update

src/App.vue

@@ -253,7 +253,7 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
         :collapse="true"
         text-color="#ffffff"
         active-text-color="#6262a2"
-        background-color="#36348e"
+        background-color="#3d67a2"
         @select="selectMenu"
         v-if="hideMenus === '0'"
       >
@@ -288,7 +288,7 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       class="main-body"
       :style="
         $store.state.themeName === 'light' && hideMenus === '0'
-          ? 'margin-left: 66px; max-width  : calc(100vw - 54px - 12px);'
+          ? 'margin-left: 52px; max-width  : calc(100vw - 54px - 12px);'
           : ''
       "
     >
@@ -609,4 +609,5 @@ body {
   height: 116px !important;
 }
 
+
 </style>

src/api/wisdomOverhaul/reliability/index.js

@@ -11,7 +11,16 @@ const countQuery = (showLoading,data) => {
     return request({
         showLoading,
         baseURL: process.env.VUE_APP_Matrix,
-        url: `alarm/count/query/new2?stationid=${data.stationid}&startdate=${data.startdate}&enddate=${data.enddate}`,
+        url: `alarm/findEarlyWarningAnalysis?stationid=${data.stationid}&startdate=${data.startdate}&enddate=${data.enddate}`,
+        method: "get",
+    });
+};
+// 预警分析
+const radarGzfx = (showLoading,data) => {
+    return request({
+        showLoading,
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `radar/gzfx?stId=${data.stId}&Date=${data.Date}`,
         method: "get",
     });
 };
@@ -25,7 +34,7 @@ const treeType = (data) => {
 const shutdownList = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `shutdown/list?stId=${data.stId}&endDate=${data.endDate}&startDate=${data.startDate}`,
+        url: `alarm/findRecentFault?stId=${data.stId}&endDate=${data.endDate}&startDate=${data.startDate}`,
         method: "get",
     });
 };
@@ -51,4 +60,5 @@ export default {
     shutdownList,
     earlyWarn,
     failurestatistics,
+    radarGzfx
 }

src/assets/styles/el-override/el-card.less

@@ -2,8 +2,6 @@
   .el-card {
     background: transparent;
     border-color: fade(@gray, 50);
-    border-radius: 0;
-
     .el-card__header {
       color: @gray-l;
       background: fade(@gray, 20);

src/assets/styles/theme/light/light-jsc.less

@@ -314,7 +314,7 @@
     }
 
     .lightMenu.show {
-        width     : 54px;
+        width     : 46px;
         transition: @transition;
     }
 
@@ -360,15 +360,20 @@
     }
 
     .lightMenu .el-sub-menu__title {
-        text-align    : center;
-        vertical-align: middle;
-        padding       : 0 20px;
+            display: flex;
+            justify-content: center;
         transition    : @transition;
     }
+    .lightMenu .el-sub-menu__title:hover{
+        background-color: rgb(28 67 122)!important;
+        transition: 0.7s!important;
+        border-radius: 0;
+    }
 
     .lightMenu .el-sub-menu__title i {
         color     : #fff;
         transition: @transition;
+        font-size: 18px;
     }
 	
 	.el-popper.is-light.is-pure .el-menu--popup {

src/components/chart/line/double-line-chart.vue

@@ -130,7 +130,6 @@ export default {
   watch: {
     list: {
       handler(newValue, oldValue) {
-        console.warn(newValue);
         this.newlist = newValue;
         this.$nextTick(() => {
           this.initChart();
@@ -160,16 +159,16 @@ export default {
     },
     xdata() {
       return this.newlist[0]?.value.map((t) => {
-        return t.text;
+        return t.speed;
       });
     },
     series() {
       let result = [];
       this.newlist.forEach((value, index) => {
         result.push({
-          name: value.title,
+          name: value.name,
           type: "line",
-          smooth: value.smooth,
+          // smooth: value.smooth,
           showSymbol: false,
           zlevel: index,
           lineStyle: {
@@ -178,9 +177,9 @@ export default {
               width: 1,
             },
           },
-          yAxisIndex: value.yAxisIndex,
+          yAxisIndex: value.yAxisIndex ||0,
           data: value.value.map((t) => {
-            return t.value;
+            return t.actualpower;
           }),
         });
       });

src/views/Decision/Decision3Db.vue

@@ -227,19 +227,9 @@ export default {
     ChangZhanVal() {
       api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
-        this.value1 = res.data[0].code
-        this.XiangMuVal(res.data[0].code)
+        this.value1 = res.data[0].code;
+        this.XiangMuVal(res.data[0].code);
       });
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wplist",
-      //   success(res) {
-      //     that.ChangZhan = res.data;
-      //   },
-      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -250,26 +240,13 @@ export default {
     XiangMuVal(val) {
       api
         .benchmarkingWtList({
-          wpid: val?val:'',
+          wpid: val ? val : "",
         })
         .then((res) => {
           this.XiangMu = res.data;
-          this.value2.push(res.data[0].id)
+          this.value2.push(res.data[0].id);
           this.AjaxCommon();
         });
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wtList",
-      //   data: {
-      //     wpid: val,
-      //   },
-      //   success(res) {
-      //     that.XiangMu = res.data;
-      //   },
-      // });
     },
     XiangMuChange(val) {
       var that = this;
@@ -293,6 +270,7 @@ export default {
       }
     },
     AjaxCommon() {
+      this.list = []
       api
         .ajaxName({
           ajaxName: this.ajaxName,
@@ -392,109 +370,6 @@ export default {
           this.tableData.data = data2;
         });
 
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/" + that.ajaxName,
-      //   data: {
-
-      //     wpid: that.value1,
-      //     wtids: that.value2,
-      //     date: that.value4,
-      //     target: "",
-      //     sort: "",
-      //   },
-      //   success(res) {
-      //     var data = res.data,
-      //       data2 = [],
-      //       chart = [],
-      //       fzy = [],
-      //       fzyArr = [],
-      //       jfpl = [],
-      //       jfplArr = [];
-      //     let thisItem = [];
-      //     jfpl = data.pop(); //静风频率
-      //     fzy = data.pop(); //风资源
-      //     if (fzy["1"] == null) {
-      //       that.BASE.showMsg({
-      //         msg: "此风机无数据",
-      //         type: "success",
-      //       });
-      //       return false;
-      //     }
-      //     data.forEach((ele, index) => {
-      //       for (let key in ele) {
-      //         if (key !== "name") {
-      //           thisItem.push(ele[key]);
-      //         }
-      //       }
-      //     });
-
-      //     var count = thisItem.length / data.length;
-
-      //     data.forEach((item, index) => {
-      //       data2.push({
-      //         index: index + 1,
-      //         name: item.name,
-      //         data1: thisItem[index * count],
-      //         data2: count >= 2 ? thisItem[index * count + 1] : [],
-      //         data3: count >= 3 ? thisItem[index * count + 2] : [],
-      //         data4: count >= 4 ? thisItem[index * count + 3] : [],
-      //         data5: count >= 5 ? thisItem[index * count + 4] : [],
-      //         is_light: false,
-      //       });
-      //     });
-
-      //     Object.keys(fzy).map((key) => {
-      //       fzyArr.push(fzy[key]);
-      //     });
-      //     Object.keys(jfpl).map((key) => {
-      //       jfplArr.push(jfpl[key]);
-      //     });
-      //     fzyArr.pop();
-      //     var jfplName = jfplArr.pop();
-      //     var indicator = [
-      //       "北",
-      //       "北北西",
-      //       "北西",
-      //       "西北西",
-      //       "西",
-      //       "西南西",
-      //       "南西",
-      //       "南南西",
-      //       "南",
-      //       "南南东",
-      //       "东南",
-      //       "东南东",
-      //       "东",
-      //       "东北东",
-      //       "北东",
-      //       "北北东",
-      //     ];
-
-      //     var fzyDataArr = [];
-      //     fzyArr.forEach((item, index) => {
-      //       var arr = [];
-      //       item.forEach((e, i) => {
-      //         arr.push(e.value);
-      //       });
-      //       fzyDataArr.push([
-      //         {
-      //           indicator: indicator,
-      //           data: [
-      //             {
-      //               value: arr,
-      //             },
-      //           ],
-      //           name: jfplArr[index],
-      //         },
-      //       ]);
-      //     });
-      //     that.fzyData = fzyDataArr;
-      //     that.tableData.data = data2;
-      //   },
-      // });
 
       api
         .benchmarkingDjhxdbbottom({
@@ -503,115 +378,62 @@ export default {
           date: this.value4,
         })
         .then((res) => {
-          console.log(res);
-          var data = res.data;
-          var arrName = [],
-            arrKey = [],
-            arrData = [],
-            tempArray = [];
-          data.forEach((ele) => {
-            for (let key in ele) {
-              if (key !== "name") {
-                arrKey.push(key);
-                arrData.push(ele[key]);
-              } else {
-                arrName.push(ele[key]);
-              }
-            }
-          });
-          this.listName = arrName;
-          for (var i = 0; i < arrKey.length - 1; i++) {
-            //冒泡排序
-            for (var j = 0; j < arrKey.length - 1 - i; j++) {
-              if (parseInt(arrKey[j]) > parseInt(arrKey[j + 1])) {
-                var temp = arrKey[j];
-                arrKey[j] = arrKey[j + 1];
-                arrKey[j + 1] = temp;
-                var temp2 = arrData[j];
-                arrData[j] = arrData[j + 1];
-                arrData[j + 1] = temp2;
-              }
-            }
+          console.log(res.data);
+     
+          // var data = res.data;
+          // var arrName = [],
+          //   arrKey = [],
+          //   arrData = [],
+          //   tempArray = [];
+          // data?.forEach((ele) => {
+          //   for (let key in ele) {
+          //     if (key !== "name") {
+          //       arrKey.push(key);
+          //       arrData.push(ele[key]);
+          //     } else {
+          //       arrName.push(ele[key]);
+          //     }
+          //   }
+          // });
+          // this.listName = arrName;
+          // for (var i = 0; i < arrKey.length - 1; i++) {
+          //   //冒泡排序
+          //   for (var j = 0; j < arrKey.length - 1 - i; j++) {
+          //     if (parseInt(arrKey[j]) > parseInt(arrKey[j + 1])) {
+          //       var temp = arrKey[j];
+          //       arrKey[j] = arrKey[j + 1];
+          //       arrKey[j + 1] = temp;
+          //       var temp2 = arrData[j];
+          //       arrData[j] = arrData[j + 1];
+          //       arrData[j + 1] = temp2;
+          //     }
+          //   }
+          // }
+          // for (var i = 0; i < data.length; i++) {
+          //   var arr = [];
+          //   arrData.forEach((e, index) => {
+          //     if (index * data.length + i < arrData.length) {
+          //       arr.push({
+          //         text: arrKey[index * data.length + i],
+          //         value: arrData[index * data.length + i],
+          //       });
+          //     }
+          //   });
+          //   tempArray.push({
+          //     title: arrName[i],
+          //     value: arr,
+          //   });
+          // }
+          // this.list = res.data;
+          
+          for (const key in res.data) {
+            let obj = {}
+            obj.name = key
+            obj.value = res.data[key]
+            this.list.push(obj)
           }
-          for (var i = 0; i < data.length; i++) {
-            var arr = [];
-            arrData.forEach((e, index) => {
-              if (index * data.length + i < arrData.length) {
-                arr.push({
-                  text: arrKey[index * data.length + i],
-                  value: arrData[index * data.length + i],
-                });
-              }
-            });
-            tempArray.push({
-              title: arrName[i],
-              value: arr,
-            });
-          }
-          console.log(tempArray);
-          this.list = tempArray;
+          console.log(" this.list", this.list);
         });
-
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/djhxdbbottom",
-      //   data: {
-      //     wpid: that.value1,
-      //     wtids: that.value2,
-      //     date: that.value4,
-      //   },
-      //   success(res) {
-      //     console.log(res);
-      //     var data = res.data;
-
-      //     var arrName = [],
-      //       arrKey = [],
-      //       arrData = [],
-      //       tempArray = [];
-      //     data.forEach((ele) => {
-      //       for (let key in ele) {
-      //         if (key !== "name") {
-      //           arrKey.push(key);
-      //           arrData.push(ele[key]);
-      //         } else {
-      //           arrName.push(ele[key]);
-      //         }
-      //       }
-      //     });
-      //     that.listName = arrName;
-      //     for (var i = 0; i < arrKey.length - 1; i++) {
-      //       //冒泡排序
-      //       for (var j = 0; j < arrKey.length - 1 - i; j++) {
-      //         if (parseInt(arrKey[j]) > parseInt(arrKey[j + 1])) {
-      //           var temp = arrKey[j];
-      //           arrKey[j] = arrKey[j + 1];
-      //           arrKey[j + 1] = temp;
-      //           var temp2 = arrData[j];
-      //           arrData[j] = arrData[j + 1];
-      //           arrData[j + 1] = temp2;
-      //         }
-      //       }
-      //     }
-      //     for (var i = 0; i < data.length; i++) {
-      //       var arr = [];
-      //       arrData.forEach((e, index) => {
-      //         if (index * data.length + i < arrData.length) {
-      //           arr.push({
-      //             text: arrKey[index * data.length + i],
-      //             value: arrData[index * data.length + i],
-      //           });
-      //         }
-      //       });
-      //       tempArray.push({
-      //         title: arrName[i],
-      //         value: arr,
-      //       });
-      //     }
-      //     console.log(tempArray);
-      //     that.list = tempArray;
-      //   },
-      // });
     },
     reset() {
       //重置
@@ -623,8 +445,8 @@ export default {
     TypeClick(val) {
       this.TypeClass = val;
       // 重置状态start
-      this.value1 = "";
-      this.value2 = "";
+      // this.value1 = "";
+      // this.value2 = "";
       this.value4 = this.getTime(1);
       this.ajaxName = this.ajaxArr[val];
       this.AjaxCommon();

src/views/Home/Home.vue

@@ -1014,7 +1014,7 @@ export default {
               subUrl: "genreset/findGLDetail",
               targetName: "bzgl",
               dialogType: "powerLineChart",
-              max: res.data.jczbmap.zjts,
+              max: res.data.jczbmap.zjrl,
             },
             {
               title: "应发功率",
@@ -1023,7 +1023,7 @@ export default {
               subUrl: "genreset/findGLDetail",
               targetName: "yfgl",
               dialogType: "powerLineChart",
-              max: res.data.jczbmap.zjts,
+              max: res.data.jczbmap.zjrl,
             },
             {
               title: "实际功率",
@@ -1032,7 +1032,7 @@ export default {
               subUrl: "genreset/findGLDetail",
               targetName: "sjgl",
               dialogType: "powerLineChart",
-              max: res.data.jczbmap.zjts,
+              max: res.data.jczbmap.zjrl,
             },
           ];
           this.jczbmap = res.data.jczbmap;

src/views/LightMatrix1/LightMatrix1.vue

@@ -1,6 +1,10 @@
 <template >
   <el-scrollbar>
-    <div class="light-matrix">
+    <div
+      :class="
+        $store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'
+      "
+    >
       <Row class="panel-2" type="">
         <Col :span="12" class="left-50-16">
           <div class="panel">
@@ -14,7 +18,7 @@
                 <SvgIcon svgid="svg-wind-site"></SvgIcon>
               </span>
             </div>
-            <div class="item write" @click="changeShow('jrfj_FDC')">
+            <div class="item Add " @click="changeShow('jrfj_FDC')">
               <div class="curStyle">
                 <div>接入风机</div>
                 <div>{{ sourceMap.fcjrnum || "---" }}</div>
@@ -26,7 +30,7 @@
                 <div>{{ sourceMap.fcyxnum || "---" }}</div>
               </div>
             </div>
-            <div class="item green" @click="changeShow('dj_FDC', 0)">
+            <div class="item green " @click="changeShow('dj_FDC', 0)">
               <div class="curStyle">
                 <div>· 待机</div>
                 <div>{{ sourceMap.fcdjnum || "---" }}</div>
@@ -79,7 +83,7 @@
                 ></SvgIcon>
               </span>
             </div>
-            <div class="item write" @click="changeShow('jrfj1_GDC')">
+            <div class="item Add " @click="changeShow('jrfj1_GDC')">
               <div class="curStyle">
                 <div>逆变器</div>
                 <div>{{ sourceMap.gfjrnum || "---" }}</div>
@@ -91,7 +95,7 @@
                 <div>{{ sourceMap.gfyxnum || "---" }}</div>
               </div>
             </div>
-            <div class="item greenv" @click="changeShow('dj1_GDC', 0)">
+            <div class="item green " @click="changeShow('dj1_GDC', 0)">
               <div class="curStyle">
                 <div>· 待机</div>
                 <div>{{ sourceMap.gfdjnum || "---" }}</div>
@@ -151,7 +155,7 @@
               >
                 <span class="sub-title">{{ fcItem.text }}</span>
                 <span class="sub-count" :class="fcItem.color">{{
-                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
+                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]||'0'
                 }}</span>
               </div>
             </div>
@@ -175,7 +179,7 @@
               >
                 <span class="sub-title">{{ fcItem.text }}</span>
                 <span class="sub-count" :class="fcItem.color">{{
-                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
+                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]||'0'
                 }}</span>
               </div>
             </div>
@@ -232,7 +236,7 @@ export default {
       fcStateArray: [
         {
           text: "接入台数",
-          color: "write",
+          color: "",
           key: "jrts",
         },
         {
@@ -247,7 +251,7 @@ export default {
         },
         {
           text: "限电台数",
-          color: "purple",
+          color: "pink",
           key: "xdts",
         },
         {
@@ -262,7 +266,7 @@ export default {
         },
         {
           text: "受累台数",
-          color: "write",
+          color: "black",
           key: "slts",
         },
         {
@@ -272,44 +276,44 @@ export default {
         },
         {
           text: "风速",
-          color: "gray",
+          color: "gray1",
           key: "ssfs",
         },
         {
           text: "预测功率",
-          color: "gray",
+          color: "gray1",
           key: "ycgl",
         },
         {
           text: "保证功率",
-          color: "gray",
+          color: "gray1",
           key: "bzgl",
         },
         {
           text: "应发功率",
-          color: "gray",
+          color: "gray1",
           key: "yfgl",
         },
         {
           text: "实际功率",
-          color: "gray",
+          color: "gray1",
           key: "sjgl",
         },
         {
           text: "AGC指令",
-          color: "gray",
+          color: "gray1",
           key: "agcygsd",
         },
         {
           text: "出线功率",
-          color: "gray",
+          color: "gray1",
           key: "agccxyg",
         },
       ],
       fcStateArray1: [
         {
           text: "接入台数",
-          color: "write",
+          color: "",
           key: "jrts",
         },
         {
@@ -577,6 +581,371 @@ export default {
       }
 
       &.write {
+        background-color: black;
+        // color: @write;
+        color: #fff;
+      }
+      &.Add{
+         color: #000 !important;
+         font-size: 17px;
+         font-weight: 700;
+      }
+      &.green {
+       background-color: #24a13a!important;
+        // color: @green;
+        color: #fff !important;
+      }
+
+      &.blue {
+        background-color: #00a5db;
+        // color: @darkBlue;
+        color: #fff;
+      }
+
+      &.pink {
+       background-color: #b10e7e;
+        // color: @pink;
+        color: #fff;
+      }
+
+      &.red {
+        background-color: #cb2020;
+        // color: @red;
+        color: #fff;
+      }
+
+      &.orange {
+         background-color: fade(@orange, 100%);
+        // color: @orange;
+        color: #fff;
+      }
+
+      &.gray {
+         background-color: #929ca3;
+        color: #fff !important;
+      }
+
+      div {
+        line-height: 2.222vh;
+
+        &:first-child {
+          font-size: @fontsize-s;
+        }
+        &:last-child {
+          font-size: @fontsize;
+          // font-family: "Bicubik";
+        }
+      }
+    }
+
+    .item2 {
+      flex: 1;
+      display: flex;
+      width: 20%;
+      flex-wrap: wrap;
+
+      .name {
+        color: @gray;
+        width: 50%;
+        text-align: center;
+      }
+
+      .num2 {
+        width: 50%;
+        color: @yellow;
+        text-align: left;
+      }
+
+      .num1 {
+        width: 50%;
+        color: @yellow;
+        text-align: center;
+        position: relative;
+
+        &::after {
+          content: "";
+          position: absolute;
+          width: 1.481vh;
+          height: 0.556vh;
+          background-color: @yellow;
+          left: 1.204vh;
+          top: 0.741vh;
+        }
+      }
+
+      .num3 {
+        width: 50%;
+        color: @yellow;
+        text-align: left;
+      }
+    }
+  }
+
+  .panel-box {
+    margin-top: 0.7407vh;
+    flex-grow: 1;
+
+    .panel-title {
+      width: 100%;
+      line-height: @titleHeight;
+      background-color: fade(@darkgray, 40%);
+
+      .panel-title-name {
+        width: 99%;
+        font-size: 14px;
+        color: @green;
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        justify-content: center;
+        padding-left: 16px;
+
+        i {
+          margin-right: 0.7407vh;
+        }
+
+        .sub-title-item {
+          display: flex;
+          flex: 1;
+
+          .sub-title {
+            flex: 0 0 auto;
+            color: #000000;
+            font-size: 14px;
+            margin: 0 0.556vh 0 1.481vh;
+            font-weight: bold;
+          }
+
+          .sub-count {
+            flex: 1 0 auto;
+            font-size: 14px;
+            // font-family: "Bicubik";
+           font-weight: 500!important;
+
+            &.black {
+              color: #ffffff!important;
+              background-color: black;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+            &.black1 {
+              color: black;
+              display: flex;
+              align-items: center;
+              font-weight: 800;
+            }
+
+            &.green {
+              color: @green;
+              color: #ffffff !important;
+              background-color: #24a13a;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+
+            &.blue {
+              color: @darkBlue;
+              color: #ffffff;
+              background-color: #00a5db;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+
+            &.pink {
+              color: #ffffff;
+              background-color: #b10e7e;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+
+            &.red {
+              color: @red;
+              color: #ffffff;
+              background-color: #cb2020;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+
+            &.orange {
+              color: @orange;
+              color: #ffffff;
+              background-color: #ff7800;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+
+            &.gray1 {
+              color: #000 !important;
+              font-weight: 800;
+              display: flex;
+              align-items: center!important;
+              justify-content: center!important;
+            }
+            &.gray {
+              color: #fff !important;
+              background-color: #929ca3;
+              display: flex;
+              align-items: center!important;
+              justify-content: center!important;
+            }
+          }
+        }
+      }
+    }
+
+    .panel-body {
+      height: calc(100% - 7.407vh);
+      padding: 0.3704vh;
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      justify-content: flex-start;
+
+      .blank {
+        margin-right:100px;
+        flex: 1 0 42px;
+      }
+
+      .card {
+        text-align: center;
+        height: 20px;
+        line-height: 20px;
+        margin-right: 2px;
+        margin-top: 2px;
+        flex: 1 0 140px;
+        cursor: pointer;
+      }
+
+      .card {
+        border-radius: 0.37vh;
+        padding: 0.185vh 0.3704vh;
+        text-align: center;
+        border: 0.093vh solid;
+        font-size: 12px;
+
+        &.write {
+          color: @black;
+          border-color: @write;
+          background-color: @write;
+        }
+
+        &.green {
+          border-color: @green;
+          color: #ffffff !important;
+          background-color: #24a13a;
+        }
+
+        &.blue {
+          color: #ffffff;
+          background-color: #00a5db;
+          border-color: @darkBlue;
+        }
+
+        &.pink {
+          color: #ffffff;
+          background-color: #b10e7e;
+          border-color: @pink;
+        }
+
+        &.red {
+          color: @write;
+          border-color: @red;
+          background-color: @red;
+        }
+
+        &.orange {
+          color: #ffffff;
+          background-color: #ff7800;
+          border-color: @orange;
+        }
+
+        &.gray {
+          color: #fff !important;
+          background-color: #929ca3;
+          border-color: @darkgray;
+        }
+      }
+    }
+  }
+  .curStyle {
+    cursor: pointer;
+    text-align: center;
+  }
+}
+// ---------------------------------------------------------------------------
+.dark-matrix {
+  // width: calc(100% - 1.111vh);
+  height: calc(100vh - 7.222vh);
+  display: flex;
+  flex-direction: column;
+
+  .panel-2 {
+    .left-50-16 {
+      width: calc(50% - 0.741vh);
+    }
+  }
+
+  .panel {
+    width: 100%;
+    border: 0.093vh solid @darkgray;
+    position: relative;
+    padding: 0.7407vh 1.4815vh;
+    background-color: fade(@darkgray, 20%);
+    display: flex;
+
+    .dot {
+      width: 0.185vh;
+      height: 0.185vh;
+      border-radius: 50%;
+      background-color: @write;
+      position: absolute;
+
+      &.left {
+        left: 0.37vh;
+      }
+
+      &.right {
+        right: 0.37vh;
+      }
+
+      &.top {
+        top: 0.37vh;
+      }
+
+      &.bottom {
+        bottom: 0.37vh;
+      }
+    }
+
+    .item {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      color: @write;
+      position: relative;
+
+      .loop {
+        position: absolute;
+        width: 4.444vh;
+        height: 4.444vh;
+        border-radius: 50%;
+        border: 0.093vh solid @darkgray;
+        background-color: fade(@darkgray, 20);
+        left: calc(50% - 2.222vh);
+        top: calc(50% - 2.222vh);
+      }
+
+      &.write {
         color: @write;
       }
 

src/views/NewPages/alarm-center-1.vue

@@ -593,7 +593,8 @@ export default {
       });
       ////////
       this.tableData = [];
-      const resData = data.data;
+      const resData = data;
+      console.log('resData',resData);
       // const resData =this.resdata;
       const column = this.columnObj;
       let dataAll = []; // 总数据集合

src/views/NewPages/alarm-center-2.vue

@@ -162,13 +162,13 @@ export default {
     tabSelect (tab) { },
     async search () {
       const { data } = await apis.powercompareWindfarmAjax();
-      this.wpoptions = data.data;
+      this.wpoptions = data;
       this.wpvalue = data.data[0].id;
       this.searchData();
     },
     async searchTree () {
       const { data } = await api.treeType()
-      this.cascaderOptions = data.data;
+      this.cascaderOptions = data;
       let arr = [];
       let columnObj = [
         {
@@ -197,7 +197,7 @@ export default {
           startDate: enddate,
       })
       ////////
-      const resData = data.data;
+      const resData = data;
       // const resData =this.resdata;
       const column = this.columnObj;
       let dataAll = []; // 总数据集合

src/views/NewPages/alarm-center-yjfx.vue

@@ -1,102 +1,180 @@
 <template>
-	<div>
-		<el-row>
-			<el-col :span="24">
-				<panel :title="'日雷达图'" class="radar-panel" :icon="'svg-wind-site'">
-					<div class="wind-info">
-						<dual-pie-chart height="40vh" width='55vh' :innerData="rzdfsData" :outerData="rzdfsData" />
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
-		<el-row>
-			<el-col :span="12">
-				<panel :title="'月雷达图'" class="radar-panel" :icon="'svg-wind-site'">
-					<div class="wind-info">
-						<dual-pie-chart height="30vh" width='55vh' :innerData="yzdfsData" :outerData="yzdfsData" />
-					</div>
-				</panel>
-			</el-col>
-			<el-col :span="12">
-				<panel :title="'年雷达图'" class="radar-panel" :icon="'svg-wind-site'">
-					<div class="wind-info">
-						<dual-pie-chart height="30vh" width='55vh' :innerData="nzdfsData" :outerData="nzdfsData" />
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
-	</div>
+  <div>
+    <el-row>
+      <el-col :span="24">
+        <panel :title="'日雷达图'" class="radar-panel" :icon="'svg-wind-site'">
+          <div class="wind-info">
+            <dual-pie-chart
+              height="40vh"
+              width="55vh"
+              :innerData="rzdfsData"
+              :outerData="rzdfsData"
+            />
+          </div>
+        </panel>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <panel :title="'月雷达图'" class="radar-panel" :icon="'svg-wind-site'">
+          <div class="wind-info">
+            <dual-pie-chart
+              height="30vh"
+              width="55vh"
+              :innerData="yzdfsData"
+              :outerData="yzdfsData"
+            />
+          </div>
+        </panel>
+      </el-col>
+      <el-col :span="12">
+        <panel :title="'年雷达图'" class="radar-panel" :icon="'svg-wind-site'">
+          <div class="wind-info">
+            <dual-pie-chart
+              height="30vh"
+              width="55vh"
+              :innerData="nzdfsData"
+              :outerData="nzdfsData"
+            />
+          </div>
+        </panel>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-	import panel from "@/components/coms/panel/panel.vue";
-	import DualPieChart from "@/components/chart/pie/dual-pie-chart.vue";
-	export default {
-		components: {
-			panel,
-			DualPieChart
-		},
-		props:{
-			date: {
-			  type: String,
-			  default: "2021-06-06",
-			},
-			wpid: {
-			  type: String,
-			  default: "MHS_FDC",
-			},
-		},
-		data() {
-			return {
-				rzdfsData: [],
-				yzdfsData: [],
-				nzdfsData: [],
-			}
-		},
-		created() {
-			this.searchData();
-		},
-		methods: {
-			searchData(){
-				var that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "radar/gzfx",
-					showLoading:true,
-					data:{
-						stId:that.wpid,
-						Date:that.date
-					},
-					success(res) {
-						let key = ['变桨','变频器','齿轮箱','发电机','风机其它','滑环','机舱加热','控制','冷却','偏航','液压','主轴'];
-						let year = Object.values(res.data[0][0]),
-							month = Object.values(res.data[1][0]),
-							day = Object.values(res.data[2][0]);
-						let yearData = [],
-							monthData = [],
-							dayData = [];
-						key.forEach((ele,index)=>{
-							yearData.push({
-							  name: ele,
-							  value: parseFloat(year[index])
-							})
-							monthData.push({
-							  name: ele,
-							  value: parseFloat(month[index])
-							})
-							dayData.push({
-							  name: ele,
-							  value: parseFloat(day[index])
-							})
-						})
-						that.nzdfsData = yearData;
-						that.yzdfsData = monthData;
-						that.rzdfsData = dayData;
-					},
-				});
-			}
-		},
-	};
+import panel from "@/components/coms/panel/panel.vue";
+import DualPieChart from "@/components/chart/pie/dual-pie-chart.vue";
+import api from "@api/wisdomOverhaul/reliability/index.js";
+export default {
+  components: {
+    panel,
+    DualPieChart,
+  },
+  props: {
+    date: {
+      type: String,
+      default: "2021-06-06",
+    },
+    wpid: {
+      type: String,
+      default: "MHS_FDC",
+    },
+  },
+  data() {
+    return {
+      rzdfsData: [],
+      yzdfsData: [],
+      nzdfsData: [],
+    };
+  },
+  created() {
+    this.searchData();
+  },
+  methods: {
+    searchData() {
+
+
+      api
+        .radarGzfx({
+         stId: this.wpid,
+          Date: this.date,
+        })
+        .then((res) => {
+             let key = [
+            "变桨",
+            "变频器",
+            "齿轮箱",
+            "发电机",
+            "风机其它",
+            "滑环",
+            "机舱加热",
+            "控制",
+            "冷却",
+            "偏航",
+            "液压",
+            "主轴",
+          ];
+          let year = Object.values(res.data[0][0]),
+            month = Object.values(res.data[1][0]),
+            day = Object.values(res.data[2][0]);
+          let yearData = [],
+            monthData = [],
+            dayData = [];
+          key.forEach((ele, index) => {
+            yearData.push({
+              name: ele,
+              value: parseFloat(year[index]),
+            });
+            monthData.push({
+              name: ele,
+              value: parseFloat(month[index]),
+            });
+            dayData.push({
+              name: ele,
+              value: parseFloat(day[index]),
+            });
+          });
+          this.nzdfsData = yearData;
+          this.yzdfsData = monthData;
+          this.rzdfsData = dayData;
+        });
+
+
+
+    //   var that = this;
+    //   that.API.requestData({
+    //     method: "GET",
+    //     subUrl: "radar/gzfx",
+    //     showLoading: true,
+    //     data: {
+    //       stId: that.wpid,
+    //       Date: that.date,
+    //     },
+    //     success(res) {
+    //       let key = [
+    //         "变桨",
+    //         "变频器",
+    //         "齿轮箱",
+    //         "发电机",
+    //         "风机其它",
+    //         "滑环",
+    //         "机舱加热",
+    //         "控制",
+    //         "冷却",
+    //         "偏航",
+    //         "液压",
+    //         "主轴",
+    //       ];
+    //       let year = Object.values(res.data[0][0]),
+    //         month = Object.values(res.data[1][0]),
+    //         day = Object.values(res.data[2][0]);
+    //       let yearData = [],
+    //         monthData = [],
+    //         dayData = [];
+    //       key.forEach((ele, index) => {
+    //         yearData.push({
+    //           name: ele,
+    //           value: parseFloat(year[index]),
+    //         });
+    //         monthData.push({
+    //           name: ele,
+    //           value: parseFloat(month[index]),
+    //         });
+    //         dayData.push({
+    //           name: ele,
+    //           value: parseFloat(day[index]),
+    //         });
+    //       });
+    //       that.nzdfsData = yearData;
+    //       that.yzdfsData = monthData;
+    //       that.rzdfsData = dayData;
+    //     },
+    //   });
+    },
+  },
+};
 </script>
 
 <style>

src/views/NewPages/form.vue

@@ -16,7 +16,7 @@
         }"
         :cell-style="{
           height: '40px',
-       background: 'rgba(0, 0, 0,1)',
+          background: 'rgba(0, 0, 0,1)',
           'border-bottom': 'solid 0px #242424',
         }"
         stripe
@@ -34,7 +34,7 @@
             : ''"
           :key="index"
           :prop="i"
-          :label="i === 'name' ? '名字' : i === 'date' ? '日期' : i"
+          :label="i === 'name' ? '名字' : i === 'date' ? '日期' : i.slice(2)"
           :fixed="i === 'name' || i === 'date' ? 'left' : null"
           width="160"
           align="center"
@@ -66,7 +66,6 @@ export default {
   data() {
     return {
       tableData: [],
-      tableTit: [],
       timeNow: {},
     };
   },
@@ -84,11 +83,20 @@ export default {
           for (let i = 0; i < res.data.length ? res.data.length : ""; i++) {
             for (let key in res.data[i]) {
               if (key === "date") {
-                res.data[i][key] = new Date(res.data[i][key]).formatDate("yyyy-MM-dd");
+                res.data[i][key] = new Date(res.data[i][key]).formatDate(
+                  "yyyy-MM-dd"
+                );
               }
             }
           }
+
+          // for (let x of res.data) {
+          //   for (let y in x) {
+          //    y = y.substring(y.indexOf("_", y.indexOf("_")) + 1);
+          //   }
+          // }
           this.tableData = res.data;
+          // console.log(" res.data", res.data);
         });
     },
     // 表格
@@ -137,8 +145,12 @@ export default {
 /deep/.el-table__fixed::before {
   height: 0;
 }
-/deep/.main-body .el-table.el-table--striped .el-table__body tr.el-table__row--striped td{
-  opacity: 1!important;
+/deep/.main-body
+  .el-table.el-table--striped
+  .el-table__body
+  tr.el-table__row--striped
+  td {
+  opacity: 1 !important;
   background-color: yellowgreen;
 }
 </style>

src/views/WindSite/pages/Matrix.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="matrix">
+  <div
+    :class="$store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'"
+  >
     <div class="btn-group-tabs">
       <BtnGroup2
         :btnGroups="btnGroups"
@@ -26,7 +28,8 @@
         <div class="card-panel">
           <div class="card-left">
             <div class="tag">{{ cItem.wtnum }}</div>
-            <div class="icon">
+
+            <div class="icon" v-if="$store.state.themeName === 'dark'">
               <span
                 class="svg-icon svg-icon-sm"
                 :class="
@@ -40,6 +43,21 @@
                 <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
               </span>
             </div>
+
+            <div class="icon" v-if="$store.state.themeName === 'light'">
+              <span
+                class="svg-icon svg-icon-sm"
+                :class="
+                  cItem.color == 'black'
+                    ? 'svg-icon-black'
+                    : cItem.color == 'gray'
+                    ? 'svg-icon-gray'
+                    : ''
+                "
+              >
+                <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+              </span>
+            </div>
           </div>
           <div class="card-right">
             <div class="num">
@@ -182,36 +200,6 @@ export default {
             this.sourceMap = {};
           }
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   showLoading,
-      //   method: "POST",
-      //   subUrl: "matrix/matrixByWpIdPush",
-      //   data: {
-      //     wpId: that.wpId,
-      //   },
-      //   success(res) {
-      //     if (res.data) {
-      //       let sourceMap = res.data;
-      //       for (let key in sourceMap) {
-      //         if (key !== "fczbmap" && key !== "fjmap") {
-      //           sourceMap[key] += "";
-      //         } else if (key === "fjmap") {
-      //           sourceMap[key].forEach((pItem) => {
-      //             pItem.forEach((cItem) => {
-      //               cItem.color = that.getColor(cItem.fjzt);
-      //               cItem.isShow = true;
-      //             });
-      //           });
-      //         }
-      //       }
-      //       that.sourceMap = sourceMap;
-      //     } else {
-      //       that.sourceMap = {};
-      //     }
-      //   },
-      // });
     },
 
     getWp() {
@@ -244,41 +232,6 @@ export default {
         this.btnGroups = btnGroups;
         this.renderBtnActiveIndex();
       });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   subUrl: "powercompare/windfarmAllAjax",
-      //   success(res) {
-      //     let btnGroups = [
-      //       {
-      //         icon: "fa fa-fire",
-      //         btns: [],
-      //       },
-      //       {
-      //         icon: "fa fa-fire-extinguisher",
-      //         btns: [],
-      //       },
-      //     ];
-
-      //     res.data.forEach((ele, index) => {
-      //       if (ele.id.indexOf("FDC") !== -1) {
-      //         btnGroups[0].btns.push({
-      //           text: ele.name,
-      //           code: ele.id,
-      //         });
-      //       } else {
-      //         btnGroups[1].btns.push({
-      //           text: ele.name,
-      //           code: ele.id,
-      //         });
-      //       }
-      //     });
-
-      //     that.btnGroups = btnGroups;
-      //     that.renderBtnActiveIndex();
-      //   },
-      // });
     },
 
     renderBtnActiveIndex() {
@@ -331,7 +284,308 @@ export default {
 <style lang="less" scoped>
 @titleHeight: 3.704vh;
 
-.matrix {
+.light-matrix {
+  width: 100%;
+  height: 100%;
+
+  .btn-group-tabs {
+    display: flex;
+    flex-direction: row;
+
+    .photovoltaic {
+      margin-left: 1.481vh;
+    }
+  }
+
+  .panel-title {
+    width: 100%;
+    height: @titleHeight;
+    line-height: @titleHeight;
+    background-color: fade(@darkgray, 40%);
+    margin-top: 1.481vh;
+
+    .panel-title-name {
+      font-size: 17px;
+      color: #000;
+
+      i {
+        margin: 0 0.556vh 0 1.481vh;
+      }
+
+      .sub-title {
+        color: @gray;
+        font-size: @fontsize-s;
+        margin: 0 0.556vh 0 1.481vh;
+      }
+
+      .sub-count {
+        font-size: @fontsize-s;
+       color: #000;
+        font-weight: 600;
+      }
+    }
+  }
+
+  .panel-body {
+    height: calc(100% - 9vh);
+    background-color: fade(@darkgray, 20%);
+    padding: 0.741vh;
+    overflow: auto;
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-content: flex-start;
+
+    .blank {
+      margin-right: 4px;
+      flex: 1 0 125px;
+    }
+    .card {
+      margin-right: 4px;
+      margin-top: 4px;
+      flex: 1 0 125px;
+    }
+
+    .card {
+      border: 0.093vh solid;
+
+      .card-panel {
+        display: flex;
+        flex-grow: row;
+
+        .card-left {
+          width: 40%;
+          border-right: 0.093vh dotted;
+
+          .tag {
+            color: @write;
+            font-size: 14px;
+            width: 100%;
+            text-align: center;
+          }
+
+          .icon {
+            flex-grow: 1;
+            height: calc(100% - 16px);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            i {
+              font-size: 14px;
+            }
+          }
+        }
+
+        .card-right {
+          width: 60%;
+
+          .num {
+            width: 100%;
+            font-size: 13px;
+            text-align: right;
+            padding-right: 0.3704vh;
+            margin: 0.1852vh 0;
+          }
+        }
+      }
+
+      .card-percent {
+        height: 0.926vh;
+        padding: 0.093vh 0.185vh;
+        position: relative;
+        border-top: 0.093vh solid;
+        background-color: transparent;
+
+        .percent {
+          height: 0.648vh;
+          background-color: @green;
+          position: absolute;
+          left: 0vh;
+          top: -1px;
+        }
+      }
+
+      &.blue {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #00a5db;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #00a5db;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #00a5db;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+
+      &.pink {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #b10e7e;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #b10e7e;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #b10e7e;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+
+      &.orange {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #ff7800;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #ff7800;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #ff7800;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+
+      &.gray {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #929ca3;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #929ca3;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #929ca3;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+
+      &.red {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #cb2020;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #cb2020;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #cb2020;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+
+      &.write {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #1e1e1e !important;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #1e1e1e !important;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #1e1e1e !important;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+      &.green {
+        // color: @darkBlue;
+        color: #fff !important;
+        .card-panel {
+          .card-left {
+            background-color: #24a13a;
+            border-color: #fff !important;
+
+            .tag {
+              background-color: #24a13a;
+              color: #fff !important;
+            }
+          }
+          .card-right {
+            background-color: #24a13a;
+            .num {
+              color: #fff !important;
+            }
+          }
+        }
+        .card-percent {
+          border: 2px solid black;
+        }
+      }
+    }
+  }
+}
+// ***************************************************************************************************
+.dark-matrix {
   width: 100%;
   height: 100%;
 

src/views/layout/Header.vue

@@ -72,13 +72,13 @@ export default {
           path: "/decision/pb",
           isActive: false,
         },
-        {
-          id: "health",
-          text: "智慧检修",
-          // path: '/sandtable',
-          path: "/health/sandtable",
-          isActive: false,
-        },
+        // {
+        //   id: "health",
+        //   text: "智慧检修",
+        //   // path: '/sandtable',
+        //   path: "/health/sandtable",
+        //   isActive: false,
+        // },
         // {
         //   id: "decision",
         //   text: "决策支持",

src/views/malfunctionRecall/index.vue

@@ -136,7 +136,7 @@ export default {
       wpArray: [],
       rowitem: "",
       wpName: "",
-      wtId: "",
+      wtId: "A01",
       type: "2",
       dialogVisible: false,
       tableData: {
@@ -206,6 +206,8 @@ export default {
     );
     this.value2 = this.getTime(2);
     this.getWp();
+
+    this.requestSafeList();
   },
   methods: {
     getTime(val) {
@@ -275,10 +277,12 @@ export default {
         endDate: that.value2,
         wpId: that.wpId,
         type: 2,
-        wtId: null,
+        wtId: "CL01_001",
       };
 
-      if (that.wtId != "") data.wtId = that.wtId;
+      if (that.wtId != "A01") {
+        data.wtId = that.wtId;
+      }
       if (that.type != "") data.type = that.type;
 
       api.eventGetShutdownevent(data).then((res) => {

src/views/singleAnalysis/double-line-chart.vue

@@ -131,7 +131,7 @@ export default {
   watch: {
     list: {
       handler(newValue, oldValue) {
-        console.warn(newValue);
+        console.warn(11111111111);
         this.newlist = newValue;
         this.$nextTick(() => {
           this.initChart();