Ver Fonte

功能修改,样式修改

xujuanning há 2 semanas atrás
pai
commit
fe452fba42

+ 2 - 1
src/nxfStyle.less

@@ -316,7 +316,8 @@
     // 页面渲染 router 部分背景颜色
     .main-body {
         // background: rgb(3, 7, 19);
-        background: #1f2d5b;
+        // background: #1f2d5b;
+        background: rgb(20, 36, 70);
     }
 
     // el-dialog 弹窗

+ 24 - 24
src/utills/constant.js

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

+ 14 - 6
src/views/IntegratedAlarm/earlyWarning/index.vue

@@ -104,7 +104,7 @@
           <template #default="scope">
             <template v-if="Array.isArray(scope.row.troubleMethod)">
               <p v-for="(item, index) in scope.row.troubleMethod" :key="index">
-                {{ index + 1 }}. {{ item }}
+                {{ item }}
               </p>
             </template>
             <p v-else>
@@ -121,7 +121,7 @@
           <template #default="scope">
             <template v-if="Array.isArray(scope.row.processMethod)">
               <p v-for="(item, index) in scope.row.processMethod" :key="index">
-                {{ index + 1 }}. {{ item }}
+                {{ item }}
               </p>
             </template>
             <p v-else>
@@ -407,10 +407,10 @@ export default {
             count: partData.length,
           };
           partData.forEach((item) => {
-            item.processMethod = this.splitStr(item.processMethod);
-            item.spareParts = this.splitStr(item.spareParts);
-            item.tools = this.splitStr(item.tools);
-            item.troubleMethod = this.splitStr(item.troubleMethod);
+            item.processMethod = this.splitStr2(item.processMethod, '\n');
+            item.spareParts = this.splitStr2(item.spareParts, ',');
+            item.tools = this.splitStr2(item.tools, ',');
+            item.troubleMethod = this.splitStr2(item.troubleMethod, '\n');
             tableData.push({
               ...item,
               part,
@@ -431,8 +431,16 @@ export default {
           .filter(Boolean)
           .filter((_, index) => index % 2 !== 0);
       }
+      console.log("str3====>>>>", str)
+
       return str;
     },
+    splitStr2(str, s) {
+      let str2 = ""
+      str2 = str.split(s)
+      console.log("str2====>>>>", str2)
+      return str2;
+    },
 
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {

+ 7 - 0
src/views/economicsOperation/benchmarkingManagement/compontent/bar-line-chart.vue

@@ -96,6 +96,13 @@ export default {
             }
             arr.push(obj)
         })
+        let obj1 = {
+            name: "理论发电量",
+            itemStyle: {
+                color: nxfStyle('理论发电量')
+            }
+        }
+        arr.push(obj1)
       return arr
     },
     end() {

+ 4 - 3
src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -50,7 +50,7 @@
           </el-option>
         </el-select>
       </div> -->
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         日期
         <div class="search-input">
           <el-date-picker
@@ -72,6 +72,7 @@
           round
           size="mini"
           :disabled="displayDetail"
+          v-if="!displayDetail"
           class="buttons"
           @click="gerCjdb"
           >搜 索</el-button
@@ -137,7 +138,7 @@
             :key="item.code"
             :prop="item.code"
             :label="item.name"
-            width="90"
+            :width="item.width ? item.width : '90'"
             show-overflow-tooltip
             sortable
           >
@@ -228,7 +229,7 @@
           :key="item.code"
           :prop="item.code"
           :label="item.name"
-          width="90"
+          :width="item.width ? item.width : '90'"
           show-overflow-tooltip
           header-align="center"
           align="center"

+ 2 - 2
src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -158,7 +158,7 @@
             :key="item.code"
             :prop="item.code"
             :label="item.name"
-            width="90"
+            :width="item.width ? item.width : '90'"
             show-overflow-tooltip
             sortable
             ><template #header="scope">
@@ -248,7 +248,7 @@
           :key="item.code"
           :prop="item.code"
           :label="item.name"
-          width="90"
+          :width="item.width ? item.width : '90'"
           show-overflow-tooltip
           header-align="center"
           align="center"

+ 4 - 3
src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -49,7 +49,7 @@
           </el-option>
         </el-select>
       </div> -->
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         日期
         <div class="search-input">
           <el-date-picker
@@ -72,6 +72,7 @@
           size="mini"
           class="buttons"
           :disabled="displayDetail"
+          v-if="!displayDetail"
           @click="gerCndb"
           >搜 索</el-button
         >
@@ -138,7 +139,7 @@
             :key="item.code"
             :prop="item.code"
             :label="item.name"
-            width="90"
+            :width="item.width ? item.width : '90'"
             show-overflow-tooltip
             sortable
           >
@@ -234,7 +235,7 @@
           :label="item.name"
           header-align="center"
           align="center"
-          width="90"
+          :width="item.width ? item.width : '90'"
           show-overflow-tooltip
           sortable
         >

+ 2 - 2
src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -179,7 +179,7 @@
             :key="item.code"
             :prop="item.code"
             :label="item.name"
-            width="90"
+            :width="item.width ? item.width : '90'"
             show-overflow-tooltip
             sortable
           >
@@ -274,7 +274,7 @@
           :key="item.code"
           :prop="item.code"
           :label="item.name"
-          width="90"
+          :width="item.width ? item.width : '90'"
           show-overflow-tooltip
           header-align="center"
           align="center"

+ 16 - 11
src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -72,7 +72,6 @@
                   filter-class-name="currentFilter"
                   prop="name"
                   label="超限原因 (点击定位至图表位置)"
-                  width="400"
                   align="center"
                   :filters="[
                     { text: '低于下限', value: '低于下限' },
@@ -99,13 +98,11 @@
                 <el-table-column
                   prop="value"
                   label="测点值"
-                  width="180"
                   align="center"
                 />
                 <el-table-column
                   prop="jud"
                   label="限值"
-                  width="180"
                   align="center"
                 />
               </el-table>
@@ -156,6 +153,7 @@ import dayjs from "dayjs";
 import agcJson from "./agcJson.json";
 import * as echarts from "echarts";
 import jsonData from "./components/data.json";
+import { nxfStyle } from "@/utils/nxfCodeStyle";
 
 const tableDataSource = ref([]);
 const paginationCurrentPage = ref(1);
@@ -340,7 +338,7 @@ const funSubmit = (params) => {
         {
           prop: "ygsdxz",
           label: "有功设定限值(MW)",
-          width: 80,
+          width: 180,
         },
         {
           prop: "sfyg",
@@ -435,7 +433,8 @@ const funSubmit = (params) => {
             // color: "#67c23a",
           },
           large: true,
-          color: "#205081",
+          // color: "#205081",
+          color: nxfStyle("有功设定限值") || "red",
         },
         {
           name: "实发有功",
@@ -466,7 +465,8 @@ const funSubmit = (params) => {
             },
             data: [],
           },
-          color: "#e96767",
+          // color: "#e96767",
+          color: nxfStyle("实发有功") || "black",
         },
         {
           name: "理论功率",
@@ -481,6 +481,7 @@ const funSubmit = (params) => {
           },
           large: true,
           color: "#41a273",
+          color:  nxfStyle("理论功率") || "red",
         },
         {
           name: "偏差上限",
@@ -496,7 +497,8 @@ const funSubmit = (params) => {
           },
           symbol: "none",
           large: true,
-          color: "rgb(77, 119, 255)",
+          // color: "rgb(77, 119, 255)",
+          color:  nxfStyle("偏差上限") || "red",
         },
         {
           name: "偏差下限",
@@ -512,7 +514,8 @@ const funSubmit = (params) => {
           },
           symbol: "none",
           large: true,
-          color: "rgb(1, 191, 236)",
+          // color: "rgb(1, 191, 236)",
+          color: nxfStyle("偏差下限") || "red",
         },
         {
           name: "保证功率",
@@ -527,7 +530,8 @@ const funSubmit = (params) => {
           //     color: "#f56c6c"
           // },
           large: true,
-          color: "#f2c94c",
+          // color: "#f2c94c",
+          color: nxfStyle("保证功率") || "red",
         },
         {
           name: "平均风速",
@@ -542,7 +546,8 @@ const funSubmit = (params) => {
           //     color: "#f56c6c"
           // },
           large: true,
-          color: "#7bbfdd",
+          // color: "#7bbfdd",
+          color: nxfStyle("平均风速") || "red",
         },
       ];
       tableData.value = tableArr;
@@ -638,7 +643,7 @@ const initPageData = () => {
     {
       prop: "ygsdxz",
       label: "有功设定限值",
-      width: 80,
+      width: 180,
     },
     {
       prop: "sfyg",

+ 7 - 3
src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue

@@ -129,6 +129,7 @@ import dayjs from "dayjs";
 import agcJson from "./agcJson.json";
 import * as echarts from "echarts";
 import jsonData from "./components/data.json";
+import { nxfStyle } from "@/utils/nxfCodeStyle";
 
 const tableDataSource = ref([]);
 const paginationCurrentPage = ref(1);
@@ -301,7 +302,8 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 1,
             large: true,
-            color: "#7bbfdd",
+            // color: "#7bbfdd",
+            color: nxfStyle("平均风速") || "black",
           },
           {
             name: "实发有功",
@@ -313,7 +315,8 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 0,
             large: true,
-            color: "#e96767",
+            // color: "#e96767",
+            color: nxfStyle("实发有功") || "black",
           },
           {
             name: "理论功率",
@@ -325,7 +328,8 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 0,
             large: true,
-            color: "#41a273",
+            // color: "#41a273",
+            color: nxfStyle("理论功率") || "black",
           }
         );
       }

+ 2 - 0
src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -1545,6 +1545,7 @@ export default {
     // tab1 - 获取当日故障数据
     async getStopData() {
       let that = this;
+      that.stopTableData.data = []
       let params = {
         wtId: that.wtId,
         recorddate: that.recorddate,
@@ -1574,6 +1575,7 @@ export default {
     // tab1 - 获取当日限电数据
     async getXdData() {
       let that = this;
+      that.xdTableData.data = []
       let params = {
         wtId: that.wtId,
         recorddate: that.recorddate,