替换集中式逆变器图片，修改按钮和分页样式，修复部分页面bug，修改菜单权限

.env.development

@@ -1,11 +1,11 @@
 
 VUE_APP_TEST=http://10.81.3.155:9002
-# VUE_APP_TEST=http://192.168.1.100:9002
+# VUE_APP_TEST=http://192.168.1.101: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://10.81.3.153:6060
+# VUE_APP_API=http://192.168.1.106:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/api/powerAnalyse.js

@@ -93,3 +93,11 @@ export function getApiequipmentinfoDayListGf(params) {
     method: "GET",
   });
 }
+//光伏离散率分析
+export function getApiLslfxGf(params) {
+  return request({
+    baseURL: process.env.VUE_APP_TEST,
+    url: `photovoltaic/analysis/inverter?stationId=${params.stationId}&time=${params.time}&timeType=${params.timeType}&pageSize=${params.pageSize}&pageNum=${params.pageNum}`,
+    method: "GET",
+  });
+}

src/assets/styles/el-override/el-pagination.less

@@ -1,11 +1,13 @@
 // el-pagination
 .main-body {
   .el-pagination {
-    color: @gray;
+    color: #b3bdc0;
     .el-pagination__total {
-      color: @gray;
+      color: #b3bdc0;
+    }
+    .el-pagination__jump {
+      color: #b3bdc0;
     }
-
     button {
       &.btn-next,
       &.btn-prev {

src/router/index.js

@@ -20,21 +20,6 @@ export const asyncRoutes = [
       permissions: ["jn_sy"],
     },
   },
-  //   {
-  //     path: "/monitor/status", // 状态监视
-  //     name: "Status",
-  //     component: () =>
-  //       import(
-  //         /* webpackChunkName: "status" */ "@/views/stateMonitor/Status/Status.vue"
-  //       ),
-  //   },
-
-  //   {
-  //     path: "/monitor/agc", // AGC 监视
-  //     name: "Agc",
-  //     component: () =>
-  //       import(/* webpackChunkName: "agc" */ "@/views/stateMonitor/Agc/Agc.vue"),
-  //     },
   //全景监视
   {
     path: "/stateMonitor",
@@ -573,15 +558,6 @@ export const asyncRoutes = [
       permissions: ["jn_economicsOperation"],
     },
     children: [
-      //   {
-      //     path: "homePage",
-      //     component: () => import("@/views/economicsOperation/homePage"),
-      //     name: "homePage",
-      //     meta: {
-      //       title: "首页",
-      //       icon: "icon-Simple-matrix",
-      //     },
-      //   },
       //对标管理
       {
         path: "benchmarkingManagement",
@@ -815,7 +791,7 @@ export const asyncRoutes = [
         meta: {
           title: "场站分析",
           icon: "svg-fddl",
-          permissions: ["jn_fddlfx"],
+          permissions: ["jn_czfx"],
         },
         children: [
           {
@@ -828,7 +804,7 @@ export const asyncRoutes = [
             meta: {
               title: "发电量分析",
               icon: "",
-              permissions: ["jn_gfdlfx"],
+              permissions: ["jn_czfx_fdlfx"],
             },
           },
           {
@@ -841,7 +817,7 @@ export const asyncRoutes = [
             meta: {
               title: "综合场用电量分析",
               icon: "",
-              permissions: ["jn_gfdlfx"],
+              permissions: ["jn_czfx_zhcydlfx"],
             },
           },
           {
@@ -854,7 +830,7 @@ export const asyncRoutes = [
             meta: {
               title: "风光资源分析",
               icon: "",
-              permissions: ["jn_gfdlfx"],
+              permissions: ["jn_czfx_fgzyfx"],
             },
           },
         ],
@@ -867,7 +843,7 @@ export const asyncRoutes = [
         meta: {
           title: "风电分析",
           icon: "svg-fdfx",
-          permissions: ["jn_xnfx"],
+          permissions: ["jn_fdfx"],
         },
         children: [
           {
@@ -878,7 +854,7 @@ export const asyncRoutes = [
             meta: {
               title: "功率曲线拟合",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_fdfx_glqxnh"],
             },
           },
           {
@@ -889,7 +865,7 @@ export const asyncRoutes = [
             meta: {
               title: "功率曲线查询",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_fdfx_glqxcx"],
             },
           },
           {
@@ -902,7 +878,7 @@ export const asyncRoutes = [
             meta: {
               title: "曲线偏差率分析",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_fdfx_qxpclfx"],
             },
           },
           {
@@ -915,7 +891,7 @@ export const asyncRoutes = [
             meta: {
               title: "切入切出分析",
               icon: "",
-              permissions: ["jn_glqx_qrqcfx"],
+              permissions: ["jn_fdfx_qrqcfx"],
             },
           },
           {
@@ -928,7 +904,7 @@ export const asyncRoutes = [
             meta: {
               title: "单机性能分析",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_fdfx_djxnfx"],
             },
           },
           {
@@ -941,7 +917,7 @@ export const asyncRoutes = [
             meta: {
               title: "单机月度分析",
               icon: "",
-              permissions: ["jn_xnfx_djydfx"],
+              permissions: ["jn_fdfx_djydfx"],
             },
           },
           {
@@ -954,7 +930,7 @@ export const asyncRoutes = [
             meta: {
               title: "性能等级评估",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_fdfx_xndjpg"],
             },
           },
           {
@@ -967,7 +943,7 @@ export const asyncRoutes = [
             meta: {
               title: "状态转换分析",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_fdfx_ztzhfx"],
             },
           },
           {
@@ -980,7 +956,7 @@ export const asyncRoutes = [
             meta: {
               title: "状态时间分析",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_fdfx_ztsjfx"],
             },
           },
         ],
@@ -995,7 +971,7 @@ export const asyncRoutes = [
         meta: {
           title: "光伏分析",
           icon: "svg-gffx",
-          permissions: ["jn_xnfx"],
+          permissions: ["jn_gffx"],
         },
         children: [
           {
@@ -1008,7 +984,7 @@ export const asyncRoutes = [
             meta: {
               title: "功率曲线拟合",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_gffx_glqxnh"],
             },
           },
           {
@@ -1021,7 +997,7 @@ export const asyncRoutes = [
             meta: {
               title: "功率温度分析",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_gffx_glwdfx"],
             },
           },
           {
@@ -1032,7 +1008,7 @@ export const asyncRoutes = [
             meta: {
               title: "离散率分析",
               icon: "",
-              permissions: ["jn_xnfx_djxnfx"],
+              permissions: ["jn_gffx_lslfx"],
             },
           },
           {
@@ -1043,9 +1019,9 @@ export const asyncRoutes = [
               ),
             name: "PrAnalyse",
             meta: {
-              title: "PR分析",
+              title: "系统效率分析",
               icon: "",
-              permissions: ["jn_xnfx_djydfx"],
+              permissions: ["jn_gffx_xtxlfx"],
             },
           },
           {
@@ -1058,7 +1034,7 @@ export const asyncRoutes = [
             meta: {
               title: "性能等级评估",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_gffx_xndjpg"],
             },
           },
           {
@@ -1071,7 +1047,7 @@ export const asyncRoutes = [
             meta: {
               title: "状态转换分析",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_gffx_ztzhfx"],
             },
           },
           {
@@ -1084,7 +1060,7 @@ export const asyncRoutes = [
             meta: {
               title: "状态时间分析",
               icon: "",
-              permissions: ["jn_glqx_glqxnh"],
+              permissions: ["jn_gffx_ztsjfx"],
             },
           },
         ],
@@ -1207,7 +1183,6 @@ export const asyncRoutes = [
     children: [
       {
         path: "healthManagement",
-        // redirect: "healthManagement/first",
         component: () => import("@/views/HealthControl/healthManagement"),
         name: "healthManagement",
         meta: {
@@ -1316,7 +1291,7 @@ export const asyncRoutes = [
             meta: {
               title: "部件温度分析",
               icon: "",
-              permissions: ["jn_nxfx_bjwd"],
+              permissions: ["jn_jkgl_bjwd"],
             },
           },
         ],

src/views/HealthControl/HealthTab1.vue

@@ -33,30 +33,38 @@
         :showLine="false"
       >
         <div class="actions mg-b-16">
-          <button
-            class="btn"
+          <el-button
+            size="mini"
+            class="btn" round
             :class="recommenIndex === 1 ? 'active' : ''"
             @click="onClickRecommon(1)"
           >
             当日内推荐
-          </button>
-          <button
-            class="btn"
+          </el-button>
+          <el-button
+            size="mini"
+            class="btn" round
             :class="recommenIndex === 2 ? 'active' : ''"
             @click="onClickRecommon(2)"
           >
             三日内推荐
-          </button>
-          <button
-            class="btn"
+          </el-button>
+          <el-button
+            size="mini"
+            class="btn" round
             :class="recommenIndex === 3 ? 'active' : ''"
             @click="onClickRecommon(3)"
           >
             超三日推荐
-          </button>
+          </el-button>
           <div style="margin-left: 450px">
-            <button class="btn" @click="onClickCofirmAll()">全部确认</button>
-            <button class="btn" @click="onClickIgnoreAll()">全部忽略</button>
+            <el-button class="btn" round @click="onClickCofirmAll()" size="mini"
+              >全部确认</el-button
+            >
+
+            <el-button class="btn" round @click="onClickIgnoreAll()" size="mini"
+              >全部忽略</el-button
+            >
           </div>
         </div>
         <div class="report-items scroll">

src/views/HealthControl/healthDetail/index.vue

@@ -2,7 +2,7 @@
   <div class="wind-site">
     <div class="page-common-body">
       <div class="page-common-body-router">
-        <router-view />
+        <router-view @getWtid="getWtid" />
       </div>
       <div v-if="!hidden" class="page-common-body-menu">
         <div class="page-common-body-menu-box">
@@ -71,17 +71,26 @@ export default {
           this.hidden = false;
         }
       },
+      immediate: true,
     },
   },
   created() {
     this.wtId = this.$route.params.wtId;
     this.wpId = this.$route.params.wpId;
-    this.menuDatas.forEach((ele) => {
-      ele.path += "/" + this.wpId + "/" + this.wtId;
-    });
+    if (this.wtId) {
+      this.menuDatas.forEach((ele) => {
+        ele.path += "/" + this.wpId + "/" + this.wtId;
+      });
+    }
   },
 
   methods: {
+    getWtid(id) {
+      this.wtId = id;
+      this.menuDatas.forEach((ele) => {
+        ele.path += "/" + this.wpId + "/" + this.wtId;
+      });
+    },
     clickMenu: function (index) {
       this.activeIndex = index;
     },

src/views/HealthControl/healthDetail/wtHealth/index.vue

@@ -109,9 +109,13 @@
             <div class="fan-code">
               <div class="fan-code-value nm font-md green">{{stoptypemap && stoptypemap.wtscore}}</div>
             </div> -->
-            <button class="btn mg-l-16" type="button" @click="onClickReport()">
+            <el-button
+              style="margin-left: 15px"
+              class="searchColor"
+              @click="onClickReport()"
+            >
               <i class="el-icon-s-order mg-r-8"></i><span>健康报告</span>
-            </button>
+            </el-button>
           </el-col>
         </el-row>
         <el-row>
@@ -775,6 +779,7 @@ export default {
   created() {
     this.wtid = this.$route.params.wtId;
     this.wpid = this.$route.params.wpId;
+    this.$emit("getWtid", this.wtid);
     this.search();
   },
   methods: {
@@ -929,10 +934,28 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
+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;
+  }
+}
 .health-0 {
   width: 100%;
-  height: calc(100vh - 90px);
+  height: calc(100% - 90px);
 
   .fan-code-box {
     display: flex;

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

@@ -65,7 +65,9 @@
         </div>
       </div>
       <div class="query-actions">
-        <button class="btn green" @click="getTableData">搜索</button>
+        <el-button class="searchColor" round size="mini" @click="getTableData"
+          >搜 索</el-button
+        >
       </div>
     </div>
     <el-table
@@ -242,4 +244,25 @@ export default {
   width: 100%;
   overflow: auto;
 }
+.query-actions {
+  margin-left: 0 !important;
+}
+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;
+  }
+}
 </style>

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

@@ -57,6 +57,7 @@
             v-model="starTime"
             :disabled="displayDetail"
             type="date"
+            size="mini"
             value-format="YYYY-MM-DD"
             placeholder="选择日期"
             popper-class="date-select"
@@ -71,6 +72,7 @@
             v-model="endTime"
             :disabled="displayDetail"
             type="date"
+            size="mini"
             value-format="YYYY-MM-DD"
             placeholder="选择日期"
             popper-class="date-select"
@@ -232,7 +234,9 @@
           @current-change="handlePageDChange"
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeDChange"
+          :page-sizes="[19, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
         </el-pagination>
@@ -372,6 +376,11 @@ export default {
       this.pageD.currentPage = val;
       this.goDetail();
     },
+    handleSizeDChange(val) {
+      this.pageD.currentPage = 1;
+      this.pageD.pagesize = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       if (val == -2) {

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

@@ -257,10 +257,12 @@
       </el-table>
       <div class="pagination-class">
         <el-pagination
+          @size-change="handleSizeDChange"
+          :page-sizes="[23, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           @current-change="handlePageDChange"
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
-          layout="total, prev, pager, next, jumper"
           :total="pageD.total"
         >
         </el-pagination>
@@ -386,6 +388,13 @@ export default {
       this.pageD.currentPage = val;
       this.goDetail();
     },
+
+    handleSizeDChange(val) {
+      this.pageD.currentPage = 1;
+      this.pageD.pagesize = val;
+      this.goDetail();
+    },
+
     tabClick(val) {
       this.tabIndex = val;
       this.stationObj = [];

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

@@ -253,7 +253,9 @@
           @current-change="handlePageDChange"
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeDChange"
+          :page-sizes="[23, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
         </el-pagination>
@@ -382,6 +384,11 @@ export default {
       this.pageD.currentPage = val;
       this.goDetail();
     },
+    handleSizeDChange(val) {
+      this.pageD.currentPage = 1;
+      this.pageD.pagesize = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       this.stationList = [];

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

@@ -237,7 +237,9 @@
           @current-change="handlePageDChange"
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeDChange"
+          :page-sizes="[23, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
         </el-pagination>
@@ -655,6 +657,11 @@ export default {
       this.pageD.currentPage = val;
       this.goDetail();
     },
+    handleSizeDChange(val) {
+      this.pageD.currentPage = 1;
+      this.pageD.pagesize = val;
+      this.goDetail();
+    },
     funthb() {
       thb({
         companys: this.company,

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

@@ -278,7 +278,9 @@
           @current-change="handlePageDChange"
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeDChange"
+          :page-sizes="[23, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
         </el-pagination>
@@ -353,7 +355,7 @@ export default {
         total: 0,
       },
       pageD: {
-        pagesize: 19,
+        pagesize: 23,
         currentPage: 1,
         total: 0,
       },
@@ -429,6 +431,11 @@ export default {
       this.pageD.currentPage = val;
       this.goDetail();
     },
+    handleSizeDChange(val) {
+      this.pageD.currentPage = 1;
+      this.pageD.pagesize = val;
+      this.goDetail();
+    },
     tabClick(val) {
       this.tabIndex = val;
       this.stationList = [];

src/views/economicsOperation/comprehensiveControl/maintenanceKPI/index.vue

@@ -32,11 +32,7 @@
       </div>
 
       <div class="but">
-        <el-button
-          round
-          size="mini"
-          class="buttons sousuo"
-          @click="getTableData"
+        <el-button round size="mini" class="buttons" @click="getTableData"
           >搜索</el-button
         >
         <el-button round size="mini" class="buttons" @click="downXlsxFn"
@@ -135,7 +131,8 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[21, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -270,11 +267,12 @@ export default {
     this.pickerTime = dayjs().format("YYYY-MM");
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   computed: {},
   methods: {
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -283,19 +281,26 @@ export default {
       this.getTableData();
     },
     getTableData() {
-        let that = this
-        let params = {
-            pageNum: that.page.currentPage,
-            pageSize: that.page.pagesize,
-            years: that.pickerTime ? this.pickerTime.substring(0, this.pickerTime.indexOf('-'))*1 : null,
-            month: that.pickerTime ? this.pickerTime.substring(this.pickerTime.indexOf('-')+1, this.pickerTime.length)*1 : null
+      let that = this;
+      let params = {
+        pageNum: that.page.currentPage,
+        pageSize: that.page.pagesize,
+        years: that.pickerTime
+          ? this.pickerTime.substring(0, this.pickerTime.indexOf("-")) * 1
+          : null,
+        month: that.pickerTime
+          ? this.pickerTime.substring(
+              this.pickerTime.indexOf("-") + 1,
+              this.pickerTime.length
+            ) * 1
+          : null,
+      };
+      maintenanceKPI(params).then((res) => {
+        if (res) {
+          that.maintenanceData = res.data.records;
+          that.page.total = res.data.total;
         }
-        maintenanceKPI(params).then(res =>{
-            if (res) {
-                that.maintenanceData = res.data.records
-                that.page.total = res.data.total
-            }
-        })
+      });
     },
     downXlsxFn() {
       let header = [];
@@ -416,26 +421,18 @@ export default {
       align-content: center;
       margin-left: 20px;
 
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
+        color: #b3b3b3;
+        font-size: 14px;
 
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
-
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
-        color: #b3b3b3;
-      }
     }
   }
 

src/views/economicsOperation/comprehensiveControl/runningKPI/index.vue

@@ -33,11 +33,7 @@
       </div>
 
       <div class="but">
-        <el-button
-          round
-          size="mini"
-          class="buttons sousuo"
-          @click="getTableData"
+        <el-button round size="mini" class="buttons" @click="getTableData"
           >搜索</el-button
         >
         <el-button round size="mini" class="buttons" @click="downXlsxFn"
@@ -136,7 +132,8 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[21, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -270,11 +267,12 @@ export default {
     this.pickerTime = dayjs().format("YYYY-MM");
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   computed: {},
   methods: {
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -283,19 +281,26 @@ export default {
       this.getTableData();
     },
     getTableData() {
-        let that = this
-        let params = {
-            pageNum: that.page.currentPage,
-            pageSize: that.page.pagesize,
-            years: that.pickerTime ? this.pickerTime.substring(0, this.pickerTime.indexOf('-'))*1 : null,
-            month: that.pickerTime ? this.pickerTime.substring(this.pickerTime.indexOf('-')+1, this.pickerTime.length)*1 : null
+      let that = this;
+      let params = {
+        pageNum: that.page.currentPage,
+        pageSize: that.page.pagesize,
+        years: that.pickerTime
+          ? this.pickerTime.substring(0, this.pickerTime.indexOf("-")) * 1
+          : null,
+        month: that.pickerTime
+          ? this.pickerTime.substring(
+              this.pickerTime.indexOf("-") + 1,
+              this.pickerTime.length
+            ) * 1
+          : null,
+      };
+      runningKPI(params).then((res) => {
+        if (res) {
+          that.runningData = res.data.records;
+          that.page.total = res.data.total;
         }
-        runningKPI(params).then(res =>{
-            if (res) {
-                that.runningData = res.data.records
-                that.page.total = res.data.total
-            }
-        })
+      });
     },
     downXlsxFn() {
       let header = [];
@@ -319,7 +324,6 @@ export default {
   padding: 0 20px;
   height: 100%;
   .running_title {
-
     .leftContent {
       width: 242px;
       height: 41px;
@@ -430,26 +434,18 @@ export default {
       align-content: center;
       margin-left: 20px;
 
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
+        color: #b3b3b3;
+        font-size: 14px;
 
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
-
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
-        color: #b3b3b3;
-      }
     }
   }
 

src/views/economicsOperation/comprehensiveControl/stationControlKPI/index.vue

@@ -32,11 +32,7 @@
       </div>
 
       <div class="but">
-        <el-button
-          round
-          size="mini"
-          class="buttons sousuo"
-          @click="getTableData"
+        <el-button round size="mini" class="buttons" @click="getTableData"
           >搜索</el-button
         >
         <el-button round size="mini" class="buttons" @click="downXlsxFn"
@@ -95,7 +91,11 @@
             align="center"
           >
             <el-table-column
-              v-for="(subItem, subIndex) in tabIndex == -1 ? item.children : item.childrenG ? item.childrenG : item.children"
+              v-for="(subItem, subIndex) in tabIndex == -1
+                ? item.children
+                : item.childrenG
+                ? item.childrenG
+                : item.children"
               :key="subIndex"
               :prop="subItem.code"
               :label="subItem.title"
@@ -128,7 +128,8 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[21, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -477,6 +478,7 @@ export default {
   computed: {},
   methods: {
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -486,28 +488,35 @@ export default {
     },
 
     getTableData() {
-        let that = this
-        let params = {
-            pageNum: that.page.currentPage,
-            pageSize: that.page.pagesize,
-            years: that.pickerTime ? this.pickerTime.substring(0, this.pickerTime.indexOf('-'))*1 : null,
-            month: that.pickerTime ? this.pickerTime.substring(this.pickerTime.indexOf('-')+1, this.pickerTime.length)*1 : null
-        }
-        if (that.tabIndex == -1) {
-            stationKPI(params).then(res =>{
-                if (res) {
-                    that.stationControlData = res.data.records
-                    that.page.total = res.data.total
-                }
-            })
-        } else {
-            stationXklKPI(params).then(res =>{
-                if (res) {
-                    that.stationControlData = res.data.records
-                    that.page.total = res.data.total
-                }
-            })
-        }
+      let that = this;
+      let params = {
+        pageNum: that.page.currentPage,
+        pageSize: that.page.pagesize,
+        years: that.pickerTime
+          ? this.pickerTime.substring(0, this.pickerTime.indexOf("-")) * 1
+          : null,
+        month: that.pickerTime
+          ? this.pickerTime.substring(
+              this.pickerTime.indexOf("-") + 1,
+              this.pickerTime.length
+            ) * 1
+          : null,
+      };
+      if (that.tabIndex == -1) {
+        stationKPI(params).then((res) => {
+          if (res) {
+            that.stationControlData = res.data.records;
+            that.page.total = res.data.total;
+          }
+        });
+      } else {
+        stationXklKPI(params).then((res) => {
+          if (res) {
+            that.stationControlData = res.data.records;
+            that.page.total = res.data.total;
+          }
+        });
+      }
     },
     downXlsxFn() {
       let header = [];
@@ -535,7 +544,6 @@ export default {
   padding: 0 20px;
   height: 100%;
   .stationControl_title {
-
     .leftContent {
       width: 242px;
       height: 41px;
@@ -646,26 +654,18 @@ export default {
       align-content: center;
       margin-left: 20px;
 
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
+        color: #b3b3b3;
+        font-size: 14px;
 
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
-
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
-        color: #b3b3b3;
-      }
     }
   }
 

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

@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="but">
-        <el-button round size="mini" class="buttons" @click="seachData"
+        <el-button round size="mini" class="buttons" @click="getTableData"
           >搜索</el-button
         >
       </div>
@@ -45,11 +45,11 @@
           :data="tableData"
           stripe
           size="mini"
-          height="100%"
+          height="calc(100% - 45px)"
           ref="Eval_table"
           style="width: 100%"
         >
-          <el-table-column prop="equipmentId" label="设备编号" align="center">
+          <el-table-column prop="equipmentId" label="设备名称" align="center">
           </el-table-column>
           <el-table-column
             v-for="(item, index) in tableHeader"
@@ -79,6 +79,7 @@
 
 <script>
 import { getApiwpByCplistlist } from "@/api/monthlyPerformanceAnalysis";
+import { getApiLslfxGf } from "@/api/powerAnalyse.js";
 import dayjs from "dayjs";
 export default {
   name: "Lslfx", //离散率分析
@@ -88,11 +89,11 @@ export default {
       stationOptions: [],
       pickerTimer: "",
       tableHeader: [
-        { title: "日照强度(W/m²)", code: "scatter" },
-        { title: "平均功率(kW)", code: "scatter" },
+        { title: "日照强度(W/m²)", code: "averageLightIntensity" },
+        { title: "平均功率(kW)", code: "averagePower" },
         { title: "离散率(%)", code: "scatter" },
-        { title: "标准差", code: "conversionEfficiency" },
-        { title: "逆变器推荐状态", code: "equivalentGeneratingTime" },
+        { title: "标准差", code: "equivalentGeneratingTimeStan" },
+        { title: "逆变器推荐状态", code: "scatterStatus" },
       ],
       page: {
         currentPage: 1,
@@ -104,6 +105,7 @@ export default {
   },
   created() {
     this.pickerTimer = dayjs().add(-1, "day").format("YYYY-MM-DD");
+    this.getStationData();
   },
   methods: {
     // 获取场站列表
@@ -116,7 +118,7 @@ export default {
       const { data: datas } = await getApiwpByCplistlist(params);
       if (datas.data.length) {
         this.stationOptions = datas.data;
-        // this.stationVal = "SXJ_KGDL_HR_GDC_STA";
+        this.stationVal = this.stationOptions[0].id;
         this.getTableData();
       } else {
         this.stationOptions = [];
@@ -137,14 +139,17 @@ export default {
     async getTableData() {
       let params = {
         time: this.pickerTimer,
+        timeType: "month",
         stationId: this.stationVal,
         type: this.tabEvent,
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
-    //   const { data } = await getApiequipmentinfoDayListGf(params);
-    //   this.tableData = data.records;
-    //   this.page.total = data.total;
+      const res = await getApiLslfxGf(params);
+      if (res.code == 200 && res.data.records.length) {
+        this.tableData = res.data.records;
+        this.page.total = res.data.total;
+      }
     },
   },
 };
@@ -182,26 +187,21 @@ export default {
       }
     }
 
-    .but {
-      display: flex;
-      flex-direction: row;
-      align-content: center;
-      margin-left: 20px;
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
-        }
+    .buttons {
+      background-color: rgba(5, 187, 76, 0.2);
+      border: 1px solid #3b6c53;
+      color: #b3b3b3;
+      font-size: 14px;
+
+      &:hover,
+      &.active {
+        background-color: rgba(5, 187, 76, 0.5);
+        color: #ffffff;
       }
     }
   }
   .lslfx-content {
-    height: calc(100% - 40px);
+    height: calc(100% - 58px);
     width: 100%;
     .leftContent {
       width: 242px;

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

@@ -64,7 +64,7 @@
       "
     >
       <div class="Evaluation_title clearfix">
-        <div class="leftContent floatLeft"><span>光伏性能评价</span></div>
+        <div class="leftContent floatLeft"><span>性能等级评估</span></div>
       </div>
 
       <div class="economicTable1">
@@ -91,9 +91,9 @@
           <el-pagination
             @current-change="handlePageChange"
             @size-change="handleSizeChange"
+            :page-sizes="[22, 50, 100, 500]"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            :page-sizes="[22, 50, 100, 500]"
             layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
           >
@@ -372,23 +372,17 @@ export default {
         flex-direction: row;
         align-content: center;
         margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
+        .buttons {
+          background-color: rgba(5, 187, 76, 0.2);
           border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
           color: #b3b3b3;
+          font-size: 14px;
+
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
+            color: #ffffff;
+          }
         }
       }
     }

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

@@ -76,7 +76,7 @@
           </div>
         </div>
         <div class="search-actions">
-          <el-button size="mini" class="btn-search" @click="search"
+          <el-button size="mini" round class="buttons" @click="search"
             >查 询</el-button
           >
           <!-- <el-button
@@ -705,27 +705,19 @@ export default {
         }
       }
       .search-actions {
-        .el-button {
-          background-color: rgba(5, 187, 76, 0.3);
+        margin-left: 15px;
+        .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;
 
-          &.btn-search:hover {
-            background-color: rgba(5, 187, 76, 0.6);
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
             color: #ffffff;
           }
         }
-        .btn-active {
-          background-color: rgba(5, 187, 76, 0.6);
-          color: #ffffff;
-        }
-      }
-      &:nth-last-child(1) {
-        justify-content: space-between;
       }
     }
   }

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

@@ -100,7 +100,7 @@
           </div>
         </div>
         <div class="search-actions">
-          <el-button size="mini" class="btn-search" @click="search"
+          <el-button size="mini" round class="buttons" @click="search"
             >曲线拟合</el-button
           >
           <!-- <el-button
@@ -921,27 +921,21 @@ export default {
       }
       .search-actions {
         top: 152px;
-        right: 75px;
+        right: 22px;
         position: absolute;
         z-index: 88;
-        .el-button {
-          background-color: rgba(5, 187, 76, 0.3);
+        .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;
 
-          &.btn-search:hover {
-            background-color: rgba(5, 187, 76, 0.6);
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
             color: #ffffff;
           }
         }
-        .btn-active {
-          background-color: rgba(5, 187, 76, 0.6);
-          color: #ffffff;
-        }
       }
       &:nth-last-child(1) {
         justify-content: space-between;

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

@@ -25,7 +25,7 @@
         popper-class="date-select"
       >
       </el-date-picker>
-      <el-button round size="mini" class="searchColor" @click="getDatas"
+      <el-button round size="mini" class="buttons" @click="getDatas"
         >搜索</el-button
       >
     </div>
@@ -113,7 +113,7 @@ export default {
   name: "PrAnalyse", //PR分析
   data() {
     return {
-      selectValue: "PR分析",
+      selectValue: "系统效率分析",
       station: "",
       stationOptions: [],
       month: dayjs().format("YYYY-MM"),
@@ -219,20 +219,15 @@ export default {
   padding: 0 20px;
   .pr-search {
     padding: 10px 0;
-    button {
-      margin-left: 10px;
-      background: rgba(67, 81, 107, 0.3);
-      border: 1px solid #274934;
-      color: #b3b3b3;
-    }
-
-    .searchColor {
+    .buttons {
+      margin-left: 15px;
       background-color: rgba(5, 187, 76, 0.2);
       border: 1px solid #3b6c53;
       color: #b3b3b3;
       font-size: 14px;
 
-      &:hover {
+      &:hover,
+      &.active {
         background-color: rgba(5, 187, 76, 0.5);
         color: #ffffff;
       }

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

@@ -56,7 +56,7 @@
     <div
       style="
         background: rgba(0, 0, 0, 0.4);
-        height: calc(100% - 39px);
+        height: calc(100% - 52px);
         padding-bottom: 15px;
       "
     >
@@ -69,58 +69,60 @@
           :data="EvaluationData"
           stripe
           size="mini"
-          height="calc(100% - 40px)"
+          height="calc(100% - 45px)"
           ref="Eval_table"
           style="width: 100%"
         >
-        <el-table-column prop="deviceId" label="设备名称" align="center" />
-            <el-table-column label="待机时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.standbyTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="并网时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="故障时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.faultTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="检修时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.maintenanceTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="限电时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.powerLimitTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="受累时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.faultTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="离线时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.offlineTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>            
-            <el-table-column label="合计时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.total }}</span>
-                </template>
-            </el-table-column>
+          <el-table-column prop="deviceId" label="设备名称" align="center" />
+          <el-table-column label="待机时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.standbyTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="并网时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="故障时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.faultTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="检修时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.maintenanceTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="限电时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.powerLimitTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="受累时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.faultTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="离线时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.offlineTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合计时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.total }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div style="text-align: right">
           <el-pagination
+            @size-change="handleSizeChange"
+            :page-sizes="[22, 50, 100, 500]"
             @current-change="handlePageChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
+            layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
           >
           </el-pagination>
@@ -134,7 +136,7 @@
 import {
   getApiphotovoltaiclist,
   getApicompanyslist,
-  getApiwpByCplistlist
+  getApiwpByCplistlist,
 } from "@/api/monthlyPerformanceAnalysis";
 import dayjs from "dayjs";
 export default {
@@ -149,17 +151,24 @@ export default {
       EvaluationData: [],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 22,
         total: 0,
       },
     };
   },
   mounted() {
-    this.getCompanyData();   
+    this.getCompanyData();
     this.pickerTimer = [
-        new Date(new Date(new Date().getTime()-24*60*60*1000).setHours(0,0,0,0)),
-        new Date(new Date(new Date().getTime()).setHours(0,0,0,0))
-    ]
+      new Date(
+        new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(
+          0,
+          0,
+          0,
+          0
+        )
+      ),
+      new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0)),
+    ];
   },
   computed: {
     pageHeight() {
@@ -169,6 +178,11 @@ export default {
     },
   },
   methods: {
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
+    },
     handlePageChange(val) {
       this.page.currentPage = val;
       this.seachData();
@@ -209,14 +223,14 @@ export default {
     async getTableData() {
       let params = {
         stationId: this.stationVal,
-        type: 'IN',
+        type: "IN",
         startTime: this.pickerTimer[0].getTime(),
         endTime: this.pickerTimer[1].getTime(),
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiphotovoltaiclist(params);
-      this.EvaluationData = datas.data
+      this.EvaluationData = datas.data;
       this.page.total = datas.total;
     },
   },
@@ -351,28 +365,16 @@ export default {
         }
       }
 
-      .but {
-        display: flex;
-        flex-direction: row;
-        align-content: center;
-        margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
-          color: #b3b3b3;
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
+        border: 1px solid #3b6c53;
+        color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
     }

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

@@ -38,12 +38,9 @@
           时间：
           <el-date-picker
             v-model="pickerTimer"
-            type="datetimerange"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            format="YYYY-MM-DD HH:mm:ss"
-            date-format="YYYY/MM/DD ddd"
-            time-format="A hh:mm:ss"
+            type="date"
+            size="mini"
+            popper-class="date-select"
           />
         </div>
         <div class="but">
@@ -56,7 +53,7 @@
     <div
       style="
         background: rgba(0, 0, 0, 0.4);
-        height: calc(100% - 39px);
+        height: calc(100% - 52px);
         padding-bottom: 15px;
       "
     >
@@ -73,32 +70,48 @@
           ref="Eval_table"
           style="width: 100%"
         >
-            <el-table-column prop="stationId" label="设备" align="center" width="100">
-              <template #default="{ row }">
-                <span>{{ '#'+row.stationId }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态">
-              <template #default="{ row }">
-                <div style="width: 100%;">
-                  <span v-for="(it,index) in row.data" :key="index" class="comStr"
-                  :style="{width: `${Number(it.time/((pickerTimer[1].getTime()-pickerTimer[0].getTime())/1000).toFixed(2))*100}%`}"
-                  :title="`${it.stationId}在${getTimedate(it.startTime)}至${getTimedate(it.endTime)}是${eventData(it.event)}状态`"
-                  :class="rowState(it)"></span>
-                </div>
-                </template>
-            </el-table-column>
-
+          <el-table-column
+            prop="stationId"
+            label="设备"
+            align="center"
+            width="100"
+          >
+            <template #default="{ row }">
+              <span>{{ "#" + row.stationId }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态">
+            <template #default="{ row }">
+              <div style="width: 100%">
+                <span
+                  v-for="(it, index) in row.data"
+                  :key="index"
+                  class="comStr"
+                  :style="{
+                    width: `${
+                      Number(it.time / (timeCount / 1000).toFixed(2)) * 100
+                    }%`,
+                  }"
+                  :title="`${it.equipmentId}在${getTimedate(
+                    it.startTime
+                  )}至${getTimedate(it.endTime)}是${eventData(it.event)}状态`"
+                  :class="rowState(it)"
+                ></span>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
         <div style="text-align: right">
           <el-pagination
+            @size-change="handleSizeChange"
+            :page-sizes="[22, 50, 100, 500]" 
+             layout="total, sizes, prev, pager, next, jumper"
             @current-change="handlePageChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
+          
             :total="page.total"
-          >
-          </el-pagination>
+          />
         </div>
       </div>
     </div>
@@ -109,7 +122,7 @@
 import {
   getApiphotovoltaicTimelist,
   getApicompanyslist,
-  getApiwpByCplistlist
+  getApiwpByCplistlist,
 } from "@/api/monthlyPerformanceAnalysis";
 import dayjs from "dayjs";
 export default {
@@ -120,21 +133,19 @@ export default {
       companyOptions: [],
       stationVal: "",
       stationOptions: [],
-      pickerTimer: [],
+      pickerTimer: "",
       EvaluationData: [],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 22,
         total: 0,
       },
+      timeCount: 0,
     };
   },
   mounted() {
-    this.getCompanyData();   
-    this.pickerTimer = [
-        new Date(new Date(new Date().getTime()-24*60*60*1000).setHours(0,0,0,0)),
-        new Date(new Date(new Date().getTime()).setHours(0,0,0,0))
-    ]
+    this.getCompanyData();
+    this.pickerTimer = dayjs().add(-1, "day").startOf("date");
   },
   computed: {
     pageHeight() {
@@ -148,24 +159,30 @@ export default {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
     },
     eventData(event) {
-      let showStr = ''
+      let showStr = "";
       if (event === 0) {
-        showStr = '待机'
+        showStr = "待机";
       } else if (event === 1) {
-        showStr = '并网'
+        showStr = "并网";
       } else if (event === 2) {
-        showStr = '故障'
+        showStr = "故障";
       } else if (event === 3) {
-        showStr = '检修'
+        showStr = "检修";
       } else if (event === 4) {
-        showStr = '限电'
+        showStr = "限电";
       } else if (event === 5) {
-        showStr = '受累'
+        showStr = "受累";
       } else if (event === 6) {
-        showStr = '离线'
+        showStr = "离线";
       }
-      return showStr
+      return showStr;
+    },
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
     },
+
     handlePageChange(val) {
       this.page.currentPage = val;
       this.seachData();
@@ -201,23 +218,23 @@ export default {
       this.getTableData();
     },
     rowState(row) {
-      let showStr = ''
+      let showStr = "";
       if (row.event === 0) {
-        showStr = 'daijiStr'
+        showStr = "daijiStr";
       } else if (row.event === 1) {
-        showStr = 'bingwangStr'
+        showStr = "bingwangStr";
       } else if (row.event === 2) {
-        showStr = 'guzhangStr'
+        showStr = "guzhangStr";
       } else if (row.event === 3) {
-        showStr = 'jianxiuStr'
+        showStr = "jianxiuStr";
       } else if (row.event === 4) {
-        showStr = 'xiandianStr'
+        showStr = "xiandianStr";
       } else if (row.event === 5) {
-        showStr = 'shouleiStr'
+        showStr = "shouleiStr";
       } else if (row.event === 6) {
-        showStr = 'lixianStr'
+        showStr = "lixianStr";
       }
-      return showStr
+      return showStr;
     },
     seachData() {
       this.getTableData();
@@ -225,36 +242,39 @@ export default {
     async getTableData() {
       let params = {
         stationId: this.stationVal,
-        type: 'IN',
-        startTime: this.pickerTimer[0].getTime(),
-        endTime: this.pickerTimer[1].getTime(),
+        type: "IN",
+        startTime: dayjs(this.pickerTimer).valueOf(),
+        endTime: dayjs(this.pickerTimer).add(1, "day").valueOf(),
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiphotovoltaicTimelist(params);
       if (datas && datas.data) {
-        let arr =[]
-        for(let i in datas.data) {
+        let arr = [];
+        for (let i in datas.data) {
           let obj = {
             stationId: i.substring(1),
-            data: datas.data[i]
-          }
-          arr.push(obj)
+            data: datas.data[i],
+          };
+          arr.push(obj);
         }
-        this.EvaluationData = arr.sort(this.sortBy('stationId'))
+        this.timeCount =
+          dayjs(this.pickerTimer).add(1, "day").valueOf() -
+          dayjs(this.pickerTimer).valueOf();
+        this.EvaluationData = arr.sort(this.sortBy("stationId"));
       }
-      this.page.total = datas.data.total;
+      this.page.total = datas.total;
     },
     sortBy(stationId) {
-      return (x, y) =>{
-        return x[stationId]- y[stationId]
-      }
-    }
+      return (x, y) => {
+        return x[stationId] - y[stationId];
+      };
+    },
   },
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .timeTransition {
   padding: 0 20px;
   height: 100%;
@@ -382,28 +402,16 @@ export default {
         }
       }
 
-      .but {
-        display: flex;
-        flex-direction: row;
-        align-content: center;
-        margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
-          color: #b3b3b3;
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
+        border: 1px solid #3b6c53;
+        color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
     }
@@ -424,30 +432,30 @@ export default {
         }
       }
     }
-    .comStr{
+    .comStr {
       display: inline-block;
       // width: 10px;
       height: 20px;
     }
-    .daijiStr{
+    .daijiStr {
       background: #1c99ff;
     }
-    .bingwangStr{
+    .bingwangStr {
       background: #05bb4c;
     }
-    .guzhangStr{
+    .guzhangStr {
       background: #ba3237;
     }
-    .jianxiuStr{
+    .jianxiuStr {
       background: #e17d24;
     }
-    .xiandianStr{
+    .xiandianStr {
       background: #c530c8;
     }
-    .shouleiStr{
+    .shouleiStr {
       background: #ffffff;
     }
-    .lixianStr{
+    .lixianStr {
       background: #606769;
     }
 

src/views/economicsOperation/stationAnalyse/electricAnalyse/components/barCharts.vue

@@ -60,6 +60,7 @@ export default {
           let seriesItem = {
             name: listItem?.name,
             type: "bar",
+            barMinHeight: 2,
             data: listItem?.data,
             itemStyle: {
               color: listItem.color,

src/views/economicsOperation/stationAnalyse/electricAnalyse/index.vue

@@ -159,7 +159,7 @@ export default {
         "实发电量",
         "当月占比(实发/计划)",
         "全年占比(实发/计划)",
-        "短期准确率",
+        "短期功率预测准确率",
       ],
       headersGf: [
         "日照强度(W/m²)",
@@ -208,15 +208,19 @@ export default {
       this.getStation();
     },
     getStation() {
-      GetStationByCompany({ companyids: this.company, type: 0 }).then(
-        ({ data: res, code }) => {
-          if (res.code == 200) {
-            this.stationOptions = res.data;
-            this.station = this.stationOptions[0]?.id || "";
-            this.getDatas();
-          }
+      GetStationByCompany({
+        companyids: this.company,
+        type: this.tabIndex,
+      }).then(({ data: res, code }) => {
+        if (res.code == 200 && res.data.length) {
+          this.stationOptions = res.data;
+          this.station = this.stationOptions[0]?.id || "";
+          this.getDatas();
+        } else {
+          this.tableData = [];
+          this.list = [];
         }
-      );
+      });
     },
     getDatas() {
       this.loading = true;
@@ -237,7 +241,7 @@ export default {
               data.bnsjdlhj,
               null,
               data.qnzbhj + "%",
-              null,
+              data.dqzqlhj + "%",
             ];
             //处理纵向表格数据
             let resData = JSON.parse(JSON.stringify(data.value));

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/historyDetail.vue

@@ -104,7 +104,9 @@
         @current-change="handleCurrentChange"
         :current-page="page.currentPage"
         :page-size="page.pagesize"
-        layout="total, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        :page-sizes="[19, 50, 100, 500]"
+        layout="total, sizes, prev, pager, next, jumper"
         :total="page.total"
       >
       </el-pagination>
@@ -230,6 +232,7 @@ export default {
       this.page.total = datas.data.total;
     },
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -261,7 +264,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .historycutInAndOut {
   height: 100%;
   .historycutInAndOut_top {
@@ -335,23 +338,17 @@ export default {
       flex-direction: row;
       align-content: center;
       margin-left: 20px;
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
-        }
-      }
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
         color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
+        }
       }
     }
     .el-date-editor--daterange {
@@ -370,5 +367,13 @@ export default {
       }
     }
   }
+  .el-pagination ::v-deep {
+    .el-pagination__sizes {
+      .el-input__inner {
+        width: 100% !important;
+        border-radius: 0 !important;
+      }
+    }
+  }
 }
 </style>

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

@@ -54,7 +54,7 @@
         </div>
       </div>
       <div class="but">
-        <el-button round size="mini" class="buttons sousuo" @click="seachData"
+        <el-button round size="mini" class="buttons" @click="seachData"
           >搜索</el-button
         >
         <el-button round size="mini" class="buttons" @click="downXlsxFn"
@@ -122,11 +122,12 @@
           </el-table-column>
         </el-table>
         <el-pagination
-          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          :page-sizes="[21, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -330,6 +331,7 @@ export default {
       this.page.total = datas.data.total;
     },
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -337,6 +339,7 @@ export default {
       this.page.currentPage = val;
       this.getTableData();
     },
+
     //转换时间
     getchangeTime(date) {
       var y = date.getFullYear();
@@ -392,7 +395,7 @@ export default {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #05BB4C;
+        color: #05bb4c;
         margin-left: 25px;
       }
     }
@@ -491,27 +494,18 @@ export default {
       flex-direction: row;
       align-content: center;
       margin-left: 20px;
-
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
+        color: #b3b3b3;
+        font-size: 14px;
 
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
-
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
-        color: #b3b3b3;
-      }
     }
   }
 

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

@@ -118,7 +118,8 @@
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[21, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -285,6 +286,7 @@ export default {
       this.page.total = datas.data.total;
     },
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -335,7 +337,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .monthMachine {
   padding: 0 20px;
   height: 100%;
@@ -437,23 +439,17 @@ export default {
       flex-direction: row;
       align-content: center;
       margin-left: 20px;
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
-        }
-      }
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
         color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
+        }
       }
     }
   }

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

@@ -183,7 +183,9 @@
             @current-change="handlePageChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            :page-sizes="[21, 50, 100, 500]"
+            layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
           >
           </el-pagination>
@@ -316,6 +318,11 @@ export default {
     },
   },
   methods: {
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
+    },
     handlePageChange(val) {
       this.page.currentPage = val;
       this.seachData();
@@ -439,7 +446,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .comprehensiveEvaluation {
   padding: 0 20px;
   height: 100%;
@@ -572,30 +579,24 @@ export default {
         flex-direction: row;
         align-content: center;
         margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
+        .buttons {
+          background-color: rgba(5, 187, 76, 0.2);
           border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
           color: #b3b3b3;
+          font-size: 14px;
+
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
+            color: #ffffff;
+          }
         }
       }
     }
   }
   .economicTable1 {
     height: calc(100% - 40px);
-    .el-table--mini {
+    .el-table--mini ::v-deep {
       .el-table__header-wrapper {
         .el-checkbox {
           display: none;

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

@@ -205,11 +205,13 @@
           </div>
         </div>
         <div class="search-actions">
-          <el-button size="mini" class="btn-search" @click="search"
+          <el-button size="mini" round class="buttons" @click="search"
             >曲线拟合</el-button
           >
           <el-button
             size="mini"
+            round
+            class="buttons"
             :class="{ 'btn-active': isChartArea }"
             :disabled="!seriesData?.length"
             @click="funChartArea"
@@ -971,24 +973,36 @@ export default {
         }
       }
       .search-actions {
-        .el-button {
-          background-color: rgba(5, 187, 76, 0.3);
+        // .el-button {
+        //   background-color: rgba(5, 187, 76, 0.3);
+        //   border: 1px solid #3b6c53;
+        //   color: #b3b3b3;
+        //   font-size: 14px;
+        //   border: none;
+        //   width: 108px;
+        //   min-height: 25px !important;
+
+        //   &.btn-search:hover {
+        //     background-color: rgba(5, 187, 76, 0.6);
+        //     color: #ffffff;
+        //   }
+        // }
+        // .btn-active {
+        //   background-color: rgba(5, 187, 76, 0.6);
+        //   color: #ffffff;
+        // }
+        .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;
 
-          &.btn-search:hover {
-            background-color: rgba(5, 187, 76, 0.6);
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
             color: #ffffff;
           }
         }
-        .btn-active {
-          background-color: rgba(5, 187, 76, 0.6);
-          color: #ffffff;
-        }
       }
       &:nth-last-child(1) {
         justify-content: space-between;

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

@@ -57,10 +57,10 @@
           <el-radio label="2"> 显示两位小数行 </el-radio>
         </el-radio-group>
         <div class="but">
-          <el-button round size="mini" class="search" @click="seachData"
+          <el-button round size="mini" class="buttons" @click="seachData"
             >拟 合</el-button
           >
-          <el-button round size="mini" class="download" @click="downXlsxFn"
+          <el-button round size="mini" class="buttons" @click="downXlsxFn"
             >导 出</el-button
           >
         </div>
@@ -507,23 +507,17 @@ export default {
         flex-direction: row;
         align-content: center;
         margin-left: 20px;
-        .search {
-          background: rgba(5, 187, 76, 0.6);
+        .buttons {
+          background-color: rgba(5, 187, 76, 0.2);
           border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #b9b9b9;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .download {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
           color: #b3b3b3;
+          font-size: 14px;
+
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
+            color: #ffffff;
+          }
         }
       }
     }

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

@@ -19,6 +19,7 @@
           <div class="lable">场站：</div>
           <div class="search-input">
             <el-select
+            size="mini"
               v-model="value1"
               clearable
               placeholder="请选择"
@@ -38,6 +39,7 @@
           <div class="lable">日期：</div>
           <div class="search-input">
             <el-date-picker
+            size="mini"
               v-model="date"
               :type="cur ? 'date' : 'month'"
               placeholder="选择日期"

src/views/economicsOperation/windAnalyse/singleWindAnasyle/historyDetail.vue

@@ -71,7 +71,9 @@
         @current-change="handleCurrentChange"
         :current-page="page.currentPage"
         :page-size="page.pagesize"
-        layout="total, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        :page-sizes="[21, 50, 100, 500]"
+        layout="total, sizes, prev, pager, next, jumper"
         :total="page.total"
       >
       </el-pagination>
@@ -108,7 +110,7 @@ export default {
       hisWindOptions: [],
       showBtn: true,
       page: {
-        pagesize: 11,
+        pagesize: 21,
         currentPage: 1,
         total: 0,
       },
@@ -300,6 +302,7 @@ export default {
       }
     },
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -331,7 +334,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .historysingleMachine {
   height: 100%;
   .historysingleMachine_top {
@@ -357,23 +360,17 @@ export default {
       flex-direction: row;
       align-content: center;
       margin-left: 20px;
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
-        }
-      }
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
         color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
+        }
       }
     }
     .el-date-editor--daterange {
@@ -396,4 +393,12 @@ export default {
     height: calc(100% - 58px);
   }
 }
+.el-pagination ::v-deep {
+  .el-pagination__sizes {
+    .el-input__inner {
+      width: 100% !important;
+      border-radius: 0 !important;
+    }
+  }
+}
 </style>

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

@@ -120,21 +120,26 @@
               </div>
               <div v-else>{{ scope.column.label }}</div>
             </template> -->
-            <template #default="scope" v-if="item.title === '操作'">
+
+            <template #default="scope">
+              <span>{{ scope.row[item.code] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="80">
+            <template #default="scope">
               <span class="historyBtn" @click="seachHistoryData(scope.row)"
                 >历史</span
               >
             </template>
-            <template #default="scope">
-              <span>{{ scope.row[item.code] }}</span>
-            </template>
           </el-table-column>
         </el-table>
         <el-pagination
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
-          layout="total, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          :page-sizes="[23, 50, 100, 500]"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="page.total"
         >
         </el-pagination>
@@ -227,7 +232,7 @@ export default {
         { title: "年排行榜", code: "yearTop" },
         { title: "年拟合优度(%)", code: "yearGoodness" },
         { title: "年风速(m/s)", code: "yearSpeed" },
-        { title: "操作" },
+        // { title: "操作" },
       ],
       tableHeaderGf: [
         { title: "逆变器", code: "wtname" },
@@ -241,7 +246,7 @@ export default {
         { title: "年系统效率", code: "nxtxl" },
         { title: "年离散率", code: "nlsl" },
         { title: "年转换效率", code: "nzhxl" },
-        { title: "操作" },
+        // { title: "操作" },
       ],
       page: {
         pagesize: 23,
@@ -336,6 +341,7 @@ export default {
       }
     },
     handleSizeChange(val) {
+      this.page.currentPage = 1;
       this.page.pagesize = val;
       this.getTableData();
     },
@@ -503,23 +509,17 @@ export default {
       flex-direction: row;
       align-content: center;
       margin-left: 20px;
-      .buttons:nth-child(1) {
-        background: rgba(5, 187, 76, 0.6);
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
         border: 1px solid #3b6c53;
-        border-radius: 13px;
-        color: #fff;
-        &:hover {
-          background: rgba(5, 187, 76, 0.9);
-          border-radius: 13px;
-          color: #fff;
-        }
-      }
-      .buttons:nth-child(2) {
-        background: rgba(67, 81, 107, 0.3);
-        border: 1px solid #3b6c53;
-        border-radius: 13px;
-        font-size: 14px;
         color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
+        }
       }
     }
   }

src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -118,7 +118,9 @@
           </div>
         </div>
         <div class="query-actions">
-          <el-button class="seach" size="mini" @click="search">搜索</el-button>
+          <el-button class="buttons" size="mini" round @click="search"
+            >搜索</el-button
+          >
         </div>
       </div>
     </div>
@@ -1789,7 +1791,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .windDetailWidth {
   width: calc(100%-50px);
   margin-left: 50px;
@@ -1839,15 +1841,17 @@ export default {
         }
       }
       .query-actions {
-        .el-button {
-          background: rgba(5, 187, 76, 0.6);
+        margin-left: 5px;
+        .buttons {
+          background-color: rgba(5, 187, 76, 0.2);
           border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
+          color: #b3b3b3;
+          font-size: 14px;
+
+          &:hover,
+          &.active {
+            background-color: rgba(5, 187, 76, 0.5);
+            color: #ffffff;
           }
         }
       }

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

@@ -56,7 +56,7 @@
     <div
       style="
         background: rgba(0, 0, 0, 0.4);
-        height: calc(100% - 39px);
+        height: calc(100% - 52px);
         padding-bottom: 15px;
       "
     >
@@ -73,54 +73,56 @@
           ref="Eval_table"
           style="width: 100%"
         >
-            <el-table-column prop="deviceId" label="风机名称" align="center" />
-            <el-table-column label="待机时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.standbyTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="并网时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="故障时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.faultTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="检修时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.maintenanceTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="限电时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.powerLimitTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="受累时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.faultTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="离线时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.offlineTime.toFixed(2) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="合计时间(H)" align="center">
-              <template #default="{ row }">
-                    <span>{{ row.total }}</span>
-                </template>
-            </el-table-column>
+          <el-table-column prop="deviceId" label="风机名称" align="center" />
+          <el-table-column label="待机时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.standbyTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="并网时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="故障时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.faultTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="检修时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.maintenanceTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="限电时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.powerLimitTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="受累时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.faultTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="离线时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.offlineTime.toFixed(2) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合计时间(H)" align="center">
+            <template #default="{ row }">
+              <span>{{ row.total }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div style="text-align: right">
           <el-pagination
+            @size-change="handleSizeChange"
+            :page-sizes="[22, 50, 100, 500]"
+            layout="total, sizes, prev, pager, next, jumper"
             @current-change="handlePageChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
             :total="page.total"
           >
           </el-pagination>
@@ -134,7 +136,7 @@
 import {
   getApiphotovoltaiclist,
   getApicompanyslist,
-  getApiwpByCplistlist
+  getApiwpByCplistlist,
 } from "@/api/monthlyPerformanceAnalysis";
 import dayjs from "dayjs";
 export default {
@@ -149,17 +151,24 @@ export default {
       EvaluationData: [],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 22,
         total: 0,
       },
     };
   },
   mounted() {
-    this.getCompanyData();   
+    this.getCompanyData();
     this.pickerTimer = [
-        new Date(new Date(new Date().getTime()-24*60*60*1000).setHours(0,0,0,0)),
-        new Date(new Date(new Date().getTime()).setHours(0,0,0,0))
-    ]
+      new Date(
+        new Date(new Date().getTime() - 24 * 60 * 60 * 1000).setHours(
+          0,
+          0,
+          0,
+          0
+        )
+      ),
+      new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0)),
+    ];
   },
   computed: {
     pageHeight() {
@@ -169,6 +178,11 @@ export default {
     },
   },
   methods: {
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
+    },
     handlePageChange(val) {
       this.page.currentPage = val;
       this.seachData();
@@ -209,14 +223,14 @@ export default {
     async getTableData() {
       let params = {
         stationId: this.stationVal,
-        type: 'WT',
+        type: "WT",
         startTime: this.pickerTimer[0].getTime(),
         endTime: this.pickerTimer[1].getTime(),
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiphotovoltaiclist(params);
-      this.EvaluationData = datas.data
+      this.EvaluationData = datas.data;
       this.page.total = datas.total;
     },
   },
@@ -351,28 +365,16 @@ export default {
         }
       }
 
-      .but {
-        display: flex;
-        flex-direction: row;
-        align-content: center;
-        margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
-          color: #b3b3b3;
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
+        border: 1px solid #3b6c53;
+        color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
     }

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

@@ -38,12 +38,9 @@
           时间：
           <el-date-picker
             v-model="pickerTimer"
-            type="datetimerange"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            format="YYYY-MM-DD HH:mm:ss"
-            date-format="YYYY/MM/DD ddd"
-            time-format="A hh:mm:ss"
+            type="date"
+            size="mini"
+            popper-class="date-select"
           />
         </div>
         <div class="but">
@@ -56,7 +53,7 @@
     <div
       style="
         background: rgba(0, 0, 0, 0.4);
-        height: calc(100% - 39px);
+        height: calc(100% - 52px);
         padding-bottom: 15px;
       "
     >
@@ -73,29 +70,45 @@
           ref="Eval_table"
           style="width: 100%"
         >
-            <el-table-column prop="stationId" label="场站" align="center" width="100">
-              <template #default="{ row }">
-                <span>{{ '#'+row.stationId }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态">
-              <template #default="{ row }">
-                <div style="width: 100%;">
-                  <span v-for="(it,index) in row.data" :key="index" class="comStr"
-                  :style="{width: `${Number(it.time/((pickerTimer[1].getTime()-pickerTimer[0].getTime())/1000).toFixed(2))*100}%`}"
-                  :title="`${it.stationId}在${getTimedate(it.startTime)}至${getTimedate(it.endTime)}是${eventData(it.event)}状态`"
-                  :class="rowState(it)"></span>
-                </div>
-                </template>
-            </el-table-column>
-
+          <el-table-column
+            prop="stationId"
+            label="场站"
+            align="center"
+            width="100"
+          >
+            <template #default="{ row }">
+              <span>{{ "#" + row.stationId }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态">
+            <template #default="{ row }">
+              <div style="width: 100%">
+                <span
+                  v-for="(it, index) in row.data"
+                  :key="index"
+                  class="comStr"
+                  :style="{
+                    width: `${
+                      Number(it.time / (timeCount / 1000).toFixed(2)) * 100
+                    }%`,
+                  }"
+                  :title="`${it.equipmentId}在${getTimedate(
+                    it.startTime
+                  )}至${getTimedate(it.endTime)}是${eventData(it.event)}状态`"
+                  :class="rowState(it)"
+                ></span>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
         <div style="text-align: right">
           <el-pagination
+            @size-change="handleSizeChange"
+            :page-sizes="[22, 50, 100, 500]"
+            layout="total, sizes, prev, pager, next, jumper"
             @current-change="handlePageChange"
             :current-page="page.currentPage"
             :page-size="page.pagesize"
-            layout="total, prev, pager, next, jumper"
             :total="page.total"
           >
           </el-pagination>
@@ -109,7 +122,7 @@
 import {
   getApiphotovoltaicTimelist,
   getApicompanyslist,
-  getApiwpByCplistlist
+  getApiwpByCplistlist,
 } from "@/api/monthlyPerformanceAnalysis";
 import dayjs from "dayjs";
 export default {
@@ -120,21 +133,19 @@ export default {
       companyOptions: [],
       stationVal: "",
       stationOptions: [],
-      pickerTimer: [],
+      pickerTimer: "",
       EvaluationData: [],
       page: {
         currentPage: 1,
-        pagesize: 21,
+        pagesize: 22,
         total: 0,
       },
+      timeCount: 0,
     };
   },
   mounted() {
-    this.getCompanyData();   
-    this.pickerTimer = [
-        new Date(new Date(new Date().getTime()-24*60*60*1000).setHours(0,0,0,0)),
-        new Date(new Date(new Date().getTime()).setHours(0,0,0,0))
-    ]
+    this.getCompanyData();
+    this.pickerTimer = dayjs().add(-1, "day").startOf("date");
   },
   computed: {
     pageHeight() {
@@ -148,23 +159,28 @@ export default {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
     },
     eventData(event) {
-      let showStr = ''
+      let showStr = "";
       if (event === 0) {
-        showStr = '待机'
+        showStr = "待机";
       } else if (event === 1) {
-        showStr = '并网'
+        showStr = "并网";
       } else if (event === 2) {
-        showStr = '故障'
+        showStr = "故障";
       } else if (event === 3) {
-        showStr = '检修'
+        showStr = "检修";
       } else if (event === 4) {
-        showStr = '限电'
+        showStr = "限电";
       } else if (event === 5) {
-        showStr = '受累'
+        showStr = "受累";
       } else if (event === 6) {
-        showStr = '离线'
+        showStr = "离线";
       }
-      return showStr
+      return showStr;
+    },
+    handleSizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pagesize = val;
+      this.seachData();
     },
     handlePageChange(val) {
       this.page.currentPage = val;
@@ -201,23 +217,23 @@ export default {
       this.getTableData();
     },
     rowState(row) {
-      let showStr = ''
+      let showStr = "";
       if (row.event === 0) {
-        showStr = 'daijiStr'
+        showStr = "daijiStr";
       } else if (row.event === 1) {
-        showStr = 'bingwangStr'
+        showStr = "bingwangStr";
       } else if (row.event === 2) {
-        showStr = 'guzhangStr'
+        showStr = "guzhangStr";
       } else if (row.event === 3) {
-        showStr = 'jianxiuStr'
+        showStr = "jianxiuStr";
       } else if (row.event === 4) {
-        showStr = 'xiandianStr'
+        showStr = "xiandianStr";
       } else if (row.event === 5) {
-        showStr = 'shouleiStr'
+        showStr = "shouleiStr";
       } else if (row.event === 6) {
-        showStr = 'lixianStr'
+        showStr = "lixianStr";
       }
-      return showStr
+      return showStr;
     },
     seachData() {
       this.getTableData();
@@ -225,31 +241,34 @@ export default {
     async getTableData() {
       let params = {
         stationId: this.stationVal,
-        type: 'WT',
-        startTime: this.pickerTimer[0].getTime(),
-        endTime: this.pickerTimer[1].getTime(),
+        type: "WT",
+        startTime: dayjs(this.pickerTimer).valueOf(),
+        endTime: dayjs(this.pickerTimer).add(1, "day").valueOf(),
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiphotovoltaicTimelist(params);
       if (datas && datas.data) {
-        let arr =[]
-        for(let i in datas.data) {
+        let arr = [];
+        for (let i in datas.data) {
           let obj = {
             stationId: i.substring(1),
-            data: datas.data[i]
-          }
-          arr.push(obj)
+            data: datas.data[i],
+          };
+          arr.push(obj);
         }
-        this.EvaluationData = arr.sort(this.sortBy('stationId'))
+        this.timeCount =
+          dayjs(this.pickerTimer).add(1, "day").valueOf() -
+          dayjs(this.pickerTimer).valueOf();
+        this.EvaluationData = arr.sort(this.sortBy("stationId"));
       }
-      this.page.total = datas.data.total;
+      this.page.total = datas.total;
     },
     sortBy(stationId) {
-      return (x, y) =>{
-        return x[stationId]- y[stationId]
-      }
-    }
+      return (x, y) => {
+        return x[stationId] - y[stationId];
+      };
+    },
   },
 };
 </script>
@@ -382,28 +401,16 @@ export default {
         }
       }
 
-      .but {
-        display: flex;
-        flex-direction: row;
-        align-content: center;
-        margin-left: 20px;
-        .buttons:nth-child(1) {
-          background: rgba(5, 187, 76, 0.6);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          color: #fff;
-          &:hover {
-            background: rgba(5, 187, 76, 0.9);
-            border-radius: 13px;
-            color: #fff;
-          }
-        }
-        .buttons:nth-child(2) {
-          background: rgba(67, 81, 107, 0.3);
-          border: 1px solid #3b6c53;
-          border-radius: 13px;
-          font-size: 14px;
-          color: #b3b3b3;
+      .buttons {
+        background-color: rgba(5, 187, 76, 0.2);
+        border: 1px solid #3b6c53;
+        color: #b3b3b3;
+        font-size: 14px;
+
+        &:hover,
+        &.active {
+          background-color: rgba(5, 187, 76, 0.5);
+          color: #ffffff;
         }
       }
     }
@@ -424,30 +431,30 @@ export default {
         }
       }
     }
-    .comStr{
+    .comStr {
       display: inline-block;
       // width: 10px;
       height: 20px;
     }
-    .daijiStr{
+    .daijiStr {
       background: #1c99ff;
     }
-    .bingwangStr{
+    .bingwangStr {
       background: #05bb4c;
     }
-    .guzhangStr{
+    .guzhangStr {
       background: #ba3237;
     }
-    .jianxiuStr{
+    .jianxiuStr {
       background: #e17d24;
     }
-    .xiandianStr{
+    .xiandianStr {
       background: #c530c8;
     }
-    .shouleiStr{
+    .shouleiStr {
       background: #ffffff;
     }
-    .lixianStr{
+    .lixianStr {
       background: #606769;
     }