lining 3 gadi atpakaļ
vecāks
revīzija
258f0e1a48

+ 16 - 25
src/api/economic/index.js

@@ -147,7 +147,6 @@ const benchmarkingWtList = (data) => {
 };
 
 const ajaxName = (data) => {
-    console.log(2222);
     return request({
         url: `/consumer/benchmarking/${data.ajaxName}?wpid=${data.wpid}&wtids=${data.wtids}&date=${data.date}&target=${data.target}&sort=${data.sort}`,
         method: "get",
@@ -233,13 +232,6 @@ const  specificFnlylList = (data) => {
     });
 };
 
-// 维护损失率
-const  specificWhsslList = (data) => {
-    return request({
-        url: `/consumer/specific/fnlylList?year=${data.year}`,
-        method: "get",
-    });
-};
  // 故障损失率
  const  specificGzsslList = (data) => {
     return request({
@@ -369,21 +361,21 @@ const  goodnessGetplotBands = (data) => {
 };
 const  goodnessPlotBandAjax = (data) => {
     return request({
-        url: `goodness/plotBandAjax`,
+        url: `/consumer/goodness/plotBandAjax`,
         method: "post",
         data:data
     });
 };
 const  goodnessFindRealPowerCharBy24 = (data) => {
     return request({
-        url: `goodness/findRealPowerCharBy24`,
+        url: `/consumer/goodness/findRealPowerCharBy24`,
         method: "post",
         data:data
     });
 };
 const  goodnessBjjllist = (data) => {
     return request({
-        url: `goodness/bjjllist`,
+        url: `/consumer/goodness/bjjllist`,
         method: "post",
         data:data
     });
@@ -391,21 +383,21 @@ const  goodnessBjjllist = (data) => {
 
 const  goodnessGzjllist = (data) => {
     return request({
-        url: `goodness/gzjllist`,
+        url: `/consumer/goodness/gzjllist`,
         method: "post",
         data:data
     });
 };
 const  goodnessXdjllist = (data) => {
     return request({
-        url: `goodness/xdjllist`,
+        url: `/consumer/goodness/xdjllist`,
         method: "post",
         data:data
     });
 };
 const  goodnessWadAjax = (data) => {
     return request({
-        url: `goodness/wadAjax`,
+        url: `/consumer/goodness/wadAjax`,
         method: "post",
         data:data
     });
@@ -413,28 +405,28 @@ const  goodnessWadAjax = (data) => {
 
 const  goodnessBphlist = (data) => {
     return request({
-        url: `goodness/bjphlist`,
+        url: `/consumer/goodness/bjphlist`,
         method: "post",
         data:data
     });
 };
 const  goodnessGlchat = (data) => {
     return request({
-        url: `goodness/glchat`,
+        url: `/consumer/goodness/glchat`,
         method: "post",
         data:data
     });
 };
 const  goodnessFjfzy = (data) => {
     return request({
-        url: `goodness/fjfzy`,
+        url: `/consumer/goodness/fjfzy`,
         method: "post",
         data:data
     });
 };
 const  requestData1 = (data) => {
     return request({
-        url: `${data.subUrl}`,
+        url: `/consumer/${data.subUrl}`,
         method: "post",
         data:data
     });
@@ -442,14 +434,14 @@ const  requestData1 = (data) => {
 //znzhfx.vue
 const  singleanalysisSingleanalysisSub = (data) => {
     return request({
-        url: `/singleanalysis/singleanalysisSub`,
+        url: `/consumer/singleanalysis/singleanalysisSub`,
         method: "post",
         data:data
     });
 };
 const  singleanalysisSingleanalysisChart = (data) => {
     return request({
-        url: `/singleanalysis/singleanalysisChart`,
+        url: `/consumer/singleanalysis/singleanalysisChart`,
         method: "post",
         data:data
     });
@@ -458,7 +450,7 @@ const  singleanalysisSingleanalysisChart = (data) => {
 
 const  singleanalysisSingleanalysisMain = (data) => {
     return request({
-        url: `singleanalysis/singleanalysisMain`,
+        url: `/consumer/singleanalysis/singleanalysisMain`,
         method: "post",
         data:data
     });
@@ -469,19 +461,19 @@ const  singleanalysisSingleanalysisMain = (data) => {
 //forecast-system.vue
 const  powercompareWindfarmAllAjax2 = (data) => {
     return request({
-        url: `powercompare/windfarmAllAjax`,
+        url: `/consumer/powercompare/windfarmAllAjax`,
         method: "get",
     });
 };
 const  weatherWeatherInfo = (data) => {
     return request({
-        url: `weather/weatherInfo?wpId=${data.wpId}`,
+        url: `/consumer/weather/weatherInfo?wpId=${data.wpId}`,
         method: "get",
     });
 };
 const  weatherWatherChart = (data) => {
     return request({
-        url: `weather/weatherChart`,
+        url: `/consumer/weather/weatherChart`,
         method: "post",
         data:data
     });
@@ -520,7 +512,6 @@ export default {
     specificMaincenterlist,
     specificMaintoplist,
     specificFnlylList,
-    specificWhsslList,
     specificGzsslList,
     specificXdsslList,
     specificXnsslList,

+ 0 - 1
src/views/Decision/Decision1.vue

@@ -318,7 +318,6 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-      console.log(11111111);
       api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
       });

+ 0 - 1
src/views/Decision/Decision3Db.vue

@@ -293,7 +293,6 @@ export default {
       }
     },
     AjaxCommon() {
-      console.log(11111111111);
       api
         .ajaxName({
           ajaxName: this.ajaxName,

+ 0 - 1
src/views/Home/components/map/svg-map-nx.vue

@@ -1178,7 +1178,6 @@ export default {
       }
     },
     mouseover: function (index) {
-      console.log(1111111);
       this.popupHide();
       this.popup[index] = true;
     },

+ 0 - 1
src/views/sampleDatabase/abilityAnalysis/index.vue

@@ -120,7 +120,6 @@ export default {
   },
   methods: {
     async getChart3() {
-      console.log(111111111);
       const res = await this.API.requestData({
         method: "POST",
         subUrl: "yaw/getTotalRanges",

+ 11 - 1
src/views/specific/fnlyl.vue

@@ -315,10 +315,10 @@ export default {
         year = this.monthChange(this.monthValue);
       }
       const site = ["compare", "year", "month"];
-
       api.specificFnlylList({
          year: year,
       }).then((res) => {
+        let stations = {}
          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
@@ -330,6 +330,16 @@ export default {
                 }
               }
             }
+            
+            if(!stations[item.wpid]){
+              stations[item.wpid] = {
+                id:item.wpid,
+                name:item.name||'',
+                children: []
+              }
+            }
+            stations[item.wpid].children.push(item)
+            console.log(stations);
             if (item.wpid === "MHS_FDC") {
               MhsLists.push(item);
             } else if (item.wpid === "NSS_FDC") {

+ 1 - 1
src/views/specific/whssl.vue

@@ -316,7 +316,7 @@ export default {
       }
       const site = ["compare", "year", "month"];
 
-        api.specificWhsslList({
+        api.specificFnlylList({
           year: year,
       }).then((res) => {
          console.log(res);

+ 1 - 0
src/views/specific/xnssl.vue

@@ -222,6 +222,7 @@ import Panel from "../../components/coms/panel/panel.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Get_PDF from "@tools/htmlToPdf";
+import api from "@api/economic/index.js";
 export default {
   setup() {},
   components: {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 233 - 239
src/views/specific/ztfx.vue