修改曲线显示

src/views/shiYuan/common/MonitorCurve/index.vue

@@ -67,7 +67,7 @@
                   start-placeholder="开始时间"
                   end-placeholder="结束时间"
                   placeholder="选择时间范围"
-                  style="width: 100%;"
+                  style="width: 100%"
                 >
                 </el-time-picker>
               </el-form-item>
@@ -214,6 +214,7 @@
             ></el-table-column>
           </el-table>
           <el-pagination
+            background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="pagination.current"
@@ -428,7 +429,7 @@ export default {
           } else {
             let mainSiteData = res.result.records;
             let newList = mainSiteData.sort((a, b) => {
-              return Date.parse(b.scadaTime) - Date.parse(a.scadaTime);
+              return Date.parse(a.scadaTime) - Date.parse(b.scadaTime);
             });
             let yData = newList.map((item) => {
               return Number(item.value);
@@ -469,7 +470,7 @@ export default {
       ehcartsData.forEach((item) => {
         const indexData = data.filter((p) => p.code == item.code);
         let sortList = indexData.sort((a, b) => {
-          return Date.parse(b.scadaTime) - Date.parse(a.scadaTime);
+          return Date.parse(a.scadaTime) - Date.parse(b.scadaTime);
         });
         item.values = sortList;
       });
@@ -807,12 +808,18 @@ export default {
           },
         },
         grid: {
-          top: "6%",
+          top: "8%",
           left: "3%",
-          right: "4%",
+          right: "5%",
           bottom: "2%",
           containLabel: true,
         },
+        
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
         xAxis: [
           //   {
           //     type: "category",
@@ -859,7 +866,7 @@ export default {
         }
       });
     },
-    
+
     getEchartData(data) {
       let datas = [];
       //将原数据排在前面
@@ -874,7 +881,7 @@ export default {
           xAxisData.push(p.scadaTime);
           seriesData.push(parseFloat(p.value));
         });
-        const label = item.devivceName + "-" + item.name
+        const label = item.devivceName + "-" + item.name;
         item["xAxis"] = {
           type: "category",
           boundaryGap: false,
@@ -886,7 +893,7 @@ export default {
           },
           axisPointer: {
             label: {
-              formatter: (params) =>{
+              formatter: (params) => {
                 return label;
               },
             },
@@ -899,17 +906,17 @@ export default {
           data: xAxisData,
         };
         item["series"] = {
-            name: label,
-            type: "line",
-            xAxisIndex: 1,
-            smooth: true,
-            emphasis: {
-              focus: "series",
-            },
-            data: seriesData,
-          };
+          name: label,
+          type: "line",
+          xAxisIndex: 1,
+          smooth: true,
+          emphasis: {
+            focus: "series",
+          },
+          data: seriesData,
+        };
       });
-      
+
       return datas;
     },
 
@@ -917,37 +924,41 @@ export default {
      * 同比数据显示
      */
     showChart(ehcartsData) {
-      let xAxis = []
-      let series = []
-      if(ehcartsData.length < 2){
-        ehcartsData.forEach(item => {
-          xAxis.push(item.xAxis)
-        })
-      }
-      else{
-        for(let i = 0;i<2;i++){
-          xAxis.push(ehcartsData[i].xAxis)
+      let xAxis = [];
+      let series = [];
+      if (ehcartsData.length < 2) {
+        ehcartsData.forEach((item) => {
+          xAxis.push(item.xAxis);
+        });
+      } else {
+        for (let i = 0; i < 2; i++) {
+          xAxis.push(ehcartsData[i].xAxis);
         }
       }
-      ehcartsData.forEach(item=>{
-        series.push(item.series)
-      })
-      
+      ehcartsData.forEach((item) => {
+        series.push(item.series);
+      });
+
       let chartDom = this.$refs.chart;
       let myChart = echarts.init(chartDom);
       //const colors = ["#5470C6", "#EE6666"];
       let option = {
         //color: colors,
         tooltip: {
-          trigger: "none",
+          trigger: 'axis',
           axisPointer: {
             type: "cross",
           },
         },
         legend: {},
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
         grid: {
-          top: 70,
-          bottom: 50,
+          top: 40,
+          bottom: 30,
         },
         xAxis: xAxis,
         yAxis: [

src/views/shiYuan/monitoringCenter/monitorPopup/index.vue

@@ -111,7 +111,7 @@ export default {
         properties.indexInfoVoList.forEach((item) => {
           this.info[item.indexName] = (item ?.flow || "") + item.unit;
         });
-      if (properties.status) this.info["通讯状态"] = properties.status;
+      if (properties.flag) this.info["通讯状态"] = properties.flag =='0' ? '正常' :(properties.flag =='1'?'报警':'离线');
       if (properties.latestDate) this.info["更新时间"] = properties.latestDate;
     },
     /**

src/views/shiYuan/monitoringCenter/partitionManage/widget.vue

@@ -89,6 +89,7 @@
       </el-table-column>
     </el-table>
     <el-pagination
+      background
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="pagination.current"

src/views/shiYuan/monitoringCenter/scadaMonitor/widget.vue

@@ -80,6 +80,19 @@
         align="center"
         show-overflow-tooltip
       />
+      <el-table-column
+        prop="BVOL"
+        label="电池电压"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ZHZL"
+        label="信号质量"
+        align="center"
+        show-overflow-tooltip
+      />
+      
       <el-table-column fixed="right" label="操作" width="120" align="center">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="goto(scope.row, true)">
@@ -332,7 +345,8 @@ export default {
       
       queryScadaData(param).then((res) => {
         if (res.code == 1 && res.result != null) {
-          this.siteDataTable = res.result; // 保存所有站点数据,用于分页时调用
+          let result = this.setIndexinfo(res.result)
+          this.siteDataTable = result; // 保存所有站点数据,用于分页时调用
           this.statisticStatus();
         } else {
           this.siteDataTable = [];
@@ -340,6 +354,25 @@ export default {
         this.tableLoading = false;
       });
     },
+    
+    /**
+     * 获取电池电压和信号质量
+    */
+    setIndexinfo(data){
+      let datas = data
+      if(!datas || datas.length < 1) return []
+      datas.forEach(item => {
+        item['BVOL'] = '';
+        item['ZHZL'] = '';
+        if(item.hasOwnProperty('indexInfoVoList') && item.indexInfoVoList && item.indexInfoVoList.length > 0){
+          const b_obj = item.indexInfoVoList.find(p=>p.indexCode.indexOf('.B_VOL') != -1)
+          if(b_obj) item['BVOL'] = b_obj.flow;
+          const z_obj = item.indexInfoVoList.find(p=>p.indexCode.indexOf('.CSQ') != -1)
+          if(z_obj) item['ZHZL'] = z_obj.flow;
+        }
+      });
+      return datas
+    },
 
     /**
      * 统计状态数据

src/views/zhpt/index.vue

@@ -34,7 +34,7 @@
                 <el-dropdown-menu slot="dropdown">
                   <div
                     class="dropdown-container"
-                    style="width: 400px; height: 700px; padding: 10px"
+                    style="width: 500px; height: 700px; padding: 10px"
                   >
                     <online-monitor
                       @selectChange="selectChange"