From ece2712b09b213a402ef6bc6a305bc72152ee431 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Wed, 21 Aug 2024 13:35:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B9=E6=8D=AEui=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/components/ns-steps.vue          | 15 ++++++++-------
 hx-ai-intelligent/src/icon/state-1.svg                 | 10 +++++-----
 hx-ai-intelligent/src/icon/state-2.svg                 | 12 +++++++-----
 hx-ai-intelligent/src/icon/state-3.svg                 | 14 +++++++++-----
 hx-ai-intelligent/src/icon/state-4.svg                 | 11 ++++++-----
 hx-ai-intelligent/src/icon/state-5.svg                 | 15 ++++++++++-----
 .../energyAlarm/editConfigureEnergyAlarm.vue           | 14 ++++++++++++--
 .../equipmentAlarm/editConfigureDeviceAlarm.vue        | 14 ++++++++++++--
 .../equipmentAlarm/editeEquipmentAlarm.vue             | 18 +++++++++++++++++-
 .../alarmSettings/notificationManagement/index.vue     |  2 +-
 .../src/view/alarmManagement/energyAlarm/status.vue    | 16 ++++++++--------
 .../src/view/alarmManagement/equipmentAlarm/status.vue | 16 ++++++++--------
 .../src/view/alarmManagement/gatewayAlarm/status.vue   | 16 ++++++++--------
 .../src/view/equipmentControl/liftSystem/liftPage.vue  |  4 ++--
 14 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue
index 1ee3302..cfd2472 100644
--- a/hx-ai-intelligent/src/components/ns-steps.vue
+++ b/hx-ai-intelligent/src/components/ns-steps.vue
@@ -3,7 +3,7 @@
     <template v-for="(item, index) in dataSource" :key="index">
       <a-step title="">
         <template #icon>
-          <ns-icon size="20" :name="item.src" />
+          <ns-icon size="24" :name="item.src" />
         </template>
         <template #description>
           <div class="card">
@@ -24,8 +24,8 @@
               style="
                 width: 100%;
                 color: rgba(0, 0, 0, 0.45);
-                height: 27px;
-                overflow: auto;
+                max-height: 35px;
+                overflow-y: scroll;
                 padding: 7px 0px;
               ">
               {{ item.remarks }}</div
@@ -57,8 +57,8 @@
   }
   .card {
     width: 450px;
-    min-height: 0px;
-    background: rgba(191, 205, 226, 0.3);
+    height: 90px;
+    background: rgba(191, 205, 226, 0.1);
     border-radius: 4px; /* 设置圆角半径 */
     padding: 12px;
     margin-left: 8px;
@@ -73,6 +73,7 @@
         text-align: center;
         line-height: 24px;
         margin-left: 12px;
+        font-size: 12px;
       }
     }
   }
@@ -90,10 +91,10 @@
   }
   :deep(.ant-steps-item-tail) {
     position: absolute !important;
-    top: -10px !important;
+    // top: -10px !important;
     left: 16px !important;
     width: 1px !important;
-    height: 150% !important;
+    height: 120% !important;
   }
   :deep(.ant-steps-item) {
     margin-top: 20px !important;
diff --git a/hx-ai-intelligent/src/icon/state-1.svg b/hx-ai-intelligent/src/icon/state-1.svg
index d05487a..10256fd 100644
--- a/hx-ai-intelligent/src/icon/state-1.svg
+++ b/hx-ai-intelligent/src/icon/state-1.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -366 )">
-    <path d="M 8.03885714285714 0.641142857142857  L 8.03885714285714 0.64  C 12.1181901007502 0.64  15.4251428571429 3.94695275639267  15.4251428571429 8.02628571428571  C 15.4251430928625 8.02704758957974  15.4251432107223 8.02780946489393  15.4251432107223 8.02857134022442  C 15.4251432107223 12.1085354806887  12.117678779758 15.415999911653  8.03771463929375 15.415999911653  C 3.95775049882947 15.415999911653  0.650286067865178 12.1085354806887  0.650286067865178 8.02857134022442  C 0.650286067865178 3.94860719976014  3.95775049882947 0.64114276879585  8.03771463929375 0.64114276879585  C 8.03809547381657 0.64114276879585  8.03847630833888 0.641142798244853  8.03885714285714 0.641142857142857  Z M 8 6.85714285714286  C 7.36881742876481 6.85714285714286  6.85714285714286 7.36881742876481  6.85714285714286 8  C 6.85714285714286 8.63118257123519  7.36881742876481 9.14285714285714  8 9.14285714285714  C 8.63118257123519 9.14285714285714  9.14285714285714 8.63118257123519  9.14285714285714 8  C 9.14285714285714 7.36881742876481  8.63118257123519 6.85714285714286  8 6.85714285714286  Z M 11.4285714285714 6.85714285714286  C 10.7973888573362 6.85714285714286  10.2857142857143 7.36881742876481  10.2857142857143 8  C 10.2857142857143 8.63118257123519  10.7973888573362 9.14285714285714  11.4285714285714 9.14285714285714  C 12.0597539998066 9.14285714285714  12.5714285714286 8.63118257123519  12.5714285714286 8  C 12.5714285714286 7.36881742876481  12.0597539998066 6.85714285714286  11.4285714285714 6.85714285714286  Z M 4.57142857142857 6.85714285714286  C 3.94024600019338 6.85714285714286  3.42857142857143 7.36881742876481  3.42857142857143 8  C 3.42857142857143 8.63118257123519  3.94024600019338 9.14285714285714  4.57142857142857 9.14285714285714  C 5.20261114266376 9.14285714285714  5.71428571428571 8.63118257123519  5.71428571428571 8  C 5.71428571428571 7.36881742876481  5.20261114266376 6.85714285714286  4.57142857142857 6.85714285714286  Z " fill-rule="nonzero" fill="#ff7602" stroke="none" transform="matrix(1 0 0 1 305 366 )" />
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Icon_Steps-Finished" transform="translate(0)">
+    <path id="Icon_Steps-Finished-4" d="M3.514,20.485A12,12,0,1,1,12,24a12,12,0,0,1-8.486-3.515Z" fill="#ffbc46"/>
+    <path id="路径_31098" data-name="路径 31098" d="M225.3,439.926a1.3,1.3,0,1,1,1.3-1.3A1.3,1.3,0,0,1,225.3,439.926Zm3.7,0a1.3,1.3,0,1,1,1.3-1.3A1.3,1.3,0,0,1,229,439.926Zm3.7,0a1.3,1.3,0,1,1,1.3-1.3A1.3,1.3,0,0,1,232.7,439.926Z" transform="translate(-217 -426.334)" fill="#fff"/>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/hx-ai-intelligent/src/icon/state-2.svg b/hx-ai-intelligent/src/icon/state-2.svg
index 7ded55c..805a9ed 100644
--- a/hx-ai-intelligent/src/icon/state-2.svg
+++ b/hx-ai-intelligent/src/icon/state-2.svg
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -340 )">
-    <path d="M 15.52 8  C 15.52 3.848  12.152 0.48  8 0.48  C 3.848 0.48  0.48 3.848  0.48 8  C 0.48 12.152  3.848 15.52  8 15.52  C 12.152 15.52  15.52 12.152  15.52 8  Z M 11.608 9.256  C 11.84 9.368  11.936 9.648  11.832 9.88  C 11.72 10.112  11.44 10.216  11.208 10.104  L 7.8 8.48  C 7.632 8.392  7.52 8.216  7.512 8.024  L 7.512 2.648  C 7.512 2.392  7.72 2.176  7.984 2.176  C 8.24 2.176  8.456 2.384  8.456 2.648  L 8.456 7.752  L 11.608 9.256  Z " fill-rule="nonzero" fill="#009de1" stroke="none" transform="matrix(1 0 0 1 305 340 )" />
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Icon_Steps-Finished" transform="translate(0)">
+    <g id="组_24421" data-name="组 24421">
+      <path id="Icon_Steps-Finished-4" d="M3.514,20.485A12,12,0,1,1,12,24a12,12,0,0,1-8.486-3.515Z" fill="#4388fb"/>
+      <path id="路径_31096" data-name="路径 31096" d="M19.464,12.806l3.912,3.153a.447.447,0,0,1,.156.606l0,.007a.438.438,0,0,1-.606.156l-4.11-3.273a.539.539,0,0,1-.241-.419V7.018a.447.447,0,0,1,.893,0v5.788Z" transform="translate(-7.735 -0.446)" fill="#fff"/>
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/hx-ai-intelligent/src/icon/state-3.svg b/hx-ai-intelligent/src/icon/state-3.svg
index 5e24ea9..c28115e 100644
--- a/hx-ai-intelligent/src/icon/state-3.svg
+++ b/hx-ai-intelligent/src/icon/state-3.svg
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -264 )">
-    <path d="M 12.8044865917969 12.8044945019531  C 15.7317833056641 9.87949759277344  15.7317833056641 5.12019596191406  12.8044865917969 2.19521370117188  C 11.3984961283515 0.787326048146557  9.48966705506673 -0.00260805552580251  7.4999560546875 3.046875E-05  C 5.50996955094545 -0.00406567496305449  3.60061659376305 0.786091774555939  2.19546946289063 2.19521370117188  C -0.731548930664062 5.12021061035156  -0.731548930664062 9.87951224121094  2.19546946289063 12.8044945019531  C 3.60067093003941 14.2135352022771  5.50998850312976 15.0036780086136  7.4999560546875 14.999677734375  C 9.49029165514025 15.0054765279533  11.4002873723065 14.2150596299848  12.8044865917969 12.8044945019531  Z M 11.9376369140625 5.54019552246094  L 6.89940004394531 10.9003754150391  C 6.87578802320076 10.9269018017654  6.84623229984903 10.9474623058395  6.81315013183594 10.9603753564453  C 6.78748609863281 10.9776751464844  6.77046462890625 10.9949895849609  6.73585041503906 11.003060859375  C 6.67362025830789 11.0304200226738  6.60651003916783 11.0449431326059  6.53853616699219 11.0457610107422  C 6.47426031328986 11.0436752198275  6.41062363711127 11.0323076485925  6.34960082519531 11.0120110400391  L 6.28960088378906 10.9773821777344  C 6.25364523541476 10.9604965742554  6.21927871922921 10.9404159360992  6.18691545410156 10.9173822363281  L 3.30259719726562 8.07866452148437  C 3.20194835437246 7.98256406662991  3.14591207112094 7.8488594603371  3.14796845214844 7.70971472167969  C 3.14796845214844 7.57240041503906  3.20046839355469 7.43510075683594  3.29421830566406 7.34076490722656  C 3.50055541080613 7.14332002945278  3.8257661663423 7.14332002945278  4.03210327148437 7.34076490722656  L 6.52210063476562 9.79326232910156  L 11.1824668212891 4.83721775390625  C 11.3839239859071 4.63706235688665  11.705600292055 4.62599539544477  11.9203371386719 4.81183204101562  C 12.0250169736047 4.90583460723342  12.0845359910269 5.04009087589488  12.0839014160156 5.18078184082031  C 12.0834323759743 5.31515796660418  12.0310295272497 5.44414958696638  11.9376515625 5.54078145996094  Z " fill-rule="nonzero" fill="#04d719" stroke="none" transform="matrix(1 0 0 1 305 264 )" />
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Icon_Steps-Finished" transform="translate(-4 -12)">
+    <g id="组_24268" data-name="组 24268" transform="translate(4 9)">
+      <g id="组_24419" data-name="组 24419">
+        <path id="Icon_Steps-Finished-4" d="M3.514,20.485A12,12,0,1,1,12,24a12,12,0,0,1-8.486-3.515Z" transform="translate(0 3)" fill="#29c49a"/>
+        <path id="路径_31093" data-name="路径 31093" d="M159.008,253.348a.47.47,0,0,0-.665.022l-6.257,6.679-3.244-2.726a.471.471,0,1,0-.606.721l3.585,3.012a.471.471,0,0,0,.647-.039l6.562-7A.471.471,0,0,0,159.008,253.348Z" transform="translate(-141.607 -242.194)" fill="#fff"/>
+      </g>
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/hx-ai-intelligent/src/icon/state-4.svg b/hx-ai-intelligent/src/icon/state-4.svg
index 3dcdc39..246e17f 100644
--- a/hx-ai-intelligent/src/icon/state-4.svg
+++ b/hx-ai-intelligent/src/icon/state-4.svg
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -315 )">
-    <path d="M 15 7.5  C 15 3.358125  11.641875 0  7.5 0  C 3.358125 0  0 3.358125  0 7.5  C 0 11.641875  3.358125 15  7.5 15  C 11.641875 15  15 11.641875  15 7.5  Z M 6.96437500488281 8.4375  L 6.96437500488281 3.8840625  C 6.96454594411788 3.81021458429416  7.02427767945776 3.75034328445354  7.09812499511719 3.75  L 7.90187500488281 3.75  C 7.97572232054224 3.75034328445354  8.03545405588212 3.81021458429416  8.03562499511719 3.8840625  L 8.03562499511719 8.4375  C 8.03545405588212 8.51134791570584  7.97572232054224 8.57121921554647  7.90187500488281 8.5715625  L 7.09812499511719 8.5715625  C 7.02427767945776 8.57121921554647  6.96454594411788 8.51134791570584  6.96437500488281 8.4375  Z M 7.5 11.25  C 7.05616214821327 11.2499137187178  6.69640622993007 10.8900878577318  6.69640622993007 10.4462499975586  C 6.69640622993007 10.0023511201461  7.05625737014613 9.64249997993007  7.50015624755859 9.64249997993007  C 7.94415034690392 9.64258627639936  8.30390626518712 10.0024121373854  8.30390626518712 10.4462499975586  C 8.30390626518712 10.8901488749711  7.94405512497106 11.2500000151871  7.50015624755859 11.2500000151871  Z " fill-rule="nonzero" fill="#d8001b" stroke="none" transform="matrix(1 0 0 1 305 315 )" />
+<svg xmlns="http://www.w3.org/2000/svg" width="25.002" height="25.002" viewBox="0 0 25.002 25.002">
+  <g id="Icon_Steps-Finished" transform="translate(0.501 0.501)">
+    <g id="组_24426" data-name="组 24426">
+      <path id="减去_1097" data-name="减去 1097" d="M-12233,477a11.923,11.923,0,0,1-8.485-3.516A11.922,11.922,0,0,1-12245,465a11.922,11.922,0,0,1,3.516-8.486A11.921,11.921,0,0,1-12233,453a11.921,11.921,0,0,1,8.485,3.515A11.922,11.922,0,0,1-12221,465a11.922,11.922,0,0,1-3.516,8.486,11.941,11.941,0,0,1-3.894,2.6A11.934,11.934,0,0,1-12233,477Zm-.15-7.554a.851.851,0,0,0-.849.851.85.85,0,0,0,.849.848.85.85,0,0,0,.849-.848A.851.851,0,0,0-12233.15,469.447Zm0-11.448a.852.852,0,0,0-.852.851v7.687a.852.852,0,0,0,.852.851.851.851,0,0,0,.849-.851V458.85A.851.851,0,0,0-12233.147,458Z" transform="translate(12245 -453)" fill="#f36163" stroke="rgba(0,0,0,0)" stroke-miterlimit="10" stroke-width="1"/>
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/hx-ai-intelligent/src/icon/state-5.svg b/hx-ai-intelligent/src/icon/state-5.svg
index 08e2ae4..c94747b 100644
--- a/hx-ai-intelligent/src/icon/state-5.svg
+++ b/hx-ai-intelligent/src/icon/state-5.svg
@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -289 )">
-    <path d="M 14.8828125 7.5  C 14.8828125 3.42891475341797  11.571085246582 0.1171875  7.5 0.1171875  C 3.42942502441406 0.1171875  0.1171875 3.42891475341797  0.1171875 7.5  C 0.1171875 11.571085246582  3.42891475341797 14.8828125  7.5 14.8828125  C 11.5705749755859 14.8828125  14.8828125 11.571085246582  14.8828125 7.5  Z M 8.24725339416504 7.50209775695801  L 10.5116636334229 9.77390681030273  C 10.717328404541 9.98062045166015  10.7167897888184 10.3139079473877  10.5106147631836 10.5195727185059  C 10.4077965582275 10.6218806689453  10.2733136187744 10.6735590710449  10.1383204248047 10.6735590710449  C 10.0027886151123 10.6735590710449  9.86779542114258 10.6218806524658  9.76494885498047 10.5185238317871  L 7.49736364379883 8.24407840576172  L 5.22240794677735 10.4947965600586  C 5.11958974182129 10.5960556237793  4.98561707336426 10.6471954266357  4.85167274963379 10.6471954266357  C 4.71563066894531 10.6471954266357  4.58009887573242 10.5949784088135  4.47674203857422 10.490572701416  C 4.27212613769531 10.2833204443359  4.27371362365723 9.9500329486084  4.4809658972168 9.74490679321289  L 6.75328522155762 7.49736362731933  L 4.4893852532959 5.22609317321777  C 4.28372048217773 5.01988978637695  4.28425909790039 4.68609203613281  4.49043412353516 4.48042726501465  C 4.69663751037598 4.27422387817383  5.02989664489746 4.27530110961914  5.23610003173828 4.4814761352539  L 7.50314662719727 6.75538294555664  L 9.77810232421875 4.50469313598633  C 9.98481596557617 4.29956698059082  10.319152331543 4.30166472106934  10.5237682324219 4.5089169946289  C 10.7288943878174 4.71616925170898  10.7267966473389 5.04996700195312  10.5195443737793 5.25458290283203  L 8.24725339416504 7.50209775695801  Z " fill-rule="nonzero" fill="#a6a6a6" stroke="none" transform="matrix(1 0 0 1 305 289 )" />
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Icon_Steps-Finished" transform="translate(0)">
+    <g id="组_24421" data-name="组 24421">
+      <path id="Icon_Steps-Finished-4" d="M3.514,20.485A12,12,0,1,1,12,24a12,12,0,0,1-8.486-3.515Z" fill="#8d96a3"/>
+      <g id="组_24420" data-name="组 24420" transform="translate(-210.7 -210.688)">
+        <path id="路径_31094" data-name="路径 31094" d="M226.416,226.416a.483.483,0,0,1-.682,0l-6.894-6.894a.482.482,0,0,1,.682-.682l6.9,6.9A.483.483,0,0,1,226.416,226.416Z" transform="translate(0 -0.012)" fill="#fff"/>
+        <path id="路径_31095" data-name="路径 31095" d="M226.416,218.828a.483.483,0,0,1,0,.682l-6.894,6.894a.482.482,0,0,1-.682-.682l6.9-6.9A.483.483,0,0,1,226.416,218.828Z" transform="translate(0 0)" fill="#fff"/>
+      </g>
+    </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
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 b76c0d1..57bba33 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -104,10 +104,12 @@
               <span class="title-name" style="line-height: 32px; margin-left: 32px">{{
                 `数值${index}:`
               }}</span>
-              <a-input
+              <a-input-number
                 style="width: 110px; margin-left: 6px"
-                type="number"
                 placeholder="请输入数值"
+                :min="-99999999.99"
+                :max="99999999.99"
+                :precision="2"
                 v-model:value="infoObject.alarmList[index - 1].num" />
               <div
                 v-if="index > 1 && index === infoObject.alarmList?.length"
@@ -410,6 +412,14 @@
         return false;
       }
     }
+    const numSet = new Set();
+    for (const item of infoObject.value.alarmList) {
+      if (numSet.has(item.num)) {
+        NsMessage.error('请输入正确数值');
+        return false; // 如果 num 已经存在于 Set 中，说明有重复，返回 false
+      }
+      numSet.add(item.num); // 添加 num 到 Set 中
+    }
 
     if (infoObject.value.alarmList.length < 2) {
       NsMessage.error('请选择逻辑和数值');
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 fb9dc7a..705c3cc 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -115,10 +115,12 @@
               <span class="title-name" style="line-height: 32px; margin-left: 32px">{{
                 `数值${index}:`
               }}</span>
-              <a-input
+              <a-input-number
                 style="width: 110px; margin-left: 6px"
-                type="number"
                 placeholder="请输入数值"
+                :min="-99999999.99"
+                :max="99999999.99"
+                :precision="2"
                 v-model:value="infoObject.alarmList[index - 1].num" />
               <div
                 v-if="index > 1 && index === infoObject.alarmList?.length"
@@ -424,6 +426,14 @@
         return false;
       }
     }
+    const numSet = new Set();
+    for (const item of infoObject.value.alarmList) {
+      if (numSet.has(item.num)) {
+        NsMessage.error('请输入正确数值');
+        return false; // 如果 num 已经存在于 Set 中，说明有重复，返回 false
+      }
+      numSet.add(item.num); // 添加 num 到 Set 中
+    }
 
     if (infoObject.value.alarmList.length < 2) {
       NsMessage.error('请选择逻辑和数值');
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index b906d12..4a7558f 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -25,7 +25,11 @@
           @change="handleChangeAlarmFrequency" />
       </a-form-item>
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
-        <ns-input-number v-model:value="infoObject.repetitions" placeholder="请输入重复次数" />
+        <ns-input-number
+          v-model:value="infoObject.repetitions"
+          :min="0"
+          :max="99"
+          placeholder="请输入重复次数" />
       </a-form-item>
       <a-form-item
         v-if="infoObject.alarmFrequency === 2 || infoObject.alarmFrequency === 3"
@@ -34,6 +38,8 @@
         <ns-input-number
           style="width: 100%"
           v-model:value="infoObject.intervalDuration"
+          :min="0"
+          :max="99"
           placeholder="请输入间隔时长">
           <template #addonAfter>
             <a-select
@@ -49,6 +55,8 @@
         <ns-input-number
           allowClear
           style="width: 100%"
+          :min="0"
+          :max="999"
           v-model:value="infoObject.monitorTime"
           placeholder="请输入监测时长">
           <template #addonAfter>
@@ -357,6 +365,7 @@
     display: flex;
     justify-content: space-between;
   }
+
   .title {
     width: 200px;
     height: 22px;
@@ -370,6 +379,7 @@
     margin-bottom: 24px;
     margin-left: 24px;
   }
+
   .blue-background.ant-switch-checked {
     background-color: linear-gradient(
       180deg,
@@ -393,24 +403,30 @@
   .grey-background.ant-switch .ant-switch-handle {
     background-color: alarmSettings !important;
   }
+
   .ant-switch-checked {
     background-color: rgba(57, 215, 187, 1) !important;
   }
+
   :deep(.ant-form-item-label) {
     z-index: 20;
     text-align: right;
     width: 23%;
   }
+
   // 禁选时 选择框的样式
   :deep(.ant-radio-disabled .ant-radio-inner::after) {
     background-color: #2778ff !important;
   }
+
   :deep(.ant-radio-checked .ant-radio-inner) {
     border-color: #2778ff !important;
   }
+
   :deep(.ant-radio-inner) {
     background-color: white !important;
   }
+
   :deep(.ant-radio-disabled + span) {
     color: rgba(51, 51, 51, 1);
   }
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
index 296925f..fa6d564 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -49,7 +49,7 @@
             @click="clickSwitch" />
         </a-form-item>
       </a-form>
-      <div style="width: 100%; height: 765px; overflow-y: auto">
+      <div style="width: 100%; height: 640px; overflow-y: auto">
         <div style="margin-bottom: 8px; width: 100%; display: flex">
           <div
             style="
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
index 0f5af59..16a34fa 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
@@ -142,18 +142,18 @@
               infoObject.value = { ...logList.value[0] };
               infoObject.value.state = infoObject.value.state.value;
               let colorMap = {
-                1: 'rgba(191, 205, 226, 1)',
-                2: 'rgba(243, 97, 99, 1)',
+                1: 'rgba(255, 188, 70, 1)',
+                2: 'rgba(67, 136, 251, 1)',
                 3: 'rgba(41, 196, 154, 1)',
-                4: 'rgba(217, 0, 27,1)',
-                5: 'rgba(166, 166, 166,1)',
+                4: 'rgba(243, 97, 99, 1)',
+                5: 'rgba(141, 150, 163, 1)',
               };
               let bgColorMap = {
-                1: 'rgba(191, 205, 226, 0.1)',
-                2: 'rgba(243, 97, 99, 0.1)',
+                1: 'rgba(255, 188, 70, 0.1)',
+                2: 'rgba(67, 136, 251, 0.1)',
                 3: 'rgba(41, 196, 154, 0.1)',
-                4: 'rgba(217, 0, 27, 0.1)',
-                5: 'rgba(166, 166, 166,0.1)',
+                4: 'rgba(243, 97, 99, 0.1)',
+                5: 'rgba(141, 150, 163, 0.1)',
               };
               logList.value.forEach((item) => {
                 item.stateName = item.state.label;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index 4f8fdbe..6521421 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -143,18 +143,18 @@
               infoObject.value = { ...logList.value[0] };
               infoObject.value.state = infoObject.value.state.value;
               let colorMap = {
-                1: 'rgba(191, 205, 226, 1)',
-                2: 'rgba(243, 97, 99, 1)',
+                1: 'rgba(255, 188, 70, 1)',
+                2: 'rgba(67, 136, 251, 1)',
                 3: 'rgba(41, 196, 154, 1)',
-                4: 'rgba(217, 0, 27,1)',
-                5: 'rgba(166, 166, 166,1)',
+                4: 'rgba(243, 97, 99, 1)',
+                5: 'rgba(141, 150, 163, 1)',
               };
               let bgColorMap = {
-                1: 'rgba(191, 205, 226, 0.1)',
-                2: 'rgba(243, 97, 99, 0.1)',
+                1: 'rgba(255, 188, 70, 0.1)',
+                2: 'rgba(67, 136, 251, 0.1)',
                 3: 'rgba(41, 196, 154, 0.1)',
-                4: 'rgba(217, 0, 27, 0.1)',
-                5: 'rgba(166, 166, 166,0.1)',
+                4: 'rgba(243, 97, 99, 0.1)',
+                5: 'rgba(141, 150, 163, 0.1)',
               };
               logList.value.forEach((item) => {
                 item.stateName = item.state.label;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
index ff65aea..0cbeecd 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
@@ -60,18 +60,18 @@
           5: '已关闭',
         };
         let colorMap = {
-          1: 'rgba(191, 205, 226, 1)',
-          2: 'rgba(243, 97, 99, 1)',
+          1: 'rgba(255, 188, 70, 1)',
+          2: 'rgba(67, 136, 251, 1)',
           3: 'rgba(41, 196, 154, 1)',
-          4: 'rgba(217, 0, 27,1)',
-          5: 'rgba(166, 166, 166,1)',
+          4: 'rgba(243, 97, 99, 1)',
+          5: 'rgba(141, 150, 163, 1)',
         };
         let bgColorMap = {
-          1: 'rgba(191, 205, 226, 0.1)',
-          2: 'rgba(243, 97, 99, 0.1)',
+          1: 'rgba(255, 188, 70, 0.1)',
+          2: 'rgba(67, 136, 251, 0.1)',
           3: 'rgba(41, 196, 154, 0.1)',
-          4: 'rgba(217, 0, 27, 0.1)',
-          5: 'rgba(166, 166, 166,0.1)',
+          4: 'rgba(243, 97, 99, 0.1)',
+          5: 'rgba(141, 150, 163, 0.1)',
         };
         logList.value.forEach((item) => {
           item.stateName = stateMap[item.state];
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
index e5b7552..5eaf62c 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
@@ -250,10 +250,10 @@
     right: 0;
   }
   :deep(.ant-spin-container) {
-    height: 100% !important;
+    height: 95% !important;
   }
   :deep(.ant-spin-nested-loading) {
-    height: 100% !important;
+    height: 95% !important;
   }
   //分页 在右边 取消
   // :deep(.ant-table-pagination-right) {