From 1035ee864a54f38f225acc6745dbfff3046e3397 Mon Sep 17 00:00:00 2001
From: SunTao <328867980@qq.com>
Date: Fri, 27 Dec 2024 17:17:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=97=85?=
 =?UTF-8?q?=E5=AE=B3=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A4=A7=E5=B1=8F=E7=97=85=E5=AE=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disease-components/traffic-log.vue        | 20 +++++++++----
 .../inspection-vehicles.vue                   |  7 +++--
 .../xj/document/maintenance-notice/index.vue  | 29 +++++++++++++++++--
 .../components/img-dialog.vue                 | 27 +++++------------
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/views/big-screen/disease-components/traffic-log.vue b/src/views/big-screen/disease-components/traffic-log.vue
index f7eb36b..57a4e88 100644
--- a/src/views/big-screen/disease-components/traffic-log.vue
+++ b/src/views/big-screen/disease-components/traffic-log.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-08 11:56:02
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-24 09:07:12
+ * @LastEditTime: 2024-12-27 16:40:12
  * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-log.vue
  * @Description: 病害巡检-病害日志
 -->
@@ -131,7 +131,10 @@
         style="width: 100%; background: none"
         height="85%"
       >
-        <el-table-column prop="defectType" width="100" label="病害类型">
+        <el-table-column
+          prop="defectType"
+          label="病害类型"
+        >
         </el-table-column>
         <el-table-column
           prop="segmentName"
@@ -139,7 +142,7 @@
           label="路段名称"
         >
         </el-table-column>
-        <el-table-column show-overflow-tooltip prop="companyName" label="所属">
+        <el-table-column show-overflow-tooltip prop="stakeStart" label="桩号">
         </el-table-column>
         <el-table-column width="70" prop="pci" label="操作">
           <template slot-scope="scope">
@@ -172,7 +175,7 @@
 </template>
 
 <script>
-import { emergencyData, DefectType } from "@/api/xj/screen/traffic-screen";
+import { emergencyData } from "@/api/xj/screen/traffic-screen";
 import { getSegment, getDefectDropDown } from "@/api/xj/screen/index";
 import fssmScroll from "@/components/scroll/fssm-scroll.vue";
 export default {
@@ -541,8 +544,9 @@ export default {
 
     // 表头行
     .headerRow {
-      background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
-      background-size: 100% 100%;
+      // background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
+      // background-size: 100% 100%;
+      background: #154167;
 
       th {
         color: #ffffff;
@@ -560,6 +564,10 @@ export default {
         background: #113463;
       }
 
+      &:nth-child(2n + 1) {
+        background: #051637;
+      }
+
       // 表格内下划线
       td {
         // border-color: transparent;
diff --git a/src/views/big-screen/overview-components/inspection-vehicles.vue b/src/views/big-screen/overview-components/inspection-vehicles.vue
index f7735e0..211ea89 100644
--- a/src/views/big-screen/overview-components/inspection-vehicles.vue
+++ b/src/views/big-screen/overview-components/inspection-vehicles.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-08 09:40:18
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-20 11:15:31
+ * @LastEditTime: 2024-12-27 16:01:37
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
  * @Description: 总览大屏-巡检车辆
 -->
@@ -405,8 +405,9 @@ export default {
 
     // 表头行
     .headerRow {
-      background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
-      background-size: 100% 100%;
+      // background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
+      // background-size: 100% 100%;
+      background: #154167;
 
       th {
         color: #ffffff;
diff --git a/src/views/xj/document/maintenance-notice/index.vue b/src/views/xj/document/maintenance-notice/index.vue
index 082947b..4bac25d 100644
--- a/src/views/xj/document/maintenance-notice/index.vue
+++ b/src/views/xj/document/maintenance-notice/index.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-20 11:58:33
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-26 15:49:28
+ * @LastEditTime: 2024-12-27 14:59:31
  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
  * @Description: 养护通知单
 -->
@@ -21,6 +21,7 @@
           v-model="noticeForm.segmentName"
           placeholder="请选择路段"
           clearable
+          filterable
         >
           <el-option
             v-for="item in segmentList"
@@ -289,7 +290,7 @@
     <el-dialog
       title="查看图片"
       :visible.sync="showImageDialog"
-      width="75rem"
+      width="85rem"
       append-to-body
       destroy-on-close
       @close="imgCancel"
@@ -307,6 +308,19 @@
           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>
@@ -318,7 +332,6 @@ import ViewDialog from "./components/view-dialog.vue";
 import {
   getSegment,
   getDefectList,
-  getDefectStatus,
   getMaintenanceNoticeList,
 } from "@/api/xj/document";
 export default {
@@ -734,4 +747,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>
diff --git a/src/views/xj/inspection/confirmation-management/components/img-dialog.vue b/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
index 6b1aec7..94be8c8 100644
--- a/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
+++ b/src/views/xj/inspection/confirmation-management/components/img-dialog.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-22 15:30:25
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-26 15:41:56
+ * @LastEditTime: 2024-12-27 17:11:58
  * @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue
  * @Description: 大屏查看图片弹窗
 -->
@@ -155,11 +155,9 @@
               {{ item.stakeEnd || "暂无数据" }}
               病害类型:
               {{ item.defectTypeName || "暂无数据" }}
-              <span v-if="bottomTipClick === '1'">
-                病害面积：{{ item.targetArea }}平方米 病害长度：{{
-                  item.targetLen * 1 <= 0 ? "暂无数据" : `${item.targetLen}米`
-                }}
-              </span>
+              病害面积：{{ item.targetArea }}平方米 病害长度：{{
+                item.targetLen * 1 <= 0 ? "暂无数据" : `${item.targetLen}米`
+              }}
             </el-checkbox>
           </el-checkbox-group>
         </div>
@@ -223,10 +221,6 @@ import debounce from "lodash/debounce";
 export default {
   name: "ImgDialog",
   props: {
-    bottomTipClick: {
-      type: String,
-      default: "1",
-    },
     imageItem: {
       type: Object,
       default: () => {},
@@ -333,14 +327,9 @@ export default {
       deep: true,
       immediate: true,
     },
-    bottomTipClick: {
-      handler() {
-        this.getDefectType();
-      },
-    },
   },
   created() {
-    this.getDefectType();
+    // this.getDefectType();
   },
   mounted() {},
   mounted() {
@@ -438,7 +427,7 @@ export default {
      * @return {*}
      */
     getDefectType() {
-      getItemTypes({ classType: this.bottomTipClick }).then(
+      getItemTypes({ classType: this.imgForm.classType }).then(
         ({ code, data }) => {
           if (code === 200) {
             this.defectTypeList = data;
@@ -460,7 +449,7 @@ export default {
         ...this.searchForm,
         segmentId: this.searchForm.segmentName,
       };
-
+      this.getDefectType();
       this.getList();
       setTimeout(() => {
         if (this.pageTip > 1) {
@@ -477,7 +466,6 @@ export default {
     getList() {
       this.loading = true;
       const data = {
-        classType: this.bottomTipClick,
         lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",
         ...this.imgForm,
         ...this.params,
@@ -503,7 +491,6 @@ export default {
     getListTop() {
       this.loading = true;
       const data = {
-        classType: this.bottomTipClick,
         ...this.imgForm,
         ...this.params,
         lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",