lxh 3 주 전
부모
커밋
195b2aacf7
2개의 변경된 파일30개의 추가작업 그리고 30개의 파일을 삭제
  1. 2 2
      common/service/config.service.js
  2. 28 28
      pages/gasreport/components/gasImgIdentify.vue

+ 2 - 2
common/service/config.service.js

@@ -7,13 +7,13 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
   // BASE_URL = "http://10.246.63.125:9999"; // 寸草塔二矿
-  BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
+  // BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
   // BASE_URL = "http://172.16.53.16:9999"; //
   // BASE_URL = "http://10.246.167.205:9999"; //上湾
   // BASE_URL = "http://172.30.157.9:9999"; //元子沟
-  // BASE_URL = "http://10.246.167.205:9999"; //上湾
+  BASE_URL = "http://10.246.167.205:9999"; //上湾
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 

+ 28 - 28
pages/gasreport/components/gasImgIdentify.vue

@@ -101,7 +101,7 @@
                     <div class="dialog-title">三对照数据</div>
                     <view class="dialog-item">
                         <text class="dialog-label">甲烷传感器:</text>
-                        <u--input inputAlign="center" disabled v-model="formState.jw" placeholder="请输入" clearable
+                        <u--input inputAlign="center" :disabled="formState.jw=='-'" v-model="formState.jw" placeholder="请输入" clearable
                             @input="changeInput($event, 'ch4')"></u--input>
                     </view>
                     <view class="dialog-item">
@@ -1231,27 +1231,27 @@ export default {
                 this.isRule3 = false
             }
         },
-        //新增光瓦失去焦点时参数校验
-        getBlur(val) {
-            let str = val.substring(val.indexOf('.') + 1).split('')
-            if (val.slice(-1) == '0' || val.slice(-1) == '2' || val.slice(-1) == '4' || val.slice(-1) == '6' || val.slice(-1) == '8') {
-                if (/^-?([1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0)$/.test(val)) {
-                    if (str.length <= 2) {
-                        this.formState.gw = val
-                        this.isRule1 = true
-                    } else {
-                        this.formState.gw = ''
-                        this.isRule1 = false
-                    }
-                } else {
-                    this.formState.gw = val
-                    this.isRule1 = true
-                }
-            } else {
-                this.formState.gw = ''
-                this.isRule1 = false
-            }
-        },
+        // //新增光瓦失去焦点时参数校验
+        // getBlur(val) {
+        //     let str = val.substring(val.indexOf('.') + 1).split('')
+        //     if (val.slice(-1) == '0' || val.slice(-1) == '2' || val.slice(-1) == '4' || val.slice(-1) == '6' || val.slice(-1) == '8') {
+        //         if (/^-?([1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0)$/.test(val)) {
+        //             if (str.length <= 2) {
+        //                 this.formState.gw = val
+        //                 this.isRule1 = true
+        //             } else {
+        //                 this.formState.gw = ''
+        //                 this.isRule1 = false
+        //             }
+        //         } else {
+        //             this.formState.gw = val
+        //             this.isRule1 = true
+        //         }
+        //     } else {
+        //         this.formState.gw = ''
+        //         this.isRule1 = false
+        //     }
+        // },
         //新增CO2失去焦点时参数校验
         getBlurCO2(val) {
             let str = val.substring(val.indexOf('.') + 1).split('')
@@ -1356,7 +1356,7 @@ export default {
                     co2Early1: that.formState.co2,
                     coEarly1: that.formState.co,
                     gwSdzEarly1: that.formState.gw,
-                    jwSdzEarly1: that.formState.ch4,
+                    jwSdzEarly1: that.formState.jw,
                     o2Early1: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeEarly1: that.formState.time,
@@ -1438,7 +1438,7 @@ export default {
                     co2Early2: that.formState.co2,
                     coEarly2: that.formState.co,
                     gwSdzEarly2: that.formState.gw,
-                    jwSdzEarly2: that.formState.ch4,
+                    jwSdzEarly2: that.formState.jw,
                     o2Early2: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeEarly2: that.formState.time,
@@ -1521,7 +1521,7 @@ export default {
                     co2Noon1: that.formState.co2,
                     coNoon1: that.formState.co,
                     gwSdzNoon1: that.formState.gw,
-                    jwSdzNoon1: that.formState.ch4,
+                    jwSdzNoon1: that.formState.jw,
                     o2Noon1: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeNoon1: that.formState.time,
@@ -1603,7 +1603,7 @@ export default {
                     co2Noon2: that.formState.co2,
                     coNoon2: that.formState.co,
                     gwSdzNoon2: that.formState.gw,
-                    jwSdzNoon2: that.formState.ch4,
+                    jwSdzNoon2: that.formState.jw,
                     o2Noon2: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeNoon2: that.formState.time,
@@ -1689,7 +1689,7 @@ export default {
                     co2Night1: that.formState.co2,
                     coNight1: that.formState.co,
                     gwSdzNight1: that.formState.gw,
-                    jwSdzNight1: that.formState.ch4,
+                    jwSdzNight1: that.formState.jw,
                     o2Night1: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeNight1: that.formState.time,
@@ -1771,7 +1771,7 @@ export default {
                     co2Night2: that.formState.co2,
                     coNight2: that.formState.co,
                     gwSdzNight2: that.formState.gw,
-                    jwSdzNight2: that.formState.ch4,
+                    jwSdzNight2: that.formState.jw,
                     o2Night2: that.formState.o2,
                     strInstallPos: that.formState.jcdd,
                     timeNight2: that.formState.time,