From 76e684a686b406030c749eda2349293070c99494 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Wed, 10 Jan 2024 09:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/RoadAndEvents/index.vue   | 10 +++---
 .../RoadAndEvents/utils/buttonEvent.js        |  4 +--
 .../views/JiHeExpressway/pages/Home/index.vue | 32 +++++++++++--------
 .../views/dutyOfficer/index.vue               | 10 ++++--
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 1fbee130..c1533e0a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -25,10 +25,10 @@
     </div>
 
     <!-- 摄像机设备 控制 弹窗  球机 可打开-->
-    <!-- <ControlCamera :data="cameraDialogConfig.data" :visible="cameraDialogConfig.visibleType === 0" /> -->
+    <!-- <ControlCamera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 0" /> -->
     <!-- 摄像机 G35 K094+079 下行（可控） 枪机 可打开-->
-    <!-- <Camera :data="cameraDialogConfig.data" :visible="cameraDialogConfig.visibleType === 1" /> -->
-    <component :dialogData="cameraDialogConfig.data" :is="cameraDialogConfig.component" @change="handleCameraChange" />
+    <!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> -->
+    <component :dialogData="dialogConfig.data" :is="dialogConfig.component" @change="handleCameraChange" />
   </Bg1>
 </template>
 
@@ -55,7 +55,7 @@ export default {
       tabContentData: [],
 
       // 路测设备-摄像机
-      cameraDialogConfig: {
+      dialogConfig: {
         // 0 有 可控（球机） ControlCamera | 1 ⽆ 不可控（枪机） Camera
         component: void 0,
         data: void 0,
@@ -107,7 +107,7 @@ export default {
 
     // 摄像机 可控 不可控 弹窗 回调
     handleCameraChange() {
-      this.cameraDialogConfig = {
+      this.dialogConfig = {
         // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera
         component: null,
         data: null
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index db2f6a0e..2a0700ae 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -63,13 +63,13 @@ export const eventMap = {
     const markerClick = (e) => {
       const extData = e.target.getExtData();
 
-      this.cameraDialogConfig = {
+      this.dialogConfig = {
         // 0 有（球机） 1 ⽆（枪机）
         component: cameraCtrlMap[extData.ptzCtrl],
         data: extData,
       };
 
-      console.log(this.cameraDialogConfig);
+      console.log(this.dialogConfig);
     };
 
     const markerCluster = await setMarkerCluster(
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index 5acad623..99b23273 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -8,7 +8,7 @@
         <FocusedMonitoring class="card-menu" />
 
         <!-- 下 -->
-        <RoadAndEvents class="content-l-b card-menu" @onClickItem="onClickItem"/>
+        <RoadAndEvents class="content-l-b card-menu" @onClickItem="onClickItem" />
       </div>
 
       <!-- 右侧 -->
@@ -49,9 +49,9 @@ export default {
     AMapContainer,
     InfoBoard
   },
-  data(){
-    return{
-      isShowInfoBoard:false
+  data() {
+    return {
+      isShowInfoBoard: false
     }
   },
   provide() {
@@ -66,12 +66,17 @@ export default {
       const result = (e.target.style.transform.match(/[-0-9]+/)?.[0] || -90) * -1
 
       e.target.style.transform = `rotate(${result}deg)`;
-
-      // translateXElement.style.transform = translateXElement.style.transform ? "" : `translateY(calc(100% - 36px))`
-      translateXElement.style.height = translateXElement.style.height != "36px" ? "36px" : `100%`
+      if (translateXElement.style.transform !== `translateY(calc(100% - 36px))`) {
+        translateXElement.style.transform = `translateY(calc(100% - 36px))`
+        translateXElement.style.position = `absolute`;
+        translateXElement.style.bottom = `0px`;
+      } else {
+        translateXElement.style.transform = `translateY(0)`
+        translateXElement.style.position = `relative`;
+      }
     },
-    onClickItem(item){
-      if(item.title.includes("情报板")){
+    onClickItem(item) {
+      if (item.title.includes("情报板")) {
         this.isShowInfoBoard = true;
       }
     }
@@ -87,7 +92,7 @@ export default {
   flex-direction: column;
   gap: 30px;
   padding: 19px 31px 0 25px;
-  justify-content: space-between;
+  justify-content: center;
 
   .card-menu {
     transition: all .24s linear;
@@ -98,7 +103,8 @@ export default {
     // margin: auto;
     display: flex;
     justify-content: space-between;
-    flex: 1;
+    // flex: 1;
+    height: min-content;
     pointer-events: none;
 
     >div {
@@ -137,9 +143,9 @@ export default {
     // margin: auto;
     pointer-events: none;
     overflow: hidden;
-    height: 100%;
-    // height: fit-content;
+    height: min-content;
     will-change: height;
+    bottom: 0;
 
     >div {
       pointer-events: all;
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 b79b9a39..abbac64d 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
@@ -2,10 +2,10 @@
   <div class='DutyOfficer'>
     <SpecialTable :columns="columns" :data="data">
       <template #title-DateDuty>
-        <div>
+        <div class="special-title">
           值班中心
         </div>
-        </template>
+      </template>
       <template #content-DateDuty="{ data }">
         <div class="item">
           <img src="@screen/images/form/calendar.svg" />
@@ -194,6 +194,12 @@ export default {
 <style lang='scss' scoped>
 .DutyOfficer {
 
+  .special-title {
+    background: linear-gradient(180deg, #FFC071 0%, #D68D00 100%);
+    background-clip: text;
+    color: transparent;
+  }
+
   .item {
     display: flex;
     align-items: center;