update

src/api/cockpit/matrix/index.js

@@ -122,8 +122,9 @@ const windfarmAllAjax = () => {
     });
 };
 //风机信息列表
-const findWtInfoList = (data) => {
+const findWtInfoList = (showLoading,data) => {
     return request({
+        showLoading,
         baseURL: process.env.VUE_APP_Matrix,
         url: `monitorwt/findWtInfoList?wpId=${data.wpId}`,
         method: "get",

src/components/coms/cards/percent-card-2.vue

@@ -12,11 +12,11 @@
     <div class="card-info">
       <div class="card-value">
         <span class="value-text gray">{{ TotalText }}</span>
-        <span class="white">{{ TotalValue/10 }}</span>
+        <span class="white">{{ TotalValue  }}</span>
       </div>
       <div class="card-value">
         <span class="value-text gray">{{ ActualText }}</span>
-        <span class="white">{{ ActualValue/10 }}</span>
+        <span class="white">{{ ActualValue  }}</span>
       </div>
     </div>
   </div>
@@ -27,6 +27,9 @@
 // 使用位置 驾驶舱首页 计划电量完成情况 中的百分比卡片
 import PercentBar from "../../chart/bar/percent-bar.vue";
 export default {
+    created() {
+      console.log(777777777,this.TotalValue);
+    },
   components: {
     PercentBar,
   },
@@ -40,7 +43,8 @@ export default {
       default: "实际",
     },
     TotalValue: {
-      type: Number,String,
+      type: Number,
+      String,
       default: 0,
     },
     ActualText: {
@@ -48,7 +52,8 @@ export default {
       default: "计划",
     },
     ActualValue: {
-      type: Number,String,
+      type: Number,
+      String,
       default: 0,
     },
     color: {
@@ -61,6 +66,8 @@ export default {
     percent() {
       return parseInt((this.TotalValue / this.ActualValue) * 1000);
     },
+
+  
   },
 };
 </script>

src/views/Agc/Agc.vue

@@ -106,12 +106,12 @@ export default {
                   value: [],
                 },
                 {
-                  title: "实际功率",
+                  title: "限电指令",
                   yAxisIndex: 0,
                   value: [],
                 },
                 {
-                  title: "限电指令",
+                  title: "实际功率",
                   yAxisIndex: 0,
                   value: [],
                 },
@@ -123,11 +123,12 @@ export default {
               ];
               keys.forEach((key, keyIndex) => {
                 pEle.tb.forEach((cEle, cIndex) => {
-                  tb[keyIndex].value.push({ text: new Date(cEle.time).formatDate("hh:mm"), value: cEle[keys[keyIndex]] || 0 });
+                  tb[keyIndex].value.push({ text: new Date(cEle.time).formatDate("hh:mm"), value: cEle[keys[keyIndex]] || '--' });
                 });
               });
 
               pEle.tb = tb;
+              // console.log('datas',datas);
               datas.push(pEle);
             });
             this.datas = datas;
@@ -135,15 +136,7 @@ export default {
             this.datas = datas;
           }
       })
-      // that.API.requestData({
-      //   showLoading,
-      //   method: "POST",
-      //   subUrl: "genreset/getAgcValues",
-      //   timeout: 600000,
-      //   success(res) {
-          
-      //   },
-      // });
+
     },
   },
 

src/views/Home/components/power-plan.vue

@@ -12,7 +12,8 @@
       "
     >
       <Col :span="12">
-        <!-- <percent-card-2 :title="'月完成率' + parseInt((planData.yfdl / planData.yfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.yfdl" :ActualValue="planData.yfdljh" :percent="planData.ywcl" /> -->
+        <!-- <percent-card-2 :title="'月完成率' + parseInt((planData.yfdl / planData.yfdljh) * 100) 
+        + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.yfdl" :ActualValue="planData.yfdljh" :percent="planData.ywcl" /> -->
         <percent-card-2
           :title="''"
           TotalText="月实际"
@@ -23,7 +24,8 @@
         />
       </Col>
       <Col :span="12">
-        <!-- <percent-card-2 :title="'年完成率' + parseInt((planData.nfdl / planData.nfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.nfdl" :ActualValue="planData.nfdljh" :percent="planData.nwcl" /> -->
+        <!-- <percent-card-2 :title="'年完成率' + parseInt((planData.nfdl / planData.nfdljh) * 100)
+         + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.nfdl" :ActualValue="planData.nfdljh" :percent="planData.nwcl" /> -->
         <percent-card-2
           :title="''"
           TotalText="年实际"
@@ -100,7 +102,6 @@ export default {
     },
   },
   mounted() {
-
     this.wpId = this.id;
     this.tabs[0].text = this.title;
   },
@@ -174,6 +175,10 @@ export default {
 
   watch: {
     data(res) {
+      Object.keys(res).forEach(function (key) {
+        // if (parseInt(res[key]) === res[key])
+          res[key] = (res[key] / 100).toFixed(2);
+      });
       this.planData = res;
     },
     id(res) {

src/views/Status/Status.vue

@@ -12,7 +12,6 @@
       <!-- <StatusPanelStatic class="panel-item" /> -->
     </div>
 
-
     <div class="table-box">
       <ComTable :data="tableData"></ComTable>
     </div>

src/views/Status/components/status-panel.vue

@@ -25,11 +25,19 @@
             :key="index"
             :class="{ light: item.is_light }"
           >
-            <div class="f1">{{ item.f1 }}</div>
-            <div class="f2">{{ item.f2 }}</div>
-            <div class="f3">(  {{ item.f3 }}  )</div>
-            <div class="f4">{{ item.f4 }}</div>
-            <div class="f5">( {{ item.f5 }} )</div>
+            <div class="f1">{{ item.f1.slice(0, 3) }}</div>
+            <div class="f2">
+              {{ item.f2 }} <div v-if="item.f3">:</div> 
+              <div class="f3">
+                {{ item.f3 }}
+                <div v-if="!item.f3">0</div>
+                </div>
+            </div>
+
+            <div class="f4">
+              {{ item.f4 }}<div v-if="item.f5">:</div> 
+              <div class="f5"> <div v-if="!item.f3"></div>{{ item.f5 }}</div>
+            </div>
           </div>
         </div>
 
@@ -126,10 +134,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-/deep/.el-table thead.is-group th.el-table__cell {
-  background-color: rgba(96, 103, 105, 0.2);
-}
-
 .status-panel {
   position: relative;
   height: 22.315vh;
@@ -216,70 +220,41 @@ export default {
       .item-box {
         flex-grow: 1;
         display: flex;
-        flex-direction: column;
+        flex-direction: row;
 
         .data-item {
           flex: 1;
           display: flex;
-          flex-direction: row;
+          flex-direction: column;
           background-color: fade(@darkgray, 20%);
           margin-top: 0.278vh;
+          align-items: center;
 
-          div {
-            font-size: @fontsize-s;
-            overflow: hidden;
-            display: flex;
-            align-items: center;
+          .f1 {
+            height: 60px;
+            text-align: center;
+            font-size: 2.2vh;
+            font-weight: 695;
+            margin-top: 25px;
           }
-
-          .f1,
           .f2,
           .f4 {
-            text-align: right;
-            color: @gray;
-            justify-content: flex-end;
-          }
-          .f1 {
-            font-size: 1.6vh;
-            font-weight: 695 !important;
-         color: #a5c3af!important;
-          }
-
-          .f3,
-          .f5 {
-            font-family: "Bicubik";
+              height: 50px;
+            display: inline-block;
             text-align: left;
-            color: @green;
-            justify-content: flex-start;
-          }
-
-          .f1 {
-            flex: 2;
-          }
-
-          .f2 {
-            flex: 3;
-            margin-right: 0.556vh;
-          }
-
-          .f3 {
-            flex: 3;
-          }
-
-          .f4 {
-            flex: 1;
-            margin-right: 0.556vh;
-          }
-
-          .f5 {
-            flex: 2;
-            margin-right: 0;
+            font-size: 1.8vh;
+            display: flex;
+            align-items: center;
           }
           .f3,
           .f5 {
-            color: #05bb4c !important;
-            font-size: 1.34vh;
-            margin-left: 18px !important;
+            height: 50px;
+            line-height: 50px;
+            display: inline-block;
+            text-align: left;
+            font-size: 1.6vh;
+            margin-left: 20px;
+            color: #05bb4c;
           }
 
           &.light {
@@ -295,17 +270,6 @@ export default {
               top: 0;
               left: 0;
             }
-
-            .f1,
-            .f2,
-            .f4 {
-              color: @write;
-            }
-
-            .f3,
-            .f5 {
-              color: fade(@write, 60%);
-            }
           }
         }
       }

src/views/WindSite/pages/DraughtFanList.vue

@@ -237,7 +237,7 @@ export default {
       //   return 0;
       // }
       api
-        .findWtInfoList({
+        .findWtInfoList(showLoading,{
           wpId: this.wpId,
         })
         .then((res) => {
@@ -499,7 +499,7 @@ export default {
     that.wpId = that.$route.params.wpId;
     that.getWp();
     that.$nextTick(() => {
-      that.requestData(false);
+      that.requestData(true);
       that.timmer = setInterval(() => {
         that.$nextTick(() => {
           that.requestData(false);
@@ -518,7 +518,7 @@ export default {
     $route(res) {
       this.wpId = res.params.wpId;
       if (res.params.wpId) {
-        this.requestData(false);
+        this.requestData(true);
         this.renderBtnActiveIndex();
       }
     },