部分页面增加loading效果，修改全景监视按钮样式，修改智慧检修菜单，修改系统效率分析表头

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TEST=http://10.81.3.155:9002
 
 # VUE_APP_API=http://192.168.1.110:6060
 VUE_APP_API=http://10.81.3.153:6060
-# VUE_APP_API=http://192.168.1.106:6060
+# VUE_APP_API=http://192.168.1.109:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/App.vue

@@ -80,7 +80,7 @@
       >
         <router-view />
       </div>
-      <!-- <alarmBadge /> -->
+      <alarmBadge />
     </div>
     <div v-else class="login"><login-page @onLogin="login" /></div>
   </div>

src/components/alarm-badge/index.vue

@@ -1,5 +1,6 @@
 <template>
-  <div
+  <div></div>
+  <!-- <div
     draggable="true"
     @dragstart="startDrag"
     @dragend="stopDrag"
@@ -33,7 +34,7 @@
       @cancleConfig="displaySetting = false"
       :alarmConfigArray="alarmConfigArray"
     />
-  </div>
+  </div> -->
 </template>
 
 <script>
@@ -206,80 +207,80 @@ export default {
       }
     },
     playAudioEffect() {
-      const lv1Config = this.getConfigItem(1);
-      let lv1Play = false;
-      if (lv1Config.isAlarmSound) {
-        lv1Play = this.dialogList.some((ele) => {
-          return ele.lv === 1 && !ele.confirm;
-        });
-      }
+    //   const lv1Config = this.getConfigItem(1);
+    //   let lv1Play = false;
+    //   if (lv1Config.isAlarmSound) {
+    //     lv1Play = this.dialogList.some((ele) => {
+    //       return ele.lv === 1 && !ele.confirm;
+    //     });
+    //   }
 
-      const lv2Config = this.getConfigItem(2);
-      let lv2Play = false;
-      if (lv2Config.isAlarmSound) {
-        lv2Play = this.dialogList.some((ele) => {
-          return ele.lv === 2 && !ele.confirm;
-        });
-      }
+    //   const lv2Config = this.getConfigItem(2);
+    //   let lv2Play = false;
+    //   if (lv2Config.isAlarmSound) {
+    //     lv2Play = this.dialogList.some((ele) => {
+    //       return ele.lv === 2 && !ele.confirm;
+    //     });
+    //   }
 
-      const lv3Config = this.getConfigItem(3);
-      let lv3Play = false;
-      if (lv3Config.isAlarmSound) {
-        lv3Play = this.dialogList.some((ele) => {
-          return ele.lv === 3 && !ele.confirm;
-        });
-      }
+    //   const lv3Config = this.getConfigItem(3);
+    //   let lv3Play = false;
+    //   if (lv3Config.isAlarmSound) {
+    //     lv3Play = this.dialogList.some((ele) => {
+    //       return ele.lv === 3 && !ele.confirm;
+    //     });
+    //   }
 
-      const lv4Config = this.getConfigItem(4);
-      let lv4Play = false;
-      if (lv4Config.isAlarmSound) {
-        lv4Play = this.dialogList.some((ele) => {
-          return ele.lv === 4 && !ele.confirm;
-        });
-      }
+    //   const lv4Config = this.getConfigItem(4);
+    //   let lv4Play = false;
+    //   if (lv4Config.isAlarmSound) {
+    //     lv4Play = this.dialogList.some((ele) => {
+    //       return ele.lv === 4 && !ele.confirm;
+    //     });
+    //   }
 
-      const lv5Config = this.getConfigItem(5);
-      let lv5Play = false;
-      if (lv5Config.isAlarmSound) {
-        lv5Play = this.dialogList.some((ele) => {
-          return ele.lv === 5 && !ele.confirm;
-        });
-      }
-      //   console.log(lv1Play, lv2Play, lv3Play, lv4Play, lv5Play);
-      if (lv5Play && !this.seriousWarning) {
-        this.seriousWarning = true;
-        this.audioElement = new Audio();
-        this.audioElement.src = "./static/sound/lv5.mp3";
-        this.audioElement.loop = true;
-        this.audioElement?.play();
-      } else if (
-        (lv1Play || lv2Play || lv3Play || lv4Play) &&
-        !this.seriousWarning
-      ) {
-        this.audioElement = new Audio();
-        this.audioElement.src = "./static/sound/lv4.mp3";
-        this.audioElement.addEventListener("ended", () => {
-          this.audioElement?.removeEventListener(
-            "ended",
-            this.stopPlayAudioEffect
-          );
-        });
-        this.audioElement?.play();
-      } else {
-        if (!this.seriousWarning) {
-          this.stopPlayAudioEffect();
-        }
-      }
+    //   const lv5Config = this.getConfigItem(5);
+    //   let lv5Play = false;
+    //   if (lv5Config.isAlarmSound) {
+    //     lv5Play = this.dialogList.some((ele) => {
+    //       return ele.lv === 5 && !ele.confirm;
+    //     });
+    //   }
+    //   //   console.log(lv1Play, lv2Play, lv3Play, lv4Play, lv5Play);
+    //   if (lv5Play && !this.seriousWarning) {
+    //     this.seriousWarning = true;
+    //     this.audioElement = new Audio();
+    //     this.audioElement.src = "./static/sound/lv5.mp3";
+    //     this.audioElement.loop = true;
+    //     this.audioElement?.play();
+    //   } else if (
+    //     (lv1Play || lv2Play || lv3Play || lv4Play) &&
+    //     !this.seriousWarning
+    //   ) {
+    //     this.audioElement = new Audio();
+    //     this.audioElement.src = "./static/sound/lv4.mp3";
+    //     this.audioElement.addEventListener("ended", () => {
+    //       this.audioElement?.removeEventListener(
+    //         "ended",
+    //         this.stopPlayAudioEffect
+    //       );
+    //     });
+    //     this.audioElement?.play();
+    //   } else {
+    //     if (!this.seriousWarning) {
+    //       this.stopPlayAudioEffect();
+    //     }
+    //   }
     },
 
     stopPlayAudioEffect() {
-      this.seriousWarning = false;
-      if (this.audioElement) {
-        this.audioElement.pause();
-        this.audioElement.currentTime = 0;
-        this.audioElement.loop = false;
-      }
-      this.audioElement = null;
+    //   this.seriousWarning = false;
+    //   if (this.audioElement) {
+    //     this.audioElement.pause();
+    //     this.audioElement.currentTime = 0;
+    //     this.audioElement.loop = false;
+    //   }
+    //   this.audioElement = null;
     },
     //获取报警配置
     getAlarmConfig() {
@@ -306,7 +307,7 @@ export default {
           {
             id: "3",
             alarmLevel: 3,
-            isAlart: true,
+            isAlart: false,
             isAlarmSound: false,
             isContinuousAlarm: false,
           },
@@ -597,7 +598,7 @@ export default {
         let data = JSON.parse(msg.data);
         // 相关处理
         if (data) {
-          console.log("收到推送消息1", data);
+        //   console.log("收到推送消息1", data);
           this.pushALarmItem(data, "ws");
           //   this.dialogList.sort((a, b) => {
           //     return b.lv - a.lv;

src/components/qushi/qushiDialog.vue

@@ -65,7 +65,7 @@
                 round
                 :disabled="timerFlag"
                 size="mini"
-                class="searchColor"
+                class="buttons"
                 @click="throttleSearch"
                 >查询
               </el-button>
@@ -275,7 +275,11 @@
           @click="cancelMultiys()"
           >取消多坐标</el-button
         >
-        <el-button size="medium" round @click="saveEditTagInfo()"
+        <el-button
+          size="medium"
+          round
+          class="buttons"
+          @click="saveEditTagInfo()"
           >确定</el-button
         >
       </el-row>
@@ -766,7 +770,7 @@ export default {
       });
     },
     sortFun(a, b) {
-    //   console.log(a, b, Number.parseInt(a - b));
+      //   console.log(a, b, Number.parseInt(a - b));
       return parseInt(a) - parseInt(b);
     },
     // 点击查询按钮查询对比曲线
@@ -828,16 +832,14 @@ export default {
   color: #929396;
 }
 
-.searchColor {
+.buttons {
   background-color: rgba(5, 187, 76, 0.2);
   border: 1px solid #3b6c53;
   color: #b3b3b3;
   font-size: 14px;
-  border: none;
-  width: 108px;
-  min-height: 25px !important;
 
-  &:hover {
+  &:hover,
+  &.active {
     background-color: rgba(5, 187, 76, 0.5);
     color: #ffffff;
   }

src/router/index.js

@@ -732,7 +732,7 @@ export const asyncRoutes = [
               import("@/views/economicsOperation/thematicAnalysis/windEnergy"),
             name: "windEnergy",
             meta: {
-              title: "风能利用率",
+              title: "风光能利用率",
               icon: "",
               permissions: ["jn_ztfx_fnlyl"],
             },
@@ -748,17 +748,7 @@ export const asyncRoutes = [
               permissions: ["jn_ztfx_wxssl"],
             },
           },
-          {
-            path: "reset",
-            component: () =>
-              import("@/views/economicsOperation/thematicAnalysis/reset"),
-            name: "reset",
-            meta: {
-              title: "三率分析",
-              icon: "",
-              permissions: ["jn_ztfx_fwjsl"],
-            },
-          },
+          
           {
             path: "MTBF",
             component: () =>
@@ -847,6 +837,32 @@ export const asyncRoutes = [
         },
         children: [
           {
+            path: "stateTransition",
+            component: () =>
+              import(
+                "@/views/economicsOperation/windAnalyse/stateTransition/index.vue"
+              ),
+            name: "stateTransition",
+            meta: {
+              title: "状态时间分析",
+              icon: "",
+              permissions: ["jn_fdfx_ztzhfx"],
+            },
+          },
+          {
+            path: "timeTransition",
+            component: () =>
+              import(
+                "@/views/economicsOperation/windAnalyse/timeTransition/index.vue"
+              ),
+            name: "timeTransition",
+            meta: {
+              title: "状态转换分析",
+              icon: "",
+              permissions: ["jn_fdfx_ztsjfx"],
+            },
+          },
+          {
             path: "powerAnalyse",
             component: () =>
               import("@/views/economicsOperation/windAnalyse/powerCurve"),
@@ -933,47 +949,47 @@ export const asyncRoutes = [
               permissions: ["jn_fdfx_xndjpg"],
             },
           },
+        ],
+      },
+      //光伏分析
+      {
+        path: "photovoltaicAnalyse",
+        redirect: "analyse/standAloneAnalyse",
+        component: () =>
+          import("@/views/economicsOperation/photovoltaicAnalyse"),
+        name: "PhotovoltaicAnalyse",
+        meta: {
+          title: "光伏分析",
+          icon: "svg-gffx",
+          permissions: ["jn_gffx"],
+        },
+        children: [
           {
-            path: "stateTransition",
+            path: "gfstateTransition",
             component: () =>
               import(
-                "@/views/economicsOperation/windAnalyse/stateTransition/index.vue"
+                "@/views/economicsOperation/photovoltaicAnalyse/stateTransition/index.vue"
               ),
-            name: "stateTransition",
+            name: "gfstateTransition",
             meta: {
-              title: "状态转换分析",
+              title: "状态时间分析",
               icon: "",
-              permissions: ["jn_fdfx_ztzhfx"],
+              permissions: ["jn_gffx_ztzhfx"],
             },
           },
           {
-            path: "timeTransition",
+            path: "gftimeTransition",
             component: () =>
               import(
-                "@/views/economicsOperation/windAnalyse/timeTransition/index.vue"
+                "@/views/economicsOperation/photovoltaicAnalyse/timeTransition/index.vue"
               ),
-            name: "timeTransition",
+            name: "gftimeTransition",
             meta: {
-              title: "状态时间分析",
+              title: "状态转换分析",
               icon: "",
-              permissions: ["jn_fdfx_ztsjfx"],
+              permissions: ["jn_gffx_ztsjfx"],
             },
           },
-        ],
-      },
-      //光伏分析
-      {
-        path: "photovoltaicAnalyse",
-        redirect: "analyse/standAloneAnalyse",
-        component: () =>
-          import("@/views/economicsOperation/photovoltaicAnalyse"),
-        name: "PhotovoltaicAnalyse",
-        meta: {
-          title: "光伏分析",
-          icon: "svg-gffx",
-          permissions: ["jn_gffx"],
-        },
-        children: [
           {
             path: "powerAnalyse",
             component: () =>
@@ -1037,32 +1053,6 @@ export const asyncRoutes = [
               permissions: ["jn_gffx_xndjpg"],
             },
           },
-          {
-            path: "gfstateTransition",
-            component: () =>
-              import(
-                "@/views/economicsOperation/photovoltaicAnalyse/stateTransition/index.vue"
-              ),
-            name: "gfstateTransition",
-            meta: {
-              title: "状态转换分析",
-              icon: "",
-              permissions: ["jn_gffx_ztzhfx"],
-            },
-          },
-          {
-            path: "gftimeTransition",
-            component: () =>
-              import(
-                "@/views/economicsOperation/photovoltaicAnalyse/timeTransition/index.vue"
-              ),
-            name: "gftimeTransition",
-            meta: {
-              title: "状态时间分析",
-              icon: "",
-              permissions: ["jn_gffx_ztsjfx"],
-            },
-          },
         ],
       }, //管控效率
       {
@@ -1186,8 +1176,8 @@ export const asyncRoutes = [
         component: () => import("@/views/HealthControl/healthManagement"),
         name: "healthManagement",
         meta: {
-          title: "健康管理",
-          icon: "svg-健康管理",
+          title: "风电健康管理",
+          icon: "svg-fjjkd",
           permissions: ["jn_jkgl"],
         },
         children: [
@@ -1296,7 +1286,16 @@ export const asyncRoutes = [
           },
         ],
       },
-
+      {
+        path: "gfHealthManagement",
+        component: () => import("@/views/HealthControl/gfHealthManagement"),
+        name: "gfHealthManagement",
+        meta: {
+          title: "光伏健康管理",
+          icon: "svg-gfjkd",
+          permissions: ["jn_gfjkgl"],
+        },
+      },
       //   {
       //     path: "energyEfficAnalyse",
       //     redirect: "energyEfficAnalyse/healthPowerCurve",

src/views/HealthControl/gfHealthManagement/index.vue

@@ -0,0 +1,12 @@
+<template>
+  <!-- <router-view /> -->
+  <div>光伏健康管理</div>
+</template>
+
+<script>
+export default {
+  name: "gfHealthManagement", //光伏健康管理
+};
+</script>
+
+<style></style>

src/views/HealthControl/healthManagement/healthList/index.vue

@@ -28,7 +28,7 @@
       <table style="width: 100%" border="0" cellspacing="0">
         <thead>
           <tr>
-            <th rowspan="2" class="type1" style="width: 50px"></th>
+            <!-- <th rowspan="2" class="type1" style="width: 50px"></th> -->
             <th rowspan="2" class="type1" style="width: 105px">风机编号</th>
             <th rowspan="2" class="type1" style="width: 105px">风机型号</th>
             <th rowspan="2" class="type1" style="width: 350px">置信度</th>
@@ -59,7 +59,7 @@
           <table style="width: 100%" border="0" cellspacing="0">
             <tbody>
               <tr v-for="(item, index) in tableData" :key="index">
-                <td class="to" style="width: 50px">{{ item.id }}</td>
+                <!-- <td class="to" style="width: 50px">{{ item.id }}</td> -->
                 <td class="to" style="width: 110px">{{ item.nemCode }}</td>
                 <td class="to" style="width: 105px">{{ item.model }}</td>
                 <td class="to" style="width: 300px">

src/views/economicsOperation/benchmarkingManagement/loseRate/index.vue

@@ -460,6 +460,7 @@ export default {
       });
     },
     gerWxssl() {
+      this.BASE.showLoading();
       wxssl({
         companys: this.company,
         type: this.tabIndex,
@@ -471,7 +472,7 @@ export default {
         target: "",
         sort: "",
       }).then(({ data: res }) => {
-        if (res.data) {
+        if (res.data.length) {
           let barList = [
             {
               name: "故障损失电量",
@@ -512,6 +513,12 @@ export default {
           });
           this.lossPower = lossPower;
           this.barList = barList;
+          this.BASE.closeLoading();
+        } else {
+          this.BASE.closeLoading();
+          this.tableData = [];
+          this.lossPower = [];
+          this.barList = [];
         }
       });
     },

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -261,7 +261,7 @@ export default {
           name: "风速",
           name1: "光照",
           unit: "m/s",
-          unit1: "W/m²",
+          unit1: "kW/m²",
         },
         { code: "fjhjx", name: "故障", unit: "万kWh" },
         { code: "jhjx", name: "检修", unit: "万kWh" },
@@ -450,6 +450,7 @@ export default {
       this.getPerformance();
     },
     getPerformance() {
+      this.BASE.showLoading();
       let routeParams = this.$route.params;
       if (this.initFlag) {
         this.starTime = routeParams.starTime;
@@ -468,7 +469,7 @@ export default {
         sort: this.sort,
       }).then(({ data: res }) => {
         this.initFlag = false;
-        if (res.data) {
+        if (res.data.length) {
           let name = [],
             data = [],
             llfdl = [],
@@ -524,6 +525,12 @@ export default {
             this.showDisplay = true;
           }, 10);
           this.tableData = res.data;
+          this.BASE.closeLoading();
+        } else {
+          this.tableData = [];
+          this.bardata = [];
+          this.lineData = [];
+          this.BASE.closeLoading();
         }
       });
     },

src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -716,6 +716,7 @@ export default {
       });
     },
     gerCndb() {
+      this.BASE.showLoading();
       cndb({
         companys: this.company,
         type: this.tabIndex,
@@ -727,7 +728,7 @@ export default {
         target: "",
         sort: "",
       }).then(({ data: res }) => {
-        if (res.data) {
+        if (res.data && res.data.resultList && res.data.resultList.length) {
           let barList = [
             {
               name: "故障损失电量",
@@ -769,6 +770,13 @@ export default {
           });
           this.lossPower = lossPower;
           this.barList = barList;
+          this.BASE.closeLoading();
+        } else {
+          this.BASE.closeLoading();
+          this.tableData = [];
+          this.page.total = 0;
+          this.lossPower = [];
+          this.barList = [];
         }
       });
     },

src/views/economicsOperation/photovoltaicAnalyse/prAnalyse/components/barCharts.vue

@@ -61,20 +61,20 @@ export default {
           left: 18,
           right: 16,
           bottom: 16,
-          top: 35,
+          top:44,
           containLabel: true,
         },
         legend: {
           show: true,
           right: 20,
           icon: "ract",
-          itemWidth: 8,
-          itemHeight: 8,
+          itemWidth: 10,
+          itemHeight: 10,
           inactiveColor: "#B3BDC0",
           padding: [10, 0],
           textStyle: {
             color: "#B3BDC0",
-            fontSize: 12,
+            fontSize: 14,
           },
         },
         tooltip: {

src/views/economicsOperation/photovoltaicAnalyse/prAnalyse/index.vue

@@ -51,11 +51,23 @@
               :label="item.label"
               :width="item.width"
               :sortable="
-                item.prop != 'prpm' && item.prop != 'wtid' ? 'custom' : false
+                item.prop != 'prpm' &&
+                item.prop != 'wtid' &&
+                item.prop != 'rl' &&
+                item.prop != 'level'
+                  ? 'custom'
+                  : false
               "
             >
+              <template #header>
+                <div v-if="item.label.length > 2 || item.label == '容量'">
+                  {{ item.label }}
+                </div>
+                <span v-else>{{ item.label }}</span>
+                <span>{{ item.unit }}</span>
+              </template>
               <template #default="{ row }">
-                <div class="pr-table-cell" v-if="item.label == '增长率(%)'">
+                <div class="pr-table-cell" v-if="item.label == '增长率'">
                   <span>{{
                     row[item.prop] || row[item.prop] == 0
                       ? row[item.prop]
@@ -85,7 +97,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column width="800"></el-table-column>
+            <el-table-column width="600"></el-table-column>
           </el-table>
         </div>
         <div class="chart-wrapper">
@@ -118,13 +130,18 @@ export default {
       stationOptions: [],
       month: dayjs().format("YYYY-MM"),
       tableHeaders: [
-        { prop: "prpm", label: "排名", width: 80 },
-        { prop: "wtid", label: "设备" },
-        { prop: "pr", label: "本期" },
-        { prop: "prhb", label: "上月" },
-        { prop: "prhbzzl", label: "增长率(%)" },
-        { prop: "prtb", label: "同期" },
-        { prop: "prtbzzl", label: "增长率(%)" },
+        { prop: "prpm", label: "排名", width: 60 },
+        { prop: "wtid", label: "设备", width: 100 },
+        { prop: "level", label: "运行状态", width: 120 },
+        { prop: "rl", label: "容量", width: 75, unit: "(kW)" },
+        { prop: "ljgzz", label: "累计光照", width: 120, unit: "(kW/m²)" },
+        { prop: "fdl", label: "发电量", width: 110, unit: "(kWh)" },
+        { prop: "llfdlmax", label: "最大理论发电量", unit: "(kWh)" },
+        { prop: "pr", label: "本期", width: 80 },
+        { prop: "prhb", label: "上月", width: 80 },
+        { prop: "prhbzzl", label: "增长率", width: 120, unit: "(%)" },
+        { prop: "prtb", label: "同期", width: 80 },
+        { prop: "prtbzzl", label: "增长率", width: 120, unit: "(%)" },
       ],
       tableData: [],
       bardata: {},
@@ -203,6 +220,15 @@ export default {
         case "prtbzzl":
           this.target = "prtbzzlpm";
           break;
+        case "llfdlmax":
+          this.target = "llfdlmaxpm";
+          break;
+        case "ljgzz":
+          this.target = "ljgzzpm";
+          break;
+        case "fdl":
+          this.target = "fdlpm";
+          break;
         case null:
           this.target = "";
       }
@@ -260,7 +286,7 @@ export default {
         width: 100%;
       }
       .chart-wrapper {
-        width: 800px;
+        width: 600px;
         height: 100%;
         position: absolute;
         right: 0;

src/views/economicsOperation/photovoltaicAnalyse/stateTransition/index.vue

@@ -61,7 +61,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>状态转换分析</span></div>
+        <div class="leftContent floatLeft"><span>状态时间分析</span></div>
       </div>
 
       <div class="economicTable1">

src/views/economicsOperation/photovoltaicAnalyse/timeTransition/index.vue

@@ -58,7 +58,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>状态时间分析</span></div>
+        <div class="leftContent floatLeft"><span>状态转换分析</span></div>
       </div>
 
       <div class="economicTable1">

src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -283,12 +283,14 @@ export default {
           barList[1].children.push(item.compare || 0);
         });
         this.barList = barList;
+        this.BASE.closeLoading();
       }
     },
     // isNumber(val) {
     //     return typeof val === "number" && !isNaN(val);
     // },
     search() {
+      this.BASE.showLoading();
       switch (this.selectValue) {
         case "MTBF":
           mtbfList({
@@ -296,7 +298,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -309,6 +311,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -319,7 +325,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -332,6 +338,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;

src/views/economicsOperation/thematicAnalysis/MTTR/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>MTTR分析</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        MTTR分析
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, mttrList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      mttrList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .economicTable {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/affected/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>受累损失率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        受累损失率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, slsslList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      slsslList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .economicTable {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/defect/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>消缺及时率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        消缺及时率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, xqjslList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      xqjslList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .economicTable {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/failure/index.vue

@@ -300,12 +300,14 @@ export default {
           barList[1].children.push(item.compare || 0);
         });
         this.barList = barList;
+        this.BASE.closeLoading();
       }
     },
     isNumber(val) {
       return typeof val === "number" && !isNaN(val);
     },
     search() {
+      this.BASE.showLoading();
       switch (this.selectValue) {
         case "故障损失率":
           gzsslList({
@@ -313,7 +315,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -326,6 +328,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -335,7 +341,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -348,6 +354,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -357,7 +367,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -370,6 +380,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -379,7 +393,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -392,6 +406,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -401,7 +419,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -414,6 +432,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;

src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -308,12 +308,14 @@ export default {
           barList[1].children.push(item.sameperiod || 0);
         });
         this.barList = barList;
+        this.BASE.closeLoading();
       }
     },
     isNumber(val) {
       return typeof val === "number" && !isNaN(val);
     },
     search() {
+      this.BASE.showLoading();
       switch (this.selectValue) {
         case "发电量":
           fdlList({
@@ -321,7 +323,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -334,6 +336,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -344,7 +350,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -357,6 +363,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -366,7 +376,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -379,6 +389,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -388,7 +402,7 @@ export default {
             type: this.tabIndex,
             year: this.monthChange(this.searchYear),
           }).then(({ data: res }) => {
-            if (res.data) {
+            if (res.data.length) {
               let arr = [
                 {
                   wpname: "",
@@ -401,6 +415,10 @@ export default {
               ];
               this.tableData = [...arr, ...res.data];
               this.rowClick(res.data[res.data.length - 1]);
+            } else {
+              this.BASE.closeLoading();
+              this.barList = [];
+              this.tableData = [];
             }
           });
           break;
@@ -630,5 +648,4 @@ export default {
   font-weight: 400;
   color: #ffffff;
 }
-
 </style>

src/views/economicsOperation/thematicAnalysis/maintain/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>检修损失率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        检修损失率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, whsslList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      whsslList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .tableDataBox {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/property/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>性能损失率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        性能损失率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, xnsslList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      xnsslList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .tableDataBox {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/ration/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>限电损失率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        限电损失率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, xdsslList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      xdsslList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .tableDataBox {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/state/index.vue

@@ -1,494 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>状态转换率</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        状态转换率
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, ztzhlList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      ztzhlList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .economicTable {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/synthesize/index.vue

@@ -1,495 +0,0 @@
-<template>
-  <div class="parcel-box">
-    <div class="search">
-      <el-select size="mini" v-model="company" placeholder="请选择">
-        <el-option
-          v-for="item in companyOptions"
-          :key="item.id"
-          :label="item.aname"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-      <div class="tabCut">
-        <div
-          @click="tabClick(val.id)"
-          :class="tabIndex === val.id ? 'active' : ''"
-          v-for="val in tabOptions"
-          :key="val.id"
-        >
-          <span>{{ val.name }}</span>
-        </div>
-      </div>
-      <div class="search-input">
-        <el-date-picker
-          v-model="searchYear"
-          type="year"
-          value-format="YYYY"
-          placeholder="选择年"
-          popper-class="date-select"
-        >
-        </el-date-picker>
-      </div>
-      <el-button round size="mini" class="searchColor" @click="search"
-        >搜索</el-button
-      >
-      <!-- <el-button round size="mini">导出</el-button> -->
-    </div>
-    <div class="data-bodys">
-      <div class="line clearfix">
-        <div class="leftContent left"><span>综合厂用电量</span></div>
-      </div>
-      <div class="economicTable">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          size="mini"
-          stripe
-          height="50vh"
-          @row-click="rowClick"
-        >
-          <el-table-column
-            align="center"
-            prop=""
-            label="风场"
-            width="165"
-            sortable
-          >
-            <template v-slot="scope">
-              <span style="cursor: pointer">{{ scope.row.wpname }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            :label="val"
-            v-for="(val, index) in tableHead"
-            :key="index"
-            width="142"
-            sortable
-          >
-            <template v-slot="scope">
-              <div v-if="scope.row.wpname == ''">
-                <el-row>
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data?.current }}</span></el-col
-                  >
-                  <el-col :span="12"
-                    ><span>{{ scope.row.data.sameperiod }}</span></el-col
-                  >
-                </el-row>
-              </div>
-              <div v-else>
-                <el-row>
-                  <el-col :span="12" style="position: relative">
-                    <div
-                      style="
-                        padding: 0 10px;
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                      "
-                    >
-                      <span style="width: 40px">{{
-                        scope.row.targetList &&
-                        (scope.row.targetList[index]?.current ||
-                        scope.row.targetList[index]?.current === 0
-                          ? scope.row.targetList[index]?.current
-                          : "--")
-                      }}</span>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          (scope.row.targetList[index]?.compare > 0 ||
-                            scope.row.targetList[index]?.compare === 0)
-                        "
-                        class="active_icon icon-arrow-up compare-lift-up"
-                      ></i>
-                      <i
-                        style="position: absolute; right: 0"
-                        v-if="
-                          scope.row.targetList &&
-                          scope.row.targetList[index]?.compare < 0
-                        "
-                        class="active_icon icon-arrow-dpwn compare-lift-down"
-                      ></i>
-                    </div>
-                  </el-col>
-                  <el-col :span="12"
-                    ><span>{{
-                      scope.row.targetList &&
-                      (scope.row.targetList[index]?.sameperiod ||
-                      scope.row.targetList[index]?.sameperiod === 0
-                        ? scope.row.targetList[index]?.sameperiod
-                        : "--")
-                    }}</span></el-col
-                  >
-                </el-row>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div class="echarts" style="height: 30vh">
-      <div class="chart-name">
-        <div class="point point-left bottom"></div>
-        <div class="point point-right bottom"></div>
-        综合厂用电量
-      </div>
-      <div>
-        <BarCharts
-          :list="barList"
-          width="100%"
-          height="32vh"
-          :top="60"
-          :pillarName="pillarName"
-          :xdate="false"
-          :showLegend="true"
-          :units="['', '']"
-        ></BarCharts>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Panel from "@/components/curveAnalyse/panel.vue";
-import ChartColumnar from "@/components/curveAnalyse/multiple-bar-chart.vue";
-
-import BarCharts from "@/views/economicsOperation/thematicAnalysis/components/barCharts.vue";
-import { companys, zhcydlList } from "@/api/curveAnalyse";
-export default {
-  name: "curveAnalyse",
-  components: {
-    ChartColumnar,
-    Panel,
-    BarCharts,
-  },
-  data() {
-    return {
-      pillarName: "",
-      echartsData: [],
-      tableName: "",
-      list: [],
-      DayPower: {
-        // 图表所用单位
-        units: [""],
-        value: [
-          {
-            title: "",
-            yAxisIndex: 0, // 使用单位
-            value: [],
-          },
-        ],
-      },
-      BarChartsList: [],
-      tabIndex: -1,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
-      barHeight: "260px",
-      barList: [],
-      tableData: [],
-      tableHead: [
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "九月",
-        "十月",
-        "十一月",
-        "十二月",
-      ],
-      company: "",
-      companyOptions: [],
-      searchYear: this.getmonthValue(),
-    };
-  },
-  watch: {},
-  filters: {},
-  computed: {},
-  created() {
-    this.initialization();
-  },
-  methods: {
-    compare(property) {
-      return (a, b) => {
-        let val1 = a[property];
-        let val2 = b[property];
-        return val1 - val2;
-      };
-    },
-    rowClick(list) {
-      if (list?.wpname) {
-        let barList = [
-          {
-            name: "本期",
-            children: [],
-            date: [],
-          },
-          {
-            name: "同期",
-            children: [],
-          },
-        ];
-        this.pillarName = list.wpname;
-        list.targetList.forEach((item) => {
-          barList[0].date.push(item.month + "月");
-          barList[0].children.push(item.current || 0);
-          barList[1].children.push(item.compare || 0);
-        });
-        this.barList = barList;
-      }
-    },
-    isNumber(val) {
-      return typeof val === "number" && !isNaN(val);
-    },
-    search() {
-      zhcydlList({
-        companys: this.company,
-        type: this.tabIndex,
-        year: this.monthChange(this.searchYear),
-      }).then(({ data: res }) => {
-        if (res.data) {
-          let arr = [
-            {
-              wpname: "",
-              data: {
-                wpname: "期次",
-                current: "本期",
-                sameperiod: "同期",
-              },
-            },
-          ];
-          this.tableData = [...arr, ...res.data];
-          this.rowClick(res.data[res.data.length - 1]);
-        }
-      });
-    },
-    monthChange(data) {
-      let year = new Date(data).getFullYear().toString();
-      return year;
-    },
-    getmonthValue() {
-      let year = new Date().getFullYear().toString();
-      return year;
-    },
-
-    tabClick(data) {
-      this.tabIndex = data;
-      this.search();
-    },
-    initialization() {
-      companys().then(({ data: res }) => {
-        if (res.data) {
-          this.companyOptions = res.data;
-          this.company = res.data[0].id;
-          this.search();
-        }
-      });
-    },
-  },
-  mounted() {},
-  beforeUnmount() {},
-};
-</script>
-
-<style lang="less" scoped>
-.data-bodys {
-  display: flex;
-  flex-direction: column;
-  background-color: rgba(0, 0, 0, 0.45);
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.parcel-box {
-  padding: 0 20px;
-  box-sizing: border-box;
-
-  .economicTable {
-  }
-
-  .line {
-    padding-bottom: 5px;
-    .leftContent {
-      width: 242px;
-      height: 41px;
-      line-height: 41px;
-      background: url("~@/assets/imgs/title_left_bg1.png") no-repeat;
-
-      span {
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #ffffff;
-        margin-left: 25px;
-      }
-    }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
-  }
-
-  .search {
-    display: flex;
-    padding-top: 10px;
-    align-items: center;
-
-    .tabCut {
-      display: inline-block;
-      margin: 0 20px;
-
-      div {
-        display: inline-block;
-        width: 60px;
-        height: 27px;
-        border: 1px solid #274934;
-        text-align: center;
-        line-height: 25px;
-        cursor: pointer;
-      }
-
-      div:nth-child(1) {
-        border-radius: 13px 0px 0px 13px;
-      }
-
-      div:nth-child(2) {
-        border-radius: 0px 13px 13px 0px;
-      }
-
-      .active {
-        background-color: rgba(5, 187, 76, 0.9);
-        color: #fff;
-      }
-    }
-
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
-      background-color: rgba(5, 187, 76, 0.2);
-      border: 1px solid #3b6c53;
-      color: #b3b3b3;
-      font-size: 14px;
-
-      &:hover {
-        background-color: rgba(5, 187, 76, 0.5);
-        color: #ffffff;
-      }
-    }
-  }
-
-  .echarts {
-    margin-top: 20px;
-    background-color: rgba(0, 0, 0, 0.45);
-    border-radius: 5px;
-    width: 100%;
-  }
-}
-
-.clearfix::after {
-  content: "";
-  clear: both;
-  height: 0;
-  line-height: 0;
-  visibility: hidden;
-  display: block;
-}
-
-.clearfix {
-  zoom: 1;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-/deep/ .el-input__prefix {
-  right: -15px;
-  left: unset;
-}
-
-/deep/ .el-input--prefix .el-input__inner {
-  padding-left: 20px;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.compare-lift-down {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #ff8300;
-}
-
-.compare-lift-up {
-  margin-left: 7px;
-  font-size: 14px;
-  font-family: Arial;
-  font-weight: 400;
-  color: #1c99ff;
-}
-
-.chart-name {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-bottom: 1px solid rgba(106, 106, 106, 0.5);
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #ffffff;
-}
-
-.point {
-  width: 6px;
-  height: 1px;
-  background-color: #ffffff;
-  position: absolute;
-
-  &.left {
-    left: 0;
-  }
-
-  &.right {
-    top: 0;
-    right: 0;
-  }
-
-  &.top {
-    top: -1px;
-  }
-
-  &.bottom {
-    bottom: -1px;
-  }
-}
-</style>

src/views/economicsOperation/thematicAnalysis/windEnergy/index.vue

@@ -250,18 +250,20 @@ export default {
           barList[1].children.push(item.compare || 0);
         });
         this.barList = barList;
+        this.BASE.closeLoading();
       }
     },
     // isNumber(val) {
     //     return typeof val === "number" && !isNaN(val);
     // },
     search() {
+      this.BASE.showLoading();
       fnlylList({
         companys: this.company,
         type: this.tabIndex,
         year: this.monthChange(this.searchYear),
       }).then(({ data: res }) => {
-        if (res.data) {
+        if (res.data.length) {
           let arr = [
             {
               wpname: "",
@@ -274,6 +276,10 @@ export default {
           ];
           this.tableData = [...arr, ...res.data];
           this.rowClick(res.data[res.data.length - 1]);
+        } else {
+          this.BASE.closeLoading();
+          this.barList = [];
+          this.tableData = [];
         }
       });
     },

src/views/economicsOperation/windAnalyse/stateTransition/index.vue

@@ -61,7 +61,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>状态转换分析</span></div>
+        <div class="leftContent floatLeft"><span>状态时间分析</span></div>
       </div>
 
       <div class="economicTable1">

src/views/economicsOperation/windAnalyse/timeTransition/index.vue

@@ -58,7 +58,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>状态时间分析</span></div>
+        <div class="leftContent floatLeft"><span>状态转换分析</span></div>
       </div>
 
       <div class="economicTable1">

src/views/stateMonitor/DetailMatrix/index.vue

@@ -78,7 +78,7 @@
             </div>
           </div>
         </div>
-        <div class="unpaid">
+        <!-- <div class="unpaid">
           <div class="unpaid-item">
             <img src="@assets/imgs/unpaid.png" class="unpaid-img" alt="" />
             <div class="unpaid-name">欠发情况</div>
@@ -98,7 +98,7 @@
               }}
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
       <!-- 风电场/光电站列表 -->
       <el-scrollbar height="calc(100% - 72px)">

src/views/stateMonitor/powerPredictMatrix/index.vue

@@ -77,11 +77,7 @@
             </div>
           </div>
           <div class="btns">
-            <el-button
-              round
-              size="mini"
-              class="searchColor"
-              @click="handleSearch"
+            <el-button round size="mini" class="buttons" @click="handleSearch"
               >查 询</el-button
             >
           </div>
@@ -348,16 +344,14 @@ export default {
       color: #b3b3b3;
       margin-right: 10px;
     }
-    .searchColor {
+    .buttons {
       background-color: rgba(5, 187, 76, 0.2);
       border: 1px solid #3b6c53;
       color: #b3b3b3;
       font-size: 14px;
-      border: none;
-      width: 108px;
-      min-height: 25px !important;
 
-      &:hover {
+      &:hover,
+      &.active {
         background-color: rgba(5, 187, 76, 0.5);
         color: #ffffff;
       }