From d15f8e8ed524ae8ed95376613b9732f1026b4944 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Fri, 16 Aug 2024 10:03:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E9=80=BB=E8=BE=91=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmSettings/equipmentAlarm/configureDeviceAlarms.vue   | 5 ++++-
 .../equipmentAlarm/editConfigureDeviceAlarm.vue              | 3 ++-
 .../src/view/alarmManagement/gatewayAlarm/look.vue           | 4 ++--
 .../view/equipmentControl/components/doubleSingleModel.vue   | 4 ++--
 .../src/view/equipmentControl/electricDoor/index.vue         | 3 +++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index 9881856..ea2e97d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -242,12 +242,15 @@
                 dynamicParams: {
                   deviceCode: 'deviceInfoCode', //帮定上级联动数据
                 },
+                defaultParams: {
+                  type: 0,
+                },
                 componentProps: {
                   api: device.queryDevicePoint,
                   allowClear: true,
                   resultField: 'data',
                   placeholder: '请选择设备点位',
-                  labelField: 'code',
+                  labelField: 'name',
                   valueField: 'id',
                   dependency: 'deviceInfoCode',
                   showSearch: true,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index cfa4053..1b70726 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -217,13 +217,14 @@
   //获取设备点位
   const getDevicePoint = (value: any) => {
     devicePointData.value = [];
+    value.type = 0;
     http.post(device.queryDevicePoint, value).then((res) => {
       if (res.msg === 'success') {
         res.data.forEach((item: any) => {
           //显示格式
           devicePointData.value.push({
             value: item.id,
-            label: item.code + ' ( ' + item.unit + ' ) ',
+            label: item.name + ' ( ' + item.unit + ' ) ',
           });
         });
       }
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
index 90de931..70227bf 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
@@ -10,7 +10,7 @@
     @close="handleClose">
     <div style="width: 100%; height: 100%; overflow-y: auto; overflow-x: hidden">
       <!-- top -->
-      <div class="box">
+      <div class="boxstyle">
         <div class="card"></div>
         <div style="left: 25px; position: absolute; height: 35px; line-height: 35px">
           告警编号：{{ infoObject.alarmCode }}
@@ -271,7 +271,7 @@
   });
 </script>
 <style scoped lang="less">
-  .box {
+  .boxstyle {
     width: 100%;
     height: 35px;
     display: flex;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
index 066911c..6653f59 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue
@@ -1,6 +1,6 @@
 <!-- 双图 -->
 <template>
-  <div class="box">
+  <div class="boxs">
     <div class="box-title title">
       {{ dataSource.title }}
     </div>
@@ -88,7 +88,7 @@
   };
 </script>
 <style lang="less" scoped>
-  .box {
+  .boxs {
     width: 192px;
     height: 125px;
     background: inherit;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
index 3b2b72c..d9a5e28 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
@@ -343,4 +343,7 @@
   :deep(.ant-tabs) {
     overflow-y: auto !important;
   }
+  :deep(.ant-empty-description) {
+    color: white !important;
+  }
 </style>