'首页数据更新'

src/api/axios.js

@@ -2,7 +2,7 @@
 import axios from 'axios';
 import BASE from '@tools/basicTool.js';
 
-axios.defaults.withCredentials = true;
+axios.defaults.withCredentials = false;
 
 /**
  * 通用请求函数
@@ -47,7 +47,7 @@ export function requestData(options) {
     // 创建请求实例
     const XHRReq = axios.create({
       headers,
-      withCredentials: true,
+      withCredentials: false,
       crossDomain: true,
       baseURL: options.baseURL || window.__MODE__.baseURL || '/api/',
       timeout: options.timeout || 30000, // 请求超时时间 - 3s

src/assets/styles/table.less

@@ -14,11 +14,11 @@
 
       th {
         background-color: fade(@darkBack, 20%);
-        height: 30px;
-        line-height: 30px;
-        color: @titleGray;
+        height: 32px;
+        line-height: 32px;
+        color: white;
         font-weight: 400;
-        font-size: @fontsize-s;
+        font-size: 13px;
         position: sticky;
         top: 0;
         cursor: pointer;
@@ -45,7 +45,9 @@
 
       td {
         padding: 4px;
-        color: @rowGray;
+        height: 32px;
+        line-height: 32px;
+        color: rgb(218, 216, 216);
         text-align: center;
         font-size: @fontsize-s;
         white-space: nowrap;

src/views/Decision/Decision1.vue

@@ -134,6 +134,7 @@
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Table from "./table.vue";
 	import partten from "@/helper/partten.js";
+import { cacher } from '@antv/x6/lib/util/function/function';
 	export default {
 		components: {
 			ToolbarPanel,
@@ -145,6 +146,7 @@
 		},
 		data() {
 			return {
+				 nbdata: [], //项目列表
 				tableData: {
 					column: [{
 							name: "",
@@ -350,8 +352,38 @@
 					return end;
 				}
 			},
+			
 			AjaxCommon() {
 				var that = this;
+                   that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.67:8133/",
+					subUrl: "benchmarking/fjjxb",
+					data: {
+						wpids: that.value1,
+						projectids: that.value2,
+						lineids: that.value3,
+						beginDate: that.value4,
+						endDate: that.value5,
+						type: that.TypeClass,
+						target: "",
+						sort: "",
+					},
+				success(res) {
+						console.log('661',res);
+						res.data.forEach((ele)=>{
+							that.nbdata.push({
+								uniformCode: ele.uniformCode,
+								meanWindSpeed: ele.meanWindSpeed,
+							});
+						})
+						// console.log('12',that.nbdata);
+				},
+				fail(error){
+					console.log('01',error);
+					that.nbdata=null
+				}
+                  },)
 				that.API.requestData({
 					method: "GET",
 					baseURL: "http://10.155.32.4:9001/",
@@ -367,6 +399,7 @@
 						sort: "",
 					},
 					success(res) {
+						console.log('666',res);
 						var name = [],
 							data = [],
 							llfdl = [],
@@ -388,7 +421,6 @@
 							arr.push(hj);
 							res.data = arr;
 						}
-
 						res.data.forEach((item, index) => {
 							name.push(item.name);
 							data.push([
@@ -438,6 +470,20 @@
 						that.tableDataEnd = data2[data2.length - 1];
 						data2.pop();
 						that.tableData.data = data2;
+						// console.log('nb',data2);
+						if(that.nbdata!=null){
+							that.tableData.data.forEach((item1)=>{
+                            that.nbdata.forEach((item2)=>{
+							if(item1.name === item2.uniformCode){
+								item1.speed = item2.meanWindSpeed
+							}else{
+
+							}
+						})
+						})
+						}
+							
+						console.log('535',that.nbdata);
 					},
 				});
 			},

src/views/Decision/Decision1Mx.vue

@@ -162,6 +162,7 @@
 		},
 		data() {
 			return {
+				nbdata: [], //项目列表
 				tableData: {
 					column: [{
 							name: "",
@@ -413,6 +414,37 @@
 			},
 			AjaxCommon() {
 				var that = this;
+				 that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.67:8133/",
+					subUrl: "benchmarking/fjjxb",
+					data: {
+						wpids: that.value1,
+						projectids: that.value2,
+						lineids: that.value3,
+						beginDate: that.value4,
+						endDate: that.value5,
+						type: that.TypeClass,
+						target: "",
+						sort: "",
+					},
+				success(res) {
+						console.log('666',res);
+						
+						res.data.forEach((ele)=>{
+							that.nbdata.push({
+								uniformCode: ele.uniformCode,
+								meanWindSpeed: ele.meanWindSpeed,
+								
+							});
+						})
+						console.log('12',that.nbdata);
+				},
+				fail(error){
+					console.log('01',error);
+					that.nbdata=null
+				}
+                  })
 				that.API.requestData({
 					method: "GET",
 					baseURL: "http://10.155.32.4:9001/",
@@ -498,6 +530,16 @@
 						that.tableDataEnd = data2[data2.length - 1];
 						data2.pop();
 						that.tableData.data = data2;
+						if(that.nbdata!=null){
+							that.tableData.data.forEach((item1)=>{
+                            that.nbdata.forEach((item2)=>{
+							if(item1.name === item2.uniformCode){
+								item1.speed = item2.meanWindSpeed
+							}
+						})
+						})
+						}
+						console.log('112',that.tableData.data);
 					}
 				});
 			},

src/views/Decision/slgl/ztzhl.vue

@@ -179,7 +179,7 @@ export default {
           if (res.code === 200) {  
             // if (vs == "小于3米风速") {
             that.tableData.data = res.data
-           res.data.forEach((ele)=>{
+            res.data.forEach((ele)=>{
               ele.rateAll5 = (ele.rateAll5*100).toFixed(2)+'%'
               ele.rateAl20 = (ele.rateAl20*100).toFixed(2)+'%'
               ele.rateAll10 = (ele.rateAll10*100).toFixed(2)+'%'

src/views/Home/Home.vue

@@ -146,12 +146,12 @@
               <table class="table-card">
                 <tr class="">
                   <td class="text gray">装机容量</td>
-                  <td class="value green">{{ Number(jczbmap.zjrl) }}</td>
+                  <td class="value green">{{ Number(rdlmap.zjrl) }}</td>
                   <td class="unit gray">MW</td>
                 </tr>
                 <tr class="">
                   <td class="text gray">上网电量(日)</td>
-                  <td class="value green">{{ jczbmap.swdl }}</td>
+                  <td class="value green">{{ rdlmap.swdl }}</td>
                   <td class="unit gray">万kWh</td>
                 </tr>
                 <tr class="">
@@ -204,12 +204,12 @@
               <table class="table-card">
                 <tr class="">
                   <td class="text gray">利用小时(月)</td>
-                  <td class="value green">{{ jczbmap.ylyxs }}</td>
+                  <td class="value green">{{ rdlmap.ylyxs }}</td>
                   <td class="unit gray">小时</td>
                 </tr>
                 <tr class="">
                   <td class="text gray">利用小时(年)</td>
-                  <td class="value green">{{ jczbmap.nlyxs }}</td>
+                  <td class="value green">{{ rdlmap.nlyxs }}</td>
                   <td class="unit gray gray">小时</td>
                 </tr>
                 <tr class="">
@@ -250,7 +250,7 @@
                   "
                 >
                   <td class="text gray">日发电量</td>
-                  <td class="value green">{{ jczbmap.rfdl }}</td>
+                  <td class="value green">{{ rdlmap.rfdl }}</td>
                   <td class="unit gray">万kWh</td>
                 </tr>
                 <tr
@@ -346,7 +346,7 @@
                   "
                 >
                   <td class="text gray">月发电量</td>
-                  <td class="value green">{{ jczbmap.yfdl }}</td>
+                  <td class="value green">{{ rdlmap.yfdl }}</td>
                   <td class="unit gray gray">万kWh</td>
                 </tr>
                 <tr
@@ -442,7 +442,7 @@
                   "
                 >
                   <td class="text gray">年发电量</td>
-                  <td class="value green">{{ jczbmap.nfdl }}</td>
+                  <td class="value green">{{ rdlmap.nfdl }}</td>
                   <td class="unit gray">万kWh</td>
                 </tr>
                 <tr
@@ -854,6 +854,7 @@ export default {
       ],
       tqmap5: [],
       jczbmap: {},
+      rdlmap:{},
       wxssmap: {},
       gxkmap: {},
       mxztmap: {},
@@ -1104,45 +1105,46 @@ export default {
           id: that.wpId,
         },
         success(res) {
-          let rdlKey = ["value1", "value2", "value3", "speed"];
-          let dw = {
-            units: "",
-            title: "",
-          };
-          that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
-            ? (dw = {
-                units: "(w/㎡)",
-                title: "日照",
-              })
-            : (dw = {
-                units: "(m/s)",
-                title: "风速",
-              });
-          let DayPower = {
-            units: ["(万kWh)", dw.units],
-            value: [
-              {
-                title: "发电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: "上网电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: "购网电量",
-                yAxisIndex: 0,
-                value: [],
-              },
-              {
-                title: dw.title,
-                yAxisIndex: 1,
-                value: [],
-              },
-            ],
-          };
+           console.log(189,res);
+          // let rdlKey = ["value1", "value2", "value3", "speed"];
+          // let dw = {
+          //   units: "",
+          //   title: "",
+          // };
+          // that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+          //   ? (dw = {
+          //       units: "(w/㎡)",
+          //       title: "日照",
+          //     })
+          //   : (dw = {
+          //       units: "(m/s)",
+          //       title: "风速",
+          //     });
+          // let DayPower = {
+          //   units: ["(万kWh)", dw.units],
+          //   value: [
+          //     {
+          //       title: "发电量",
+          //       yAxisIndex: 0,
+          //       value: [],
+          //     },
+          //     {
+          //       title: "上网电量",
+          //       yAxisIndex: 0,
+          //       value: [],
+          //     },
+          //     {
+          //       title: "购网电量",
+          //       yAxisIndex: 0,
+          //       value: [],
+          //     },
+          //     {
+          //       title: dw.title,
+          //       yAxisIndex: 1,
+          //       value: [],
+          //     },
+          //   ],
+          // };
 
           let glKey = [
             "value2",
@@ -1190,14 +1192,14 @@ export default {
             },
           ];
 
-          rdlKey.forEach((keyEle, keyIndex) => {
-            res.data.rdlvos.forEach((cEle) => {
-              DayPower.value[keyIndex].value.push({
-                text: cEle.timestr,
-                value: cEle[keyEle],
-              });
-            });
-          });
+          // rdlKey.forEach((keyEle, keyIndex) => {
+          //   res.data.rdlvos.forEach((cEle) => {
+          //     DayPower.value[keyIndex].value.push({
+          //       text: cEle.timestr,
+          //       value: cEle[keyEle],
+          //     });
+          //   });
+          // });
 
           glKey.forEach((keyEle, keyIndex) => {
             res.data.glvos.forEach((cEle) => {
@@ -1208,12 +1210,144 @@ export default {
             });
           });
 
-          that.DayPower = DayPower;
+          // that.DayPower = DayPower;
           that.Powertrend = Powertrend;
         },
       });
     },
 
+    getCharts1() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        // baseURL: "http://192.168.10.24:8021/",
+        baseURL: "http://192.168.1.67:8021/",
+        subUrl: "meterinfoAll",
+        data: {
+          id: that.wpId,
+        },
+        success(res) {
+          //  console.log(189,res);
+          let rdlKey = ["value1", "value2", "value3", "speed"];
+          let dw = {
+            units: "",
+            title: "",
+          };
+          that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+            ? (dw = {
+                units: "(w/㎡)",
+                title: "日照",
+              })
+            : (dw = {
+                units: "(m/s)",
+                title: "风速",
+              });
+          let DayPower = {
+            units: ["(万kWh)", dw.units],
+            value: [
+              {
+                title: "发电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "上网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "购网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: dw.title,
+                yAxisIndex: 1,
+                value: [],
+              },
+            ],
+          };
+
+          // let glKey = [
+          //   "value2",
+          //   "value1",
+          //   "value5",
+          //   "value4",
+          //   "value7",
+          //   "value6",
+          // ];
+          // let Powertrend = [
+          //   {
+          //     title: "实发功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: "理论功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: "保证功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: "4小时预测功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: "24小时预测功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: that.wpId === "-2" ? "日照强度" : "平均风速",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          //   {
+          //     title: "72小时预测功率",
+          //     smooth: true,
+          //     value: [],
+          //   },
+          // ];
+          console.log(89,res);
+
+          rdlKey.forEach((keyEle, keyIndex) => {
+            res.data.rdlmap.forEach((cEle) => {
+              DayPower.value[keyIndex].value.push({
+                text: cEle.timestr,
+                value: cEle[keyEle],
+              });
+            });
+          });
+
+           that.rdlmap={
+            swdl:res.data.zdlmap.swdl.toFixed(2),
+            rfdl:res.data.zdlmap.rfdl.toFixed(2),
+            yfdl:res.data.zdlmap.yfdl.toFixed(2),
+            nfdl:res.data.zdlmap.nfdl.toFixed(2),
+            zjrl:res.data.zdlmap.zjrl.toFixed(2),
+            ylyxs:res.data.zdlmap.ylyxs,
+            nlyxs:res.data.zdlmap.nlyxs
+            }
+
+          // glKey.forEach((keyEle, keyIndex) => {
+          //   res.data.glvos.forEach((cEle) => {
+          //     Powertrend[keyIndex].value.push({
+          //       text: new Date(cEle.time).formatDate("hh:mm"),
+          //       value: cEle[keyEle],
+          //     });
+          //   });
+          // });
+
+          that.DayPower = DayPower;
+          // that.Powertrend = Powertrend;
+        },
+      });
+    },
     // 点击地图展示类型
     changeShowType(wpId, planBtnName) {
       if (
@@ -1267,6 +1401,7 @@ export default {
 
       this.requestData(false);
       this.getCharts();
+      this.getCharts1();
       this.timmer = setInterval(() => {
         this.requestData(false);
       }, this.$store.state.websocketTimeSec);
@@ -1293,6 +1428,7 @@ export default {
           targetName,
         },
         success(res) {
+          console.log(123,res);
           that.dialogShow = true;
           that.dialogData = res.data;
           that.dialogType = dialogType;
@@ -1427,6 +1563,7 @@ export default {
     that.$nextTick(() => {
       that.requestData(false);
       this.getCharts();
+      this.getCharts1();
       that.timmer = setInterval(() => {
         that.requestData(false);
       }, that.$store.state.websocketTimeSec);
@@ -1435,6 +1572,7 @@ export default {
       }, 1000);
       that.timmer3 = setInterval(() => {
         this.getCharts();
+        this.getCharts1();
       }, 360000);
     });
   },

src/views/Others/index.vue

@@ -126,6 +126,28 @@
         </div>
       </el-carousel-item>
 
+
+ <el-carousel-item
+        :style="
+          $store.state.themeName === 'dark'
+            ? 'padding: 20px; background: rgb(4, 12, 11)'
+            : 'padding: 20px; background: #fff'
+        "
+      >
+        <div class="itemBox">
+          <p class="itemTitle">场站详细数据</p>
+          <div class="df-table" >
+            <div
+              class="sjcx-item"
+            >
+              <div class="sjcx-name"><a href="http://192.168.1.67:8301/" >查询所有场站数据</a></div>
+              <!-- <div class="sjcx-value"><a href="http://192.168.10.10:3000/">查询所有场站数据</a></div> -->
+            </div>
+          </div>
+        </div>
+      </el-carousel-item>
+  
+
       <!-- card-4 -->
       <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
@@ -151,6 +173,8 @@
           </div>
         </div>
       </el-carousel-item> -->
+
+
       <el-carousel-item
         :style="
           $store.state.themeName === 'dark'
@@ -663,6 +687,13 @@ export default {
       .sjcx-name {
         // background-color:aqua;
         flex: 0 0 50%;
+        a{
+          color: #9ca5a8;
+          list-style: none;
+          &:hover{
+            color: #05bb4c;
+          }
+        }
       }
       .sjcx-value {
         // text-align: left;

src/views/sisView/index.vue

@@ -6,7 +6,7 @@
       <div class="contentBox" style="height: 300px">
         <div class="contentItem">
           <div class="itemName size5">装机容量</div>
-          <div class="itemNum">{{ items.zjrl }}</div>
+          <div class="itemNum">{{ little.zjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName size6">安全天数</div>
           <div class="itemNum">{{ items.aqts }}</div>
@@ -17,24 +17,24 @@
         </div>
         <div class="contentItem">
           <div class="itemName size5">日发电量</div>
-          <div class="itemNum">{{ items.rfdl }}</div>
+          <div class="itemNum">{{ little.rfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">年利用小时</div>
-          <div class="itemNum">{{ items.nlyxs }}</div>
+          <div class="itemNum">{{ little.nlyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">年发电量</div>
-          <div class="itemNum">{{ items.nfdl }}</div>
+          <div class="itemNum">{{ little.nfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName size5">上网电量</div>
-          <div class="itemNum">{{ items.swdl }}</div>
+          <div class="itemNum">{{ little.swdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">月利用小时</div>
-          <div class="itemNum">{{ items.ylyxs }}</div>
+          <div class="itemNum">{{ little.ylyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">月发电量</div>
-          <div class="itemNum">{{ items.yfdl }}</div>
+          <div class="itemNum">{{ little.yfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
@@ -88,46 +88,46 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{ items.fdzjrl }}</div>
+          <div class="itemNum">{{ little.fczjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">实时风速</div>
           <div class="itemNum">{{ items.fdssfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{ items.fdyfdl }}</div>
+          <div class="itemNum">{{ little.fcyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{ items.fdnfdl }}</div>
+          <div class="itemNum">{{ little.fcnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{ items.fdrfdl }}</div>
+          <div class="itemNum">{{ little.fcrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">实时功率</div>
           <div class="itemNum">{{ items.fdssgl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{ items.fdylyxs }}</div>
+          <div class="itemNum">{{ little.fcylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{ items.fdnlyxs }}</div>
+          <div class="itemNum">{{ little.fcnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{ items.fdswdl }}</div>
+          <div class="itemNum">{{ little.fcswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">总欠发</div>
-          <div class="itemNum">{{ items.fdzqf }}</div>
+          <div class="itemNum">{{ mine.fdzqf }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">牛发电量</div>
-          <div class="itemNum">{{ items.nssfdl }}</div>
+          <div class="itemNum">{{ little.nssfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛欠发</div>
-          <div class="itemNum">{{ items.nssqf }}</div>
+          <div class="itemNum">{{ mine.nssqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛风速</div>
           <div class="itemNum">{{ items.nssfs }}</div>
@@ -138,10 +138,10 @@
         </div>
         <div class="contentItem">
           <div class="itemName">麻发电量</div>
-          <div class="itemNum">{{ items.mhsfdl }}</div>
+          <div class="itemNum">{{ little.mhsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻欠发</div>
-          <div class="itemNum">{{ items.mhsqf }}</div>
+          <div class="itemNum">{{ mine.mhsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻风速</div>
           <div class="itemNum">{{ items.mhsfs }}</div>
@@ -152,10 +152,10 @@
         </div>
         <div class="contentItem">
           <div class="itemName">青发电量</div>
-          <div class="itemNum">{{ items.qsfdl }}</div>
+          <div class="itemNum">{{ little.qsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青欠发</div>
-          <div class="itemNum">{{ items.qsqf }}</div>
+          <div class="itemNum">{{ mine.qsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青风速</div>
           <div class="itemNum">{{ items.qsfs }}</div>
@@ -166,10 +166,10 @@
         </div>
         <div class="contentItem">
           <div class="itemName">石发电量</div>
-          <div class="itemNum">{{ items.sbqfdl }}</div>
+          <div class="itemNum">{{ little.sbqfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石欠发</div>
-          <div class="itemNum">{{ items.sbqqf }}</div>
+          <div class="itemNum">{{ mine.sbqqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石风速</div>
           <div class="itemNum">{{ items.sbqfs }}</div>
@@ -180,10 +180,10 @@
         </div>
         <div class="contentItem">
           <div class="itemName">香发电量</div>
-          <div class="itemNum">{{ items.xsfdl }}</div>
+          <div class="itemNum">{{ little.xsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香欠发</div>
-          <div class="itemNum">{{ items.xsqf }}</div>
+          <div class="itemNum">{{ mine.xsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香风速</div>
           <div class="itemNum">{{ items.xsfs }}</div>
@@ -199,7 +199,7 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{ items.gfzjrl }}</div>
+          <div class="itemNum">{{ little.gfzjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">日照强度</div>
           <div class="itemNum">{{ items.gfrzqd }}</div>
@@ -210,29 +210,29 @@
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{ items.gfrfdl }}</div>
+          <div class="itemNum">{{ little.gfrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{ items.gfyfdl }}</div>
+          <div class="itemNum">{{ little.gfyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{ items.gfnfdl }}</div>
+          <div class="itemNum">{{ little.gfnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{ items.gfswdl }}</div>
+          <div class="itemNum">{{ little.gfswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{ items.gfylyxs }}</div>
+          <div class="itemNum">{{ little.gfylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{ items.gfnlyxs }}</div>
+          <div class="itemNum">{{ little.gfnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">武发电量</div>
-          <div class="itemNum">{{ items.dwkfdl }}</div>
+          <div class="itemNum">{{ little.dwkfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">武日强度</div>
           <div class="itemNum">{{ items.dwkrzqd }}</div>
@@ -243,7 +243,7 @@
         </div>
         <div class="contentItem">
           <div class="itemName">平发电量</div>
-          <div class="itemNum">{{ items.plfdl }}</div>
+          <div class="itemNum">{{ little.plfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">平日强度</div>
           <div class="itemNum">{{ items.plrzqd }}</div>
@@ -254,7 +254,7 @@
         </div>
         <div class="contentItem">
           <div class="itemName">宣发电量</div>
-          <div class="itemNum">{{ items.xhfdl }}</div>
+          <div class="itemNum">{{ little.xhfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">宣日强度</div>
           <div class="itemNum">{{ items.xhrzqd }}</div>
@@ -265,7 +265,7 @@
         </div>
         <div class="contentItem">
           <div class="itemName">马发电量</div>
-          <div class="itemNum">{{ items.mchfdl }}</div>
+          <div class="itemNum">{{ little.mchfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">马日强度</div>
           <div class="itemNum">{{ items.mchrzqd }}</div>
@@ -276,7 +276,7 @@
         </div>
         <div class="contentItem">
           <div class="itemName">海发电量</div>
-          <div class="itemNum">{{ items.hzjfdl }}</div>
+          <div class="itemNum">{{ little.hzjfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">海日强度</div>
           <div class="itemNum">{{ items.hzjrzqd }}</div>
@@ -285,9 +285,9 @@
           <div class="itemNum">{{ items.hzjgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
-        <!-- <div class="contentItem">
+         <div class="contentItem">
           <div class="itemName">埃发电量</div>
-          <div class="itemNum">{{ items.akfdl }}</div>
+          <div class="itemNum">{{ little.akfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">埃日强度</div>
           <div class="itemNum">{{ items.akrzqd }}</div>
@@ -295,7 +295,7 @@
           <div class="itemName">埃功率</div>
           <div class="itemNum">{{ items.akgl }}</div>
           <div class="itemUnit">MW</div>
-        </div> -->
+        </div>
       </div>
     </div>
   </div>
@@ -312,11 +312,12 @@ export default {
   components: {
     clock,
   },
-
   // 数据
   data() {
     return {
       items: {},
+      little:{},
+      mine:{},
       timmer: null,
     };
   },
@@ -337,7 +338,6 @@ export default {
       that.API.requestData({
         method: "GET",
         subUrl: "http://10.155.32.4:8034/bigscreen/list",
-        // subUrl: "http://192.168.10.12:8034/bigscreen/list",
         success(res) {
           let keys = Object.keys(res.data);
           let items = res.data;
@@ -352,12 +352,55 @@ export default {
         },
       });
     },
+    viewAjax1() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "http://192.168.1.67:8021/meterinfoAll/sisView",
+        success(res) {
+          let keys=Object.keys(res.data)
+          let items=res.data
+          keys.forEach((ele)=>{
+             if(items[ele].toFixed(2).split(".")[1]=="00"){
+               items[ele]=items[ele].toFixed(2).split(".")[0];
+             }else{
+                items[ele]=items[ele].toFixed(2)
+             }
+          })
+          that.little = items;
+        },
+      });
+    },
+
+    viewAjax2() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "http://192.168.1.67:8133/powergen/lost",
+        success(res) {
+          let keys = Object.keys(res.data);
+          let items = res.data;
+          keys.forEach((ele) => {
+            if (items[ele].toFixed(2).split(".")[1] == "00") {
+              items[ele] = items[ele].toFixed(2).split(".")[0];
+            } else {
+              items[ele] = items[ele].toFixed(2);
+            }
+          });
+          that.mine = items;
+        },
+      });
+    },
   },
 
   created() {
     this.viewAjax();
+    this.viewAjax1()
+    this.viewAjax2()
     this.timmer = setInterval(() => {
       this.viewAjax();
+      this.viewAjax1()
+      this.viewAjax2()
     }, 6000);
   },