Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/api/electricDoor.ts

@@ -1,6 +1,6 @@
 import { BASE_URL } from './index';
 
 export enum electricDoorApi {
-  getDeviceState = `${BASE_URL}/eleDoorCtrl/getDeviceState`, // 查询设备最新状态
+  getDeviceState = `${BASE_URL}/api/eleDoorCtrl/getDeviceState`, // 查询设备最新状态
-  getDeviceRecordList = `${BASE_URL}/eleDoorCtrl/getDeviceRecordList`, // 查询设备日志列表
+  getDeviceRecordList = `${BASE_URL}/api/eleDoorCtrl/getDeviceRecordList`, // 查询设备日志列表
 }

hx-ai-intelligent/src/api/liftSystem.ts

@@ -1,6 +1,6 @@
 import { BASE_URL } from './index';
 
 export enum liftSystemApi {
-  getDeviceState = `${BASE_URL}/elevatorCtrl/getDeviceState`, // 查询设备最新状态
+  getDeviceState = `${BASE_URL}/api/elevatorCtrl/getDeviceState`, // 查询设备最新状态
-  getDeviceRecordList = `${BASE_URL}/elevatorCtrl/getDeviceRecordList`, // 查询设备日志列表
+  getDeviceRecordList = `${BASE_URL}/api/elevatorCtrl/getDeviceRecordList`, // 查询设备日志列表
 }

hx-ai-intelligent/src/components/ns-steps.vue

@@ -12,12 +12,12 @@
               <a-tag
                 class="card-title-tag"
                 :style="{
-                  background: item.bgColor,
+                  'background-color': item.bgColor,
                   border: '1px solid ' + item.color,
                   color: item.color,
                 }"
-                >{{ item.stateName }}</a-tag
+                >{{ item.stateName }}
-              >
+              </a-tag>
               <div class="time">{{ item.createTime }}</div>
             </div>
             <div

hx-ai-intelligent/src/icon/baocun.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="20px" height="20px" xmlns="http://www.w3.org/2000/svg">
   <g transform="matrix(1 0 0 1 -320 -9 )">
-    <path d="M 5.72142857421875 4.29571427734375  L 5.72142857421875 0.0171428515625  L 10 0.0171428515625  L 10 4.29571427734375  L 5.72142857421875 4.29571427734375  Z M 14.564285722656251 0.3028571484375  L 19.84 5.57857142578125  C 19.9828571484375 5.57857142578125  19.9828571484375 5.864285703125001  20 6.0071428515625005  L 20 19.27  C 19.9828571484375 19.69857142578125  19.697142871093753 19.98428572265625  19.27 20  L 0.73 20  C 0.30142857421874997 19.98428572265625  0.015714277343749916 19.6985714453125  0 19.27  L 0 0.73  C 0.015714277343749916 0.30142857421874997  0.30142855468749996 0.015714277343749916  0.73 0.015714277343749916  L 4.29571427734375 0.015714277343749916  L 4.29571427734375 5.72142857421875  L 11.42571427734375 5.72142857421875  L 11.42571427734375 0.0171428515625  L 13.992857148437501 0.0171428515625  C 14.135714296875001 0.0171428515625  14.421428574218751 0.16  14.564285722656251 0.3028571484375  Z M 4.29571427734375 15.70428572265625  L 15.70428572265625 15.704285722656248  L 15.70428572265625 10  L 4.29571427734375 10  L 4.29571427734375 15.70428572265625  Z " fill-rule="nonzero" fill="#ff7602" stroke="none" transform="matrix(1 0 0 1 320 9 )" />
+    <path d="M 5.72142857421875 4.29571427734375  L 5.72142857421875 0.0171428515625  L 10 0.0171428515625  L 10 4.29571427734375  L 5.72142857421875 4.29571427734375  Z M 14.564285722656251 0.3028571484375  L 19.84 5.57857142578125  C 19.9828571484375 5.57857142578125  19.9828571484375 5.864285703125001  20 6.0071428515625005  L 20 19.27  C 19.9828571484375 19.69857142578125  19.697142871093753 19.98428572265625  19.27 20  L 0.73 20  C 0.30142857421874997 19.98428572265625  0.015714277343749916 19.6985714453125  0 19.27  L 0 0.73  C 0.015714277343749916 0.30142857421874997  0.30142855468749996 0.015714277343749916  0.73 0.015714277343749916  L 4.29571427734375 0.015714277343749916  L 4.29571427734375 5.72142857421875  L 11.42571427734375 5.72142857421875  L 11.42571427734375 0.0171428515625  L 13.992857148437501 0.0171428515625  C 14.135714296875001 0.0171428515625  14.421428574218751 0.16  14.564285722656251 0.3028571484375  Z M 4.29571427734375 15.70428572265625  L 15.70428572265625 15.704285722656248  L 15.70428572265625 10  L 4.29571427734375 10  L 4.29571427734375 15.70428572265625  Z " fill-rule="nonzero" fill="rgba(67, 136, 251, 1)" stroke="none" transform="matrix(1 0 0 1 320 9 )" />
   </g>
 </svg>

hx-ai-intelligent/src/icon/bianji.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="20px" height="20px" xmlns="http://www.w3.org/2000/svg">
   <g transform="matrix(1 0 0 1 -320 -9 )">
-    <path d="M 17.482232142857143 6.05310267857143  L 7.481830357142856 16.053526785714283  L 3.946339285714287 12.518035714285713  L 13.946741071428567 2.5176116071428565  L 17.482232142857143 6.05310267857143  Z M 2.8571428571428568 17.142857142857142  L 2.8571428571428568 13.607142857142856  L 6.392857142857144 17.142857142857142  L 2.8571428571428568 17.142857142857142  Z M 18.013392857142858 0.4017857142857143  L 19.598214285714285 1.9866071428571428  C 20.133928571428573 2.5223214285714284  20.133928571428573 3.3995535714285703  19.598214285714285 3.937500000000002  L 18.55357142857143 4.982142857142853  L 15.017857142857142 1.4464285714285705  L 16.062499999999996 0.4017857142857143  C 16.598214285714285 -0.13392857142857142  17.47544642857143 -0.13392857142857142  18.013392857142858 0.4017857142857143  Z M 0 15.714285714285714  L 1.4285714285714284 15.714285714285714  L 1.4285714285714284 18.571428571424978  L 1.4285714285714284 20  L 0 20  L 0 15.714285714285714  Z M 18.571428571428573 20  L 1.4285714285714284 20  L 1.4285714285714284 18.571428571428573  L 18.571428571428573 18.571428571428573  L 18.571428571428573 20  Z M 20 15.714285714285714  L 20 20  L 18.571428571428573 20  L 18.571428571428573 15.714285714285714  L 20 15.714285714285714  Z " fill-rule="nonzero" fill="#ff7602" stroke="none" transform="matrix(1 0 0 1 320 9 )" />
+    <path d="M 17.482232142857143 6.05310267857143  L 7.481830357142856 16.053526785714283  L 3.946339285714287 12.518035714285713  L 13.946741071428567 2.5176116071428565  L 17.482232142857143 6.05310267857143  Z M 2.8571428571428568 17.142857142857142  L 2.8571428571428568 13.607142857142856  L 6.392857142857144 17.142857142857142  L 2.8571428571428568 17.142857142857142  Z M 18.013392857142858 0.4017857142857143  L 19.598214285714285 1.9866071428571428  C 20.133928571428573 2.5223214285714284  20.133928571428573 3.3995535714285703  19.598214285714285 3.937500000000002  L 18.55357142857143 4.982142857142853  L 15.017857142857142 1.4464285714285705  L 16.062499999999996 0.4017857142857143  C 16.598214285714285 -0.13392857142857142  17.47544642857143 -0.13392857142857142  18.013392857142858 0.4017857142857143  Z M 0 15.714285714285714  L 1.4285714285714284 15.714285714285714  L 1.4285714285714284 18.571428571424978  L 1.4285714285714284 20  L 0 20  L 0 15.714285714285714  Z M 18.571428571428573 20  L 1.4285714285714284 20  L 1.4285714285714284 18.571428571428573  L 18.571428571428573 18.571428571428573  L 18.571428571428573 20  Z M 20 15.714285714285714  L 20 20  L 18.571428571428573 20  L 18.571428571428573 15.714285714285714  L 20 15.714285714285714  Z " fill-rule="nonzero" fill="rgba(67, 136, 251, 1)" stroke="none" transform="matrix(1 0 0 1 320 9 )" />
   </g>
 </svg>

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue

@@ -98,7 +98,7 @@
               <span class="title-name" style="line-height: 32px">{{ `逻辑${index}:` }}</span>
               <a-select
                 v-model:value="infoObject.alarmList[index - 1].logic"
-                style="width: 110px; margin-left: 12px"
+                style="width: 110px; margin-left: 16px"
                 placeholder="请选择逻辑"
                 :options="logicEnum" />
               <span class="title-name" style="line-height: 32px; margin-left: 32px">{{
@@ -133,7 +133,7 @@
                   margin-left: 16px;
                 "
                 @click="deleteAlarmList(index - 1)">
-                <img style="width: 16px" src="../../../../../src/icon/del.png" />
+                <img style="width: 17px" src="../../../../../src/icon/del.png" />
               </div>
             </div>
             <div

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue

@@ -144,7 +144,7 @@
                   margin-left: 16px;
                 "
                 @click="deleteAlarmList(index - 1)">
-                <img style="width: 16px" src="../../../../../src/icon/del.png" />
+                <img style="width: 17px" src="../../../../../src/icon/del.png" />
               </div>
             </div>
             <div
@@ -549,7 +549,6 @@
     line-height: 21px;
     color: rgba(51, 51, 51, 1);
     margin-bottom: 24px;
-    margin-left: 24px;
   }
   .blue-background.ant-switch-checked {
     background-color: linear-gradient(

hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue

@@ -214,11 +214,27 @@
         {
           type: 'slider',
           // backgroundColor: 'yellow',
-          // fillerColor: 'yellow',
+          fillerColor: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            1,
+            0,
+            [
+              {
+                offset: 0,
+                color: 'rgba(97, 134, 255, 1)',
+              },
+              {
+                offset: 1,
+                color: 'rgba(36, 186, 255, 1)',
+              },
+            ],
+            false,
+          ),
           height: 12, // 设置slider的高度为15
           start: 0,
           end: 100,
-          right: 11,
+          right: 13,
           left: 10,
           bottom: 10,
           handleIcon:
@@ -226,9 +242,41 @@
           handleSize: '140%', // 放大按钮
           // borderColor: 'none',
           handleStyle: {
-            // color: 'red',
+            color: new echarts.graphic.LinearGradient(
-            // shadowBlur: 6,
+              0,
-            // shadowColor: 'yellow',
+              0,
+              1,
+              0,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(97, 134, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(36, 186, 255, 1)',
+                },
+              ],
+              false,
+            ),
+            borderWidth: 4,
+            borderColor: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(255, 255, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(204, 238, 255, 1)',
+                },
+              ],
+              false,
+            ),
             shadowOffsetX: 0, // 阴影偏移x轴多少
             shadowOffsetY: 0, // 阴影偏移y轴多少
           },

hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue

@@ -32,7 +32,7 @@
                 placeholder="请输入异常描述"
                 :disabled="showEdit"
                 style="width: 85%"
-                :autoSize="{ minRows: 4, maxRows: 4 }" />
+                :autoSize="{ minRows: 9, maxRows: 9 }" />
             </a-form-item>
           </a-form>
         </div>
@@ -158,9 +158,10 @@
               logList.value.forEach((item) => {
                 item.stateName = item.state.label;
                 item.color = colorMap[item.state.value];
-                item.bgColor = bgColorMap[item.state];
+                item.bgColor = bgColorMap[item.state.value];
                 item.src = 'state-' + item.state.value;
               });
+              console.log(logList.value);
               config.value.dataSource = logList.value;
             }
           });

hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue

@@ -213,11 +213,27 @@
         {
           type: 'slider',
           // backgroundColor: 'yellow',
-          // fillerColor: 'yellow',
+          fillerColor: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            1,
+            0,
+            [
+              {
+                offset: 0,
+                color: 'rgba(97, 134, 255, 1)',
+              },
+              {
+                offset: 1,
+                color: 'rgba(36, 186, 255, 1)',
+              },
+            ],
+            false,
+          ),
           height: 12, // 设置slider的高度为15
           start: 0,
           end: 100,
-          right: 10,
+          right: 13,
           left: 10,
           bottom: 10,
           handleIcon:
@@ -225,9 +241,41 @@
           handleSize: '140%', // 放大按钮
           // borderColor: 'none',
           handleStyle: {
-            // color: 'red',
+            color: new echarts.graphic.LinearGradient(
-            // shadowBlur: 6,
+              0,
-            // shadowColor: 'yellow',
+              0,
+              1,
+              0,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(97, 134, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(36, 186, 255, 1)',
+                },
+              ],
+              false,
+            ),
+            borderWidth: 4,
+            borderColor: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(255, 255, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(204, 238, 255, 1)',
+                },
+              ],
+              false,
+            ),
             shadowOffsetX: 0, // 阴影偏移x轴多少
             shadowOffsetY: 0, // 阴影偏移y轴多少
           },

hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue

@@ -159,7 +159,7 @@
               logList.value.forEach((item) => {
                 item.stateName = item.state.label;
                 item.color = colorMap[item.state.value];
-                item.bgColor = bgColorMap[item.state];
+                item.bgColor = bgColorMap[item.state.value];
                 item.src = 'state-' + item.state.value;
               });
               config.value.dataSource = logList.value;

hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue

@@ -201,19 +201,70 @@
         {
           type: 'slider',
           // backgroundColor: 'yellow',
-          // fillerColor: 'yellow',
+          fillerColor: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            1,
+            0,
+            [
+              {
+                offset: 0,
+                color: 'rgba(97, 134, 255, 1)',
+              },
+              {
+                offset: 1,
+                color: 'rgba(36, 186, 255, 1)',
+              },
+            ],
+            false,
+          ),
           height: 12, // 设置slider的高度为15
           start: 0,
           end: 100,
-          right: 11,
+          right: 12,
           left: 10,
-          bottom: 10,
+          bottom: 12,
           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',
+            color: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              1,
+              0,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(97, 134, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(36, 186, 255, 1)',
+                },
+              ],
+              false,
+            ),
+            borderWidth: 4,
+            borderColor: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(255, 255, 255, 1)',
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(204, 238, 255, 1)',
+                },
+              ],
+              false,
+            ),
+            boxShadow: ' 0px 3px 6px  rgba(36, 62, 146, 0.3)',
             // shadowBlur: 6,
             // shadowColor: 'yellow',
             shadowOffsetX: 0, // 阴影偏移x轴多少
@@ -261,9 +312,9 @@
           areaStyle: {
             normal: {
               color: new echarts.graphic.LinearGradient(
+                1,
                 0,
-                0,
+                1,
-                0,
                 1,
                 [
                   {