From 5549ab6fb8e1c561f6ff24eea514f009a1eb6fc5 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 18:39:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=20=E4=BF=AE=E5=A4=8D=E9=9B=A8=E5=88=B7?=
 =?UTF-8?q?=20IotDeviceId=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/Dialogs/Camera/index.vue  | 53 ++++++-------------
 1 file changed, 15 insertions(+), 38 deletions(-)

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 d270a36b..df35c1e9 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,51 +7,31 @@
           <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
-            v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1"
-            style="width: 50%; display: flex; margin-top: 18px"
-          >
-            <span
-              style="
+          <div v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1"
+            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
-            >
+            <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.id"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
 
@@ -61,10 +41,7 @@
       </div>
     </div>
 
-    <CameraControlDialog
-      :deviceId="dialogData.iotDeviceId"
-      v-model="controlDialogVisible"
-    />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
   </Dialog>
 </template>
 
@@ -164,7 +141,7 @@ export default {
   },
   methods: {
     controlClick: throttle(function (type) {
-      controlCamera(this.deviceId, type);
+      controlCamera(this.dialogData.iotDeviceId, type);
     }, 150),
     visibleClose(bool) {
       if (bool) return;
@@ -228,7 +205,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }

From d8a0d6d4a9600219a2fb6359fb545a34fbbcc551 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 18:53:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20=20=E6=9B=B4=E6=96=B0controlCamera?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Camera/index.vue            | 2 +-
 .../pages/Home/components/RoadAndEvents/utils/httpList.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 df35c1e9..a507d6dd 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
@@ -141,7 +141,7 @@ export default {
   },
   methods: {
     controlClick: throttle(function (type) {
-      controlCamera(this.dialogData.iotDeviceId, type);
+      controlCamera(this.dialogData.iotDeviceId, type, false);
     }, 150),
     visibleClose(bool) {
       if (bool) return;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index 736c5e7b..d0fdb2d9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -87,12 +87,12 @@ function padZero(num) {
 99 /各⽅向动作停⽌/
  * @returns
  */
-export function controlCamera(camId, cmdType) {
+export function controlCamera(camId, cmdType, isMsgType = true) {
   return request({
     url: "/video/PTZControl",
     method: "get",
     params: {
-      msgType: 3,
+      ...(isMsgType ? { msgType: 3 } : undefined),
       camId,
       cmdType,
       speed: 1,

From 3a43fcb2a6494dd018e58c9a663f697fcebdfe0a Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 18:57:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E7=A7=BB=E9=99=A4=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E6=9C=BA=20=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Camera/index.vue   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 a507d6dd..a00f4674 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
@@ -113,12 +113,12 @@ export default {
           enum: "DeviceTypeEnum",
           // gridColumn: 2,
         },
-        {
-          label: "状态更新时间",
-          key: "updateTime",
-          // gridColumn: 2,
-          // enum: "CameraDirectionEnum"
-        },
+        // {
+        //   label: "状态更新时间",
+        //   key: "updateTime",
+        //   // gridColumn: 2,
+        //   // enum: "CameraDirectionEnum"
+        // },
         // {
         //   label: '经/纬度',
         //   key: "${longitude} / ${latitude}",