常规消缺、模拟数据新增

src/utils/index.js

@@ -1,7 +1,7 @@
 // import http from '@/api/http.js'
 // import { downloadXlsx } from "../utils/xlsx";
 import { saveAs } from 'file-saver'
-import {apiGetExportMsg, apiGetModel,} from '../api/api'
+import { apiGetExportMsg, apiGetModel, } from '../api/api'
 // import XLSXD from 'xlsx-style'
 // import Papa from 'papaparse'
 // import { isObject } from "xe-utils"
@@ -19,7 +19,7 @@ const until = {
             } else if (b === '0.00' || b === 0) {
                 num = '-'
             } else {
-                num = Math.round((Number(a)/Number(b)*100))+'%'
+                num = Math.round((Number(a) / Number(b) * 100)) + '%'
             }
         } else {
             num = '-'
@@ -27,7 +27,7 @@ const until = {
         return num
     },
     // 导出所有
-    downloadPer(url,fileName, idss, idsmo) {
+    downloadPer(url, fileName, idss, idsmo) {
         let params = null
         if (!idsmo) {
             params = {
@@ -39,7 +39,7 @@ const until = {
                 idsBcr: idsmo ? idsmo.join(',') : '',
             }
         }
-        apiGetExportMsg(url,params).then(datas =>{
+        apiGetExportMsg(url, params).then(datas => {
             let blob = new Blob([datas])
             saveAs(blob, fileName)
         }).catch((r) => {
@@ -48,59 +48,59 @@ const until = {
     },
     // 下载模板
     downloadTemplate(url, params, proName) {
-        apiGetModel(url,params).then(datas =>{
+        apiGetModel(url, params).then(datas => {
             let blob = new Blob([datas])
             saveAs(blob, proName)
         }).catch((r) => {
             console.error(r)
         })
     },
-    getTime(date){
-        var y = date.getFullYear();  
-        var m = date.getMonth() + 1;  
-        m = m < 10 ? ('0' + m) : m;  
-        var d = date.getDate();  
-        d = d < 10 ? ('0' + d) : d;  
-        var h = date.getHours();  
-        h=h < 10 ? ('0' + h) : h;  
-        var minute = date.getMinutes();  
-        minute = minute < 10 ? ('0' + minute) : minute;  
-        var second=date.getSeconds();  
-        second=second < 10 ? ('0' + second) : second;  
-        return y + '-' + m + '-' + d+' '+h+':'+minute+':'+second; 
+    getTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        var second = date.getSeconds();
+        second = second < 10 ? ('0' + second) : second;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
         // timeF = y + '-' + m + '-' + d
         // return timeF
     },
     changePowerPickDate(val) {
-        let endss = val.substring(val.length-2, val.length) * 1
-        let startTime = val.substring(0, val.length-2)
+        let endss = val.substring(val.length - 2, val.length) * 1
+        let startTime = val.substring(0, val.length - 2)
         let allTime = ''
-        if (0 <= endss &&  endss < 15) {
+        if (0 <= endss && endss < 15) {
             allTime = startTime + '00'
-        } else if (15 <= endss &&  endss  < 30) {
+        } else if (15 <= endss && endss < 30) {
             allTime = startTime + '15'
-        } else if (30 <= endss &&  endss  < 45) {
+        } else if (30 <= endss && endss < 45) {
             allTime = startTime + '30'
-        } else if (45 <= endss &&  endss  < 60) {
+        } else if (45 <= endss && endss < 60) {
             allTime = startTime + '45'
         }
         return allTime
     },
     changeElectricPickDate(val) {
-        let endss = val.substring(val.length-2, val.length) * 1
-        let startTime = val.substring(0, val.length-2)
+        let endss = val.substring(val.length - 2, val.length) * 1
+        let startTime = val.substring(0, val.length - 2)
         let allTime = ''
-        if (0 <= endss &&  endss < 10) {
+        if (0 <= endss && endss < 10) {
             allTime = startTime + '00'
-        } else if (10 <= endss &&  endss  < 20) {
+        } else if (10 <= endss && endss < 20) {
             allTime = startTime + '10'
-        } else if (20 <= endss &&  endss  < 30) {
+        } else if (20 <= endss && endss < 30) {
             allTime = startTime + '20'
-        } else if (30 <= endss &&  endss  < 40) {
+        } else if (30 <= endss && endss < 40) {
             allTime = startTime + '30'
-        } else if (40 <= endss &&  endss  < 50) {
+        } else if (40 <= endss && endss < 50) {
             allTime = startTime + '40'
-        } else if (50 <= endss &&  endss  < 60) {
+        } else if (50 <= endss && endss < 60) {
             allTime = startTime + '50'
         }
         return allTime
@@ -134,20 +134,20 @@ const until = {
         }
         return str
     },
-    sortBy(attr,rev){
+    sortBy(attr, rev) {
         //第二个参数没有传递 默认升序排列
-        if(rev ==  undefined){
+        if (rev == undefined) {
             rev = 1;
-        }else{
+        } else {
             rev = (rev) ? 1 : -1;
         }
-        return function(a,b){
+        return function (a, b) {
             a = a[attr];
             b = b[attr];
-            if(a < b){
+            if (a < b) {
                 return rev * -1;
             }
-            if(a > b){
+            if (a > b) {
                 return rev * 1;
             }
             return 0;
@@ -199,15 +199,15 @@ const until = {
  */
     commafy(num) {
         return num && num.toString()
-        .replace(/\d+/, function(s){
-            return s.replace(/(\d)(?=(\d{3})+$)/g, '$1,')
-        })
+            .replace(/\d+/, function (s) {
+                return s.replace(/(\d)(?=(\d{3})+$)/g, '$1,')
+            })
     },
 
-/*
- *手机号码中间4位隐藏花号（*）显示
- *
- */
+    /*
+     *手机号码中间4位隐藏花号（*）显示
+     *
+     */
     hideMobile(mobile) {
         return mobile && mobile.toString().replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2")
     },
@@ -232,11 +232,11 @@ const until = {
         let result = Array.isArray(obj) ? [] : {};
         for (let key in obj) {
             if (obj.hasOwnProperty(key)) {
-            if (typeof obj[key] === 'object' && obj[key] !== null) {
-                result[key] = deepCopy(obj[key]);
-            } else {
-                result[key] = obj[key];
-            }
+                if (typeof obj[key] === 'object' && obj[key] !== null) {
+                    result[key] = deepCopy(obj[key]);
+                } else {
+                    result[key] = obj[key];
+                }
             }
         }
         return result;
@@ -245,21 +245,21 @@ const until = {
         let datalist = [];
         //表头数据
         let cluData = ''
-        for(let i=0; i<columnData.length;i++){
-            cluData += columnData[i].label+','
+        for (let i = 0; i < columnData.length; i++) {
+            cluData += columnData[i].label + ','
         }
-        cluData.slice(0, cluData.length-1)
+        cluData.slice(0, cluData.length - 1)
         datalist.push(cluData.split(','));
         //这里的tableData为你的表格数据
-        for(let j=0;j<tableDatas.length;j++) {
+        for (let j = 0; j < tableDatas.length; j++) {
             let item = tableDatas[j]
             let tabelDatas = ''
-            for(let k=0; k<columnData.length;k++){
+            for (let k = 0; k < columnData.length; k++) {
                 let its = columnData[k]
-                if (item[its.value] !==null) {
+                if (item[its.value] !== null) {
                     tabelDatas += item[its.value] + ','
                 } else {
-                    tabelDatas +=  '-,'
+                    tabelDatas += '-,'
                 }
             }
             datalist.push(tabelDatas.split(','));
@@ -287,7 +287,7 @@ const until = {
             skipHeader: true, //是否忽略表头，默认为false
             origin: 'A2' // 设置插入位置
         })
-        contentWs['!merges'] = [{s:{r:0,c:0}, e:{r:1,c:0}}, {s:{r:0,c:1}, e:{r:1,c:1}}]
+        contentWs['!merges'] = [{ s: { r: 0, c: 0 }, e: { r: 1, c: 0 } }, { s: { r: 0, c: 1 }, e: { r: 1, c: 1 } }]
         // contentWs['!merges'] = [{s:{r:1,c:2}, e:{r:2,c:2}}]
         // contentWs['A1'] = {
         //     t: 's',
@@ -310,7 +310,7 @@ const until = {
         // {s:{r:0,c:0}, e:{r:0,c:2}}为一个规则，s:起始位置，e：结束位置，r：行，c：列
         // contentWs['!merges'] = [{s:{r:0,c:0}, e:{r:0,c:2}}]
 
-        
+
         // contentWs['A3'] = {
         //     t: 's',
         //     v: '人员ss',
@@ -330,7 +330,7 @@ const until = {
         // }
         // contentWs['!merges'] = [{s:{r:0,c:2}, e:{r:0,c:4}}]
         //设置列宽
-        contentWs['!cols'] = [{wch: 30},{wch: 20},{wch: 40}]
+        contentWs['!cols'] = [{ wch: 30 }, { wch: 20 }, { wch: 40 }]
         XLSX.utils.book_append_sheet(wb, contentWs, '明细')
         // XLSX.writeFile(wb, '明细.xlsx')
         const tmpDown = new Blob([
@@ -348,13 +348,13 @@ const until = {
     downExcel(obj, fileName) {
         const a_node = document.createElement('a')
         a_node.download = fileName
-        if ('msSaveOrOpenBlob'in navigator) {
+        if ('msSaveOrOpenBlob' in navigator) {
             window.navigator.msSaveOrOpenBlob(obj, fileName)
         } else {
             a_node.href = URL.createObjectURL(obj)
         }
         a_node.click()
-        setTimeout(() =>{
+        setTimeout(() => {
             URL.createObjectURL(obj)
         }, 2000)
     },
@@ -362,13 +362,13 @@ const until = {
         if (typeof ArrayBuffer !== 'undefined') {
             const buf = new ArrayBuffer(s.length)
             const view = new Uint8Array(buf)
-            for(let i =0; i != s.length; ++i) {
+            for (let i = 0; i != s.length; ++i) {
                 view[i] = s.charCodeAt(i) & 0xff
             }
             return buf
         } else {
             const buf = new Array(s.length)
-            for(let i =0; i != s.length; ++i) {
+            for (let i = 0; i != s.length; ++i) {
                 buf[i] = s.charCodeAt(i) & 0xff
             }
             return buf
@@ -399,7 +399,7 @@ const until = {
                     dataIndex: dataIndex,
                     position: '15%'
                 });
-            } else { 
+            } else {
                 myChart2.dispatchAction({
                     type: 'hideTip'
                 });
@@ -427,7 +427,7 @@ const until = {
                     dataIndex: dataIndex,
                     position: '15%'
                 });
-            } else { 
+            } else {
                 myChart1.dispatchAction({
                     type: 'hideTip'
                 });
@@ -443,7 +443,7 @@ const until = {
             } else {
                 num = '-'
             }
-        } else if(data === 0) {
+        } else if (data === 0) {
             num = 0
         } else {
             num = '-'
@@ -459,12 +459,12 @@ const until = {
     // ------------------------------------------------------------------------
     // 冒泡排序
     sortBubble(arr) {
-        for(let i=0; i<arr.length; i++){
-            for(let j=0; j<arr.length-i; j++){
-                if (arr[j] > arr[j+1]) {
+        for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr.length - i; j++) {
+                if (arr[j] > arr[j + 1]) {
                     let temp = arr[j]
-                    arr[j] = arr[j+1]
-                    arr[j+1] = temp
+                    arr[j] = arr[j + 1]
+                    arr[j + 1] = temp
                 }
             }
         }
@@ -475,7 +475,7 @@ const until = {
     //利用for 循环 搭配 indexOf 去重
     unique(arr) {
         let newArr = []
-        for(let i=0; i<arr.length; i++) {
+        for (let i = 0; i < arr.length; i++) {
             if (newArr.indexOf(arr[i]) === -1) {
                 newArr.push(arr[i])
             }
@@ -486,7 +486,7 @@ const until = {
     //借助ES6提供的Set结构 new Set() 
     // var arr = [1,9,8,8,7,2,5,3,3,3,2,3,1,4,5,444,55,22];
     // var arr2 = noRepeat(arr)
-    noRepeatT(arr){
+    noRepeatT(arr) {
         var newArr = [...new Set(arr)]; //利用了Set结构不能接收重复数据的特点
         return newArr
     },
@@ -494,7 +494,7 @@ const until = {
     //利用 filter() 去重
     //eg: var arr = ['apple','apps','pear','apple','orange','apps']
     useFilter(arr) {
-        return arr.filter(function(item,index){
+        return arr.filter(function (item, index) {
             return arr.indexOf(item) === index;  // 因为indexOf 只能查找到第一个  
         })
     },
@@ -502,10 +502,10 @@ const until = {
     //将数组的每一个元素依次与其他元素做比较，发现重复元素，删除 
     //eg: var arr = [1,9,8,8,7,2,5,3,3,3,2,3,1,4,5,444,55,22];
     noRepeatF(arr) {
-        for(var i = 0; i < arr.length-1; i++){
-            for(var j = i+1; j < arr.length; j++){
-                if(arr[i]===arr[j]){
-                    arr.splice(j,1);
+        for (var i = 0; i < arr.length - 1; i++) {
+            for (var j = i + 1; j < arr.length; j++) {
+                if (arr[i] === arr[j]) {
+                    arr.splice(j, 1);
                     j--;
                 }
             }
@@ -519,7 +519,7 @@ const until = {
         var newArr = [];
         for (var i = 0; i < arr.length; i++) {
             if (arr.indexOf(arr[i]) == i) {
-            newArr.push(arr[i]);
+                newArr.push(arr[i]);
             }
         }
         return newArr;
@@ -527,13 +527,13 @@ const until = {
     //方法六
     //利用双重for循环
     // var arr = [1,9,8,8,7,2,5,3,3,3,2,3,1,4,5,444,55,22]
-    noRepeatS(arr){
-    for (var i = 0; i < arr.length; i++) {
-        for (var j = 0; j < arr.length; j++) {
-            if (arr[i] == arr[j] && i != j) { //将后面重复的数删掉
-                arr.splice(j, 1);
+    noRepeatS(arr) {
+        for (var i = 0; i < arr.length; i++) {
+            for (var j = 0; j < arr.length; j++) {
+                if (arr[i] == arr[j] && i != j) { //将后面重复的数删掉
+                    arr.splice(j, 1);
                 }
-        }
+            }
         }
         return arr;
     },
@@ -542,8 +542,8 @@ const until = {
     // var arr = [1,9,8,8,7,2,5,3,3,3,2,3,1,4,5,444,55,22];
     noRepeatSe(arr) {
         let newArr = [];
-        for(i=0; i<arr.length; i++){
-            if(!newArr.includes(arr[i])){
+        for (i = 0; i < arr.length; i++) {
+            if (!newArr.includes(arr[i])) {
                 newArr.push(arr[i])
             }
         }
@@ -555,7 +555,7 @@ const until = {
         let str = argu.split('?')[1]
         let result = {}
         let temp = str.split('&')
-        for(let i=0; i<temp.length; i++) {
+        for (let i = 0; i < temp.length; i++) {
             let temp2 = temp[i].split('=')
             result[temp2[0]] = temp2[1]
         }
@@ -566,7 +566,7 @@ const until = {
     countStr(str) {
         let json = {}
         //循环完毕后会得到一个对象 如{a:0,b:1,c:2}
-        for(let i=0; i<str.length; i++) {
+        for (let i = 0; i < str.length; i++) {
             if (!json[str.charAt(i)]) {
                 json[str.charAt(i)] = 1
             } else {
@@ -579,7 +579,7 @@ const until = {
         if (obj instanceof Object) {
             let isArray = Array.isArray(obj)
             let cloneObj = isArray ? [] : {}
-            for(let key in obj) {
+            for (let key in obj) {
                 cloneObj[key] = isObject(obj[key]) ? deepClone(obj[key]) : obj[key]
             }
             return cloneObj
@@ -589,7 +589,7 @@ const until = {
     },
     // 防抖
     debounce(fn, delay) {
-    
+
         var delay = delay || 200;
         var timer;
         return function () {

src/views/fdnlfx/dataAnalysis/angleAnalysis/index.vue

@@ -47,7 +47,7 @@
               name="4"
             >
             </el-tab-pane>
-            <div v-if="activeTab === '3'" :style="{ height: tableHeight }">
+            <div v-show="activeTab === '3'" :style="{ height: tableHeight }">
               <table-cop
                 class=""
                 :data="tableData"
@@ -263,6 +263,9 @@ const funRepeatMap = (arr, type) => {
 };
 
 const funGetTree = async () => {
+  initPageData();
+  return;
+
   //   const res = await httpRequest.get("/power/prepare/treepitch");
   const res = await httpRequest.get("/power/process/tree");
   treeData.value = funRepeatMap(res.data, "process");

src/views/fdnlfx/dataAnalysis/combine/index.vue

@@ -111,7 +111,7 @@
                 :tableId="tableShowId"
                 :tableName="tableName"
                 :tableFilePath="tableFilePath"
-                style="position:relative;top: -15px;"
+                style="position: relative; top: -15px"
               >
               </table-cop>
             </el-tab-pane>
@@ -255,14 +255,21 @@ const funExcelChange = async (obj) => {
   activeTab.value = "1";
   isChartArea.value = false;
   tableShowId.value = obj.id;
-  let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
-for(let i =0; i<tableX.length; i++) {
-    let it = tableX[i]
+  let tableX = [
+    "未满发样板机_",
+    "满发样板机_",
+    "样板机_",
+    "未满发_",
+    "满发_",
+    "_",
+  ];
+  for (let i = 0; i < tableX.length; i++) {
+    let it = tableX[i];
     if (obj.name.indexOf(it) !== -1) {
-    tableName.value = obj.name.substring(0, obj.name.indexOf(it));
-    break;
+      tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+      break;
     }
-}
+  }
   tableFilePath.value = obj.path;
   excelType.value = obj.type; // 接收excel的type 用于控制右侧tab展示
 
@@ -647,13 +654,14 @@ const funChartSelect = async (batch) => {
           yDataArr.push(dataSetObj[1].source[scatterIndex].k);
         }
       }
-      const wtRes = await httpRequest.get("/power/fitting/filter", {
-        params: {
-          yk: yDataArr.join(","),
-          wk: wDataArr.join(","),
-          only: dataRadom.value,
-        },
-      });
+      const wtRes = Object.assign({}, jsonData.wtRes);
+      // const wtRes = await httpRequest.get("/power/fitting/filter", {
+      //   params: {
+      //     yk: yDataArr.join(","),
+      //     wk: wDataArr.join(","),
+      //     only: dataRadom.value,
+      //   },
+      // });
       allpowerFittingData.value = [];
       wtRes.data.forEach((it) => {
         let obj = {
@@ -848,8 +856,9 @@ const faultDataFn = async () => {
     alarmList: allpowerFittingData.value,
     table: "alarmWt",
   };
-  const faultRes = await httpRequest.post("/power/fitting/alarms", params);
-  faultData.value = faultRes.data;
+  // const faultRes = await httpRequest.post("/power/fitting/alarms", params);
+  // faultData.value = faultRes.data;
+  faultData.value = jsonData.faultRes;
 };
 //预警数据
 const warnDataFn = async () => {
@@ -957,14 +966,21 @@ const initPageData = () => {
     activeTab.value = "1";
     isChartArea.value = false;
     tableShowId.value = obj.id;
-    let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
-for(let i =0; i<tableX.length; i++) {
-    let it = tableX[i]
-    if (obj.name.indexOf(it) !== -1) {
-    tableName.value = obj.name.substring(0, obj.name.indexOf(it));
-    break;
+    let tableX = [
+      "未满发样板机_",
+      "满发样板机_",
+      "样板机_",
+      "未满发_",
+      "满发_",
+      "_",
+    ];
+    for (let i = 0; i < tableX.length; i++) {
+      let it = tableX[i];
+      if (obj.name.indexOf(it) !== -1) {
+        tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+        break;
+      }
     }
-}
     tableFilePath.value = obj.path;
     excelType.value = obj.type; // 接收excel的type 用于控制右侧tab展示
 

src/views/fdnlfx/dataAnalysis/hotAnalysis/index.vue

@@ -137,9 +137,8 @@
                     @getSelected="funhotChartSelect"
                   />
                 </div>
-                <div v-if="activeTab === '3'" :style="{ height: tableHeight }">
+                <div v-show="activeTab === '3'" :style="{ height: tableHeight }">
                   <table-cop
-                    class=""
                     :data="tableData"
                     :column="tableColumn"
                     :theme="theme"

src/views/fdnlfx/dataAnalysis/lineAnalysis/index.vue

@@ -991,6 +991,7 @@ const funPower = () => {
         }
       })
       .catch(() => {
+        const res = jsonData.funPowerRes;
         powerxAxis.data = [];
         powerSeries.value = [
           {
@@ -1017,54 +1018,56 @@ const funPower = () => {
             markLine: {},
           },
         ];
-        const xAxis = [],
-          seriesArr = [],
-          countArr = [];
-        for (const val of jsonData.powerData.data) {
-          xAxis.push(val.wt);
-          seriesArr.push(val.avg);
-          countArr.push(val.count);
-        }
-        powerxAxis.data = xAxis;
-        countSeries.value[0].data = countArr.map((o) => {
-          return {
-            value: o,
-            // itemStyle: {
-            // 	color: o < res.data.avg ? 'rgb(197,78,82)' : 'rgb(50,93,171)'
-            // }
-          };
-        });
-        powerSeries.value[0].data = seriesArr.map((o) => {
-          return {
-            value: o,
-            itemStyle: {
-              color: o < res.data.avg ? "rgb(197,78,82)" : "rgb(50,93,171)",
-            },
-          };
-        });
-        let maxValue = Math.max(...seriesArr);
-        if (jsonData.powerData.power > maxValue) {
-          maxValue = res.data.power;
-        } else {
-          maxValue = null;
-        }
-        poweryAxis.value.max = maxValue;
-        powerSeries.value[0].markLine.data = [
-          {
-            yAxis: res.data.avg,
-            name: `平均额定功率${res.data.avg}`,
-            lineStyle: {
-              color: "green",
+        if (res.data.data) {
+          const xAxis = [],
+            seriesArr = [],
+            countArr = [];
+          for (const val of res.data.data) {
+            xAxis.push(val.wt);
+            seriesArr.push(val.avg);
+            countArr.push(val.count);
+          }
+          powerxAxis.data = xAxis;
+          countSeries.value[0].data = countArr.map((o) => {
+            return {
+              value: o,
+              // itemStyle: {
+              // 	color: o < res.data.avg ? 'rgb(197,78,82)' : 'rgb(50,93,171)'
+              // }
+            };
+          });
+          powerSeries.value[0].data = seriesArr.map((o) => {
+            return {
+              value: o,
+              itemStyle: {
+                color: o < res.data.avg ? "rgb(197,78,82)" : "rgb(50,93,171)",
+              },
+            };
+          });
+          let maxValue = Math.max(...seriesArr);
+          if (res.data.power > maxValue) {
+            maxValue = res.data.power;
+          } else {
+            maxValue = null;
+          }
+          poweryAxis.value.max = maxValue;
+          powerSeries.value[0].markLine.data = [
+            {
+              yAxis: res.data.avg,
+              name: `平均额定功率${res.data.avg}`,
+              lineStyle: {
+                color: "green",
+              },
             },
-          },
-          {
-            yAxis: res.data.power,
-            name: `额定功率${res.data.power}`,
-            lineStyle: {
-              color: "red",
+            {
+              yAxis: res.data.power,
+              name: `额定功率${res.data.power}`,
+              lineStyle: {
+                color: "red",
+              },
             },
-          },
-        ];
+          ];
+        }
         powerDialog.value = true;
       });
   }
@@ -1092,65 +1095,61 @@ watch(
 );
 
 const initPageData = () => {
-  actTreeNode.value = null;
   treeData.value = funRepeatMap(JSON.parse(JSON.stringify(jsonData.treeData)));
+  actTreeNode.value = treeData.value[0].children[0].children[0].children[0];
   excelList.value = [];
-  nextTick(() => {
-    if (actTreeNode.value) {
-      if (actTreeNode.value.childs) {
-        excelList.value = actTreeNode.value.childs.map((o) => {
-          return {
-            id: o.id,
-            interval: o.interval,
-            path: o.path,
-            prepareid: o.prepareid,
-            station: o.station,
-            time: o.time,
-            type: o.type,
-            windturbine: o.windturbine,
-            isCheck: false,
-            name: o.path.substring(
-              o.path.indexOf(o.station + "_") + (o.station + "_").length
-            ),
-          };
-        });
-      } else {
-        excelList.value = [];
-      }
-      if (treeCopRef.value && treeCopRef.value.data) {
-        treeCopRef.value.$refs.tree.setCheckedKeys(
-          [actTreeNode.value.id],
-          true
-        );
-        excelCheckIds.value = [actTreeNode.value.childs[0].id];
+  console.log(111, actTreeNode.value);
+  if (actTreeNode.value) {
+    if (actTreeNode.value.childs) {
+      excelList.value = actTreeNode.value.childs.map((o) => {
+        return {
+          id: o.id,
+          interval: o.interval,
+          path: o.path,
+          prepareid: o.prepareid,
+          station: o.station,
+          time: o.time,
+          type: o.type,
+          windturbine: o.windturbine,
+          isCheck: false,
+          name: o.path.substring(
+            o.path.indexOf(o.station + "_") + (o.station + "_").length
+          ),
+        };
+      });
+    } else {
+      excelList.value = [];
+    }
+    if (treeCopRef.value && treeCopRef.value.data) {
+      treeCopRef.value.$refs.tree.setCheckedKeys([actTreeNode.value.id], true);
+      excelCheckIds.value = [actTreeNode.value.childs[0].id];
 
-        wtData.value = [];
-        seriesData.value = [];
+      wtData.value = [];
+      seriesData.value = [];
+      seriesData.value.push({
+        name: "保证功率",
+        type: "line",
+        symbol: "line", //设定为实心点
+        symbolSize: 0, //设定实心点的大小
+        smooth: true, //这个是把线变成曲线
+        data: jsonData.lineData.bzgl || [],
+        xAxisIndex: 0,
+      });
+      for (const wtObj of jsonData.lineData.sjgl) {
         seriesData.value.push({
-          name: "保证功率",
+          // name: wtObj.obj.windturbineId + "\n实际功率",
+          name: wtObj.obj.code + "\n实际功率",
           type: "line",
           symbol: "line", //设定为实心点
           symbolSize: 0, //设定实心点的大小
           smooth: true, //这个是把线变成曲线
-          data: jsonData.lineData.bzgl || [],
+          data: wtObj.sjgl || [],
           xAxisIndex: 0,
         });
-        for (const wtObj of jsonData.lineData.sjgl) {
-          seriesData.value.push({
-            // name: wtObj.obj.windturbineId + "\n实际功率",
-            name: wtObj.obj.code + "\n实际功率",
-            type: "line",
-            symbol: "line", //设定为实心点
-            symbolSize: 0, //设定实心点的大小
-            smooth: true, //这个是把线变成曲线
-            data: wtObj.sjgl || [],
-            xAxisIndex: 0,
-          });
-          wtData.value.push(wtObj.obj);
-        }
+        wtData.value.push(wtObj.obj);
       }
     }
-  });
+  }
 };
 /**mounted */
 onMounted(() => {

src/views/fdnlfx/dataAnalysis/posAnalysis/components/posChart.vue

@@ -1,205 +1,226 @@
 <script setup name="posChart">
-    import {
-        ref,
-        reactive,
-        shallowRef,
-        defineProps,
-        watch,
-        nextTick,
-        onActivated,
-        onMounted,
-        defineEmits
-    } from 'vue'
-    import AMapLoader from '@amap/amap-jsapi-loader';
-    import {
-        ElMessage
-    } from 'element-plus';
-    import httpRequest from '@/utils/request.js'
-    // import stationPosRes from './stationPos.json'
-    const emits = defineEmits(['rightClick', 'mapDone'])
-    const map = shallowRef(null);
-    const aMap = ref(null)
-    const container = ref()
-    const funMapSet = (callback = (flag) => {}) => {
-        AMapLoader.load({
-            key: "	540080009cfdae95b6b5a4f47af24f90", // 申请好的Web端开发者Key，首次调用 load 时必填
-            version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-            plugins: [''], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-        }).then((AMap) => {
-            aMap.value = AMap;
-            map.value = new AMap.Map(container.value, { //设置地图容器id
-                viewMode: "3D", //是否为3D地图模式
-                zoom: 9, //初始化地图级别
-                center: [106.065974, 37.428168], //初始化地图中心点位置
-                layers: [
-                    // 卫星
-                    new AMap.TileLayer.Satellite(),
-                    // 路网
-                    new AMap.TileLayer.RoadNet()
-                ]
-            });
-            callback(true)
-        }).catch(e => {
-            console.error(e);
-            callback(false)
-        })
-    }
-    const funStationPos = async () => {
-        const res = await httpRequest.get('/base/location', {
-            params: {
-                ids: props.ids.join(","),
-            },
-        })
-        if (res.code === 200) {
-            if (res.data && res.data.length) {
-                map.value.clearMap()
-                res.data.forEach(item => {
-                    const marker = new aMap.value.Marker({
-                        icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png",
-                        // icon: "./static/run_Icon.gif",
-                        position: [Number(item.longitude), Number(item.latitude)],
-                        anchor: 'bottom-center'
-                    });
-                    // 设置label标签
-                    // label默认蓝框白底左上角显示，样式className为：amap-marker-label
-                    marker.setLabel({
-                        direction: 'right',
-                        offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
-                        content: `${item.aname}`, //设置文本标注内容
-                    });
-                    map.value.add(marker)
-                    // marker.setTitle(item.name);
-
-                    //创建右键菜单
-                    const contextMenu = new aMap.value.ContextMenu();
-                    /**右键菜单可根据props中传参定义 */
-                    //右键1
-                    contextMenu.addItem("功率曲线拟合", (e) => {
-                        console.log('rightObj====>>>>', rightObj.value)
-                        // funCombineGet(rightObj.value)
-                        emits('rightClick', {
-                            menuIndex: 0,
-                            current: rightObj.value,
-                        })
-                    }, 0);
+import {
+  ref,
+  reactive,
+  shallowRef,
+  defineProps,
+  watch,
+  nextTick,
+  onActivated,
+  onMounted,
+  defineEmits,
+} from "vue";
+import AMapLoader from "@amap/amap-jsapi-loader";
+import { ElMessage } from "element-plus";
+import httpRequest from "@/utils/request.js";
+import jsonData from "./data.json";
+// import stationPosRes from './stationPos.json'
+const emits = defineEmits(["rightClick", "mapDone"]);
+const map = shallowRef(null);
+const aMap = ref(null);
+const container = ref();
+const funMapSet = (callback = (flag) => {}) => {
+  AMapLoader.load({
+    key: "	540080009cfdae95b6b5a4f47af24f90", // 申请好的Web端开发者Key，首次调用 load 时必填
+    version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+    plugins: [""], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  })
+    .then((AMap) => {
+      aMap.value = AMap;
+      map.value = new AMap.Map(container.value, {
+        //设置地图容器id
+        viewMode: "3D", //是否为3D地图模式
+        zoom: 9, //初始化地图级别
+        center: [106.065974, 37.428168], //初始化地图中心点位置
+        layers: [
+          // 卫星
+          new AMap.TileLayer.Satellite(),
+          // 路网
+          new AMap.TileLayer.RoadNet(),
+        ],
+      });
+      callback(true);
+    })
+    .catch((e) => {
+      console.error(e);
+      callback(false);
+    });
+};
+const funStationPos = async () => {
+  //   const res = await httpRequest.get("/base/location", {
+  //     params: {
+  //       ids: props.ids.join(","),
+  //     },
+  //   });
+  const res = {
+    code: 200,
+    data: jsonData.locationData,
+  };
+  if (res.code === 200) {
+    console.log(1122);
+    if (res.data && res.data.length) {
+      map.value.clearMap();
+      res.data.forEach((item) => {
+        const marker = new aMap.value.Marker({
+          icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png",
+          // icon: "./static/run_Icon.gif",
+          position: [Number(item.longitude), Number(item.latitude)],
+          anchor: "bottom-center",
+        });
+        // 设置label标签
+        // label默认蓝框白底左上角显示，样式className为：amap-marker-label
+        marker.setLabel({
+          direction: "right",
+          offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
+          content: `${item.aname}`, //设置文本标注内容
+        });
+        map.value.add(marker);
+        // marker.setTitle(item.name);
 
-                    //右键2
-                    contextMenu.addItem("对风偏差分析", () => {
-                        emits('rightClick', {
-                            menuIndex: 1,
-                            current: rightObj.value,
-                        })
-                    }, 1);
+        //创建右键菜单
+        const contextMenu = new aMap.value.ContextMenu();
+        /**右键菜单可根据props中传参定义 */
+        //右键1
+        contextMenu.addItem(
+          "功率曲线拟合",
+          (e) => {
+            console.log("rightObj====>>>>", rightObj.value);
+            // funCombineGet(rightObj.value)
+            emits("rightClick", {
+              menuIndex: 0,
+              current: rightObj.value,
+            });
+          },
+          0
+        );
 
-                    // //右键2
-                    // contextMenu.addItem("温度与功率分析", () => {
-                    // 	emits('rightClick', {
-                    // 		menuIndex: 2,
-                    // 		current: rightObj.value
-                    // 	})
-                    // }, 2);
-                    map.value.add(marker)
-                    // marker.setTitle(item.name);
-                    // 设置label标签
-                    // label默认蓝框白底左上角显示，样式className为：amap-marker-label
-                    marker.setLabel({
-                        direction: 'right',
-                        offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
-                        content: `${item.name}`, //设置文本标注内容
-                    });
-                    //绑定鼠标右击事件——弹出右键菜单
-                    marker.on('rightclick', function (e) {
-                        rightObj.value = item
-                        contextMenu.open(map.value, e.lnglat);
-                    });
+        //右键2
+        contextMenu.addItem(
+          "对风偏差分析",
+          () => {
+            emits("rightClick", {
+              menuIndex: 1,
+              current: rightObj.value,
+            });
+          },
+          1
+        );
 
-                })
-                map.value.setFitView()
-            }
-        }
+        // //右键2
+        // contextMenu.addItem("温度与功率分析", () => {
+        // 	emits('rightClick', {
+        // 		menuIndex: 2,
+        // 		current: rightObj.value
+        // 	})
+        // }, 2);
+        map.value.add(marker);
+        // marker.setTitle(item.name);
+        // 设置label标签
+        // label默认蓝框白底左上角显示，样式className为：amap-marker-label
+        marker.setLabel({
+          direction: "right",
+          offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
+          content: `${item.aname}`, //设置文本标注内容
+        });
+        //绑定鼠标右击事件——弹出右键菜单
+        marker.on("rightclick", function (e) {
+          rightObj.value = item;
+          contextMenu.open(map.value, e.lnglat);
+        });
+      });
+      map.value.setFitView();
     }
+  }
+};
 
-    const funStationPosvs = async () => {
-        const res = await httpRequest.get('/base/station', {
-            params: {},
-        })
-        if (res.code === 200) {
-            if (res.data && res.data.length) {
-                map.value.clearMap()
-                res.data.forEach(item => {
-                    const marker = new aMap.value.Marker({
-                        icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png",
-                        // icon: "./static/run_Icon.gif",
-                        position: [Number(item.longitude), Number(item.latitude)],
-                        anchor: 'bottom-center'
-                    });
-                    // 设置label标签
-                    // label默认蓝框白底左上角显示，样式className为：amap-marker-label
-                    marker.setLabel({
-                        direction: 'right',
-                        offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
-                        content: `${item.aname}`, //设置文本标注内容
-                    });
-                    map.value.add(marker)
-                    // marker.setTitle(item.name);
-
-                })
-                map.value.setFitView()
-            }
-        }
+const funStationPosvs = async () => {
+  const res = await httpRequest.get("/base/station", {
+    params: {},
+  });
+  if (res.code === 200) {
+    if (res.data && res.data.length) {
+      map.value.clearMap();
+      res.data.forEach((item) => {
+        const marker = new aMap.value.Marker({
+          icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png",
+          // icon: "./static/run_Icon.gif",
+          position: [Number(item.longitude), Number(item.latitude)],
+          anchor: "bottom-center",
+        });
+        // 设置label标签
+        // label默认蓝框白底左上角显示，样式className为：amap-marker-label
+        marker.setLabel({
+          direction: "right",
+          offset: new aMap.value.Pixel(10, 0), //设置文本标注偏移量
+          content: `${item.aname}`, //设置文本标注内容
+        });
+        map.value.add(marker);
+        // marker.setTitle(item.name);
+      });
+      map.value.setFitView();
     }
+  }
+};
 
-    const props = defineProps({
-        ids: {
-            type: Array,
-            default: () => [],
-        },
-        windList: {
-            type: Array,
-            default: () => []
-        },
-        height: {
-            type: String,
-            default: '100%'
-        }
-    })
-    /** 右键后对象数据的接收 */
-    const rightObj = ref(null)
-    /**监听windList */
-    watch(() => props.ids, (val) => {
-        if (val.length > 0) {
-            funStationPos()
-        } else {
-            funStationPosvs()
-        }
-        // httpRequest
-        //     .get("/base/location", {
-        //         params: {
-        //             ids: value.join(","),
-        //         },
-        //     })
-        //     .then((res) => {
-        //         this.searchId = value || [];
-        //         this.wtList = res.data || [];
-        //         this.getWpList();
-        //     });
-    })
-    //created
-    onMounted(() => {
-        funMapSet(mapStatus => {
-            if (!mapStatus) {
-                ElMessage.error('地图未加载成功, 请刷新重试或检查网络!')
-                return false
-            }
-            funStationPos()
-            emits('mapDone', mapStatus)
-        })
-    })
+const props = defineProps({
+  ids: {
+    type: Array,
+    default: () => [],
+  },
+  windList: {
+    type: Array,
+    default: () => [],
+  },
+  height: {
+    type: String,
+    default: "100%",
+  },
+});
+/** 右键后对象数据的接收 */
+const rightObj = ref(null);
+/**监听windList */
+watch(
+  () => props.ids,
+  (val) => {
+    if (val.length > 0) {
+      funStationPos();
+    } else {
+      funStationPosvs();
+    }
+    // httpRequest
+    //     .get("/base/location", {
+    //         params: {
+    //             ids: value.join(","),
+    //         },
+    //     })
+    //     .then((res) => {
+    //         this.searchId = value || [];
+    //         this.wtList = res.data || [];
+    //         this.getWpList();
+    //     });
+  }
+);
+//created
+onMounted(() => {
+  funMapSet((mapStatus) => {
+    if (!mapStatus) {
+      ElMessage.error("地图未加载成功, 请刷新重试或检查网络!");
+      return false;
+    }
+    funStationPos();
+    emits("mapDone", mapStatus);
+  });
+});
 </script>
 <template>
-    <div :style="{height: props.height}">
-        <div class="h-full" ref="container" style="height: 100%">
-            <el-empty description="地图未加载成功, 请刷新重试或检查网络!"></el-empty>
-        </div>
+  <div :style="{ height: props.height }">
+    <div class="h-full" ref="container" style="height: 100%">
+      <el-empty description="地图未加载成功, 请刷新重试或检查网络!"></el-empty>
     </div>
-</template>
+  </div>
+</template>
+<style lang="less" >
+.amap-marker-label {
+  color: #000;
+}
+</style>

src/views/fdnlfx/dataAnalysis/posAnalysis/index.vue

@@ -39,14 +39,19 @@
                 overflow: 'hidden',
               }"
             >
-              <!-- <posChart @mapDone="funMapDone" @rightClick="funRightClick" :height="tableHeight"
-                                :windList="windList" :ids="excelCheckIds" v-if="showOnlineMap" /> -->
+              <posChart
+                @mapDone="funMapDone"
+                @rightClick="funRightClick"
+                :height="tableHeight"
+                :windList="windList"
+                :ids="excelCheckIds"
+              />
               <!-- v-if="showOnlineMap" -->
-              <leafletMap
+              <!-- <leafletMap
                 :windList="windList"
                 :ids="excelCheckIds"
                 @mapDone="funMapDone"
-                @rightClick="funRightClick"
+                @rightClick="funRightClick" -->
               />
             </div>
           </div>

src/views/fdnlfx/dataAnalysis/rateAnalysis/index.vue

@@ -129,7 +129,7 @@
                 </scatter-single-chart-cop>
               </el-col>
             </el-row>
-            <div v-if="activeTab === '2'" :style="{ height: tableHeight }">
+            <div v-show="activeTab === '2'" :style="{ height: tableHeight }">
               <table-cop
                 class=""
                 :data="tableData"

src/views/fdnlfx/report/index.vue

@@ -1605,9 +1605,10 @@ const handleReport = async (index, row) => {
   time.value = row.time;
   //   console.log(index, row)
   centerDialogVisible.value = true;
-  const res = await httpRequest.get(
-    `/report/info?station=${row.station}&date=${row.time}`
-  );
+  // const res = await httpRequest.get(
+  //   `/report/info?station=${row.station}&date=${row.time}`
+  // );
+  const res=jsonData.bgData;
   nbdata.value = res.data.station;
   //    console.log('nb',nbdata.value);
   if (res.data.info.curve.length) {

src/views/fdnlfx/yhjyReport/index.vue

@@ -174,7 +174,7 @@
         >
           根据以上标准，对每台风机的运行数据及隐患问题信息进行分析，结果如下：
         </p>
-        <div >
+        <div>
           <el-table
             class="toolSty"
             :data="fjsxList1"
@@ -601,6 +601,7 @@ import { apiGetbaseStation } from "@/api/gengra";
 import { ElMessage } from "element-plus";
 
 import jsonData from "./dataJson.json";
+import bgData from "./bgData.json";
 import twoxizeJson from "../report/lianggexizeJson";
 export default {
   name: "yhjyReport",
@@ -636,7 +637,8 @@ export default {
   },
 
   mounted() {
-    this.funGetStation();
+    // this.funGetStation();
+    this.handleReportOp();
   },
 
   methods: {
@@ -877,6 +879,8 @@ export default {
       );
     },
     handleReportOp() {
+      this.renderReportPage(bgData);
+      return;
       if (this.reportParamDate) {
         this.OperationName = "";
         this.OperationGs = "";

src/views/powerPrediction/batteryDivinerPage.vue

@@ -477,8 +477,12 @@ export default {
         this.$refs.dayBatter.windTurbines = this.windTurbines;
         this.$refs.dayBatter.windTurbinesVal = this.itemVal;
         this.$nextTick(() => {
-          this.$refs.dayBatter.getChartsData();
-          this.$refs.dayBatter.getTableData();
+          this.$refs.dayBatter.getChartsData(
+            Object.assign({}, jsonData.rChartData)
+          );
+          this.$refs.dayBatter.getTableData(
+            Object.assign({}, jsonData.rTableData)
+          );
         });
       } else {
         this.$refs.moothYear.dialogVisible = true;
@@ -527,8 +531,8 @@ export default {
               type: "hideTip",
             });
           }
-          this.$refs.moothYear.getChartsData();
-          this.$refs.moothYear.getTableData();
+          this.$refs.moothYear.getChartsData(Object.assign({}, jsonData.rChartData));
+          this.$refs.moothYear.getTableData(Object.assign({}, jsonData.rTableData));
         });
       }
     },

src/views/powerPrediction/component/stationPowerControl.json

@@ -88,7 +88,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "雷家山平均风速",
+                "name": "场站01平均风速",
                 "nameEn": "GJNY_SXGS_LJS_FDC_STA",
                 "time": "白天"
             },
@@ -135,7 +135,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "雷家山平均风速",
+                "name": "场站01平均风速",
                 "nameEn": "GJNY_SXGS_LJS_FDC_STA",
                 "time": "夜间"
             },
@@ -182,7 +182,7 @@
                     17.59,
                     19.17
                 ],
-                "name": "雷家山一期",
+                "name": "场站01一期",
                 "nameEn": "GJNY_SXGS_LJSF01_EG",
                 "time": "白天"
             },
@@ -229,7 +229,7 @@
                     22.14,
                     38.98
                 ],
-                "name": "雷家山一期",
+                "name": "场站01一期",
                 "nameEn": "GJNY_SXGS_LJSF01_EG",
                 "time": "夜间"
             },
@@ -276,7 +276,7 @@
                     39.730000000000004,
                     58.15
                 ],
-                "name": "雷家山一期",
+                "name": "场站01一期",
                 "nameEn": "GJNY_SXGS_LJSF01_EG",
                 "time": "合计"
             },
@@ -323,7 +323,7 @@
                     1.73,
                     11.22
                 ],
-                "name": "雷家山二期",
+                "name": "场站01二期",
                 "nameEn": "GJNY_SXGS_LJSF02_EG",
                 "time": "白天"
             },
@@ -370,7 +370,7 @@
                     11.84,
                     12.27
                 ],
-                "name": "雷家山二期",
+                "name": "场站01二期",
                 "nameEn": "GJNY_SXGS_LJSF02_EG",
                 "time": "夜间"
             },
@@ -417,7 +417,7 @@
                     13.57,
                     23.490000000000002
                 ],
-                "name": "雷家山二期",
+                "name": "场站01二期",
                 "nameEn": "GJNY_SXGS_LJSF02_EG",
                 "time": "合计"
             },
@@ -464,7 +464,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "左庄平均风速",
+                "name": "场站02平均风速",
                 "nameEn": "GJNY_SXGS_ZZ_FDC_STA",
                 "time": "白天"
             },
@@ -511,7 +511,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "左庄平均风速",
+                "name": "场站02平均风速",
                 "nameEn": "GJNY_SXGS_ZZ_FDC_STA",
                 "time": "夜间"
             },
@@ -558,7 +558,7 @@
                     30.68,
                     33.1
                 ],
-                "name": "左庄一期",
+                "name": "场站02一期",
                 "nameEn": "GJNY_SXGS_ZZF01_EG",
                 "time": "白天"
             },
@@ -605,7 +605,7 @@
                     36.25,
                     23.25
                 ],
-                "name": "左庄一期",
+                "name": "场站02一期",
                 "nameEn": "GJNY_SXGS_ZZF01_EG",
                 "time": "夜间"
             },
@@ -652,7 +652,7 @@
                     66.93,
                     56.35
                 ],
-                "name": "左庄一期",
+                "name": "场站02一期",
                 "nameEn": "GJNY_SXGS_ZZF01_EG",
                 "time": "合计"
             },
@@ -699,7 +699,7 @@
                     7.73,
                     23.27
                 ],
-                "name": "左庄二期",
+                "name": "场站02二期",
                 "nameEn": "GJNY_SXGS_ZZF02_EG",
                 "time": "白天"
             },
@@ -746,7 +746,7 @@
                     24.93,
                     16.31
                 ],
-                "name": "左庄二期",
+                "name": "场站02二期",
                 "nameEn": "GJNY_SXGS_ZZF02_EG",
                 "time": "夜间"
             },
@@ -793,7 +793,7 @@
                     32.66,
                     39.58
                 ],
-                "name": "左庄二期",
+                "name": "场站02二期",
                 "nameEn": "GJNY_SXGS_ZZF02_EG",
                 "time": "合计"
             },
@@ -840,7 +840,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "繁食沟平均风速",
+                "name": "场站03平均风速",
                 "nameEn": "GJNY_SXGS_FSG_FDC_STA",
                 "time": "白天"
             },
@@ -887,7 +887,7 @@
                     0.0,
                     0.0
                 ],
-                "name": "繁食沟平均风速",
+                "name": "场站03平均风速",
                 "nameEn": "GJNY_SXGS_FSG_FDC_STA",
                 "time": "夜间"
             },
@@ -934,7 +934,7 @@
                     18.28,
                     5.23
                 ],
-                "name": "繁食沟一期",
+                "name": "场站03一期",
                 "nameEn": "GJNY_SXGS_FSGF01_EG",
                 "time": "白天"
             },
@@ -981,7 +981,7 @@
                     28.27,
                     14.16
                 ],
-                "name": "繁食沟一期",
+                "name": "场站03一期",
                 "nameEn": "GJNY_SXGS_FSGF01_EG",
                 "time": "夜间"
             },
@@ -1028,7 +1028,7 @@
                     46.55,
                     19.39
                 ],
-                "name": "繁食沟一期",
+                "name": "场站03一期",
                 "nameEn": "GJNY_SXGS_FSGF01_EG",
                 "time": "合计"
             },
@@ -1075,7 +1075,7 @@
                     13.31,
                     2.76
                 ],
-                "name": "繁食沟二期",
+                "name": "场站03二期",
                 "nameEn": "GJNY_SXGS_FSGF02_EG",
                 "time": "白天"
             },
@@ -1122,7 +1122,7 @@
                     33.95,
                     11.25
                 ],
-                "name": "繁食沟二期",
+                "name": "场站03二期",
                 "nameEn": "GJNY_SXGS_FSGF02_EG",
                 "time": "夜间"
             },
@@ -1169,7 +1169,7 @@
                     47.260000000000005,
                     14.01
                 ],
-                "name": "繁食沟二期",
+                "name": "场站03二期",
                 "nameEn": "GJNY_SXGS_FSGF02_EG",
                 "time": "合计"
             }

src/views/powerPrediction/powerPredictionPage.vue

@@ -815,12 +815,20 @@ export default {
         });
         if (name === "功率预测") {
           this.$refs.prediction.isPower = true;
-          this.$refs.prediction.getChartsData();
-          this.$refs.prediction.getTableData();
+          this.$refs.prediction.getChartsData(
+            Object.assign({}, jsonData.ycChartData)
+          );
+          this.$refs.prediction.getTableData(
+            Object.assign({}, jsonData.ycTableData)
+          );
         } else {
           this.$refs.prediction.isPower = false;
-          this.$refs.prediction.getwindChartsData();
-          this.$refs.prediction.getwindTableData();
+          this.$refs.prediction.getwindChartsData(
+            Object.assign({}, jsonData.fsChartData)
+          );
+          this.$refs.prediction.getwindTableData(
+            Object.assign({}, jsonData.fsTableData)
+          );
         }
       });
     },

src/views/powerPrediction/stationPowerContro.vue

@@ -157,7 +157,7 @@ export default {
       "月" +
       this.pickerTime.split("-")[2] +
       "日";
-    this.getStationData();
+    this.getStationData(jsonData);
   },
   computed: {
     tableHeight() {
@@ -173,12 +173,35 @@ export default {
     },
   },
   methods: {
-    getStationData() {
+    getStationData(res) {
       let that = this;
       that.loading = true;
       let params = {
         date: that.pickerTime,
       };
+      that.loading = false;
+      if (res && res.data) {
+        // that.tableData = res.data.power
+        res.data.power.forEach((iv) => {
+          let obj = {
+            name: iv.name,
+            nameEn: iv.nameEn,
+            time: iv.time,
+          };
+          iv.power.forEach((ic, idx) => {
+            obj[obj.nameEn + (idx + 1)] = ic > 0 ? ic.toFixed(2) : "/";
+          });
+          that.tableData.push(obj);
+        });
+        res.data.title.forEach((it, index) => {
+          let obj = {
+            label: it,
+            value: index,
+          };
+          that.tableColumn.push(obj);
+        });
+      }
+      return;
       apiGetallStationPower(params)
         .then((res) => {
           that.loading = false;