From e453a88a5655b19cc769b4cab3063e2f34723d37 Mon Sep 17 00:00:00 2001
From: SunTao <328867980@qq.com>
Date: Tue, 7 Jan 2025 16:26:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E4=BB=8A=E6=97=A5=E5=B7=A1=E6=9F=A5=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B7=A5=E5=8D=95=E7=94=9F=E6=88=90=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=97=85=E5=AE=B3=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E5=8A=A0=E6=A0=87=E9=A2=98=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disease-components/traffic-safety.vue     | 26 ++++++++++++-------
 .../overview-components/today-inspection.vue  | 25 +++++++++++-------
 .../xj/document/maintenance-notice/index.vue  | 15 +++++------
 .../components/surface-map.vue                | 12 ++++++++-
 .../inspection/surface-management/index.vue   | 20 +++++++++++---
 .../task-management/components/task-map.vue   |  2 +-
 6 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/src/views/big-screen/disease-components/traffic-safety.vue b/src/views/big-screen/disease-components/traffic-safety.vue
index 5e6ad75..06e6211 100644
--- a/src/views/big-screen/disease-components/traffic-safety.vue
+++ b/src/views/big-screen/disease-components/traffic-safety.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-21 09:59:32
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-19 10:43:45
+ * @LastEditTime: 2025-01-07 14:26:49
  * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-safety.vue
  * @Description: 病害巡检大屏-今日巡查
 -->
@@ -21,9 +21,9 @@
         <div class="right-rate-top">
           <span>{{ count }}</span
           >个
-          <i v-if="state === '增加'" class="el-icon-top"></i>
-          <i v-if="state === '无变化'" class="el-icon-minus"></i>
-          <i v-else class="el-icon-bottom"></i>
+          <i v-if="state === '增加'" class="el-icon-caret-top"></i>
+          <i v-else-if="state === '无变化'" class="el-icon-minus"></i>
+          <i v-else class="el-icon-caret-bottom"></i>
         </div>
         <div class="right-rate-bottom">
           <span v-if="state === '增加'" class="up">{{ state }}</span>
@@ -691,7 +691,9 @@ export default {
       background-size: 100%;
       background-position: 100% 50%;
       color: #aac6c7;
-      font-size: 1rem;
+      // font-size: 1rem;
+      font-family: "DouYu";
+      font-size: 0.8rem;
 
       span {
         margin-right: 0.5rem;
@@ -725,6 +727,8 @@ export default {
         display: flex;
         justify-content: center;
         align-items: flex-end;
+        font-family: "DouYu";
+        font-size: 0.8rem;
 
         span {
           font-size: 1rem;
@@ -739,14 +743,18 @@ export default {
           /*给文字设置成透明*/
         }
 
-        .el-icon-top {
-          font-size: 1.5rem;
+        .el-icon-caret-top {
+          font-size: 1.2rem;
+          line-height: 1.5rem;
+          font-weight: 800;
           color: red;
         }
 
-        .el-icon-bottom,
+        .el-icon-caret-bottom,
         .el-icon-minus {
-          font-size: 1.5rem;
+          font-size: 1.2rem;
+          line-height: 1.5rem;
+          font-weight: 800;
           color: #19eb27;
         }
       }
diff --git a/src/views/big-screen/overview-components/today-inspection.vue b/src/views/big-screen/overview-components/today-inspection.vue
index 6e21d9b..0b1c965 100644
--- a/src/views/big-screen/overview-components/today-inspection.vue
+++ b/src/views/big-screen/overview-components/today-inspection.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-18 09:42:49
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-23 09:53:28
+ * @LastEditTime: 2025-01-07 14:26:03
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\today-inspection.vue
  * @Description: 总览大屏-今日巡查
 -->
@@ -21,9 +21,9 @@
         <div class="right-rate-top">
           <span>{{ count }}</span
           >个
-          <i v-if="state === '增加'" class="el-icon-top"></i>
-          <i v-if="state === '无变化'" class="el-icon-minus"></i>
-          <i v-else class="el-icon-bottom"></i>
+          <i v-if="state === '增加'" class="el-icon-caret-top"></i>
+          <i v-else-if="state === '无变化'" class="el-icon-minus"></i>
+          <i v-else class="el-icon-caret-bottom"></i>
         </div>
         <div class="right-rate-bottom">
           <span v-if="state === '增加'" class="up">{{ state }}</span>
@@ -683,7 +683,8 @@ export default {
       background-size: 100%;
       background-position: 100% 50%;
       color: #aac6c7;
-      font-size: 1rem;
+      font-family: "DouYu";
+      font-size: 0.8rem;
 
       span {
         font-size: 1rem;
@@ -718,6 +719,8 @@ export default {
         display: flex;
         justify-content: center;
         align-items: flex-end;
+        font-family: "DouYu";
+        font-size: 0.8rem;
 
         span {
           font-size: 1rem;
@@ -732,14 +735,18 @@ export default {
           /*给文字设置成透明*/
         }
 
-        .el-icon-top {
-          font-size: 1.5rem;
+        .el-icon-caret-top {
+          font-size: 1.2rem;
+          line-height: 1.5rem;
+          font-weight: 800;
           color: red;
         }
 
-        .el-icon-bottom,
+        .el-icon-caret-bottom,
         .el-icon-minus {
-          font-size: 1.5rem;
+          font-size: 1.2rem;
+          line-height: 1.5rem;
+          font-weight: 800;
           color: #19eb27;
         }
       }
diff --git a/src/views/xj/document/maintenance-notice/index.vue b/src/views/xj/document/maintenance-notice/index.vue
index d51466a..938cdc0 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: 2025-01-03 14:25:11
+ * @LastEditTime: 2025-01-07 15:03:36
  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
  * @Description: 养护通知单
 -->
@@ -174,12 +174,11 @@
         >
           <el-table-column type="index" label="序号"> </el-table-column>
           <el-table-column label="路段名称" align="center" prop="segmentName" />
-          <el-table-column label="采集时间" align="center" prop="createdTime">
-            <template slot-scope="scope">
-              <span>{{
-                new Date(scope.row.createdTime).toLocaleString()
-              }}</span>
-            </template>
+          <el-table-column
+            label="采集时间"
+            align="center"
+            prop="createdTimeLocal"
+          >
           </el-table-column>
           <el-table-column
             label="病害类型"
@@ -227,7 +226,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                >生成工单
+                >生成通知单
               </el-button>
               <el-button
                 v-if="activeName === '已生成'"
diff --git a/src/views/xj/inspection/surface-management/components/surface-map.vue b/src/views/xj/inspection/surface-management/components/surface-map.vue
index f9e19bd..b2ce78f 100644
--- a/src/views/xj/inspection/surface-management/components/surface-map.vue
+++ b/src/views/xj/inspection/surface-management/components/surface-map.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 14:49:21
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-01-03 09:38:10
+ * @LastEditTime: 2025-01-07 15:56:50
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\components\surface-map.vue
  * @Description: 路面病害管理-地图组件
 -->
@@ -10,6 +10,9 @@
 <template>
   <div class="div-all">
     <div class="div-map">
+      <span>
+        {{ mapObject.title }}
+      </span>
       <fssm-map
         ref="contentMap"
         :mapId="id"
@@ -353,6 +356,13 @@ export default {
   height: 65%;
   position: relative;
 
+  span {
+    position: absolute;
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 1;
+  }
+
   .map-clean {
     position: absolute;
     top: 0.5rem;
diff --git a/src/views/xj/inspection/surface-management/index.vue b/src/views/xj/inspection/surface-management/index.vue
index cac4674..c637c8d 100644
--- a/src/views/xj/inspection/surface-management/index.vue
+++ b/src/views/xj/inspection/surface-management/index.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 13:59:51
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-20 15:01:48
+ * @LastEditTime: 2025-01-07 15:53:44
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\index.vue
  * @Description: 巡检管理-路面病害对比
 -->
@@ -20,6 +20,7 @@
       >
         <el-form-item label="路段名称" prop="segmentId">
           <el-select
+            ref="segmentIdSelect"
             v-model="surfaceForm.segmentId"
             placeholder="请选择道路名称"
             clearable
@@ -44,6 +45,7 @@
         </el-form-item>
         <el-form-item label="病害类型">
           <el-cascader
+            ref="segmentIdCascader"
             v-model="surfaceForm.defectType"
             :options="defectTypeList"
             :props="{
@@ -234,12 +236,24 @@ export default {
                   Object.keys(this.surfaceListLeft).length < 1 &&
                   data.data.length > 0
                 ) {
-                  this.surfaceListLeft = data;
+                  const [node] = this.$refs.segmentIdCascader.getCheckedNodes();
+                  this.surfaceListLeft = {
+                    ...data,
+                    title: `${this.$refs.segmentIdSelect.selected.label}——${
+                      this.surfaceForm.time
+                    }——${node?.label || "全部病害"}`,
+                  };
                 } else if (
                   Object.keys(this.surfaceListRight).length < 1 &&
                   data.data.length > 0
                 ) {
-                  this.surfaceListRight = data;
+                  const [node] = this.$refs.segmentIdCascader.getCheckedNodes();
+                  this.surfaceListRight = {
+                    ...data,
+                    title: `${this.$refs.segmentIdSelect.selected.label}——${
+                      this.surfaceForm.time
+                    }——${node?.label || "全部病害"}`,
+                  };
                 }
               }
             });
diff --git a/src/views/xj/inspection/task-management/components/task-map.vue b/src/views/xj/inspection/task-management/components/task-map.vue
index 1504a5c..83dbead 100644
--- a/src/views/xj/inspection/task-management/components/task-map.vue
+++ b/src/views/xj/inspection/task-management/components/task-map.vue
@@ -36,7 +36,7 @@
       destroy-on-close
       @close="screenImgCancel"
     >
-      <div class="image-container" ref="imageContainer">
+      <div class="image-container" ref="imageContainer" v-if="showImageDialog">
         <img
           :src="screenImage.imageUrl"
           alt="Main Image"