浏览代码

功能,样式修改

xujuanning 1 月之前
父节点
当前提交
861fec057f
共有 25 个文件被更改,包括 329 次插入157 次删除
  1. 3 3
      src/assets/styles/dialog.less
  2. 24 24
      src/components/chart/bar/list-bar-chart2.vue
  3. 7 4
      src/components/windDetail/index.vue
  4. 55 6
      src/nxfStyle.less
  5. 2 2
      src/views/IntegratedAlarm/safe/components/safecomponent.vue
  6. 8 4
      src/views/economicsOperation/homePage/components/barCharts.vue
  7. 3 3
      src/views/economicsOperation/homePage/components/normal-radar-chart.vue
  8. 2 1
      src/views/economicsOperation/homePage/components/pieChart.vue
  9. 40 29
      src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue
  10. 8 4
      src/views/economicsOperation/stationAnalyse/stationElectricAnalyse/components/line-bar-charts.vue
  11. 6 6
      src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/lineCharts.vue
  12. 5 5
      src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/radar-chart.vue
  13. 21 20
      src/views/economicsOperation/thematicAnalysis/MTBF/index.vue
  14. 8 4
      src/views/economicsOperation/thematicAnalysis/components/barCharts.vue
  15. 2 1
      src/views/economicsOperation/thematicAnalysis/failure/index.vue
  16. 2 1
      src/views/economicsOperation/thematicAnalysis/generation/index.vue
  17. 6 5
      src/views/economicsOperation/windAnalyse/monthlyAnalysis/reportDialog.vue
  18. 2 2
      src/views/economicsOperation/windAnalyse/performanceAssess/dayDetailInfo.vue
  19. 41 15
      src/views/economicsOperation/windAnalyse/powerCurve/components/current-scatter-chart.vue
  20. 9 3
      src/views/economicsOperation/windAnalyse/powerSearch/index.vue
  21. 3 3
      src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue
  22. 4 0
      src/views/rateAnalysis/components/chart.vue
  23. 6 0
      src/views/rateAnalysis/components/lineChart.vue
  24. 3 0
      src/views/rateAnalysis/components/scatterSingleChart.vue
  25. 59 12
      src/views/rateAnalysis/index.vue

+ 3 - 3
src/assets/styles/dialog.less

@@ -361,7 +361,7 @@
     }
 
     .el-tabs__item.is-active {
-        color: #05bb4c !important;
+        color: #67b9ff !important;
         background: linear-gradient(0deg,
                 rgb(0 199 80 / 80%),
                 rgb(0 199 80 / 20%),
@@ -817,7 +817,7 @@ background-color: rgba(30,90,163, .5);
     }
 
     .el-select-dropdown__item {
-        color: #b3b3b3 !important;
+        color: #f8f8ff !important;
         height: 36px !important;
         line-height: 36px !important;
         font-size: 12px !important;
@@ -858,7 +858,7 @@ background-color: rgba(30,90,163, .5);
         line-height: 28px !important;
         padding: 0 17px !important;
         margin-right: 30px;
-        color: #b3b3b3 !important;
+        color: #f8f8ff !important;
     }
 
     .el-tabs__nav-wrap {

+ 24 - 24
src/components/chart/bar/list-bar-chart2.vue

@@ -165,30 +165,30 @@
                             animationEasing: "elasticOut",
                         },
                         // 三角
-                        {
-                            type: "pictorialBar",
-                            symbolPosition: "end",
-                            animation: this.firstAnimation,
-                            data: [value.value],
-                            symbol: "triangle",
-                            symbolOffset: [0, -10],
-                            symbolSize: [5, 5],
-                            symbolRotate: 180,
-                            label: {
-                                show: false,
-                                position: "right"
-                            },
-                            itemStyle: {
-                                normal: {
-                                    borderWidth: 0,
-                                    color: function (params) {
-                                        return partten.getColor(currColor);
-                                    },
-                                    // shadowBlur: 2,
-                                    // shadowColor: "rgba(255, 255, 255, 0.80)",
-                                },
-                            },
-                        },
+                        // {
+                        //     type: "pictorialBar",
+                        //     symbolPosition: "end",
+                        //     animation: this.firstAnimation,
+                        //     data: [value.value],
+                        //     symbol: "triangle",
+                        //     symbolOffset: [0, -10],
+                        //     symbolSize: [5, 5],
+                        //     symbolRotate: 180,
+                        //     label: {
+                        //         show: false,
+                        //         position: "right"
+                        //     },
+                        //     itemStyle: {
+                        //         normal: {
+                        //             borderWidth: 0,
+                        //             color: function (params) {
+                        //                 return partten.getColor(currColor);
+                        //             },
+                        //             // shadowBlur: 2,
+                        //             // shadowColor: "rgba(255, 255, 255, 0.80)",
+                        //         },
+                        //     },
+                        // },
                         // 分隔
                         {
                             type: "pictorialBar",

+ 7 - 4
src/components/windDetail/index.vue

@@ -1318,7 +1318,8 @@ export default {
         height: 100%;
         display: flex;
         align-items: center;
-        color: #b3bdc0;
+        // color: #b3bdc0;
+        color: #f8f8ff;
         justify-content: center;
         // background: rgba(67, 81, 107, 0.2);
         background: rgba(96, 103, 105, 0.2);
@@ -1458,7 +1459,8 @@ export default {
         height: 100%;
         display: flex;
         align-items: center;
-        color: #b3bdc0;
+        // color: #b3bdc0;
+        color: #f8f8ff;
         justify-content: center;
         // background: rgba(67, 81, 107, 0.2);
         background: rgba(96, 103, 105, 0.2);
@@ -1637,7 +1639,8 @@ export default {
                 font-size: 14px;
                 font-family: Source Han Sans SC;
                 font-weight: 400;
-                color: #817c7c;
+                // color: #817c7c;
+                color: #f8f8ff;
                 margin-left: 5px;
                 width: 55px;
               }
@@ -1932,7 +1935,7 @@ export default {
   font-size: 14px;
   font-family: Microsoft YaHei;
   font-weight: 400;
-  color: #b3b3b3;
+  color: #f8f8ff;
   padding: 0 0px;
 
   .table-value,

+ 55 - 6
src/nxfStyle.less

@@ -4,6 +4,32 @@
     // background: #09172b;
     background: #1f2d5b;
 
+    .title,
+    .comAnalysis_top,
+    .powerLinefitting_top,
+    .cutInAndOutAnalysis_top,
+    .singleMachine_top,
+    .historysingleMachine_top,
+    .monthMachine_top,
+    .Evaluation_top {
+
+        .station,
+        .dates,
+        .timeaa {
+            color: #f8f8ff !important;
+        }
+    }
+
+    .el-form {
+        .el-form-item {
+            .el-form-item__label {
+                color: #f8f8ff;
+            }
+        }
+    }
+
+
+
     // /integratedAlarm/safe/realwarning 卡片
     .card {
         color: rgb(228, 236, 255);
@@ -138,6 +164,8 @@
     // /economicsOperation/windAnalyse/qxpclfx
     .query-items {
         .newspan {
+            color: #f8f8ff;
+
             &.active {
                 background: linear-gradient(to top, rgba(#67b9ff, 0.5), rgba(#67b9ff, 0));
 
@@ -154,6 +182,12 @@
                 }
             }
         }
+
+        .query-item {
+            .lable {
+                color: #f8f8ff;
+            }
+        }
     }
 
     .searchColor {
@@ -264,6 +298,10 @@
 
     // 部分页面顶部搜索条件框
     .form-wrapper {
+        .station {
+            color: #f8f8ff;
+        }
+
         .btns {
             .buttons {
                 color: #fff;
@@ -276,6 +314,14 @@
                 }
             }
         }
+
+        .search {
+            .search-item {
+                .lable {
+                    color: #f8f8ff !important;
+                }
+            }
+        }
     }
 
     // 左侧导航背景颜色
@@ -629,6 +675,11 @@
 
     // el-tabs 下划线错位修复
     .el-tabs .el-tabs__header {
+
+        .el-tabs__item {
+            color: #f8f8ff;
+        }
+
         .el-tabs__active-bar {
             display: none !important;
         }
@@ -646,12 +697,6 @@
         }
     }
 
-
-
-    .el-tabs .el-tabs__item {
-        color: #97a8ca;
-    }
-
     // 下拉菜单
     .dropdown .el-dropdown-menu {
         background: rgb(10, 23, 42);
@@ -697,6 +742,10 @@
 
     // 部分页面顶部搜索条件右侧按钮
     .search-wrapper {
+        .label {
+            color: #f8f8ff;
+        }
+
         .buttons {
             color: #fff;
             background-color: rgb(37, 112, 206);

+ 2 - 2
src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -25,7 +25,7 @@
       <el-table-column
         prop="tsName"
         label="时间"
-        width="150"
+        width="180"
         show-overflow-tooltip
         align="center"
       />
@@ -359,7 +359,7 @@ export default {
           let alarmList = [];
           this.alarmList = [];
           res.data.ls.forEach((ele) => {
-            ele.tsName = dayjs(ele.ts).format("MM-DD HH:mm:ss")
+            ele.tsName = dayjs(ele.ts).format("YYYY-MM-DD HH:mm:ss")
             alarmList.push(ele);
           });
           alarmList.sort((a, b) => {

+ 8 - 4
src/views/economicsOperation/homePage/components/barCharts.vue

@@ -131,13 +131,15 @@ export default {
             type: "value",
             name: value,
             nameTextStyle: {
-              color: "#a6c1dd",
+              // color: "#a6c1dd",
+              color: "#f8f8ff",
             },
             axisLabel: {
               formatter: "{value} ",
               fontSize: 12,
               textStyle: {
-                color: "#a6c1dd",
+                // color: "#a6c1dd",
+                color: "#f8f8ff",
               },
             },
             //分格线
@@ -263,7 +265,8 @@ export default {
           inactiveColor: partten.getColor("gray"),
           textStyle: {
             fontSize: 12,
-            color: partten.getColor("grayl"),
+            // color: partten.getColor("grayl"),
+            color: "#f8f8ff",
           },
         },
         grid: {
@@ -285,7 +288,8 @@ export default {
               interval: this.interval,
               fontSize: 12,
               textStyle: {
-                color: "#a6c1dd",
+                // color: "#a6c1dd",
+                color: "#f8f8ff",
               },
             },
           },

+ 3 - 3
src/views/economicsOperation/homePage/components/normal-radar-chart.vue

@@ -235,7 +235,7 @@ export default {
           backgroundColor: "rgba(0,0,0,0.4)",
           borderColor: "#606769",
           textStyle: {
-            color: "#fff",
+            color: "#f8f8ff",
             fontSize: util.vh(16),
           },
         },
@@ -245,7 +245,7 @@ export default {
           inactiveColor: "#606769",
           textStyle: {
             fontSize: 12,
-            color: "#B3BDC0",
+            color: "#f8f8ff",
           },
         },
         radar: [
@@ -257,7 +257,7 @@ export default {
             nameGap: "16",
             name: {
               textStyle: {
-                color: "#606769",
+                color: "#f8f8ff",
                 fontSize: 12,
               },
             },

+ 2 - 1
src/views/economicsOperation/homePage/components/pieChart.vue

@@ -157,7 +157,8 @@ export default {
           itemWidth: 8,
           itemHeight: 8,
           textStyle: {
-            color: partten.getColor("grayl"),
+            // color: partten.getColor("grayl"),
+            color: "#f8f8ff",
             fontSize: 12,
           },
           formatter(params) {

+ 40 - 29
src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -96,16 +96,8 @@
                     </p>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="value"
-                  label="测点值"
-                  align="center"
-                />
-                <el-table-column
-                  prop="jud"
-                  label="限值"
-                  align="center"
-                />
+                <el-table-column prop="value" label="测点值" align="center" />
+                <el-table-column prop="jud" label="限值" align="center" />
               </el-table>
             </el-tab-pane>
             <el-tab-pane
@@ -397,27 +389,46 @@ const funSubmit = (params) => {
 
         tsArr.push(dayjs(o.ts).format("YYYY-MM-DD HH:mm:ss"));
 
-        ygsdxz.push(ygsdxzValue > 0 ? Number(o.value).toFixed(2) : null);
-        sfyg.push(sfygValue > 0 ? Number(sfygValue).toFixed(2) : null);
-        llgl.push(llglValue > 0 ? Number(llglValue).toFixed(2) : null);
-        pcsx.push(pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : null);
-        pcxx.push(pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : null);
-        bzgl.push(bzglValue > 0 ? Number(bzglValue).toFixed(2) : null);
-        pjfs.push(pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : null);
+        // ygsdxz.push(ygsdxzValue > 0 ? Number(o.value).toFixed(2) : null);
+        // sfyg.push(sfygValue > 0 ? Number(sfygValue).toFixed(2) : null);
+        // llgl.push(llglValue > 0 ? Number(llglValue).toFixed(2) : null);
+        // pcsx.push(pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : null);
+        // pcxx.push(pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : null);
+        // bzgl.push(bzglValue > 0 ? Number(bzglValue).toFixed(2) : null);
+        // pjfs.push(pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : null);
+
+        ygsdxz.push(ygsdxzValue === 0 ? 0 : Number(o.value).toFixed(2));
+        sfyg.push(sfygValue === 0 ? 0 : Number(sfygValue).toFixed(2));
+        llgl.push(llglValue === 0 ? 0 : Number(llglValue).toFixed(2));
+        pcsx.push(pcsxValue === 0 ? 0 : Number(pcsxValue).toFixed(2));
+        pcxx.push(pcxxValue === 0 ? 0 : Number(pcxxValue).toFixed(2));
+        bzgl.push(bzglValue === 0 ? 0 : Number(bzglValue).toFixed(2));
+        pjfs.push(pjfsValue === 0 ? 0 : Number(pjfsValue).toFixed(2));
 
         tableArr.push({
           ts: dayjs(o.ts).format("YYYY-MM-DD HH:mm:ss"),
-          ygsdxz: ygsdxzValue > 0 ? Number(o.value).toFixed(2) : "",
-          sfyg: sfygValue > 0 ? Number(sfygValue).toFixed(2) : "",
-          llgl: llglValue > 0 ? Number(llglValue).toFixed(2) : "",
-          pcsx: pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : "",
-          pcxx: pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : "",
-          bzgl: bzglValue > 0 ? Number(bzglValue).toFixed(2) : "",
-          pjfs: pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : "",
+          // ygsdxz: ygsdxzValue > 0 ? Number(o.value).toFixed(2) : "",
+          // sfyg: sfygValue > 0 ? Number(sfygValue).toFixed(2) : "",
+          // llgl: llglValue > 0 ? Number(llglValue).toFixed(2) : "",
+          // pcsx: pcsxValue > 0 ? Number(pcsxValue).toFixed(2) : "",
+          // pcxx: pcxxValue > 0 ? Number(pcxxValue).toFixed(2) : "",
+          // bzgl: bzglValue > 0 ? Number(bzglValue).toFixed(2) : "",
+          // pjfs: pjfsValue > 0 ? Number(pjfsValue).toFixed(2) : "",
+          // cz:
+          //   ygsdxzValue > 0 && sfygValue > 0
+          //     ? (ygsdxzValue - sfygValue).toFixed(2)
+          //     : "",
+          ygsdxz: ygsdxzValue === 0 ? 0 : Number(o.value).toFixed(2),
+          sfyg: sfygValue === 0 ? 0 : Number(sfygValue).toFixed(2),
+          llgl: llglValue === 0 ? 0 : Number(llglValue).toFixed(2),
+          pcsx: pcsxValue === 0 ? 0 : Number(pcsxValue).toFixed(2),
+          pcxx: pcxxValue === 0 ? 0 : Number(pcxxValue).toFixed(2),
+          bzgl: bzglValue === 0 ? 0 : Number(bzglValue).toFixed(2),
+          pjfs: pjfsValue === 0 ? 0 : Number(pjfsValue).toFixed(2),
           cz:
-            ygsdxzValue > 0 && sfygValue > 0
-              ? (ygsdxzValue - sfygValue).toFixed(2)
-              : "",
+            ygsdxzValue - sfygValue === 0
+              ? 0
+              : (ygsdxzValue - sfygValue).toFixed(2),
         });
       });
       xAxisData.value = tableArr.map((o) => o.ts);
@@ -482,7 +493,7 @@ const funSubmit = (params) => {
           },
           large: true,
           color: "#41a273",
-          color:  nxfStyle("理论功率") || "red",
+          color: nxfStyle("理论功率") || "red",
         },
         {
           name: "偏差上限",
@@ -499,7 +510,7 @@ const funSubmit = (params) => {
           symbol: "none",
           large: true,
           // color: "rgb(77, 119, 255)",
-          color:  nxfStyle("偏差上限") || "red",
+          color: nxfStyle("偏差上限") || "red",
         },
         {
           name: "偏差下限",

+ 8 - 4
src/views/economicsOperation/stationAnalyse/stationElectricAnalyse/components/line-bar-charts.vue

@@ -137,7 +137,8 @@ export default {
           inactiveColor: partten.getColor("gray"),
           textStyle: {
             fontSize: 12,
-            color: partten.getColor("grayl"),
+            // color: partten.getColor("grayl"),
+            color: "#f8f8ff",
           },
         },
         grid: {
@@ -163,7 +164,8 @@ export default {
             axisLabel: {
               textStyle: {
                 fontSize: 14,
-                color: "#93989A",
+                // color: "#93989A",
+                color: "#f8f8ff",
               },
             },
           },
@@ -173,7 +175,8 @@ export default {
             type: "value",
             name: "单位:万千瓦时",
             nameTextStyle: {
-              color: "#93989A",
+              // color: "#93989A",
+              color: "#f8f8ff",
             },
             splitLine: {
               show: true,
@@ -185,7 +188,8 @@ export default {
             axisLabel: {
               textStyle: {
                 fontSize: 14,
-                color: "#93989A",
+                // color: "#93989A",
+                color: "#f8f8ff",
               },
             },
           },

+ 6 - 6
src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/lineCharts.vue

@@ -66,8 +66,8 @@ export default {
           trigger: "axis",
           textStyle: {
             fontSize: 16,
-            fontFamily: "楷体",
-            color: "white", //设置文字颜色
+            fontFamily: "ali",
+            color: "#f8f8ff", //设置文字颜色
             fontWeight: "400",
           },
           backgroundColor: "rgba(#2169c3, 0.35)",
@@ -102,7 +102,7 @@ export default {
 
           textStyle: {
             fontSize: "12",
-            color: "#A4A4A5",
+            color: "#f8f8ff",
           },
           orient: "vertical",
           icon: "roundRect",
@@ -117,7 +117,7 @@ export default {
           axisLabel: {
             textStyle: {
               fontSize: 14,
-              color: "#93989A",
+              color: "#f8f8ff",
             },
           },
           axisLine: {
@@ -132,7 +132,7 @@ export default {
         yAxis: {
           name: this.unit,
           nameTextStyle: {
-            color: "#93989A",
+            color: "#f8f8ff",
           },
           splitLine: {
             show: true,
@@ -144,7 +144,7 @@ export default {
           axisLabel: {
             textStyle: {
               fontSize: 14,
-              color: "#93989A",
+              color: "#f8f8ff",
             },
           },
           type: "value",

+ 5 - 5
src/views/economicsOperation/stationAnalyse/windAndPhotovoltaic/components/radar-chart.vue

@@ -109,7 +109,7 @@ export default {
           subtext: "风速风向频次玫瑰图",
           subtextStyle: {
             fontSize: 16,
-            color: "#93989A",
+            color: "#f8f8ff",
           },
           top: 10,
           left: "5%",
@@ -137,7 +137,7 @@ export default {
           ],
           axisLabel: {
             fontSize: 13,
-            color: "#93989A",
+            color: "#f8f8ff",
           },
           splitLine: {
             show: true,
@@ -146,7 +146,7 @@ export default {
         radiusAxis: {
           axisLabel: {
             fontSize: 13,
-            color: "#93989A",
+            color: "#f8f8ff",
           },
         },
         polar: {
@@ -234,7 +234,7 @@ export default {
           borderColor: "#2169c3",
           backgroundColor: "#2169c3",
           textStyle: {
-            color: "#fff", //设置文字颜色
+            color: "#f8f8ff", //设置文字颜色
           },
           formatter: (params) => {
             var mark = params.marker; //点
@@ -255,7 +255,7 @@ export default {
           itemHeight: 10,
           textStyle: {
             fontSize: 13,
-            color: "#93989A",
+            color: "#f8f8ff",
           },
           top: "middle",
           data: [

+ 21 - 20
src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -310,9 +310,9 @@ export default {
     // },
     // tab
     handleOpen(val, index) {
-        this.cur = index;
-        this.selectValue = val;
-        this.search();
+      this.cur = index;
+      this.selectValue = val;
+      this.search();
     },
     search() {
       this.BASE.showLoading();
@@ -378,7 +378,7 @@ export default {
       }
     },
     initialization() {
-    //   this.dataChange(dataJson.data.mtbfdata)
+      //   this.dataChange(dataJson.data.mtbfdata)
       companys().then(({ data: res }) => {
         if (res.data) {
           this.companyOptions = res.data;
@@ -403,20 +403,21 @@ export default {
     cursor: pointer;
     padding: 0 1vw;
     margin: 0 2px;
-    color: #9ca5a8;
+    // color: #9ca5a8;
+    color: #f8f8ff;
     transition: color 0.2s ease-in-out;
     position: relative;
-    }
-    .newspan:hover {
+  }
+  .newspan:hover {
     background: linear-gradient(
-        to top,
-        rgba(5, 187, 76, 0.5),
-        rgba(5, 187, 76, 0)
+      to top,
+      rgba(5, 187, 76, 0.5),
+      rgba(5, 187, 76, 0)
     );
     color: white;
     position: relative;
-    }
-    .newspan:hover::after {
+  }
+  .newspan:hover::after {
     content: "";
     position: absolute;
     width: 100%;
@@ -426,17 +427,17 @@ export default {
     left: 0;
     bottom: 0;
     box-sizing: border-box;
-    }
-    .active {
+  }
+  .active {
     background: linear-gradient(
-        to top,
-        rgba(5, 187, 76, 0.5),
-        rgba(5, 187, 76, 0)
+      to top,
+      rgba(5, 187, 76, 0.5),
+      rgba(5, 187, 76, 0)
     );
     color: white;
     position: relative;
-    }
-    .active::after {
+  }
+  .active::after {
     content: "";
     position: absolute;
     width: 100%;
@@ -446,7 +447,7 @@ export default {
     left: 0;
     bottom: 0;
     box-sizing: border-box;
-    }
+  }
   .search {
     display: flex;
     flex-direction: row;

+ 8 - 4
src/views/economicsOperation/thematicAnalysis/components/barCharts.vue

@@ -127,7 +127,8 @@ export default {
               formatter: "{value} ",
               fontSize: 12,
               textStyle: {
-                color: "#828484",
+                // color: "#828484",
+                color: "#f8f8ff",
               },
             },
             //分格线
@@ -198,7 +199,8 @@ export default {
         title: {
           text: this.pillarName,
           textStyle: {
-            color: "#999999",
+            // color: "#999999",
+            color: "#f8f8ff",
             fontSize: 18,
           },
         },
@@ -251,7 +253,8 @@ export default {
           inactiveColor: partten.getColor("gray"),
           textStyle: {
             fontSize: 12,
-            color: partten.getColor("grayl"),
+            // color: partten.getColor("grayl"),
+            color: "#f8f8ff",
           },
         },
         grid: {
@@ -273,7 +276,8 @@ export default {
               interval: this.interval,
               fontSize: 12,
               textStyle: {
-                color: "rgb(116,124,128)",
+                // color: "rgb(116,124,128)",
+                color: "f8f8ff",
               },
             },
           },

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

@@ -452,7 +452,8 @@ export default {
     cursor: pointer;
     padding: 0 1vw;
     margin: 0 2px;
-    color: #9ca5a8;
+    // color: #9ca5a8;
+    color: #f8f8ff;
     transition: color 0.2s ease-in-out;
     position: relative;
     }

+ 2 - 1
src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -481,7 +481,8 @@ export default {
     cursor: pointer;
     padding: 0 1vw;
     margin: 0 2px;
-    color: #9ca5a8;
+    // color: #9ca5a8;
+    color: #f8f8ff;
     transition: color 0.2s ease-in-out;
     position: relative;
     }

+ 6 - 5
src/views/economicsOperation/windAnalyse/monthlyAnalysis/reportDialog.vue

@@ -45,15 +45,16 @@
         }}小时、同比{{ tableVal.tqzb && (tableVal.tqzb.lyxs || 0) }}小时,
         设备可利用率{{ tableVal.byzb && (tableVal.byzb.sbklyl || 0) }}%、同比{{
           tableVal.tqzb && (tableVal.tqzb.sbklyl || 0)
-        }}%, 等效可用系数{{
+        }}%, 
+        <!-- 等效可用系数{{
           tableVal.byzb && (tableVal.byzb.dxklyxs || 0)
-        }}%、同比{{ tableVal.tqzb && (tableVal.tqzb.dxklyxs || 0) }}%,
+        }}%、同比{{ tableVal.tqzb && (tableVal.tqzb.dxklyxs || 0) }}%, -->
         静风频率达到{{ tableVal.byzb && (tableVal.byzb.jfpl || 0) }}%、同比{{
           tableVal.tqzb && (tableVal.tqzb.jfpl || 0)
-        }}%
-        <!-- 机组功率特性一致性系数达到{{
+        }}%
+        机组功率特性一致性系数达到{{
           tableVal.byzb && (tableVal.byzb.glyzxxs || 0)
-        }}%、同比{{ tableVal.tqzb && (tableVal.tqzb.glyzxxs || 0) }}%。 -->
+        }}%、同比{{ tableVal.tqzb && (tableVal.tqzb.glyzxxs || 0) }}%。
       </div>
       <div class="textIndent">
         2.{{ rowData?.windPowerStationName }}{{ dialogTitle }}风机{{

+ 2 - 2
src/views/economicsOperation/windAnalyse/performanceAssess/dayDetailInfo.vue

@@ -497,7 +497,7 @@ export default {
     font-family: MicrosoftYaHei;
     .herder-info {
       flex: 1 0 25%;
-      color: #a5a3a3;
+      color: #fff;
       font-family: MicrosoftYaHei;
       text-align: center;
       font-size: 14px;
@@ -543,7 +543,7 @@ export default {
           }
         }
         .white {
-          color: #b3b3b3;
+          color: #c2e1ff;
           font-size: 14px;
           font-family: MicrosoftYaHei;
         }

+ 41 - 15
src/views/economicsOperation/windAnalyse/powerCurve/components/current-scatter-chart.vue

@@ -67,7 +67,13 @@ export default {
       id: "",
       chart: null,
       color: [
-        "#2999a0", "#67b9ff", "#ff6271", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae"
+        "#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05b2fa",
+        "#0ef167",
+        "#05bb4c",
+        "#4b55ae",
       ],
       theme: "dark",
     };
@@ -119,15 +125,21 @@ export default {
         //     : "rgba(255,255,255,0.5)",
         //工具箱
         color: [
-        //   "#3D54BE",
-        //   "rgb(255,0,0)",
-        //   "#a1a1a1",
-        //   "#0098d9",
-        //   "#FF8700",
-        //   "#005eaa",
-        //   "#cda819",
-        //   "#32a487",
-        "#2999a0", "#67b9ff", "#a1a1a1", "#05b2fa", "#0ef167","#05bb4c", "#4b55ae"
+          //   "#3D54BE",
+          //   "rgb(255,0,0)",
+          //   "#a1a1a1",
+          //   "#0098d9",
+          //   "#FF8700",
+          //   "#005eaa",
+          //   "#cda819",
+          //   "#32a487",
+          "#2999a0",
+          "#67b9ff",
+          "#a1a1a1",
+          "#05b2fa",
+          "#0ef167",
+          "#05bb4c",
+          "#4b55ae",
         ],
         toolbox: {
           show: true,
@@ -137,7 +149,8 @@ export default {
           borderColor: "#ccc",
           textStyle: {
             fontSize: 16,
-            color: "#ccc",
+            // color: "#ccc",
+            color: "#f8f8ff",
           },
           iconStyle: {
             borderColor: "#ccc",
@@ -210,7 +223,7 @@ export default {
           inactiveColor:
             that.theme === "dark" ? partten.getColor("gray") : "#000",
           textStyle: {
-            color: that.theme === "dark" ? partten.getColor("grayl") : "#000",
+            color: that.theme === "dark" ? "#f8f8ff" : "#000",
             fontSize: 12,
           },
         },
@@ -226,7 +239,7 @@ export default {
           {
             name: "m/s",
             nameTextStyle: {
-              color: "#838383",
+              color: "#f8f8ff",
             },
             type: "value",
             boundaryGap: false,
@@ -236,12 +249,15 @@ export default {
             interval: 1,
             axisLabel: {
               formatter: "{value}",
+              textStyle: {
+                color: "#f8f8ff",
+              },
             },
             splitLine: {
               show: false,
             },
             textStyle: {
-              color: that.theme === "dark" ? partten.getColor("gray") : "#000",
+              color: that.theme === "dark" ? "#f8f8ff" : "#000",
             },
           },
         ],
@@ -253,11 +269,21 @@ export default {
             min: 0,
             name: "kW",
             nameTextStyle: {
-              color: "#838383",
+              color: "#f8f8ff",
+            },
+            axisLabel: {
+              textStyle: {
+                color: "#f8f8ff",
+              },
             },
           },
           {
             splitLine: { show: false },
+            axisLabel: {
+              textStyle: {
+                color: "#f8f8ff",
+              },
+            },
             position: "right",
             min: 0,
           },

+ 9 - 3
src/views/economicsOperation/windAnalyse/powerSearch/index.vue

@@ -399,7 +399,7 @@ export default {
           itemWidth: 6,
           inactiveColor: partten.getColor("gray"),
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: "#f8f8ff",
             fontSize: 12,
           },
         },
@@ -417,7 +417,7 @@ export default {
             axisLabel: {
               formatter: "{value}",
               textStyle: {
-                color: partten.getColor("gray"),
+                color: "#f8f8ff",
                 fontSize: util.vh(10),
               },
             },
@@ -428,9 +428,15 @@ export default {
           // show: showY,
           type: "value",
           name: "kWh",
+          nameTextStyle: {
+            color: "#f8f8ff",
+          },
           axisLabel: {
             formatter: "{value}",
-            fontSize: "14px",
+            textStyle: {
+              color: "#f8f8ff",
+              fontSize: "14px",
+            },
           },
           boundaryGap: false,
           //分格线

+ 3 - 3
src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -269,7 +269,7 @@
                 <div class="value green">{{ dayPowerInfo.rbjcs }}</div>
               </div> -->
               <div class="info-item">
-                <div class="text">停机次数:</div>
+                <div class="text">故障停机次数:</div>
                 <div class="value green">{{ dayPowerInfo.rtjcs }}</div>
               </div>
               <!-- <div class="info-item">
@@ -364,7 +364,7 @@
                     <div class="value green">{{ dayPowerInfo.ybjcs }}</div>
                   </div> -->
                   <div class="info-item">
-                    <div class="text">月停机次数:</div>
+                    <div class="text">月故障停机次数:</div>
                     <div class="value green">{{ dayPowerInfo.ytjcs }}</div>
                   </div>
                   <!-- <div class="info-item">
@@ -1173,7 +1173,7 @@ export default {
             is_light: false,
           },
           {
-            name: "损失电量(kWh)",
+            name: "损失电量(kWh)",
             field: "lossPower",
             is_num: false,
             is_light: false,

+ 4 - 0
src/views/rateAnalysis/components/chart.vue

@@ -100,6 +100,9 @@ const option = computed({
         subtext: props.subtext || "",
         top: 10,
         left: props.isDiaAlone ? "22%" : "5%",
+        subtextStyle: {
+          color: "#f8f8ff",
+        },
       },
       angleAxis: props.xAxis || {},
       radiusAxis: {},
@@ -147,6 +150,7 @@ const option = computed({
         itemWidth: 16,
         itemHeight: 10,
         textStyle: {
+          color: "#f8f8ff",
           fontSize: util.vh(10),
         },
         top: "middle",

+ 6 - 0
src/views/rateAnalysis/components/lineChart.vue

@@ -77,6 +77,9 @@ const option = computed({
         subtext: props.subtext || "",
         top: 6,
         left: "5%",
+        subtextStyle: {
+          color: "#f8f8ff",
+        },
       },
       xAxis: props.xAxis || {},
       yAxis: props.yAxis || {},
@@ -109,6 +112,9 @@ const option = computed({
         right: "120",
         top: "5",
         itemWidth: 6,
+        textStyle: {
+          color: "#f8f8ff",
+        },
       },
       grid: {
         top: 80,

+ 3 - 0
src/views/rateAnalysis/components/scatterSingleChart.vue

@@ -84,6 +84,9 @@ const option = computed({
         subtext: props.subtext || "",
         top: 6,
         left: "5%",
+        subtextStyle: {
+          color: "#f8f8ff",
+        },
       },
       grid: {
         top: 80,

+ 59 - 12
src/views/rateAnalysis/index.vue

@@ -384,7 +384,7 @@ import { useStore } from "vuex";
 import httpRequest from "@/utils/request.js";
 import tools from "@tools/htmlToPdf.js";
 import jsonData from "./components/data.json";
-import axios from "axios"
+import axios from "axios";
 // import flowerRes from '@/data/flower.json'
 // import lineChartRes from '@/data/lineNew.json'
 /**配置参数 */
@@ -426,20 +426,20 @@ const tableData = ref([]);
 const tableColumn = ref([]);
 const tableDataGet = async () => {
   const res = await axios({
-    method:"GET",
-    baseURL:process.env.VUE_APP_API,
-    url:"/wind/show",
-       params: {
+    method: "GET",
+    baseURL: process.env.VUE_APP_API,
+    url: "/wind/show",
+    params: {
       id: excelCheckIds.value.join(),
     },
   });
-  console.log(111,res)
+  console.log(111, res);
   // const res = await httpRequest.get(`${process.env.VUE_APP_API}/wind/show`, {
   //   params: {
   //     id: excelCheckIds.value.join(),
   //   },
   // });
-  
+
   tableColumn.value = res.data.title.map((o) => {
     return {
       prop: o.key,
@@ -472,14 +472,14 @@ const funRepeatMap = (arr) => {
 };
 const funGetTree = async () => {
   const res = await axios({
-    method:"GET",
-    baseURL:process.env.VUE_APP_ALARM,
-    url:"/power/process/tree"
+    method: "GET",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "/power/process/tree",
   });
   // const res = await httpRequest.get(
   //   `${process.env.VUE_APP_ALARM}/power/process/tree`
   // );
-  console.log(222,res)
+  console.log(222, res);
   actTreeNode.value = null;
   excelList.value = [];
   treeData.value = funRepeatMap(res.data);
@@ -675,6 +675,11 @@ const funSubmit = async () => {
             splitLine: {
               show: true,
             },
+            axisLabel: {
+              textStyle: {
+                color: "#f8f8ff",
+              },
+            },
           },
           isRadar: false,
           series: chart.roses.length
@@ -728,6 +733,11 @@ const funSubmit = async () => {
             splitLine: {
               show: true,
             },
+            axisLabel: {
+              textStyle: {
+                color: "#f8f8ff",
+              },
+            },
           },
           series: chart.roses.length
             ? [
@@ -892,27 +902,48 @@ const linexAxis = ref({
   axisTick: {
     show: true,
   },
+  axisLabel: {
+    textStyle: {
+      color: "#f8f8ff",
+    },
+  },
 });
 const lineyAxis = ref([
   {
     type: "value",
     name: "m/s",
+    nameTextStyle: {
+      color: "#f8f8ff",
+    },
     splitLine: {
       show: false,
     },
     axisTick: {
       show: true,
     },
+    axisLabel: {
+      textStyle: {
+        color: "#f8f8ff",
+      },
+    },
   },
   {
     type: "value",
     name: "频次",
+    nameTextStyle: {
+      color: "#f8f8ff",
+    },
     splitLine: {
       show: false,
     },
     axisTick: {
       show: true,
     },
+    axisLabel: {
+      textStyle: {
+        color: "#f8f8ff",
+      },
+    },
   },
 ]);
 const lineSeries = ref([]);
@@ -995,6 +1026,9 @@ const scatterxData = ref([
   {
     type: "category",
     name: "度",
+    nameTextStyle: {
+      color: "#f8f8ff",
+    },
     data: new Array(61).fill(-30).map((o, index) => Number(o + index)),
     boundaryGap: false,
     splitLine: {
@@ -1003,6 +1037,11 @@ const scatterxData = ref([
     axisLine: {
       show: true,
     },
+    axisLabel: {
+      textStyle: {
+        color: "#f8f8ff",
+      },
+    },
   },
 ]);
 const scatteryData = ref([
@@ -1013,9 +1052,17 @@ const scatteryData = ref([
       show: false,
     },
     name: "m/s",
+    nameTextStyle: {
+      color: "#f8f8ff",
+    },
     splitLine: {
       show: false,
     },
+    axisLabel: {
+      textStyle: {
+        color: "#f8f8ff",
+      },
+    },
   },
 ]);
 const scatterSeries = ref([
@@ -1407,7 +1454,7 @@ watch(
 const initPageData = () => {
   actTreeNode.value = null;
   excelList.value = [];
-//   treeData.value = funRepeatMap(JSON.parse(JSON.stringify(jsonData.treeData)));
+  //   treeData.value = funRepeatMap(JSON.parse(JSON.stringify(jsonData.treeData)));
   if (actTreeNode.value) {
     if (actTreeNode.value.childs) {
       excelList.value = actTreeNode.value.childs.map((o) => {