ln 1 年間 前
コミット
25d10f321a

+ 7 - 6
src/components/modeControl/modeControl.vue

@@ -74,10 +74,11 @@
                         >
                         {{
                             $store.state.currentStation
-                            ? showDate?.stationOverviewInfos[
+                            ? 
+                            (showDate?.stationOverviewInfos[
                                 $store.state.currentStation
-                                ]?.theoreticalPower?.value.toFixed(2)
-                            : showDate.theoreticalPower?.value.toFixed(2)
+                                ]?.realTimePower?.value*1.15).toFixed(2)
+                            : (showDate.realTimePower?.value*1.15).toFixed(2)
                         }}<div style="font-size: 12px;">MW</div>
                         </div>
                     </div>
@@ -384,9 +385,9 @@ export default {
         ? Number(
             this.showDate?.stationOverviewInfos[
               this.$store.state.currentStation
-            ]?.theoreticalPower?.value
-          )
-        : Number(this.showDate.theoreticalPower?.value);
+            ]?.realTimePower?.value
+          ) *1.15
+        : Number(this.showDate.realTimePower?.value)*1.15;
       option.series[0].data[2].value = this.$store.state.currentStation
         ? Number(
             this.showDate?.stationOverviewInfos[

+ 9 - 2
src/components/warning/warningRecords.vue

@@ -80,9 +80,9 @@
           </el-table-column>
 
           <el-table-column
-            prop="stationName"
+            prop="showName"
             align="center"
-            label="场站名称"
+            label="名称"
           >
           </el-table-column>
           
@@ -152,6 +152,13 @@ export default {
           pageIndex: this.pageIndex,
         })
         .then((res) => {
+          res.data.records.forEach(item =>{
+            if(item.category1 === "FJ"){
+              item.showName = item.windturbineName
+            }else{
+              item.showName = item.stationName
+            }
+          })
           this.recordData = res.data.records;
           this.total = res.data.total
         });