update

src/api/cockpit/matrix/index.js

@@ -2,7 +2,7 @@ import request from "../../../tools/request";
 //获取驾驶舱基础信息
 const findBasicDataInfo = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `genreset/findBasicDataInfo?id=${data.id}`,
         method: "get",
     });
@@ -10,21 +10,21 @@ const findBasicDataInfo = (data) => {
 //获取驾驶舱功率曲线图和电量柱状图信息
 const findPowerInfo = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `genreset/findPowerInfo?id=${data.id}`,
         method: "get",
     });
 };
-const findInfo = (subUrl,data) => {
+const findInfo = (subUrl, data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `${subUrl}?id=${data.id}`,
         method: "get",
     });
 };
-const findInfos = (subUrl,data) => {
+const findInfos = (subUrl, data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `${subUrl}?id=${data.id}&targetName=${data.targetName}`,
         method: "get",
     });
@@ -32,7 +32,7 @@ const findInfos = (subUrl,data) => {
 //预测风速电量
 const forecastwindspeedInfo = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `genreset/getForecastwindspeedInfo?wpId=${data.wpId}`,
         method: "get",
     });
@@ -40,7 +40,7 @@ const forecastwindspeedInfo = (data) => {
 //未来5天天气预报功能
 const weatherRealDay5Info = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `genreset/getWeatherRealDay5Info?wpId=${data.wpId}`,
         method: "get",
     });
@@ -49,7 +49,7 @@ const weatherRealDay5Info = (data) => {
 const matrixPush = (showLoading) => {
     return request({
         showLoading,
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `matrix/matrixPush`,
         method: "get",
     });
@@ -57,7 +57,7 @@ const matrixPush = (showLoading) => {
 //全风场简单矩阵
 const findSimpleMatrixAll = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `matrix/findSimpleMatrixAll?wpId=${data.wpId}`,
         method: "get",
     });
@@ -65,7 +65,7 @@ const findSimpleMatrixAll = (data) => {
 //风机信息
 const findWtInfo = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `monitorwt/findWtInfo?wtId=${data.wtId}`,
         method: "get",
     });
@@ -74,7 +74,7 @@ const findWtInfo = (data) => {
 const matrixDetialPush = (showLoading) => {
     return request({
         showLoading,
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `matrix/matrixDetialPush`,
         method: "get",
     });
@@ -82,7 +82,7 @@ const matrixDetialPush = (showLoading) => {
 //
 const findWtWarnInfo = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `monitorwt/findWtWarnInfo?wtId=${data.wtId}`,
         method: "get",
     });
@@ -91,7 +91,7 @@ const findWtWarnInfo = (data) => {
 const matrixQfPush = (showLoading) => {
     return request({
         showLoading,
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `matrix/matrixQfPush`,
         method: "get",
     });
@@ -100,7 +100,7 @@ const matrixQfPush = (showLoading) => {
 const monitor = (showLoading) => {
     return request({
         showLoading,
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `monitor/monitor`,
         method: "get",
     });
@@ -109,14 +109,14 @@ const monitor = (showLoading) => {
 const getAgcValues = (showLoading) => {
     return request({
         showLoading,
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `genreset/getAgcValues`,
         method: "get",
     });
 };
 const windfarmAllAjax = () => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `powercompare/windfarmAllAjax`,
         method: "get",
     });
@@ -124,11 +124,55 @@ const windfarmAllAjax = () => {
 //风机信息列表
 const findWtInfoList = (data) => {
     return request({
-        baseURL:process.env.VUE_APP_Matrix,
+        baseURL: process.env.VUE_APP_Matrix,
         url: `monitorwt/findWtInfoList?wpId=${data.wpId}`,
         method: "get",
     });
 };
+//测风塔
+const monitorFindCftInfo = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `monitor/findCftInfo?wpId=${data.wpId}`,
+        method: "get",
+    });
+};
+
+const powercompareWindfarmAllAjax = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `powercompare/windfarmAllAjax`,
+        method: "get",
+    });
+};
+const genresetFindPowerInfo = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `genreset/findPowerInfo?id=${data.id}`,
+        method: "get",
+    });
+};
+
+//风场矩阵
+const matrixMatrixByWpIdPush = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `matrix/matrixByWpIdPush?wpId=${data.wpId}`,
+        method: "get",
+    });
+};
+
+//总样貌
+const monitorFindGeneralAppearance = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `monitor/findGeneralAppearance?wpId=${data.wpId}`,
+        method: "get",
+    });
+};
+
+
+
 
 export default {
     findBasicDataInfo,
@@ -147,4 +191,9 @@ export default {
     getAgcValues,
     windfarmAllAjax,
     findWtInfoList,
+    monitorFindCftInfo,
+    powercompareWindfarmAllAjax,
+    genresetFindPowerInfo,
+    matrixMatrixByWpIdPush,
+    monitorFindGeneralAppearance,
 }

src/router/index.js

@@ -54,13 +54,11 @@ const routes = [{
 		name: "WindSite",
 		component: () =>
 			import( /* webpackChunkName: "windsite" */ "../views/WindSite/WindSite.vue"),
-		children: [
-			// {
-			// 	path: "home/:wpId", // 场站监视
-			// 	component: () =>
-			// 		import( /* webpackChunkName: "windsitehome" */ "../views/WindSite/pages/Home/Home.vue"),
-			// }, 
-			{
+		children: [{
+				path: "home/:wpId", // 场站监视
+				component: () =>
+					import( /* webpackChunkName: "windsitehome" */ "../views/WindSite/pages/Home/Home.vue"),
+			}, {
 				path: "draughtfanlist/:wpId", // 风机列表
 				component: () =>
 					import( /* webpackChunkName: "windsitedraughtfanlist" */

src/views/HealthControl/assess/assessindex.vue

@@ -180,7 +180,6 @@ export default {
             sortable: true,
             id: "id",
           },
-
           {
             name: "综合排名",
             field: "rank",

src/views/Home/Home.vue

@@ -1062,7 +1062,7 @@ export default {
               max: res.data.jczbmap.zjts,
             },
           ];
-
+          // console.log('res.data.jczbmap',res.data.jczbmap);
           this.jczbmap = res.data.jczbmap;
           this.wxssmap = res.data.wxssmap;
           this.gxkmap = res.data.gxkmap;

src/views/Home/components/map.vue

@@ -185,6 +185,7 @@ export default {
 
   mounted() {
     this.fcId = this.wpId;
+    // console.log('安全天数',this.day);
     this.safeDay = this.day;
     this.sourceMap = this.data;
     this.xtMap = this.xtData;
@@ -248,7 +249,6 @@ export default {
       this.$emit("mapClickBack", wpId, planBtnName);
     },
     clickLabel(wpId, planBtnName) {
-      console.log(111111111,wpId,planBtnName);
       this.mapName = wpId;
       this.currentTitle = planBtnName;
       this.mapIndex = 1;

src/views/WindSite/WindSite.vue

@@ -50,11 +50,11 @@ export default {
     return {
       activeIndex: 0,
       menuDatas: [
-        {
-          icon: "svg-s场站监视",
-          path: "/monitor/windsite/home",
-          text: "场站监视",
-        },
+        // {
+        //   icon: "svg-s场站监视",
+        //   path: "/monitor/windsite/home",
+        //   text: "场站监视",
+        // },
         {
           icon: "svg-s指标列表",
           path: "/monitor/windsite/draughtfanlist",
@@ -115,11 +115,11 @@ export default {
           path: "/monitor/windsite/boosterstation",
           text: "升压站",
         },
-        {
-          icon: "svg-s地图",
-          path: "/monitor/windsite/map",
-          text: "地图",
-        },
+        // {
+        //   icon: "svg-s地图",
+        //   path: "/monitor/windsite/map",
+        //   text: "地图",
+        // },
       ],
     };
   },

src/views/WindSite/pages/BoosterStation.vue

@@ -60,6 +60,7 @@ import PL2 from "../components/boosterstation/pl2.vue";
 import XH from "../components/boosterstation/xh.vue";
 import MCH from "../components/boosterstation/mch.vue";
 import HZJ from "../components/boosterstation/hzj.vue";
+import api from "@api/cockpit/matrix/index.js";
 export default {
   // 名称
   name: "BoosterStation",
@@ -112,12 +113,9 @@ export default {
       });
     },
     getWp() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAllAjax",
-        success(res) {
-          let btnGroup = [
+      api.powercompareWindfarmAllAjax({
+      }).then((res) => {
+             let btnGroup = [
             {
               icon: "svg-wind-site",
               btns: [],
@@ -155,10 +153,59 @@ export default {
 				}
             }
           });
-          that.btnGroups = btnGroup;
-          that.renderBtnActiveIndex();
-        },
+          this.btnGroups = btnGroup;
+          this.renderBtnActiveIndex();
       });
+
+
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAllAjax",
+      //   success(res) {
+      //     let btnGroup = [
+      //       {
+      //         icon: "svg-wind-site",
+      //         btns: [],
+      //       },
+      //       {
+      //         icon: "svg-photovoltaic",
+      //         btns: [],
+      //       },
+      //     ];
+
+      //     res.data.forEach((ele, index) => {
+      //       if (ele.id.indexOf("FDC") !== -1) {
+      //         btnGroup[0].btns.push({
+      //           text: ele.name,
+      //           code: ele.id,
+      //         });
+			//   if(ele.id == 'QS_FDC'){
+			// 	// 当点击为宋六时
+			// 	btnGroup[0].btns.push({
+			// 	  text: '宋堡第六风电场',
+			// 	  code: 'QS3_FDC',
+			// 	});
+			//   }
+      //       } else {
+			// 	btnGroup[1].btns.push({
+			// 	  text: ele.name,
+			// 	  code: ele.id,
+			// 	});
+				
+			// 	if(ele.id == 'PL_GDC'){
+			// 		btnGroup[1].btns.push({
+			// 		  text: '平罗二期光伏电站',
+			// 		  code: 'PL2_GDC',
+			// 		});
+			// 	}
+      //       }
+      //     });
+      //     that.btnGroups = btnGroup;
+      //     that.renderBtnActiveIndex();
+      //   },
+      // });
     },
     renderBtnActiveIndex() {
       this.btnGroups.forEach((pEle, pIndex) => {

src/views/WindSite/pages/DraughtFanList.vue

@@ -1,10 +1,24 @@
 <template>
   <div class="draught-fan-list">
     <div class="btn-group-tabs">
-      <BtnGroup2 :btnGroups="btnGroupsss" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
+      <BtnGroup2
+        :btnGroups="btnGroupsss"
+        :rowIndex="rowIndex"
+        :index="selectIndex"
+        @select="select"
+      ></BtnGroup2>
     </div>
-    <div class="df-table">
-      <table-2 :data="data" :height="'100%'" @headerClick="headerClick"></table-2>
+    <div
+      class="df-table"
+      v-loading="loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+      element-loading-text="加载中"
+    >
+      <table-2
+        :data="data"
+        :height="'100%'"
+        @headerClick="headerClick"
+      ></table-2>
     </div>
   </div>
 </template>
@@ -24,6 +38,7 @@ export default {
   // 数据
   data() {
     return {
+      loading: true,
       btnGroupsss: [
         {
           icon: "fa fa-fire",
@@ -221,12 +236,21 @@ export default {
       //   this.requestDataGDC(showLoading);
       //   return 0;
       // }
-      api.findWtInfoList({
-        wpId: this.wpId,
-      }).then(res =>{
-        res.data.forEach((ele) => {
+      api
+        .findWtInfoList({
+          wpId: this.wpId,
+        })
+        .then((res) => {
+          this.loading = false;
+          res.data.forEach((ele) => {
             for (let key in ele) {
-              if (key !== "code" && key !== "lnid" && key !== "model" && key !== "pjid" && key !== "wpid") {
+              if (
+                key !== "code" &&
+                key !== "lnid" &&
+                key !== "model" &&
+                key !== "pjid" &&
+                key !== "wpid"
+              ) {
                 ele[key] = ele[key] || 0;
               }
             }
@@ -369,7 +393,7 @@ export default {
               },
             ],
           };
-      })
+        });
       // that.API.requestData({
       //   showLoading,
       //   method: "POST",
@@ -378,7 +402,7 @@ export default {
       //     wpId: that.wpId,
       //   },
       //   success(res) {
-          
+
       //   },
       // });
     },
@@ -407,40 +431,40 @@ export default {
     //   this.data = { data: res.data.data, column: column };
     // },
     getWp() {
-      api.windfarmAllAjax().then(res =>{
-          let btnGroups = [
-            {
-              icon: "svg-wind-site",
-              btns: [],
-            },
-            {
-              icon: "svg-photovoltaic",
-              btns: [],
-            },
-          ];
+      api.windfarmAllAjax().then((res) => {
+        let btnGroups = [
+          {
+            icon: "svg-wind-site",
+            btns: [],
+          },
+          {
+            icon: "svg-photovoltaic",
+            btns: [],
+          },
+        ];
 
-          res.data.forEach((ele, index) => {
-            if (ele.id.indexOf("FDC") !== -1) {
-              btnGroups[0].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
-            } else {
-              btnGroups[1].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
-            }
-          });
+        res.data.forEach((ele, index) => {
+          if (ele.id.indexOf("FDC") !== -1) {
+            btnGroups[0].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          } else {
+            btnGroups[1].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          }
+        });
 
-          this.btnGroupsss = btnGroups;
-          this.renderBtnActiveIndex();
-      })
+        this.btnGroupsss = btnGroups;
+        this.renderBtnActiveIndex();
+      });
       // that.API.requestData({
       //   method: "GET",
       //   subUrl: "powercompare/windfarmAllAjax",
       //   success(res) {
-          
+
       //   },
       // });
     },

src/views/WindSite/pages/GeneralAppearance.vue

@@ -1,289 +1,418 @@
 <template>
-	<div class="general-appearance">
-		<div class="btn-group-tabs">
-			<BtnGroup2 :btnGroups="btnGroups" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
-		</div>
-		<div class="panel-title">
-			<div class="panel-title-name">
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/black.png" />
-					<span class="sub-title gray">接入台数</span>
-					<span class="sub-count font-num white">{{ wpnumMap.jrts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/green.png" />
-					<span class="sub-title green">待机台数</span>
-					<span class="sub-count font-num green">{{ wpnumMap.djts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/blue.png" />
-					<span class="sub-title blue">并网台数</span>
-					<span class="sub-count font-num blue">{{ wpnumMap.yxts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/purple.png" />
-					<span class="sub-title pink">限电台数</span>
-					<span class="sub-count font-num pink">{{ wpnumMap.xdts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/red.png" />
-					<span class="sub-title red">故障台数</span>
-					<span class="sub-count font-num red">{{ wpnumMap.gzts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/orange.png" />
-					<span class="sub-title orange">检修台数</span>
-					<span class="sub-count font-num orange">{{ wpnumMap.whts }}</span>
-				</div>
-				<div class="sub-title-item">
-					<img src="../../../assets/map/fan/black.png" />
-					<span class="sub-title gray">离线台数</span>
-					<span class="sub-count font-num gray">{{ wpnumMap.lxts }}</span>
-				</div>
-			</div>
-			<div class="query-actions btnR" v-if="wpId == 'PL01_GC' || wpId == 'PL02_GC'">
-				<button class="btn" :class="wpId == 'PL01_GC'?'green':''" @click="pl('PL01_GC')">平罗一期</button>
-				<button class="btn" :class="wpId == 'PL02_GC'?'green':''" @click="pl('PL02_GC')">平罗二期</button>
-			</div>
-		</div>
-		<div>
-			<MHS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MHS_FDC'" />
-			<NSS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'NSS_FDC'" />
-			<QS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'QS_FDC'" />
-			<SBQ class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'SBQ_FDC'" />
-			<XS class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'XS_FDC'" />
-			<XH class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'XH_GDC'" />
-			<DWK class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'DWK_GDC'" />
-			<PL1 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL_GDC'" />
-			<PL2 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL2_GDC'" />
-			<MCH class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MCH_GDC'" />
-			<HZJ class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'HZJ_GDC'" />
-		</div>
-	</div>
+  <div class="general-appearance">
+    <div class="btn-group-tabs">
+      <BtnGroup2
+        :btnGroups="btnGroups"
+        :rowIndex="rowIndex"
+        :index="selectIndex"
+        @select="select"
+      ></BtnGroup2>
+    </div>
+    <div class="panel-title">
+      <div class="panel-title-name">
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/black.png" />
+          <span class="sub-title gray">接入台数</span>
+          <span class="sub-count font-num white">{{ wpnumMap.jrts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/green.png" />
+          <span class="sub-title green">待机台数</span>
+          <span class="sub-count font-num green">{{ wpnumMap.djts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/blue.png" />
+          <span class="sub-title blue">并网台数</span>
+          <span class="sub-count font-num blue">{{ wpnumMap.yxts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/purple.png" />
+          <span class="sub-title pink">限电台数</span>
+          <span class="sub-count font-num pink">{{ wpnumMap.xdts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/red.png" />
+          <span class="sub-title red">故障台数</span>
+          <span class="sub-count font-num red">{{ wpnumMap.gzts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/orange.png" />
+          <span class="sub-title orange">检修台数</span>
+          <span class="sub-count font-num orange">{{ wpnumMap.whts }}</span>
+        </div>
+        <div class="sub-title-item">
+          <img src="../../../assets/map/fan/black.png" />
+          <span class="sub-title gray">离线台数</span>
+          <span class="sub-count font-num gray">{{ wpnumMap.lxts }}</span>
+        </div>
+      </div>
+      <div
+        class="query-actions btnR"
+        v-if="wpId == 'PL01_GC' || wpId == 'PL02_GC'"
+      >
+        <button
+          class="btn"
+          :class="wpId == 'PL01_GC' ? 'green' : ''"
+          @click="pl('PL01_GC')"
+        >
+          平罗一期
+        </button>
+        <button
+          class="btn"
+          :class="wpId == 'PL02_GC' ? 'green' : ''"
+          @click="pl('PL02_GC')"
+        >
+          平罗二期
+        </button>
+      </div>
+    </div>
+    <div>
+      <MHS
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'MHS_FDC'"
+      />
+      <NSS
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'NSS_FDC'"
+      />
+      <QS
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'QS_FDC'"
+      />
+      <SBQ
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'SBQ_FDC'"
+      />
+      <XS
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'XS_FDC'"
+      />
+      <XH
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'XH_GDC'"
+      />
+      <DWK
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'DWK_GDC'"
+      />
+      <PL1
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'PL_GDC'"
+      />
+      <PL2
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'PL2_GDC'"
+      />
+      <MCH
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'MCH_GDC'"
+      />
+      <HZJ
+        class="general-appearance-body"
+        :data="fjmap"
+        :zmmap="zmmap"
+        v-if="wpId === 'HZJ_GDC'"
+      />
+    </div>
+  </div>
 </template>
 
 <script>
-	import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
-	import MHS from "../components/generalappearance/mhs.vue";
-	import NSS from "../components/generalappearance/nss.vue";
-	import QS from "../components/generalappearance/qs.vue";
-	import SBQ from "../components/generalappearance/sbq.vue";
-	import XS from "../components/generalappearance/xs.vue";
-	import XH from "../components/generalappearance/xh.vue";
-	import DWK from "../components/generalappearance/dwk.vue";
-	import PL1 from "../components/generalappearance/pl1.vue";
-	import PL2 from "../components/generalappearance/pl2.vue";
-	import MCH from "../components/generalappearance/mch.vue";
-	import HZJ from "../components/generalappearance/hzj.vue";
-	export default {
-		// 名称
-		name: "GeneralAppearance",
-		// 使用组件
-		components: {
-			BtnGroup2,
-			MHS,
-			NSS,
-			QS,
-			SBQ,
-			XS,
-			XH,
-			DWK,
-			PL1,
-			PL2,
-			MCH,
-			HZJ
-		},
-		// 数据
-		data() {
-			return {
-				timmer: undefined,
-				wpId: undefined, //场站
-				wpnumMap: {}, //风机监视数量
-				fjmap: [], //场站风机详情
-				zmmap: {},
-				selectIndex: 0,
-				rowIndex: 0,
-				btnGroups: [{
-						icon: "svg-wind-site",
-						btns: [],
-					},
-					{
-						icon: "svg-photovoltaic",
-						btns: [],
-					},
-				],
-			};
-		},
-		created() {
-			let that = this;
-			that.wpId = that.$route.params.wpId;
-			that.$nextTick(() => {
-				that.getWp();
-				that.timmer = setInterval(() => {
-					that.requestData();
-				}, that.$store.state.websocketTimeSec);
-			});
-		},
-		// 函数
-		methods: {
-			select(res) {
-				this.$router.replace({
-					path: `/monitor/windsite/generalappearance/${res.code}`,
-				});
-			},
-			getWp() {
-				let that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "powercompare/windfarmAllAjax",
-					success(res) {
-						let btnGroup = [{
-								icon: "svg-wind-site",
-								btns: [],
-							},
-							{
-								icon: "svg-photovoltaic",
-								btns: [],
-							},
-						];
+import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
+import MHS from "../components/generalappearance/mhs.vue";
+import NSS from "../components/generalappearance/nss.vue";
+import QS from "../components/generalappearance/qs.vue";
+import SBQ from "../components/generalappearance/sbq.vue";
+import XS from "../components/generalappearance/xs.vue";
+import XH from "../components/generalappearance/xh.vue";
+import DWK from "../components/generalappearance/dwk.vue";
+import PL1 from "../components/generalappearance/pl1.vue";
+import PL2 from "../components/generalappearance/pl2.vue";
+import MCH from "../components/generalappearance/mch.vue";
+import HZJ from "../components/generalappearance/hzj.vue";
+import api from "@api/cockpit/matrix/index.js";
+export default {
+  // 名称
+  name: "GeneralAppearance",
+  // 使用组件
+  components: {
+    BtnGroup2,
+    MHS,
+    NSS,
+    QS,
+    SBQ,
+    XS,
+    XH,
+    DWK,
+    PL1,
+    PL2,
+    MCH,
+    HZJ,
+  },
+  // 数据
+  data() {
+    return {
+      timmer: undefined,
+      wpId: undefined, //场站
+      wpnumMap: {}, //风机监视数量
+      fjmap: [], //场站风机详情
+      zmmap: {},
+      selectIndex: 0,
+      rowIndex: 0,
+      btnGroups: [
+        {
+          icon: "svg-wind-site",
+          btns: [],
+        },
+        {
+          icon: "svg-photovoltaic",
+          btns: [],
+        },
+      ],
+    };
+  },
+  created() {
+    let that = this;
+    that.wpId = that.$route.params.wpId;
+    that.$nextTick(() => {
+      that.getWp();
+      that.timmer = setInterval(() => {
+        that.requestData();
+      }, that.$store.state.websocketTimeSec);
+    });
+  },
+  // 函数
+  methods: {
+    select(res) {
+      this.$router.replace({
+        path: `/monitor/windsite/generalappearance/${res.code}`,
+      });
+    },
+    getWp() {
+      api.powercompareWindfarmAllAjax().then((res) => {
+        let btnGroup = [
+          {
+            icon: "svg-wind-site",
+            btns: [],
+          },
+          {
+            icon: "svg-photovoltaic",
+            btns: [],
+          },
+        ];
 
-						res.data.forEach((ele, index) => {
-							if (ele.id.indexOf("FDC") !== -1) {
-								btnGroup[0].btns.push({
-									text: ele.name,
-									code: ele.id,
-								});
-							} else {
-								btnGroup[1].btns.push({
-									text: ele.name,
-									code: ele.id,
-								});
-								// if(ele.id == 'PL_GDC'){
-								// 	btnGroup[1].btns.push({
-								// 	  text: '平罗二期光伏电站',
-								// 	  code: 'PL2_GDC',
-								// 	});
-								// }
-							}
-						});
+        res.data.forEach((ele, index) => {
+          if (ele.id.indexOf("FDC") !== -1) {
+            btnGroup[0].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          } else {
+            btnGroup[1].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+            // if(ele.id == 'PL_GDC'){
+            // 	btnGroup[1].btns.push({
+            // 	  text: '平罗二期光伏电站',
+            // 	  code: 'PL2_GDC',
+            // 	});
+            // }
+          }
+        });
 
-						that.btnGroups = btnGroup;
-						that.renderBtnActiveIndex();
-					},
-				});
-			},
-			requestData() {
-				let that = this;
-				that.API.requestData({
-					method: "POST",
-					subUrl: "monitor/findGeneralAppearance",
-					data: {
-						wpId: that.wpId,
-					},
-					success(res) {
-						if (res.code == 200) {
-							that.wpnumMap = res.data.fczbmap.jczbmap;
-							that.fjmap = res.data.fjmap[0];
-							that.zmmap = res.data.zmmap;
-						}
-					},
-				});
-			},
-			renderBtnActiveIndex() {
-				this.btnGroups.forEach((pEle, pIndex) => {
-					pEle.btns.forEach((cEle, cIndex) => {
-						if (cEle.code === this.wpId) {
-							this.rowIndex = pIndex;
-							this.selectIndex = cIndex;
-						}
-					});
-				});
-			},
-			pl(a) { //单指平罗2个总貌
-				this.$router.replace({
-					path: `/monitor/windsite/generalappearance/${a}`,
-				});
-			}
-		},
-		unmounted() {
-			clearInterval(this.timmer);
-			this.timmer = null;
-		},
-		watch: {
-			$route(res) {
-				this.wpId = res.params.wpId;
-				if (res.params.wpId) {
-					this.requestData();
-					this.renderBtnActiveIndex();
-				}
-			},
-		},
-	};
+        this.btnGroups = btnGroup;
+        this.renderBtnActiveIndex();
+      });
+
+      //   let that = this;
+      //   that.API.requestData({
+      //     method: "GET",
+      //     subUrl: "powercompare/windfarmAllAjax",
+      //     success(res) {
+      //       let btnGroup = [
+      //         {
+      //           icon: "svg-wind-site",
+      //           btns: [],
+      //         },
+      //         {
+      //           icon: "svg-photovoltaic",
+      //           btns: [],
+      //         },
+      //       ];
+
+      //       res.data.forEach((ele, index) => {
+      //         if (ele.id.indexOf("FDC") !== -1) {
+      //           btnGroup[0].btns.push({
+      //             text: ele.name,
+      //             code: ele.id,
+      //           });
+      //         } else {
+      //           btnGroup[1].btns.push({
+      //             text: ele.name,
+      //             code: ele.id,
+      //           });
+      //           // if(ele.id == 'PL_GDC'){
+      //           // 	btnGroup[1].btns.push({
+      //           // 	  text: '平罗二期光伏电站',
+      //           // 	  code: 'PL2_GDC',
+      //           // 	});
+      //           // }
+      //         }
+      //       });
+
+      //       that.btnGroups = btnGroup;
+      //       that.renderBtnActiveIndex();
+      //     },
+      //   });
+    },
+    requestData() {
+
+
+    api.monitorFindGeneralAppearance({
+         wpId: this.wpId,
+      }).then((res) => {
+            if (res.code == 200) {
+            this.wpnumMap = res.data.fczbmap.jczbmap;
+            this.fjmap = res.data.fjmap[0];
+            this.zmmap = res.data.zmmap;
+          }
+      });
+
+
+
+    //   let that = this;
+    //   that.API.requestData({
+    //     method: "POST",
+    //     subUrl: "monitor/findGeneralAppearance",
+    //     data: {
+    //       wpId: that.wpId,
+    //     },
+    //     success(res) {
+    //       if (res.code == 200) {
+    //         that.wpnumMap = res.data.fczbmap.jczbmap;
+    //         that.fjmap = res.data.fjmap[0];
+    //         that.zmmap = res.data.zmmap;
+    //       }
+    //     },
+    //   });
+    },
+    renderBtnActiveIndex() {
+      this.btnGroups.forEach((pEle, pIndex) => {
+        pEle.btns.forEach((cEle, cIndex) => {
+          if (cEle.code === this.wpId) {
+            this.rowIndex = pIndex;
+            this.selectIndex = cIndex;
+          }
+        });
+      });
+    },
+    pl(a) {
+      //单指平罗2个总貌
+      this.$router.replace({
+        path: `/monitor/windsite/generalappearance/${a}`,
+      });
+    },
+  },
+  unmounted() {
+    clearInterval(this.timmer);
+    this.timmer = null;
+  },
+  watch: {
+    $route(res) {
+      this.wpId = res.params.wpId;
+      if (res.params.wpId) {
+        this.requestData();
+        this.renderBtnActiveIndex();
+      }
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	.general-appearance {
-		width: 100%;
-		height: calc(100vh - 90px);
-		display: flex;
-		flex-direction: column;
+.general-appearance {
+  width: 100%;
+  height: calc(100vh - 90px);
+  display: flex;
+  flex-direction: column;
 
-		.btn-group-tabs {
-			display: flex;
-			flex-direction: row;
-		}
+  .btn-group-tabs {
+    display: flex;
+    flex-direction: row;
+  }
 
-		.btnR {
-			flex: 1;
-			text-align: end;
-		}
+  .btnR {
+    flex: 1;
+    text-align: end;
+  }
 
-		.general-appearance-body {
-			flex-grow: 1;
-		}
+  .general-appearance-body {
+    flex-grow: 1;
+  }
 
-		.panel-title {
-			width: 100%;
-			background-color: fade(@darkgray, 40%);
-			margin-top: 1.481vh;
-			padding: 6px;
-			display: flex;
-			align-items: center;
+  .panel-title {
+    width: 100%;
+    background-color: fade(@darkgray, 40%);
+    margin-top: 1.481vh;
+    padding: 6px;
+    display: flex;
+    align-items: center;
 
-			.panel-title-name {
-				color: @green;
-				display: flex;
-				align-items: center;
-				line-height: 0;
-				font-size: 0;
+    .panel-title-name {
+      color: @green;
+      display: flex;
+      align-items: center;
+      line-height: 0;
+      font-size: 0;
 
-				i,
-				span {
-					margin: 0 0 0 1.481vh;
-					line-height: 0;
-					font-size: 13px;
-				}
-			}
+      i,
+      span {
+        margin: 0 0 0 1.481vh;
+        line-height: 0;
+        font-size: 13px;
+      }
+    }
 
-			.sub-title-item {
-				display: flex;
-				align-items: center;
-				margin-left: 16px;
+    .sub-title-item {
+      display: flex;
+      align-items: center;
+      margin-left: 16px;
 
-				.sub-title {
-					font-size: 13px;
-					margin-left: 6px;
-				}
+      .sub-title {
+        font-size: 13px;
+        margin-left: 6px;
+      }
 
-				.sub-count {
-					font-size: 13px;
-					font-weight: 500;
-				}
+      .sub-count {
+        font-size: 13px;
+        font-weight: 500;
+      }
 
-				img {
-					height: 31px;
-				}
-			}
-		}
-	}
+      img {
+        height: 31px;
+      }
+    }
+  }
+}
 </style>

src/views/WindSite/pages/Matrix.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="matrix">
     <div class="btn-group-tabs">
-      <BtnGroup2 :btnGroups="btnGroups" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
+      <BtnGroup2
+        :btnGroups="btnGroups"
+        :rowIndex="rowIndex"
+        :index="selectIndex"
+        @select="select"
+      ></BtnGroup2>
     </div>
     <div class="panel-title">
       <div class="panel-title-name" v-if="sourceMap">
@@ -12,24 +17,45 @@
       </div>
     </div>
     <div class="panel-body">
-      <div class="card" v-for="(cItem, cIndex) of sourceMap.fjmap[0]" :key="cIndex" :class="cItem.color">
+      <div
+        class="card"
+        v-for="(cItem, cIndex) of sourceMap.fjmap[0]"
+        :key="cIndex"
+        :class="cItem.color"
+      >
         <div class="card-panel">
           <div class="card-left">
             <div class="tag">{{ cItem.wtnum }}</div>
             <div class="icon">
-              <span class="svg-icon svg-icon-sm" :class="cItem.color == 'black' ? 'svg-icon-black' : cItem.color == 'gray' ? 'svg-icon-gray' : 'svg-icon-write'">
+              <span
+                class="svg-icon svg-icon-sm"
+                :class="
+                  cItem.color == 'black'
+                    ? 'svg-icon-black'
+                    : cItem.color == 'gray'
+                    ? 'svg-icon-gray'
+                    : 'svg-icon-write'
+                "
+              >
                 <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
               </span>
             </div>
           </div>
           <div class="card-right">
-            <div class="num">{{ cItem.fs }} 
-				<block v-if='cItem.wpId.indexOf("FDC") !== -1'>m/s</block>
-				<block v-else>W/m²</block>
-			</div>
-			<div class="num" v-if='cItem.wpId.indexOf("FDC") == -1' style="height:0.25rem;"> </div>
+            <div class="num">
+              {{ cItem.fs }}
+              <block v-if="cItem.wpId.indexOf('FDC') !== -1">m/s</block>
+              <block v-else>W/m²</block>
+            </div>
+            <div
+              class="num"
+              v-if="cItem.wpId.indexOf('FDC') == -1"
+              style="height: 0.25rem"
+            ></div>
             <div class="num">{{ cItem.gl }} kW</div>
-            <div class="num" v-if='cItem.wpId.indexOf("FDC") !== -1'>{{ cItem.fdjzs }} rpm</div>
+            <div class="num" v-if="cItem.wpId.indexOf('FDC') !== -1">
+              {{ cItem.fdjzs }} rpm
+            </div>
           </div>
         </div>
         <div class="card-percent">
@@ -46,6 +72,7 @@
 import util from "@/helper/util.js";
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
+import api from "@api/cockpit/matrix/index.js";
 export default {
   // 名称
   name: "Matrix",
@@ -130,15 +157,11 @@ export default {
 
     // 请求服务
     requestData(showLoading) {
-      let that = this;
-      that.API.requestData({
-        showLoading,
-        method: "POST",
-        subUrl: "matrix/matrixByWpIdPush",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
+      api
+        .matrixMatrixByWpIdPush({
+          wpId: this.wpId,
+        })
+        .then((res) => {
           if (res.data) {
             let sourceMap = res.data;
             for (let key in sourceMap) {
@@ -147,55 +170,115 @@ export default {
               } else if (key === "fjmap") {
                 sourceMap[key].forEach((pItem) => {
                   pItem.forEach((cItem) => {
-                    cItem.color = that.getColor(cItem.fjzt);
+                    cItem.wtnum = cItem.wtId.slice(-3);
+                    cItem.color = this.getColor(cItem.fjzt);
                     cItem.isShow = true;
                   });
                 });
               }
             }
-            that.sourceMap = sourceMap;
+            this.sourceMap = sourceMap;
           } else {
-            that.sourceMap = {};
+            this.sourceMap = {};
           }
-        },
-      });
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   showLoading,
+      //   method: "POST",
+      //   subUrl: "matrix/matrixByWpIdPush",
+      //   data: {
+      //     wpId: that.wpId,
+      //   },
+      //   success(res) {
+      //     if (res.data) {
+      //       let sourceMap = res.data;
+      //       for (let key in sourceMap) {
+      //         if (key !== "fczbmap" && key !== "fjmap") {
+      //           sourceMap[key] += "";
+      //         } else if (key === "fjmap") {
+      //           sourceMap[key].forEach((pItem) => {
+      //             pItem.forEach((cItem) => {
+      //               cItem.color = that.getColor(cItem.fjzt);
+      //               cItem.isShow = true;
+      //             });
+      //           });
+      //         }
+      //       }
+      //       that.sourceMap = sourceMap;
+      //     } else {
+      //       that.sourceMap = {};
+      //     }
+      //   },
+      // });
     },
 
     getWp() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAllAjax",
-        success(res) {
-          let btnGroups = [
-            {
-              icon: "fa fa-fire",
-              btns: [],
-            },
-            {
-              icon: "fa fa-fire-extinguisher",
-              btns: [],
-            },
-          ];
-
-          res.data.forEach((ele, index) => {
-            if (ele.id.indexOf("FDC") !== -1) {
-              btnGroups[0].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
-            } else {
-              btnGroups[1].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
-            }
-          });
+      api.powercompareWindfarmAllAjax().then((res) => {
+        let btnGroups = [
+          {
+            icon: "fa fa-fire",
+            btns: [],
+          },
+          {
+            icon: "fa fa-fire-extinguisher",
+            btns: [],
+          },
+        ];
+
+        res.data.forEach((ele, index) => {
+          if (ele.id.indexOf("FDC") !== -1) {
+            btnGroups[0].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          } else {
+            btnGroups[1].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          }
+        });
 
-          that.btnGroups = btnGroups;
-          that.renderBtnActiveIndex();
-        },
+        this.btnGroups = btnGroups;
+        this.renderBtnActiveIndex();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAllAjax",
+      //   success(res) {
+      //     let btnGroups = [
+      //       {
+      //         icon: "fa fa-fire",
+      //         btns: [],
+      //       },
+      //       {
+      //         icon: "fa fa-fire-extinguisher",
+      //         btns: [],
+      //       },
+      //     ];
+
+      //     res.data.forEach((ele, index) => {
+      //       if (ele.id.indexOf("FDC") !== -1) {
+      //         btnGroups[0].btns.push({
+      //           text: ele.name,
+      //           code: ele.id,
+      //         });
+      //       } else {
+      //         btnGroups[1].btns.push({
+      //           text: ele.name,
+      //           code: ele.id,
+      //         });
+      //       }
+      //     });
+
+      //     that.btnGroups = btnGroups;
+      //     that.renderBtnActiveIndex();
+      //   },
+      // });
     },
 
     renderBtnActiveIndex() {

src/views/WindSite/pages/Tower.vue

@@ -76,6 +76,7 @@ import WindTower from "./Tower/WindTower.vue";
 import DashPieChart from "@com/chart/pie/dash-pie-chart.vue";
 import DirectionRadarChart from "@com/chart/radar/radar-chart.vue";
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
+import api from "@api/cockpit/matrix/index.js";
 export default {
   // 名称
   name: "Tower",
@@ -148,16 +149,12 @@ export default {
   // 函数
   methods: {
     requestLine() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "genreset/findPowerInfo",
-        timeout: 60000,
-        data: {
-          id: that.wpId,
-        },
-        success(res) {
-          let rdlKey = ["value1", "value2", "value3", "speed"];
+      api
+        .genresetFindPowerInfo({
+            id: this.wpId,
+        })
+        .then((res) => {
+                 let rdlKey = ["value1", "value2", "value3", "speed"];
           let DayPower = {
             // 图表所用单位
             units: ["(万kWh)", "(m/s)"],
@@ -250,51 +247,186 @@ export default {
             });
           });
 
-          that.DayPower = DayPower;
-          that.Powertrend = Powertrend;
-        },
-      });
+          this.DayPower = DayPower;
+          this.Powertrend = Powertrend;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "POST",
+      //   subUrl: "genreset/findPowerInfo",
+      //   timeout: 60000,
+      //   data: {
+      //     id: that.wpId,
+      //   },
+      //   success(res) {
+      //     let rdlKey = ["value1", "value2", "value3", "speed"];
+      //     let DayPower = {
+      //       // 图表所用单位
+      //       units: ["(万kWh)", "(m/s)"],
+      //       value: [
+      //         {
+      //           title: "发电量",
+      //           yAxisIndex: 0,
+      //           value: [],
+      //         },
+      //         {
+      //           title: "上网电量",
+      //           yAxisIndex: 0,
+      //           value: [],
+      //         },
+      //         {
+      //           title: "购网电量",
+      //           yAxisIndex: 0,
+      //           value: [],
+      //         },
+      //         {
+      //           title: "实时风速",
+      //           yAxisIndex: 1,
+      //           value: [],
+      //         },
+      //       ],
+      //     };
+
+      //     let glKey = [
+      //       "value1",
+      //       "value2",
+      //       "value3",
+      //       "value4",
+      //       "value5",
+      //       "value6",
+      //       "value7",
+      //     ];
+      //     let Powertrend = [
+      //       {
+      //         title: "应发功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "实发功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "理论功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "4小时预测功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "保证功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "平均风速",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "24小时预测功率",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //     ];
+
+      //     rdlKey.forEach((keyEle, keyIndex) => {
+      //       res.data.rdlvos.forEach((cEle) => {
+      //         DayPower.value[keyIndex].value.push({
+      //           text: cEle.timestr,
+      //           value: cEle[keyEle],
+      //         });
+      //       });
+      //     });
+
+      //     glKey.forEach((keyEle, keyIndex) => {
+      //       res.data.glvos.forEach((cEle) => {
+      //         Powertrend[keyIndex].value.push({
+      //           text: new Date(cEle.time).formatDate("hh:mm"),
+      //           value: cEle[keyEle],
+      //         });
+      //       });
+      //     });
+
+      //     that.DayPower = DayPower;
+      //     that.Powertrend = Powertrend;
+      //   },
+      // });
     },
     requestData(showLoading) {
-      let that = this;
-      that.API.requestData({
-        showLoading,
-        method: "POST",
-        subUrl: "monitor/findCftInfo",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
-          that.cftmap = res.data.cftmap;
-        },
-      });
+      api
+        .monitorFindCftInfo({
+          wpId: this.wpId,
+        })
+        .then((res) => {
+          this.cftmap = res.data.cftmap;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   showLoading,
+      //   method: "POST",
+      //   subUrl: "monitor/findCftInfo",
+      //   data: {
+      //     wpId: that.wpId,
+      //   },
+      //   success(res) {
+      //     that.cftmap = res.data.cftmap;
+      //   },
+      // });
     },
     getWp() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAllAjax",
-        success(res) {
-          let btnGroups = [
-            {
-              icon: "svg-wind-site",
-              btns: [],
-            },
-          ];
+      api.powercompareWindfarmAllAjax({}).then((res) => {
+        let btnGroups = [
+          {
+            icon: "svg-wind-site",
+            btns: [],
+          },
+        ];
 
-          res.data.forEach((ele, index) => {
-            if (ele.id.indexOf("FDC") !== -1) {
-              btnGroups[0].btns.push({
-                text: ele.name,
-                code: ele.id,
-              });
-            }
-          });
+        res.data.forEach((ele, index) => {
+          if (ele.id.indexOf("FDC") !== -1) {
+            btnGroups[0].btns.push({
+              text: ele.name,
+              code: ele.id,
+            });
+          }
+        });
 
-          that.btnGroupsss = btnGroups;
-          that.renderBtnActiveIndex();
-        },
+        this.btnGroupsss = btnGroups;
+        this.renderBtnActiveIndex();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   subUrl: "powercompare/windfarmAllAjax",
+      //   success(res) {
+      //     let btnGroups = [
+      //       {
+      //         icon: "svg-wind-site",
+      //         btns: [],
+      //       },
+      //     ];
+
+      //     res.data.forEach((ele, index) => {
+      //       if (ele.id.indexOf("FDC") !== -1) {
+      //         btnGroups[0].btns.push({
+      //           text: ele.name,
+      //           code: ele.id,
+      //         });
+      //       }
+      //     });
+
+      //     that.btnGroupsss = btnGroups;
+      //     that.renderBtnActiveIndex();
+      //   },
+      // });
     },
     renderBtnActiveIndex() {
       this.btnGroupsss.forEach((pEle, pIndex) => {