update

src/api/wisdomOverhaul/index.js

@@ -0,0 +1,72 @@
+import request from "../../tools/request";
+
+const sandtableFindWtInfo = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `sandtable/findWtInfo?wpId=${data.wpId}`,
+        method: "POST",
+    });
+};
+const sandtableJudgeWpHealth = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `sandtable/judgeWpHealth?wpId=${data.wpId}`,
+        method: "POST",
+    });
+};
+const queryAlltotal = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `alarm/count/query/alltotal?stationid=${data.stationid}`,
+        method: "get",
+    });
+};
+const countAlltotal = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `shutdown/count/alltotal?stId=${data.stId}`,
+        method: "get",
+    });
+};
+const inventoryGroupcount = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `inventory/groupcount?stId=${data.stId}`,
+        method: "get",
+    });
+};
+const equoperationrecordEquupdatecount = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `equoperationrecord/equupdatecount?stId=${data.stId}`,
+        method: "get",
+    });
+};
+const equoperationrecordTop4 = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `equoperationrecord/top4?stId=${data.stId}`,
+        method: "get",
+    });
+};
+const benchmarkZyzb = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `benchmark/zyzb?windPowerStation=${data.windPowerStation}`,
+        method: "get",
+    });
+};
+
+export default {
+    sandtableFindWtInfo,
+    sandtableJudgeWpHealth,
+    queryAlltotal,
+    countAlltotal,
+    inventoryGroupcount,
+    equoperationrecordEquupdatecount,
+    equoperationrecordTop4,
+    benchmarkZyzb,
+    
+
+
+}

src/api/wisdomOverhaul/lifecycle/index.js

@@ -18,8 +18,8 @@ const warehouseList = (data) => {
 const polineList = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `poline/list?vendor=${data.vendor}&ponum=${data.ponum}&warehouse=${data.warehouse}&starttime=${data.starttime}&endtime=${data.endtime}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
-        method: "get",
+        url: `reliability/poline?vendor=${data.vendor}&ponum=${data.ponum}&warehouse=${data.warehouse}&starttime=${data.starttime}&endtime=${data.endtime}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+        method: "post",
     });
 };
 const windturbineList = (data) => {

src/api/wisdomOverhaul/one/index.js

@@ -3,7 +3,7 @@ import request from "../../../tools/request";
 const analysisDetail = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
+        url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
         method: "get",
     });
 };

src/api/wisdomOverhaul/reliability/index.js

@@ -3,7 +3,7 @@ import request from "../../../tools/request";
 const analysisDetail = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
+        url: `/health/analysis/detail?station=${data.station}&startTs=${data.startTs}&endTs=${data.endTs}&interval=${data.interval}&wtId=${data.wtId}&name=${data.name}`,
         method: "get",
     });
 };

src/views/Home/Home.vue

@@ -932,21 +932,23 @@ export default {
 
   methods: {
 
-       mGetDate(){
-     var date = new Date();
-     var year = date.getFullYear();
-     var month = date.getMonth()+1;
-     var d = new Date(year, month, 0);
-     return d.getDate();
-},
-
-    getDAY(){
-  //  let curDate = new Date();
-  //  let curMonth = curDate.getMonth(); //当前月份 需要加1
-  //  curDate.setMonth(curMonth+1); 
-  //  curDate.setDate(0) //关键
-  //  curDate.getDate(); //计算的当月总天数
-   return this.mGetDate()-new Date().getDate()?this.mGetDate()-new Date().getDate():1 // new Date().getDate()当前几号  总天数-当前即可
+    mGetDate() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var d = new Date(year, month, 0);
+      return d.getDate();
+    },
+
+    getDAY() {
+      //  let curDate = new Date();
+      //  let curMonth = curDate.getMonth(); //当前月份 需要加1
+      //  curDate.setMonth(curMonth+1);
+      //  curDate.setDate(0) //关键
+      //  curDate.getDate(); //计算的当月总天数
+      return this.mGetDate() - new Date().getDate()
+        ? this.mGetDate() - new Date().getDate()
+        : 1; // new Date().getDate()当前几号  总天数-当前即可
     },
     // 打开天气弹窗
     openWeatherDialog() {
@@ -1072,12 +1074,20 @@ export default {
             },
             {
               name: "当月预测电量",
-              value: ((res.data.jczbmap.yfdl+res.data.jczbmap.rycfdl)*(this.getDAY())* 1.08).toFixed(2),
+              value: (
+                (res.data.jczbmap.yfdl + res.data.jczbmap.rycfdl) *
+                this.getDAY() *
+                1.08
+              ).toFixed(2),
               // 预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
               // total: res.data.jczbmap.yfdlsx,
               total:
                 res.data.jczbmap.yycfdl >= res.data.jczbmap.yfdl
-                  ? ((res.data.jczbmap.yfdl+res.data.jczbmap.rycfdl)*(this.getDAY())* 1.08).toFixed(2) + 200
+                  ? (
+                      (res.data.jczbmap.yfdl + res.data.jczbmap.rycfdl) *
+                      this.getDAY() *
+                      1.08
+                    ).toFixed(2) + 200
                   : res.data.jczbmap.yfdl + 200,
             },
             {
@@ -1428,6 +1438,7 @@ export default {
   },
 
   created() {
+
     let that = this;
     that.nowTime = new Date().formatDate("hh:mm:ss");
     that.$nextTick(() => {
@@ -1715,7 +1726,7 @@ export default {
     }
   }
 }
-.haha{
+.haha {
   height: 100px;
   width: 150px;
   position: relative;
@@ -1774,5 +1785,4 @@ export default {
     filter: hue-rotate(360deg);
   }
 }
-
 </style>

src/views/Home/components/weather.vue

@@ -40,14 +40,14 @@
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-日出" />
           </div>
-          <div class="value">{{ sunrise }}</div>
+          <div class="value">{{ sourceMap.richushijian }}</div>
           <div class="text">日出时间</div>
         </Col>
         <Col>
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-日落" />
           </div>
-          <div class="value">{{ sunset }}</div>
+          <div class="value">{{ sourceMap.riluoshijian }}</div>
           <div class="text">日落时间</div>
         </Col>
       </Row>

src/views/NewPages/alarm-center-1.vue

@@ -68,7 +68,6 @@
       </div>
     </div>
 
-
     <panel-3 class="table-panel">
       <table-3 :data="tableData" :height="'85vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
@@ -90,8 +89,6 @@
         </template>
       </table-3>
     </panel-3>
-
-
   </div>
 </template>
 
@@ -279,6 +276,7 @@ export default {
   methods: {
     //对比
     showChart(column) {
+      console.log(55555);
       let that = this;
       that.dialogTitle = column.column.name;
       that.wtId = column.row.name;
@@ -294,7 +292,7 @@ export default {
       );
     },
     requestDetailData(station, startTs, endTs, interval, wtId, name) {
-      BASE.showLoading();
+      // BASE.showLoading();
       api
         .analysisDetail({
           station: station,
@@ -307,6 +305,7 @@ export default {
           name: name,
         })
         .then((res) => {
+          if(res.data)
           if (res.data.length == 1) {
             this.dialogVisible = true;
             BASE.closeLoading();

src/views/SandTable/SandTable.vue

@@ -2,14 +2,14 @@
   <div class="sand-table" id="sandTable">
     <img :src="require('@assets/png/3dback.png')" class="i3dback" />
     <!-- <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" /> -->
-    <StBack></StBack>
-    <ThreeModel1
+    <!-- <StBack></StBack> -->
+    <!-- <ThreeModel1
       class="three-model-layer"
       :data="mapSource"
       @when="when"
       @clickMapItem="clickMapItem"
-    ></ThreeModel1>
-    <div class="sand-table-left" v-if="showPanel">
+    ></ThreeModel1> -->
+    <div class="sand-table-left">
       <PanelSand
         class="left-panel"
         title="气象预测"
@@ -46,101 +46,15 @@
         </template>
       </PanelSandToolbar>
     </div>
-    <div class="sand-table-right" v-if="showPanel">
-      <PanelSand class="right-panel" title="视频监控">
-        <!-- <el-row v-for="(pItem, pIndex) in videoArray" :key="pIndex">
-          <el-col
-            :span="12"
-            class="pre-img-box"
-            v-for="(cItem, cIndex) in pItem"
-            :key="cIndex"
-            @click="openVideoDialog(cItem)"
-          >
-            <div class="mask"></div>
-            <iframe
-              class="pre-img videoBoxiframe"
-              :class="cItem.class"
-              width="95%"
-              height="8.657vh"
-              :src="cItem.url + cItem.token"
-              v-if="cItem.switch"
-            />
-          </el-col> -->
-        <el-row v-for="(pItem, pIndex) in videoArray1" :key="pIndex">
-          <el-col
-            :span="12"
-            class="pre-img-box"
-            v-for="(cItem, cIndex) in pItem"
-            :key="cIndex"
-            @click="openVideoDialog1(cItem)"
-          >
-            <div class="mask"></div>
-            <hlsVideo
-              class="pre-img videoBoxiframe"
-              width="95%"
-              height="8.657vh"
-              :code="cItem.code"
-              :class="cItem.class"
-              v-if="cItem.switch"
-            />
-            <!-- <iframe
-              class="pre-img videoBoxiframe"
-              :class="cItem.class"
-              width="95%"
-              height="8.657vh"
-              src="http://192.168.1.18:1935/hls/NSS_FDC_ZK/index.m3u8"
-              v-if="cItem.switch"
-            /> -->
-          </el-col>
-        </el-row>
-      </PanelSand>
-      <PanelSand class="right-panel mg-t-16" title="工单管理">
-        <div
-          class="person-info-box mg-t-16 animated a0"
-          :class="peopleClass"
-          v-if="workData.data[0]"
-        >
-          <img
-            class="header mg-r-8 bg-green"
-            style="width: 75px; height: 75px; cursor: pointer"
-            :src="workData.data[workDataIndex].imgurl"
-            @click="jumpUrl('/health/frist?tab=2')"
-          />
-          <div class="person-info">
-            <div class="green font-lg" style="font-weight: bold">
-              {{ workData.data[workDataIndex].laborname }}
-            </div>
-            <div class="white font-sm">
-              <span>职务：{{ workData.data[workDataIndex].jobcode }}</span>
-              <!-- <span class="mg-l-16">当前任务编号 000000</span> -->
-            </div>
-            <div class="white font-sm">
-              <!-- 平均检修时间 <span class="green">5</span> 小时 -->
-              开始时间
-              <span class="green">{{
-                workData.data[workDataIndex].starttime
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <div class="table mg-t-8" style="min-height: 180px">
-          <Table :data="workData" />
-        </div>
-      </PanelSand>
-      <PanelSandToolbar class="right-panel mg-t-16" title="部件">
-        <template v-slot:tools>
-          <div class="exchange" @click="changeBjSwitch">
-            <span :class="bjSwitch ? 'gray' : 'green'">库存</span>
-            <i class="green fa fa-exchange mg-l-8 mg-r-8"></i>
-            <span :class="bjSwitch ? 'green' : 'gray'">记录</span>
-          </div>
-        </template>
-        <template v-slot:default>
-          <RadarPieChart height="21vh" :list="bjChartData" title="部件情况" />
-        </template>
-      </PanelSandToolbar>
-    </div>
-    <div class="sand-table-bottom" :style="$store.state.themeName === 'dark' ? 'right: calc(50vw - 545px);' : 'right: calc(50vw - 590px);'" v-if="showPanel">
+
+    <div
+      class="sand-table-bottom"
+      :style="
+        $store.state.themeName === 'dark'
+          ? 'right: calc(50vw - 545px);'
+          : 'right: calc(50vw - 590px);'
+      "
+    >
       <Ppanel
         title="利用小时"
         :data="riseNumber(gxkmap.bg_dxkyss)"
@@ -535,8 +449,7 @@ import Col from "@com/coms/grid/col.vue";
 import Row from "@com/coms/grid/row.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import hlsVideo from "./component/hls.vue";
-import api from "@api/wisdomOverhaul/one/index.js"
-// import api from "@api/wisdomOverhaul/windResource/index.js";
+import api from "@api/wisdomOverhaul/index";
 
 export default {
   // 名称
@@ -785,16 +698,11 @@ export default {
     },
 
     getWtInfo() {
-
-
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "sandtable/findWtInfo",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
+      api
+        .sandtableFindWtInfo({
+          wpId: this.wpId,
+        })
+        .then((res) => {
           res.data.tqmap5.ls.forEach((ele) => {
             ele.time = new Date(ele.time).formatDate("yyyy-MM-dd hh:mm");
           });
@@ -822,8 +730,8 @@ export default {
             });
           });
 
-          that.tqmap1 = res.data.tqmap1;
-          that.tqmap5 = res.data.tqmap5.ls;
+          this.tqmap1 = res.data.tqmap1;
+          this.tqmap5 = res.data.tqmap5.ls;
 
           res.data.sels.forEach((ele) => {
             ele.stopTime = new Date(ele.stopTime).formatDate(
@@ -840,40 +748,103 @@ export default {
             );
           });
 
-          that.sels.data = res.data.sels;
-          that.rmls.data = res.data.rmls;
-          that.gxkmap = res.data.gxkmap;
-          that.weatherChart = weatherChart;
-        },
-      });
+          this.sels.data = res.data.sels;
+          this.rmls.data = res.data.rmls;
+          this.gxkmap = res.data.gxkmap;
+          this.weatherChart = weatherChart;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "POST",
+      //   subUrl: "sandtable/findWtInfo",
+      //   data: {
+      //     wpId: that.wpId,
+      //   },
+      //   success(res) {
+      //     res.data.tqmap5.ls.forEach((ele) => {
+      //       ele.time = new Date(ele.time).formatDate("yyyy-MM-dd hh:mm");
+      //     });
+
+      //     const keys = ["wd", "sd"];
+      //     let weatherChart = [
+      //       {
+      //         title: "温度",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //       {
+      //         title: "湿度",
+      //         smooth: true,
+      //         value: [],
+      //       },
+      //     ];
+
+      //     keys.forEach((key, keyIndex) => {
+      //       res.data.tqmap5.ls.forEach((ele) => {
+      //         weatherChart[keyIndex].value.push({
+      //           text: ele.time,
+      //           value: ele[key],
+      //         });
+      //       });
+      //     });
+
+      //     that.tqmap1 = res.data.tqmap1;
+      //     that.tqmap5 = res.data.tqmap5.ls;
+
+      //     res.data.sels.forEach((ele) => {
+      //       ele.stopTime = new Date(ele.stopTime).formatDate(
+      //         "yyyy-MM-dd hh:mm:ss"
+      //       );
+      //       ele.startTime = new Date(ele.stopTime).formatDate(
+      //         "yyyy-MM-dd hh:mm:ss"
+      //       );
+      //     });
+
+      //     res.data.rmls.forEach((ele) => {
+      //       ele.recodedate = new Date(ele.recodedate).formatDate(
+      //         "yyyy-MM-dd hh:mm:ss"
+      //       );
+      //     });
+
+      //     that.sels.data = res.data.sels;
+      //     that.rmls.data = res.data.rmls;
+      //     that.gxkmap = res.data.gxkmap;
+      //     that.weatherChart = weatherChart;
+      //   },
+      // });
     },
 
     // 获取中部地图数据
     getWpHealthInfo() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "sandtable/judgeWpHealth",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
-          that.mapSource = res.data;
-        },
-      });
+      api
+        .sandtableJudgeWpHealth({
+          wpId: this.wpId,
+        })
+        .then((res) => {
+          this.mapSource = res.data;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "POST",
+      //   subUrl: "sandtable/judgeWpHealth",
+      //   data: {
+      //     wpId: that.wpId,
+      //   },
+      //   success(res) {
+      //     that.mapSource = res.data;
+      //   },
+      // });
     },
 
     // 获取报警玫瑰图
     getWarnMGT() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/query/alltotal",
-        data: {
-          stationid: that.wpId,
-        },
-        success(res) {
+      api
+        .queryAlltotal({
+          stationid: this.wpId,
+        })
+        .then((res) => {
           let warnChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];
@@ -882,22 +853,38 @@ export default {
               name: ele.relatePartsText,
             });
           }
-          that.warnChartData = warnChartData;
-        },
-      });
+          this.warnChartData = warnChartData;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://192.168.1.18:8075/",
+      //   subUrl: "alarm/count/query/alltotal",
+      //   data: {
+      //     stationid: that.wpId,
+      //   },
+      //   success(res) {
+      //     let warnChartData = [];
+      //     for (let key in res.data) {
+      //       const ele = res.data[key];
+      //       warnChartData.push({
+      //         value: ele.count,
+      //         name: ele.relatePartsText,
+      //       });
+      //     }
+      //     that.warnChartData = warnChartData;
+      //   },
+      // });
     },
 
     // 获取故障玫瑰图
     getStopMGT() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "shutdown/count/alltotal",
-        data: {
-          stId: that.wpId,
-        },
-        success(res) {
+      api
+        .countAlltotal({
+          stId: this.wpId,
+        })
+        .then((res) => {
           let warnChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];
@@ -906,22 +893,38 @@ export default {
               name: ele.type,
             });
           }
-          that.warnChartData = warnChartData;
-        },
-      });
+          this.warnChartData = warnChartData;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://192.168.1.18:8075/",
+      //   subUrl: "shutdown/count/alltotal",
+      //   data: {
+      //     stId: that.wpId,
+      //   },
+      //   success(res) {
+      //     let warnChartData = [];
+      //     for (let key in res.data) {
+      //       const ele = res.data[key];
+      //       warnChartData.push({
+      //         value: ele.count,
+      //         name: ele.type,
+      //       });
+      //     }
+      //     that.warnChartData = warnChartData;
+      //   },
+      // });
     },
 
     // 获取库存玫瑰图
     getRepertoryMGT() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:9988/",
-        subUrl: "inventory/groupcount",
-        data: {
-          stId: that.wpId,
-        },
-        success(res) {
+      api
+        .inventoryGroupcount({
+          stId: this.wpId,
+        })
+        .then((res) => {
           let bjChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];
@@ -930,22 +933,38 @@ export default {
               name: ele.description,
             });
           }
-          that.bjChartData = bjChartData;
-        },
-      });
+          this.bjChartData = bjChartData;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://192.168.1.18:9988/",
+      //   subUrl: "inventory/groupcount",
+      //   data: {
+      //     stId: that.wpId,
+      //   },
+      //   success(res) {
+      //     let bjChartData = [];
+      //     for (let key in res.data) {
+      //       const ele = res.data[key];
+      //       bjChartData.push({
+      //         value: ele.curbal,
+      //         name: ele.description,
+      //       });
+      //     }
+      //     that.bjChartData = bjChartData;
+      //   },
+      // });
     },
 
     // 获取记录玫瑰图
     getRecordMGT() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:9988/",
-        subUrl: "equoperationrecord/equupdatecount",
-        data: {
-          stId: that.wpId,
-        },
-        success(res) {
+      api
+        .equoperationrecordEquupdatecount({
+          stId: this.wpId,
+        })
+        .then((res) => {
           let bjChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];
@@ -954,46 +973,87 @@ export default {
               name: ele.description,
             });
           }
-          that.bjChartData = bjChartData;
-        },
-      });
+          this.bjChartData = bjChartData;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://192.168.1.18:9988/",
+      //   subUrl: "equoperationrecord/equupdatecount",
+      //   data: {
+      //     stId: that.wpId,
+      //   },
+      //   success(res) {
+      //     let bjChartData = [];
+      //     for (let key in res.data) {
+      //       const ele = res.data[key];
+      //       bjChartData.push({
+      //         value: ele.count,
+      //         name: ele.description,
+      //       });
+      //     }
+      //     that.bjChartData = bjChartData;
+      //   },
+      // });
     },
 
     // 获取中部地图数据
     getTop4Info() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://192.168.1.18:9988/",
-        subUrl: "equoperationrecord/top4",
-        data: {
-          stId: that.wpId,
-        },
-        success(res) {
+      api
+        .equoperationrecordTop4({
+          stId: this.wpId,
+        })
+        .then((res) => {
           res.data.forEach((ele, index) => {
             ele.index = index;
             ele.jobcode = ele.jobcode || "------";
           });
-          that.workData.data = res.data;
-        },
-      });
+          this.workData.data = res.data;
+        });
+
+      //   let that = this;
+      //   that.API.requestData({
+      //     method: "GET",
+      //     baseURL: "http://192.168.1.18:9988/",
+      //     subUrl: "equoperationrecord/top4",
+      //     data: {
+      //       stId: that.wpId,
+      //     },
+      //     success(res) {
+      //       res.data.forEach((ele, index) => {
+      //         ele.index = index;
+      //         ele.jobcode = ele.jobcode || "------";
+      //       });
+      //       that.workData.data = res.data;
+      //     },
+      //   });
     },
 
     // 获取主要指标
     getWpMainInfo() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.155.32.4:8034/",
-        subUrl: "benchmark/zyzb",
-        data: {
-          windPowerStation: that.wpId,
-        },
-        success(res) {
-          that.mainInfo = res.data;
-          that.showMainInfoDialog = true;
-        },
-      });
+      api
+        .benchmarkZyzb({
+          windPowerStation: this.wpId,
+        })
+        .then((res) => {
+          this.mainInfo = res.data;
+          this.showMainInfoDialog = true;
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: "GET",
+      //   baseURL: "http://10.155.32.4:8034/",
+      //   subUrl: "benchmark/zyzb",
+      //   data: {
+      //     windPowerStation: that.wpId,
+      //   },
+      //   success(res) {
+      //     that.mainInfo = res.data;
+      //     that.showMainInfoDialog = true;
+      //   },
+      // });
     },
 
     clickStopRow(row) {

src/views/WindSite/WindSite.vue

@@ -110,11 +110,11 @@ export default {
           path: "/monitor/windsite/generalappearance",
           text: "总貌图",
         },
-        {
-          icon: "svg-s升压站",
-          path: "/monitor/windsite/boosterstation",
-          text: "升压站",
-        },
+        // {
+        //   icon: "svg-s升压站",
+        //   path: "/monitor/windsite/boosterstation",
+        //   text: "升压站",
+        // },
         // {
         //   icon: "svg-s地图",
         //   path: "/monitor/windsite/map",

src/views/allLifeManage/tab2.vue

@@ -315,9 +315,9 @@ export default {
     },
 
     getTableData() {
-      let that = this;
-      if (!that.wpId) {
-        that.BASE.showMsg({
+      // let that = this;
+      if (!this.wpId) {
+        this.BASE.showMsg({
           msg: "场站与日期不可为空",
         });
       } else {

src/views/layout/Menu.vue

@@ -60,7 +60,6 @@
             :class="subIndex == index ? 'green' : 'gray'"
           >
             {{ menu.text }}
-            {{ menu.text }}
           </div>
         </router-link>
       </li>
@@ -122,6 +121,11 @@ export default {
               icon: "svg-wind-site",
               path: "/monitor/windsite/draughtfanlist/CL_FDC",
             },
+            {
+              text: "升压站",
+              icon: "svg-s升压站",
+              path: "/monitor/windsite/boosterstation/CL_FDC",
+            },
           ],
         },
         {

src/views/nxfx/qxpclfx.vue

@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div>
     <div class="query mg-b-8">
       <div class="query-items">
@@ -163,8 +163,9 @@ export default {
   created() {
     this.ChangZhanVal();
     this.date = this.getDate(1);
-    this.date2 = this.getDate(2);
+   
     this.getTable(this.date);
+    // this.getTable(this.date1);
   },
   methods: {
     // 获取表格数据
@@ -177,8 +178,8 @@ export default {
           isAsc: "asc",
           wpId: this.value1,
           recorddate: date,
-            pageNum: 1,
-          pageSize:1000,
+          pageNum: 1,
+          pageSize: 1000,
         })
         .then((res) => {
           this.tableLoading = false;
@@ -199,50 +200,21 @@ export default {
             this.tableData.data = data;
           }
         });
-
-      // that.API.requestData({
-      //   timeout: 60000,
-      //   method: "POST",
-      //   subUrl: "/leaderboard/curvefittingmainList",
-      //   data: {
-      //     isAsc: "asc",
-      //     wpId: that.value1,
-      //     recorddate: date,
-      //   },
-      //   success(res) {
-      //     that.tableLoading = false;
-      //     if (res.code === 200) {
-      //       // that.tableData.data = res.data
-      //       var data = [];
-      //       res.data.forEach((item, index) => {
-      //         data[index] = {
-      //           fj: item.windturbineid,
-      //           sjbz: item.deviationrate2,
-      //           sjzy: item.deviationrate1,
-      //           zybz: item.deviationrate3,
-      //           hb: item.monthdeviationrate,
-      //           tb: item.yeardeviationrate,
-      //           bbgfj: item.standarddeviationrate,
-      //         };
-      //       });
-      //       that.tableData.data = data;
-      //     }
-      //   },
-      //   Error(res) {
-      //     console.log("tag", res);
-      //   },
-      // });
     },
     //   tab
     handleOpen(vl, index) {
+      console.log(index);
       this.$nextTick(() => {
         this.cur = index;
         this.showTitle = vl;
         if (index == 0) {
           this.getDate(1);
+          this.getTable(this.date);
           this.shows = true;
         } else {
           this.getDate(2);
+           this.date = this.getDate(2);
+          this.getTable(this.date);
           this.shows = false;
         }
       });

src/views/windAnalysis/tab3.vue

@@ -89,8 +89,9 @@ export default {
 
     // 获取线路
     getLine(){
+
       api.lineWpIdAjax({
-        wpIds: this.wpId
+       wpId: this.wpId
       }).then((res) => {
         this.wpArray = res.data;
           this.projectArray = res.data;