소스 검색

修改经济运行模块表格样式

baiyanting 1 년 전
부모
커밋
77b6faaf59

+ 100 - 0
src/utills/constant.js

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

+ 6 - 5
src/views/economicsOperation/analyse/monthlyAnalysis/index.vue

@@ -68,7 +68,7 @@
     <div
       style="
         background: rgba(0, 0, 0, 0.4);
-        height: calc(100% - 76px);
+        height: calc(100% - 48px);
         padding-bottom: 15px;
       "
     >
@@ -127,6 +127,7 @@
     <el-dialog
       v-model="dialogVisible"
       width="70%"
+      top="40px"
       custom-class="modal"
       :close-on-click-modal="false"
     >
@@ -336,7 +337,7 @@ export default {
 
 <style lang="less">
 .monthMachine {
-  padding: 0 30px;
+  padding: 0 20px;
   height: 100%;
   .monthMachine_title {
     .leftContent {
@@ -379,8 +380,8 @@ export default {
     display: flex;
     flex-direction: row;
     align-items: center;
-    padding-top: 10px;
-    padding-bottom: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 
     .station {
       display: flex;
@@ -457,7 +458,7 @@ export default {
     }
   }
   .economicTable1 {
-    height: calc(100% - 32px);
+    height: calc(100% - 40px);
     .el-pagination {
       padding-top: 5px;
       display: flex;

+ 2 - 2
src/views/economicsOperation/analyse/standAloneAnalyse/historyDetail.vue

@@ -35,7 +35,7 @@
         <el-table-column
           align="center"
           :label="tabIndex === -1 ? '风机' : '逆变器'"
-          width="130"
+          width="80"
           fixed="left"
         >
           <template #default="{ row }">
@@ -46,7 +46,7 @@
           align="center"
           prop="recordDate"
           label="日期"
-          width="150"
+          width="120"
           fixed="left"
         >
           <template #default="scope">

+ 27 - 75
src/views/economicsOperation/analyse/standAloneAnalyse/index.vue

@@ -79,6 +79,21 @@
           style="width: 100%"
         >
           <el-table-column
+            align="center"
+            prop="wtcode"
+            :label="tabIndex == -1 ? '风机' : '逆变器'"
+            show-overflow-tooltip
+            sortable
+          >
+            <template #default="scope">
+              <span
+                @click="seachDetail(scope.row)"
+                style="cursor: pointer; color: #05bb4c"
+                >{{ scope.row.wtcode }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
             v-for="(item, index) in tabIndex === -1
               ? tableHeader
               : tableHeaderGf"
@@ -88,9 +103,9 @@
             :label="item.title"
             show-overflow-tooltip
             align="center"
-            :width="item.title === '操作' ? '200' : ''"
+            :width="item.title === '操作' ? '80' : '160'"
           >
-            <template #header="scope">
+            <!-- <template #header="scope">
               <div v-if="scope.column.label.indexOf('(') > 0">
                 <div>
                   {{
@@ -104,11 +119,8 @@
                 </div>
               </div>
               <div v-else>{{ scope.column.label }}</div>
-            </template>
+            </template> -->
             <template #default="scope" v-if="item.title === '操作'">
-              <span class="historyBtn" @click="seachDetail(scope.row)"
-                >详情</span
-              >
               <span class="historyBtn" @click="seachHistoryData(scope.row)"
                 >历史</span
               >
@@ -201,7 +213,7 @@ export default {
         { id: -2, name: "光伏" },
       ],
       tableHeader: [
-        { title: "风机", code: "wtcode" },
+        // { title: "风机", code: "wtcode" },
         { title: "型号", code: "modelId" },
         { title: "日排行榜", code: "dayTop" },
         { title: "日拟合优度(%)", code: "dayGoodness" },
@@ -229,7 +241,7 @@ export default {
         { title: "操作" },
       ],
       page: {
-        pagesize: 21,
+        pagesize: 23,
         currentPage: 1,
         total: 0,
       },
@@ -402,7 +414,7 @@ export default {
 <style lang="less">
 .singleMachine {
   height: 100%;
-  padding: 0 30px;
+  padding: 0 20px;
 
   .singleMachine_title {
     .leftContent {
@@ -427,18 +439,10 @@ export default {
     .floatRight {
       float: right;
     }
-
-    .rightContent {
-      width: 212px;
-      height: 28px;
-      margin-top: 13px;
-      background: url("../../../../assets/imgs/title_right_bg.png");
-    }
   }
   .singleMachine_content {
     background: rgba(0, 0, 0, 0.45);
-    height: calc(100% - 58px);
-    padding-bottom: 20px;
+    height: calc(100% - 48px);
   }
   .clearfix::after {
     content: "";
@@ -457,8 +461,8 @@ export default {
     display: flex;
     flex-direction: row;
     align-items: center;
-    padding-top: 10px;
-    margin-bottom: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 
     .station {
       display: flex;
@@ -538,36 +542,6 @@ export default {
 
   .economicTable1 {
     height: calc(100% - 42px);
-    // .el-table--mini {
-    //   margin: 5px;
-    //   .el-table__header-wrapper {
-    //     tr {
-    //       background: rgba(83, 89, 104, 0.3) !important;
-    //       th {
-    //         vertical-align: top !important;
-    //       }
-    //       .cell {
-    //         color: #b3b3b3;
-    //         font-family: MicrosoftYaHei;
-    //         font-size: 14px;
-    //       }
-    //     }
-    //   }
-    //   .el-table__body-wrapper {
-    //     tr {
-    //       &:nth-child(2n) {
-    //         background: rgba(83, 89, 104, 0.05) !important;
-    //       }
-    //       .cell {
-    //         color: #d8d8d9;
-    //         font-family: ArialMT;
-    //         font-size: 13px;
-    //         height: 25px !important;
-    //       }
-    //     }
-    //   }
-    // }
-
     .el-table__fixed,
     .el-table__fixed-right {
       background: rgba(0, 0, 0, 1);
@@ -586,35 +560,13 @@ export default {
     .el-pagination {
       display: flex;
       justify-content: flex-end;
-      margin-right: 40px;
-      margin-top: 20px;
-
-      //   .btn-prev,
-      //   .btn-next,
-      //   .btn-quickprev,
-      //   .btn-quicknext,
-      //   .el-pager,
-      //   .number {
-      //     background: rgba(58, 63, 75, 0.4);
-      //     color: #fff;
-      //     border-radius: 2px;
-      //   }
-
-      //   .el-pager .active {
-      //     background: #05bb4c;
-      //     color: #fff;
-      //     border-radius: 2px;
-      //   }
+    padding-top: 5px;
 
+  
       .el-pagination__total,
       .el-pagination__jump {
         color: #fff;
-        // .el-input__inner {
-        //   background: rgba(58, 63, 75, 0.2);
-        //   border: 1px solid #3e4349;
-        //   color: #fff;
-        //   border-radius: 2px;
-        // }
+ 
       }
     }
 

+ 33 - 376
src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -117,7 +117,7 @@
           :data="tableData"
           ref="multipleTable"
           size="mini"
-          height="calc(100% - 40px)"
+          height="calc(100% - 39px)"
           :cell-style="{ padding: '6px' }"
           :row-style="{ height: '0' }"
           stripe
@@ -132,247 +132,24 @@
             label="名称"
             sortable
           >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="zhpm"
-            label="综合排名"
-            width="80"
-            sortable
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdlpm"
-            label="发电量排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdl"
-            label="发电量"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdlpm"
-            label="故障损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdl"
-            label="故障损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdlpm"
-            label="检修损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdl"
-            label="检修损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdlpm"
-            label="性能损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdl"
-            label="性能损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdlpm"
-            label="限电损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdl"
-            label="限电损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdlpm"
-            label="受累损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdl"
-            label="受累损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlylpm"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlyl"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzsslpm"
-            label="故障损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssl"
-            label="故障损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxsslpm"
-            label="检修损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssl"
-            label="检修损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qflpm"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qfl"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnsslpm"
-            label="性能损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssl"
-            label="性能损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slsslpm"
-            label="受累损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssl"
-            label="受累损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop=""
-            label="操作"
-            width="70"
-          >
             <template v-slot="scope">
               <span
                 @click="goDetail(scope.row)"
                 style="cursor: pointer; color: #05bb4c"
-                >详情</span
+                >{{ scope.row.name }}</span
               >
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.name.length == 4 ? 55 : 68"
+            show-overflow-tooltip
+            sortable
+          />
         </el-table>
         <div class="pagination-class">
           <el-pagination
@@ -416,10 +193,7 @@
         ></BarCharts>
       </div>
     </div>
-    <div
-      v-if="displayDetail"
-      style="height: calc(100% - 43px - 35px); padding-bottom: 10px"
-    >
+    <div v-if="displayDetail" style="height: calc(100% - 48px - 35px)">
       <el-table
         :data="detailTable"
         ref="multipleTable"
@@ -437,146 +211,21 @@
           prop="name"
           label="风机名称"
           show-overflow-tooltip
-          width="150"
           sortable
         >
         </el-table-column>
         <el-table-column
-          align="center"
+          v-for="item in tabIndex == -1
+            ? tableHeaderDetail
+            : tableHeaderGDetail"
+          :key="item.code"
+          :prop="item.code"
+          :label="item.name"
+          :width="item.name.length == 4 ? 58 : 88"
           show-overflow-tooltip
-          prop="zhpm"
-          label="综合排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          show-overflow-tooltip
-          prop="gzssdl"
-          label="故障损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="jxssdl" label="检修损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xnssdl" label="性能损失" sortable>
-        </el-table-column>
-        <el-table-column
           align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xdssdl" label="限电损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          show-overflow-tooltip
           sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="slssdl" label="受累损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qflpm"
-          show-overflow-tooltip
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qfl"
-          show-overflow-tooltip
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
-          show-overflow-tooltip
-          sortable
-        >
-        </el-table-column>
+        />
       </el-table>
       <div class="pagination-class">
         <el-pagination
@@ -621,6 +270,12 @@
 
 <script>
 import dayjs from "dayjs";
+import {
+  tableHeader,
+  tableHeaderG,
+  tableHeaderDetail,
+  tableHeaderGDetail,
+} from "@/utills//constant.js";
 import { companys } from "@/api/curveAnalyse";
 import { getStation, cjdb, details } from "@/api/performance";
 import PieChart from "../../homePage/components/pieChart.vue";
@@ -635,8 +290,12 @@ export default {
   },
   data() {
     return {
+      tableHeader,
+      tableHeaderG,
+      tableHeaderDetail,
+      tableHeaderGDetail,
       page: {
-        pagesize: 9,
+        pagesize: 10,
         currentPage: 1,
         total: 0,
       },
@@ -1054,7 +713,7 @@ export default {
   height: 100%;
   width: 100%;
   padding: 0 30px;
-  padding-bottom: 10px;
+  padding-bottom: 14px;
 }
 
 .form-wrapper {
@@ -1163,7 +822,6 @@ export default {
   width: 100%;
   height: calc(100% - 350px - 43px - 20px);
   background-color: rgba(0, 0, 0, 0.45);
-  padding-bottom: 20px;
   border-radius: 5px;
 }
 .economicTable {
@@ -1176,7 +834,6 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding-bottom: 5px;
 
   .leftContent {
     width: 242px;

+ 38 - 352
src/views/economicsOperation/benchmarkingManagement/loseRate/index.vue

@@ -164,251 +164,33 @@
           stripe
           @selection-change="handleCurrentChange"
         >
-          <el-table-column type="selection" width="60" align="center">
+          <el-table-column type="selection" width="58" align="center">
           </el-table-column>
           <el-table-column
             align="center"
             prop="name"
             label="名称"
             show-overflow-tooltip
-            width="150"
             sortable
           >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="zhpm"
-            label="综合排名"
-            show-overflow-tooltip
-            width="80"
-            sortable
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fdlpm"
-            label="发电量排名"
-            show-overflow-tooltip
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fdl"
-            label="发电量"
-            show-overflow-tooltip
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="gzssdlpm"
-            show-overflow-tooltip
-            label="故障损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="gzssdl"
-            label="故障损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxssdlpm"
-            show-overflow-tooltip
-            label="检修损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxssdl"
-            show-overflow-tooltip
-            label="检修损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnssdlpm"
-            show-overflow-tooltip
-            label="性能损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnssdl"
-            show-overflow-tooltip
-            label="性能损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xdssdlpm"
-            show-overflow-tooltip
-            label="限电损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xdssdl"
-            show-overflow-tooltip
-            label="限电损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="slssdlpm"
-            label="受累损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="slssdl"
-            show-overflow-tooltip
-            label="受累损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fnlylpm"
-            show-overflow-tooltip
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="fnlyl"
-            show-overflow-tooltip
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="gzsslpm"
-            show-overflow-tooltip
-            label="故障损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="gzssl"
-            show-overflow-tooltip
-            label="故障损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxsslpm"
-            show-overflow-tooltip
-            label="检修损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxssl"
-            show-overflow-tooltip
-            label="检修损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="qflpm"
-            show-overflow-tooltip
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="qfl"
-            show-overflow-tooltip
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnsslpm"
-            show-overflow-tooltip
-            label="性能损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnssl"
-            show-overflow-tooltip
-            label="性能损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="slsslpm"
-            show-overflow-tooltip
-            label="受累损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="slssl"
-            label="受累损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="" label="操作">
-            <template v-slot="scope">
+            <template #default="scope">
               <span
                 @click="goDetail(scope.row)"
                 style="cursor: pointer; color: #05bb4c"
-                >详情</span
+                >{{ scope.row.name }}</span
               >
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.name.length == 4 ? 55 : 68"
+            show-overflow-tooltip
+            sortable
+          />
         </el-table>
       </div>
     </div>
@@ -458,124 +240,20 @@
       >
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="name"
-          label="风机名称"
-          width="150"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="zhpm" label="综合排名" sortable>
-        </el-table-column>
-        <el-table-column align="center" prop="gzssdl" label="故障损失" sortable>
+        <el-table-column align="center" prop="name" label="风机名称" sortable>
         </el-table-column>
         <el-table-column
+          v-for="item in tabIndex == -1
+            ? tableHeaderDetail
+            : tableHeaderGDetail"
+          :key="item.code"
+          :prop="item.code"
+          :label="item.name"
           align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
+          :width="item.name.length == 4 ? 58 : 88"
+          show-overflow-tooltip
           sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="jxssdl" label="检修损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xnssdl" label="性能损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xdssdl" label="限电损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="slssdl" label="受累损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qflpm"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qfl"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
-          sortable
-        >
-        </el-table-column>
+        />
       </el-table>
       <div class="pagination-class">
         <el-pagination
@@ -620,6 +298,12 @@
 
 <script>
 import dayjs from "dayjs";
+import {
+  tableHeader,
+  tableHeaderG,
+  tableHeaderDetail,
+  tableHeaderGDetail,
+} from "@/utills//constant.js";
 import { companys } from "@/api/curveAnalyse";
 import {
   getStation,
@@ -632,7 +316,7 @@ import PieChart from "../../homePage/components/pieChart.vue";
 import BarCharts from "../../homePage/components/barCharts.vue";
 import dayinfo from "../compontent/dayinfo.vue";
 export default {
-  name: "intervalBenchmarking", //场际对标
+  name: "lostRate", //场际对标
   components: {
     PieChart,
     BarCharts,
@@ -640,6 +324,10 @@ export default {
   },
   data() {
     return {
+      tableHeader,
+      tableHeaderG,
+      tableHeaderDetail,
+      tableHeaderGDetail,
       company: "",
       companyOptions: [],
       stationObj: [],
@@ -672,7 +360,7 @@ export default {
       analyisDialog: [],
       detailRow: {},
       pageD: {
-        pagesize: 24,
+        pagesize: 23,
         currentPage: 1,
         total: 0,
       },
@@ -1170,9 +858,9 @@ export default {
 
 .bodys {
   width: 100%;
-  height: calc(100% - 350px - 43px - 20px);
+  height: calc(100% - 345px - 43px - 20px);
   background-color: rgba(0, 0, 0, 0.45);
-  padding-bottom: 20px;
+  //   padding-bottom: 20px;
   border-radius: 5px;
 }
 
@@ -1182,8 +870,6 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding-bottom: 5px;
-
   .leftContent {
     width: 242px;
     height: 41px;
@@ -1208,7 +894,7 @@ export default {
 
 .echarts {
   width: 100%;
-  height: 350px;
+  height: 345px;
   display: flex;
   flex-direction: row;
   align-items: center;

+ 37 - 404
src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -144,256 +144,33 @@
           stripe
           @selection-change="handleCurrentChange"
         >
-          <el-table-column type="selection" width="60" align="center">
+          <el-table-column type="selection" width="58" align="center">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             align="center"
             prop="name"
             label="名称"
-            width="150"
             sortable
           >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="zhpm"
-            label="综合排名"
-            width="80"
-            sortable
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdlpm"
-            label="发电量排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdl"
-            label="发电量"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdlpm"
-            label="故障损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdl"
-            label="故障损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdlpm"
-            label="检修损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdl"
-            label="检修损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdlpm"
-            label="性能损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdl"
-            label="性能损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdlpm"
-            label="限电损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdl"
-            label="限电损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdlpm"
-            label="受累损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdl"
-            label="受累损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlylpm"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlyl"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzsslpm"
-            label="故障损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssl"
-            label="故障损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxsslpm"
-            label="检修损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssl"
-            label="检修损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qflpm"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qfl"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnsslpm"
-            label="性能损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssl"
-            label="性能损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slsslpm"
-            label="受累损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssl"
-            label="受累损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop=""
-            label="操作"
-          >
             <template v-slot="scope">
               <span
                 @click="goDetail(scope.row)"
                 style="cursor: pointer; color: #05bb4c"
-                >详情</span
+                >{{ scope.row.name }}</span
               >
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.name.length == 4 ? 55 : 68"
+            show-overflow-tooltip
+            sortable
+          />
         </el-table>
         <div class="pagination-class">
           <el-pagination
@@ -442,183 +219,34 @@
         :data="detailTable"
         ref="multipleTable"
         size="mini"
-       height="calc(100% - 35px)"
+        height="calc(100% - 35px)"
         :cell-style="{ padding: '0px' }"
         :row-style="{ height: '0' }"
         stripe
         @selection-change="handleCurrentChange"
       >
-        <el-table-column type="selection" width="60" align="center">
+        <el-table-column type="selection" width="58" align="center">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           align="center"
           prop="name"
           label="风机名称"
-          width="150"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="zhpm"
-          label="综合排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssdl"
-          label="故障损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdl"
-          label="检修损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdl"
-          label="性能损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdl"
-          label="限电损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdl"
-          label="受累损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qflpm"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qfl"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
           sortable
         >
         </el-table-column>
         <el-table-column
+          v-for="item in tabIndex == -1
+            ? tableHeaderDetail
+            : tableHeaderGDetail"
+          :key="item.code"
+          :prop="item.code"
+          :label="item.name"
+          :width="item.name.length == 4 ? 56 : 88"
           show-overflow-tooltip
           align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
           sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
-          sortable
-        >
-        </el-table-column>
+        />
       </el-table>
       <div class="pagination-class">
         <el-pagination
@@ -664,6 +292,12 @@
 
 <script>
 import dayjs from "dayjs";
+import {
+  tableHeader,
+  tableHeaderG,
+  tableHeaderDetail,
+  tableHeaderGDetail,
+} from "@/utills//constant.js";
 import { companys } from "@/api/curveAnalyse";
 import { getStation, getProject, xmdb, details } from "@/api/performance";
 import PieChart from "../../homePage/components/pieChart.vue";
@@ -678,8 +312,12 @@ export default {
   },
   data() {
     return {
+      tableHeader,
+      tableHeaderG,
+      tableHeaderDetail,
+      tableHeaderGDetail,
       page: {
-        pagesize: 10,
+        pagesize: 11,
         currentPage: 1,
         total: 0,
       },
@@ -734,13 +372,11 @@ export default {
     this.endTime = dayjs(new Date().getTime()).format("YYYY-MM-DD");
     this.initialization();
   },
-  mounted() {
-   
-  },
+  mounted() {},
   methods: {
     handlePageChange(val) {
       this.page.currentPage = val;
-      this.gerCndb();
+      this.getXmdb();
     },
     handlePageDChange(val) {
       this.pageD.currentPage = val;
@@ -1066,9 +702,7 @@ export default {
       this.analyisDialog = analyis;
     },
   },
-  watch: {
-    
-  },
+  watch: {},
 };
 </script>
 
@@ -1188,7 +822,7 @@ export default {
   width: 100%;
   height: calc(100% - 350px - 43px - 20px);
   background-color: rgba(0, 0, 0, 0.45);
-  padding-bottom: 20px;
+  //   padding-bottom: 20px;
   border-radius: 5px;
 }
 .economicTable {
@@ -1201,7 +835,6 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding-bottom: 5px;
   .leftContent {
     width: 242px;
     height: 41px;

+ 36 - 391
src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -123,16 +123,7 @@
           stripe
           @selection-change="handleCurrentChange"
         >
-          <el-table-column type="selection" width="60" align="center">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="zhpm"
-            show-overflow-tooltip
-            label="综合排名"
-            width="80"
-            sortable
-          >
+          <el-table-column type="selection" width="58" align="center">
           </el-table-column>
           <el-table-column
             align="center"
@@ -140,234 +131,26 @@
             prop="date"
             label="日期"
             sortable
-            width="100"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fdlpm"
-            label="发电量排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fdl"
-            label="发电量"
-            sortable
-            width="65"
           >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="gzssdlpm"
-            label="故障损失排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="gzssdl"
-            label="故障损失"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="jxssdlpm"
-            label="检修损失排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="jxssdl"
-            label="检修损失"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xnssdlpm"
-            label="性能损失排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xnssdl"
-            label="性能损失"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xdssdlpm"
-            label="限电损失排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="xdssdl"
-            label="限电损失"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="slssdlpm"
-            label="受累损失排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="slssdl"
-            label="受累损失"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fnlylpm"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="fnlyl"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            show-overflow-tooltip
-            prop="gzsslpm"
-            label="故障损失率排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="gzssl"
-            show-overflow-tooltip
-            label="故障损失率(%)"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxsslpm"
-            show-overflow-tooltip
-            label="检修损失率排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="jxssl"
-            show-overflow-tooltip
-            label="检修损失率(%)"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="qflpm"
-            show-overflow-tooltip
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="qfl"
-            show-overflow-tooltip
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnsslpm"
-            show-overflow-tooltip
-            label="性能损失率排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="xnssl"
-            show-overflow-tooltip
-            label="性能损失率(%)"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="slsslpm"
-            show-overflow-tooltip
-            label="受累损失率排名"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="slssl"
-            show-overflow-tooltip
-            label="受累损失率(%)"
-            sortable
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="" label="操作">
             <template v-slot="scope">
               <span
                 @click="goDetail(scope.row)"
                 style="cursor: pointer; color: #05bb4c"
-                >详情</span
+                >{{ scope.row.date }}</span
               >
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.name.length == 4 ? 55 : 69"
+            show-overflow-tooltip
+            sortable
+          >
+          </el-table-column>
         </el-table>
         <div class="pagination-class">
           <el-pagination
@@ -425,174 +208,26 @@
         stripe
         @selection-change="handleCurrentChange"
       >
-        <el-table-column type="selection" width="60" align="center">
+        <el-table-column type="selection" width="55" align="center">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           align="center"
           prop="name"
           label="风机名称"
-          width="150"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="zhpm"
-          label="综合排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssdl"
-          label="故障损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdl"
-          label="检修损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdl"
-          label="性能损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdl"
-          label="限电损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdl"
-          label="受累损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qflpm"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qfl"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
           sortable
         >
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+          v-for="item in tabIndex == -1
+            ? tableHeaderDetail
+            : tableHeaderGDetail"
+          :key="item.code"
+          :prop="item.code"
+          :label="item.name"
           align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
+          :width="item.name.length == 4 ? 57 : 88"
           show-overflow-tooltip
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
           sortable
         >
         </el-table-column>
@@ -928,6 +563,12 @@
 
 <script>
 import dayjs from "dayjs";
+import {
+  tableHeader,
+  tableHeaderG,
+  tableHeaderDetail,
+  tableHeaderGDetail,
+} from "@/utills//constant.js";
 import { companys } from "@/api/curveAnalyse";
 import { getStation, cndb, thb, details } from "@/api/performance";
 import PieChart from "../../homePage/components/pieChart.vue";
@@ -942,13 +583,17 @@ export default {
   },
   data() {
     return {
+      tableHeader,
+      tableHeaderG,
+      tableHeaderDetail,
+      tableHeaderGDetail,
       page: {
-        pagesize: 9,
+        pagesize: 11,
         currentPage: 1,
         total: 0,
       },
       pageD: {
-        pagesize: 19,
+        pagesize: 23,
         currentPage: 1,
         total: 0,
       },
@@ -1478,7 +1123,7 @@ export default {
   width: 100%;
   height: calc(100% - 350px - 43px - 20px);
   background-color: rgba(0, 0, 0, 0.45);
-  padding-bottom: 20px;
+  //   padding-bottom: 20px;
   border-radius: 5px;
 }
 .economicTable {
@@ -1491,7 +1136,7 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding-bottom: 5px;
+
   .leftContent {
     width: 242px;
     height: 41px;
@@ -1503,7 +1148,7 @@ export default {
       font-size: 16px;
       font-family: Microsoft YaHei;
       font-weight: 400;
-      color: #05BB4C;
+      color: #05bb4c;
       margin-left: 25px;
     }
   }

+ 33 - 392
src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -165,251 +165,33 @@
           stripe
           @selection-change="handleCurrentChange"
         >
-          <el-table-column type="selection" width="60" align="center">
+          <el-table-column type="selection" width="56" align="center">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             align="center"
             prop="name"
             label="名称"
-            width="150"
             sortable
           >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="zhpm"
-            label="综合排名"
-            width="80"
-            sortable
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdlpm"
-            label="发电量排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fdl"
-            label="发电量"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdlpm"
-            label="故障损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssdl"
-            label="故障损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdlpm"
-            label="检修损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssdl"
-            label="检修损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdlpm"
-            label="性能损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssdl"
-            label="性能损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdlpm"
-            label="限电损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xdssdl"
-            label="限电损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdlpm"
-            label="受累损失排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssdl"
-            label="受累损失"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlylpm"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="fnlyl"
-            :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzsslpm"
-            label="故障损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="gzssl"
-            label="故障损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxsslpm"
-            label="检修损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="jxssl"
-            label="检修损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qflpm"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="qfl"
-            :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnsslpm"
-            label="性能损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="xnssl"
-            label="性能损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slsslpm"
-            label="受累损失率排名"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            align="center"
-            prop="slssl"
-            label="受累损失率(%)"
-            sortable
-            width="63"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="" label="操作">
             <template v-slot="scope">
               <span
                 @click="goDetail(scope.row)"
                 style="cursor: pointer; color: #05bb4c"
-                >详情</span
+                >{{ scope.row.name }}</span
               >
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="item in tabIndex == -1 ? tableHeader : tableHeaderG"
+            :key="item.code"
+            :prop="item.code"
+            :label="item.name"
+            :width="item.name.length == 4 ? 55 : 67"
+            show-overflow-tooltip
+            sortable
+          />
         </el-table>
         <div class="pagination-class">
           <el-pagination
@@ -475,170 +257,21 @@
           align="center"
           prop="name"
           label="风机名称"
-          width="150"
           sortable
         >
         </el-table-column>
         <el-table-column
+          v-for="item in tabIndex == -1
+            ? tableHeaderDetail
+            : tableHeaderGDetail"
+          :key="item.code"
+          :prop="item.code"
+          :label="item.name"
+          :width="item.name.length == 4 ? 58 : 88"
           show-overflow-tooltip
           align="center"
-          prop="zhpm"
-          label="综合排名"
           sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssdl"
-          label="故障损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssdl"
-          label="检修损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssdl"
-          label="性能损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xdssdl"
-          label="限电损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssdl"
-          label="受累损失"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qflpm"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="qfl"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
-          sortable
-        >
-        </el-table-column>
+        />
       </el-table>
       <div class="pagination-class">
         <el-pagination
@@ -684,6 +317,12 @@
 
 <script>
 import dayjs from "dayjs";
+import {
+  tableHeader,
+  tableHeaderG,
+  tableHeaderDetail,
+  tableHeaderGDetail,
+} from "@/utills//constant.js";
 import { companys } from "@/api/curveAnalyse";
 import {
   getStation,
@@ -704,8 +343,12 @@ export default {
   },
   data() {
     return {
+      tableHeader,
+      tableHeaderG,
+      tableHeaderDetail,
+      tableHeaderGDetail,
       page: {
-        pagesize: 10,
+        pagesize: 11,
         currentPage: 1,
         total: 0,
       },
@@ -1268,7 +911,6 @@ export default {
   width: 100%;
   height: calc(100% - 350px - 43px - 20px);
   background-color: rgba(0, 0, 0, 0.45);
-  padding-bottom: 20px;
   border-radius: 5px;
 }
 .economicTable {
@@ -1281,7 +923,6 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding-bottom: 5px;
   .leftContent {
     width: 242px;
     height: 41px;
@@ -1293,7 +934,7 @@ export default {
       font-size: 16px;
       font-family: Microsoft YaHei;
       font-weight: 400;
-      color: #05BB4C;
+      color: #05bb4c;
       margin-left: 25px;
     }
   }
@@ -1302,7 +943,7 @@ export default {
     width: 212px;
     height: 28px;
     margin-top: 13px;
-    background: url("../../../../assets/imgs/title_right_bg.png");
+    background: url("~@/assets/imgs/title_right_bg.png");
   }
 }
 

+ 2 - 0
src/views/economicsOperation/efficiency/consumeEfficiency/index.vue

@@ -133,12 +133,14 @@ export default {
       });
     },
     getTableDate() {
+      this.BASE.showLoading();
       eliminatRate({
         companyId: this.company,
         beginDate: this.starTime,
         endDate: this.endTime,
       }).then(({ data: res }) => {
         if (res) {
+          this.BASE.closeLoading();
           this.tableData = res.data;
         }
       });

+ 3 - 3
src/views/economicsOperation/performanceAnalyse/performanceAssess/index.vue

@@ -299,7 +299,7 @@ export default {
       ],
       page: {
         currentPage: 1,
-        pagesize: 22,
+        pagesize: 21,
         total: 0,
       },
       historyTimer: "",
@@ -441,7 +441,7 @@ export default {
 
 <style lang="less">
 .comprehensiveEvaluation {
-  padding: 0 30px;
+  padding: 0 20px;
   height: 100%;
 
   .Evaluation_title {
@@ -594,7 +594,7 @@ export default {
     }
   }
   .economicTable1 {
-    height: calc(100% - 32px);
+    height: calc(100% - 40px);
     .el-table--mini {
       .el-table__header-wrapper {
         .el-checkbox {

+ 2 - 2
src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -93,7 +93,7 @@
             :label="val"
             v-for="(val, index) in tableHead"
             :key="index"
-            width="142"
+            width="140"
             sortable
           >
             <template v-slot="scope">
@@ -372,7 +372,7 @@ export default {
 
 <style lang="less" scoped>
 .parcel-box {
-  padding: 0 30px;
+  padding: 0 20px;
   box-sizing: border-box;
   height: 100%;
   .search {

+ 2 - 2
src/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis/index.vue

@@ -183,7 +183,7 @@
               <el-table-column
                 v-for="(item, index) in tableHeaderYear"
                 :key="index"
-                width="64"
+                width="63"
                 :prop="item.code"
                 :label="item.title"
                 align="center"
@@ -740,7 +740,7 @@ export default {
 
 <style lang="less">
 .comAnalysis {
-  padding: 0 30px;
+  padding: 0 20px;
   height: 100%;
 
   .comAnalysis_title {

+ 2 - 2
src/views/economicsOperation/thematicAnalysis/failure/index.vue

@@ -93,7 +93,7 @@
             :label="val"
             v-for="(val, index) in tableHead"
             :key="index"
-            width="144"
+            width="140"
             sortable
           >
             <template v-slot="scope">
@@ -457,7 +457,7 @@ export default {
 
 <style lang="less" scoped>
 .parcel-box {
-  padding: 0 30px;
+  padding: 0 20px;
   box-sizing: border-box;
   height: 100%;
   .search {

+ 2 - 2
src/views/economicsOperation/thematicAnalysis/windEnergy/index.vue

@@ -73,7 +73,7 @@
             :label="val"
             v-for="(val, index) in tableHead"
             :key="index"
-            width="144"
+            width="140"
             sortable
           >
             <template v-slot="scope">
@@ -323,7 +323,7 @@ export default {
 
 <style lang="less" scoped>
 .parcel-box {
-  padding: 0 30px;
+  padding: 0 20px;
   box-sizing: border-box;
   height: 100%;
   .search {