11

psdc-ui/src/views/emonitor/db/index.vue

@@ -268,6 +268,7 @@ export default {
         myChart2 = echarts.init(document.getElementById("myEcharts2"));
         myChart2.setOption({
           title: {},
+          legend:{},
           tooltip: {
             trigger: "axis",
             show: true
@@ -365,6 +366,12 @@ export default {
             borderWidth: 1,
             borderColor: '#767da1',
           },
+          legend:{
+            data:['今日用电量'],
+            textStyle: {
+              color: "white" //标题的颜色
+            },
+          },
           textStyle:{
             color:'#BEC3DA'
           },
@@ -415,6 +422,22 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              markPoint: {
+                itemStyle: {
+                  normal: {
+                    label: {
+                      color: '#fff',
+                      // fontSize: 9
+                      // borderColor: '#000',
+                      // borderWidth: 1,
+                    }
+                  }
+                },
+                data: [
+                  {type: "max", name: "最大值"},
+                  {type: "min", name: "最小值"}
+                ]
+              },
             },
           ],
         });

psdc-ui/src/views/system/cl/index.vue

@@ -413,28 +413,17 @@ function submitForm() {
         timingForm.sceneName='',
         timingForm.sceneRemark='',
         timingForm.deviceVos=[]
+    data.checkedSblb=[];
+    data.isIndeterminate=false
+    open.value = false;
+    data.sblb.map(item => {
+      item.controlKey.map(temp => {
+        temp.value = '';
+      });
+    });
   })
-  data.checkedSblb=[];
-  data.isIndeterminate=false
-  open.value = false;
 };
 function cancel() {
-  let tempCheckedSblb = [];
-  data.checkedSblb.forEach(item => {
-    let tempItem = {
-      deviceId: item,
-      tempList:[]
-    };
-    // 根据 item 从 data.sblb 中找到对应的设备信息
-    let deviceInfo = data.sblb.find(sblbItem => sblbItem.deviceId === item);
-    if (deviceInfo) {
-      tempItem.tempList = deviceInfo.controlKey;
-    }
-    tempCheckedSblb.push(tempItem);
-    // deviceInfo.controlKey.map(item => {
-    //   item.value = '';
-    // });
-  });
       timingForm.sceneName='',
       timingForm.sceneRemark='',
       timingForm.deviceVos=[];
@@ -442,6 +431,11 @@ function cancel() {
   data.checkedSblb=[];
   data.isIndeterminate=false
   open.value = false;
+  data.sblb.map(item => {
+    item.controlKey.map(temp => {
+      temp.value = '';
+    });
+  });
 
 };
 function handleXg(dat) {
@@ -490,33 +484,17 @@ function submitForm1() {
       data.queryParams=res.data
     })
     handleQuery()
+    data.sblb.map(item => {
+      item.controlKey.map(temp => {
+        temp.value = '';
+      });
+    });
   })
   open1.value = false;
   timingForm1.sceneName=''
   timingForm1.sceneRemark=''
   timingForm1.sceneCode=''
   timingForm1.deviceVos=[]
-  // data.sblb.map(item => {
-  //   item.controlKey.map(temp => {
-  //     temp.value = '';
-  //   });
-  // });
-  // getTb({
-  //   "sceneCode": data.sceneCode,
-  //
-  //   "pageNum": currentPage.value,
-  //
-  //   "pageSize": pageSize.value
-  // }).then((res)=>{
-  //   console.log(res)
-  //   data.timingList=res.rows
-  //   data.total=res.total
-  // })
-  // for(let i in data.sblb) {
-  //   data.sblb[i].temp = ''
-  //   data.sblb[i].intemp = ''
-  //   data.sblb[i].outtemp = ''
-  // }
 };
 function cancel1() {
   open1.value = false;
@@ -524,28 +502,11 @@ function cancel1() {
   timingForm1.sceneRemark=''
   timingForm1.sceneCode=''
   timingForm1.deviceVos=[]
-  // data.sblb.map(item => {
-  //   item.controlKey.map(temp => {
-  //     temp.value = '';
-  //   });
-  // });
-  // getTb({
-  //   "sceneCode": data.sceneCode,
-  //
-  //   "pageNum": currentPage.value,
-  //
-  //   "pageSize": pageSize.value
-  // }).then((res)=>{
-  //   console.log(res)
-  //   data.timingList=res.rows
-  //   data.total=res.total
-  // })
-  // data.sblb.map(item => {
-  //   item.controlKey.map(temp => {
-  //     temp.value = '';
-  //   });
-  // });
-
+  data.sblb.map(item => {
+    item.controlKey.map(temp => {
+      temp.value = '';
+    });
+  });
 
 };
 function handleDel(sceneCode) {