Merge branch 'master' of http://124.70.43.205:3000/sunzehao/platform_largeScreen

src/components/chart/bar/list-bar-chart2-home.vue

@@ -316,10 +316,13 @@ export default {
       deep: true,
       immediate: true,
     },
-    "$store.state.themeName"() {
-      this.list.forEach((value, index) => {
-        this.initChart(value, index);
-      });
+    "$store.state.moreSty"(val) {
+        if (val){
+            this.list.forEach((value, index) => {
+                value.color = val === 'greenSty' ? 0 : 1
+                this.initChart(value, index);
+            });
+        }
     },
   },
   unmounted() {

src/components/chart/pie/dash-pie-chart.vue

@@ -56,6 +56,7 @@ export default {
     return {
       id: "",
       chart: null,
+      statemoreSty: 1
     };
   },
   computed: {
@@ -102,14 +103,14 @@ export default {
                     new echarts.graphic.LinearGradient(0, 0, 1, 0, [
                       {
                         offset: 0,
-                        color: $("#appBody").is(".dark")
-                          ? partten.getColor(this.color) + "01"
+                        color: this.$store.state.moreSty === 'greenSty'
+                          ? "rgb(33, 187, 76)"
                           : "rgb(57, 54, 143)",
                       },
                       {
                         offset: 1,
-                        color: $("#appBody").is(".dark")
-                          ? partten.getColor(this.color) + "ff"
+                        color: this.$store.state.moreSty === 'greenSty'
+                          ? "rgb(33, 187, 76)"
                           : "rgb(57, 54, 143)",
                       },
                     ]),
@@ -200,8 +201,8 @@ export default {
                 color: [
                   [
                     1,
-                    $("#appBody").is(".dark")
-                      ? partten.getColor(this.color)
+                    this.$store.state.moreSty === 'greenSty'
+                      ? "rgb(33, 187, 76)"
                       : "rgb(57, 54, 143)",
                   ],
                 ],
@@ -217,9 +218,9 @@ export default {
               distance: 6,
               splitNumber: 2,
               lineStyle: {
-                color: $("#appBody").is(".dark")
-                  ? partten.getColor(this.color)
-                  : "rgb(57, 54, 143)", //用颜色渐变函数不起作用
+                color: this.$store.state.moreSty === 'greenSty'
+                      ? "rgb(33, 187, 76)"
+                      : "rgb(57, 54, 143)", //用颜色渐变函数不起作用
                 width: 1,
               },
               length: 4,
@@ -255,8 +256,8 @@ export default {
                     formatter: function (params) {
                       return params.value;
                     },
-                    color: $("#appBody").is(".dark")
-                      ? partten.getColor(this.color)
+                    color: this.$store.state.moreSty === 'greenSty'
+                      ? "rgb(33, 187, 76)"
                       : "rgb(57, 54, 143)",
                     fontSize: 12,
                     fontWeight: "bold",
@@ -382,8 +383,13 @@ export default {
   },
 
   watch: {
-    "$store.state.themeName"() {
-      this.initChart();
+    "$store.state.moreSty"(val) {
+        if (val === 'greenSty') {
+            this.statemoreSty = 1
+        } else {
+            this.statemoreSty = 2
+        }
+        this.initChart();
     },
   },
 };

src/components/windDetail/index.vue

@@ -131,7 +131,7 @@
     </div>
     <div class="parts">
       <div class="part-top">
-        <div class="part-title">
+        <div class="part-title" :data-type="$store.state.moreSty">
           <div
             class="title-item part-left"
             :class="{ active: current === 'fdj' }"
@@ -263,6 +263,7 @@
                 <div>{{ item.name }}</div>
                 <div
                   class="table-value"
+                   :data-type="$store.state.moreSty"
                   :class="item.value == 1 ? 'round-red' : 'round'"
                 ></div>
               </div>
@@ -287,7 +288,7 @@
             >
               <div class="table-item" v-for="(item, ind) in val" :key="ind">
                 <div>{{ item.name }}</div>
-                <div class="table-value">
+                <div class="table-value" :data-type="$store.state.moreSty">
                   {{
                     item.name.includes("状态")
                       ? item.value
@@ -311,7 +312,7 @@
             <div class="point point-left bottom"></div>
             <div class="point point-right bottom"></div>
             <span style="font-size: 16px;position: relative;top: -5px;">故障分类</span>
-            <div class="problemSeach">
+            <div class="problemSeach" :data-type="$store.state.moreSty">
                 <el-input v-model="inputcv" clearable placeholder="请输入" />
                 <div class="seachBtn">
                     <el-icon :size="18" :color="color">
@@ -337,15 +338,15 @@
                             <div class="numBot">总故障</div>
                         </div>
                     </div>
-                    <div class="warnItems" v-for="(it, index) in 7" :key="index">
-                        <div class="warnItemLeft">20</div>
-                        <div class="warnItemRight">防雷保护类</div>
+                    <div class="warnItems" v-for="(it, index) in warnList1" :key="index">
+                        <div class="warnItemLeft">{{it.num}}</div>
+                        <div class="warnItemRight">{{it.name}}</div>
                     </div>
                 </div>
-                <div class="warn" v-for="(it, index) in 2" :key="index">
-                    <div class="warnItems" v-for="(it, index) in 10" :key="index">
-                        <div class="warnItemLeft" :class="isRed(index)">20</div>
-                        <div class="warnItemRight" :class="isRed(index)">防雷保护类</div>
+                <div class="warn" v-for="(it, index) in warnListT" :key="index">
+                    <div class="warnItems" v-for="(itv, idx) in it" :key="idx">
+                        <div class="warnItemLeft" :class="isRed(idx)">{{itv.num}}</div>
+                        <div class="warnItemRight" :class="isRed(idx)">{{itv.name}}</div>
                     </div>
                 </div>
             </div>
@@ -400,6 +401,7 @@ import {
 } from "@/api/factoryMonitor/index.js";
 import svgIcon from "@/components/coms/icon/svg-icon.vue";
 import alarmDialog from "@/components/alarm";
+import warnJson from './warnJson.json'
 export default {
   name: "windDetail",
   data() {
@@ -608,7 +610,9 @@ export default {
       warnTypeData: {
         typeData: [],
         tableData: []
-      }
+      },
+      warnList1: [],
+      warnListT: []
     };
   },
   components: { svgIcon, alarmDialog, powerAndSpeed,  },
@@ -623,6 +627,10 @@ export default {
       default: false,
     },
   },
+  created() {
+    this.warnList1 = warnJson.warn1
+    this.warnListT = warnJson.warnT
+  },
   computed: {
     windSpeedRota() {
       let count = this.windStatus?.SSPJFS / 25;
@@ -1169,6 +1177,30 @@ export default {
       flex: 1;
       width: 100%;
     }
+    .part-title[data-type~="greenSty"] {
+        .title-item{
+            background: rgba(33, 187, 76, 0.2);
+            border-left: 1px solid rgba(33, 187, 76, 0.48);
+            border-top: 1px solid rgba(33, 187, 76, 0.48);
+            border-bottom: 1px solid rgba(33, 187, 76, 0.48);
+            &.active {
+                background-color: rgba(33, 187, 76, 0.48);
+                color: #ffffff;
+            }
+        }
+    }
+    .part-title[data-type~="blueSty"] {
+        .title-item{
+            background: rgba(96, 103, 105, 0.2);
+            border-left: 1px solid rgba(0, 70, 199, 0.48);
+            border-top: 1px solid rgba(0, 70, 199, 0.48);
+            border-bottom: 1px solid rgba(0, 70, 199, 0.48);
+            &.active {
+                background-color: rgba(0, 70, 199, 0.48);
+                color: #ffffff;
+            }
+        }
+    }
     .part-title {
       width: 100%;
       height: 30px;
@@ -1183,10 +1215,7 @@ export default {
         color: #b3bdc0;
         justify-content: center;
         // background: rgba(67, 81, 107, 0.2);
-        background: rgba(96, 103, 105, 0.2);
-        border-left: 1px solid rgba(0, 70, 199, 0.48);
-        border-top: 1px solid rgba(0, 70, 199, 0.48);
-        border-bottom: 1px solid rgba(0, 70, 199, 0.48);
+        
 
         &.part-left {
           border-radius: 15px 0px 0px 15px;
@@ -1197,11 +1226,7 @@ export default {
           border-radius: 0px 15px 15px 0px;
         }
 
-        &.active {
-          //   background-color: rgba(0, 70, 199, 0.4);
-          background-color: rgba(0, 70, 199, 0.48);
-          color: #ffffff;
-        }
+        
       }
     }
     .part-imgs {
@@ -1257,6 +1282,17 @@ export default {
             width: 25%;
             font-size: 12px;
 
+            .table-value[data-type~="greenSty"] {
+                &.round {
+                    background-color: rgba(33, 187, 76, 0.48);
+                }
+            }
+            .table-value[data-type~="blueSty"] {
+                &.round {
+                    background-color: rgba(0, 70, 199, 0.48);
+                }
+            }
+
             .table-value {
               display: flex;
               flex-direction: row;
@@ -1275,7 +1311,6 @@ export default {
                 width: 8px;
                 height: 8px;
                 border-radius: 50%;
-                background-color: rgba(0, 70, 199, 0.48);
                 margin-right: 90px;
               }
 
@@ -1317,6 +1352,24 @@ export default {
         font-weight: 400;
         color: #ffffff;
 
+        .problemSeach[data-type~="greenSty"] {
+            .seachBtn{
+                background: rgba(33, 187, 76, 0.48);
+                &:hover {
+                    background-color: rgba(16, 219, 57, 0.5);
+                    color: #ffffff;
+                }
+            }
+        }
+        .problemSeach[data-type~="blueSty"] {
+            .seachBtn{
+                background: rgba(0, 70, 199, 0.48);
+                &:hover {
+                    background-color: rgba(16, 81, 219, 0.5);
+                    color: #ffffff;
+                }
+            }
+        }
         .problemSeach{
             display: flex;
             .el-input{
@@ -1328,7 +1381,6 @@ export default {
             .seachBtn{
                 width: 30px;
                 height: 30px;
-                background: rgba(0, 70, 199, 0.48);
                 border-radius: 30px;
                 position: relative;
                 margin-left: 5px;
@@ -1338,10 +1390,7 @@ export default {
                     top: 6px;
                     left: 7px;
                 }
-                &:hover {
-                    background-color: rgba(16, 81, 219, 0.5);
-                    color: #ffffff;
-                }
+                
             }
             .buttons {
                 background-color: rgba(5, 187, 76, 0.2);
@@ -1398,7 +1447,7 @@ export default {
                 .warnComNum{
                     position: relative;
                     top: -119px;
-                    left: 88px;
+                    left: 78px;
                     width: 55px;
                     .numTop{
                         font-size: 22px;
@@ -1467,6 +1516,7 @@ export default {
                     width: 20%;
                     border: 1px solid #817c7c;
                     margin-right: 1%;
+                    font-size: 14px;
                     text-align: center;
                     line-height: 28px;
                 }
@@ -1474,6 +1524,7 @@ export default {
                     height: 32px;
                     width: 79%;
                     line-height: 28px;
+                    font-size: 12px;
                     border: 1px solid #817c7c;
                     padding-left: 5px;
                 }
@@ -1564,10 +1615,15 @@ export default {
   color: #b3b3b3;
   padding: 0 0px;
 
+    .table-value[data-type~="greenSty"] {
+        color: rgb(33, 187, 76);
+    }
+    .table-value[data-type~="blueSty"] {
+        color: rgb(15, 120, 240);
+    }
   .table-value {
     font-family: Arial;
     font-weight: 400;
-    color: rgb(15, 120, 240);
     margin-right: 25px;
   }
 }

src/components/windDetail/warnJson.json

@@ -0,0 +1,86 @@
+{
+    "warn1": [
+        {
+            "name": "电网类故障",
+            "num": 15
+        },
+        {
+            "name": "浪涌保护类故障",
+            "num": 0
+        },
+        {
+            "name": "液压站类故障",
+            "num": 16
+        },
+        {
+            "name": "齿轮箱类故障",
+            "num": 13
+        },
+        {
+            "name": "安全链类故障",
+            "num": 0
+        }
+    ],
+    "warnT": [
+        [
+            {
+                "name": "变流器类故障",
+                "num": 100
+            },
+            {
+                "name": "变桨类故障",
+                "num": 100
+            },
+            {
+                "name": "偏航类故障",
+                "num": 541
+            },
+            {
+                "name": "主轴类故障",
+                "num": 0
+            },
+            {
+                "name": "高速刹车类故障",
+                "num": 738
+            },
+            {
+                "name": "扭缆类故障",
+                "num": 0
+            },
+            {
+                "name": "叶轮转速类故障",
+                "num": 0
+            },
+            {
+                "name": "维护模式类故障",
+                "num": 0
+            }
+        ],
+        [
+            {
+                "name": "控制器状态类故障",
+                "num": 834
+            },
+            {
+                "name": "机舱震动类故障",
+                "num": 0
+            },
+            {
+                "name": "风资源测量类故障",
+                "num": 100
+            },
+            {
+                "name": "机舱类故障",
+                "num": 188
+            },
+            {
+                "name": "外界温度类故障",
+                "num": 659
+            },
+            {
+                "name": "发电机类故障",
+                "num": 23
+            }
+        ]
+    ]
+}

src/components/zbDialog/index.vue

@@ -44,12 +44,14 @@
       >
         <div class="targetNav" :data-type="$store.state.moreSty">
           <ul>
+            <!-- @click="getMoreUniformCodesList(-1, -1, '')" -->
             <li
               :class="{ active: headerIndex == -1, 'li-left': true }"
-              @click="getMoreUniformCodesList(-1, -1, '')"
+              @click="showCodeList('all')"
             >
               全部
             </li>
+            <!-- @click="getMoreUniformCodesList(-1, index, item.code)" -->
             <li
               v-for="(item, index) in partList"
               :key="index"
@@ -57,7 +59,7 @@
                 active: headerIndex == index,
                 'li-right': index == partList.length - 1,
               }"
-              @click="getMoreUniformCodesList(-1, index, item.code)"
+              @click="showCodeList('only',item.code, index)"
             >
               {{ item.label }}
             </li>
@@ -66,7 +68,7 @@
         <div class="box">
           <el-checkbox-group v-model="checkList" @change="handleCheckedChange">
             <el-checkbox
-              v-for="(item, index) in moreTargetData"
+              v-for="(item, index) in moreTargetDatawind"
               :key="index"
               :label="item.name"
             ></el-checkbox>
@@ -102,6 +104,7 @@
 <script>
 import { GetWtTargets } from "@/api/factoryMonitor/index.js";
 import { getComprehensiveTargets } from "@/api/monitor/index.js";
+import zbJson from './zbJson.json'
 export default {
   name: "zbDialog", //指标弹窗
   components: {},
@@ -129,6 +132,8 @@ export default {
       selectValue: "",
       checkList: [],
       moreTargetData: [],
+      moreTargetDatawind: [],
+      allTargetDatawind: [],
       allMoreTargetData: [],
       headerIndex: -1,
       partList: [
@@ -144,11 +149,32 @@ export default {
     };
   },
   created() {
-    this.moreTargetData = new Array(50).fill({
-        name: "指标测试名称"
+    // this.moreTargetData = new Array(50).fill({
+    //     name: "指标测试名称"
+    // })
+    this.moreTargetDatawind = zbJson.wind
+    this.allTargetDatawind = zbJson.wind
+    zbJson.power.forEach(it =>{
+        this.moreTargetData.push({
+            name: it
+        })
     })
   },
   methods: {
+    showCodeList(type, code, index) {
+        this.headerIndex = index;
+        if (type === "all") {
+            this.moreTargetDatawind = zbJson.wind
+        } else {
+            this.moreTargetDatawind = []
+            this.allTargetDatawind.forEach(it => {
+                if (it.code === code) {
+                    this.moreTargetDatawind.push(it)
+                }
+            })
+            
+        }
+    },
     // 初始化弹窗数据
     openDialog(type, text, station) {
       this.dialogVisible = true;

src/components/zbDialog/zbJson.json

@@ -0,0 +1,219 @@
+{
+    "wind": [
+        {
+            "code": "qt",
+            "name": "IGBT温度"
+        },
+        {
+            "code": "fdj",
+            "name": "U1绕组温度"
+        },
+        {
+            "code": "fdj",
+            "name": "U2绕组温度"
+        },
+        {
+            "code": "fdj",
+            "name": "V1绕组温度"
+        },
+        {
+            "code": "fdj",
+            "name": "V2绕组温度"
+        },
+        {
+            "code": "fdj",
+            "name": "W1绕组温度"
+        },
+        {
+            "code": "fdj",
+            "name": "W2绕组温度"
+        },
+        {
+            "code": "jc",
+            "name": "X方向振动幅度值"
+        },
+        {
+            "code": "jc",
+            "name": "Y方向振动幅度值"
+        },
+        {
+            "code": "bj",
+            "name": "变桨电机1温度"
+        },
+        {
+            "code": "bj",
+            "name": "变桨电机2温度"
+        },
+        {
+            "code": "bj",
+            "name": "变桨电机3温度"
+        },
+        {
+            "code": "clx",
+            "name": "齿轮箱入口油温"
+        },
+        {
+            "code": "clx",
+            "name": "齿轮箱轴1温度"
+        },
+        {
+            "code": "clx",
+            "name": "齿轮箱轴2温度"
+        },
+        {
+            "code": "clx",
+            "name": "齿轮油油温"
+        },
+        {
+            "code": "fdj",
+            "name": "发电机转速"
+        },
+        {
+            "code": "fdj",
+            "name": "非驱动轴承温度/轴承B温度"
+        },
+        {
+            "code": "qt",
+            "name": "风机60秒风向"
+        },
+        {
+            "code": "qt",
+            "name": "风速"
+        },
+        {
+            "code": "qt",
+            "name": "风向"
+        },
+        {
+            "code": "qt",
+            "name": "功率因数"
+        },
+        {
+            "code": "jc",
+            "name": "环境温度"
+        },
+        {
+            "code": "jc",
+            "name": "机舱温度"
+        },
+        {
+            "code": "bj",
+            "name": "桨距角设定值"
+        },
+        {
+            "code": "jc",
+            "name": "控制柜温度/塔底柜温度"
+        },
+        {
+            "code": "qt",
+            "name": "轮毂温度"
+        },
+        {
+            "code": "fdj",
+            "name": "网侧A相电流"
+        },
+        {
+            "code": "fdj",
+            "name": "网侧B相电流"
+        },
+        {
+            "code": "fdj",
+            "name": "网侧C相电流"
+        },
+        {
+            "code": "fdj",
+            "name": "叶轮转速"
+        },
+        {
+            "code": "fdj",
+            "name": "有功功率"
+        },
+        {
+            "code": "qt",
+            "name": "主轴叶轮侧温度"
+        },
+        {
+            "code": "qt",
+            "name": "总发电量"
+        },
+        {
+            "code": "qt",
+            "name": "无功功率"
+        },
+        {
+            "code": "yy",
+            "name": "液压系统油位"
+        },
+        {
+            "code": "yy",
+            "name": "液压系统油压"
+        },
+        {
+            "code": "ph",
+            "name": "机舱方向/对风角度"
+        },
+        {
+            "code": "ph",
+            "name": "偏航位置"
+        },
+        {
+            "code": "ph",
+            "name": "偏航功率"
+        },
+        {
+            "code": "ph",
+            "name": "偏航右极限位置"
+        }
+    ],
+    "power": [
+        "变压器油温",
+        "电抗器温度",
+        "电网AB线电压",
+        "电网A相电流",
+        "电网A相电压",
+        "电网BC线电压",
+        "电网B相电流",
+        "电网B相电压",
+        "电网CA线电压",
+        "电网C相电流",
+        "电网C相电压",
+        "电网频率",
+        "额定无功输出功率",
+        "负极对地电压",
+        "负极对地阻抗值",
+        "功率因数",
+        "功率因数(遥调)",
+        "机内温度",
+        "累计二氧化碳减排量",
+        "模块温度 1",
+        "模块温度 2",
+        "模块温度 3",
+        "模块温度 4",
+        "模块温度 5",
+        "模块温度 6",
+        "逆变器关机时间",
+        "逆变器交流电流",
+        "逆变器交流电压",
+        "逆变器开机时间",
+        "逆变器输入电流",
+        "逆变器输入电压",
+        "逆变器效率",
+        "逆变器运行状态",
+        "逆变器直流电流",
+        "逆变器直流电压",
+        "年发电量",
+        "日并网分钟",
+        "日发电量",
+        "视在功率",
+        "输入总功率",
+        "无功功率",
+        "无功功率(遥调)",
+        "有功功率",
+        "有功功率(遥调)",
+        "月发电量",
+        "正极对地阻抗值",
+        "总电压",
+        "总发电量",
+        "总运行时间"
+    ]
+}

src/views/Home/components/map.vue

@@ -1769,7 +1769,7 @@ export default {
                   ? 0
                   : (data?.proplanmap?.fd_r_sjdl / 10000).toFixed(2)
                 : 0,
-              color: 1,
+              color: 0,
               total: data?.proplanmap
                 ? data?.proplanmap?.fd_r_jhdl < 0
                   ? 0
@@ -1786,7 +1786,7 @@ export default {
                   ? 0
                   : (data?.proplanmap?.fd_y_sjdl / 10000).toFixed(2)
                 : 0,
-              color: 1,
+              color: 0,
               total: data?.proplanmap
                 ? data?.proplanmap?.fd_y_jhdl < 0
                   ? 0
@@ -1822,7 +1822,7 @@ export default {
                   ? 0
                   : (data?.proplanmap?.gf_r_sjdl / 10000).toFixed(2)
                 : 0,
-              color: 1,
+              color: 0,
               total: data?.proplanmap
                 ? data?.proplanmap?.gf_r_jhdl < 0
                   ? 0
@@ -1839,7 +1839,7 @@ export default {
                   ? 0
                   : (data?.proplanmap?.gf_y_sjdl / 10000).toFixed(2)
                 : 0,
-              color: 1,
+              color: 0,
               total: data?.proplanmap
                 ? data?.proplanmap?.gf_y_jhdl < 0
                   ? 0

src/views/IntegratedAlarm/component/p-panel.vue

@@ -4,7 +4,9 @@
         <div class="p-panel-body">
             <div class="pp-info">
                 <div class="pp-info-days">
-                    <span class="font-num blue font-lg pp-info-days-num">{{
+                    <span class="font-num font-lg pp-info-days-num"
+                    :style="$store.state.moreSty === 'blueSty' ? 'color:#0a82f2' : 'color:#05BB4C'"
+                    >{{
             days
           }}</span>
                     <span class="gray font-sm">{{ daysUnit }}</span>
@@ -101,7 +103,7 @@
             },
             backColor: {
                 type: String,
-                default: "#4B55AE",
+                default: "#4d6357",
             },
         },
         emits: {},

src/views/IntegratedAlarm/index.vue

@@ -65,7 +65,7 @@
             <div class="sand-table-bottom"
                 :style="$store.state.themeName === 'dark' ? 'right: calc(50vw - 545px);' : 'right: calc(50vw - 590px);'"
                 v-if="showPanel">
-                <Ppanel title="利用小时" :data="riseNumber(gxkmap.bg_dxkyss)" dataColor="#0a82f2" :days="gxkmap.ydxkyss"
+                <Ppanel title="利用小时" :data="riseNumber(gxkmap.bg_dxkyss)" :dataColor="$store.state.moreSty === 'blueSty' ? '#0a82f2' : '#05BB4C'" :days="gxkmap.ydxkyss"
                     :data1Icon="
             gxkmap.tb_dxkyss < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'
             " :data1IconClass="
@@ -79,7 +79,7 @@
                 ? 'svg-icon-sm svg-icon-yellow'
                 : 'svg-icon-sm svg-icon-green'
             "></Ppanel>
-                <Ppanel title="设备可利用率" class="stb-p" :data="riseNumber(gxkmap.bg_sbklyl)" dataColor="#0a82f2"
+                <Ppanel title="设备可利用率" class="stb-p" :data="riseNumber(gxkmap.bg_sbklyl)" :dataColor="$store.state.moreSty === 'blueSty' ? '#0a82f2' : '#05BB4C'"
                     daysUnit="%" :days="gxkmap.ysbklyl" :data1Icon="
             gxkmap.hb_sbklyl < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'
             " :data1IconClass="
@@ -93,7 +93,7 @@
                 ? 'svg-icon-sm svg-icon-yellow'
                 : 'svg-icon-sm svg-icon-green'
             "></Ppanel>
-                <Ppanel title="MTBF" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mtbf)" dataColor="#0a82f2"
+                <Ppanel title="MTBF" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mtbf)" :dataColor="$store.state.moreSty === 'blueSty' ? '#0a82f2' : '#05BB4C'"
                     :days="gxkmap.mtbf" :data1Icon="gxkmap.hb_mtbf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
                     :data1IconClass="
             gxkmap.hb_mtbf < 0
@@ -104,7 +104,7 @@
                 ? 'svg-icon-sm svg-icon-yellow'
                 : 'svg-icon-sm svg-icon-green'
             "></Ppanel>
-                <Ppanel title="MTTR" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mttr)" dataColor="#0a82f2"
+                <Ppanel title="MTTR" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mttr)" :dataColor="$store.state.moreSty === 'blueSty' ? '#0a82f2' : '#05BB4C'"
                     :days="gxkmap.mttr" :data1Icon="gxkmap.hb_mttr < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
                     :data1IconClass="
             gxkmap.hb_mttr < 0
@@ -115,7 +115,7 @@
                 ? 'svg-icon-sm svg-icon-yellow'
                 : 'svg-icon-sm svg-icon-green'
             "></Ppanel>
-                <Ppanel title="MTTF" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mttf)" dataColor="#0a82f2"
+                <Ppanel title="MTTF" class="stb-p" :data="'0.1' || riseNumber(gxkmap.bg_mttf)" :dataColor="$store.state.moreSty === 'blueSty' ? '#0a82f2' : '#05BB4C'"
                     :days="gxkmap.mttf" :data1Icon="gxkmap.hb_mttf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
                     :data1IconClass="
             gxkmap.hb_mttf < 0

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/dataJson.json

@@ -216,6 +216,430 @@
                 "point": 9809.02,
                 "ordernum": null
             }
+        ],
+        "data1": [
+            {
+                "id": "SXJ_KGDL_XWT_FDC_STA",
+                "name": "13期次",
+                "llfdl": 72.47,
+                "sjfdl": 41.09,
+                "speed": 5.91,
+                "fjhjx": 77.97,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 5.41,
+                "fnlly": 25.42,
+                "point": 159.72,
+                "ordernum": 1
+            },
+            {
+                "id": "SXJ_KGDL_BHB_FDC_STA",
+                "name": "03期次",
+                "llfdl": 205.19,
+                "sjfdl": 206.02,
+                "speed": 5.58,
+                "fjhjx": 0.0,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 5.17,
+                "fnlly": 56.67,
+                "point": 102.71,
+                "ordernum": 2
+            },
+            {
+                "id": "SXJ_KGDL_YF_FDC_STA",
+                "name": "06期次",
+                "llfdl": 689.16,
+                "sjfdl": 365.82,
+                "speed": 5.07,
+                "fjhjx": 0.0,
+                "jhjx": 10.62,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 8.71,
+                "fnlly": 57.86,
+                "point": 598.08,
+                "ordernum": 3
+            },
+            {
+                "id": "SXJ_KGDL_BHB3_FDC_STA",
+                "name": "04期次",
+                "llfdl": 478.1,
+                "sjfdl": 361.29,
+                "speed": 5.68,
+                "fjhjx": 5.6,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 5.21,
+                "fnlly": 56.09,
+                "point": 905.91,
+                "ordernum": 4
+            },
+            {
+                "id": "SXJ_KGDL_PDL_FDC_STA",
+                "name": "11期次",
+                "llfdl": 411.38,
+                "sjfdl": 400.64,
+                "speed": 7.53,
+                "fjhjx": 1.78,
+                "jhjx": 4.63,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 14.34,
+                "fnlly": 45.5,
+                "point": 307.52,
+                "ordernum": 5
+            },
+            {
+                "id": "SXJ_KGDL_NJL_FDC_STA",
+                "name": "01期次",
+                "llfdl": 665.82,
+                "sjfdl": 427.97,
+                "speed": 6.79,
+                "fjhjx": 0.38,
+                "jhjx": 22.43,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 15.03,
+                "fnlly": 66.08,
+                "point": 562.4,
+                "ordernum": 6
+            },
+            {
+                "id": "SXJ_KGDL_DJY_FDC_STA",
+                "name": "14期次",
+                "llfdl": 83.19,
+                "sjfdl": 84.04,
+                "speed": 0.24,
+                "fjhjx": 0.0,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.16,
+                "fnlly": 79.82,
+                "point": 51.51,
+                "ordernum": 7
+            },
+            {
+                "id": "SXJ_KGDL_GJY_FDC_STA",
+                "name": "02期次",
+                "llfdl": 542.33,
+                "sjfdl": 513.97,
+                "speed": 6.11,
+                "fjhjx": 0.23,
+                "jhjx": 2.01,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 26.12,
+                "fnlly": 90.93,
+                "point": 606.56,
+                "ordernum": 8
+            },
+            {
+                "id": "SXJ_KGDL_PTZ_FDC_STA",
+                "name": "09期次",
+                "llfdl": 318.73,
+                "sjfdl": 602.91,
+                "speed": 5.13,
+                "fjhjx": 0.0,
+                "jhjx": 21.47,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 4.35,
+                "fnlly": 56.41,
+                "point": 390.6,
+                "ordernum": 9
+            },
+            {
+                "id": "SXJ_KGDL_HSM_FDC_STA",
+                "name": "05期次",
+                "llfdl": 349.81,
+                "sjfdl": 338.02,
+                "speed": 4.78,
+                "fjhjx": 0.0,
+                "jhjx": 8.25,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 3.54,
+                "fnlly": 96.63,
+                "point": 314.79,
+                "ordernum": 10
+            },
+            {
+                "id": "SXJ_KGDL_ZK_FDC_STA",
+                "name": "07期次",
+                "llfdl": 385.34,
+                "sjfdl": 384.07,
+                "speed": 4.02,
+                "fjhjx": 0.0,
+                "jhjx": 0.57,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.7,
+                "fnlly": 99.78,
+                "point": 343.87,
+                "ordernum": 11
+            },
+            {
+                "id": "SXJ_KGDL_YTY_FDC_STA",
+                "name": "08期次",
+                "llfdl": 95.47,
+                "sjfdl": 92.61,
+                "speed": 5.52,
+                "fjhjx": 0.84,
+                "jhjx": 1.34,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.69,
+                "fnlly": 98.54,
+                "point": 115.02,
+                "ordernum": 12
+            },
+            {
+                "id": "SXJ_KGDL_YLZ_FDC_STA",
+                "name": "10期次",
+                "llfdl": 500.3,
+                "sjfdl": 409.79,
+                "speed": 4.12,
+                "fjhjx": 0.05,
+                "jhjx": 0.14,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.31,
+                "fnlly": 99.9,
+                "point": 250.33,
+                "ordernum": 13
+            },
+            {
+                "id": "hj",
+                "name": "合计",
+                "llfdl": 4917.29,
+                "sjfdl": 4627.24,
+                "speed": 5.11,
+                "fjhjx": 122.85,
+                "jhjx": 75.46,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 91.74,
+                "fnlly": 96.75,
+                "point": 5809.02,
+                "ordernum": null
+            }
+        ],
+        "data2": [
+            {
+                "id": "SXJ_KGDL_XWT_FDC_STA",
+                "name": "13集电线",
+                "llfdl": 172.47,
+                "sjfdl": 61.09,
+                "speed": 5.91,
+                "fjhjx": 107.97,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 3.41,
+                "fnlly": 35.42,
+                "point": 189.72,
+                "ordernum": 1
+            },
+            {
+                "id": "SXJ_KGDL_BHB_FDC_STA",
+                "name": "03集电线",
+                "llfdl": 275.19,
+                "sjfdl": 266.02,
+                "speed": 5.58,
+                "fjhjx": 0.0,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 9.17,
+                "fnlly": 96.67,
+                "point": 302.71,
+                "ordernum": 2
+            },
+            {
+                "id": "SXJ_KGDL_YF_FDC_STA",
+                "name": "06集电线",
+                "llfdl": 1089.16,
+                "sjfdl": 1065.82,
+                "speed": 5.07,
+                "fjhjx": 0.0,
+                "jhjx": 14.62,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 8.71,
+                "fnlly": 97.86,
+                "point": 1198.08,
+                "ordernum": 3
+            },
+            {
+                "id": "SXJ_KGDL_BHB3_FDC_STA",
+                "name": "04集电线",
+                "llfdl": 878.1,
+                "sjfdl": 861.29,
+                "speed": 5.68,
+                "fjhjx": 11.6,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 5.21,
+                "fnlly": 98.09,
+                "point": 965.91,
+                "ordernum": 4
+            },
+            {
+                "id": "SXJ_KGDL_PDL_FDC_STA",
+                "name": "11集电线",
+                "llfdl": 461.38,
+                "sjfdl": 440.64,
+                "speed": 7.53,
+                "fjhjx": 1.78,
+                "jhjx": 4.63,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 14.34,
+                "fnlly": 95.5,
+                "point": 507.52,
+                "ordernum": 5
+            },
+            {
+                "id": "SXJ_KGDL_NJL_FDC_STA",
+                "name": "01集电线",
+                "llfdl": 965.82,
+                "sjfdl": 927.97,
+                "speed": 6.79,
+                "fjhjx": 0.38,
+                "jhjx": 22.43,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 15.03,
+                "fnlly": 96.08,
+                "point": 1062.4,
+                "ordernum": 6
+            },
+            {
+                "id": "SXJ_KGDL_DJY_FDC_STA",
+                "name": "14集电线",
+                "llfdl": 83.19,
+                "sjfdl": 83.04,
+                "speed": 0.24,
+                "fjhjx": 0.0,
+                "jhjx": 0.0,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.16,
+                "fnlly": 99.82,
+                "point": 91.51,
+                "ordernum": 7
+            },
+            {
+                "id": "SXJ_KGDL_GJY_FDC_STA",
+                "name": "02集电线",
+                "llfdl": 642.33,
+                "sjfdl": 613.97,
+                "speed": 6.11,
+                "fjhjx": 0.23,
+                "jhjx": 2.01,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 26.12,
+                "fnlly": 98.93,
+                "point": 906.56,
+                "ordernum": 8
+            },
+            {
+                "id": "SXJ_KGDL_PTZ_FDC_STA",
+                "name": "09集电线",
+                "llfdl": 718.73,
+                "sjfdl": 692.91,
+                "speed": 5.13,
+                "fjhjx": 0.0,
+                "jhjx": 21.47,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 4.35,
+                "fnlly": 96.41,
+                "point": 790.6,
+                "ordernum": 9
+            },
+            {
+                "id": "SXJ_KGDL_HSM_FDC_STA",
+                "name": "05集电线",
+                "llfdl": 349.81,
+                "sjfdl": 338.02,
+                "speed": 4.78,
+                "fjhjx": 0.0,
+                "jhjx": 8.25,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 3.54,
+                "fnlly": 96.63,
+                "point": 384.79,
+                "ordernum": 10
+            },
+            {
+                "id": "SXJ_KGDL_ZK_FDC_STA",
+                "name": "07集电线",
+                "llfdl": 585.34,
+                "sjfdl": 584.07,
+                "speed": 4.02,
+                "fjhjx": 0.0,
+                "jhjx": 0.57,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.7,
+                "fnlly": 99.78,
+                "point": 643.87,
+                "ordernum": 11
+            },
+            {
+                "id": "SXJ_KGDL_YTY_FDC_STA",
+                "name": "08集电线",
+                "llfdl": 195.47,
+                "sjfdl": 192.61,
+                "speed": 5.52,
+                "fjhjx": 0.84,
+                "jhjx": 1.34,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.69,
+                "fnlly": 98.54,
+                "point": 215.02,
+                "ordernum": 12
+            },
+            {
+                "id": "SXJ_KGDL_YLZ_FDC_STA",
+                "name": "10集电线",
+                "llfdl": 500.3,
+                "sjfdl": 499.79,
+                "speed": 4.12,
+                "fjhjx": 0.05,
+                "jhjx": 0.14,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 0.31,
+                "fnlly": 99.9,
+                "point": 550.33,
+                "ordernum": 13
+            },
+            {
+                "id": "hj",
+                "name": "合计",
+                "llfdl": 8917.29,
+                "sjfdl": 8627.24,
+                "speed": 5.11,
+                "fjhjx": 122.85,
+                "jhjx": 75.46,
+                "sl": 0.0,
+                "xd": 0.0,
+                "xn": 91.74,
+                "fnlly": 96.75,
+                "point": 9809.02,
+                "ordernum": null
+            }
         ]
     }
 }

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -73,7 +73,7 @@
                     <el-table-column align="center" prop="" label="" width="850"></el-table-column>
                     <el-table-column v-for="item in tableHeader" :key="item.code" header-align="center"
                         :align="item.code == 'name' ? 'center' : 'right'" :prop="item.code" :label="item.name" :width="
-              item.code == 'name' ? 143 : item.name.length == 2 ? 85 : 110
+              item.code == 'name' ? 143 : item.name.length == 2 ? 85 : 103
             " show-overflow-tooltip>
                         <template #header>
                             <div style="display: flex; flex-direction: column">
@@ -316,7 +316,7 @@
                 this.getPerformance();
             },
             initialization() {
-                this.dataChange(dataJson)
+                this.dataChange(dataJson.data.data)
                 companys().then(({
                     data: res
                 }) => {
@@ -422,7 +422,14 @@
             },
             typeClick(data) {
                 this.typeIndex = data;
-                this.getPerformance();
+                // this.getPerformance();
+                if(data === "1") {
+                    this.dataChange(dataJson.data.data)
+                } else if(data === "2") {
+                    this.dataChange(dataJson.data.data1)
+                } else if(data === "3") {
+                    this.dataChange(dataJson.data.data2)
+                }
             },
             getPerformance() {
                 this.BASE.showLoading();
@@ -454,8 +461,8 @@
                         this.BASE.closeLoading();
                     });
             },
-            dataChange(res) {
-                if (res.data.data && res.data.data.length) {
+            dataChange(datas) {
+                if (datas && datas.length) {
                     let name = [],
                         data = [],
                         llfdl = [],
@@ -467,7 +474,7 @@
                             "受累损失电量",
                             "性能损失电量",
                         ]; //项目列表
-                    res.data.data.forEach((item, index) => {
+                    datas.forEach((item, index) => {
                         name.push(item.name);
                         data.push([
                             item.sjfdl,
@@ -510,7 +517,7 @@
                     setTimeout(() => {
                         this.showDisplay = true;
                     }, 10);
-                    this.tableData = res.data.data;
+                    this.tableData = datas;
                     this.BASE.closeLoading();
                 } else {
                     this.tableData = [];

src/views/economicsOperation/nxfHomePage/component/percent-bar.vue

@@ -187,7 +187,7 @@
                 } else {
                     colorList = [
                         new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                            offset: 0, color: 'rgb(81, 232, 166)' // 颜色渐变
+                            offset: 0, color: 'rgb(33, 187, 76)' // 颜色渐变
                         }, {
                             offset: 1, color: 'rgb(36, 215, 129)'   // 颜色渐变rgb(36, 215, 129)
                         }]),

src/views/economicsOperation/photovoltaicAnalyse/timeTransition/index.vue

@@ -144,10 +144,11 @@ export default {
     };
   },
   mounted() {
-    this.EvaluationData = dataJson.data.data.records;
-      this.page.total = dataJson.data.data.total;
+    // this.EvaluationData = dataJson.data.data.records;
+    //   this.page.total = dataJson.data.data.total;
     this.getCompanyData();
     this.pickerTimer = dayjs().add(-1, "day").startOf("date");
+    this.changeData(dataJson.data)
   },
   computed: {
     pageHeight() {
@@ -251,7 +252,10 @@ export default {
         pageSize: this.page.pagesize,
       };
       const { data: datas } = await getApiphotovoltaicTimelist(params);
-      if (datas && datas.data) {
+      this.changeData(datas)
+    },
+    changeData(datas) {
+        if (datas && datas.data) {
         let arr = [];
         for (let i in datas.data) {
           let obj = {

src/views/stateMonitor/LightMatrix/index.vue

@@ -374,6 +374,7 @@
     </el-scrollbar>
   </div>
   <el-dialog
+  :fullscreen="true"
     width="90%"
     top="40px"
     v-model="displayMatrix"
@@ -388,13 +389,13 @@
     <div class="dialog-body" style="height: 900px">
       <img class="dialog-img" src="@assets/imgs/dialog.png" />
       <windDetail
-        v-show="wtType == -1"
+        v-if="wtType == -1"
         :wind="wind"
         :wtType="wtType"
         :flag="flag"
       ></windDetail>
       <lightDetail
-        v-show="wtType == -2"
+        v-if="wtType == -2"
         :wind="wind"
         :wtType="wtType"
         :flag="flag"
@@ -581,7 +582,8 @@ export default {
     // 查看风机详情
     goDetails(wt, type, wpid) {
       this.displayMatrix = true;
-      this.wtType = type;
+      this.wtType = -1;
+    //   this.wtType = type;
       this.$nextTick(() => {
         this.wind = { ...wt, wtType: type, wpid };
         this.flag = true;

src/views/stateMonitor/factoryMonitor/windPowerPlant/components/barCharts.vue

@@ -54,6 +54,17 @@ export default {
         "#1c99ff",
       ],
     },
+    color1: {
+      type: Array,
+      default: () => [
+        "#21bb4c",
+        "#ea8b00",
+        "#05bb4c",
+        "#edbf00",
+        "#C530C8",
+        "#1c99ff",
+      ],
+    },
     showAnimation: {
       type: Boolean,
       default: true,
@@ -160,7 +171,7 @@ export default {
             animation: this.firstAnimation && this.showAnimation,
             yAxisIndex: 0,
             itemStyle: {
-              borderColor: this.color[index],
+              borderColor: this.$store.state.moreSty === 'greenSty' ? this.color1[index] : this.color[index],
               borderWidth: 1,
               // shadowBlur: 1,
               // shadowColor: "#16ADD4",
@@ -191,7 +202,7 @@ export default {
             x2: 0,
             y2: 1,
             colorStops: [
-              { offset: 0, color: "#1c99ff" }, // 设置颜色渐变
+              { offset: 0, color: this.$store.state.moreSty === 'greenSty' ? "#21bb4c" : "#1c99ff" }, // 设置颜色渐变
               { offset: 1, color: "rgba(0,70,212,0)" },
             ],
           },
@@ -353,6 +364,11 @@ export default {
       this.initChart();
     });
   },
+  watch: {
+    "$store.state.moreSty"() {
+        this.initChart();
+    },
+    },
   unmounted() {
     window.removeEventListener("resize", this.resize);
   },

src/views/stateMonitor/factoryMonitor/windPowerPlant/windPower/components/thermometer.vue

@@ -283,6 +283,9 @@ export default {
         this.getChart();
       },
     },
+    "$store.state.moreSty"(val) {
+        this.getChart();
+    },
   },
   unmounted() {},
 };

src/views/stateMonitor/factoryMonitor/windPowerPlant/windPower/components/wave.vue

@@ -189,13 +189,14 @@ export default {
 </script>
 
 <style lang="less">
-.wave[data-type~="greenSty"] {
-    z-index: -1;
-}
-.wave[data-type~="blueSty"] {
-    z-index: 0;
-}
+// .wave[data-type~="greenSty"] {
+//     z-index: -1;
+// }
+// .wave[data-type~="blueSty"] {
+//     z-index: 0;
+// }
 .wave {
+    z-index: 0;
   position: absolute;
   left: 42px;
   top: 0;

src/views/stateMonitor/powerPredictMatrix/dataJson.json

@@ -55,5 +55,29 @@
             "ycfs": [147,258,123,123,456,123,159,357],
             "xAxis": ["09-09 02:00:00","09-10 02:00:00","09-11 02:00:00","09-12 02:00:00","09-12 02:00:00","09-13 02:00:00","09-14 02:00:00","09-15 02:00:00"]
         }
-    ]
+    ],
+    "diaData": {
+        "测试1": [
+            {
+                "name": "测试风场1",
+                "ycgl": [147,258,369,123,456,789,159,357],
+                "llgl": [123,258,159,123,456,789,159,357],
+                "sjgl": [147,123,357,123,456,357,159,357],
+                "pjfs": [147,258,369,357,456,357,159,357],
+                "ycfs": [147,258,123,123,456,123,159,357],
+                "xAxis": ["09-09 02:00:00","09-10 02:00:00","09-11 02:00:00","09-12 02:00:00","09-12 02:00:00","09-13 02:00:00","09-14 02:00:00","09-15 02:00:00"]
+            }
+        ],
+        "测试2": [
+            {
+                "name": "测试风场2",
+                "ycgl": [147,258,369,123,456,789,159,357],
+                "llgl": [123,258,159,123,456,789,159,357],
+                "sjgl": [147,123,357,123,456,357,159,357],
+                "pjfs": [147,258,369,357,456,357,159,357],
+                "ycfs": [147,258,123,123,456,123,159,357],
+                "xAxis": ["09-09 02:00:00","09-10 02:00:00","09-11 02:00:00","09-12 02:00:00","09-12 02:00:00","09-13 02:00:00","09-14 02:00:00","09-15 02:00:00"]
+            }
+        ]
+    }
 }

src/views/stateMonitor/powerPredictMatrix/index.vue

@@ -136,7 +136,7 @@ export default {
       format: "YYYY-MM-DD",
       doubleChartData: [],
       singleChartData: {},
-      isDouble: false,
+      isDouble: true,
       showWpid: "",
       isSearch: false,
       timer: null,
@@ -227,12 +227,18 @@ export default {
       for (let index in res) {
         resData[index].name = res[index][0].name;
         res[index].forEach((ele) => {
-          resData[index].pjfs.push(ele.pjfs);
-          resData[index].ycfs.push(ele.ycfs);
-          resData[index].sjgl.push(ele.sjgl);
-          resData[index].ycgl.push(ele.ycgl);
-          resData[index].llgl.push(ele.llgl);
-          resData[index].xAxis.push(dayjs(ele.hours).format("MM-DD HH:mm:ss"));
+        //   resData[index].pjfs.push(ele.pjfs);
+        //   resData[index].ycfs.push(ele.ycfs);
+        //   resData[index].sjgl.push(ele.sjgl);
+        //   resData[index].ycgl.push(ele.ycgl);
+        //   resData[index].llgl.push(ele.llgl);
+        //   resData[index].xAxis.push(dayjs(ele.hours).format("MM-DD HH:mm:ss"));
+        resData[index].pjfs= ele.pjfs;
+        resData[index].ycfs= ele.ycfs;
+        resData[index].sjgl= ele.sjgl;
+        resData[index].ycgl= ele.ycgl;
+        resData[index].llgl= ele.llgl;
+        resData[index].xAxis = ele.xAxis
         });
       }
       return resData;
@@ -243,7 +249,9 @@ export default {
       this.showWpid = id;
       this.beginDate = dayjs().startOf("day").format(this.format);
       this.endDate = dayjs().add(10, "day").format(this.format);
-      this.getPowerData();
+      this.displayDialog = true;
+    //   this.getPowerData();
+        this.doubleChartData = this.dealRes(dataJson.diaData);
     },
     getPowerData() {
       GetPowerData({