fix：病害确认修改关闭弹窗查询列表，巡检任务修改导出弹窗逻辑，修改巡检查看弹窗查看图片

src/views/xj/inspection/confirmation-management/index.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-01 13:17:41
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-26 16:02:14
+ * @LastEditTime: 2024-12-27 14:25:36
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\confirmation-management\index.vue
  * @Description: 巡检信息-病害确认
 -->
@@ -315,10 +315,9 @@ import {
   listDefect,
   mergeDefect,
 } from "@/api/xj/confirmation";
-import imageDialog from "./components/image-dialog.vue";
 import imgDialog from "./components/img-dialog.vue";
 export default {
-  components: { imageDialog, imgDialog },
+  components: { imgDialog },
   name: "ConfirmationManagement",
   data() {
     return {
@@ -515,7 +514,7 @@ export default {
       this.searchForm = {};
       this.dateTime = [];
       this.getTableList();
-      this.$refs.defectTable.clearSort()
+      this.$refs.defectTable.clearSort();
     },
 
     /**
@@ -609,6 +608,8 @@ export default {
       this.showImageDialog = false;
       this.currentImageItem = {};
       this.rects = [];
+      this.imageItem = {};
+      this.getTableList();
     },
   },
 };

src/views/xj/inspection/task-management/components/task-view.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-12-02 11:20:55
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-02 16:57:55
+ * @LastEditTime: 2024-12-27 14:15:53
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\components\task-view.vue
  * @Description: 巡检信息-巡检任务-查看新增病害
 -->
@@ -109,7 +109,7 @@
     <el-dialog
       title="查看图片"
       :visible.sync="showImageDialog"
-      width="75rem"
+      width="85rem"
       append-to-body
       destroy-on-close
       @close="imgCancel"
@@ -127,6 +127,21 @@
           class="rect-overlay"
           :style="getRectStyle(rect)"
         ></div>
+        <div class="rect-image">
+          采集时间:
+          {{
+            new Date(currentImageItem.createdTime).toLocaleString()
+          }}
+          起始桩号： {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号：
+          {{ currentImageItem.stakeEnd || "暂无数据" }}
+          病害类型：
+          {{ currentImageItem.defectTypeName || "暂无数据" }}
+          病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{
+            currentImageItem.targetLen * 1 <= 0
+              ? "暂无数据"
+              : `${currentImageItem.targetLen}米`
+          }}
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -387,4 +402,14 @@ export default {
   pointer-events: none;
   border: 2px solid red;
 }
+
+// 图片信息
+.rect-image {
+  width: 90%;
+  position: absolute;
+  top: 0;
+  font-size: 1.2rem;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.5);
+}
 </style>

src/views/xj/inspection/task-management/index.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 09:48:43
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-24 16:01:02
+ * @LastEditTime: 2024-12-27 14:03:45
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\index.vue
  * @Description: 巡检管理-巡检任务
 -->
@@ -22,7 +22,6 @@
           v-model="queryParams.taskId"
           :fetch-suggestions="querySearchAsync"
           placeholder="请输入任务id"
-          @select="handleSelect"
         ></el-autocomplete>
       </el-form-item>
       <el-form-item label="车牌号码" prop="plateNo">
@@ -94,9 +93,9 @@
       <el-table-column label="巡检终点" align="center" prop="stakeEnd" />
       <el-table-column label="车牌号码" align="center" prop="plateNo">
       </el-table-column>
-      <el-table-column label="病害数" align="center" prop="defectCount">
+      <el-table-column label="发现病害数" align="center" prop="defectCount">
       </el-table-column>
-      <el-table-column label="新增病害数" align="center" prop="newDefectCount">
+      <el-table-column label="发现新增病害数" align="center" prop="newDefectCount">
       </el-table-column>
       <el-table-column label="任务id" align="center" prop="extId" />
       <el-table-column
@@ -105,10 +104,29 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-popover placement="left" width="auto" trigger="hover">
+            <p>导出是否附带图片？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" @click="wordExport(scope.row,false)"
+                >取消</el-button
+              >
+              <el-button type="primary" size="mini" @click="wordExport(scope.row,true)"
+                >确定</el-button
+              >
+            </div>
+            <el-button
+              slot="reference"
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              >导出</el-button
+            >
+          </el-popover>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
+            style="margin-left: 0.5rem"
             @click="viewDefect(scope.row)"
             >查看
           </el-button>
@@ -119,14 +137,6 @@
             @click="handleRetrace(scope.row)"
             >回顾
           </el-button> -->
-          <el-button
-            style="margin-left: 0.5rem"
-            size="mini"
-            type="text"
-            icon="el-icon-download"
-            @click="handelExpport(scope.row)"
-            >导出</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -146,7 +156,7 @@
     </div>
     <!-- 查看新增病害弹窗 -->
     <el-dialog
-      title="查看新增病害"
+      title="已确认新增病害"
       :visible.sync="viewVisible"
       width="85rem"
       append-to-body
@@ -185,25 +195,6 @@
         :dialogItem="dialogItem"
       ></task-retrace>
     </el-dialog>
-
-    <!-- 导出数据弹窗 -->
-    <el-dialog
-      title="导出"
-      :visible.sync="exportVisible"
-      width="30rem"
-      append-to-body
-      :close-on-click-modal="false"
-      destroy-on-close
-      @close="exportCancel"
-    >
-      <template>
-        <div style="font-size: 1.5rem">导出是否附带图片</div>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm(true)">确 定</el-button>
-          <el-button @click="submitForm(false)">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -265,8 +256,6 @@ export default {
       // 病害类型下拉
       defectCascaderList: [],
 
-      // 导出弹窗显隐控制
-      exportVisible: false,
     };
   },
   created() {
@@ -309,13 +298,6 @@ export default {
       });
     },
 
-    /**
-     * @description: 任务id选择事件
-     * @param {*}
-     * @return {*}
-     */
-    handleSelect() {},
-
     /**
      * @description: 获取巡检路段下拉数据
      * @return {*}
@@ -415,20 +397,12 @@ export default {
       this.dialogItem = item;
     },
 
-    /**
-     * @description: 点击导出事件
-     * @return {*}
-     */
-    handelExpport(item) {
-      this.exportVisible = true;
-      this.dialogItem = item;
-    },
-
     /**
      * @description: 导出文件
      * @return {*}
      */
-    submitForm(type) {
+    submitForm(item,type) {
+      console.log(item,'fdfdfd')
       this.wordExport(this.dialogItem, type);
     },
 
@@ -499,14 +473,6 @@ export default {
       this.dialogItem = {};
     },
 
-    /**
-     * @description: 关闭导出弹窗
-     * @return {*}
-     */
-    exportCancel() {
-      this.exportVisible = false;
-      this.dialogItem = {};
-    },
   },
 };
 </script>