From 8c23804467119b83072611b33b02f48f8157de98 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 11:34:21 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Camera/components/CameraControlDialog.vue |  5 +-
 .../Home/components/Dialogs/Camera/index.vue  | 47 +++++++++----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
index 9149ed8d..82d803f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
@@ -27,10 +27,7 @@
           <span>{{ item.label }}</span>
           <img src="../images/add.svg" @click="controlClick(item.add)">
         </div>
-        <div>雨刷
-          <Button @click.native="controlClick(49)">开</Button>
-          <Button @click.native="controlClick(48)">关</Button>
-        </div>
+
 
       </div>
     </div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index c1666b0a..2dba6497 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -7,29 +7,24 @@
           <Descriptions :list="list" :data="data" style="gap: 18px">
             <template #content-deviceName>
               <span>{{ dialogData.deviceName || "-" }}</span>
-              <img
-                @click="controlDialogVisible = true"
-                v-if="
-                  [0, '0'].includes(
-                    dialogData.parseOtherConfig &&
-                      dialogData.parseOtherConfig.ptzCtrl
-                  )
-                "
-                src="@screen/images/camera-control-icon.svg"
-                width="18px"
-                height="18px"
-                style="cursor: pointer"
-              />
+              <img @click="controlDialogVisible = true" v-if="[0, '0'].includes(
+    dialogData.parseOtherConfig &&
+    dialogData.parseOtherConfig.ptzCtrl
+  )
+    " src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer" />
             </template>
           </Descriptions>
+          <div style="width:50%;display:flex;margin-top:18px">
+            <span
+              style="color: #3de8ff;font-size: 15px;font-family: PingFang SC, PingFang SC;font-weight: 400;line-height: 18px;">
+              雨刷: </span>
+            <Button style="margin-left:5px;" @click.native="controlClick(49)">开</Button>
+            <Button style="margin-left:5px;" @click.native="controlClick(48)">关</Button>
+          </div>
         </ElTabPane>
         <ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.productId"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
 
@@ -39,10 +34,7 @@
       </div>
     </div>
 
-    <CameraControlDialog
-      :deviceId="dialogData.iotDeviceId"
-      v-model="controlDialogVisible"
-    />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
   </Dialog>
 </template>
 
@@ -58,6 +50,8 @@ import {
   getRoadInfoByStakeMark,
   getOrganizationName,
 } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { controlCamera } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { throttle } from "lodash"
 
 import { dialogDelayVisible } from "./../mixin";
 
@@ -108,12 +102,12 @@ export default {
           label: "设备状态",
           key: "deviceState",
           enum: "DeviceTypeEnum",
-          gridColumn: 2,
+          // gridColumn: 2,
         },
         {
           label: "状态更新时间",
           key: "updateTime",
-          gridColumn: 2,
+          // gridColumn: 2,
           // enum: "CameraDirectionEnum"
         },
         // {
@@ -137,6 +131,9 @@ export default {
     console.log(this.data, "this.data");
   },
   methods: {
+    controlClick: throttle(function (type) {
+      controlCamera(this.deviceId, type)
+    }, 150),
     visibleClose(bool) {
       if (bool) return;
 
@@ -199,7 +196,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }