소스 검색

AGC曲线分析模块修改

wangb 2 주 전
부모
커밋
adafde4e00
2개의 변경된 파일25개의 추가작업 그리고 2개의 파일을 삭제
  1. 12 2
      src/components/generatingCapacityComponent/table.vue
  2. 13 0
      src/views/generatingCapacity/dataAnalysis/agcAnalysis/index.vue

+ 12 - 2
src/components/generatingCapacityComponent/table.vue

@@ -31,7 +31,7 @@
       size="small"
       ref="windLifeTable"
       v-loading="loading"
-      show-summary
+      :show-summary="hj"
       :summary-method="getSummaries"
       :max-height="tableHeight"
       :style="{ width: '100%' }"
@@ -136,6 +136,12 @@ export default {
         return false;
       },
     },
+    showHj: {
+      type: Boolean,
+      default: () => {
+        return true;
+      },
+    },
   },
   data() {
     return {
@@ -143,11 +149,13 @@ export default {
       nodata: nodata,
       tableHeight: window.innerHeight - 200 + "px",
       tableData: [],
+      hj: true,
     };
   },
 
   created() {
     this.tableData = this.data || [];
+    this.hj = this.showHj;
   },
 
   methods: {
@@ -309,7 +317,9 @@ export default {
     data(value) {
       this.tableData = value || [];
     },
-    theme(bool) {},
+    showHj(bool) {
+      this.hj = bool;
+    },
   },
 };
 </script>

+ 13 - 0
src/views/generatingCapacity/dataAnalysis/agcAnalysis/index.vue

@@ -48,6 +48,7 @@
                 :tableId="tableShowId"
                 :tableName="tableName"
                 fromTableId="7"
+                :showHj="false"
                 style="position: relative; top: -10px"
               >
               </table-cop>
@@ -276,6 +277,11 @@ const funSubmit = async (params) => {
       width: 80,
     },
     {
+      prop: "cz",
+      label: "差值",
+      width: 80,
+    },
+    {
       prop: "llgl",
       label: "理论功率",
       width: 80,
@@ -332,6 +338,13 @@ const funSubmit = async (params) => {
         res["偏差下限"].values.length > 0
           ? Number(res["偏差下限"].values[index].value).toFixed(2)
           : "-",
+      cz:
+        res["有功设定限值"].values.length && res["实发有功"].values.length
+          ? (
+              Number(res["有功设定限值"].values[index].value) -
+              Number(res["实发有功"].values[index].value)
+            ).toFixed(2)
+          : "-",
     });
   });
   xAxisData.value = tableArr.map((o) => o.ts);