Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/SIS_Web

public/websocket.js

@@ -1,23 +1,25 @@
 import Stomp from "stompjs";
 import store from '../src/store/index'
-var projectconfig = 'ws://192.168.10.22:8082/gyee-websocket'
+var projectconfig = 'ws://192.168.10.14:8082/gyee-websocket'
 // ============================一般使用的变量============================
 let number = 0;
 export const datainit = initialize;
 // ============================  大函数体   ============================
-function initialize() {
+function initialize(topic) {
   let adpClient = null;
   var url = projectconfig;
-  adpClient = Stomp.client(url);
+  // let socket = new SockJS(url);  // 这个地址要找你们后端
+  // adpClient = Stomp.over(socket);
+   adpClient = Stomp.client(url);
   adpClient.debug = null;
-  adpClient.connect({}, adpClient => connectCallBackSubscribe(adpClient), error => reconnect(error, adpClient));
+  adpClient.connect({topic:topic}, adpClient2 => connectCallBackSubscribe(adpClient), error => reconnect(error, adpClient));
 }
 // 断线重连
 function reconnect(error, adpClient) {
   //连接失败时再次调用函数
   number++;
   adpClient.connected = false;
-  clearTimeout(setTimeout(initialize(), 1000 * 5));
+  clearTimeout(setTimeout(initialize('/topic/popup'), 1000 * 5));
   debugX("DataAdapter reconnect:" + number + " 次");
   return;
 }
@@ -25,13 +27,14 @@ function reconnect(error, adpClient) {
 function connectCallBackSubscribe(adpClient) {
   number = 0;
   adpClient.connected = true;
-  adpClient.subscribe('topic/popup', stompMessage => reflexWindturbineBasicInformation(stompMessage));
+  adpClient.subscribe('/topic/popup', stompMessage => reflexWindturbineBasicInformation(stompMessage));
 }
 // ============================  解析函数体  ============================
 function reflexWindturbineBasicInformation(stompMessage) {
   var newdata = JSON.parse(stompMessage.body);
   store.dispatch('getupdate', newdata);
   console.log(newdata)
+  
 }
 // ============================  其他  ============================
 function debugX(text) {

src/App.vue

@@ -125,7 +125,7 @@ export default {
     };
   },
   created() {
-    // datainit();
+     //datainit("/topic/popup");
   },
   methods: {
     handleSelect(key, keyPath) {},

src/http.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import Vue from 'vue'
 import router from './router'
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
-
+axios.defaults.withCredentials = true
 const http = axios.create({
   baseURL: process.env.VUE_APP_API_URL || '/api/',
   // baseURL: process.env.VUE_APP_API_URL,

src/views/betweenValues/InterValue.vue

@@ -68,7 +68,7 @@
             </el-row>
             </el-form>
             <el-table
-            :data="getTableDataAll"
+            :data="tableData"
             :row-style="{ height: '10px' }" 
             :cell-style="{ textAlign: 'center',padding:'1px' }" 
             :header-cell-style="headStyle"
@@ -209,14 +209,14 @@
                     label="受累损失率(%)"
                     width="70">
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                     prop="address"
                     label="操作"
                     width="70">
                     <template slot-scope="scope">
                         <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">详情</el-button>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 </el-table-column>
             </el-table>
             	<el-dialog class="el-dialog_body" width="60%" title="对标信息分析" :visible.sync="dialogTableVisible" append-to-body>
@@ -324,24 +324,10 @@ export default {
             getTableDataAll:[],
             pagesize:10,
             currentPage2: 1,
+            orderByColumn:'',
+            isAsc:'asc',
             doesExist:'no',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }]
+            tableData: []
             }
     },
     created(){
@@ -437,6 +423,7 @@ export default {
 			}else if(column.order == "ascending"){
 				this.isAsc = "asc";
 			}
+            this.InterValueDatainitial();
 		},
         InterValueDatainitial(){
             let that = this;
@@ -444,70 +431,32 @@ export default {
                 that.options = res.data.data;
             })
             var valueData1 = new URLSearchParams();
-            valueData1.append('wpId','MHS_FDC');
-            valueData1.append('year',"2021");
-            valueData1.append('month',"1");
-            valueData1.append('zjs',"1")
-            this.$http.post('/contrast/addBenchmarkZj',valueData1).then((res) => {
-                that.tableData = res.data.data;
-                for(let i=0;i<that.tableData.length;i++){
-                    that.getTableDataAll.push(that.tableData[i])
-                } 
-            })
-            var valueData2 = new URLSearchParams();
-            valueData2.append('wpId','NSS_FDC');
-            valueData2.append('year',"2021");
-            valueData2.append('month',"1");
-            valueData2.append('zjs',"1")
-            this.$http.post('/contrast/addBenchmarkZj',valueData2).then((res) => {
-                that.tableData = res.data.data;
-                for(let i=0;i<that.tableData.length;i++){
-                    that.getTableDataAll.push(that.tableData[i])
-                } 
-            })
-            var valueData3 = new URLSearchParams();
-            valueData3.append('wpId','SBQ_FDC');
-            valueData3.append('year',"2021");
-            valueData3.append('month',"1");
-            valueData3.append('zjs',"1")
-            this.$http.post('/contrast/addBenchmarkZj',valueData3).then((res) => {
-                that.tableData = res.data.data;
-                for(let i=0;i<that.tableData.length;i++){
-                    that.getTableDataAll.push(that.tableData[i])
-                } 
-            })
-            var valueData4 = new URLSearchParams();
-            valueData4.append('wpId','QS_FDC');
-            valueData4.append('year',"2021");
-            valueData4.append('month',"1");
-            valueData4.append('zjs',"1")
-            this.$http.post('/contrast/addBenchmarkZj',valueData4).then((res) => {
+            valueData1.append('orderByColumn',this.orderByColumn);
+            valueData1.append('isAsc',this.isAsc);
+            this.$http.post('/contrast/benchmarkZjList',valueData1).then((res) => {
+                // that.tableData = res.data.data
+                 console.log(res)
                 that.tableData = res.data.data;
-                for(let i=0;i<that.tableData.length;i++){
-                    that.getTableDataAll.push(that.tableData[i])
-                } 
-            })
-            var valueData5 = new URLSearchParams();
-            valueData5.append('wpId','XS_FDC');
-            valueData5.append('year',"2021");
-            valueData5.append('month',"1");
-            valueData5.append('zjs',"1")
-            this.$http.post('/contrast/addBenchmarkZj',valueData5).then((res) => {
-                that.tableData = res.data.data;
-                for(let i=0;i<that.tableData.length;i++){
-                    that.getTableDataAll.push(that.tableData[i])
-                } 
+                 for(let i=0;i<that.tableData.length;i++){
+                        that.getTableDataAll.push(that.tableData[i])
+                    }
             })
         },
-        InterValueData(){
+        InterValueData(){     
             let that = this;
+            this.$http.get('/powercompare/windfarmAjax').then((res) => {
+                that.options = res.data.data;
+            })
             this.doesExist = 'no';
             var valueData = new URLSearchParams();
+            valueData.append('orderByColumn',this.orderByColumn);
+            valueData.append('isAsc',this.isAsc);
             valueData.append('wpId',this.value);
             valueData.append('year',this.value2);
             valueData.append('month',this.value3);
             valueData.append('zjs',this.value4)
             this.$http.post('/contrast/addBenchmarkZj',valueData).then((res) => {
+                console.log(res)
                 that.tableData = res.data.data;
                 // console.log(that.getTableDataAll)
                 console.log(that.tableData)
@@ -527,8 +476,8 @@ export default {
                     this.$message.error("添加成功");
                     return; 
                 }
-                
             })
+            // this.InterValueDatainitial();
         },
         drawPie() {
 				var charts;

src/views/gradeEvaluation/PerformanceAnalysisOperation.vue

@@ -9,8 +9,9 @@
                 :header-cell-style="{ textAlign:'center',background:'#F5F7FA'}"
                 @sort-change="changeTableSort"
                 :data="tableDataAll"
+                align="center"
                 border
-                style="width: 100%;margin-top:2%;margin-left:6%;">
+                style="width: 100%;margin-top:2%;">
                 <el-table-column
                 prop="name"
                 label="指标名称"
@@ -42,12 +43,12 @@
                 width="300">
                 </el-table-column>
             </el-table>
-            <div style="width:90%;margin-left:6%;margin-top:1%">本月{{text1}}设备小时数{{sbxxs}}小时、同比{{tbsbxxs}}小时，设备可利用率{{sbklly}}%、同比{{tbsbklly}}%，等效可用系数{{dxkyxs}}%、同比{{tbdxkyxs}}%，静风频率达到{{jfpl}}%、同比{{tbjfpl}}%，机组功率特性一致性系数达到{{gltxyzx}}%、同比{{tbglyzxxs}}%。</div>
-            <div style="width:70%;margin-left:6%;margin-top:1%">{{text2}}</div>
-            <div id="chartHistogram" style="width: 100%; height: 400px; margin: auto"></div>
-            <div id="losschartHistogram" style="width: 100%; height: 400px; margin: auto"></div>
-            <div id="windchartHistogram" style="width: 100%; height: 400px; margin: auto"></div>
-            <div style="width: 90%; height: 300px; margin: auto"></div>
+            <div style="width:80%;margin-top:1%;margin-left:7%">本月{{text1}}设备小时数{{sbxxs}}小时、同比{{tbsbxxs}}小时，设备可利用率{{sbklly}}%、同比{{tbsbklly}}%，等效可用系数{{dxkyxs}}%、同比{{tbdxkyxs}}%，静风频率达到{{jfpl}}%、同比{{tbjfpl}}%，机组功率特性一致性系数达到{{gltxyzx}}%、同比{{tbglyzxxs}}%。</div>
+            <div style="width:80%;margin-top:1%;margin-left:7%">{{text2}}</div>
+            <div id="chartHistogram" style="width: 100%; height: 400px;margin-left:6%;"></div>
+            <div id="losschartHistogram" style="width: 100%; height: 400px;margin-left:6%;"></div>
+            <div id="windchartHistogram" style="width: 100%; height: 400px;margin-left:6%;"></div>
+            <div style="width: 100%; height: 300px; margin: auto"></div>
 
         </div>
     </div>
@@ -94,6 +95,7 @@ export default {
             jdChart:[],
             jfData:[],
             djData:[],
+            slssData:[],
             tableData: [{
                 date: '2016-05-02',
                 name: '王小虎',
@@ -147,28 +149,29 @@ export default {
             performance.append('year',this.year);
             performance.append('month',this.month);
             this.$http.post('/singleanalysis/singleanalysisSub',performance).then((res) =>{
+                console.log(res)
                 this.tableData = res.data.data;
-                console.log(this.tableData)
-                this.tableDataAll.push({name:'实际发电量（万千瓦时）',byz:this.tableData.byzb.fdl,qntq:this.tableData.tqzb.fdl,tbzzl:this.tableData.tbzb.fdl,hb:this.tableData.hbzb.fdl,hq:this.tableData.hqzb.fdl});
-                this.tableDataAll.push({name:'理论发电量（万千瓦时）',byz:this.tableData.byzb.llfdl,qntq:this.tableData.tqzb.llfdl,tbzzl:this.tableData.tbzb.llfdl,hb:this.tableData.hbzb.llfdl,hq:this.tableData.hqzb.llfdl});
-                this.tableDataAll.push({name:'设备利用小时（小时）',byz:this.tableData.byzb.lyxs,qntq:this.tableData.tqzb.lyxs,tbzzl:this.tableData.tbzb.lyxs,hb:this.tableData.hbzb.lyxs,hq:this.tableData.hqzb.lyxs});
-                this.tableDataAll.push({name:'设备利用率（%）',byz:this.tableData.byzb.sbklyl,qntq:this.tableData.tqzb.sbklyl,tbzzl:this.tableData.tbzb.sbklyl,hb:this.tableData.hbzb.sbklyl,hq:this.tableData.hqzb.sbklyl});
-                this.tableDataAll.push({name:'等效可用系数（%）',byz:this.tableData.byzb.dxklyxs,qntq:this.tableData.tqzb.dxklyxs,tbzzl:this.tableData.tbzb.dxklyxs,hb:this.tableData.hbzb.dxklyxs,hq:this.tableData.hqzb.dxklyxs});
-                this.tableDataAll.push({name:'平均风速（m/s）',byz:this.tableData.byzb.fs,qntq:this.tableData.tqzb.fs,tbzzl:this.tableData.tbzb.fs,hb:this.tableData.hbzb.fs,hq:this.tableData.hqzb.fs});
-                this.tableDataAll.push({name:'小风切入风速（m/s）',byz:this.tableData.byzb.xfqr,qntq:this.tableData.tqzb.xfqr,tbzzl:this.tableData.tbzb.xfqr,hb:this.tableData.hbzb.xfqr,hq:this.tableData.hqzb.xfqr});
-                this.tableDataAll.push({name:'小风切入合格率（%）',byz:this.tableData.byzb.xfqrhgl,qntq:this.tableData.tqzb.xfqrhgl,tbzzl:this.tableData.tbzb.xfqrhgl,hb:this.tableData.hbzb.xfqrhgl,hq:this.tableData.hqzb.xfqrhgl});
-                this.tableDataAll.push({name:'有效风时数（小时）',byz:this.tableData.byzb.yxfss,qntq:this.tableData.tqzb.yxfss,tbzzl:this.tableData.tbzb.yxfss,hb:this.tableData.hbzb.yxfss,hq:this.tableData.hqzb.yxfss});
-                this.tableDataAll.push({name:'故障损失电量（万千瓦时）',byz:this.tableData.byzb.gzss,qntq:this.tableData.tqzb.gzss,tbzzl:this.tableData.tbzb.gzss,hb:this.tableData.hbzb.gzss,hq:this.tableData.hqzb.gzss});
-                this.tableDataAll.push({name:'调度限电损失电量（万千瓦时）',byz:this.tableData.byzb.xdss,qntq:this.tableData.tqzb.xdss,tbzzl:this.tableData.tbzb.xdss,hb:this.tableData.hbzb.xdss,hq:this.tableData.hqzb.xdss});
-                this.tableDataAll.push({name:'计划检修损失电量（万千瓦时）',byz:this.tableData.byzb.jxss,qntq:this.tableData.tqzb.jxss,tbzzl:this.tableData.tbzb.jxss,hb:this.tableData.hbzb.jxss,hq:this.tableData.hqzb.jxss});
-                this.tableDataAll.push({name:'性能未达标损失电量（万千瓦时）',byz:this.tableData.byzb.xnss,qntq:this.tableData.tqzb.xnss,tbzzl:this.tableData.tbzb.xnss,hb:this.tableData.hbzb.xnss,hq:this.tableData.hqzb.xnss});
-                this.tableDataAll.push({name:'故障停运时间（小时）',byz:this.tableData.byzb.gzxs,qntq:this.tableData.tqzb.gzxs,tbzzl:this.tableData.tbzb.gzxs,hb:this.tableData.hbzb.gzxs,hq:this.tableData.hqzb.gzxs});
-                this.tableDataAll.push({name:'检修停运时间（小时）',byz:this.tableData.byzb.jxxs,qntq:this.tableData.tqzb.jxxs,tbzzl:this.tableData.tbzb.jxxs,hb:this.tableData.hbzb.jxxs,hq:this.tableData.hqzb.jxxs});
-                this.tableDataAll.push({name:'并网时间（小时）',byz:this.tableData.byzb.rlxs,qntq:this.tableData.tqzb.rlxs,tbzzl:this.tableData.tbzb.rlxs,hb:this.tableData.hbzb.rlxs,hq:this.tableData.hqzb.rlxs});
-                this.tableDataAll.push({name:'待机时间（小时）',byz:this.tableData.byzb.tjxs,qntq:this.tableData.tqzb.tjxs,tbzzl:this.tableData.tbzb.tjxs,hb:this.tableData.hbzb.tjxs,hq:this.tableData.hqzb.tjxs});
-                this.tableDataAll.push({name:'通讯中断时间（小时）',byz:this.tableData.byzb.zdxs,qntq:this.tableData.tqzb.zdxs,tbzzl:this.tableData.tbzb.zdxs,hb:this.tableData.hbzb.zdxs,hq:this.tableData.hqzb.zdxs});
-                this.tableDataAll.push({name:'功率特性一致性系数（%）',byz:this.tableData.byzb.glyzxxs,qntq:this.tableData.tqzb.glyzxxs,tbzzl:this.tableData.tbzb.glyzxxs,hb:this.tableData.hbzb.glyzxxs,hq:this.tableData.hqzb.glyzxxs});
-                this.tableDataAll.push({name:'静风频率（%）',byz:this.tableData.byzb.jfpl,qntq:this.tableData.tqzb.jfpl,tbzzl:this.tableData.tbzb.jfpl,hb:this.tableData.hbzb.jfpl,hq:this.tableData.hqzb.jfpl});
+                
+                this.tableDataAll.push({name:'实际发电量（万千瓦时）',byz:this.tableData.byzb.fdl,qntq:this.tableData.tqzb.fdl,tbzzl:this.tableData.tbzb.fdl,hb:this.tableData.hqzb.fdl,hq:this.tableData.hbzb.fdl});
+                this.tableDataAll.push({name:'理论发电量（万千瓦时）',byz:this.tableData.byzb.llfdl,qntq:this.tableData.tqzb.llfdl,tbzzl:this.tableData.tbzb.llfdl,hb:this.tableData.hqzb.llfdl,hq:this.tableData.hbzb.llfdl});
+                this.tableDataAll.push({name:'设备利用小时（小时）',byz:this.tableData.byzb.lyxs,qntq:this.tableData.tqzb.lyxs,tbzzl:this.tableData.tbzb.lyxs,hb:this.tableData.hqzb.lyxs,hq:this.tableData.hbzb.lyxs});
+                this.tableDataAll.push({name:'设备利用率（%）',byz:this.tableData.byzb.sbklyl,qntq:this.tableData.tqzb.sbklyl,tbzzl:this.tableData.tbzb.sbklyl,hb:this.tableData.hqzb.sbklyl,hq:this.tableData.hbzb.sbklyl});
+                this.tableDataAll.push({name:'等效可用系数（%）',byz:this.tableData.byzb.dxklyxs,qntq:this.tableData.tqzb.dxklyxs,tbzzl:this.tableData.tbzb.dxklyxs,hb:this.tableData.hqzb.dxklyxs,hq:this.tableData.hbzb.dxklyxs});
+                this.tableDataAll.push({name:'平均风速（m/s）',byz:this.tableData.byzb.fs,qntq:this.tableData.tqzb.fs,tbzzl:this.tableData.tbzb.fs,hb:this.tableData.hqzb.fs,hq:this.tableData.hbzb.fs});
+                this.tableDataAll.push({name:'小风切入风速（m/s）',byz:this.tableData.byzb.xfqr,qntq:this.tableData.tqzb.xfqr,tbzzl:this.tableData.tbzb.xfqr,hb:this.tableData.hqzb.xfqr,hq:this.tableData.hbzb.xfqr});
+                this.tableDataAll.push({name:'小风切入合格率（%）',byz:this.tableData.byzb.xfqrhgl,qntq:this.tableData.tqzb.xfqrhgl,tbzzl:this.tableData.tbzb.xfqrhgl,hb:this.tableData.hqzb.xfqrhgl,hq:this.tableData.hbzb.xfqrhgl});
+                this.tableDataAll.push({name:'有效风时数（小时）',byz:this.tableData.byzb.yxfss,qntq:this.tableData.tqzb.yxfss,tbzzl:this.tableData.tbzb.yxfss,hb:this.tableData.hqzb.yxfss,hq:this.tableData.hbzb.yxfss});
+                this.tableDataAll.push({name:'故障损失电量（万千瓦时）',byz:this.tableData.byzb.gzss,qntq:this.tableData.tqzb.gzss,tbzzl:this.tableData.tbzb.gzss,hb:this.tableData.hqzb.gzss,hq:this.tableData.hbzb.gzss});
+                this.tableDataAll.push({name:'调度限电损失电量（万千瓦时）',byz:this.tableData.byzb.xdss,qntq:this.tableData.tqzb.xdss,tbzzl:this.tableData.tbzb.xdss,hb:this.tableData.hqzb.xdss,hq:this.tableData.hbzb.xdss});
+                this.tableDataAll.push({name:'计划检修损失电量（万千瓦时）',byz:this.tableData.byzb.jxss,qntq:this.tableData.tqzb.jxss,tbzzl:this.tableData.tbzb.jxss,hb:this.tableData.hqzb.jxss,hq:this.tableData.hbzb.jxss});
+                this.tableDataAll.push({name:'性能未达标损失电量（万千瓦时）',byz:this.tableData.byzb.xnss,qntq:this.tableData.tqzb.xnss,tbzzl:this.tableData.tbzb.xnss,hb:this.tableData.hqzb.xnss,hq:this.tableData.hbzb.xnss});
+                this.tableDataAll.push({name:'故障停运时间（小时）',byz:this.tableData.byzb.gzxs,qntq:this.tableData.tqzb.gzxs,tbzzl:this.tableData.tbzb.gzxs,hb:this.tableData.hqzb.gzxs,hq:this.tableData.hbzb.gzxs});
+                this.tableDataAll.push({name:'检修停运时间（小时）',byz:this.tableData.byzb.jxxs,qntq:this.tableData.tqzb.jxxs,tbzzl:this.tableData.tbzb.jxxs,hb:this.tableData.hqzb.jxxs,hq:this.tableData.hbzb.jxxs});
+                this.tableDataAll.push({name:'并网时间（小时）',byz:this.tableData.byzb.rlxs,qntq:this.tableData.tqzb.rlxs,tbzzl:this.tableData.tbzb.rlxs,hb:this.tableData.hqzb.rlxs,hq:this.tableData.hbzb.rlxs});
+                this.tableDataAll.push({name:'待机时间（小时）',byz:this.tableData.byzb.tjxs,qntq:this.tableData.tqzb.tjxs,tbzzl:this.tableData.tbzb.tjxs,hb:this.tableData.hqzb.tjxs,hq:this.tableData.hbzb.tjxs});
+                this.tableDataAll.push({name:'通讯中断时间（小时）',byz:this.tableData.byzb.zdxs,qntq:this.tableData.tqzb.zdxs,tbzzl:this.tableData.tbzb.zdxs,hb:this.tableData.hqzb.zdxs,hq:this.tableData.hbzb.zdxs});
+                this.tableDataAll.push({name:'功率特性一致性系数（%）',byz:this.tableData.byzb.glyzxxs,qntq:this.tableData.tqzb.glyzxxs,tbzzl:this.tableData.tbzb.glyzxxs,hb:this.tableData.hqzb.glyzxxs,hq:this.tableData.hbzb.glyzxxs});
+                this.tableDataAll.push({name:'静风频率（%）',byz:this.tableData.byzb.jfpl,qntq:this.tableData.tqzb.jfpl,tbzzl:this.tableData.tbzb.jfpl,hb:this.tableData.hqzb.jfpl,hq:this.tableData.hbzb.jfpl});
                 this.text1 = this.tableData.byzb.windturbineName;
                 this.sbxxs = this.tableData.byzb.lyxs;
                 this.tbsbxxs = this.tableData.tqzb.lyxs;
@@ -213,6 +216,7 @@ export default {
                     this.xnwdbData.push(this.wsChart[i].xnss);
                     this.jxssData.push(this.wsChart[i].jxss);
                     this.gzssData.push(this.wsChart[i].gzss);
+                    this.slssData.push(this.wsChart[i].slss);
                     this.$nextTick(function() {
                         this.getLossChartDataImport('losschartHistogram')
                     })
@@ -331,7 +335,7 @@ export default {
                     orient: 'vertical',
                     left: 'center',
                     bottom:'bottom',
-                    data: ['限电损失电量(万千瓦时)', '性能未达标损失电量(万千瓦时)', '检修损失电量(万千瓦时)', '故障损失电量(万千瓦时)']
+                    data: ['限电损失电量(万千瓦时)', '性能未达标损失电量(万千瓦时)', '检修损失电量(万千瓦时)', '故障损失电量(万千瓦时)','受累损失电量(万千瓦时)']
                 },
                 xAxis: [
                     {
@@ -420,6 +424,23 @@ export default {
                         },
                         data: this.gzssData
                     },
+                    {
+                        name: '受累损失电量(万千瓦时)',
+                        type: 'bar',
+                        stack: 'vistors',
+                        label: {
+                            show: false
+                        },
+                        emphasis: {
+                            focus: 'series'
+                        },
+                        itemStyle:{
+                            normal:{
+                                color:'#A6A6A6'
+                            }
+                        },
+                        data: this.slssData
+                    },
                 ]
             };
             charts.setOption(option);
@@ -434,13 +455,13 @@ export default {
                     orient: 'vertical',
                     left: 'center',
                     bottom:'bottom',
-                    data: ['静风频率', '待机台数']
-                },
-                toolbox: {
-                    feature: {
-                        saveAsImage: {}
-                    }
+                    data: ['静风频率（小时）', '待机时间（小时）']
                 },
+                // toolbox: {
+                //     feature: {
+                //         saveAsImage: {}
+                //     }
+                // },
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
@@ -460,7 +481,7 @@ export default {
                 },
                 series: [
                     {
-                        name: '静风频率',
+                        name: '静风频率（小时）',
                         type: 'line',
                         stack: '总量',
                         data: this.jfData,
@@ -474,7 +495,7 @@ export default {
                         },
                     },
                     {
-                        name: '待机台数',
+                        name: '待机时间（小时）',
                         type: 'line',
                         stack: '总量',
                         data: this.djData,