Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/home/index.vue

@@ -217,7 +217,7 @@
         chartsData: [],
         nowDate: null, //存放年月日变量
         nowTime: null, //存放时分秒变量
-        timer: "", //定义一个定时器的变量
+        timer: '', //定义一个定时器的变量
         currentTime: new Date(), // 获取当前时间
         timer: '',
         dialogVisible: false,
@@ -420,21 +420,21 @@
         this.second = check(second);
 
         function check(i) {
-          const num = (i < 10) ? ("0" + i) : i;
+          const num = (i < 10) ? ('0' + i) : i;
           return num;
         }
-        this.nowDate = year + "-" + this.month + "-" + this.day;
-        this.nowTime = this.hour + ":" + this.minute + ":" + this.second;
+        this.nowDate = year + '-' + this.month + '-' + this.day;
+        this.nowTime = this.hour + ':' + this.minute + ':' + this.second;
       },
       initCharts() {
         let app = this;
-        var roseCharts = document.getElementsByClassName("roseChart");
+        var roseCharts = document.getElementsByClassName('roseChart');
         for (let i = 0; i < roseCharts.length; i++) {
           let myChart = app.$echarts.init(roseCharts[i]);
           let color = []
           let data = []
-          let text = ""
-          let formatter = ""
+          let text = ''
+          let formatter = ''
           let graphicText = ''
           switch (i) {
             case 0:
@@ -543,7 +543,7 @@
               selectedMode: true, // 图例选择的模式，控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择，可以设成 false 关闭。
               top: '10%',
               left: 'center',
-              con: "circle",
+              con: 'circle',
               itemWidth: 10, // 设置宽度
               itemHeight: 10, // 设置高度
               itemGap: 40, // 设置间距
@@ -604,10 +604,10 @@
               data: data // 系列中的数据内容数组。
             }]
           })
-          myChart.off("click");
-          myChart.on("click", function(params) {
+          myChart.off('click');
+          myChart.on('click', function(params) {
             //  var a = params.dataIndex
-            console.log(params, "我被点击了");
+            console.log(params, '我被点击了');
             app.dialogVisible = true
           })
         }
@@ -824,7 +824,7 @@
             label: {
               show: true,
               position: 'top',
-              color: "#b0b1b3"
+              color: '#b0b1b3'
             },
             data: [3000, 4000, 4200, 4500, 6000, 5600, 4500, 5020, 4500, 5400, 4300]
           }]
@@ -1225,7 +1225,7 @@
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             if (parseInt(result)) {
               console.log('result:', result);
               this.text = parseInt(result)

src/views/houseSelfCollect/weightCheck.vue

@@ -540,7 +540,7 @@
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/outboundManagement/weighing.vue

@@ -282,7 +282,7 @@
 						}
 					}
 				}
-				setTimeout(1000)
+				// setTimeout(1000)
 				// value 是一个 Uint8Array
 				}
 				await port.close();

src/views/warehouse/warehouseManagementGross.vue

@@ -541,7 +541,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -552,7 +552,7 @@
                 this.dataList.tare = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -488,7 +488,7 @@
                 this.dataList.grossWeight = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementTare.vue

@@ -470,7 +470,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();