Merge branch 'master' of http://124.70.43.205:3000/sunzehao/fd_dwgz_zhyw_nx

src/App.vue

@@ -67,7 +67,7 @@
             >
               <template #title>
                 <div class="elGrounpTitleAll" v-if="!isCollapse">
-                  <div v-html="menu.svg" class="svgSty"></div>
+                  <!-- <div v-html="menu.svg" class="svgSty"></div> -->
                   <span style="margin-left: 10px" class="chSpna">{{
                     menu.name
                   }}</span>
@@ -98,8 +98,8 @@
               :style="noGrounpItemFn(menu.index)"
             >
               <div class="elMenuTitle elMenuTitleAll" v-if="!isCollapse">
-                <div v-html="menu.svg" class="svgSty"></div>
-                <span class="titspan">{{ menu.name }}</span>
+                <!-- <div v-html="menu.svg" class="svgSty"></div> -->
+                <span class="titspan" :class="getSelectState(menu.index)">{{ menu.name }}</span>
               </div>
               <div class="elMenuTitle" v-else>
                 <div v-html="menu.svg" style="display: flex"></div>
@@ -1304,6 +1304,7 @@ body {
         margin: 0 5px;
 
         .el-sub-menu__title {
+            // height: 1px !important;
           background: none;
 
           .elGrounpTitleAll {
@@ -1353,13 +1354,13 @@ body {
 
         .el-menu {
           border-radius: 0 0 8px 8px;
-          padding: 10px 0 10px 0;
+        //   padding: 10px 0 10px 0;
           background: #132444;
 
           .elsubMenu {
             width: 130px;
             height: 30px;
-            margin: 10px 0;
+            // margin: 10px 0;
             position: relative;
             left: 50px;
             // background: #1c69bb;
@@ -1383,6 +1384,7 @@ body {
                 left: -30px;
               }
             }
+            
 
             // .is-active {
             //     max-width: 160px !important;
@@ -1402,6 +1404,14 @@ body {
               color: #a5b7df;
             }
           }
+          
+            .elsubMenu:hover{
+                background: #1c69bb;
+                .grounpItemSpan {
+                color: #a5b7df;
+                }
+            }
+          
         }
       }
 
@@ -1444,6 +1454,17 @@ body {
             position: relative;
             top: 5px;
           }
+            .titspan:hover{
+                padding: 0 10px;
+                background: #1c69bb;
+            }
+          .isSelect {
+            background: #1c69bb;
+            padding: 0 10px;
+            .grounpItemSpan {
+              color: #a5b7df;
+            }
+          }
         }
       }
 
@@ -1517,7 +1538,7 @@ body {
         background: transparent !important;
 
         .titspan {
-          color: #1c69bb !important;
+          color: #a5b7df !important;
         }
 
         svg {

src/components/chart/combination/area-line-chart.vue

@@ -258,6 +258,24 @@ export default {
             },
           },
           {
+            type: "value",
+            name: this.units[2],
+            axisLabel: {
+              formatter: "{value} ",
+              color: partten.getColor("gray"),
+              align: "left",
+            },
+            axisLine: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+          },
+          {
             data: [
               this.areaData && this.areaData.length
                 ? this.areaData[0].name
@@ -277,7 +295,7 @@ export default {
             type: "line",
             data: value.value,
             smooth: true, //平滑展示
-            yAxisIndex: 0,
+            yAxisIndex: value.text === '风速' ? 1 : 0,
           });
         });
       }

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

@@ -119,6 +119,7 @@
             align="center"
             prop="name"
             label="名称"
+            width="100"
             sortable
           >
             <template v-slot="scope">

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

@@ -159,7 +159,7 @@
             align="center"
             prop="name"
             label="名称"
-            width="75"
+            width="150"
             show-overflow-tooltip
             sortable
           >

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

@@ -140,6 +140,7 @@
             align="center"
             prop="name"
             label="名称"
+            width="120"
             sortable
           >
             <template v-slot="scope">

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

@@ -161,6 +161,7 @@
             align="center"
             prop="name"
             label="名称"
+            width="140"
             sortable
           >
             <template v-slot="scope">

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

@@ -80,6 +80,7 @@
             align="center"
             prop=""
             label="场站"
+            width="120"
             show-overflow-tooltip
             sortable
           >

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

@@ -80,6 +80,7 @@
             align="center"
             prop=""
             label="场站"
+            width="120"
             show-overflow-tooltip
             sortable
           >

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

@@ -59,6 +59,7 @@
             align="center"
             prop=""
             label="场站"
+            width="120"
             show-overflow-tooltip
             sortable
           >

vue.config.js

@@ -91,7 +91,7 @@ module.exports = {
     chainWebpack: (config) => {
     config.resolve.symlinks(true); // 修复热更新失效
     config.plugin("html").tap((args) => {
-      args[0].title = "发电场站生产实时运营管理平台";
+      args[0].title = "预警系统";
 
       return args;
     });