代码提交

src/App.vue

@@ -32,7 +32,7 @@
 <script>
 import MinxinItem from "./mixins"
 import axios from 'axios'
-import {getWather} from "./api/index.js";
+import {getWather,Weather} from "./api/index.js";
 export default {
   name: 'home',
   mixins:[MinxinItem],
@@ -60,9 +60,8 @@ export default {
     handleWather(){
       // axios({url:"http://www.jcznedu.com:5000/weather/prediction/?city=盐都&&limit=3",methods:'GET'}).then(res=>{
       // })
-      getWather({
+      Weather({
-        city:'盐都',
+        
-        limit:'3'
       }).then((res)=>{
         this.weatherArr = res.data.data.daly;
         this.weatherArr[0].date = '今天';

src/api/index.js

@@ -55,9 +55,15 @@ export const getPbtyqk = (params) => {
         params
     })
 };
+// //查询天气
+// export const getWather = (params) => {
+//     return axios.get('aps/weather/prediction/', {
+//         params
+//     })
+// };
 //查询天气
-export const getWather = (params) => {
+export const Weather = (params) => {
-    return axios.get('aps/weather/prediction/', {
+    return axios.get('api/Handler/Weather.ashx', {
         params
     })
 };

src/views/index.vue

@@ -452,25 +452,32 @@ export default {
       dataGdzl = res.data.data
       this.detailedTwo(dataGdzl);
     })
-    //配变停运
+    // //配变停运
-    getPbtyqk({
+    // getPbtyqk({
-      action:"week"
+    //   action:"week"
-    }).then((res)=>{
+    // }).then((res)=>{
-      let dataPbty = [];
+    //   let dataPbty = [];
-      dataPbty = res.data.data
+    //   dataPbty = res.data.data
-      this.detailedFive(dataPbty);
+    //   console.log(dataPbty,'dataPbty');
-      let dataPb = [];
+    //   this.detailedFive(dataPbty);
-      let dataCf = [];
+    //   let dataPb = [];
-      let dataCfl = [];
+    //   let dataCf = [];
-      for (let i = 0; i < dataPbty.length; i++) {
+    //   let dataCfl = [];
-        dataPb.push(dataPbty[i].pbsl);
+    //   for (let i = 0; i < dataPbty.length; i++) {
-        dataCf.push(dataPbty[i].cftytc);
+    //     dataPb.push(dataPbty[i].pbsl);
-        dataCfl.push(dataPbty[i].pbcftyl)
+    //     dataCf.push(dataPbty[i].cftytc);
-      }
+    //     dataCfl.push(dataPbty[i].pbcftyl)
-      this.topContent[0].count = dataPb.reduce((x, y) => x + y)
+    //   }
-      this.topContent[1].count = dataCf.reduce((x, y) => x + y)
+    //   this.topContent[0].count = dataPb.reduce((x, y) => x + y)
-      this.topContent[2].count = dataCfl.reduce((x, y) => x + y) + '%'
+    //   this.topContent[1].count = dataCf.reduce((x, y) => x + y)
-    })
+    //   let pbCount =  (this.topContent[1].count/this.topContent[0].count)*100
+    //   let pbCountString = pbCount.toString()
+    //   if (pbCountString.indexOf(".") != -1) {
+    //     this.topContent[2].count =  pbCountString.substring(0,pbCountString.indexOf(".")+3) + '%'
+    //   }else{
+    //    this.topContent[2].count = pbCountString +'%'
+    //   }
+    // })
     this.handleDate(0);
     let that = this;
      window.addEventListener('message', function (e) {
@@ -1462,10 +1469,10 @@ export default {
     },
     handleDate(index){
       this.currentIndex = index
-      if (index == 0) {
+      // if (index == 0) {
         //周配变停运
         getPbtyqk({
-          action:"week"
+          action: index==0?"week":'month'
         }).then((res)=>{
           let dataPbty = [];
           dataPbty = res.data.data
@@ -1478,25 +1485,39 @@ export default {
           }
           this.topContent[0].count = dataPb.reduce((x, y) => x + y)
           this.topContent[1].count = dataCf.reduce((x, y) => x + y)
-        })
+           let pbCount =  (this.topContent[1].count/this.topContent[0].count)*100
-      }else if (index == 1) {
+          let pbCountString = pbCount.toString()
-        //月配变停运
+          if (pbCountString.indexOf(".") != -1) {
-        getPbtyqk({
+            this.topContent[2].count =  pbCountString.substring(0,pbCountString.indexOf(".")+3) + '%'
-          action:"month"
+          }else{
-        }).then((res)=>{
+          this.topContent[2].count = pbCountString +'%'
-          let dataPbty = [];
-          dataPbty = res.data.data
-          this.detailedFive(dataPbty);
-          let dataPb = [];
-          let dataCf = [];
-          for (let i = 0; i < dataPbty.length; i++) {
-            dataPb.push(dataPbty[i].pbsl);
-            dataCf.push(dataPbty[i].cftytc);
           }
-          this.topContent[0].count = dataPb.reduce((x, y) => x + y)
-          this.topContent[1].count = dataCf.reduce((x, y) => x + y)
         })
-      }
+      // }else if (index == 1) {
+      //   //月配变停运
+      //   getPbtyqk({
+      //     action:"month"
+      //   }).then((res)=>{
+      //     let dataPbty = [];
+      //     dataPbty = res.data.data
+      //     this.detailedFive(dataPbty);
+      //     let dataPb = [];
+      //     let dataCf = [];
+      //     for (let i = 0; i < dataPbty.length; i++) {
+      //       dataPb.push(dataPbty[i].pbsl);
+      //       dataCf.push(dataPbty[i].cftytc);
+      //     }
+      //     this.topContent[0].count = dataPb.reduce((x, y) => x + y)
+      //     this.topContent[1].count = dataCf.reduce((x, y) => x + y)
+      //      let pbCount =  (this.topContent[1].count/this.topContent[0].count)*100
+      //     let pbCountString = pbCount.toString()
+      //     if (pbCountString.indexOf(".") != -1) {
+      //       this.topContent[2].count =  pbCountString.substring(0,pbCountString.indexOf(".")+3) + '%'
+      //     }else{
+      //     this.topContent[2].count = pbCountString +'%'
+      //     }
+      //   })
+      // }
     },
     addColor(index){
       if(this.currentIndex == index) {

vue.config.js

@@ -23,15 +23,15 @@ module.exports = {
                     '^/api':'',
                 }
             },
-            '/aps': { //代理的名字
+            // '/aps': { //代理的名字
-                target:'http://www.jcznedu.com:5000/',
+            //     target:'http://www.jcznedu.com:5000/',
-                // target: 'http://172.16.1.254:3111/', 
+            //     // target: 'http://172.16.1.254:3111/', 
-                ws: true,
+            //     ws: true,
-                changeOrigin: true,
+            //     changeOrigin: true,
-                pathRewrite:{
+            //     pathRewrite:{
-                    '^/aps':'',
+            //         '^/aps':'',
-                }
+            //     }
-            }
+            // }
         }
     }
 }