完成地图状态展示

cpp-ui/src/views/largeScreen/components/center-bottom.vue

@@ -180,13 +180,14 @@ export default {
         "forecastDay": forecastDay
       }
       this.$axios({url: '/largeScreenController/forecastContrast', method: 'get',params: queryParams}).then(response => {
+        let curveMap = response.data.curveMap
         this.chartData = {
-          realList: response.data.realList,
-            ableList: response.data.ableList,
-          theoryList: response.data.theoryList,
-          cdqList: response.data.cdqList,
-          dqList: response.data.dqList,
-          timeList: response.data.timeList,
+          realList: curveMap.realList,
+            ableList: curveMap.ableList,
+          theoryList: curveMap.theoryList,
+          cdqList: curveMap.cdqList,
+          dqList: curveMap.dqList,
+          timeList: curveMap.timeList,
         }
         this.setOptions(this.chartData)
       }).catch(err => {

cpp-ui/src/views/largeScreen/components/right-bottom.vue

@@ -86,6 +86,8 @@ export default {
       })
     },
     setOptions({xData, pData} = {}) {
+      console.log(xData)
+      console.log(pData)
       const _this = this
       let option = JSON.parse(JSON.stringify(forecast10LineOption))
       option.xAxis.data = xData

cpp-ui/src/views/largeScreen/index.vue

@@ -373,9 +373,10 @@ import centerBottom from "./components/center-bottom.vue";
 import rightMiddle from "./components/right-middle.vue";
 import leftBottom from "./components/left-bottom.vue";
 import centerTop from "./components/center-top.vue";
+
 export default {
   name: 'largeScreen',
-  components: {leftMiddle, rightTop, rightBottom, centerBottom, rightMiddle, leftBottom,centerTop},
+  components: {leftMiddle, rightTop, rightBottom, centerBottom, rightMiddle, leftBottom, centerTop},
   data() {
     const checkExpireTime = (rule, value, callback) => {
       if (value == null || value === '') {
@@ -534,7 +535,8 @@ export default {
       clearInterval(this.sysBizDataTimer);
     } else {
       this.sysBizDataTimer = setInterval(() => {
-        this.getBizData(this);//再次加载数据,自己定义的方法
+        // 再次加载数据,自己定义的方法
+        _this.getBizData()
       }, 60000);//每隔60秒刷新一次
     }
   },
@@ -556,51 +558,78 @@ export default {
         return nums[0];
       }
     },
-    async getBizData() {
-      // 气象站预测按钮类型
-      // let weatherType
-      // if(sessionStorage.getItem('screen-weather-type')){
-      //   weatherType = sessionStorage.getItem('screen-weather-type')
-      // }else{
-      //   weatherType = 'wind'
-      // }
-      let forecastDay
-      if(sessionStorage.getItem('screen-forecast-day')){
-        forecastDay = sessionStorage.getItem('screen-forecast-day')
-      }else{
-        forecastDay = 'day'
-      }
-      let forecastType
-      if(sessionStorage.getItem('screen-forecast-type')){
-        forecastType = sessionStorage.getItem('screen-forecast-type')
-      }else{
-        forecastType = 'wind'
-      }
-
-      let queryParams = {
-        "forecastDay": forecastDay,
-        "forecastType": forecastType,
-      }
-
-      await this.$axios({url: '/largeScreenController/getBizData', method: 'get',params: queryParams}).then(response => {
-        this.mockData()
+    electricFieldDataTotal(){
+      this.$axios({
+        url: '/largeScreenController/electricFieldDataTotal',
+        method: 'get'
+      }).then(response => {
         // 顶部场站数据统计值
         let electricFieldDataTotalDto = response.data.electricFieldDataTotalDto
         this.envData.wsAvg = electricFieldDataTotalDto.wsAvg
         this.envData.fzdAvg = electricFieldDataTotalDto.fzdAvg
         this.envData.gfOpenCapcitySum = electricFieldDataTotalDto.gfOpenCapcitySum
         this.envData.fdOpenCapcitySum = electricFieldDataTotalDto.fdOpenCapcitySum
+      }).catch(err => {
+      })
+    },
+    calGenerating(){
+      this.$axios({
+        url: '/largeScreenController/calGenerating',
+        method: 'get'
+      }).then(response => {
         // 首页左中部生产数据统计
         let productionDataTotalDto = response.data.productionDataTotalDto
-        this.leftMiddleParams ={
+        this.leftMiddleParams = {
           realGeneratingSum: productionDataTotalDto.realGeneratingSum,
           forecastGeneratingSum: productionDataTotalDto.forecastGeneratingSum,
           realPowerSum: productionDataTotalDto.realPowerSum,
           theoryPowerSum: productionDataTotalDto.theoryPowerSum,
         }
+      }).catch(err => {
+      })
+    },
+    calForecastGenerating() {
+      this.$axios({
+        url: '/largeScreenController/calForecastGenerating',
+        method: 'get'
+      }).then(response => {
+        // 未来10天发电量
         this.rightBottomParams = response.data.forecastGeneratingMap
+      }).catch(err => {
+      })
+    },
+    centerForecastNwpAvgTotal() {
+      this.$axios({
+        url: '/largeScreenController/centerForecastNwpAvgTotal',
+        method: 'get'
+      }).then(response => {
         // 气象预测
         this.rightMiddleParams = response.data.forecastNwpMap
+      }).catch(err => {
+      })
+    },
+    forecastContrast() {
+      let forecastDay
+      if (sessionStorage.getItem('screen-forecast-day')) {
+        forecastDay = sessionStorage.getItem('screen-forecast-day')
+      } else {
+        forecastDay = 'day'
+      }
+      let forecastType
+      if (sessionStorage.getItem('screen-forecast-type')) {
+        forecastType = sessionStorage.getItem('screen-forecast-type')
+      } else {
+        forecastType = 'wind'
+      }
+      let queryParams = {
+        "forecastDay": forecastDay,
+        "forecastType": forecastType,
+      }
+      this.$axios({
+        url: '/largeScreenController/forecastContrast',
+        method: 'get',
+        params: queryParams
+      }).then(response => {
         // 功率曲线图
         let curveMap = response.data.curveMap
         this.centerBottomParams = {
@@ -611,30 +640,41 @@ export default {
           dqList: curveMap.dqList,
           timeList: curveMap.timeList,
         }
+      }).catch(err => {
+        // clearInterval(this.sysBizDataTimer);
+      })
+    },
+    accuracyRanking() {
+      this.$axios({
+        url: '/largeScreenController/accuracyRanking',
+        method: 'get'
+      }).then(response => {
         // 准确率排名
         this.rightTopParams = response.data.accuracyRankingMap
+      }).catch(err => {
+        // clearInterval(this.sysBizDataTimer);
+      })
+    },
+    getMapData() {
+      this.$axios({
+        url: '/largeScreenController/mapData',
+        method: 'get'
+      }).then(response => {
         this.centerTopParams = response.data.mapDataMap
-
-        // // 限电信息
-        // let xdMap = response.data.xdMap
-        // this.totality.number = xdMap.zczs
-        // this.totality.capacity = xdMap.totalCapacity
-        // this.xdczs = xdMap.xdczs
-        // this.zczs = xdMap.zczs
-        // this.xdbl = xdMap.xdbl
-        // // 风速、辐照度平均值
-        // let envDataMap = response.data.envDataMap
-        // this.envData.ws = envDataMap.wsAvg
-        // this.envData.radiance = envDataMap.fzdAvg
       }).catch(err => {
-        clearInterval(this.sysBizDataTimer);
+        // clearInterval(this.sysBizDataTimer);
       })
     },
-    mockData(){
-      this.rightBottomParams ={
-        xData: [],
-        pData: []
-      }
+    getBizData() {
+      this.electricFieldDataTotal()
+      this.calGenerating()
+      this.calForecastGenerating()
+      this.centerForecastNwpAvgTotal()
+      this.getMapData()
+      this.accuracyRanking()
+      this.forecastContrast()
+    },
+    mockData() {
       // this.rightTopParams = [
       //   {sort: 1, name: '新疆光伏电站', accuracy: '99.8%'},
       //   {sort: 2, name: '新疆光伏电站', accuracy: '97.8%'},
@@ -780,7 +820,6 @@ export default {
     },
 
 
-
     formatStartDate(row) {
       return formatToDateTime(row.startTime)
     },