update

src/api/wisdomOverhaul/energy/index.js

@@ -0,0 +1,32 @@
+import request from "../../../tools/request";
+
+
+const yawGetPassRate = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `yaw/getPassRate?wtId=${data.wtId}$beginDate=${data.beginDate}$endDate=${data.endDate}$type=${data.type}`,
+        method: "get",
+    });
+};
+const yawGetTotalRanges = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `yaw/getTotalRanges?wtId=${data.wtId}$beginDate=${data.beginDate}$endDate=${data.endDate}$type=${data.type}`,
+        method: "get",
+    });
+};
+const yawGetRanges = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `yaw/getRanges?wtId=${data.wtId}$beginDate=${data.beginDate}$endDate=${data.endDate}$type=${data.type}$value=${data.value}`,
+        method: "get",
+    });
+};
+
+
+
+export default {
+    yawGetPassRate,
+    yawGetTotalRanges,
+    yawGetRanges
+}

src/api/wisdomOverhaul/fault/index.js

@@ -25,8 +25,8 @@ const stopanalysisStopAnalysisTree = (data) => {
 const eventGetShutdownevent = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `/event/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}`,
-        method: "get",
+        url: `/fault/getShutdownevent?pageNum=${data.tablepar.pageNum}&pageSize=${data.tablepar.pageSize}&beginDate=${data.beginDate}&endDate=${data.endDate}&wpId=${data.wpId}&type=${data.type}&wtId=${data.wtId}`,
+        method: "post",
     });
 };
 

src/api/wisdomOverhaul/health/index.js

@@ -6,10 +6,10 @@ const requestRecommen = (data) => {
         method: "get",
     });
 };
-const recommen = (url,data) => {
+const recommen = (url, data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `${url}`,
+        url: `${url}?rid=${data.rid}`,
         method: "post",
         data: data
     });
@@ -161,6 +161,13 @@ const healthsubFindWtHisValueForBj = (data) => {
         method: "get",
     });
 };
+const healthreportHealthReport = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `healthreport/healthReport?wtid=${data.wtid}&date=${data.date}`,
+        method: "get",
+    });
+};
 
 
 
@@ -190,4 +197,5 @@ export default {
     healthsubFindPowerChar,
     healthsubGetWeatherRealDay5Info,
     healthsubFindWtHisValueForBj,
+    healthreportHealthReport,
 }

src/api/wisdomOverhaul/lifecycle/index.js

@@ -0,0 +1,47 @@
+import request from "../../../tools/request";
+
+
+const companiesList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `companies/list`,
+        method: "get",
+    });
+};
+const warehouseList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `warehouse/list`,
+        method: "get",
+    });
+};
+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",
+    });
+};
+const windturbineList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `windturbine/list?wtid=${data.wtid}`,
+        method: "get",
+    });
+};
+const equoperationrecordList = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `equoperationrecord/list?wtid=${data.wtid}&starttime=${data.starttime}&endtime=${data.endtime}&type=${data.type}&pagenum=${data.pagenum}&pagesize=${data.pagesize}`,
+        method: "get",
+    });
+};
+
+export default {
+    companiesList,
+    warehouseList,
+    polineList,
+    windturbineList,
+    equoperationrecordList
+
+}

src/api/wisdomOverhaul/one/index.js

@@ -0,0 +1,13 @@
+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}`,
+        method: "get",
+    });
+};
+
+export default {
+    analysisDetail
+}

src/api/wisdomOverhaul/windResources/index.js

@@ -2,7 +2,7 @@ import request from "../../../tools/request";
 const scatterAjax = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}`,
+        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}&month=${data.month}`,
         method: "get",
     });
 };

src/assets/styles/form.less

@@ -85,7 +85,6 @@
       flex: 0 0 auto;
      
     }
-
   }
 
   input {

src/components/coms/cards/percent-card-2.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="card-value">
         <span class="value-text gray">{{ ActualText }}</span>
-        <span class="white">{{ ActualValue  }}</span>
+        <span class="white">{{ ActualValue*10  }}</span>
       </div>
     </div>
   </div>

src/components/coms/panel/panel.vue

@@ -73,12 +73,12 @@ export default {
 
   .panel-header {
     display: flex;
-    font-size: 16px;
+    font-size: 14px;
     padding-left: 1.185vh;
     background: rgba(255, 255, 255, 10%);
-    line-height: 45px;
+    line-height: 27px;
     margin-bottom: 0.7407vh;
-    height: 45px;
+    height: 27px;
 
     .panel-title {
       color: fade(#fff, 75);

src/components/coms/table/group-table.vue

@@ -2,6 +2,7 @@
   <el-table class="custom-table" :show-summary="summary" :class="customClass" stripe :data="data.data" :height="height" style="width: 100%" @cell-click="onClick" @header-click="onHeaderClick" ref="groupTable">
     <template v-for="(col, cIndex) in data.column" :key="col">
       <el-table-column v-if="col.child && col.child.length > 0" :label="col.name" :key="col">
+  
         <el-table-column
           v-for="(sub, sindex) in col.child"
           :key="sub"
@@ -21,7 +22,10 @@
             <slot :name="sub.field" :column="sub" :row="item.row" :all="item" :data="item.row[item.field]"></slot>
           </template>
         </el-table-column>
+        
+
       </el-table-column>
+
       <el-table-column
         v-if="!col.child"
         :label="col.name"
@@ -38,6 +42,7 @@
           <slot :name="col.field" :column="col" :row="item.row" :all="item" :data="item.row[col.field]"></slot>
         </template>
       </el-table-column>
+      
     </template>
   </el-table>
   <el-pagination class="mg-t-8"
@@ -189,6 +194,7 @@ export default {
   },
   mounted() {
     // 渲染后
+    console.log(this.data,555555555555555555);
   },
   beforeUpdate() {},
   updated() {},

src/views/Agc/Agc.vue

@@ -131,6 +131,7 @@ export default {
               // console.log('datas',datas);
               datas.push(pEle);
             });
+            console.log(datas);
             this.datas = datas;
           } else {
             this.datas = datas;

src/views/Agc/components/agc-panel.vue

@@ -104,7 +104,7 @@
         </tr>
       </tbody>
     </table>
-    <!-- 查看默认实例去除末尾参数 :list 即可 -->
+    <!-- 查看默认实例去除末尾参数 :list 即可   图 -->
     <DoubleLineChart
       v-if="chartType === 'double'"
       height="20vh"

src/views/Decision/Decision2.vue

@@ -146,7 +146,7 @@
       <div>
         <panel title="损失电量分析">
           <multiple-bar-chart
-            :height="'calc(100vh - 21.5vh - 500px)'"
+            :height="'calc(100vh - 26.5vh - 500px)'"
             :list="analyis"
             :customerTooltip="true"
             @tooltip="tooltip"

src/views/Decision/Decision2Cjdb.vue

@@ -96,7 +96,7 @@
       <div>
         <panel title="损失电量分析">
           <multiple-bar-chart
-            :height="'calc(100vh - 21.3vh - 500px)'"
+            :height="'calc(100vh - 23.3vh - 500px)'"
             :list="analyis"
             :customerTooltip="true"
             @tooltip="tooltip"

src/views/Decision/Decision2Cndb.vue

@@ -77,7 +77,7 @@
         <el-col :span="24" class="pd-l-8">
           <panel title="损失电量分析">
             <multiple-bar-chart
-              height="30vh"
+              height="28vh"
               :list="analyis"
               :customerTooltip="true"
               @tooltip="tooltip"

src/views/Decision/Decision2Xldb.vue

@@ -94,7 +94,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions">
+      <div :class="detailShow == 2 ? 'query-actions1' : 'query-actions'">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
         <button class="btn">导出</button>
@@ -160,7 +160,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-		:title="[windNum,windNum2]"
+        :title="[windNum, windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -758,7 +758,7 @@ export default {
     api.benchmarkingWplist({}).then((res) => {
       this.value1.push(res.data[0].id);
       this.AjaxCommon();
-      this.ChangZhanChange(this.value1)
+      this.ChangZhanChange(this.value1);
     });
 
     // that.API.requestData({
@@ -828,14 +828,13 @@ export default {
       this.clearDb();
     },
     XianLuVal(val) {
-
-      api.benchmarkingLineList({
-        projects: val,
-      }).then((res) => {
-        this.XianLu = res.data;
-      });
-
-
+      api
+        .benchmarkingLineList({
+          projects: val,
+        })
+        .then((res) => {
+          this.XianLu = res.data;
+        });
 
       // var that = this;
       // that.API.requestData({
@@ -882,17 +881,18 @@ export default {
       }
     },
     AjaxCommon() {
-
-      api.benchmarkingXldb({
-        wpids: this.value1,
+      api
+        .benchmarkingXldb({
+          wpids: this.value1,
           projectids: this.value2,
           lineids: this.value3,
           beginDate: this.value4,
           endDate: this.value5,
           target: "",
           sort: "",
-      }).then((res) => {
-         this.ajaxData = res.data;
+        })
+        .then((res) => {
+          this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -1018,8 +1018,7 @@ export default {
           this.outerLl = ll;
 
           this.analyis = analyis;
-      });
-
+        });
 
       // var that = this;
       // that.API.requestData({

src/views/Decision/Decision3.vue

@@ -136,7 +136,7 @@
       </el-row>
       <panel title="损失电量分析">
         <multiple-bar-chart
-          :height="'calc(100vh - 21.3vh - 430px)'"
+          :height="'calc(100vh - 23.3vh - 430px)'"
           :list="analyis"
           :customerTooltip="true"
           @tooltip="tooltip"

src/views/Home/Home.vue

@@ -1204,6 +1204,7 @@ export default {
           });
 
           this.DayPower = DayPower;
+          console.log(DayPower,'DayPower');
           this.Powertrend = Powertrend;
         });
     },

src/views/Home/components/map/KB_FDC.vue

@@ -216,7 +216,7 @@
         <rect
           x="205"
           y="161"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -237,7 +237,7 @@
         <rect
           x="207"
           y="65"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -258,7 +258,7 @@
         <rect
           x="194"
           y="25"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -298,7 +298,7 @@
         <rect
           x="98"
           y="170"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -319,7 +319,7 @@
         <rect
           x="88"
           y="78"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -340,7 +340,7 @@
         <rect
           x="113"
           y="47"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -380,7 +380,7 @@
         <rect
           x="68"
           y="230"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -402,7 +402,7 @@
         <rect
           x="110"
           y="270"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -424,7 +424,7 @@
         <rect
           x="153"
           y="250"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -465,7 +465,7 @@
         <rect
           x="200"
           y="222"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -486,7 +486,7 @@
         <rect
           x="256"
           y="185"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -507,7 +507,7 @@
         <rect
           x="355"
           y="145"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -529,7 +529,7 @@
         <rect
           x="390"
           y="185"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -551,7 +551,7 @@
         <rect
           x="485"
           y="70"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -573,7 +573,7 @@
         <rect
           x="375"
           y="30"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -595,7 +595,7 @@
         <rect
           x="445"
           y="150"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -617,7 +617,7 @@
         <rect
           x="515"
           y="35"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -639,7 +639,7 @@
         <rect
           x="465"
           y="15"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -661,7 +661,7 @@
         <rect
           x="348"
           y="100"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -683,7 +683,7 @@
         <rect
           x="285"
           y="85"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -705,7 +705,7 @@
         <rect
           x="405"
           y="56"
-          width="70"
+          width="99"
           height="23"
           stroke="#46C55A35"
           fill="#000000"
@@ -802,6 +802,7 @@ export default {
         // 点击事件
         element.addEventListener("click", function () {
           Array.prototype.forEach.call(elsImage, (ele, index) => {
+            console.log(ele,9999999999);
             // 遍历map-float元素 清空凸起
             ele.style.display = "none";
           });

src/views/Home/components/map/svg-map-nx.vue

@@ -169,10 +169,11 @@
         />
         <g>
           <g v-if="showPoint">
-            <!-- @click.stop="clickLabel('CL_FDC', '崇礼风电场')"  -->
+           
             <g
               v-if="showType === 'all' || showType === 'fc'"
               class="item-label"
+               @click.stop="clickLabel('CL_FDC', '崇礼风电场')" 
               @mouseover="mouseover(0)"
               @mouseout="mouseout"
             >
@@ -367,9 +368,10 @@
           </g>
 
           <g v-if="showPoint">
-            <!-- @click.stop="clickLabel('DX_FDC', '代县风电场')" -->
+           
             <g
               v-if="showType === 'all' || showType === 'fc'"
+               @click.stop="clickLabel('DX_FDC', '代县风电场')"
               class="item-label"
               @mouseover="mouseover(2)"
               @mouseout="mouseout"

src/views/LightMatrix1/LightMatrix1.vue

@@ -450,7 +450,9 @@ export default {
 
     // 请求服务
     requestData(showLoading) {
+      // console.log(111111);
       api.matrixPush(showLoading).then((res) => {
+        console.log(res.data);
         if (res) {
           let sourceMap = res.data;
           let fjmap = [];

src/views/NewPages/history-search.vue

@@ -18,13 +18,13 @@
             </el-date-picker>
           </div>
         </div>
-        <div class="query-item">
+        <!-- <div class="query-item">
           <div class="lable">间隔：</div>
           <div class="search-input">
             <el-input v-model="form.interval" type="number"></el-input>
           </div>
-        </div>
-        <div class="query-item">
+        </div> -->
+        <!-- <div class="query-item">
           <div class="lable">间隔：</div>
           <div class="search-input">
             <el-checkbox
@@ -33,7 +33,7 @@
               :border="true"
             ></el-checkbox>
           </div>
-        </div>
+        </div> -->
         <div class="query-item">
           <div class="lable"></div>
           <div class="search-input">
@@ -316,8 +316,8 @@ export default {
       }
     },
     last() {
-      if (this.active-- < 0) {
-        this.active = 0;
+      if (this.active-- <= 1) {
+        this.active = 1;
       }
     },
     reset() {
@@ -664,7 +664,10 @@ export default {
   }
 }
 .el-checkbox__input {
-  display: block;
+ display: block;
+}
+.el-checkbox__label{
+  padding-left: 0;
 }
 .steps {
   margin: 30px;

src/views/NewPages/power-benchmarking.vue

@@ -11,12 +11,14 @@
             <svg-icon :svgid="'svg-flash'" />
           </i>
         </div>
+        <!-- 累计增发电量 -->
         <div class="info">
           <div class="title">累计增发电量</div>
           <div class="value">0</div>
           <div class="unit">万kWh</div>
         </div>
       </div>
+      <!--   理论电量平衡分析法 -->
       <div
         class="static-items"
         :style="
@@ -35,6 +37,7 @@
           <div class="item" v-for="(item, index) of analyselist" :key="index">
             <div class="title">{{ item.name }}</div>
             <div class="value">{{ item.actual }}%</div>
+            
             <div class="up-down">
               <div class="up-down-item">
                 <span class="name">环</span>
@@ -73,6 +76,7 @@
                 <span class="value">{{ item.yoy }}%</span>
               </div>
             </div>
+
             <div class="percent">
               <div class="percent-box">
                 <div
@@ -88,9 +92,12 @@
               </div>
               <div class="value">{{ item.expect }}%</div>
             </div>
+
+
           </div>
         </div>
       </div>
+      <!-- 管理效率指标 -->
       <div
         class="static-items"
         :style="
@@ -105,6 +112,7 @@
           </i>
           管理效率指标
         </div>
+
         <div class="items">
           <div class="item" v-for="(item, index) of managelist" :key="index">
             <div class="title">{{ item.name }}</div>
@@ -165,6 +173,7 @@
           </div>
         </div>
       </div>
+      <!--  其它经济性指标 -->
       <div
         class="static-items"
         :style="
@@ -240,6 +249,7 @@
         </div>
       </div>
     </div>
+
     <div class="top">
       <div class="top-left">
         <div class="top-left-header">
@@ -300,6 +310,7 @@
             <span class="right-btn">光伏</span>
           </div> -->
         </div>
+        <!-- 中间数据 -->
         <group-table
           :customClass="'table'"
           :data="eltableData"
@@ -332,6 +343,7 @@
         </group-table>
       </div>
     </div>
+<!-- 指标分析 -->
     <div class="bottom">
       <panel :title="'指标分析'">
         <multiple-bar-chart
@@ -813,62 +825,62 @@ export default {
                   Number(item[3].mttf)
               ),
               availability: this.filter(
-                (Number(item[0].availability) +
+                 (Number(item[0].availability) +
                   Number(item[1].availability) +
                   Number(item[2].availability) +
                   Number(item[3].availability)) /
                   4
               ),
               availabilityfactor: this.filter(
-                (Number(item[0].availabilityfactor) +
+                 (Number(item[0].availabilityfactor) +
                   Number(item[1].availabilityfactor) +
                   Number(item[2].availabilityfactor) +
                   Number(item[3].availabilityfactor)) /
                   4
               ),
               failurelossrate: this.filter(
-                (Number(item[0].failurelossrate) +
+                 (Number(item[0].failurelossrate) +
                   Number(item[1].failurelossrate) +
                   Number(item[2].failurelossrate) +
                   Number(item[3].failurelossrate)) /
                   4
               ),
               mainlossrate: this.filter(
-                (Number(item[0].mainlossrate) +
+                 (Number(item[0].mainlossrate) +
                   Number(item[1].mainlossrate) +
                   Number(item[2].mainlossrate) +
                   Number(item[3].mainlossrate)) /
                   4
               ),
               mttr: this.filter(
-                Number(item[0].mttr) +
+                 Number(item[0].mttr) +
                   Number(item[1].mttr) +
                   Number(item[2].mttr) +
                   Number(item[3].mttr)
               ),
               hiddentimely: this.filter(
-                (Number(item[0].hiddentimely) +
+                 (Number(item[0].hiddentimely) +
                   Number(item[1].hiddentimely) +
                   Number(item[2].hiddentimely) +
                   Number(item[3].hiddentimely)) /
                   4
               ),
               resettimelyrate: this.filter(
-                (Number(item[0].resettimelyrate) +
+                 (Number(item[0].resettimelyrate) +
                   Number(item[1].resettimelyrate) +
                   Number(item[2].resettimelyrate) +
                   Number(item[3].resettimelyrate)) /
                   4
               ),
               statetransitionrate: this.filter(
-                (Number(item[0].statetransitionrate) +
+                 (Number(item[0].statetransitionrate) +
                   Number(item[1].statetransitionrate) +
                   Number(item[2].statetransitionrate) +
                   Number(item[3].statetransitionrate)) /
                   4
               ),
               eliminationrate: this.filter(
-                (Number(item[0].eliminationrate) +
+                 (Number(item[0].eliminationrate) +
                   Number(item[1].eliminationrate) +
                   Number(item[2].eliminationrate) +
                   Number(item[3].eliminationrate)) /
@@ -885,247 +897,6 @@ export default {
             this.echartData(this.eltableData.column[1].child.slice(3));
           }
         });
-
-      // let that = this;
-      // this.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/dbmainbottom",
-      //   data: {
-      //     timetype: timetype,
-      //     foreigntype: "风电",
-      //   },
-      // success(res) {
-      //   if (res.code == 200) {
-      //     res.data.forEach((item) => {
-      //       if (item.foreignkeyid === "SBQ_FDC") item.name = "石板泉";
-      //       if (item.foreignkeyid === "MHS_FDC") item.name = "麻黄山";
-      //       if (item.foreignkeyid === "NSS_FDC") item.name = "牛首山";
-      //       if (item.foreignkeyid === "XS_FDC") item.name = "香山";
-      //       if (item.foreignkeyid === "QS_FDC") item.name = "青山";
-      //       item.mark = that.filter(item.mark);
-      //       item.theoreticalpower = that.filter(item.theoreticalpower);
-      //       item.actualpower = that.filter(item.actualpower);
-      //       item.daynhgzssdl = that.filter(item.daynhgzssdl);
-      //       item.daynhwhssdl = that.filter(item.daynhwhssdl);
-      //       item.daynhxdssdl = that.filter(item.daynhxdssdl);
-      //       item.daynhcfdl = that.filter(item.daynhcfdl);
-      //       item.daynhqfdl = that.filter(item.daynhqfdl);
-      //       item.windenergy = that.filter(item.windenergy);
-      //       item.powerlossrate = that.filter(item.powerlossrate);
-      //       item.performancelossrate = that.filter(item.performancelossrate);
-      //       item.comprehensiverate = that.filter(item.comprehensiverate);
-      //       item.utilizationhours = that.filter(item.utilizationhours);
-      //       item.windpoweraccuracy = that.filter(item.windpoweraccuracy);
-      //       item.agccurvefollowing = that.filter(item.agccurvefollowing);
-      //       item.mtbf = that.filter(item.mtbf);
-      //       item.mttf = that.filter(item.mttf);
-      //       item.availability = that.filter(item.availability);
-      //       item.availabilityfactor = that.filter(item.availabilityfactor);
-      //       item.failurelossrate = that.filter(item.failurelossrate);
-      //       item.mainlossrate = that.filter(item.mainlossrate);
-      //       item.mttr = that.filter(item.mttr);
-      //       item.hiddentimely = that.filter(item.hiddentimely);
-      //       item.resettimelyrate = that.filter(item.resettimelyrate);
-      //       item.statetransitionrate = that.filter(item.statetransitionrate);
-      //       item.eliminationrate = that.filter(item.eliminationrate);
-      //     });
-
-      //     // 合计列
-      //     let item = res.data;
-      //     let obj = {
-      //       name: "合计",
-      //       mark: that.filter(
-      //         (Number(item[0].mark) +
-      //           Number(item[1].mark) +
-      //           Number(item[2].mark) +
-      //           Number(item[3].mark)) /
-      //           4
-      //       ),
-      //       capacity: that.filter(
-      //         Number(item[0].capacity) +
-      //           Number(item[1].capacity) +
-      //           Number(item[2].capacity) +
-      //           Number(item[3].capacity)
-      //       ),
-      //       units: that.filter(
-      //         Number(item[0].units) +
-      //           Number(item[1].units) +
-      //           Number(item[2].units) +
-      //           Number(item[3].units)
-      //       ),
-      //       theoreticalpower: that.filter(
-      //         Number(item[0].theoreticalpower) +
-      //           Number(item[1].theoreticalpower) +
-      //           Number(item[2].theoreticalpower) +
-      //           Number(item[3].theoreticalpower)
-      //       ),
-      //       actualpower: that.filter(
-      //         Number(item[0].actualpower) +
-      //           Number(item[1].actualpower) +
-      //           Number(item[2].actualpower) +
-      //           Number(item[3].actualpower)
-      //       ),
-      //       daynhgzssdl: that.filter(
-      //         Number(item[0].daynhgzssdl) +
-      //           Number(item[1].daynhgzssdl) +
-      //           Number(item[2].daynhgzssdl) +
-      //           Number(item[3].daynhgzssdl)
-      //       ),
-      //       daynhwhssdl: that.filter(
-      //         Number(item[0].daynhwhssdl) +
-      //           Number(item[1].daynhwhssdl) +
-      //           Number(item[2].daynhwhssdl) +
-      //           Number(item[3].daynhwhssdl)
-      //       ),
-      //       daynhxdssdl: that.filter(
-      //         Number(item[0].daynhxdssdl) +
-      //           Number(item[1].daynhxdssdl) +
-      //           Number(item[2].daynhxdssdl) +
-      //           Number(item[3].daynhxdssdl)
-      //       ),
-      //       daynhcfdl: that.filter(
-      //         Number(item[0].daynhcfdl) +
-      //           Number(item[1].daynhcfdl) +
-      //           Number(item[2].daynhcfdl) +
-      //           Number(item[3].daynhcfdl)
-      //       ),
-      //       daynhqfdl: that.filter(
-      //         Number(item[0].daynhqfdl) +
-      //           Number(item[1].daynhqfdl) +
-      //           Number(item[2].daynhqfdl) +
-      //           Number(item[3].daynhqfdl)
-      //       ),
-      //       windenergy: that.filter(
-      //         (Number(item[0].windenergy) +
-      //           Number(item[1].windenergy) +
-      //           Number(item[2].windenergy) +
-      //           Number(item[3].windenergy)) /
-      //           4
-      //       ),
-      //       powerlossrate: that.filter(
-      //         (Number(item[0].powerlossrate) +
-      //           Number(item[1].powerlossrate) +
-      //           Number(item[2].powerlossrate) +
-      //           Number(item[3].powerlossrate)) /
-      //           4
-      //       ),
-      //       performancelossrate: that.filter(
-      //         (Number(item[0].performancelossrate) +
-      //           Number(item[1].performancelossrate) +
-      //           Number(item[2].performancelossrate) +
-      //           Number(item[3].performancelossrate)) /
-      //           4
-      //       ),
-      //       comprehensiverate: that.filter(
-      //         (Number(item[0].comprehensiverate) +
-      //           Number(item[1].comprehensiverate) +
-      //           Number(item[2].comprehensiverate) +
-      //           Number(item[3].comprehensiverate)) /
-      //           4
-      //       ),
-      //       utilizationhours: that.filter(
-      //         Number(item[0].utilizationhours) +
-      //           Number(item[1].utilizationhours) +
-      //           Number(item[2].utilizationhours) +
-      //           Number(item[3].utilizationhours)
-      //       ),
-      //       windpoweraccuracy: that.filter(
-      //         (Number(item[0].windpoweraccuracy) +
-      //           Number(item[1].windpoweraccuracy) +
-      //           Number(item[2].windpoweraccuracy) +
-      //           Number(item[3].windpoweraccuracy)) /
-      //           4
-      //       ),
-      //       agccurvefollowing: that.filter(
-      //         (Number(item[0].agccurvefollowing) +
-      //           Number(item[1].agccurvefollowing) +
-      //           Number(item[2].agccurvefollowing) +
-      //           Number(item[3].agccurvefollowing)) /
-      //           4
-      //       ),
-      //       mtbf: that.filter(
-      //         Number(item[0].mtbf) +
-      //           Number(item[1].mtbf) +
-      //           Number(item[2].mtbf) +
-      //           Number(item[3].mtbf)
-      //       ),
-      //       mttf: that.filter(
-      //         Number(item[0].mttf) +
-      //           Number(item[1].mttf) +
-      //           Number(item[2].mttf) +
-      //           Number(item[3].mttf)
-      //       ),
-      //       availability: that.filter(
-      //         (Number(item[0].availability) +
-      //           Number(item[1].availability) +
-      //           Number(item[2].availability) +
-      //           Number(item[3].availability)) /
-      //           4
-      //       ),
-      //       availabilityfactor: that.filter(
-      //         (Number(item[0].availabilityfactor) +
-      //           Number(item[1].availabilityfactor) +
-      //           Number(item[2].availabilityfactor) +
-      //           Number(item[3].availabilityfactor)) /
-      //           4
-      //       ),
-      //       failurelossrate: that.filter(
-      //         (Number(item[0].failurelossrate) +
-      //           Number(item[1].failurelossrate) +
-      //           Number(item[2].failurelossrate) +
-      //           Number(item[3].failurelossrate)) /
-      //           4
-      //       ),
-      //       mainlossrate: that.filter(
-      //         (Number(item[0].mainlossrate) +
-      //           Number(item[1].mainlossrate) +
-      //           Number(item[2].mainlossrate) +
-      //           Number(item[3].mainlossrate)) /
-      //           4
-      //       ),
-      //       mttr: that.filter(
-      //         Number(item[0].mttr) +
-      //           Number(item[1].mttr) +
-      //           Number(item[2].mttr) +
-      //           Number(item[3].mttr)
-      //       ),
-      //       hiddentimely: that.filter(
-      //         (Number(item[0].hiddentimely) +
-      //           Number(item[1].hiddentimely) +
-      //           Number(item[2].hiddentimely) +
-      //           Number(item[3].hiddentimely)) /
-      //           4
-      //       ),
-      //       resettimelyrate: that.filter(
-      //         (Number(item[0].resettimelyrate) +
-      //           Number(item[1].resettimelyrate) +
-      //           Number(item[2].resettimelyrate) +
-      //           Number(item[3].resettimelyrate)) /
-      //           4
-      //       ),
-      //       statetransitionrate: that.filter(
-      //         (Number(item[0].statetransitionrate) +
-      //           Number(item[1].statetransitionrate) +
-      //           Number(item[2].statetransitionrate) +
-      //           Number(item[3].statetransitionrate)) /
-      //           4
-      //       ),
-      //       eliminationrate: that.filter(
-      //         (Number(item[0].eliminationrate) +
-      //           Number(item[1].eliminationrate) +
-      //           Number(item[2].eliminationrate) +
-      //           Number(item[3].eliminationrate)) /
-      //           4
-      //       ),
-      //     };
-      //     item.push(obj);
-      //     that.eltableData.data = res.data;
-      //     that.setRank();
-      //     that.echartData(that.eltableData.column[1].child.slice(3));
-      //   }
-      // },
-      // });
     },
     // 顶部数据
     requestDataTop(timetype) {
@@ -1137,20 +908,6 @@ export default {
         .then((res) => {
           if (res.code == 200 && res.data.length > 0) this.calculate(res.data);
         });
-
-      // let that = this;
-      // this.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/dbmaintop",
-      //   data: {
-      //     timetype: timetype,
-      //     foreigntype: "风电",
-      //   },
-      //   success(res) {
-      //     if (res.code == 200) that.calculate(res.data);
-      //   },
-      // });
     },
     // 左边的排序
     setRank(column, name) {

src/views/NewPages/statisticAnalysis.vue

@@ -18,7 +18,8 @@
 
     <div class="table1">
       <el-table
-        max-height="80vh"
+        max-height="86vh"
+         height="1100"
         v-loading="loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
         :data="tableData"
@@ -52,7 +53,7 @@
           <template #default="scope">
             <el-button
               @click="handleClick3(scope.row)"
-              :class="scope.row.isConfirm == 1 ? 'aaaa' : 'btn'"
+              :class="scope.row.isConfirm == 1 ? 'displayBtn' : 'btn'"
               :disabled="scope.row.isConfirm == 1"
             >
               确认</el-button
@@ -195,7 +196,7 @@ export default {
   border-radius: 5px;
 }
 .table1 {
-  margin-top: 60px;
+  margin-top: 30px;
 }
 /deep/.el-date-editor {
   width: 490px;
@@ -232,11 +233,11 @@ export default {
   border-color: #05bb4c;
 }
 
-.aaaa {
+.displayBtn {
   background-color: #4d4949;
   color: rgb(87 110 108);
 }
-.aaaa:hover {
+.displayBtn:hover {
   border: #4d4949;
   background-color: #4d4949;
   color: rgb(87 110 108);

src/views/SandTable/SandTable.vue

@@ -535,6 +535,8 @@ 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";
 
 export default {
   // 名称
@@ -778,11 +780,13 @@ export default {
     openVideoDialog1(item) {
       if (item.code) {
         this.dialogVideoUrl = item.code;
-        this.showVideoDialog = true;
+        // this.showVideoDialog = true;
       }
     },
 
     getWtInfo() {
+
+
       let that = this;
       that.API.requestData({
         method: "POST",

src/views/allLifeManage/tab1.vue

@@ -78,7 +78,8 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
-
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   components: { ComTable },
   data() {
@@ -233,29 +234,41 @@ export default {
 
     // 获取厂家
     getVendor() {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://192.168.1.18:9988",
-        subUrl: "companies/list",
-        success(res) {
-          that.vendorArray = res.data;
-          that.vendor = res.data[0].company;
-          that.getWarehouse();
-        },
+      api.companiesList().then((res) => {
+        this.vendorArray = res.data;
+        this.vendor = res.data[0].company;
+        this.getWarehouse();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   baseURL: "http://192.168.1.18:9988",
+      //   subUrl: "companies/list",
+      //   success(res) {
+      //     that.vendorArray = res.data;
+      //     that.vendor = res.data[0].company;
+      //     that.getWarehouse();
+      //   },
+      // });
     },
     // 获取仓库
     getWarehouse() {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://192.168.1.18:9988",
-        subUrl: "warehouse/list",
-        success(res) {
-          that.warehouseArray = res.data;
-          that.warehouse = res.data[0].warehouse;
-          that.requestSafeList();
-        },
+      api.benchmarkingLineList().then((res) => {
+        this.warehouseArray = res.data;
+        this.warehouse = res.data[0].warehouse;
+        this.requestSafeList();
       });
+
+      // let that = this;
+      // that.API.requestData({
+      //   baseURL: "http://192.168.1.18:9988",
+      //   subUrl: "warehouse/list",
+      //   success(res) {
+      //     that.warehouseArray = res.data;
+      //     that.warehouse = res.data[0].warehouse;
+      //     that.requestSafeList();
+      //   },
+      // });
     },
 
     // 格式化日期
@@ -318,40 +331,68 @@ export default {
         //   stationid: that.wpId,
         // };
 
-        // http://192.168.1.18:9988/poline/list?pagenum=1&pagesize=10&vendor=联合动力&ponum=PO10564&warehouse=麻黄山仓库&starttime=2021-07-08 18:34:40&endtime=2021-07-08 18:34:45
-        that.API.requestData({
-          // baseURL:"http://192.168.1.14:8075/",
-          baseURL: "http://192.168.1.18:9988",
-          subUrl: "poline/list",
-          method: "GET",
-          data: {
-            vendor: that.vendor,
-            ponum: that.ponum,
-            warehouse: that.warehouse,
+        api
+          .polineList({
+            vendor: this.vendor,
+            ponum: this.ponum,
+            warehouse: this.warehouse,
             starttime,
             endtime,
-            pagenum: that.pageNum,
-            pagesize: that.pageSize,
-          },
-          success(res) {
+            pagenum: this.pageNum,
+            pagesize: this.pageSize,
+          })
+          .then((res) => {
             if (res.data.records.length) {
               res.data.records.forEach((ele, index) => {
                 ele.index = index + 1;
-                ele.timeDate = that.fmtDate(new Date(ele.time));
+                ele.timeDate = this.fmtDate(new Date(ele.time));
                 if (ele.value > 0) {
                   ele.value = parseFloat(ele.value).toFixed(4);
                 }
               });
-              that.tableData.data = res.data.records || [];
+              this.tableData.data = res.data.records || [];
             } else {
               // that.BASE.showMsg({
               //   type: "warning",
               //   msg: "所选日期区间之内暂无数据，请重试",
               // });
             }
-            that.showDialog = true;
-          },
-        });
+            this.showDialog = true;
+          });
+
+        // that.API.requestData({
+        //   // baseURL:"http://192.168.1.14:8075/",
+        //   baseURL: "http://192.168.1.18:9988",
+        //   subUrl: "poline/list",
+        //   method: "GET",
+        //   data: {
+        //     vendor: that.vendor,
+        //     ponum: that.ponum,
+        //     warehouse: that.warehouse,
+        //     starttime,
+        //     endtime,
+        //     pagenum: that.pageNum,
+        //     pagesize: that.pageSize,
+        //   },
+        //   success(res) {
+        //     if (res.data.records.length) {
+        //       res.data.records.forEach((ele, index) => {
+        //         ele.index = index + 1;
+        //         ele.timeDate = that.fmtDate(new Date(ele.time));
+        //         if (ele.value > 0) {
+        //           ele.value = parseFloat(ele.value).toFixed(4);
+        //         }
+        //       });
+        //       that.tableData.data = res.data.records || [];
+        //     } else {
+        //       // that.BASE.showMsg({
+        //       //   type: "warning",
+        //       //   msg: "所选日期区间之内暂无数据，请重试",
+        //       // });
+        //     }
+        //     that.showDialog = true;
+        //   },
+        // });
       }
     },
   },

src/views/allLifeManage/tab2.vue

@@ -5,16 +5,37 @@
         <div class="query-item">
           <div class="lable">风场：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="getWtArray">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="getWtArray"
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">风机：</div>
           <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
@@ -31,17 +52,19 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
 
   // 使用组件
   components: {
-    ComTable
+    ComTable,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       wpArray: [],
@@ -97,63 +120,63 @@ export default {
             field: "vendor",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "型号",
             field: "model",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定功率",
             field: "ratedpower",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定风速",
             field: "ratedwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定电压",
             field: "ratedvoltage",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "额定转速",
             field: "ratedrev",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "切入风速",
             field: "cutinwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "切出风速",
             field: "cutoutwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "生存风速",
             field: "maxwinspe",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "最低温度",
@@ -215,7 +238,7 @@ export default {
             field: "installdate",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           // {
           //   name: "调试日期",
@@ -243,101 +266,123 @@ export default {
             field: "wflocation",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风机ID",
             field: "wtid",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
         data: [],
-      }
+      },
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWpArray () {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = that.wpId || res.data[0].id;
-          that.getWtArray(that.wpId, true);
-        }
+    getWpArray() {
+      api1.benchmarkingWplist({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = this.wpId || res.data[0].id;
+        this.getWtArray(this.wpId, true);
       });
     },
 
     // 获取风机
-    getWtArray (wpId, keepRequest) {
+    getWtArray(wpId, keepRequest) {
       let that = this;
       if (wpId) {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "powercompare/windturbineAjax",
-          data: {
-            wpId
-          },
-          success (res) {
-            that.wtArray = res.data;
-            const findRes = res.data.some(ele => {
-              return ele.id === that.wtId;
+        api1
+          .powercompareWindturbineAjax({
+            wpId: wpId,
+          })
+          .then((res) => {
+            this.wtArray = res.data;
+            const findRes = res.data.some((ele) => {
+              return ele.id === this.wtId;
             });
-            that.wtId = (findRes ? that.wtId : res.data[0].id);
-            that.getTableData();
-          }
-        });
+            this.wtId = findRes ? this.wtId : res.data[0].id;
+            this.getTableData();
+          });
       } else {
         that.wtArray = [];
         that.wtId = "";
       }
     },
 
-    getTableData () {
+    getTableData() {
       let that = this;
       if (!that.wpId) {
         that.BASE.showMsg({
-          msg: "场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "GET",
-          baseURL:"http://192.168.1.18:9988/",
-          subUrl: "windturbine/list",
-          data: {
-            wtid:that.wtId
-          },
-          success (res) {
-            res.data.forEach(ele => {
-              ele.installdate = new Date(ele.installdate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.opdate = new Date(ele.opdate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.releasedate = new Date(ele.releasedate).formatDate("yyyy-MM-dd hh:mm:ss");
-              ele.testdate = new Date(ele.testdate).formatDate("yyyy-MM-dd hh:mm:ss");
+        api
+          .windturbineList({
+            wtid: this.wtId,
+          })
+          .then((res) => {
+            res.data.forEach((ele) => {
+              ele.installdate = new Date(ele.installdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.opdate = new Date(ele.opdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.releasedate = new Date(ele.releasedate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
+              ele.testdate = new Date(ele.testdate).formatDate(
+                "yyyy-MM-dd hh:mm:ss"
+              );
             });
-            that.tableData.data = res.data;
-          }
-        });
+            this.tableData.data = res.data;
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   baseURL: "http://192.168.1.18:9988/",
+        //   subUrl: "windturbine/list",
+        //   data: {
+        //     wtid: that.wtId,
+        //   },
+        //   success(res) {
+        //     res.data.forEach((ele) => {
+        //       ele.installdate = new Date(ele.installdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.opdate = new Date(ele.opdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.releasedate = new Date(ele.releasedate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //       ele.testdate = new Date(ele.testdate).formatDate(
+        //         "yyyy-MM-dd hh:mm:ss"
+        //       );
+        //     });
+        //     that.tableData.data = res.data;
+        //   },
+        // });
       }
     },
 
-    search () {
+    search() {
       this.getTableData();
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWpArray();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -365,7 +410,7 @@ export default {
     margin-top: 1.481vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/allLifeManage/tab3.vue

@@ -5,38 +5,81 @@
         <div class="query-item">
           <div class="lable">风场：</div>
           <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="getWtArray">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="getWtArray"
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">风机：</div>
           <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">开始日期：</div>
           <div class="search-input">
-            <el-date-picker v-model="starttime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+            <el-date-picker
+              v-model="starttime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
             </el-date-picker>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">结束日期：</div>
           <div class="search-input">
-            <el-date-picker v-model="endtime" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+            <el-date-picker
+              v-model="endtime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              popper-class="date-select"
+            >
             </el-date-picker>
           </div>
         </div>
         <div class="query-item">
           <div class="lable">类型：</div>
           <div class="search-input">
-            <el-select v-model="type" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
+            <el-select
+              v-model="type"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in typeArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </div>
         </div>
@@ -53,17 +96,19 @@
 
 <script>
 import ComTable from "@com/coms/table/table.vue";
+import api from "@api/wisdomOverhaul/lifecycle/index.js";
+import api1 from "@api/economic/index.js";
 export default {
   // 名称
   name: "cutAnalyse",
 
   // 使用组件
   components: {
-    ComTable
+    ComTable,
   },
 
   // 数据
-  data () {
+  data() {
     const that = this;
     return {
       wpArray: [],
@@ -71,19 +116,23 @@ export default {
       wtArray: [],
       wtId: "",
       type: "异动",
-      typeArray: [{
-        id: "检修",
-        label: "检修",
-        value: "检修"
-      }, {
-        id: "异动",
-        label: "异动",
-        value: "异动"
-      }, {
-        id: "故障",
-        label: "故障",
-        value: "故障"
-      }],
+      typeArray: [
+        {
+          id: "检修",
+          label: "检修",
+          value: "检修",
+        },
+        {
+          id: "异动",
+          label: "异动",
+          value: "异动",
+        },
+        {
+          id: "故障",
+          label: "故障",
+          value: "故障",
+        },
+      ],
       starttime: new Date().formatDate("yyyy-MM") + "-01",
       endtime: new Date().formatDate("yyyy-MM-dd"),
       tableData: {
@@ -93,144 +142,176 @@ export default {
             field: "leader",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修类型",
             field: "type",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "风机编号",
             field: "wtnum",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "开始时间",
             field: "starttime",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "结束时间",
             field: "endtime",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修原因",
             field: "problem",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "检修方式",
             field: "solveway",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
           },
           {
             name: "设备唯一编号",
             field: "eqnum",
             is_num: false,
             is_light: false,
-            sortable: true
-          }
+            sortable: true,
+          },
         ],
         data: [],
-      }
+      },
     };
   },
 
   // 函数
   methods: {
     // 获取风场
-    getWpArray () {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = that.wpId || res.data[0].id;
-          that.getWtArray(that.wpId, true);
-        }
+
+    getWpArray() {
+      api1.benchmarkingWplist({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = this.wpId || res.data[0].id;
+        this.getWtArray(this.wpId, true);
       });
     },
+    // getWpArray() {
+    //   // let that = this;
+    //   // that.API.requestData({
+    //   //   method: "GET",
+    //   //   subUrl: "powercompare/windfarmAjax",
+    //   //   success (res) {
+    //   //     that.wpArray = res.data;
+    //   //     that.wpId = that.wpId || res.data[0].id;
+    //   //     that.getWtArray(that.wpId, true);
+    //   //   }
+    //   // });
+    // },
 
     // 获取风机
-    getWtArray (wpId, keepRequest) {
+    getWtArray(wpId, keepRequest) {
       let that = this;
       if (wpId) {
-        that.API.requestData({
-          method: "GET",
-          subUrl: "powercompare/windturbineAjax",
-          data: {
-            wpId
-          },
-          success (res) {
-            that.wtArray = res.data;
-            const findRes = res.data.some(ele => {
-              return ele.id === that.wtId;
+        api1
+          .powercompareWindturbineAjax({
+            wpId: wpId,
+          })
+          .then((res) => {
+            this.wtArray = res.data;
+            const findRes = res.data.some((ele) => {
+              return ele.id === this.wtId;
             });
-            that.wtId = (findRes ? that.wtId : res.data[0].id);
-            that.getTableData();
-          }
-        });
+            this.wtId = findRes ? this.wtId : res.data[0].id;
+            this.getTableData();
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   subUrl: "powercompare/windturbineAjax",
+        //   data: {
+        //     wpId,
+        //   },
+        //   success(res) {
+        //     that.wtArray = res.data;
+        //     const findRes = res.data.some((ele) => {
+        //       return ele.id === that.wtId;
+        //     });
+        //     that.wtId = findRes ? that.wtId : res.data[0].id;
+        //     that.getTableData();
+        //   },
+        // });
       } else {
         that.wtArray = [];
         that.wtId = "";
       }
     },
 
-    getTableData () {
+    getTableData() {
       let that = this;
       if (!that.wpId || !that.starttime || !that.endtime) {
         that.BASE.showMsg({
-          msg: "场站与日期不可为空"
+          msg: "场站与日期不可为空",
         });
       } else {
-        that.API.requestData({
-          method: "GET",
-          baseURL: "http://192.168.1.18:9988/",
-          subUrl: "equoperationrecord/list",
-          data: {
-            wtid: that.wtId,
-            starttime: that.starttime,
-            endtime: that.endtime,
-            type: that.type,
+        api
+          .equoperationrecordList({
+            wtid: this.wtId,
+            starttime: this.starttime,
+            endtime: this.endtime,
+            type: this.type,
             pagenum: 1,
-            pagesize: 50000
-          },
-          success (res) {
-   
-            that.tableData.data = res.data.records;
-          }
-        });
+            pagesize: 50000,
+          })
+          .then((res) => {
+            this.tableData.data = res.data.records;
+          });
+
+        // that.API.requestData({
+        //   method: "GET",
+        //   baseURL: "http://192.168.1.18:9988/",
+        //   subUrl: "equoperationrecord/list",
+        //   data: {
+        //     wtid: that.wtId,
+        //     starttime: that.starttime,
+        //     endtime: that.endtime,
+        //     type: that.type,
+        //     pagenum: 1,
+        //     pagesize: 50000,
+        //   },
+        //   success(res) {
+        //     that.tableData.data = res.data.records;
+        //   },
+        // });
       }
     },
 
-
-    search () {
+    search() {
       this.getTableData();
-    }
+    },
   },
 
-  created () {
+  created() {
     this.getWpArray();
   },
 
-  mounted () { },
+  mounted() {},
 
-  unmounted () { },
+  unmounted() {},
 };
 </script>
 
@@ -258,7 +339,7 @@ export default {
     margin-top: 1.481vh;
 
     &:before {
-      content: '';
+      content: "";
       width: 0.37vh;
       height: 0.37vh;
       background: @write;

src/views/layout/Menu.vue

@@ -561,28 +561,28 @@ export default {
                 },
               ],
             },
-            {
-              text: "故障预警",
-              icon: "svg-预警记录",
-              path: "/health/MalfunctionWarning/",
-              children: [
-                {
-                  text: "无监督学习",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/",
-                },
-                {
-                  text: "有监督学习",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/Supervised",
-                },
-                {
-                  text: "齿轮箱故障诊断",
-                  icon: "svg-wind-site",
-                  path: "/health/MalfunctionWarning/diagnose",
-                },
-              ],
-            },
+            // {
+            //   text: "故障预警",
+            //   icon: "svg-预警记录",
+            //   path: "/health/MalfunctionWarning/",
+            //   children: [
+            //     {
+            //       text: "无监督学习",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/",
+            //     },
+            //     {
+            //       text: "有监督学习",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/Supervised",
+            //     },
+            //     {
+            //       text: "齿轮箱故障诊断",
+            //       icon: "svg-wind-site",
+            //       path: "/health/MalfunctionWarning/diagnose",
+            //     },
+            //   ],
+            // },
           ],
         },
         {

src/views/malfunctionDiagnose/index.vue

@@ -83,7 +83,7 @@
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
         <!-- <button class="btn green" @click="">导入</button> -->
-        <button class="btn green" @click="excelExport()">导出</button>
+        <button class="btn green" @click="Excels">导出</button>
       </div>
     </div>
     <div class="df-table">
@@ -267,11 +267,12 @@ export default {
           values: item.judegvulue,
         })
         .then((res) => {
-          res.data[0].id = "0";
-          this.treeData = res.data;
-          this.dialogShow = true;
+          if (res.data[0]) {
+            res.data[0].id = "0";
+            this.treeData = res.data;
+            this.dialogShow = true;
+          }
         });
-
     },
 
     search() {
@@ -280,7 +281,7 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
-    excelExport() {
+    Excels() {
       let that = this;
       const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
       let tHeader = []; // 上面设置Excel的表格第一行的标题

src/views/malfunctionRecall/index.vue

@@ -274,6 +274,8 @@ export default {
         beginDate: that.value1,
         endDate: that.value2,
         wpId: that.wpId,
+        type: 2,
+        wtId: null,
       };
 
       if (that.wtId != "") data.wtId = that.wtId;