Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/weightCheck.vue

@@ -314,9 +314,9 @@
         // this.openPort()
         // this.isShowBalance = true
       // }
-       if (this.$route.query.automaticWeightAcquisition == '1') {
+      //  if (this.$route.query.automaticWeightAcquisition == '1') {
         this.isShowBalance = true
-      }
+      // }
       console.log(this.weighingList)
       
       this.getList()
@@ -463,8 +463,10 @@
           }
 
         } else {
+          debugger
           this.index = 1
           this.carList = this.pList
+          this.carList1 = this.pList
           if (this.pList.length != 0) {
             let _item = this.pList.filter(function(val1) {
               if (val1.id == that.$route.query.id) {