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

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

@@ -1,5 +1,7 @@
+import { BASE_URL } from './index';
+
 export enum planToAddApi {
-  getActivatedPlanTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanTree', //计划树
+  getActivatedPlanTree = `${BASE_URL}/api/deviceCtrlPlan/getActivatedPlanTree`, //计划树
-  getActivatedPlanListByTree = '/carbon-smart/deviceCtrlPlan/getActivatedPlanListByTree', //计划列表
+  getActivatedPlanListByTree = `${BASE_URL}/api/deviceCtrlPlan/getActivatedPlanListByTree`, //计划列表
-  updPlan = '/carbon-smart/deviceCtrlPlan/updateActivatedPlan', //修改计划
+  updPlan = `${BASE_URL}/api/deviceCtrlPlan/updateActivatedPlan`, //修改计划
 }

hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue

@@ -190,28 +190,17 @@
           type: 'shadow',
         },
         formatter: function (params: any) {
-          let res =
+          console.log(params, '错误');
-            params[0].axisValue +
+          if (params.length > 0) {
-            '<br/>' +
+            let res = params[0].axisValue + '<br/>';
-            params[0].marker +
+            params.forEach((item: any) => {
-            '    ' +
+              if (item.seriesName !== '总数') {
-            params[0].seriesName +
+                res = res + item.marker + '    ' + item.seriesName + '  :  ' + item.data + '<br/>';
-            '  :  ' +
+              }
-            params[0].data +
+            });
-            '<br/>' +
+            return res;
-            params[1].marker +
+          }
-            '    ' +
+          return '';
-            params[1].seriesName +
-            ' :  ' +
-            params[1].data +
-            '<br/>' +
-            params[2].marker +
-            '    ' +
-            params[2].seriesName +
-            '  :  ' +
-            params[2].data +
-            '<br/>';
-          return res;
         },
       },
       grid: {
@@ -285,14 +274,25 @@
       //滑块样式
       dataZoom: [
         {
-          type: 'inside',
-          start: 0,
-          end: 100,
-        },
-        {
           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,
@@ -304,9 +304,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轴多少
           },