From c160258739baa641751fd50974e30dec3308c5c2 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Thu, 12 Dec 2024 16:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=90=83=E6=9C=BA=E6=8E=A7=E5=88=B6=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E7=AD=9B=E9=80=89=E8=AE=BE=E5=A4=87=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E6=9C=BA=E6=9F=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/HomeDevice/Camera.vue     |  7 ++--
 .../Home/components/HomeDevice/device.vue     | 34 ++++++++++++++++++-
 .../smart/statisticalAnalysis/query/data.js   |  5 +++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/Camera.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/Camera.vue
index d7c36123..2cb0c168 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/Camera.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/Camera.vue
@@ -1,6 +1,6 @@
 <template>
     <Dialog v-model="visibleModel" :title="dialogData.deviceName" @update:close="visibleClose"
-     width="450px" style="z-index:3000">
+     width="450px" >
       <div class="Camera">
         <Video class="video-stream" :camId="dialogData.iotDeviceId" :img="AENUM[dialogData.childType]" />
         <ElTabs v-model="activeName" class="tabs">
@@ -11,10 +11,7 @@
                 <img
                   @click="controlDialogVisible = true"
                   v-if="check(['business:home:camera']) && 
-                    [0, '0'].includes(
-                      dialogData.parseOtherConfig &&
-                        dialogData.parseOtherConfig.ptzCtrl
-                    )
+                    (dialogData.childType=='1-2'||dialogData.childType=='1-3')
                   "
                   src="@screen/images/camera-control-icon.svg"
                   width="18px"
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/device.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/device.vue
index b3decc37..125f8b2b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/device.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/device.vue
@@ -10,7 +10,11 @@
                 placeholder="请选择设备类型"
               >
                 <el-option
-                  v-for="item in [{label:'摄像机',value:1},{label:'情报板',value:2},{label:'语音广播',value:5},
+                  v-for="item in [{label:'高清网络枪型固定摄像机',value:20},{label:'高清网络球形摄像机',value:21},
+                  {label:'桥下高清网络球形摄像机',value:22},{label:'360°全景相机',value:23},{label:'180°全景相机',value:24},
+                  {label:'门架式可变信息标志',value:25},{label:'站前可变信息标志',value:26},{label:'雨棚可变信息标志',value:27},
+                  {label:'站前悬臂式可变信息标志',value:28},
+                  {label:'语音广播',value:5},
                   {label:'护栏碰撞',value:6},{label:'毫米波雷达',value:7},
                   {label:'合流区预警',value:8},{label:'激光疲劳唤醒',value:10},{label:'一类交调站',value:11},
                   {label:'行车诱导',value:12},
@@ -375,6 +379,34 @@ import { log } from 'mathjs';
         if (params.deviceName === '') {
           delete params.deviceName
         }
+        if(params.deviceType==20){
+          params.deviceType=1;
+          params.childType='1-1'
+        }else if(params.deviceType==21){
+          params.deviceType=1;
+          params.childType='1-2'
+        }else if(params.deviceType==22){
+          params.deviceType=1;
+          params.childType='1-3'
+        }else if(params.deviceType==23){
+          params.deviceType=1;
+          params.childType='1-4'
+        }else if(params.deviceType==24){
+          params.deviceType=1;
+          params.childType='1-5'
+        }else if(params.deviceType==25){
+          params.deviceType=2;
+          params.childType='2-1'
+        }else if(params.deviceType==26){
+          params.deviceType=2;
+          params.childType='2-2'
+        }else if(params.deviceType==27){
+          params.deviceType=2;
+          params.childType='2-3'
+        }else if(params.deviceType==28){
+          params.deviceType=2;
+          params.childType='2-4'
+        }
   
         request({
           url: 'business/device/list',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
index 37f46039..85f9da8a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
@@ -101,6 +101,11 @@ export const deviceType = [
     label: "远端机",
     color: "#0040a6",
   },
+  {
+    value: "17",
+    label: "一体机柜",
+    color: "#f2f2f2",
+  },
 ]
 export const tabMap = {
   AlarmEvents: {