From 486085be54a1191c65f3d1ea0711a76b605dd951 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 09:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E8=AF=B1=E5=AF=BC=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TimeLine/TimeLine2/index.vue   |   1 +
 .../JiHeExpressway/components/Video/index.vue |   3 +-
 .../JiHeExpressway/images/form/location.svg   |  12 ++
 .../Dialogs/DrivingGuidance/index.vue         |   3 +-
 .../components/SpecialTable.vue               |   3 +
 .../views/dutyOfficer/index.vue               | 113 +++++-------------
 .../Cards/AuditDetails/index.vue              |   9 +-
 7 files changed, 58 insertions(+), 86 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/form/location.svg

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue
index 89259547..db664bd7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/index.vue
@@ -78,6 +78,7 @@ export default {
 .TimeLine2 {
   color: #fff;
   overflow-y: auto;
+  height: 100%;
 
   .node {
     width: 100%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
index 1d4648b5..18e2fb64 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
@@ -20,7 +20,8 @@ export default {
   },
   mounted() {
     const player = new HttpLivePlayer(this.$refs.videoContainerRef, { camId: this.camId, url: this.url });
-    this.$once("hook:beforeDestroy", () => player.destroy())
+
+    this.$once("hook:beforeDestroy", () => player.destroy());
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/form/location.svg b/ruoyi-ui/src/views/JiHeExpressway/images/form/location.svg
new file mode 100644
index 00000000..8e5561ee
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/form/location.svg
@@ -0,0 +1,12 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142815213">
+<circle id="Ellipse 41" cx="11.5" cy="11.5" r="11.5" fill="url(#paint0_linear_195_833)"/>
+<path id="Vector" d="M11.4989 5.22729C10.1135 5.22905 8.78541 5.7921 7.80583 6.79295C6.82624 7.79379 6.27516 9.15073 6.27344 10.5661C6.27344 13.412 10.9557 18.4539 11.1553 18.6674C11.1995 18.7151 11.2528 18.753 11.3119 18.779C11.3709 18.8049 11.4346 18.8183 11.4989 18.8182H11.51C11.576 18.8171 11.6411 18.8017 11.7008 18.7729C11.7605 18.7441 11.8135 18.7026 11.8563 18.6512L13.4783 16.754C15.6324 14.058 16.728 11.9758 16.728 10.5661C16.7263 9.15073 16.1752 7.79379 15.1956 6.79295C14.216 5.7921 12.8879 5.22905 11.5026 5.22729H11.4989ZM11.4989 12.9937C11.0289 12.9937 10.5696 12.8513 10.1788 12.5846C9.78812 12.3178 9.48359 11.9387 9.30376 11.4951C9.12393 11.0515 9.07688 10.5634 9.16856 10.0926C9.26023 9.62166 9.48652 9.18912 9.8188 8.84962C10.1511 8.51013 10.5744 8.27893 11.0353 8.18526C11.4962 8.09159 11.9739 8.13967 12.4081 8.3234C12.8422 8.50713 13.2133 8.81828 13.4744 9.21748C13.7355 9.61668 13.8748 10.086 13.8748 10.5661C13.8749 10.885 13.8136 11.2007 13.6942 11.4953C13.5748 11.7898 13.3998 12.0575 13.1792 12.2829C12.9585 12.5084 12.6966 12.6872 12.4082 12.8091C12.1199 12.9311 11.8109 12.9938 11.4989 12.9937Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_195_833" x1="11.0869" y1="4.38931" x2="11.0869" y2="22.4733" gradientUnits="userSpaceOnUse">
+<stop stop-color="#9E6AF2"/>
+<stop offset="1" stop-color="#651FD6"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 88c1f41b..b66a1808 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -91,6 +91,7 @@ export default {
     dialogData: {
       immediate: true,
       handler() {
+        this.dialogData.roadName = "G35济泽高速";
         request({
           url: `/business/product/${this.dialogData.product_id}`,
           method: "get",
@@ -124,7 +125,7 @@ export default {
                   .then(({ code, data }) => {
                     if (code != 200) return;
 
-                    this.dialogData.roadName = data.dc_road;
+                    if (data.dc_road) this.dialogData.roadName = data.dc_road;
                   })
               })
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
index 982c4201..f3408bcd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
@@ -107,8 +107,10 @@ export default {
     }
 
     .content {
+      width: 100%;
       display: flex;
       align-items: center;
+      justify-content: center;
       flex: 1;
     }
 
@@ -131,6 +133,7 @@ export default {
     padding: 24px 18px;
 
     .content {
+      width: 100%;
       gap: 9px;
     }
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
index 8e963eda..67d22e46 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
@@ -43,75 +43,31 @@
           {{ data['值班日期'] }}
         </div>
       </template>
-      <template #content-DutyLeaderCenter="{ data }">
+      <template #content-Stationary="{ data }">
         <div class="parent">
           <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-          <div class="item">
-            <img src="@screen/images/form/phone.svg" />
-            {{ data['值班日期'] }}
+            <img src="@screen/images/form/location.svg" />
+            {{ data['驻点'] }}
           </div>
         </div>
       </template>
-      <template #content-DispatchLeadership="{ data }">
+      <template #content-DayShift="{ data }">
         <div class="item-parent">
           <div class="item">
             <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
+            {{ data['白班'] }}
           </div>
           <div class="item">
             <img src="@screen/images/form/phone.svg" />
-            {{ data['值班日期'] }}
+            {{ data['白班'] }}
           </div>
         </div>
       </template>
-      <template #content-DispatchDuty="{ data }">
+      <template #content-GraveyardShift="{ data }">
         <div class="item-parent">
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-          <div class="item">
+          <div class="item" v-for="item in 15">
             <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-        </div>
-      </template>
-      <template #content-TravelDuty="{ data }">
-        <div class="item-parent">
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-        </div>
-      </template>
-      <template #content-EmergencyLeadership="{ data }">
-        <div class="item-parent">
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-          <div class="item">
-            <img src="@screen/images/form/phone.svg" />
-            {{ data['值班日期'] }}
-          </div>
-        </div>
-      </template>
-      <template #content-EmergencyDuty="{ data }">
-        <div class="item-parent">
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
-          </div>
-          <div class="item">
-            <img src="@screen/images/form/people.svg" />
-            {{ data['值班日期'] }}
+            {{ data['夜班'] }}
           </div>
         </div>
       </template>
@@ -165,48 +121,30 @@ export default {
         {
           key: "DateDuty",
           title: "值班日期",
-          width: "180px"
-        },
-        {
-          key: "DutyLeaderCenter",
-          title: "中心值班领导",
-          width: "240px"
+          width: "210px"
         },
         {
-          key: "DispatchLeadership",
-          title: "调度领导",
+          key: "Stationary",
+          title: "驻点",
           width: "240px"
         },
         {
-          key: "DispatchDuty",
-          title: "调度值班",
-          width: "180px"
+          key: "DayShift",
+          title: "白班",
+          width: "510px"
         },
         {
-          key: "TravelDuty",
-          title: "出行值班",
-          width: "180px"
-        },
-        {
-          key: "EmergencyLeadership",
-          title: "应急领导",
-          width: "240px"
-        },
-        {
-          key: "EmergencyDuty",
-          title: "应急值班",
-          width: "180px"
+          key: "GraveyardShift",
+          title: "夜班",
+          width: "510px"
         },
       ],
       data: Array.from({ length: 15 }).map((_, index) => ({
         "id": index,
         "值班日期": "2023-12-21",
-        "中心值班领导": "甘易玫",
-        "调度领导": "甘易玫",
-        "调度值班": "甘易玫",
-        "出行值班": "甘易玫",
-        "应急领导": "甘易玫",
-        "应急值班": "甘易玫",
+        "驻点": "驻点",
+        "白班": "甘易玫",
+        "夜班": "甘易玫",
       })),
 
       operateRecordVisible: false,
@@ -243,6 +181,15 @@ export default {
     }
   }
 
+  .item-parent {
+    display: grid;
+    gap: 9px;
+    width: 100%;
+    grid-template-columns: repeat(3, 1fr);
+    overflow-y: auto;
+    max-height: 150px;
+  }
+
   .operate-button {
     width: 105px;
     height: 41px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
index 63a6c955..424fbce9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
@@ -36,5 +36,12 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.AuditDetails {}
+.AuditDetails {
+
+  ::v-deep {
+    .content {
+      overflow: hidden;
+    }
+  }
+}
 </style>