Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into daping

src/assets/styles/form.less

@@ -372,7 +372,11 @@
           }
 
           &.today span {
-            color: @green;
+            color: @blue;
+          }
+          &.today.end-date span,
+          &.today.start-date span {
+            color: #fff;
           }
 
           &.current:not(.disabled) span {
@@ -452,6 +456,7 @@
   .el-month-table td.current:not(.disabled) .cell {
     color: @green;
   }
+  
 }
 
 // .el-input-number {

src/components/alarm-badge/index.vue

@@ -1,17 +1,16 @@
 <template>
-  <div></div>
   <div
     draggable="true"
     @dragstart="startDrag"
     @dragend="stopDrag"
-    :style="{ left: x + 'px', top: y + 'px' }"
+    :style="{ right: x + 'px', bottom: y + 'px' }"
     style="cursor: pointer; position: absolute; z-index: 999"
   >
     <el-badge
       :value="warnLength"
       :class="{ active: warnLength && !displayAlarms ? false : true }"
     >
-      <div class="alarmDeligo" @click="displayAlarm" v-if="warnLength" >
+      <div class="alarmDeligo" @click="displayAlarm" v-if="warnLength">
         <img src="@assets/imgs/ygj.png" class="trans" />
         <img src="@assets/imgs/ygj1.png" />
       </div>
@@ -152,8 +151,8 @@ export default {
   },
   created() {
     this.getAlarmConfig();
-    this.x = window.innerWidth - 82;
-    this.y = window.innerHeight - 32;
+    this.x = 80;
+    this.y = 80;
     let requestResult = [];
     this.requestAlarmHistoryParams.forEach(({ alarmType, deviceType }) => {
       requestResult.push(this.getAlarmHistory(alarmType, deviceType));
@@ -506,18 +505,16 @@ export default {
     stopDrag(event) {
       let x = event.clientX - this.currentX;
       let y = event.clientY - this.currentY;
-      this.x += x;
-      //   if (this.x < 60) {
-      //     this.x = 60;
-      //   } else if (this.x > window.innerWidth - 20) {
-      //     this.x = window.innerWidth - 82;
-      //   }
-      this.y += y;
-      //   if (this.y > window.innerHeight - 20) {
-      //     this.y = window.innerHeight - 32;
-      //   } else if (this.y < 0) {
-      //     this.y = 0;
-      //   }
+      if (event.clientX <= 80 || event.clientX >= window.innerWidth - 40) {
+        this.x = this.x;
+      } else {
+        this.x -= x;
+      }
+      if (event.clientY <= 70 || event.clientY >= window.innerHeight - 60) {
+        this.y = this.y;
+      } else {
+        this.y -= y;
+      }
     },
     //开关列表
     displayAlarm(val) {

src/components/alarm/index.vue

@@ -22,7 +22,7 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            :align="item.code == 'description' ? 'left' : 'center'"
             :width="item.width"
           >
             <template #default="{ row }">
@@ -116,7 +116,7 @@ export default {
         pageNum: this.page.currentPage,
         pageSize: this.page.pagesize,
         description: "",
-        isclose:false
+        isclose: false,
       }).then(({ data }) => {
         this.BASE.closeLoading();
         if (data.records.length) {

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

@@ -19,7 +19,10 @@
         <td
           v-for="(col, i) of data.column"
           :key="i"
-          :style="{ width: col.width }"
+          :style="{
+            width: col.width,
+            textAlign: col.field == 'wtCode' ? 'center' : 'right',
+          }"
           :class="{
             light: hoverRow == row || hoverCol == col,
             num: col.is_num,

src/components/deligoAlarmList/index.vue

@@ -30,7 +30,7 @@
               v-for="(header, index) in tableHeader"
               :key="index"
               :label="header.title"
-              align="center"
+              :align="header.code == '' ? 'left' : 'center'"
               :prop="header.code"
               show-overflow-tooltip
               :width="header.width"

src/components/qushi/qushiDialog.vue

@@ -133,7 +133,9 @@
           stripe
         >
           <el-table-column
-            align="center"
+            :align="
+              item.code == 'tagName' || item.code == 'name' ? 'left' : 'center'
+            "
             v-for="item in tableHeader"
             :key="item.code"
             :prop="item.code"
@@ -196,7 +198,7 @@
           <el-table-column
             prop="tagName"
             label="指标名称"
-            align="center"
+            align="left"
             fixed
             width="420"
           >

src/utills/constant.js

@@ -1,100 +1,100 @@
 export const tableHeader = [
   { name: "综合排名", code: "zhpm" },
   { name: "发电量排名", code: "fdlpm" },
-  { name: "发电量", code: "fdl" },
+  { name: "发电量", code: "fdl", align: "right" },
   { name: "故障损失排名", code: "gzssdlpm" },
-  { name: "故障损失", code: "gzssdl" },
+  { name: "故障损失", code: "gzssdl", align: "right" },
   { name: "检修损失排名", code: "jxssdlpm" },
-  { name: "检修损失", code: "jxssdl" },
+  { name: "检修损失", code: "jxssdl", align: "right" },
   { name: "性能损失排名", code: "xnssdlpm" },
-  { name: "性能损失", code: "xnssdl" },
+  { name: "性能损失", code: "xnssdl", align: "right" },
   { name: "限电损失排名", code: "xdssdlpm" },
-  { name: "限电损失", code: "xdssdl" },
+  { name: "限电损失", code: "xdssdl", align: "right" },
   { name: "受累损失排名", code: "slssdlpm" },
-  { name: "受累损失", code: "slssdl" },
+  { name: "受累损失", code: "slssdl", align: "right" },
   { name: "风能利用率排名", code: "fnlylpm" },
-  { name: "风能利用率", code: "fnlyl" },
+  { name: "风能利用率", code: "fnlyl", align: "right" },
   { name: "故障损失率排名", code: "gzsslpm" },
-  { name: "故障损失率(%)", code: "gzssl" },
+  { name: "故障损失率(%)", code: "gzssl", align: "right" },
   { name: "检修损失率排名", code: "jxsslpm" },
-  { name: "检修损失率(%)", code: "jxssl" },
+  { name: "检修损失率(%)", code: "jxssl", align: "right" },
   { name: "弃风率排名", code: "qflpm" },
-  { name: "弃风率", code: "qfl" },
+  { name: "弃风率", code: "qfl", align: "right" },
   { name: "性能损失率排名", code: "xnsslpm" },
-  { name: "性能损失率(%)", code: "xnssl" },
+  { name: "性能损失率(%)", code: "xnssl", align: "right" },
   { name: "受累损失率排名", code: "slsslpm" },
-  { name: "受累损失率(%)", code: "slssl" },
+  { name: "受累损失率(%)", code: "slssl", align: "right" },
 ];
 export const tableHeaderG = [
   { name: "综合排名", code: "" },
   { name: "发电量排名", code: "fdlpm" },
-  { name: "发电量", code: "fdl" },
+  { name: "发电量", code: "fdl", align: "right" },
   { name: "故障损失排名", code: "gzssdlpm" },
-  { name: "故障损失", code: "gzssdl" },
+  { name: "故障损失", code: "gzssdl", align: "right" },
   { name: "检修损失排名", code: "jxssdlpm" },
-  { name: "检修损失", code: "jxssdl" },
+  { name: "检修损失", code: "jxssdl", align: "right" },
   { name: "性能损失排名", code: "xnssdlpm" },
-  { name: "性能损失", code: "xnssdl" },
+  { name: "性能损失", code: "xnssdl", align: "right" },
   { name: "限电损失排名", code: "xdssdlpm" },
-  { name: "限电损失", code: "xdssdl" },
+  { name: "限电损失", code: "xdssdl", align: "right" },
   { name: "受累损失排名", code: "slssdlpm" },
-  { name: "受累损失", code: "slssdl" },
+  { name: "受累损失", code: "slssdl", align: "right" },
   { name: "光能利用率排名", code: "fnlylpm" },
-  { name: "光能利用率", code: "fnlyl" },
+  { name: "光能利用率", code: "fnlyl", align: "right" },
   { name: "故障损失率排名", code: "gzsslpm" },
-  { name: "故障损失率(%)", code: "gzssl" },
+  { name: "故障损失率(%)", code: "gzssl", align: "right" },
   { name: "检修损失率排名", code: "jxsslpm" },
-  { name: "检修损失率(%)", code: "jxssl" },
+  { name: "检修损失率(%)", code: "jxssl", align: "right" },
   { name: "弃光率排名", code: "qflpm" },
-  { name: "弃光率", code: "qfl" },
+  { name: "弃光率", code: "qfl", align: "right" },
   { name: "性能损失率排名", code: "xnsslpm" },
-  { name: "性能损失率(%)", code: "xnssl" },
+  { name: "性能损失率(%)", code: "xnssl", align: "right" },
   { name: "受累损失率排名", code: "slsslpm" },
-  { name: "受累损失率(%)", code: "slssl" },
+  { name: "受累损失率(%)", code: "slssl", align: "right" },
 ];
 export const tableHeaderDetail = [
   { name: "综合排名", code: "zhpm" },
   { name: "故障损失排名", code: "gzssdlpm" },
-  { name: "故障损失", code: "gzssdl" },
+  { name: "故障损失", code: "gzssdl", align: "right" },
   { name: "检修损失排名", code: "jxssdlpm" },
-  { name: "检修损失", code: "jxssdl" },
+  { name: "检修损失", code: "jxssdl", align: "right" },
   { name: "性能损失排名", code: "xnssdlpm" },
   { name: "性能损失", code: "xnssdl" },
   { name: "限电损失排名", code: "xdssdlpm" },
-  { name: "限电损失", code: "xdssdl" },
+  { name: "限电损失", code: "xdssdl", align: "right" },
   { name: "受累损失排名", code: "slssdlpm" },
-  { name: "受累损失", code: "slssdl" },
+  { name: "受累损失", code: "slssdl", align: "right" },
   { name: "故障损失率排名", code: "gzsslpm" },
-  { name: "故障损失率(%)", code: "gzssl" },
+  { name: "故障损失率(%)", code: "gzssl", align: "right" },
   { name: "检修损失率排名", code: "jxsslpm" },
-  { name: "检修损失率(%)", code: "jxssl" },
+  { name: "检修损失率(%)", code: "jxssl", align: "right" },
   { name: "弃风率排名", code: "qflpm" },
-  { name: "弃风率", code: "qfl" },
+  { name: "弃风率", code: "qfl", align: "right" },
   { name: "性能损失率排名", code: "xnsslpm" },
-  { name: "性能损失率(%)", code: "xnssl" },
+  { name: "性能损失率(%)", code: "xnssl", align: "right" },
   { name: "受累损失率排名", code: "slsslpm" },
-  { name: "受累损失率(%)", code: "slssl" },
+  { name: "受累损失率(%)", code: "slssl", align: "right" },
 ];
 export const tableHeaderGDetail = [
   { name: "综合排名", code: "" },
   { name: "故障损失排名", code: "gzssdlpm" },
-  { name: "故障损失", code: "gzssdl" },
+  { name: "故障损失", code: "gzssdl", align: "right" },
   { name: "检修损失排名", code: "jxssdlpm" },
-  { name: "检修损失", code: "jxssdl" },
+  { name: "检修损失", code: "jxssdl", align: "right" },
   { name: "性能损失排名", code: "xnssdlpm" },
-  { name: "性能损失", code: "xnssdl" },
+  { name: "性能损失", code: "xnssdl", align: "right" },
   { name: "限电损失排名", code: "xdssdlpm" },
-  { name: "限电损失", code: "xdssdl" },
+  { name: "限电损失", code: "xdssdl", align: "right" },
   { name: "受累损失排名", code: "slssdlpm" },
-  { name: "受累损失", code: "slssdl" },
+  { name: "受累损失", code: "slssdl", align: "right" },
   { name: "故障损失率排名", code: "gzsslpm" },
-  { name: "故障损失率(%)", code: "gzssl" },
+  { name: "故障损失率(%)", code: "gzssl", align: "right" },
   { name: "检修损失率排名", code: "jxsslpm" },
-  { name: "检修损失率(%)", code: "jxssl" },
+  { name: "检修损失率(%)", code: "jxssl", align: "right" },
   { name: "弃光率排名", code: "qflpm" },
-  { name: "弃光率", code: "qfl" },
+  { name: "弃光率", code: "qfl", align: "right" },
   { name: "性能损失率排名", code: "xnsslpm" },
-  { name: "性能损失率(%)", code: "xnssl" },
+  { name: "性能损失率(%)", code: "xnssl", align: "right" },
   { name: "受累损失率排名", code: "slsslpm" },
-  { name: "受累损失率(%)", code: "slssl" },
+  { name: "受累损失率(%)", code: "slssl", align: "right" },
 ];

src/views/Home/components/map.vue

@@ -457,7 +457,7 @@
               </div>
               <div class="capacity">
                 <div class="item">
-                  <el-row>
+                  <el-row align="middle">
                     <el-col :span="8"><span>装机容量</span></el-col>
                     <el-col :span="9"
                       ><span>{{
@@ -966,7 +966,11 @@
               <div class="titles">
                 <div class="amount">
                   <div class="icon fengji-icon svg-icon svg-icon-white"></div>
-                  <img class="amount-image" src="@/assets/png/sy-sun.png" alt="" />
+                  <img
+                    class="amount-image"
+                    src="@/assets/png/sy-sun.png"
+                    alt=""
+                  />
                   <div class="amount-nums">
                     <text class="num-item">{{
                       Number(
@@ -2627,8 +2631,8 @@ p {
               .item {
                 margin-top: 9px;
                 .el-row {
+                  text-align: center;
                   .el-col:nth-child(1) {
-                    text-align: left;
                     font-size: 14px;
                     font-weight: 400;
                     color: #999999;
@@ -2714,277 +2718,6 @@ p {
         }
       }
     }
-    //亮
-    .new-home-light {
-      margin-top: -50px;
-      margin-left: 20px;
-      .airForceStation {
-        position: relative;
-        background-color: #d1d6d9;
-        padding: 20px;
-        width: 320px;
-        margin-bottom: 15px;
-        span {
-          color: #000;
-        }
-        .title {
-          font-size: 18px;
-          line-height: 28px;
-          margin: 15px 0;
-          display: flex;
-          align-items: center;
-          justify-content: left;
-          span {
-            color: #000;
-          }
-        }
-        .collectInstall {
-          display: flex;
-          margin-bottom: 10px;
-        }
-        .listItem {
-          display: flex;
-          margin-bottom: 10px;
-        }
-        .line {
-          display: flex;
-          margin-bottom: 10px;
-        }
-        .name {
-          flex: 4;
-        }
-        .num {
-          flex: 3;
-          color: #000;
-          font-weight: bold;
-          font-size: 19px;
-          // text-align: center;
-        }
-        .unit {
-          flex: 1;
-          font-size: 14px;
-          font-weight: 400;
-          color: #000;
-        }
-      }
-      .piggy-tab-width {
-        width: 350px !important;
-      }
-      .energy-system-box {
-        width: 400px;
-        box-sizing: border-box;
-        margin-bottom: 21px;
-        margin-top: 5px;
-        background-color: #d1d6d9;
-        .model-bg {
-          width: 100%;
-          min-height: 135px;
-          background-color: #d1d6d9;
-          border-radius: 6px;
-          display: flex;
-          flex-direction: column;
-          padding: 1% 5%;
-
-          .titles {
-            height: 45px;
-            border-bottom: 1px solid #333333;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: space-between;
-            .name {
-              font-size: 16px;
-              color: #000;
-            }
-
-            .unit {
-              font-size: 12px;
-              color: #000;
-            }
-          }
-          .save {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            width: 100%;
-            margin: 17px 0;
-
-            .save-item {
-              width: 25%;
-              display: flex;
-              flex-direction: column;
-              align-items: center;
-
-              .kind {
-                width: 20px;
-                height: 22px;
-
-                .kind-img {
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-
-              .save-value {
-                font-size: 16px;
-                color: #ffffff;
-                margin: 10px 0;
-              }
-
-              .save-name {
-                font-size: 12px;
-                color: #b3b3b3;
-              }
-            }
-          }
-        }
-        .energy-system-bgc {
-          padding: 115px;
-          width: 100%;
-          opacity: 0.3;
-          background-color: rgba(83, 98, 104, 0.2);
-        }
-        .energy-system-content {
-          padding: 5px 5px 15px 5px;
-          .title-all {
-            margin-left: 5px;
-            margin-bottom: 8px;
-          }
-          .title-all-content {
-            color: #05bb4c;
-            font-weight: bold;
-            font-size: 19px;
-          }
-          .title-all-title {
-            font-size: 13px;
-          }
-          .title-all-unit {
-            font-size: 12px;
-            color: #000;
-            margin-left: 5px;
-          }
-          .title {
-            color: #000;
-            font-size: 16px;
-            line-height: 28px;
-            margin: 10px 0.5vh;
-            text-align: right;
-            .title-name {
-              float: left;
-            }
-          }
-          .right-content,
-          .left-content {
-            width: 50%;
-            .img-num {
-              text-align: center;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              .img {
-                margin-right: 10px;
-              }
-              .num {
-                span {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #000;
-                }
-                span:nth-child(3) {
-                  font-size: 19px;
-                  font-weight: bold;
-                  color: #05bb4c;
-                  line-height: 27px;
-                }
-                span:nth-child(4) {
-                  margin-left: 15px;
-                }
-              }
-            }
-            .capacity {
-              .item {
-                margin-top: 9px;
-                .el-row {
-                  .el-col:nth-child(1) {
-                    text-align: center;
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #000;
-                  }
-                  .el-col:nth-child(2) {
-                    font-size: 16px;
-                    font-weight: bold;
-                    color: #05bb4c;
-                  }
-                  .el-col:nth-child(3) {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #000;
-                  }
-                }
-              }
-            }
-          }
-          .left-content {
-          }
-          .right-content {
-            border-left: 1px dashed #4e4040;
-          }
-        }
-      }
-      .security-day {
-        .lineBox {
-          margin: 12px 0 15px;
-          .num {
-            color: @green;
-            font-size: 16px;
-            margin-bottom: 15px;
-            margin: 0 7px;
-          }
-          .unit {
-            font-size: 12px;
-            color: #5e6269;
-          }
-        }
-        .text {
-          font-size: 20px;
-          color: @write;
-        }
-
-        .num {
-          color: @green;
-          font-size: 35px;
-          .unit {
-            font-size: 24px;
-            position: relative;
-            margin-left: 0.556vh;
-            top: -0.185vh;
-          }
-          .unit-t {
-            font-size: 12px;
-            margin-left: 10px;
-          }
-        }
-
-        .text1 {
-          font-size: 14px;
-          color: @write;
-        }
-
-        .num1 {
-          color: @green;
-          font-size: 24px;
-          margin-bottom: 15px;
-
-          .unit {
-            font-size: 12px;
-            position: relative;
-            margin-left: 0.556vh;
-            color: #5e6269;
-          }
-        }
-      }
-    }
   }
 
   .security-day {

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -146,7 +146,15 @@
           v-for="item in state.tableHeader"
           :key="item.code"
           :label="item.title"
-          align="center"
+          :align="
+            item.code == 'description' ||
+            item.code == 'expression' ||
+            item.code == 'name' ||
+            item.code == 'modelId' ||
+            item.code == 'relatedPartsName'
+              ? 'left'
+              : 'center'
+          "
           :prop="item.code"
           :minWidth="item.width ? item.width : 60"
           show-overflow-tooltip
@@ -421,7 +429,13 @@ const export2Excel = async () => {
   outExportExcel(
     tableHeader,
     tableKey,
-    data.records,
+    data.records.map((item) => {
+      return {
+        ...item,
+        category: categoryConvert(item.category),
+        enable: enabledConvert(item.enable),
+      };
+    }),
     "自定义预警配置导出excel"
   );
 };

src/views/IntegratedAlarm/alarmConfig/historyConfig/index.vue

@@ -104,7 +104,13 @@
             : state.tableHeader1"
           :key="item.code"
           :label="item.title"
-          align="center"
+          :align="
+            item.code == 'description' ||
+            item.code == 'modelId' ||
+            item.code == 'componentsName'
+              ? 'left'
+              : 'center'
+          "
           :prop="item.code"
           show-overflow-tooltip
         >
@@ -360,20 +366,34 @@ const tableKey = [
 ];
 // 批量导出
 const export2Excel = async () => {
-  let { name, wpId, modelId } = query;
+  let tableHeader = [];
+  let tableKey = [];
   const res = await windturbinebj_fetchTableData({
+    ...query,
     pageNum: 1,
     pageSize: 999999,
-    name,
-    wpId,
-    modelId,
   });
 
   ElMessage.success(`导出成功!`);
+  if (query.alarmType == "windturbine" || query.alarmType == "inverter") {
+    tableHeader = state.tableHeader.map((item) => item.title);
+    tableKey = state.tableHeader.map((item) => item.code);
+  } else if (query.alarmType == "booststation") {
+    tableHeader = state.tableHeader1.map((item) => item.title);
+    tableKey = state.tableHeader1.map((item) => item.code);
+  }
   outExportExcel(
     tableHeader,
     tableKey,
-    res.data.records,
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        alarmType: alarmTypeConvert("alarmType", item.alarmType),
+        deviceType: alarmTypeConvert("deviceType", item.deviceType),
+        enable: enabledConvert(item.enable),
+        resetTableName: item.resetTable ? "是" : "否",
+      };
+    }),
     "设备报警配置导出excel"
   );
 };

src/views/IntegratedAlarm/alarmConfig/logs/index.vue

@@ -45,33 +45,36 @@
           prop="ruleName"
           label="规则名称"
           width="300"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="ruleType"
           label="规则类型"
           width="120"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="stationName"
           label="场站名称"
           width="140"
-          align="center"
+          align="left"
         />
         <el-table-column
           prop="modelId"
           label="风机型号"
           width="200"
-          align="center"
+          align="left"
         />
-        <el-table-column label="更改内容" show-overflow-tooltip>
+        <el-table-column label="更改内容" show-overflow-tooltip align="left">
           <template #default="scope">
-            <div v-for="item in scope.row.infoList" :key="item">
-              {{ item.fieldName }} :更改前: {{ item.beforValue }}
-              <el-divider direction="vertical" /> 更改后:
-              {{ item.afterValue }}
+            <div v-if="scope.row.infoList.length">
+              <div v-for="item in scope.row.infoList" :key="item">
+                {{ item.fieldName }} :更改前: {{ item.beforValue }}
+                <el-divider direction="vertical" /> 更改后:
+                {{ item.afterValue }}
+              </div>
             </div>
+            <div v-else>--</div>
           </template>
         </el-table-column>
         <el-table-column

src/views/IntegratedAlarm/deviceConfig/components/custom.vue

@@ -117,7 +117,29 @@
       height="calc(100% - 45px)"
       style="width: 100%"
     >
-      <el-table-column label="编码" align="center" prop="id" width="50" />
+      <el-table-column
+        v-for="item in state.tableHeader"
+        :key="item.id"
+        :prop="item.prop"
+        :label="item.label"
+        :align="item.align"
+        header-align="center"
+        :width="item.width"
+        :min-width="item.minWidth"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">
+          <span v-if="item.prop == 'rank'"> {{ rankConvert(row.rank) }}</span>
+          <span v-else-if="item.prop == 'category'">
+            {{ categoryConvert(row.category) }}</span
+          >
+          <span v-else-if="item.prop == 'enabled'">
+            {{ row.enabled ? "启用" : "未启用" }}</span
+          >
+          <span v-else>{{ row[item.prop] ? row[item.prop] : "--" }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="编码" align="center" prop="id" width="50" />
       <el-table-column
         label="场站"
         align="center"
@@ -161,7 +183,7 @@
         align="center"
         prop="relatedPartsName"
         min-width="30"
-      />
+      /> -->
       <el-table-column label="操作" align="center" width="80">
         <template #default="scope">
           <el-button
@@ -242,6 +264,23 @@ const state = reactive({
   ],
   visible: false,
   form: {},
+  tableHeader: [
+    { prop: "id", label: "编码", align: "center", width: 50 },
+    { prop: "stationName", label: "场站", align: "center", minWidth: 50 },
+    { prop: "modelId", label: "机型", align: "center", minWidth: 50 },
+    { prop: "name", label: "名称", align: "left", minWidth: 50 },
+    { prop: "expression", label: "表达式", align: "left" },
+    { prop: "rank", label: "级别", align: "center", minWidth: 30 },
+    { prop: "category", label: "类型", align: "center", minWidth: 20 },
+    { prop: "description", label: "描述", align: "left" },
+    { prop: "enabled", label: "是否启用", align: "center", width: 80 },
+    {
+      prop: "relatedPartsName",
+      label: "所属部件",
+      align: "center",
+      minWidth: 30,
+    },
+  ],
 });
 const query = reactive({
   pageNum: 1,
@@ -286,7 +325,7 @@ const getequipmentmodel_list = async () => {
 };
 // 分页导航
 const handlePageChange = (val) => {
-  query.pagenum = val;
+  query.pageNum = val;
   getData();
 };
 const tableHeader = [
@@ -328,7 +367,19 @@ const export2Excel = async () => {
   });
 
   ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "自定义预警配置导出excel");
+  outExportExcel(
+    state.tableHeader.map((item) => item.label),
+    state.tableHeader.map((item) => item.prop),
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        rank: rankConvert(item.rank),
+        category: categoryConvert(item.category),
+        enabled: item.enabled ? "启用" : "未启用",
+      };
+    }),
+    "自定义预警配置导出excel"
+  );
 };
 // 模板下载
 const outExe = () => {

src/views/IntegratedAlarm/deviceConfig/components/windturbine.vue

@@ -32,7 +32,7 @@
       </div>
       <div style="display: flex; flex-direction: row; margin-bottom: 10px">
         <el-select
-          v-if="!isStation"
+          v-if="isStation"
           v-model="query.stationId"
           clearable
           size="mini"
@@ -89,53 +89,34 @@
         stripe
         height="calc(100% - 43px)"
       >
-        <el-table-column label="序列号" align="center" prop="id" />
-        <el-table-column label="统一编码" align="center" prop="uniformCode">
-          <template #default="scope">{{
-            // ednaValueConvert(scope.row.ednaValue)
-            scope.row.uniformCode
-          }}</template>
-        </el-table-column>
-        <el-table-column
-          label="描述"
-          align="left"
-          prop="description"
-          width="180"
-        />
         <el-table-column
-          label="停机类型"
-          align="center"
-          prop="characteristic"
-        />
-        <el-table-column label="风机型号" align="center" prop="modelId" />
-        <el-table-column label="报警类型" align="center" prop="alarmTypeName" />
-        <el-table-column label="故障编码" align="center" prop="nemCode" />
-        <el-table-column label="报警级别" align="center">
-          <template #default="scope">{{
-            levelIdConvert(scope.row.rank)
-          }}</template>
-        </el-table-column>
-        <el-table-column label="报警分类" align="center" min-width="50">
-          <template #default="scope">{{
-            warningClassIfyIdConvert(scope.row.deviceType)
-          }}</template>
-        </el-table-column>
-        <el-table-column label="是否可以复位" align="center" min-width="50">
-          <template #default="scope">{{
-            scope.row.resetTable ? "是" : "否"
-          }}</template>
-        </el-table-column>
-        <el-table-column label="是否启用" align="center" min-width="50">
-          <template #default="scope">{{
-            scope.row.enabled == 1 ? "是" : "否"
-          }}</template>
+          v-for="item in state.tableHeader"
+          :key="item.id"
+          :prop="item.prop"
+          :label="item.label"
+          :align="item.align"
+          header-align="center"
+          :width="item.width"
+          :min-width="item.minWidth"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">
+            <span v-if="item.prop == 'rank'">
+              {{ levelIdConvert(row.rank) }}</span
+            >
+            <span v-else-if="item.prop == 'deviceType'">
+              {{ warningClassIfyIdConvert(row.deviceType) }}</span
+            >
+            <span v-else-if="item.prop == 'resetTable'">
+              {{ row.resetTable ? "是" : "否" }}</span
+            >
+            <span v-else-if="item.prop == 'enabled'">
+              {{ row.enabled == 1 ? "是" : "否" }}</span
+            >
+            <span v-else>{{ row[item.prop] ? row[item.prop] : "--" }}</span>
+          </template>
         </el-table-column>
-        <el-table-column
-          label="关联部件"
-          align="center"
-          min-width="50"
-          prop="componentsName"
-        />
+  
 
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
@@ -200,6 +181,30 @@ const state = reactive({
   modelList: [],
   visible: false,
   form: {},
+  tableHeader: [
+    { label: "序列号", prop: "id", align: "center" },
+    { label: "统一编码", prop: "uniformCode", align: "center" },
+    { label: "描述", prop: "description", align: "left", width: 180 },
+    { label: "停机类型", prop: "characteristic", align: "center" },
+    { label: "风机型号", prop: "modelId", align: "center" },
+    { label: "报警类型", prop: "alarmTypeName", align: "center" },
+    { label: "故障编码", prop: "nemCode", align: "center" },
+    { label: "报警级别", prop: "rank", align: "center" },
+    { label: "报警分类", prop: "deviceType", align: "center", minWidth: 50 },
+    {
+      label: "是否可以复位",
+      prop: "resetTable",
+      align: "center",
+      minWidth: 50,
+    },
+    { label: "是否启用", prop: "enabled", align: "center", minWidth: 50 },
+    {
+      label: "关联部件",
+      prop: "componentsName",
+      align: "center",
+      minWidth: 50,
+    },
+  ],
 });
 const query = reactive({
   pageNum: 1,
@@ -247,7 +252,7 @@ const getequipmentmodel_list = async () => {
 };
 // 分页导航
 const handlePageChange = (val) => {
-  query.pagenum = val;
+  query.pageNum = val;
   getData();
 };
 
@@ -294,17 +299,27 @@ const tableKey = [
 ];
 // 批量导出
 const export2Excel = async () => {
-  let { name, stationId, modelId } = query;
   const res = await windturbinebj_fetchTableData({
+    ...query,
     pageNum: 1,
     pageSize: 999999,
-    name,
-    stationId,
-    modelId,
   });
 
-  ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "风机报警配置导出excel");
+  outExportExcel(
+    state.tableHeader.map((item) => item.label),
+    state.tableHeader.map((item) => item.prop),
+    res.data.records.map((item) => {
+      return {
+        ...item,
+        rank: levelIdConvert(item.rank),
+        alarmTypeName: warningClassIfyIdConvert(item.alarmType),
+        deviceType: warningClassIfyIdConvert(item.deviceType),
+        enabled: item.enabled == 1 ? "是" : "否",
+        resetTable: item.resetTable ? "是" : "否",
+      };
+    }),
+    "设备报警配置导出excel"
+  );
 };
 // 模板下载
 const outExe = () => {
@@ -341,8 +356,8 @@ const levelIdConvert = (val) => {
 // 报警分类
 const warningClassIfyIdConvert = (val) => {
   switch (val) {
-    case "station":
-      return "场站";
+    case "interver":
+      return "光伏";
     case "windturbine":
       return "风机";
     case "booststation":

src/views/IntegratedAlarm/deviceConfig/components/ycpoint.vue

@@ -111,11 +111,17 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="unitName" label="单位"></el-table-column>
-      <el-table-column prop="categoryData" label="测点类型"></el-table-column>
-      <el-table-column prop="categorysci" label="物理类型"></el-table-column>
-      <el-table-column prop="categorysci" label="数据类型"></el-table-column>
-      <el-table-column prop="description" label="描述"></el-table-column>
+      <el-table-column
+        v-for="(item, index) in state.tableHeader"
+        :key="index"
+        :prop="item.code"
+        :label="item.text"
+      >
+        <template #default="{ row }">
+          {{ row[item.code] ? row[item.code] : "--" }}
+        </template>
+      </el-table-column>
+      
       <el-table-column label="操作" width="180" align="center">
         <template #default="scope">
           <el-button
@@ -319,6 +325,13 @@ watch(
   }
 );
 let state = reactive({
+  tableHeader: [
+    { text: "单位", code: "unitName" },
+    { text: "测点类型", code: "categoryData" },
+    { text: "物理类型", code: "categorysci" },
+    { text: "数据类型", code: "categorysci" },
+    { text: "描述", code: "description" },
+  ],
   pointTableData: "",
   SearchVal: "",
   selectPoint: "",

src/views/IntegratedAlarm/deviceConfig/components/yxpoint.vue

@@ -91,11 +91,16 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="unitName" label="单位"></el-table-column>
-      <el-table-column prop="categoryData" label="测点类型"></el-table-column>
-      <el-table-column prop="categorysci" label="物理类型"></el-table-column>
-      <el-table-column prop="categorysci" label="数据类型"></el-table-column>
-      <el-table-column prop="description" label="描述"></el-table-column>
+      <el-table-column
+        v-for="(item, index) in state.tableHeader"
+        :key="index"
+        :prop="item.code"
+        :label="item.text"
+      >
+        <template #default="{ row }">
+          {{ row[item.code] ? row[item.code] : "--" }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="180" align="center">
         <template #default="scope">
           <el-button
@@ -292,6 +297,13 @@ watch(
   }
 );
 let state = reactive({
+  tableHeader: [
+    { text: "单位", code: "unitName" },
+    { text: "测点类型", code: "categoryData" },
+    { text: "物理类型", code: "categorysci" },
+    { text: "数据类型", code: "categorysci" },
+    { text: "描述", code: "description" },
+  ],
   pointTableData: "",
   SearchVal: "",
   selectPoint: "",

src/views/IntegratedAlarm/deviceConfig/index.vue

@@ -296,7 +296,7 @@ const saveTreeAdd = async () => {
 // getData
 const getData = async () => {
   const res = await tree();
-  state.treedata = res.children.reverse();
+  state.treedata = [res];
   state.cascaderdata = cascaderforEach(res);
 };
 

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -110,6 +110,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -123,6 +124,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -114,6 +114,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -127,6 +128,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -40,7 +40,7 @@
       <el-table-column
         prop="description"
         label="报警信息"
-        align="center"
+        align="left"
         show-overflow-tooltip
       />
       <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
@@ -131,21 +131,25 @@
             width="100"
             show-overflow-tooltip
           /> -->
-          <el-table-column label="报警描述" align="center">
+          <el-table-column label="报警描述" align="left">
             <template #default="scope">
               <span
                 class="alertDescCursor"
                 @click="goToAlertDescPage(scope.row)"
-                >{{ scope.row.description }}</span
+                >{{ scope.row.description || "--" }}</span
               >
             </template>
           </el-table-column>
           <el-table-column
             prop="faultCause"
             label="报警故障原因"
-            align="center"
+            align="left"
             show-overflow-tooltip
-          />
+          >
+            <template #default="{ row }">
+              {{ row.faultCause == "NULL" ? "--" : row.faultCause }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop=""
             label="报警解除时间"
@@ -154,7 +158,7 @@
             show-overflow-tooltip
           >
             <template #default="scope">
-              <span>{{ scope.row.endts || scope.row.closeTime }}</span>
+              <span>{{ scope.row.endts || scope.row.closeTime || "--" }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -137,6 +137,7 @@
               value-format="YYYY-MM-DD HH:mm:ss"
               start-placeholder="开始"
               end-placeholder="结束"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -186,6 +187,11 @@
             :width="item.width || ''"
             show-overflow-tooltip
             header-align="center"
+            :align="
+              item.code == 'description' || item.code == 'faultCause'
+                ? 'left'
+                : 'center'
+            "
           >
             <template #default="scope">
               <p :style="item.style && item.style(scope.row)">
@@ -205,7 +211,7 @@
                 </span>
                 <span v-else>
                   {{
-                    scope.row[item.code] != "NULL" ? scope.row[item.code] : "--"
+                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
                   }}
                 </span>
               </p>
@@ -573,7 +579,7 @@ const getAlarmHistoryt = async () => {
   data?.ls?.forEach((ele) => {
     ele.isCloseName = ele.endts ? "已解除" : "未解除";
     ele.deviceTypeName = tableFilter(ele.deviceType);
-    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "";
+    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
   });
   state.tableData = data?.ls;
 };
@@ -589,10 +595,13 @@ const export2Excel = async () => {
   let params = {
     pageNum: query.page,
     pageSize: query.pageTotal,
-    alarmType: state.typeVal,
+    alarmId: state.alarmId,
+    alarmType: "custom",
+    deviceType: state.typeVal,
     stationid: state.stationId,
-    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
-    modelId: state.modelId,
+    deviceid:
+      state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
+    modelId: state.typeVal == "booststation" ? "" : state.modelId,
     components: state.components,
     description: state.description,
     begin: state.dateTime[0],
@@ -619,7 +628,7 @@ const export2Excel = async () => {
       return ele.id === state.stationId;
     }).name;
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
-
+    console.log(data.ls);
     outExportExcel(
       tableHeader,
       tableKey,
@@ -628,7 +637,10 @@ const export2Excel = async () => {
           ...item,
           ts: formatTime(item.ts),
           rank: tableFilter(item.rank),
-          deviceType: tableFilter(item.deviceType),
+          endtsName: item.endts > 0 ? formatTime(item.endts) : "--",
+          isCloseName: item.endts ? "已解除" : "未解除",
+          confirmed: item.confirmed ? "是" : "否",
+          deviceTypeName: tableFilter(item.deviceType),
         };
       }),
       fileName

src/views/IntegratedAlarm/safe/dataSearch/index.vue

@@ -91,16 +91,17 @@
             align="center"
             width="120"
           />
-          <el-table-column prop="name" label="名称" align="center" />
-          <el-table-column prop="value" label="值" width="120" align="center">
+          <el-table-column prop="name" label="名称" align="left" />
+          <el-table-column prop="value" label="值" width="120" align="right">
             <template #default="scope">
               <el-tag
                 size="small"
                 color="#133122"
                 style="border-color: #67c23a"
                 type="success"
-                >{{ scope.row.value }}</el-tag
               >
+                {{ scope.row.value }}
+              </el-tag>
             </template>
           </el-table-column>
 
@@ -112,7 +113,7 @@
           <el-table-column label="单位" width="100" align="center">
             <template #default="scope">
               {{ scope.row.unitName }}
-              {{ scope.row.unitNameCn ? `(${scope.row.unitNameCn})` : "" }}
+              {{ scope.row.unitNameCn ? `(${scope.row.unitNameCn})` : "--" }}
             </template>
           </el-table-column>
           <el-table-column width="100" align="center">

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -131,6 +131,7 @@
               value-format="YYYY-MM-DD HH:mm:ss"
               start-placeholder="开始"
               end-placeholder="结束"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -179,7 +180,11 @@
             :key="item.code"
             :width="item.width || ''"
             show-overflow-tooltip
-            align="center"
+            :align="
+              item.code == 'description' || item.code == 'faultCause'
+                ? 'left'
+                : 'center'
+            "
           >
             <template #default="scope">
               <p :style="item.style && item.style(scope.row)">
@@ -606,7 +611,7 @@ const getAlarmHistoryt = async () => {
         : ele.alarmType === "inverter"
         ? "光伏"
         : "";
-    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "";
+    ele.endtsName = ele.endts > 0 ? formatTime(ele.endts) : "--";
   });
   state.tableData = data?.ls;
 };
@@ -652,7 +657,6 @@ const export2Excel = async () => {
       return ele.id === state.stationId;
     }).name;
     const fileName = `${stationName} ${state.dateTime[0]} ~ ${state.dateTime[1]} 数据表`;
-
     outExportExcel(
       tableHeader,
       tableKey,
@@ -661,7 +665,17 @@ const export2Excel = async () => {
           ...item,
           ts: formatTime(item.ts),
           rank: tableFilter(item.rank),
-          alarmtype: tableFilter(item.alarmtype),
+          alarmTypeName:
+            item.alarmType === "booststation"
+              ? "升压站"
+              : item.alarmType === "windturbine"
+              ? "风机"
+              : item.alarmType === "inverter"
+              ? "光伏"
+              : "",
+          endtsName: item.endts > 0 ? formatTime(item.endts) : "--",
+          isCloseName: item.endts ? "已解除" : "未解除",
+          confirmed: item.confirmed ? "是" : "否",
         };
       }),
       fileName
@@ -686,7 +700,7 @@ const obj = {
   4: "中高级",
   5: "高级",
   booststation: "升压站",
-  custom: "自定义",
+  inverter: "光伏",
   windturbine: "风机",
 };
 const messageTypeObj = {

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -66,58 +66,6 @@ import Safecom from "@/views/IntegratedAlarm/safe/components/safecomponent.vue";
   width: 100%;
   height: 100%;
   padding: 20px 10px;
-  //   .topCard {
-  //     height: 24vh;
-  //     overflow-y: auto;
-  //     display: flex;
-  //     flex-wrap: wrap;
-  //     justify-content: flex-start;
-  //     align-content: flex-start;
-
-  //     .item {
-  //       width: 194px;
-  //       height: 90px;
-  //       padding: 6px 10px;
-  //       margin: 5px;
-  //       display: flex;
-  //       background-color: #f55d5d;
-  //       flex-direction: column;
-  //       -moz-user-select: none;
-  //       -webkit-user-select: none;
-  //       user-select: none;
-  //       cursor: pointer;
-
-  //       .title {
-  //         color: #fff;
-  //         font-size: 14px;
-  //       }
-
-  //       .warn_content {
-  //         flex: 1;
-  //         font-size: 12px;
-  //         color: rgb(133, 133, 133);
-  //         line-height: 1.3;
-  //         color: #fff;
-  //         overflow: hidden;
-  //         text-overflow: ellipsis;
-  //         display: -webkit-box;
-  //         -webkit-line-clamp: 2;
-  //         -webkit-box-orient: vertical;
-  //       }
-
-  //       .warn_btn {
-  //         display: flex;
-  //         justify-content: space-between;
-  //         font-size: 14px;
-  //         color: #fff;
-
-  //         .el-button--mini {
-  //           min-height: 20px;
-  //           padding: 0px;
-  //         }
-  //       }
-  //     }
-  //   }
 
   .bottomCard {
     display: flex;

src/views/IntegratedAlarm/safe/stopQuery/index.vue

@@ -87,6 +87,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               @change="getTableData"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -114,13 +115,21 @@
           :prop="item.prop"
           show-overflow-tooltip
           header-align="center"
-          align="center"
+          :align="
+            item.prop == 'handleWay' || item.prop == 'faultView'
+              ? 'left'
+              : 'center'
+          "
           v-for="(item, index) in tHeader"
           :key="index"
         >
           <template #default="scope">
             <span>
-              {{ scope.row[item.prop] != "NULL" ? scope.row[item.prop] : "--" }}
+              {{
+                scope.row[item.prop] != "NULL" && scope.row[item.prop] != null
+                  ? scope.row[item.prop]
+                  : "--"
+              }}
             </span>
           </template>
         </el-table-column>
@@ -250,7 +259,7 @@ export default {
         ele.stopTimeName = dayjs(ele.stopTime).format("YYYY-MM-DD HH:mm:ss");
         ele.startTimeName = ele.startTime
           ? dayjs(ele.startTime).format("YYYY-MM-DD HH:mm:ss")
-          : "";
+          : "--";
         ele.typeName = ele.stopTypeId === "gz" ? "故障" : "检修";
       });
 

src/views/economicsOperation/benchmarkingManagement/compontent/dayinfo.vue

@@ -43,32 +43,32 @@
         >
           <el-table-column align="center" prop="name" label="场站" width="200">
           </el-table-column>
-          <el-table-column align="center" prop="windData1" :label="windNum">
+          <el-table-column align="right" header-align="center" prop="windData1" :label="windNum">
           </el-table-column>
           <el-table-column
             v-if="windNum2"
-            align="center"
+            align="right" header-align="center"
             prop="windData2"
             :label="windNum2"
           >
           </el-table-column>
           <el-table-column
             v-if="windNum3"
-            align="center"
+            align="right" header-align="center"
             prop="windData3"
             :label="windNum3"
           >
           </el-table-column>
           <el-table-column
             v-if="windNum4"
-            align="center"
+            align="right" header-align="center"
             prop="windData4"
             :label="windNum4"
           >
           </el-table-column>
           <el-table-column
             v-if="windNum5"
-            align="center"
+            align="right" header-align="center"
             prop="windData5"
             :label="windNum5"
           >

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

@@ -143,7 +143,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
             v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
             :key="item.code"
             :prop="item.code"
@@ -225,7 +226,8 @@
           :label="item.name"
           :width="item.name.length == 4 ? 58 : 88"
           show-overflow-tooltip
-          align="center"
+          header-align="center"
+          :align="item.align ? item.align : 'center'"
           sortable
         />
       </el-table>

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

@@ -182,7 +182,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
             v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
             :key="item.code"
             :prop="item.code"
@@ -249,7 +250,8 @@
           :key="item.code"
           :prop="item.code"
           :label="item.name"
-          align="center"
+          header-align="center"
+          :align="item.align ? item.align : 'center'"
           :width="item.name.length == 4 ? 58 : 88"
           show-overflow-tooltip
           sortable

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

@@ -149,7 +149,8 @@
           <el-table-column
             v-for="item in tableHeader"
             :key="item.code"
-            align="center"
+            header-align="center"
+            :align="item.code == 'name' ? 'center' : 'right'"
             :prop="item.code"
             :label="item.name"
             :width="

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

@@ -162,7 +162,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
             v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
             :key="item.code"
             :prop="item.code"
@@ -244,7 +245,8 @@
           :label="item.name"
           :width="item.name.length == 4 ? 56 : 88"
           show-overflow-tooltip
-          align="center"
+          header-align="center"
+          :align="item.align ? item.align : 'center'"
           sortable
         />
       </el-table>

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

@@ -141,7 +141,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
             v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
             :key="item.code"
             :prop="item.code"
@@ -225,7 +226,8 @@
           :key="item.code"
           :prop="item.code"
           :label="item.name"
-          align="center"
+          header-align="center"
+          :align="item.align ? item.align : 'center'"
           :width="item.name.length == 4 ? 57 : 88"
           show-overflow-tooltip
           sortable
@@ -328,7 +330,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="fdl"
               label="发电量"
@@ -348,7 +351,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="gzssdl"
               label="故障损失"
@@ -368,7 +372,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="jxssdl"
               label="检修损失"
@@ -388,7 +393,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="xnssdl"
               label="性能损失"
@@ -408,7 +414,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="xdssdl"
               label="限电损失"
@@ -428,7 +435,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="slssdl"
               label="受累损失"
@@ -448,7 +456,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="fnlyl"
               :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
@@ -468,7 +477,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="gzssl"
               label="故障损失率(%)"
@@ -488,7 +498,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="jxssl"
               label="检修损失率(%)"
@@ -508,7 +519,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="qfl"
               :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
@@ -528,7 +540,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="xnssl"
               label="性能损失率(%)"
@@ -548,7 +561,8 @@
             </el-table-column>
             <el-table-column
               show-overflow-tooltip
-              align="center"
+              align="right"
+              header-align="center"
               label-class-name="s-tb-th"
               prop="slssl"
               label="受累损失率(%)"

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

@@ -183,7 +183,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
             v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
             :key="item.code"
             :prop="item.code"
@@ -269,7 +270,8 @@
           :label="item.name"
           :width="item.name.length == 4 ? 58 : 88"
           show-overflow-tooltip
-          align="center"
+          header-align="center"
+          :align="item.align ? item.align : 'center'"
           sortable
         />
       </el-table>

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

@@ -102,7 +102,8 @@
               :key="subIndex"
               :prop="subItem.code"
               :label="subItem.title"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <el-table-column
@@ -112,7 +113,8 @@
                 width="63"
                 :prop="thiItem.code"
                 :label="thiItem.title"
-                align="center"
+                align="right"
+                header-align="center"
                 show-overflow-tooltip
               >
               </el-table-column>

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

@@ -103,7 +103,8 @@
               :key="subIndex"
               :prop="subItem.code"
               :label="subItem.title"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <el-table-column
@@ -113,7 +114,8 @@
                 width="63"
                 :prop="thiItem.code"
                 :label="thiItem.title"
-                align="center"
+                align="right"
+                header-align="center"
                 show-overflow-tooltip
               >
               </el-table-column>

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

@@ -99,7 +99,8 @@
               :key="subIndex"
               :prop="subItem.code"
               :label="subItem.title"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <el-table-column
@@ -109,7 +110,8 @@
                 width="45"
                 :prop="thiItem.code"
                 :label="thiItem.title"
-                align="center"
+                align="right"
+                header-align="center"
                 show-overflow-tooltip
               >
               </el-table-column>

src/views/economicsOperation/efficiency/consumeEfficiency/index.vue

@@ -68,19 +68,22 @@
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="gzCount"
             label="故障次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="xqCount"
             label="消缺及时次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="xqjsl"
             label="消缺及时率(%)"
             sortable

src/views/economicsOperation/efficiency/restorationEfficiency/index.vue

@@ -68,49 +68,57 @@
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="five"
             label="5分钟 / 复位次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="fives"
             label="5分钟 / 复位率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="ten"
             label="10分钟 / 复位次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="tens"
             label="10分钟 / 复位率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="fifteen"
             label="15分钟 / 复位次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="fifteens"
             label="15分钟 / 复位率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="twenty"
             label="20分钟 / 复位次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="twentys"
             label="20分钟 / 复位率(%)"
             sortable

src/views/economicsOperation/efficiency/stateEfficiency/index.vue

@@ -91,49 +91,57 @@
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="wfz"
             label="5分钟 / 转换次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="wfzfwl"
             label="5分钟 / 转换率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="sfz"
             label="10分钟 / 转换次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="sfzfwl"
             label="10分钟 / 转换率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="swfz"
             label="15分钟 / 转换次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="swfzfwl"
             label="15分钟 / 转换率(%)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="esfz"
             label="20分钟 / 转换次数(次)"
             sortable
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             prop="esfzfwl"
             label="20分钟 / 转换率(%)"
             sortable

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

@@ -57,7 +57,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            header-align="center"
+            :align="item.align"
           />
         </el-table>
         <div style="text-align: right">
@@ -89,11 +90,19 @@ export default {
       stationOptions: [],
       pickerTimer: "",
       tableHeader: [
-        { title: "日照强度(W/m²)", code: "averageLightIntensity" },
-        { title: "平均功率(kW)", code: "averagePower" },
-        { title: "离散率(%)", code: "scatter" },
-        { title: "标准差", code: "equivalentGeneratingTimeStan" },
-        { title: "逆变器推荐状态", code: "scatterStatus" },
+        {
+          title: "日照强度(W/m²)",
+          code: "averageLightIntensity",
+          align: "right",
+        },
+        { title: "平均功率(kW)", code: "averagePower", align: "right" },
+        { title: "离散率(%)", code: "scatter", align: "right" },
+        {
+          title: "标准差",
+          code: "equivalentGeneratingTimeStan",
+          align: "right",
+        },
+        { title: "逆变器推荐状态", code: "scatterStatus", align: "left" },
       ],
       page: {
         currentPage: 1,

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

@@ -84,7 +84,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            align="right"
+            header-align="center"
           />
         </el-table>
         <div style="text-align: right">

src/views/economicsOperation/photovoltaicAnalyse/powerAnalyse/components/table.vue

@@ -57,9 +57,10 @@ const tableHeight = computed(() => {
       :style="{ width: '100%' }"
     >
       <el-table-column
-        align="center"
+        header-align="center"
+        :align="index < 2 ? 'center' : 'right'"
         show-overflow-tooltip
-        v-for="item in props.column"
+        v-for="(item, index) in props.column"
         :key="item.prop"
         :prop="item.prop"
         :label="item.label"

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

@@ -139,21 +139,24 @@
               property="speed"
               sortable
               width="140"
-              align="center"
+              align="right"
+              header-align="center"
               label="风速(m/s)"
             />
             <el-table-column
               property="power"
               sortable
               width="140"
-              align="center"
+              align="right"
+              header-align="center"
               label="功率(kW)"
             />
             <el-table-column
               property="rr"
               sortable
               width="140"
-              align="center"
+              align="right"
+              header-align="center"
               label="转速"
             />
             <el-table-column
@@ -487,6 +490,7 @@ export default {
             return {
               prop: o.key,
               label: o.des,
+              
               width: o.des === "时间" ? 100 : 80,
             };
           });

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

@@ -45,7 +45,8 @@
             <el-table-column
               v-for="(item, index) in tableHeaders"
               :key="index"
-              align="center"
+              header-align="center"
+              :align="item.align"
               show-overflow-tooltip
               :prop="item.prop"
               :label="item.label"
@@ -133,15 +134,44 @@ export default {
         { prop: "prpm", label: "排名", width: 60 },
         { prop: "wtid", label: "设备", width: 100 },
         { prop: "level", label: "运行状态", width: 120 },
-        { prop: "rl", label: "容量", width: 75, unit: "(kW)" },
-        { prop: "ljgzz", label: "累计光照", width: 120, unit: "(kW/m²)" },
-        { prop: "fdl", label: "发电量", width: 110, unit: "(kWh)" },
-        { prop: "llfdlmax", label: "最大理论发电量", unit: "(kWh)" },
-        { prop: "pr", label: "本期", width: 80 },
-        { prop: "prhb", label: "上月", width: 80 },
-        { prop: "prhbzzl", label: "增长率", width: 120, unit: "(%)" },
-        { prop: "prtb", label: "同期", width: 80 },
-        { prop: "prtbzzl", label: "增长率", width: 120, unit: "(%)" },
+        { prop: "rl", label: "容量", width: 75, unit: "(kW)", align: "right" },
+        {
+          prop: "ljgzz",
+          label: "累计光照",
+          width: 120,
+          unit: "(kW/m²)",
+          align: "right",
+        },
+        {
+          prop: "fdl",
+          label: "发电量",
+          width: 110,
+          unit: "(kWh)",
+          align: "right",
+        },
+        {
+          prop: "llfdlmax",
+          label: "最大理论发电量",
+          unit: "(kWh)",
+          align: "right",
+        },
+        { prop: "pr", label: "本期", width: 80, align: "right" },
+        { prop: "prhb", label: "上月", width: 80, align: "right" },
+        {
+          prop: "prhbzzl",
+          label: "增长率",
+          width: 120,
+          unit: "(%)",
+          align: "right",
+        },
+        { prop: "prtb", label: "同期", width: 80, align: "right" },
+        {
+          prop: "prtbzzl",
+          label: "增长率",
+          width: 120,
+          unit: "(%)",
+          align: "right",
+        },
       ],
       tableData: [],
       bardata: {},

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

@@ -74,42 +74,42 @@
           style="width: 100%"
         >
           <el-table-column prop="deviceId" label="设备名称" align="center" />
-          <el-table-column label="待机时间(H)" align="center">
+          <el-table-column label="待机时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.standbyTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="并网时间(H)" align="center">
+          <el-table-column label="并网时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="故障时间(H)" align="center">
+          <el-table-column label="故障时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.faultTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="检修时间(H)" align="center">
+          <el-table-column label="检修时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.maintenanceTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="限电时间(H)" align="center">
+          <el-table-column label="限电时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.powerLimitTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="受累时间(H)" align="center">
+          <el-table-column label="受累时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.faultTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="离线时间(H)" align="center">
+          <el-table-column label="离线时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.offlineTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合计时间(H)" align="center">
+          <el-table-column label="合计时间(H)" align="right" header-align="center">
             <template #default="{ row }">
               <span>{{ row.total }}</span>
             </template>

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

@@ -82,7 +82,8 @@
             v-for="(item, index) in tableHead"
             :label="item"
             :key="index"
-            align="center"
+            header-align="center"
+            :align="item == '指标名称' ? 'center' : 'right'"
             :width="item == '指标名称' ? '200px' : ''"
             show-overflow-tooltip
           >

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

@@ -99,7 +99,8 @@
               label="本月"
               width="66"
               v-if="filter == 1 || filter == 2"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <template #default="scope">
@@ -116,7 +117,8 @@
               label="同比"
               width="66"
               v-if="filter == 1"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <template #default="scope">
@@ -133,7 +135,8 @@
               label="环比"
               width="66"
               v-if="filter == 2"
-              align="center"
+              align="right"
+              header-align="center"
               show-overflow-tooltip
             >
               <template #default="scope">
@@ -148,7 +151,8 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
+            header-align="center"
             label="合计"
             width="76"
             show-overflow-tooltip

src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/photovoltaic.vue

@@ -14,7 +14,10 @@
           :label="item.label"
           :prop="item.prop"
           :key="index"
-          align="center"
+          header-align="center"
+          :align="
+            item.prop == 'zfzd' || item.prop == 'zdfdz' ? 'right' : 'center'
+          "
           show-overflow-tooltip
         >
         </el-table-column>

src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/wind.vue

@@ -7,7 +7,8 @@
           :label="item.label"
           :prop="item.prop"
           :key="index"
-          align="center"
+          header-align="center"
+          :align="index == 0 ? 'center' : 'right'"
           show-overflow-tooltip
         >
           <template #default="{ row }">
@@ -124,7 +125,8 @@ export default {
     getRadarChart(wpid) {
       getWindAnalysisRadarChart({ Data: this.date, wpid }).then((res) => {
         if (res.code == 200) {
-          this.radarChart = res.data && res.data[0].count ? res.data[0].count : [];
+          this.radarChart =
+            res.data && res.data[0].count ? res.data[0].count : [];
         }
         // this.chartLoading = false;
         // this.BASE.closeLoading();

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

@@ -88,6 +88,7 @@
           sortable
           :prop="item.code"
           :label="item.title"
+          header-align="center"
           align="center"
         >
           <template #header="scope">

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

@@ -55,7 +55,7 @@
       </div>
       <div class="but">
         <el-button round size="mini" class="buttons" @click="seachData"
-          >搜 索索</el-button
+          >搜 索</el-button
         >
         <el-button round size="mini" class="buttons" @click="downXlsxFn"
           >导出</el-button
@@ -95,7 +95,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            header-align="center"
+            align="right"
           >
             <template #header="scope">
               <div

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

@@ -99,7 +99,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            align="right"
+            header-align="center"
           >
             <template #header="scope">
               <div>
@@ -302,7 +303,6 @@ export default {
       return y + "-" + m;
     },
     reportDialogFn(row) {
-    
       this.dialogVisible = true;
       this.dialogTitle = row.wtcode;
       this.pickerTimerYear = this.pickerTimer.substring(

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

@@ -25,7 +25,7 @@
           :key="index"
           :prop="item.field"
           :label="item.name"
-          align="center"
+          :align="item.field == 'name' ? 'center' : 'right'"
           :width="item.width"
         >
         </el-table-column>

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

@@ -543,6 +543,7 @@ export default {
           font-family: MicrosoftYaHei;
         }
         .colorSty {
+          text-align: right;
           color: #05bb4c;
           font-size: 14px;
           font-family: MicrosoftYaHei;

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

@@ -44,7 +44,8 @@
           sortable
           :prop="item.code"
           :label="item.title"
-          align="center"
+          align="right"
+          header-align="center"
         >
           <template #header="scope">
             <div>
@@ -178,3 +179,14 @@ export default {
   }
 }
 </style>
+<style lang="less">
+.el-overlay {
+  .el-overlay-dialog {
+    .EvaluationhistoryModel {
+      .el-dialog__body {
+        height: calc(100% - 65px);
+      }
+    }
+  }
+}
+</style>

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

@@ -159,7 +159,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            align="right"
+            header-align="center"
             show-overflow-tooltip
           >
             <template #header="scope">

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

@@ -116,7 +116,8 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            header-align="center"
+            :align="index == 0 ? 'center' : 'right'"
           >
           </el-table-column>
         </el-table>

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

@@ -55,7 +55,8 @@
       >
         <el-table-column
           :sortable="item.field != 'nemCode' && item.field != 'recordDate'"
-          align="center"
+          header-align="center"
+          :align="index < 2 ? 'center' : 'right'"
           v-for="(item, index) in tableData.column"
           :key="index"
           :prop="item.field"
@@ -74,7 +75,6 @@ export default {
 
   data() {
     return {
-   
       ChangZhan: [],
       value1: "",
       date: "",

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

@@ -60,7 +60,8 @@
           :prop="item.code"
           :label="item.title"
           show-overflow-tooltip
-          align="center"
+          header-align="center"
+          align="right"
         >
           <template #header="scope">
             <div>{{ scope.column.label }}</div>

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

@@ -103,7 +103,8 @@
             :prop="item.code"
             :label="item.title"
             show-overflow-tooltip
-            align="center"
+            header-align="center"
+            :align="item.align ? item.align : 'center'"
           >
             <!-- <template #header="scope">
               <div v-if="scope.column.label.indexOf('(') > 0">
@@ -222,30 +223,30 @@ export default {
       ],
       tableHeader: [
         // { title: "风机", code: "wtcode" },
-        { title: "型号", code: "modelId" },
-        { title: "日排行榜", code: "dayTop" },
-        { title: "日拟合优度(%)", code: "dayGoodness" },
-        { title: "日风速(m/s)", code: "daySpeed" },
-        { title: "月排行榜", code: "monthTop" },
-        { title: "月拟合优度(%)", code: "monthGoodness" },
-        { title: "月风速(m/s)", code: "monthSpeed" },
-        { title: "年排行榜", code: "yearTop" },
-        { title: "年拟合优度(%)", code: "yearGoodness" },
-        { title: "年风速(m/s)", code: "yearSpeed" },
+        { title: "型号", code: "modelId", align: "left" },
+        { title: "日排行榜", code: "dayTop", align: "right" },
+        { title: "日拟合优度(%)", code: "dayGoodness", align: "right" },
+        { title: "日风速(m/s)", code: "daySpeed", align: "right" },
+        { title: "月排行榜", code: "monthTop", align: "right" },
+        { title: "月拟合优度(%)", code: "monthGoodness", align: "right" },
+        { title: "月风速(m/s)", code: "monthSpeed", align: "right" },
+        { title: "年排行榜", code: "yearTop", align: "right" },
+        { title: "年拟合优度(%)", code: "yearGoodness", align: "right" },
+        { title: "年风速(m/s)", code: "yearSpeed", align: "right" },
         // { title: "操作" },
       ],
       tableHeaderGf: [
         { title: "逆变器", code: "wtname" },
-        { title: "型号", code: "model" },
-        { title: "日系统效率", code: "rxtxl" },
-        { title: "日离散率", code: "rlsl" },
-        { title: "日转换效率", code: "rzhxl" },
-        { title: "月系统效率", code: "yxtxl" },
-        { title: "月离散率", code: "ylsl" },
-        { title: "月转换效率", code: "yzhxl" },
-        { title: "年系统效率", code: "nxtxl" },
-        { title: "年离散率", code: "nlsl" },
-        { title: "年转换效率", code: "nzhxl" },
+        { title: "型号", code: "model", align: "left" },
+        { title: "日系统效率", code: "rxtxl", align: "right" },
+        { title: "日离散率", code: "rlsl", align: "right" },
+        { title: "日转换效率", code: "rzhxl", align: "right" },
+        { title: "月系统效率", code: "yxtxl", align: "right" },
+        { title: "月离散率", code: "ylsl", align: "right" },
+        { title: "月转换效率", code: "yzhxl", align: "right" },
+        { title: "年系统效率", code: "nxtxl", align: "right" },
+        { title: "年离散率", code: "nlsl", align: "right" },
+        { title: "年转换效率", code: "nzhxl", align: "right" },
         // { title: "操作" },
       ],
       page: {

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

@@ -74,42 +74,74 @@
           style="width: 100%"
         >
           <el-table-column prop="deviceId" label="风机名称" align="center" />
-          <el-table-column label="待机时间(H)" align="center">
+          <el-table-column
+            label="待机时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.standbyTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="并网时间(H)" align="center">
+          <el-table-column
+            label="并网时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.gridConnectionTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="故障时间(H)" align="center">
+          <el-table-column
+            label="故障时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.faultTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="检修时间(H)" align="center">
+          <el-table-column
+            label="检修时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.maintenanceTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="限电时间(H)" align="center">
+          <el-table-column
+            label="限电时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.powerLimitTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="受累时间(H)" align="center">
+          <el-table-column
+            label="受累时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.faultTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="离线时间(H)" align="center">
+          <el-table-column
+            label="离线时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.offlineTime.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合计时间(H)" align="center">
+          <el-table-column
+            label="合计时间(H)"
+            align="right"
+            header-align="center"
+          >
             <template #default="{ row }">
               <span>{{ row.total }}</span>
             </template>

src/views/layout/Header.vue

@@ -158,11 +158,11 @@ export default {
         //   text: "综合报警",
         //   path: "",
         // });
-        currMenu.splice(5, 0, {
-          id: "fdfx",
-          text: "发电能力分析",
-          path: "",
-        });
+        // currMenu.splice(5, 0, {
+        //   id: "fdfx",
+        //   text: "发电能力分析",
+        //   path: "",
+        // });
         // currMenu.push();
         return currMenu;
       } else {

src/views/stateMonitor/DetailMatrix/index.vue

@@ -217,6 +217,7 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input style="width: 200px" :value="val.power" /> -->
                     </div>
                     <div class="right-item">
                       <i
@@ -242,6 +243,18 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input
+                        style="width: 200px"
+                        :value="
+                          value.czlx == '-1'
+                            ? val.speed
+                              ? Number(val.speed)?.toFixed(2)
+                              : '0.00'
+                            : val.current
+                            ? Number(val.current)?.toFixed(2)
+                            : '0.00'
+                        "
+                      /> -->
                     </div>
                     <div class="right-item">
                       <i
@@ -267,6 +280,18 @@
                             : "0.00"
                         }}
                       </div>
+                      <!-- <input
+                        style="width: 200px"
+                        :value="
+                          value.czlx == '-1'
+                            ? val.transfer
+                              ? Number(val.transfer)?.toFixed(2)
+                              : '0.00'
+                            : val.voltage
+                            ? Number(val.voltage)?.toFixed(2)
+                            : '0.00'
+                        "
+                      /> -->
                     </div>
                   </div>
                 </div>
@@ -701,12 +726,12 @@ export default {
           if (Object.values(res.data.data).length) {
             this.BASE.closeLoading();
             let sourceMap = res.data.data;
-            // sourceMap.powerVos.forEach((item, index) => {
-            //   item["switch" + index] = true;
-            // });
+
             this.sourceMap = sourceMap;
-            if (this.fillFjzt) {
+            if (this.fillFjzt != "all") {
               this.handleClick(this.fillFjzt);
+            } else {
+              this.showMatrixList = this.sourceMap.powerVos;
             }
           } else {
             this.sourceMap = {};
@@ -714,6 +739,30 @@ export default {
           }
         });
     },
+
+    chunkArray(arr, chunkSize) {
+      // 验证输入参数
+      if (
+        !Array.isArray(arr) ||
+        typeof chunkSize !== "number" ||
+        chunkSize <= 0
+      ) {
+        throw new Error(
+          "Invalid input. Please provide a valid array and a positive chunk size."
+        );
+      }
+
+      // 初始化二维数组
+      const result = [];
+
+      // 遍历原始数组，按照指定长度分组
+      for (let i = 0; i < arr.length; i += chunkSize) {
+        result.push(arr.slice(i, i + chunkSize));
+      }
+
+      return result;
+    },
+
     // 点击切换状态
     handleClick(val) {
       this.fillFjzt = val;
@@ -726,6 +775,27 @@ export default {
     },
     // 状态切换改变数据
     handleClickWind() {
+      //   const tempWtArray = this.BASE.deepCopy(sourceMap.powerVos);
+
+      //   tempWtArray?.forEach((ele) => {
+      //     ele.spWtlist = this.chunkArray(ele.wtlist, 100);
+      //   });
+
+      //   sourceMap.powerVos.forEach((ele) => {
+      //     ele.wtlist = [];
+      //   });
+
+      //   for (let i = 0; i < sourceMap.powerVos.length; i++) {
+      //     const ele = sourceMap.powerVos[i];
+      //     for (let j = 0; j < tempWtArray[i]?.spWtlist?.length; j++) {
+      //       setTimeout(() => {
+      //         ele.wtlist = ele.wtlist.concat(tempWtArray[i].spWtlist[j]);
+      //       }, 500);
+      //     }
+      //   }
+
+      //   console.log(11, tempWtArray);
+      //   console.log(22, sourceMap);
       this.loading = false;
       this.showMatrixList = JSON.parse(JSON.stringify(this.sourceMap.powerVos));
       let matrixList = this.sourceMap.powerVos;
@@ -936,7 +1006,15 @@ export default {
       } else {
         this.showMatrixList = this.sourceMap.powerVos;
       }
+      const tempWtArray = this.chunkArray(this.showMatrixList, 3);
+      this.showMatrixList = tempWtArray[0];
+      for (let i = 1; i < tempWtArray.length; i++) {
+        setTimeout(() => {
+          this.showMatrixList.push(...tempWtArray[i]);
+        }, 5);
+      }
     },
+
     // 点击左侧数据弹出曲线
     handleLeftClick(wt, type, wpid) {
       this.displayMatrix = true;

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -136,7 +136,7 @@
             sortable
             :prop="item.code"
             :label="item.title"
-            align="center"
+            :align="item.code != 'description' ? 'center' : 'left'"
             :width="item.width"
           >
             <template #default="{ row }">
@@ -148,7 +148,7 @@
               <span v-else-if="item.code == 'endts'">{{
                 row.endts ? getTime(row.endts) : "--"
               }}</span>
-              <span v-else>{{ row[item.code] }}</span>
+              <span v-else>{{ row[item.code] || "--" }}</span>
             </template>
           </el-table-column>
         </el-table>

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

@@ -35,7 +35,7 @@
           :key="index"
           :prop="item.uniformCode"
           sortable
-          align="center"
+        :align="index < 1 ? 'center' : 'right'"
           header-align="center"
           :resizable="true"
           :min-width="item.width"
@@ -222,28 +222,30 @@ export default {
         uniformCode: "AI121",
         width: "150",
       },
+
       {
-        name: "月发电量",
+        name: "总发电量",
         valueUnit: "万kWh",
-        uniformCode: "AIG072",
+        uniformCode: "AIG095",
         width: "150",
       },
       {
-        name: "年发电量",
-        valueUnit: "万kWh",
-        uniformCode: "AIG063",
+        name: "有功功率",
+        valueUnit: "MW",
+        uniformCode: "AI114",
         width: "150",
       },
+
       {
-        name: "总发电量",
-        valueUnit: "万kWh",
-        uniformCode: "AIG095",
+        name: "逆变器直流电流",
+        valueUnit: "A",
+        uniformCode: "AIG061",
         width: "150",
       },
       {
-        name: "有功功率",
-        valueUnit: "MW",
-        uniformCode: "AI114",
+        name: "逆变器直流电压",
+        valueUnit: "V",
+        uniformCode: "AIG062",
         width: "150",
       },
     ];

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy-map.vue

@@ -149,91 +149,91 @@ export default {
           y: "360",
         },
         {
-          name: "13方阵",
+          name: "N13方阵",
           x: "1415",
           y: "195",
           type: 3,
         },
         {
-          name: "14方阵",
+          name: "N14方阵",
           x: "1430",
           y: "325",
           type: 3,
         },
         {
-          name: "15方阵",
+          name: "N15方阵",
           x: "1440",
           y: "465",
           type: 3,
         },
         {
-          name: "1方阵",
+          name: "N01方阵",
           x: "1215",
           y: "215",
           type: 3,
         },
         {
-          name: "5方阵",
+          name: "N05方阵",
           x: "1215",
           y: "325",
           type: 3,
         },
         {
-          name: "10方阵",
+          name: "N10方阵",
           x: "1220",
           y: "465",
           type: 3,
         },
         {
-          name: "12方阵",
+          name: "N12方阵",
           x: "1135",
           y: "555",
           type: 3,
         },
         {
-          name: "4方阵",
+          name: "N04方阵",
           x: "1005",
           y: "315",
           type: 3,
         },
         {
-          name: "9方阵",
+          name: "N09方阵",
           x: "995",
           y: "455",
           type: 3,
         },
         {
-          name: "3方阵",
+          name: "N03方阵",
           x: "785",
           y: "315",
           type: 3,
         },
         {
-          name: "8方阵",
+          name: "N08方阵",
           x: "765",
           y: "455",
           type: 3,
         },
         {
-          name: "2方阵",
+          name: "N02方阵",
           x: "580",
           y: "310",
           type: 3,
         },
         {
-          name: "7方阵",
+          name: "N07方阵",
           x: "545",
           y: "455",
           type: 3,
         },
         {
-          name: "11方阵",
+          name: "N11方阵",
           x: "605",
           y: "540",
           type: 3,
         },
         {
-          name: "6方阵",
+          name: "N06方阵",
           x: "325",
           y: "450",
           type: 3,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy2-map.vue

@@ -149,367 +149,367 @@ export default {
           y: "255",
         },
         {
-          name: "8方阵",
+          name: "T08方阵",
           x: "1440",
           y: "60",
           type: 3,
         },
         {
-          name: "9方阵",
+          name: "T09方阵",
           x: "1420",
           y: "70",
           type: 3,
         },
         {
-          name: "10方阵",
+          name: "T10方阵",
           x: "1397",
           y: "80",
           type: 3,
         },
         {
-          name: "11方阵",
+          name: "T11方阵",
           x: "1360",
           y: "90",
           type: 3,
         },
         {
-          name: "40方阵",
+          name: "T40方阵",
           x: "1385",
           y: "28",
           type: 3,
         },
         {
-          name: "41方阵",
+          name: "T41方阵",
           x: "1360",
           y: "35",
           type: 3,
         },
         {
-          name: "43方阵",
+          name: "T43方阵",
           x: "1325",
           y: "30",
           type: 3,
         },
         {
-          name: "45方阵",
+          name: "T45方阵",
           x: "1295",
           y: "55",
           type: 3,
         },
         {
-          name: "53方阵",
+          name: "T53方阵",
           x: "1265",
           y: "80",
           type: 3,
         },
         {
-          name: "42方阵",
+          name: "T42方阵",
           x: "1265",
           y: "25",
           type: 3,
         },
         {
-          name: "46方阵",
+          name: "T46方阵",
           x: "1240",
           y: "45",
           type: 3,
         },
         {
-          name: "52方阵",
+          name: "T52方阵",
           x: "1210",
           y: "70",
           type: 3,
         },
         {
-          name: "47方阵",
+          name: "T47方阵",
           x: "1185",
           y: "20",
           type: 3,
         },
         {
-          name: "54方阵",
+          name: "T54方阵",
           x: "1185",
           y: "100",
           type: 3,
         },
         {
-          name: "51方阵",
+          name: "T51方阵",
           x: "1160",
           y: "55",
           type: 3,
         },
         {
-          name: "48方阵",
+          name: "T48方阵",
           x: "1130",
           y: "40",
           type: 3,
         },
         {
-          name: "55方阵",
+          name: "T55方阵",
           x: "1125",
           y: "80",
           type: 3,
         },
         {
-          name: "50方阵",
+          name: "T50方阵",
           x: "1105",
           y: "25",
           type: 3,
         },
         {
-          name: "61方阵",
+          name: "T61方阵",
           x: "1090",
           y: "100",
           type: 3,
         },
         {
-          name: "59方阵",
+          name: "T59方阵",
           x: "1065",
           y: "60",
           type: 3,
         },
         {
-          name: "60方阵",
+          name: "T60方阵",
           x: "1040",
           y: "85",
           type: 3,
         },
         {
-          name: "49方阵",
+          name: "T49方阵",
           x: "1000",
           y: "5",
           type: 3,
         },
         {
-          name: "57方阵",
+          name: "T57方阵",
           x: "1020",
           y: "35",
           type: 3,
         },
         {
-          name: "59方阵",
+          name: "T59方阵",
           x: "985",
           y: "70",
           type: 3,
         },
         {
-          name: "58方阵",
+          name: "T58方阵",
           x: "940",
           y: "10",
           type: 3,
         },
         {
-          name: "62方阵",
+          name: "T62方阵",
           x: "930",
           y: "85",
           type: 3,
         },
         {
-          name: "12方阵",
+          name: "T12方阵",
           x: "660",
           y: "165",
           type: 3,
         },
         {
-          name: "14方阵",
+          name: "T14方阵",
           x: "680",
           y: "210",
           type: 3,
         },
         {
-          name: "17方阵",
+          name: "T17方阵",
           x: "690",
           y: "270",
           type: 3,
         },
         {
-          name: "16方阵",
+          name: "T16方阵",
           x: "645",
           y: "245",
           type: 3,
         },
         {
-          name: "13方阵",
+          name: "T13方阵",
           x: "625",
           y: "180",
           type: 3,
         },
         {
-          name: "15方阵",
+          name: "T15方阵",
           x: "590",
           y: "220",
           type: 3,
         },
         {
-          name: "19方阵",
+          name: "T19方阵",
           x: "600",
           y: "280",
           type: 3,
         },
         {
-          name: "18方阵",
+          name: "T18方阵",
           x: "560",
           y: "245",
           type: 3,
         },
         {
-          name: "21方阵",
+          name: "T21方阵",
           x: "565",
           y: "305",
           type: 3,
         },
         {
-          name: "23方阵",
+          name: "T23方阵",
           x: "545",
           y: "345",
           type: 3,
         },
         {
-          name: "20方阵",
+          name: "T20方阵",
           x: "520",
           y: "275",
           type: 3,
         },
         {
-          name: "22方阵",
+          name: "T22方阵",
           x: "485",
           y: "310",
           type: 3,
         },
         {
-          name: "24方阵",
+          name: "T24方阵",
           x: "445",
           y: "350",
           type: 3,
         },
         {
-          name: "25方阵",
+          name: "T25方阵",
           x: "400",
           y: "300",
           type: 3,
         },
         {
-          name: "26方阵",
+          name: "T26方阵",
           x: "350",
           y: "320",
           type: 3,
         },
         {
-          name: "27方阵",
+          name: "T27方阵",
           x: "300",
           y: "345",
           type: 3,
         },
         {
-          name: "7方阵",
+          name: "T07方阵",
           x: "1265",
           y: "375",
           type: 3,
         },
         {
-          name: "3方阵",
+          name: "T03方阵",
           x: "1230",
           y: "320",
           type: 3,
         },
         {
-          name: "6方阵",
+          name: "T06方阵",
           x: "1200",
           y: "360",
           type: 3,
         },
         {
-          name: "2方阵",
+          name: "T02方阵",
           x: "1165",
           y: "280",
           type: 3,
         },
         {
-          name: "1方阵",
+          name: "T01方阵",
           x: "1150",
           y: "230",
           type: 3,
         },
         {
-          name: "5方阵",
+          name: "T05方阵",
           x: "1140",
           y: "335",
           type: 3,
         },
         {
-          name: "4方阵",
+          name: "T04方阵",
           x: "1065",
           y: "300",
           type: 3,
         },
         {
-          name: "31方阵",
+          name: "T31方阵",
           x: "1640",
           y: "610",
           type: 3,
         },
         {
-          name: "35方阵",
+          name: "T35方阵",
           x: "1630",
           y: "660",
           type: 3,
         },
         {
-          name: "28方阵",
+          name: "T28方阵",
           x: "1625",
           y: "560",
           type: 3,
         },
         {
-          name: "30方阵",
+          name: "T30方阵",
           x: "1560",
           y: "580",
           type: 3,
         },
         {
-          name: "34方阵",
+          name: "T34方阵",
           x: "1540",
           y: "630",
           type: 3,
         },
         {
-          name: "29方阵",
+          name: "T29方阵",
           x: "1480",
           y: "550",
           type: 3,
         },
         {
-          name: "36方阵",
+          name: "T36方阵",
           x: "1470",
           y: "625",
           type: 3,
         },
         {
-          name: "33方阵",
+          name: "T33方阵",
           x: "1450",
           y: "600",
           type: 3,
         },
         {
-          name: "32方阵",
+          name: "T32方阵",
           x: "1405",
           y: "600",
           type: 3,
         },
         {
-          name: "37方阵",
+          name: "T37方阵",
           x: "1370",
           y: "630",
           type: 3,
         },
         {
-          name: "38方阵",
+          name: "T38方阵",
           x: "1050",
           y: "800",
           type: 3,
         },
         {
-          name: "39方阵",
+          name: "T39方阵",
           x: "1000",
           y: "850",
           type: 3,

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

@@ -606,7 +606,6 @@ export default {
         this.stationCode = wpid;
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
-        this.getBarValuesFDL();
       } else {
         clearInterval(this.timer);
         clearInterval(this.time2);
@@ -647,6 +646,7 @@ export default {
             },
           ];
           if (flag) {
+            this.getBarValuesFDL();
             this.getLossValuesAnalyse(this.dates);
           }
         });
@@ -713,11 +713,15 @@ export default {
         }
       }
     },
-    // 改变完成电量数据
+    // 改变日发电量数据
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdldb);
+        let children = data.data.map((item) =>
+          item.recordDate == dayjs().format("YYYY-MM-DD")
+            ? (this.wpInfos.rfdl || 0) * 10000
+            : item.rfdldb
+        );
         this.barList = [
           {
             name: "发电量",

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

@@ -35,7 +35,7 @@
           :key="index"
           :prop="item.uniformCode"
           sortable
-          align="center"
+         :align="index < 1 ? 'center' : 'right'"
           header-align="center"
           :resizable="true"
           :min-width="item.width"

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map.vue

@@ -457,158 +457,358 @@ export default {
     return {
       dataList: [
         {
-          name: "升压站",
-          x: "1015",
-          y: "325",
+          name: "#39",
+          x: "1740",
+          y: "10",
+          type: 3,
         },
+
         {
-          name: "#6",
-          x: "1830",
-          y: "550",
+          name: "#38",
+          x: "1675",
+          y: "10",
           type: 3,
         },
+
         {
-          name: "#5",
-          x: "1680",
-          y: "520",
+          name: "#40",
+          x: "1689",
+          y: "-10",
           type: 3,
         },
+
         {
-          name: "#4",
-          x: "1625",
-          y: "350",
+          name: "#37",
+          x: "1615",
+          y: "-10",
           type: 3,
         },
+
         {
-          name: "#3",
-          x: "1515",
+          name: "#36",
+          x: "1570",
+          y: "10",
+          type: 3,
+        },
+
+        {
+          name: "#35",
+          x: "1600",
+          y: "70",
+          type: 3,
+        },
+
+        {
+          name: "#34",
+          x: "1585",
+          y: "125",
+          type: 3,
+        },
+
+        {
+          name: "#33",
+          x: "1535",
+          y: "190",
+          type: 3,
+        },
+
+        {
+          name: "#24",
+          x: "1488",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#25",
+          x: "1425",
+          y: "430",
+          type: 3,
+        },
+
+        {
+          name: "#49",
+          x: "1420",
+          y: "125",
+          type: 3,
+        },
+
+        {
+          name: "#50",
+          x: "1405",
+          y: "85",
+          type: 3,
+        },
+
+        {
+          name: "#48",
+          x: "1405",
+          y: "165",
+          type: 3,
+        },
+
+        {
+          name: "#45",
+          x: "1400",
           y: "300",
           type: 3,
         },
+
         {
-          name: "#7",
-          x: "1460",
-          y: "830",
+          name: "#23",
+          x: "1380",
+          y: "565",
           type: 3,
         },
+
         {
-          name: "#2",
+          name: "#32",
+          x: "1378",
+          y: "225",
+          type: 3,
+        },
+
+        {
+          name: "#22",
+          x: "1355",
+          y: "500",
+          type: 3,
+        },
+
+        {
+          name: "#46",
+          x: "1345",
+          y: "255",
+          type: 3,
+        },
+
+        {
+          name: "#30",
+          x: "1325",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#47",
+          x: "1290",
+          y: "175",
+          type: 3,
+        },
+
+        {
+          name: "#31",
+          x: "1250",
+          y: "390",
+          type: 3,
+        },
+
+        {
+          name: "#21",
           x: "1230",
-          y: "200",
+          y: "465",
           type: 3,
         },
+
         {
-          name: "#1",
-          x: "1210",
-          y: "320",
+          name: "#44",
+          x: "1225",
+          y: "335",
           type: 3,
         },
+
         {
-          name: "#17",
-          x: "1130",
-          y: "650",
+          name: "#13",
+          x: "1220",
+          y: "705",
           type: 3,
         },
+
         {
-          name: "#16",
-          x: "1075",
-          y: "120",
+          name: "#14",
+          x: "1165",
+          y: "745",
           type: 3,
         },
+
         {
-          name: "#11",
-          x: "1075",
-          y: "240",
+          name: "#12",
+          x: "1160",
+          y: "645",
           type: 3,
         },
+
         {
-          name: "#10",
-          x: "955",
-          y: "230",
+          name: "#43",
+          x: "1150",
+          y: "400",
+          type: 3,
+        },
+
+        {
+          name: "#20",
+          x: "1140",
+          y: "515",
+          type: 3,
+        },
+
+        {
+          name: "#19",
+          x: "1100",
+          y: "555",
           type: 3,
         },
+
         {
           name: "#15",
-          x: "955",
-          y: "125",
+          x: "1055",
+          y: "735",
           type: 3,
         },
+
         {
-          name: "#14",
-          x: "865",
-          y: "65",
+          name: "#42",
+          x: "1045",
+          y: "385",
           type: 3,
         },
+
         {
           name: "#9",
-          x: "860",
-          y: "230",
+          x: "1020",
+          y: "615",
           type: 3,
         },
+
         {
           name: "#8",
-          x: "770",
-          y: "295",
+          x: "1015",
+          y: "550",
           type: 3,
         },
+
         {
-          name: "#13",
-          x: "770",
-          y: "70",
+          name: "#17",
+          x: "1010",
+          y: "850",
           type: 3,
         },
+
         {
-          name: "#12",
-          x: "740",
-          y: "155",
+          name: "#18",
+          x: "1000",
+          y: "500",
           type: 3,
         },
+
         {
-          name: "#18",
-          x: "710",
-          y: "375",
+          name: "#16",
+          x: "995",
+          y: "790",
           type: 3,
         },
+
         {
-          name: "#19",
-          x: "690",
-          y: "255",
+          name: "#10",
+          x: "975",
+          y: "660",
           type: 3,
         },
+
         {
-          name: "#20",
-          x: "590",
-          y: "275",
+          name: "#11",
+          x: "900",
+          y: "700",
           type: 3,
         },
+
+        {
+          name: "升压站",
+          x: "880",
+          y: "625",
+        },
+
         {
-          name: "#23",
-          x: "440",
-          y: "90",
+          name: "#41",
+          x: "865",
+          y: "500",
           type: 3,
         },
+
         {
-          name: "#21",
-          x: "425",
-          y: "255",
+          name: "#2",
+          x: "835",
+          y: "785",
           type: 3,
         },
+
         {
-          name: "#22",
-          x: "365",
-          y: "155",
+          name: "#26",
+          x: "800",
+          y: "590",
           type: 3,
         },
+
         {
-          name: "#25",
-          x: "175",
-          y: "190",
+          name: "#28",
+          x: "790",
+          y: "525",
           type: 3,
         },
+
         {
-          name: "#24",
-          x: "45",
-          y: "190",
+          name: "#1",
+          x: "770",
+          y: "700",
+          type: 3,
+        },
+
+        {
+          name: "#29",
+          x: "745",
+          y: "410",
+          type: 3,
+        },
+
+        {
+          name: "#27",
+          x: "700",
+          y: "570",
+          type: 3,
+        },
+
+        {
+          name: "#3",
+          x: "600",
+          y: "815",
+          type: 3,
+        },
+
+        {
+          name: "#4",
+          x: "510",
+          y: "815",
+          type: 3,
+        },
+
+        {
+          name: "#7",
+          x: "435",
+          y: "525",
+          type: 3,
+        },
+
+        {
+          name: "#5",
+          x: "420",
+          y: "725",
+          type: 3,
+        },
+
+        {
+          name: "#6",
+          x: "270",
+          y: "720",
           type: 3,
         },
       ],

src/views/stateMonitor/factoryMonitor/windPowerPlant/geomorphologicMap/components/djy-map2.vue

@@ -1,647 +0,0 @@
-<template>
-  <div class="svg-map">
-    <svg
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      x="0px"
-      y="0px"
-      viewBox="0 0 1955 940"
-      :style="
-        'enable-background: new 0 0 866 359; left: ' +
-        svgLeft +
-        '; top: ' +
-        svgTop +
-        ';'
-      "
-      xml:space="preserve"
-      :width="svgWidth"
-      :height="svgHeight"
-    >
-      <defs>
-        <g id="nx-map-line">
-          <line
-            class="nx-map-line"
-            x1="25"
-            y1="25"
-            x2="25"
-            y2="80"
-            stroke="#edbf03"
-            stroke-width="1"
-          />
-          <circle
-            class="nx-map-up-circle"
-            cx="25"
-            cy="25"
-            r="2"
-            fill="#edbf03"
-          />
-        </g>
-        <g id="nx-map-circle">
-          <circle
-            class="nx-map-down-circle-1"
-            cx="25"
-            cy="80"
-            r="3"
-            fill="#edbf03"
-          />
-          <circle
-            class="nx-map-down-circle-2"
-            :class="{ 'nx-map-down-circle-loop': c1 }"
-            cx="25"
-            cy="80"
-            r="9"
-            stroke="#edbf03"
-            stroke-width="1"
-            fill="none"
-          />
-          <circle
-            class="nx-map-down-circle-3"
-            :class="{ 'nx-map-down-circle-loop': c2 }"
-            cx="25"
-            cy="80"
-            r="16"
-            opacity="0.6"
-            stroke="#edbf03"
-            stroke-width="1"
-            fill="none"
-          />
-        </g>
-      </defs>
-      <g>
-        <image
-          style="overflow: visible"
-          width="2050"
-          height="1110"
-          class="map-base"
-          xlink:href="./img/dmt_djy2.png"
-          transform="matrix(1 0 0 1 0 -100)"
-        ></image>
-        <g
-          class="item-label-hover"
-          v-for="(item, index) in dataList"
-          :key="index"
-        >
-          <svg
-            data-v-28794fe1=""
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
-            xmlns:xlink="http://www.w3.org/1999/xlink"
-            :x="String(Number(item.x) - 45)"
-            :y="String(Number(item.y) - 60)"
-            width="150"
-            height="150"
-            viewBox="0 0 220 392"
-            enable-background="new 0 0 220 392"
-            xml:space="preserve"
-            class="windmill"
-          >
-            <image
-              v-if="item.name != '升压站'"
-              data-v-28794fe1=""
-              width="147"
-              height="345"
-              x="58"
-              y="78"
-              xlink:href="@/assets/map/fan/yz.png"
-              class="pillar"
-            ></image>
-            <!-- 运行 -->
-            <image
-              v-if="item.type === 2 || item.type === 3"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_green.png"
-              class="turnCircle"
-            ></image>
-            <!-- 受累 -->
-            <image
-              v-if="item.type === 10 || item.type === 11"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_white.png"
-            ></image>
-            <!-- 限电 -->
-            <image
-              v-if="item.type === 8 || item.type === 9"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_purple.png"
-              class="turnCircle-slow"
-            ></image>
-            <!-- 离线 -->
-            <image
-              v-if="item.type === 12 || item.type === 13"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_black.png"
-            ></image>
-            <!-- 待机 -->
-            <image
-              v-if="item.type === 0 || item.type === 1"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_blue.png"
-            ></image>
-            <!-- 故障 -->
-            <image
-              v-if="item.type === 4 || item.type === 5"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_red.png"
-            ></image>
-            <!-- 检修 -->
-            <image
-              v-if="item.type === 6 || item.type === 7"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/map/fan/yp_orange.png"
-            ></image>
-            <!-- 升压站 -->
-            <image
-              v-if="item.name == '升压站'"
-              data-v-28794fe1=""
-              width="200"
-              height="460"
-              xlink:href="@/assets/png/booster-station.png"
-            ></image>
-          </svg>
-
-          <text
-            v-if="item.name != '升压站'"
-            class="mapKey"
-            :x="Number(item.x) + 25"
-            :y="Number(item.y) + 90"
-            fill="#ffffff"
-            font-size="14"
-          >
-            {{ item.name }}
-          </text>
-          <text
-            v-else
-            class="mapKey"
-            :x="Number(item.x) + 10"
-            :y="Number(item.y) + 80"
-            fill="#ffffff"
-            font-size="14"
-          >
-            {{ item.name }}
-          </text>
-          <g class="isshow" v-if="item.name != '升压站'">
-            <rect
-              :x="Number(item.x) + 55"
-              :y="Number(item.y) + 20"
-              width="90"
-              height="50"
-              stroke="#46C55A35"
-              fill="#000000"
-              opacity="0.8"
-            />
-            <text
-              :x="Number(item.x) + 60"
-              :y="Number(item.y) + 40"
-              fill="#ffffff"
-              font-size="14"
-            >
-              {{ item.fs }}m/s
-            </text>
-            <text
-              :x="Number(item.x) + 60"
-              :y="Number(item.y) + 60"
-              fill="#ffffff"
-              font-size="14"
-            >
-              {{ item.gl }}kW
-            </text>
-          </g>
-        </g>
-      </g>
-      <g>
-        <svg
-          :x="-20"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_green.png"
-          ></image>
-        </svg>
-        <text :x="43" :y="920" fill="#ffffff" font-size="14">运行</text>
-        <svg
-          :x="40"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_white.png"
-          ></image>
-        </svg>
-        <text :x="107" :y="920" fill="#ffffff" font-size="14">受累</text>
-        <svg
-          :x="100"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_purple.png"
-          ></image>
-        </svg>
-        <text :x="165" :y="920" fill="#ffffff" font-size="14">限电</text>
-        <svg
-          :x="160"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_black.png"
-          ></image>
-        </svg>
-        <text :x="229" :y="920" fill="#ffffff" font-size="14">离线</text>
-        <svg
-          :x="220"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_blue.png"
-          ></image>
-        </svg>
-        <text :x="288" :y="920" fill="#ffffff" font-size="14">待机</text>
-        <svg
-          :x="280"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_red.png"
-          ></image>
-        </svg>
-        <text :x="347" :y="920" fill="#ffffff" font-size="14">故障</text>
-        <svg
-          :x="340"
-          :y="770"
-          data-v-28794fe1=""
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          width="150"
-          height="150"
-          viewBox="0 0 220 392"
-          enable-background="new 0 0 220 392"
-          xml:space="preserve"
-          class="windmill"
-        >
-          <image
-            data-v-28794fe1=""
-            width="147"
-            height="345"
-            x="58"
-            y="78"
-            xlink:href="@/assets/map/fan/yz.png"
-            class="pillar"
-          ></image>
-          <image
-            data-v-28794fe1=""
-            width="200"
-            height="460"
-            xlink:href="@/assets/map/fan/yp_orange.png"
-          ></image>
-        </svg>
-        <text :x="410" :y="920" fill="#ffffff" font-size="14">检修</text>
-      </g>
-    </svg>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    windturbineList: {
-      type: Array,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      dataList: [
-        {
-          name: "升压站",
-          x: "1015",
-          y: "325",
-        },
-        {
-          name: "#27",
-          x: "1740",
-          y: "800",
-          type: 3,
-        },
-        {
-          name: "#26",
-          x: "1720",
-          y: "680",
-          type: 3,
-        },
-        {
-          name: "#28",
-          x: "1615",
-          y: "720",
-          type: 3,
-        },
-        {
-          name: "#41",
-          x: "1535",
-          y: "660",
-          type: 3,
-        },
-        {
-          name: "#29",
-          x: "1430",
-          y: "870",
-          type: 3,
-        },
-        {
-          name: "#42",
-          x: "1245",
-          y: "535",
-          type: 3,
-        },
-        {
-          name: "#43",
-          x: "1225",
-          y: "420",
-          type: 3,
-        },
-        {
-          name: "#31",
-          x: "1170",
-          y: "320",
-          type: 3,
-        },
-        {
-          name: "#30",
-          x: "1130",
-          y: "265",
-          type: 3,
-        },
-        {
-          name: "#44",
-          x: "1075",
-          y: "375",
-          type: 3,
-        },
-        {
-          name: "#45",
-          x: "945",
-          y: "220",
-          type: 3,
-        },
-        {
-          name: "#46",
-          x: "890",
-          y: "290",
-          type: 3,
-        },
-        {
-          name: "#32",
-          x: "820",
-          y: "265",
-          type: 3,
-        },
-        {
-          name: "#47",
-          x: "755",
-          y: "375",
-          type: 3,
-        },
-        {
-          name: "#48",
-          x: "710",
-          y: "260",
-          type: 3,
-        },
-        {
-          name: "#33",
-          x: "695",
-          y: "140",
-          type: 3,
-        },
-        {
-          name: "#49",
-          x: "615",
-          y: "260",
-          type: 3,
-        },
-        {
-          name: "#34",
-          x: "570",
-          y: "110",
-          type: 3,
-        },
-        {
-          name: "#50",
-          x: "530",
-          y: "295",
-          type: 3,
-        },
-        {
-          name: "#35",
-          x: "455",
-          y: "105",
-          type: 3,
-        },
-        {
-          name: "#36",
-          x: "345",
-          y: "115",
-          type: 3,
-        },
-        {
-          name: "#37",
-          x: "295",
-          y: "80",
-          type: 3,
-        },
-        {
-          name: "#38",
-          x: "230",
-          y: "55",
-          type: 3,
-        },
-        {
-          name: "#39",
-          x: "225",
-          y: "0",
-          type: 3,
-        },
-        {
-          name: "#40",
-          x: "145",
-          y: "80",
-          type: 3,
-        },
-      ],
-      list: this.windturbineList || [],
-    };
-  },
-  created() {
-    this.$nextTick(() => {
-      this.getData();
-    });
-  },
-  methods: {
-    getData() {
-      this.dataList.forEach((item) => {
-        this.list.forEach((i, num) => {
-          if (item.name == i.wtname) {
-            item["fs"] = i.speed + " ";
-            item["gl"] = i.power + " ";
-            item["type"] = i.status;
-          }
-        });
-      });
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.item-label-hover:hover .isshow {
-  display: flex;
-}
-
-.isshow {
-  display: none;
-  color: #ffffff;
-}
-</style>

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

@@ -65,11 +65,7 @@
       :windturbineList="windturbineList"
       ref="maps"
     ></djyMap>
-    <djyMap2
-      v-if="project === 'SXJ_KGDL_DJYF02_EG'"
-      :windturbineList="windturbineList"
-      ref="maps"
-    ></djyMap2>
+
     <!-- 牛家岭 -->
     <njlMap
       v-if="project === 'SXJ_KGDL_NJLF01_EG'"
@@ -129,7 +125,6 @@ import ylzMap from "./components/ylz-map.vue";
 import ytyMap from "./components/yty-map.vue";
 import bhb3Map from "./components/bhb3-map.vue";
 import djyMap from "./components/djy-map.vue";
-import djyMap2 from "./components/djy-map2.vue";
 import njlMap from "./components/njl-map.vue";
 import njlMap2 from "./components/njl-map2.vue";
 import pdlMap from "./components/pdl-map.vue";
@@ -156,7 +151,7 @@ export default {
     ytyMap,
     bhb3Map,
     djyMap,
-    djyMap2,
+
     njlMap,
     njlMap2,
     pdlMap,

src/views/stateMonitor/factoryMonitor/windPowerPlant/windPower/components/windEchart.vue

@@ -198,10 +198,10 @@ export default {
       // 当日0点时间
       var timeStamp = [];
       let stamp = new Date(new Date().setHours(0, 0, 0, 0)).getTime();
-      for (let i = 0; i < 48; i++) {
+      for (let i = 0; i < 24; i++) {
         timeStamp.push(dayjs(stamp).format("MM-DD HH:mm"));
         this.emptyData.push("0");
-        stamp = parseInt(stamp) + 30 * 60 * 1000;
+        stamp = parseInt(stamp) + 60 * 60 * 1000;
       }
       timeStamp.push(dayjs(stamp).format("MM-DD") + "\xa0" + "24:00");
       this.emptyData.push("0");

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

@@ -601,7 +601,6 @@ export default {
         this.getSingleMatrix(true);
         this.getPowerStationAssets();
         this.getPoints();
-        this.getBarValuesFDL();
       } else {
         clearInterval(this.timer);
         clearInterval(this.time2);
@@ -642,6 +641,7 @@ export default {
             },
           ];
           if (flag) {
+            this.getBarValuesFDL();
             this.getLossValuesAnalyse(this.dates);
           }
         });
@@ -712,7 +712,12 @@ export default {
     getBarValuesFDL() {
       GetWpHisdata({ wpid: this.stationCode }).then(({ data }) => {
         let date = data.data.map((item) => item.recordDate);
-        let children = data.data.map((item) => item.rfdldb);
+        let children = data.data.map(
+          (item) =>
+            item.recordDate == dayjs().format("YYYY-MM-DD")
+              ? (this.wpInfos.rfdl || 0) * 10000
+              : item.rfdldb
+        );
         this.barList = [
           {
             name: "发电量",

src/views/stateMonitor/zhzb/zhzb.vue

@@ -38,7 +38,7 @@
           :key="index"
           :prop="item.uniformCode"
           sortable
-          align="center"
+          :align="index < 1 ? 'center' : 'right'"
           header-align="center"
           :resizable="true"
           :min-width="item.width"
@@ -321,31 +321,31 @@ export default {
           },
           {
             name: "日发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "RFDL",
             width: "150",
           },
           {
             name: "月发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "YFDL",
             width: "150",
           },
           {
             name: "年发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "NFDL",
             width: "150",
           },
           {
             name: "实时总功率",
-            valueUnit: null,
+            valueUnit: "MW",
             uniformCode: "SSZGL",
             width: "150",
           },
           {
             name: "实时平均光照度",
-            valueUnit: null,
+            valueUnit: "W/m²",
             uniformCode: "SSPJGZD",
             width: "150",
           },