Merge branch 'master' of http://git.lgzn.space/huajimang/yanDuLargeScreen

src/App.vue

@@ -2,7 +2,7 @@
   <div id="app">
     <div class="top">
       <div class="left">
-        xxx电力可视化系统
+        盐都电力可视化系统
       </div>
       <div class="middle">
         <div class="router" :class="{'active':routerActive==index}" v-for="(item,index) in routerTitle" @click="handleChange(index)" :key="index">{{item}}</div>

src/api/index.js

@@ -46,3 +46,9 @@ export const getGdsgdzl = (params) => {
         params
     })
 };
+//查询配变停运情况
+export const getPbtyqk = (params) => {
+    return axios.get('/Handler/Pbtyqk.ashx', {
+        params
+    })
+};

src/views/index.vue

@@ -141,7 +141,7 @@
     </div>
     <div class="middle">
       <div class="one" style="height: 635px; width: 100%">
-          <iframe src="/unityWeb/index.html" style="height: 100%; width: 100%" 
+          <iframe src="/unityWeb/index.html" style="height: 100%; width: 100%;border: none" 
           ref="iframe"></iframe>
         <div class="unityBtn">
           <div
@@ -326,7 +326,7 @@
 </template>
 
 <script>
-import { getCompanyInfo,getLine,getBanzugz,getGdtj,getDwbzgz,getGdsgdzl} from "../api/index.js";
+import { getCompanyInfo,getLine,getBanzugz,getGdtj,getDwbzgz,getGdsgdzl,getPbtyqk} from "../api/index.js";
 import ringMainUnit from  "./HomePop/ringMainUnit.vue"
 export default {
   name: "home",
@@ -447,12 +447,20 @@ export default {
       dataBzgz = res.data.data;
       this.detailedOne(dataBzgz);
     })
+    //供电质量统计
     getGdsgdzl().then((res)=>{
       let dataGdzl = []
       dataGdzl = res.data.data
       this.detailedTwo(dataGdzl);
     })
-    this.detailedFive();
+    //配变停运
+    getPbtyqk({
+      action:"week"
+    }).then((res)=>{
+      let dataPbty = [];
+      dataPbty = res.data.data
+      this.detailedFive(dataPbty);
+    })
     this.handleDate(0);
     let that = this;
      window.addEventListener('message', function (e) {
@@ -503,10 +511,10 @@ export default {
           },
         },
         grid: {
-          top:'10%',
+          top:'15%',
           left: "5%",
           right: "3%",
-          bottom: "24%",
+          bottom: "15%",
           containLabel: true,
         },
         xAxis: [
@@ -1224,7 +1232,18 @@ export default {
         
       
     },
-    detailedFive(){
+    detailedFive(dataPbty){
+      console.log(dataPbty,'dataPbty');
+      let dataListx = [];
+      let dataPb = [];
+      let dataGz = [];
+      let dataCf = [];
+      for (let i = 0; i < dataPbty.length; i++) {
+        dataListx.push(dataPbty[i].gds);
+        dataGz.push(dataPbty[i].gztytc);
+        dataPb.push(dataPbty[i].pbsl);
+        dataCf.push(dataPbty[i].cftytc);
+      }
       let that = this;
      var myChart = this.$echarts.init(document.getElementById("detailedFive"));
     var option = {
@@ -1251,7 +1270,7 @@ export default {
     },
   },
   xAxis: {
-    data: ["盐都直属", "大冈", "大纵湖", "尚庄", "郭猛", "秦南", "西区","楼王","学富","潘黄","龙冈"],
+    data: dataListx,
     axisLine: {
       show: false, //隐藏X轴轴线
       lineStyle: {
@@ -1368,7 +1387,7 @@ export default {
       //   show:false,
       //   color: "rgba(5,140,255, 0.2)",
       // },
-      data: [4.2, 3.8, 4.8, 3.5, 2.9, 2.8, 3, 5,6,7,8,10],
+      data: dataGz,
     },
     {
       name: "重复停运",
@@ -1391,7 +1410,7 @@ export default {
       //   show:false,
       //   color: "rgba(5,140,255, 0.2)",
       // },
-      data: [2, 3, 4, 3, 2, 2, 3, 4,7,9,10,11,12],
+      data: dataCf,
     },
     {
       name: "配变数量",
@@ -1411,7 +1430,7 @@ export default {
           ]),
         },
       },
-      data: [4.2, 3.8, 4.8, 3.5, 2.9, 2.8, 3, 5,8,10,13,14],
+      data: dataPb,
     },
   ],
 };
@@ -1430,6 +1449,25 @@ export default {
     },
     handleDate(index){
       this.currentIndex = index
+      if (index == 0) {
+        //周配变停运
+        getPbtyqk({
+          action:"week"
+        }).then((res)=>{
+          let dataPbty = [];
+          dataPbty = res.data.data
+          this.detailedFive(dataPbty);
+        })
+      }else if (index == 1) {
+        //月配变停运
+        getPbtyqk({
+          action:"month"
+        }).then((res)=>{
+          let dataPbty = [];
+          dataPbty = res.data.data
+          this.detailedFive(dataPbty);
+        })
+      }
     },
     addColor(index){
       if(this.currentIndex == index) {
@@ -1702,7 +1740,7 @@ export default {
     }
     #detailedOne{
       width: 100%;
-      height: calc(90% - 52px);
+      height: calc(100% - 87px) !important;
     };
     #detailedFour{
       width: 100%;