瀏覽代碼

BUG修复

Koishi 2 天之前
父節點
當前提交
23faac9a74

+ 14 - 14
.env.production

@@ -15,34 +15,34 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
-# VUE_APP_ALARM=http://10.220.1.5:6015
-VUE_APP_ALARM=http://10.112.33.5:6015
+VUE_APP_ALARM=http://10.220.1.5:6015
+# VUE_APP_ALARM=http://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
-# VUE_APP_API=http://10.220.1.5:6060
-VUE_APP_API=http://10.112.33.5:6060
+VUE_APP_API=http://10.220.1.5:6060
+# VUE_APP_API=http://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
-# VUE_APP_URL=https://10.220.1.5:5300
-VUE_APP_URL=https://10.112.33.5:5300
+VUE_APP_URL=https://10.220.1.5:5300
+# VUE_APP_URL=https://10.112.33.5:5300
 
-# VUE_APP_URL2=http://10.220.1.5:8080
-VUE_APP_URL2=http://10.112.33.5:8081
+VUE_APP_URL2=http://10.220.1.5:8080
+# VUE_APP_URL2=http://10.112.33.5:8081
 
-# VUE_APP_REPORT=http://10.220.1.5:8001
-VUE_APP_REPORT=http://10.112.33.5:8001
+VUE_APP_REPORT=http://10.220.1.5:8001
+# VUE_APP_REPORT=http://10.112.33.5:8001
 
-# VUE_APP_WS_URL=ws://10.220.1.5:6014
-VUE_APP_WS_URL=ws://10.112.33.5:6014
+VUE_APP_WS_URL=ws://10.220.1.5:6014
+# VUE_APP_WS_URL=ws://10.112.33.5:6014
 
-# VUE_APP_GENERAT_URL=http://10.220.1.5:6060
-VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 VUE_APP_HEADER2_URL=http://10.112.32.31:10201

+ 7 - 5
src/views/economicsOperation/nxfHomePage/component/percent-card-2.vue

@@ -46,6 +46,7 @@
 <script>
 // 百分比card2
 // 使用位置 驾驶舱首页 计划电量完成情况 中的百分比卡片
+import { number } from "echarts";
 import PercentBar from "./percent-bar.vue";
 export default {
   created() {},
@@ -100,11 +101,12 @@ export default {
   },
 
   computed: {
-    // percent() {
-    //   return this.TotalValue === 0 || this.ActualValue === 0
-    //     ? 0
-    //     : parseInt((this.TotalValue / this.ActualValue) * 100);
-    // },
+    percent() {
+      // return this.TotalValue === 0 || this.ActualValue === 0
+      //   ? 0
+      //   : parseInt((this.TotalValue / this.ActualValue) * 100);
+      return ((this.percent * 1000) * 100 / 1000)
+    },
   },
 };
 </script>

+ 3 - 3
src/views/economicsOperation/nxfHomePage/component/power-plan.vue

@@ -4,17 +4,17 @@
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="周实际" ActualText="周计划" PercentText="日历进度" PercentName="周完成"
                 :TotalValue="planData.zfdlsj" :ActualValue="planData.zfdljh" :PercentValue="planData.zjd"
-                :percent="planData.zwcl*100" :Datasv="planData" />
+                :percent="planData.zwcl" :Datasv="planData" />
             </Col>
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="月实际" ActualText="月计划" PercentText="日历进度" PercentName="月完成"
                 :TotalValue="planData.yfdlsj" :ActualValue="planData.yfdljh" :PercentValue="planData.yjd"
-                :percent="planData.ywcl*100" />
+                :percent="planData.ywcl" />
             </Col>
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="年实际" ActualText="年计划" PercentText="日历进度" PercentName="年完成"
                 :TotalValue="planData.nfdlsj" :ActualValue="planData.nfdljh" :PercentValue="planData.njd"
-                :percent="planData.nwcl*100" />
+                :percent="planData.nwcl" />
             </Col>
         </row>
     </div>

+ 2 - 2
src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -256,10 +256,10 @@
                 <div class="text">损失电量:</div>
                 <div class="value green">{{ dayPowerInfo.rssdl }}</div>
               </div>
-              <div class="info-item">
+              <!-- <div class="info-item">
                 <div class="text">报警次数:</div>
                 <div class="value green">{{ dayPowerInfo.rbjcs }}</div>
-              </div>
+              </div> -->
               <div class="info-item">
                 <div class="text">停机次数:</div>
                 <div class="value green">{{ dayPowerInfo.rtjcs }}</div>