From 1f0eca56aeb972bf07cd85d9c786eb130daa1455 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Wed, 14 Aug 2024 09:24:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E6=80=BB=E8=A7=88=20=E6=BB=91=E5=9D=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/alarmManagement/alarmOverview/index.vue   | 40 +++++++++++++++++++---
 .../energyAlarm/editConfigureEnergyAlarm.vue       |  1 -
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
index 0219bf8..1b2f0ab 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
@@ -282,13 +282,45 @@
           },
         },
       ],
+      //滑块样式
       dataZoom: [
         {
-          height: 12,
+          type: 'inside',
           start: 0,
           end: 100,
-          handleSize: '300%', // 设置滑块的大小
-          bottom: 15,
+        },
+        {
+          type: 'slider',
+          // backgroundColor: 'yellow',
+          // fillerColor: 'yellow',
+          height: 12, // 设置slider的高度为15
+          start: 0,
+          end: 100,
+          right: 60,
+          left: 60,
+          bottom: 10,
+          handleIcon:
+            'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5M36.9,35.8h-1.3z M27.8,35.8 h-1.3H27L27.8,35.8L27.8,35.8z', // 使用类似 axisPointer 的图标
+          handleSize: '140%', // 放大按钮
+          borderColor: 'none',
+          handleStyle: {
+            // color: 'red',
+            // shadowBlur: 6,
+            // shadowColor: 'yellow',
+            shadowOffsetX: 0, // 阴影偏移x轴多少
+            shadowOffsetY: 0, // 阴影偏移y轴多少
+          },
+          // 显示的label的格式化器
+          // 20050101 变为 2005\n0101
+          // labelFormatter: function (index, value) {
+          //   const year = value.slice(0, 4);
+          //   const date = value.slice(4);
+          //   return year + '\n' + date;
+          // },
+          // textStyle: {
+          //   fontStyle: 'italic', // 设置字体倾斜
+          // },
+          showDataShadow: false, // 隐藏数据阴影
         },
       ],
       series: [
@@ -678,7 +710,7 @@
               font-weight: 400;
               font-family: 'Arial Negreta', 'Arial Normal', 'Arial', sans-serif;
               font-style: normal;
-              font-size: 40px;
+              font-size: 30px;
             }
           }
           .item-box-right {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
index b83339b..7431126 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -357,7 +357,6 @@
     site: [{ required: true, message: '请选择站点', trigger: 'change' }],
     dataSources: [{ required: true, message: '请选择设备类型', trigger: 'change' }],
     deviceNode: [{ required: true, message: '请选择设备名称', trigger: 'change' }],
-    sbAdress: [{ required: true, message: '请选择设备点位', trigger: 'change' }],
     comparisonType: [{ required: true, message: '请选择对比类型', trigger: 'change' }],
     ruleType: [{ required: true, message: '请选择规则类型', trigger: 'change' }],
     abnormalDescription: [