修改经济运行样式，修改安全监视样式

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

@@ -462,36 +462,36 @@ export default {
     .el-pagination {
       display: flex;
       justify-content: flex-end;
-      margin-right: 40px;
-      margin-top: 20px;
+    //   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;
-      }
+    //   .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;
-      }
+    //   .el-pager .active {
+    //     background: #05bb4c;
+    //     color: #fff;
+    //     border-radius: 2px;
+    //   }
 
-      .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;
-        }
-      }
+    //   .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;
+    //     }
+    //   }
     }
   }
   .el-overlay {

src/views/economicsOperation/analyse/standAloneAnalyse/historyDetail.vue

@@ -19,7 +19,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div> -->
+      </div> 
       <div class="station">
         场站：
         <el-select
@@ -55,7 +55,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div>-->
       <div class="stationsv">
         <span class="timeaa">时间：</span>
         <el-date-picker
@@ -114,32 +114,16 @@
           sortable
           :prop="item.code"
           :label="item.title"
+          show-overflow-tooltip
           align="center"
-          :width="item.title === '操作' ? '200' : ''"
+          
         >
           <template #header="scope">
-            <div v-if="scope.column.label.indexOf('(') > 0">
-              <div>
-                {{
-                  scope.column.label.slice(0, scope.column.label.indexOf("("))
-                }}
-              </div>
-              <div>
-                {{ scope.column.label.slice(scope.column.label.indexOf("(")) }}
-              </div>
-            </div>
-            <div v-else>{{ scope.column.label }}</div>
-          </template>
-          <template #default="scope" v-if="item.title === '操作'">
-            <!-- <span class="historyBtn" @click="seachDetail(scope.row)">详情</span> -->
-            <span class="historyBtn" @click="seachHistoryData(scope.row)"
-              >历史</span
-            >
+            <div>{{ scope.column.label }}</div>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="page.currentPage"
         :page-size="page.pagesize"
@@ -510,86 +494,85 @@ export default {
         width: 10%;
         color: #fff;
         position: relative;
-        top: -7px;
-      }
-    }
-  }
-  .historysingleMachine_Table {
-    padding: 5px;
-    padding-bottom: 10px;
-    background: rgba(0, 0, 0, 0.4);
-    .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;
-          }
-        }
       }
     }
   }
+  //   .historysingleMachine_Table {
+  //     padding: 5px;
+  //     padding-bottom: 10px;
+  //     background: rgba(0, 0, 0, 0.4);
+  //     .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-pagination {
-  display: flex;
-  justify-content: flex-end;
-  margin-right: 40px;
-  margin-top: 20px;
+// .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) !important;
-    color: #fff;
-    border-radius: 2px;
-  }
+//   .btn-prev,
+//   .btn-next,
+//   .btn-quickprev,
+//   .btn-quicknext,
+//   .el-pager,
+//   .number {
+//     background: rgba(58, 63, 75, 0.4) !important;
+//     color: #fff;
+//     border-radius: 2px;
+//   }
 
-  .el-pager .active {
-    background: #083c94;
-    color: #fff;
-    border-radius: 2px;
-  }
+//   .el-pager .active {
+//     background: #083c94;
+//     color: #fff;
+//     border-radius: 2px;
+//   }
 
-  .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;
-    }
-  }
-}
-.historyBtn {
-  background: #43516b;
-  border-radius: 15px;
-  margin-top: 5px;
-  border: 1px solid #43516b;
-  span {
-    color: #fff;
-  }
-}
+//   .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;
+//     }
+//   }
+// }
+// .historyBtn {
+//   background: #43516b;
+//   border-radius: 15px;
+//   margin-top: 5px;
+//   border: 1px solid #43516b;
+//   span {
+//     color: #fff;
+//   }
+// }
 </style>

src/views/economicsOperation/analyse/standAloneAnalyse/index.vue

@@ -45,7 +45,7 @@
       </div>
       <div class="station">
         时间：
-        <div >
+        <div>
           <el-date-picker
             v-model="pickerTimer"
             type="date"
@@ -70,7 +70,7 @@
         <div class="leftContent floatLeft"><span>单机性能分析</span></div>
         <div class="rightContent floatRight"></div>
       </div>
-      <div class="singleMachine_Table">
+      <div class="economicTable1">
         <el-table
           :data="singleMachineData"
           size="mini"
@@ -87,6 +87,7 @@
             sortable
             :prop="item.code"
             :label="item.title"
+            show-overflow-tooltip
             align="center"
             :width="item.title === '操作' ? '200' : ''"
           >
@@ -114,7 +115,6 @@
           </el-table-column>
         </el-table>
         <el-pagination
-          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pagesize"
@@ -535,77 +535,92 @@ export default {
     }
   }
 
-  .singleMachine_Table {
+  .economicTable1 {
     margin: 0 5px 5px 5px;
     padding-bottom: 10px;
-    .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--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);
+      border-left: 2px solid #000;
+      height: calc(100% - 15px) !important;
+    }
+
+    .el-table__fixed::before {
+      background-color: #2a2a2a;
     }
 
+    .el-table__fixed-right::before {
+      background-color: #2a2a2a;
+    }
+    
     .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;
-      }
+      //   .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: #083c94;
-        color: #fff;
-        border-radius: 2px;
-      }
+      //   .el-pager .active {
+      //     background: #05bb4c;
+      //     color: #fff;
+      //     border-radius: 2px;
+      //   }
 
       .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;
-        }
+        // .el-input__inner {
+        //   background: rgba(58, 63, 75, 0.2);
+        //   border: 1px solid #3e4349;
+        //   color: #fff;
+        //   border-radius: 2px;
+        // }
       }
     }
 
     .historyBtn {
       cursor: pointer;
-      color: #1c99ff;
+      color: #05bb4c;
       margin-right: 15px;
     }
   }

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

@@ -1,8 +1,8 @@
 <template>
   <div class="Evaluationinfo" v-if="!noData">
     <div class="chart-name">
-      <div class="point left"></div>
-      <div class="point right"></div>
+      <div class="point point-left"></div>
+      <div class="point point-right"></div>
     </div>
     <div class="header">
       <span class="herder-info" v-for="item of gridDatas" :key="item"
@@ -25,8 +25,8 @@
           </tr>
         </table>
         <div class="chart-namess">
-          <div class="point left"></div>
-          <div class="point right"></div>
+          <div class="point point-left"></div>
+          <div class="point point-right"></div>
         </div>
         <div class="chart-body">
           <normal-radar-chart :height="'500px'" :value="chartDatas" />
@@ -557,12 +557,11 @@ export default {
           height: 1px;
           background-color: #ffffff;
           position: absolute;
-          &.left {
+          &.point-left {
             left: 0;
           }
 
-          &.right {
-            top: 0;
+          &.point-right {
             right: 50%;
           }
 
@@ -595,12 +594,11 @@ export default {
       background-color: #ffffff;
       position: absolute;
 
-      &.left {
+      &.point-left {
         left: 0;
       }
 
-      &.right {
-        top: 0;
+      &.point-right {
         right: 1px;
       }
 

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

@@ -1,7 +1,7 @@
 <template>
   <div class="historycutInAndOut">
     <div class="historycutInAndOut_top">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="hiscompanyVal"
         placeholder="请选择"
@@ -42,7 +42,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
       <div class="stationsv">
         <span class="timeaa">时间</span>
         <el-date-picker
@@ -51,7 +51,7 @@
           range-separator="To"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          :size="size"
+          size="mini"
           format="YYYY/MM/DD"
           value-format="YYYY-MM-DD"
         />
@@ -101,7 +101,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="page.currentPage"
         :page-size="page.pagesize"
@@ -224,6 +223,7 @@ export default {
         beginDate: this.pickerTimer[0],
         endDate: this.pickerTimer[1],
         wpId: this.hisstationVal,
+        wtId: this.hiswindId,
       };
       const { data: datas } = await getApioutputSpeedhistorylist(params);
       this.historycutInAndOutData = datas.data.records;
@@ -367,7 +367,6 @@ export default {
         width: 10%;
         color: #fff;
         position: relative;
-        top: -7px;
       }
     }
   }

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

@@ -527,33 +527,33 @@ export default {
       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;
-      }
+      //   .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;
+      //   }
 
       .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;
-        }
+        //     .el-input__inner {
+        //       background: rgba(58, 63, 75, 0.2);
+        //       border: 1px solid #3e4349;
+        //       color: #fff;
+        //       border-radius: 2px;
+        //     }
       }
     }
 

src/views/economicsOperation/powerCurve/powerLinefitting/index.vue

@@ -348,6 +348,7 @@ export default {
           left: 40,
           right: 15,
           bottom: 24,
+          containLabel: true,
         },
         xAxis: [
           {
@@ -520,7 +521,7 @@ export default {
         &.active {
           background: fade(#05bb4c, 80);
           border: 1px solid #05bb4c;
-          color:#fff ;
+          color: #fff;
           cursor: pointer;
         }
       }

src/views/stateMonitor/Agc/Agc.vue

@@ -84,7 +84,7 @@ export default {
 
 <style lang="less" scoped>
 .agc {
-  height: calc(100vh - 7.222vh);
+  height: calc(100% - 32px - 35px);
   overflow: hidden;
   .btn-group-tabs {
     display: flex;

src/views/stateMonitor/DetailMatrix/detailMatrix.vue

@@ -117,8 +117,8 @@
           >
             <!-- wp -->
             <div class="matrix-title">
-              <!--svg + wpname -->
-              <div class="matrix-svg">
+              <!--svg + wpname @click="handleToggle(index)"-->
+              <div class="matrix-svg" >
                 <i
                   v-if="value.czlx == -1"
                   class="svg-icon svg-icon-sm svg-icon-green"
@@ -160,8 +160,8 @@
                 </div>
               </div>
             </div>
-            <!-- wt -->
-            <div class="matrix-list">
+            <!-- wt v-show="value['switch' + index]"-->
+            <div class="matrix-list" >
               <div
                 class="matrix-card"
                 style="cursor: pointer"
@@ -690,7 +690,9 @@ export default {
         .then((res) => {
           if (Object.values(res.data.data).length) {
             let sourceMap = res.data.data;
-
+            // sourceMap.powerVos.forEach((item, index) => {
+            //   item["switch" + index] = true;
+            // });
             this.sourceMap = sourceMap;
             if (this.fillFjzt) {
               this.handleClick(this.fillFjzt);
@@ -706,6 +708,11 @@ export default {
       this.fillFjzt = val;
       this.handleClickWind();
     },
+    // 点击开关闭场站设备
+    handleToggle(index) {
+    //   this.showMatrixList[index]["switch" + index] =
+    //     !this.showMatrixList[index]["switch" + index];
+    },
     // 状态切换改变数据
     handleClickWind() {
       this.loading = false;

src/views/stateMonitor/Status/Status.vue

@@ -96,7 +96,7 @@ export default {
 
 <style lang="less" scoped>
 .status {
-  height: calc(100vh - 7.222vh);
+  height: calc(100% - 32px - 35px);
   overflow: hidden;
   .el-col + .el-col {
     padding-left: 0;
@@ -111,48 +111,4 @@ export default {
   }
 }
 
-// .light-status {
-//   .simp_content {
-//     display: grid;
-//     justify-content: space-evenly;
-//     grid-template-columns: repeat(auto-fill, 352px);
-//     height: calc(100vh - 117px);
-//     overflow-y: auto;
-//     overflow-x: hidden;
-//   }
-//   .simp_ui {
-//     width: 353px;
-//     height: 229px;
-//     background: #fff;
-//     border-radius: 8px;
-//     margin-bottom: 11px;
-//     padding: 0 12px;
-//     li {
-//       display: flex;
-//       margin: 0 auto;
-//     }
-//   }
-// }
-// .dark-status {
-//   .simp_content {
-//     display: grid;
-//     justify-content: space-evenly;
-//     grid-template-columns: repeat(auto-fill, 352px);
-//     height: calc(100vh - 117px);
-//     overflow-y: auto;
-//     overflow-x: hidden;
-//   }
-//   .simp_ui {
-//     width: 353px;
-//     height: 229px;
-//     background: rgba(96, 103, 105, 0.2);
-//     border-radius: 8px;
-//     margin-bottom: 11px;
-//     padding: 0 12px;
-//     li {
-//       display: flex;
-//       margin: 0 auto;
-//     }
-//   }
-// }
 </style>

src/views/stateMonitor/factoryMonitor/components/headerButton.vue

@@ -292,14 +292,6 @@ export default {
       return this.allPowerStation.slice(start, end);
     },
   },
-  watch: {
-    type: {
-      handler(oldVal, newVal) {
-        console.log(oldVal, newVal);
-      },
-      immediate: true,
-    },
-  },
 };
 </script>
 <style lang="less" scoped>

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

@@ -350,7 +350,7 @@
             <div class="point point-right bottom"></div>
             <div>今日和昨日出力对比</div>
           </div>
-          <div v-if="showFlag" style="width: 100%">
+          <div v-if="showFlag" style="width: 100%; margin-top: 10px">
             <LineCharts
               class="charts-item"
               :list="contrastList"
@@ -695,8 +695,7 @@ export default {
       return this.weather.weather ? "width: 20%" : "display: none";
     },
   },
-  created() {
-  },
+  created() {},
   mounted() {
     if (document.getElementById("ifrId")) {
       const oIframe = document.getElementById("ifrId");