Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/components/ImageListPreview/index.vue

@@ -20,7 +20,7 @@
         <!-- -->
         <div class="image relative"
              v-else>
-          <el-image :src="v"
+          <el-image :src="v.url"
                     class="avatar"
                     :preview-src-list="fileList"
                     :z-index="6000" />
@@ -47,7 +47,9 @@ export default {
       handler(newVal) {
         if(newVal){
         const list = Array.isArray(newVal) ? newVal : this.value.split(",");
-        this.fileList = list.map((url) => ({ name: url, url }));}
+        this.fileList = list.map((url) => ({ name: url, url }));
+        console.log("this.fileList",this.fileList);
+      }        
         else{
           this.fileList =[];
         }

src/views/resumption/plan/index.vue

@@ -205,6 +205,7 @@
           <el-table-column
             prop="execOrgType"
             label="履职机构类型"
+            width="120px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
@@ -220,6 +221,7 @@
           <el-table-column
             prop="planCycle"
             label="履职周期"
+            width="80px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
@@ -238,6 +240,7 @@
           <el-table-column
             prop="planExec"
             label="履职时间"
+            width="80px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
@@ -256,6 +259,7 @@
           <el-table-column
             prop="planStatus"
             label="计划状态"
+            width="80px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"

src/views/resumption/protection/index.vue

@@ -194,10 +194,9 @@
                 v-hasPermi="['device:protection']"
                 >布撤防历史</el-button
               >
-              <el-popover
-                placement="top-start"
+              <el-popconfirm
                 @confirm="onDel(r.row.id)"
-                content="点击确定删除防区"
+                title="点击确定删除防区"
               >
                 <el-button
                   size="mini"
@@ -207,7 +206,7 @@
                   slot="reference"
                   >删除</el-button
                 >
-              </el-popover>
+              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -317,7 +316,11 @@ export default {
       this.$refs.historyDialog.show(row);
     },
     async onDel(id) {
-      await api.del(id);
+      let b=(await api.del(id)).data;
+      if(b){
+        this.$message.info("删除成功");
+      }
+      
       this.getList();
     },
     updateStatus(id, status) {

src/views/resumption/taskManager/index.vue

@@ -20,7 +20,7 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="履职计划">
+          <el-form-item label="履职计划" prop="planId">
             <el-select
               v-model="queryParams.planId"
               filterable
@@ -36,7 +36,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="履职角色">
+          <el-form-item label="履职角色" prop="executeRole">
             <el-select
               v-model="queryParams.executeRole"
               placeHolder="请选择履职角色"
@@ -50,11 +50,10 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="履职周期">
+          <el-form-item label="履职周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
-              placeHolder="请选择履职周期"
-              clearable
+              placeHolder="请选择履职周期"              
               @change="changeType($event)"
             >
               <el-option
@@ -65,7 +64,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="任务状态">
+          <el-form-item label="任务状态" prop="status">
             <el-select
               v-model="queryParams.status"
               placeHolder="请选择任务状态"
@@ -683,9 +682,11 @@ export default {
     },
     resetQuery() {
       this.resetForm("queryParams");
-      this.queryParams.orgId = undefined;
-      this.queryParams.checkSub = false;
-      this.$refs.tree.setCurrentKey(null);
+      this.queryParams.executeCycle="2";
+      this.changeType("2");
+      // this.queryParams.orgId = undefined;
+      // this.queryParams.checkSub = false;
+      // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },
     async getList() {