绩效榜表头增加单位，风电光伏场站日发电量值修改

.env.development

@@ -20,6 +20,7 @@ VUE_APP_DIALOG_POINT = contextmenu
 
 
 # 智慧检修
+# VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
 VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 # 综合报警
 VUE_APP_ALARM=http://10.81.3.154:6015

.env.production

@@ -9,6 +9,7 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 智慧检修
+# VUE_APP_NEW_WISDOM=http://10.81.3.162:8170
 VUE_APP_NEW_WISDOM=http://10.81.3.155:8170
 # 综合报警
 VUE_APP_ALARM=http://10.81.3.154:6015

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

@@ -135,133 +135,41 @@
           <el-table-column align="center" prop="" label="" width="1000">
           </el-table-column>
           <el-table-column
+            v-for="item in tableHeader"
+            :key="item.code"
             align="center"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.width ? item.width : 120"
             show-overflow-tooltip
-            prop="name"
-            label="名称"
-            width="180"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="llfdl"
-            label="理论发电量"
-            show-overflow-tooltip
-            width="100"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="sjfdl"
-            label="实际发电量"
-            show-overflow-tooltip
-            width="100"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fnlly"
-            show-overflow-tooltip
-            :label="tabIndex == -1 ? '风能利用率%' : '光能利用率%'"
-            width="100"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="speed"
-            show-overflow-tooltip
-            :label="tabIndex == -1 ? '风速' : '光照'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fjhjx1"
-            label="故障损失"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fjhjx2"
-            label="故障受累"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="jhjx1"
-            label="检修损失"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="jhjx2"
-            label="检修受累"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="sl1"
-            label="电网受累"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="sl2"
-            label="天气受累"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xd1"
-            label="限电降出"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xd2"
-            label="限电停机"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xn1"
-            show-overflow-tooltip
-            :label="tabIndex == -1 ? '待风损失' : '待机损失'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xn2"
-            label="手动停机"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xn3"
-            label="正常发电"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xn4"
-            label="缺陷降出"
           >
+            <template #header>
+              <div style="display: flex; flex-direction: column">
+                <span>{{
+                  item.name1
+                    ? tabIndex == -1
+                      ? item.name
+                      : item.name1
+                    : item.name
+                }}</span>
+                <span v-if="item.unit"
+                  >({{
+                    item.unit1
+                      ? tabIndex == -1
+                        ? item.unit
+                        : item.unit1
+                      : item.unit
+                  }})</span
+                >
+              </div>
+            </template>
           </el-table-column>
         </el-table>
       </div>
       <div class="left">
         <bar-line-chart
           :height="height"
+          width="100%"
           v-if="showDisplay"
           :color="colors"
           :bardata="bardata"
@@ -321,6 +229,31 @@ export default {
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],
+      tableHeader: [
+        { code: "name", name: "名称", width: 140 },
+        { code: "llfdl", name: "理论发电量", unit: "万kWh", width: 100 },
+        { code: "sjfdl", name: "实际发电量", unit: "万kWh", width: 100 },
+        { code: "fnlly", name: "风能利用率", name1: "光能利用率", unit: "%" },
+        {
+          code: "speed",
+          name: "风速",
+          name1: "光照",
+          unit: "m/s",
+          unit1: "W/m²",
+        },
+        { code: "fjhjx1", name: "故障损失", unit: "万kWh" },
+        { code: "fjhjx2", name: "故障受累", unit: "万kWh" },
+        { code: "jhjx1", name: "检修损失", unit: "万kWh" },
+        { code: "jhjx2", name: "检修受累", unit: "万kWh" },
+        { code: "sl1", name: "电网受累", unit: "万kWh" },
+        { code: "sl2", name: "天气受累", unit: "万kWh" },
+        { code: "xd1", name: "限电降出", unit: "万kWh" },
+        { code: "xd2", name: "限电停机", unit: "万kWh" },
+        { code: "xn1", name: "待风损失", name2: "待机损失", unit: "万kWh" },
+        { code: "xn2", name: "手动停机", unit: "万kWh" },
+        { code: "xn3", name: "正常发电", unit: "万kWh" },
+        { code: "xn4", name: "缺陷降出", unit: "万kWh" },
+      ],
       tableData: [],
       showDisplay: true,
       height: "858px",
@@ -538,7 +471,7 @@ export default {
     },
     getPerformance() {
       let routeParams = this.$route.params;
-      if (this.initFlag) {    
+      if (this.initFlag) {
         this.starTime = routeParams.starTime;
         this.endTime = routeParams.endTime;
       }
@@ -629,7 +562,7 @@ export default {
     mxClick() {
       this.$router.push({
         name: "performanceRankingList",
-        params: {   
+        params: {
           starTime: this.starTime,
           endTime: this.endTime,
         },
@@ -650,7 +583,7 @@ export default {
   flex-direction: row;
   align-items: center;
   margin-top: 10px;
-
+  white-space: nowrap;
   .tabCut {
     display: inline-block;
     margin: 0 10px;

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

@@ -140,78 +140,41 @@
           stripe
           @header-click="onHeaderClick"
         >
-          <el-table-column align="center" prop="" label="" width="900">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="name"
-            show-overflow-tooltip
-            label="名称"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="llfdl"
-            label="理论发电量"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="sjfdl"
-            label="实际发电量"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fnlly"
-            show-overflow-tooltip
-            :label="tabIndex == -1 ? '风能利用率%' : '光能利用率%'"
-            width="120"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="speed"
-            show-overflow-tooltip
-            :label="tabIndex == -1 ? '风速' : '光照'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fjhjx"
-            label="故障"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="jhjx"
-            label="检修"
-          >
-          </el-table-column>
           <el-table-column
             align="center"
-            show-overflow-tooltip
-            prop="sl"
-            label="受累"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xd"
-            label="限电"
-          >
-          </el-table-column>
+            prop=""
+            label=""
+            width="900"
+          ></el-table-column>
           <el-table-column
+            v-for="item in tableHeader"
+            :key="item.code"
             align="center"
+            :prop="item.code"
+            :label="item.name"
+            width="140"
             show-overflow-tooltip
-            prop="xn"
-            label="性能"
           >
+            <template #header>
+              <div style="display: flex; flex-direction: column">
+                <span>{{
+                  item.name1
+                    ? tabIndex == -1
+                      ? item.name
+                      : item.name1
+                    : item.name
+                }}</span>
+                <span v-if="item.unit"
+                  >({{
+                    item.unit1
+                      ? tabIndex == -1
+                        ? item.unit
+                        : item.unit1
+                      : item.unit
+                  }})</span
+                >
+              </div>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -219,6 +182,7 @@
         <bar-line-chart
           v-if="showDisplay"
           :height="height"
+          width="100%"
           :bardata="bardata"
           :lineData="lineData"
           :color="barColor"
@@ -284,6 +248,23 @@ export default {
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],
+      tableHeader: [
+        { code: "name", name: "名称" },
+        { code: "llfdl", name: "理论发电量", unit: "万kWh" },
+        { code: "sjfdl", name: "实际发电量", unit: "万kWh" },
+        { code: "fnlly", name: "风能利用率", name1: "光能利用率", unit: "%" },
+        {
+          code: "speed",
+          name: "风速",
+          name1: "光照",
+          unit: "m/s",
+          unit1: "W/m²",
+        },
+        { code: "fjhjx", name: "故障", unit: "万kWh" },
+        { code: "jhjx", name: "检修", unit: "万kWh" },
+        { code: "sl", name: "受累", unit: "万kWh" },
+        { code: "xn", name: "性能", unit: "万kWh" },
+      ],
       tableData: [],
       showDisplay: true,
       height: "880px",
@@ -560,7 +541,7 @@ export default {
   align-items: center;
   margin-top: 10px;
   padding-left: 20px;
-
+  white-space: nowrap;
   .tabCut {
     display: inline-block;
     margin: 0 10px;
@@ -646,7 +627,7 @@ export default {
   margin-top: 10px;
   margin-left: 1%;
   border-radius: 5px;
-  overflow-y: auto;
+  overflow: auto;
   position: relative;
 
   .left {
@@ -698,7 +679,7 @@ export default {
   }
 
   .economicTable {
-    width: 100%;
+    // width: 100%;
   }
 }
 

src/views/layout/Menu.vue

@@ -60,6 +60,7 @@
   >
     <ul class="menu-list">
       <li
+        v-show="!menu.path.includes('decision1Mx')"
         class="menu-item"
         v-for="(menu, index) of subMenu"
         @click="subclick(index)"
@@ -112,28 +113,28 @@ export default {
           id: "others",
           text: "其他",
           data: [
-            {
-              text: "自定制报表管理",
-              icon: "svg-自定制报表管理",
-              path: "/others/report",
-              children: [
-                {
-                  text: "日报表",
-                  icon: "",
-                  path: "/others/report/gjyrbb",
-                },
-                {
-                  text: "风电场站自定义",
-                  icon: "",
-                  path: "/others/report/fdczzdy",
-                },
-                {
-                  text: "风电项目自定义",
-                  icon: "",
-                  path: "/others/report/fdxmzdy",
-                },
-              ],
-            },
+            // {
+            //   text: "自定制报表管理",
+            //   icon: "svg-自定制报表管理",
+            //   path: "/others/report",
+            //   children: [
+            //     {
+            //       text: "日报表",
+            //       icon: "",
+            //       path: "/others/report/gjyrbb",
+            //     },
+            //     {
+            //       text: "风电场站自定义",
+            //       icon: "",
+            //       path: "/others/report/fdczzdy",
+            //     },
+            //     {
+            //       text: "风电项目自定义",
+            //       icon: "",
+            //       path: "/others/report/fdxmzdy",
+            //     },
+            //   ],
+            // },
             // {
             //   text: "统计分析",
             //   icon: "svg-统计分析",
@@ -233,7 +234,6 @@ export default {
             //     },
             //   ],
             // },
-
             // {
             //   text: "原始数据查询",
             //   icon: "svg-报表首页",
@@ -276,7 +276,6 @@ export default {
             //       icon: "svg-wind-site",
             //       path: "/others/alarmCenter/alarmcenter",
             //     },
-
             //     {
             //       text: "停机事件管理",
             //       icon: "svg-wind-site",

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor/index.vue

@@ -1770,11 +1770,11 @@ p {
         }
 
         &.gray {
-          border: 1px solid #51555a;
-          color: #ffffff;
+          border: 1px solid #606769;
+          color: #a7a7a7;
 
           .info {
-            border-bottom: 1px solid #51555a;
+            border-bottom: 1px solid #606769;
             background-color: rgba(81, 85, 90, 0.2);
 
             .dashed {

src/views/stateMonitor/factoryMonitor/photovoltaic/lighthome/index.vue

@@ -153,12 +153,16 @@
             <div class="point point-right bottom"></div>
             <div>24小时功率曲线图</div>
           </div>
-          <div class="echarts" style="margin-top: 10px" v-if="showFlag">
+          <div
+            class="echarts"
+            style="width: 100%; margin-top: 10px"
+            v-if="showFlag"
+          >
             <power-echarts
               :predictFlag="true"
               :CurveValues="powerList"
               :ratio="1000"
-              width="650px"
+              width="100%"
               unit="MW"
               :height="screenHeight > 1000 ? '23vh' : '19vh'"
               :showTitle="false"
@@ -172,7 +176,7 @@
             <div class="top">
               日发电量
               <div class="value">
-                {{ dataDeal(wpInfos?.rfdl / 10000, 2) }}
+                {{ wpInfos?.rfdl || 0 }}
                 <div class="unit">万kWh</div>
               </div>
             </div>
@@ -181,14 +185,7 @@
               <div class="others-power" v-for="item in powerData" :key="item">
                 {{ item.name }}
                 <div class="others-value">
-                  {{
-                    dataDeal(
-                      item.unit
-                        ? wpInfos[item.value] / item.unit
-                        : wpInfos[item.value],
-                      2
-                    )
-                  }}<span class="unit">万kWh</span>
+                  {{ wpInfos[item.value] || 0 }}<span class="unit">万kWh</span>
                 </div>
               </div>
             </div>
@@ -215,7 +212,7 @@
                     :style="{ transform: windPawer }"
                   />
                   <div class="information">
-                    {{ dataDeal(wpInfos?.yggl / 1000, 2) }}
+                    {{ wpInfos?.yggl || 0 }}
                   </div>
                   <div class="unit">MW</div>
                 </div>
@@ -280,7 +277,7 @@
               </div>
             </div>
           </div>
-          <div class="circle"></div>
+          <!-- <div class="circle"></div> -->
           <PieChart
             width="100%"
             height="240px"
@@ -302,7 +299,7 @@
             <BarCharts
               :list="barList"
               width="100%"
-              :height="screenHeight > 1050 ? '23vh' : '19vh'"
+              :height="screenHeight > 1000 ? '23vh' : '19vh'"
               :ratio="10000"
               :showLegend="false"
               :units="units"
@@ -313,7 +310,7 @@
         </div>
       </div>
       <div class="last">
-        <div class="info" :style="screenHeight > 1000 ? '' : 'height: 579px'">
+        <div class="info">
           <div class="info-item" v-for="(item, index) in infoList" :key="index">
             <div class="last-left">{{ item.name }}</div>
             <div class="last-right" v-if="item.code === 'czlx'">光伏</div>
@@ -355,11 +352,10 @@
               :list="contrastList"
               width="100%"
               :ratio="1000"
-              :height="screenHeight > 1050 ? '23vh' : '19vh'"
+              :height="screenHeight > 1000 ? '23vh' : '19vh'"
               :unit="'MW'"
               :showLegend="true"
-            >
-            </LineCharts>
+            />
           </div>
         </div>
       </div>
@@ -503,13 +499,11 @@ export default {
           id: 0,
           name: "月发电量",
           value: "yfdl",
-          unit: 10000,
         },
         {
           id: 1,
           name: "年发电量",
           value: "nfdl",
-          unit: 10000,
         },
       ],
       infoList: [
@@ -579,14 +573,14 @@ export default {
           code: "zctysj",
           name: "整场投运时间",
         },
-        {
-          code: "cftsl",
-          name: "测风塔(座)",
-        },
-        {
-          code: "syzsl",
-          name: "升压站(座)",
-        },
+        // {
+        //   code: "cftsl",
+        //   name: "测风塔(座)",
+        // },
+        // {
+        //   code: "syzsl",
+        //   name: "升压站(座)",
+        // },
         {
           code: "czwz",
           name: "场站位置",
@@ -1010,6 +1004,9 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.body {
+  height: 100%;
+}
 .windPowerContent {
   height: 100%;
   width: calc(100% - 60px);
@@ -1090,6 +1087,8 @@ export default {
 }
 
 .content {
+  height: calc(100% - 56px);
+  overflow-y: auto;
   display: flex;
   flex-direction: row;
 }
@@ -1655,7 +1654,7 @@ export default {
 
   .info {
     width: 100%;
-    height: 637px;
+    height: 560px;
     background-color: rgba(96, 103, 105, 0.2);
     border-radius: 5px;
     margin-bottom: 20px;

src/views/stateMonitor/factoryMonitor/windPowerPlant/matrixMonitor/index.vue

@@ -1779,11 +1779,11 @@ p {
         }
 
         &.gray {
-          border: 1px solid #51555a;
-          color: #ffffff;
+          border: 1px solid #606769;
+          color: #a7a7a7;
 
           .info {
-            border-bottom: 1px solid #51555a;
+            border-bottom: 1px solid #606769;
             background-color: rgba(81, 85, 90, 0.2);
 
             .dashed {

src/views/stateMonitor/factoryMonitor/windPowerPlant/windhome/index.vue

@@ -153,12 +153,16 @@
             <div class="point point-right bottom"></div>
             <div>24小时功率曲线图</div>
           </div>
-          <div class="echarts" style="margin-top: 10px" v-if="showFlag">
+          <div
+            class="echarts"
+            style="width: 100%; margin-top: 10px"
+            v-if="showFlag"
+          >
             <power-echarts
               :predictFlag="true"
               :CurveValues="powerList"
               :ratio="1000"
-              width="650px"
+              width="100%"
               unit="MW"
               :height="screenHeight > 1050 ? '23vh' : '19vh'"
               :showTitle="false"
@@ -172,7 +176,7 @@
             <div class="top">
               日发电量
               <div class="value">
-                {{ dataDeal(wpInfos?.rfdl, 2) }}
+                {{ wpInfos?.rfdl || 0 }}
                 <div class="unit">万kWh</div>
               </div>
             </div>
@@ -209,7 +213,7 @@
                     :style="{ transform: windPawer }"
                   />
                   <div class="information">
-                    {{ dataDeal(wpInfos?.yggl / 1000, 2) }}
+                    {{ wpInfos?.yggl }}
                   </div>
                   <div class="unit">MW</div>
                 </div>
@@ -275,7 +279,7 @@
               </div>
             </div>
           </div>
-          <div class="circle"></div>
+          <!-- <div class="circle"></div> -->
           <PieChart
             width="100%"
             height="240px"
@@ -574,14 +578,14 @@ export default {
           code: "zctysj",
           name: "整场投运时间",
         },
-        {
-          code: "cftsl",
-          name: "测风塔(座)",
-        },
-        {
-          code: "syzsl",
-          name: "升压站(座)",
-        },
+        // {
+        //   code: "cftsl",
+        //   name: "测风塔(座)",
+        // },
+        // {
+        //   code: "syzsl",
+        //   name: "升压站(座)",
+        // },
         {
           code: "czwz",
           name: "场站位置",
@@ -1006,6 +1010,9 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.body {
+  height: 100%;
+}
 .windPowerContent {
   height: 100%;
   width: calc(100% - 60px);
@@ -1088,6 +1095,8 @@ export default {
 .content {
   display: flex;
   flex-direction: row;
+  height: calc(100% - 56px);
+  overflow-y: auto;
 }
 
 .first {