数值列居右，描述列居左

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/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

@@ -149,7 +149,9 @@
           :align="
             item.code == 'description' ||
             item.code == 'expression' ||
-            item.code == 'name'
+            item.code == 'name' ||
+            item.code == 'modelId' ||
+            item.code == 'relatedPartsName'
               ? 'left'
               : 'center'
           "

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

@@ -104,7 +104,13 @@
             : state.tableHeader1"
           :key="item.code"
           :label="item.title"
-          :align="item.code == 'description' ? 'left' : 'center'"
+          :align="
+            item.code == 'description' ||
+            item.code == 'modelId' ||
+            item.code == 'componentsName'
+              ? 'left'
+              : 'center'
+          "
           :prop="item.code"
           show-overflow-tooltip
         >

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

@@ -67,11 +67,14 @@
         />
         <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/windturbine.vue

@@ -107,9 +107,21 @@
           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" prop="modelId">
+          <template #default="{ row }">
+            {{ row.modelId ? row.modelId : "--" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="报警类型" align="center" prop="alarmTypeName">
+          <template #default="{ row }">
+            {{ row.alarmTypeName ? row.alarmTypeName : "--" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="故障编码" align="center" prop="nemCode">
+          <template #default="{ row }">
+            {{ row.nemCode ? row.nemCode : "--" }}
+          </template>
+        </el-table-column>
         <el-table-column label="报警级别" align="center">
           <template #default="scope">{{
             levelIdConvert(scope.row.rank)
@@ -135,7 +147,11 @@
           align="center"
           min-width="50"
           prop="componentsName"
-        />
+        >
+          <template #default="{ row }">
+            {{ row.componentsName ? row.componentsName : "--" }}
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">

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/safe/components/safecomponent.vue

@@ -136,7 +136,7 @@
               <span
                 class="alertDescCursor"
                 @click="goToAlertDescPage(scope.row)"
-                >{{ scope.row.description }}</span
+                >{{ scope.row.description || "--" }}</span
               >
             </template>
           </el-table-column>
@@ -147,7 +147,7 @@
             show-overflow-tooltip
           >
             <template #default="{ row }">
-              {{ row.faultCause == "NULL" ? "" : row.faultCause }}
+              {{ row.faultCause == "NULL" ? "--" : row.faultCause }}
             </template>
           </el-table-column>
           <el-table-column
@@ -158,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

@@ -261,7 +261,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>
@@ -579,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;
 };

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

@@ -92,15 +92,16 @@
             width="120"
           />
           <el-table-column prop="name" label="名称" align="left" />
-          <el-table-column prop="value" label="值" width="120" align="center">
+          <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

@@ -207,7 +207,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>
@@ -250,9 +250,6 @@
                 <span v-else-if="item.code == 'ts'">
                   {{ formatTime(scope.row.ts) }}
                 </span>
-                <span v-else-if="item.code == 'endts'">
-                  {{ scope.row.endts > 0 ? formatTime(scope.row.endts) : "" }}
-                </span>
                 <span
                   :style="`color:${
                     scope.row.confirmed ? '#05bb4c' : 'var(--el-color-danger)'
@@ -263,7 +260,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>
@@ -614,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;
 };

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

@@ -125,7 +125,11 @@
         >
           <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>
@@ -255,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/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"

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/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"