Просмотр исходного кода

Merge branch 'fix_refresh' of shuzhihua/pms-app into master

yanghao 3 дней назад
Родитель
Сommit
e465861fa1
2 измененных файлов с 14 добавлено и 8 удалено
  1. 2 2
      config/env.dev.js
  2. 12 6
      pages/recordFilling/detail.vue

+ 2 - 2
config/env.dev.js

@@ -1,7 +1,7 @@
 // 开发环境配置
 export default {
-	// apiUrl: 'http://192.168.188.16:48080',
-	apiUrl: 'https://iot.deepoil.cc',
+	apiUrl: 'http://192.168.188.16:48080',
+	// apiUrl: 'https://iot.deepoil.cc',
 	// apiUrl: 'https://aims.deepoil.cc', //正式
 	apiUrlSuffix: '/admin-api',
 	// 其他开发环境配置...  

+ 12 - 6
pages/recordFilling/detail.vue

@@ -299,19 +299,25 @@ const handleRealTimeUpdate = (nosum, deviceItem) => {
   // 当日运转时间累加
   if (
     deviceItem.deviceName.includes("增压机") &&
-    nosum.name === "当日运转时间"
+    nosum.name === "当日运转时间H"
   ) {
-    debouncedCalculateTotalRunTime("增压机", "当日运转时间", "当日运转时间H");
+    debouncedCalculateTotalRunTime("增压机", "当日运转时间H", "当日运转时间H");
   }
 
   // 当日注气量累加
-  if (deviceItem.deviceName.includes("提纯撬") && nosum.name === "当日注气量") {
-    debouncedCalculateTotalRunTime("提纯撬", "当日注气量", "当日注气量-方");
+  if (
+    deviceItem.deviceName.includes("提纯撬") &&
+    nosum.name === "当日注气量-方"
+  ) {
+    debouncedCalculateTotalRunTime("提纯撬", "当日注气量-方", "当日注气量-方");
   }
 
   // 当日注水量累加
-  if (deviceItem.deviceName.includes("注水泵") && nosum.name === "当日注水量") {
-    debouncedCalculateTotalRunTime("注水泵", "当日注水量", "当日注水量-方");
+  if (
+    deviceItem.deviceName.includes("注水泵") &&
+    nosum.name === "当日注水量-方"
+  ) {
+    debouncedCalculateTotalRunTime("注水泵", "当日注水量-方", "当日注水量-方");
   }
 
   // 当日用电量累加