Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/check/index.vue

@@ -443,7 +443,7 @@ export default {
       return false;
     },
     newcheckCanPublish(row){
-      if (row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1) {
+      if ((row.planOfOrgType==3&&row.planStatus!=1)||(row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1)) {
         return true;
       }
       return false;

src/views/core/accessPlan/index.vue

@@ -99,7 +99,7 @@
               <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="(scope.row.parentOrgId==isEdit||scope.row.orgId==isEdit)&&check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
               <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null" icon="el-icon-arrow-down"
@@ -171,10 +171,12 @@
         </el-form-item> -->
             <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
               <el-checkbox v-model="form.immediately">
-              
-                <el-popover placement="top-start" title="" width="200" trigger="hover"
+                默认从下个周期生成任务，
+                <br/>
+                勾选后从当前周期立即生成任务
+                <!-- <el-popover placement="top-start" title="" width="200" trigger="hover"
                             content="" :disabled="form.isEdit">
-                </el-popover>
+                </el-popover> -->
               </el-checkbox>
             </el-form-item> 
 
@@ -429,7 +431,7 @@
         const id = row.id || this.ids
         getPlan(id).then(response => {
           this.form = response.data;
-          this.initNum = response.data.planFrequency; 
+          this.initNum = response.data.parentFrequency; 
           this.open = true;
           this.title = "修改监控调阅计划";
           findRoleByType(this.form.orgType).then(response => {

src/views/resumption/plan/index.vue

@@ -453,6 +453,8 @@ export default {
       return false;
     },
     newcheckCanPublish(row){
+      // console.log(row.planOfOrgType,"row.planOfOrgType")
+      // console.log(row.planStatus,"row.planStatus")
       if ((row.planOfOrgType==3&&row.planStatus!=1)||(row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1)) {
         return true;
       }

src/views/safetycheck/taskManager/components/register.vue

@@ -139,7 +139,7 @@
                         style="width: 100px; height: 100px;margin:10px;"
                         v-if="point.imgData"
                         v-for="url in point.imgData"
-                        :src="url"
+                        :src="url.imgPath"
                         :preview-src-list="point.imgData.map((d) => d.imgPath)"
                       >
                       </el-image></div
@@ -407,11 +407,13 @@ export default {
   overflow-y: auto;
   margin-bottom: 20px;
   margin-top: 20px;
+  flex-direction:column;
 }
 .area_content {
   border: #B8BDC0 1px solid;
   display: flex;
   flex-direction: row;
+  width:100%;
 }
 
 .content > .area_content:first-child {

src/views/system/check/index.vue

@@ -209,8 +209,8 @@
           areaId: [
             {required: true, message: '请选择区域', trigger: 'blur'},
           ],
-          orgId: [
-            {required: true, message: '请选择归属部门', trigger: 'blur'},
+          orgType: [
+            {required: true, message: '请选择机构类型', trigger: 'blur'},
           ],
           checkName: [
             {required: true, message: '请输入NFC点位名称', trigger: 'change'}