更新

src/api/V2/charts/index.js

@@ -1,8 +1,2 @@
-/**
- * @fileOverview 图标数据
- */
-// 动态请求前缀
-const baseUrl = process.env.VUE_APP_API_CERTIFICATE
 
-// 证书模块
-export const API_GET_GETCHARTSDATA = `${baseUrl}/biInfoController/selectBiInfo`
+export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`

src/views/home/index.vue

@@ -429,7 +429,6 @@
           let text = ''
           let formatter = ''
           let graphicText = ''
-          debugger
           switch (i) {
             case 0:
               // 圆环图各环节的颜色

src/views/houseSelfCollect/weightCheck.vue

@@ -484,6 +484,7 @@
               }
             }
             else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
+              console.log(value)
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -493,6 +494,7 @@
                   result += tmp
                 }
               }
+              console.log(parseInt(result))
               if (this.tpyeNo != 2) {
                 if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.grossWeight = parseInt(result)
@@ -504,6 +506,7 @@
               }
             }
             else {
+              // console.log(value)
               for(var i=0;i<value.length;i++){
                 var tmp = String.fromCharCode(value[i])
                 
@@ -530,13 +533,21 @@
                 }
               }
               if (this.tpyeNo != 2) {
+                console.log(parseInt(result)+''+parseInt(this.result1))
                 if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.grossWeight =  parseInt(result+this.result1)
                 }
+                if (parseInt(result) == 0&&parseInt(this.result1) == 0) {
+                  this.weighingList.grossWeight =  0
+                }
+               
               } else {
                 if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.tare =  parseInt(result+this.result1)
                 }
+                if (parseInt(result) == 0&&parseInt(this.result1) == 0) {
+                  this.weighingList.tare =  0
+                }
               }
             }
 
@@ -549,6 +560,10 @@
         }
       },
       cancel() {
+        
+        if(this.reader){
+          this.reader.cancel()
+        }
         this.$router.push({
           path: 'weighingManagement'
         })