修改串口判断

src/views/outboundManagement/weighing.vue

@@ -137,7 +137,10 @@
 				reader:null,
 				param:9600
 			}
-		},
+    },
+    mounted() {
+	  this.openPort()
+	  },
 		activated() {
 			this.types = this.$route.query.typeNo
 			this.weighingList.number = this.$route.query.number
@@ -176,14 +179,24 @@
 				this.reader.cancel()
 			},
 			async openPort(){
-			console.log('openPort',navigator);
-			if ('serial' in navigator) {
-				// The Web Serial API is supported.
-				console.log('the Web Serial API is supported.');
-				console.log(this.param);
-				const port = await navigator.serial.requestPort();
-				await port.open({ baudRate: this.param }); // set baud rate
-				this.reader = port.readable.getReader();
+			 console.log('openPort', navigator)
+        if ('serial' in navigator) {
+          if (!this.$store.state.app.reader) {
+            // The Web Serial API is supported.
+            console.log('the Web Serial API is supported.')
+            console.log(this.param)
+            const port = await navigator.serial.requestPort()
+            await port.open({
+              baudRate: this.param,
+            }) // set baud rate
+            this.reader = port.readable.getReader()
+            console.log('beforeReader', port)
+            console.log('beforeReader', this.reader)
+            this.$store.dispatch('app/setReader', this.reader)
+          } else {
+            console.log('afterport', this.$store.state.app.reader)
+            this.reader = this.$store.state.app.reader
+          }
 				// 监听来自串行设备的数据
 				while (true) {
 				const { value, done } = await this.reader.read();

src/views/warehouse/warehouseManagementGross.vue

@@ -899,6 +899,7 @@ export default {
     //   // this.deptBudgetList.inOutType = '退库'
     //   this.deptBudgetList.inOutTypeKey = '1'
     // }
+    this.openPort()
   },
   methods: {
     async closePort() {
@@ -907,15 +908,23 @@ export default {
     },
     async openPort() {
       console.log('openPort', navigator)
-      if ('serial' in navigator) {
-        // The Web Serial API is supported.
-        console.log('the Web Serial API is supported.')
-        console.log(this.param)
-        const port = await navigator.serial.requestPort()
-        await port.open({
-          baudRate: this.param,
-        }) // set baud rate
-        this.reader = port.readable.getReader()
+        if ('serial' in navigator) {
+          if (!this.$store.state.app.reader) {
+            // The Web Serial API is supported.
+            console.log('the Web Serial API is supported.')
+            console.log(this.param)
+            const port = await navigator.serial.requestPort()
+            await port.open({
+              baudRate: this.param,
+            }) // set baud rate
+            this.reader = port.readable.getReader()
+            console.log('beforeReader', port)
+            console.log('beforeReader', this.reader)
+            this.$store.dispatch('app/setReader', this.reader)
+          } else {
+            console.log('afterport', this.$store.state.app.reader)
+            this.reader = this.$store.state.app.reader
+          }
         // 监听来自串行设备的数据
         while (true) {
           const { value, done } = await this.reader.read()

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -823,6 +823,9 @@ export default {
       ],
     }
   },
+  mounted() {
+	  this.openPort()
+	},
   activated() {
     if (this.$route.query.allowEdit == 1) {
       this.allowEdit = false
@@ -890,16 +893,24 @@ export default {
       this.reader.cancel()
     },
     async openPort() {
-      console.log('openPort', navigator)
-      if ('serial' in navigator) {
-        // The Web Serial API is supported.
-        console.log('the Web Serial API is supported.')
-        console.log(this.param)
-        const port = await navigator.serial.requestPort()
-        await port.open({
-          baudRate: this.param,
-        }) // set baud rate
-        this.reader = port.readable.getReader()
+       console.log('openPort', navigator)
+        if ('serial' in navigator) {
+          if (!this.$store.state.app.reader) {
+            // The Web Serial API is supported.
+            console.log('the Web Serial API is supported.')
+            console.log(this.param)
+            const port = await navigator.serial.requestPort()
+            await port.open({
+              baudRate: this.param,
+            }) // set baud rate
+            this.reader = port.readable.getReader()
+            console.log('beforeReader', port)
+            console.log('beforeReader', this.reader)
+            this.$store.dispatch('app/setReader', this.reader)
+          } else {
+            console.log('afterport', this.$store.state.app.reader)
+            this.reader = this.$store.state.app.reader
+          }
         // 监听来自串行设备的数据
         while (true) {
           const { value, done } = await this.reader.read()

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -612,6 +612,9 @@ export default {
       result1: '00',
     }
   },
+  mounted() {
+	  this.openPort()
+	},
   activated() {
     if (this.$route.query.allowEdit == 1) {
       this.allowEdit = false
@@ -661,7 +664,8 @@ export default {
     },
     async openPort() {
       console.log('openPort', navigator)
-      if ('serial' in navigator) {
+    if ('serial' in navigator) {
+      if (!this.$store.state.app.reader) {
         // The Web Serial API is supported.
         console.log('the Web Serial API is supported.')
         console.log(this.param)
@@ -670,6 +674,13 @@ export default {
           baudRate: this.param,
         }) // set baud rate
         this.reader = port.readable.getReader()
+        console.log('beforeReader', port)
+        console.log('beforeReader', this.reader)
+        this.$store.dispatch('app/setReader', this.reader)
+      } else {
+        console.log('afterport', this.$store.state.app.reader)
+        this.reader = this.$store.state.app.reader
+      }
         // 监听来自串行设备的数据
         while (true) {
           const { value, done } = await this.reader.read()

src/views/warehouse/warehouseManagementTare.vue

@@ -773,6 +773,7 @@ export default {
         console.log(response)
         this.deptBudgetList1 = response
       })
+     this.openPort()  
   },
   methods: {
     async closePort() {
@@ -781,7 +782,8 @@ export default {
     },
     async openPort() {
       console.log('openPort', navigator)
-      if ('serial' in navigator) {
+    if ('serial' in navigator) {
+      if (!this.$store.state.app.reader) {
         // The Web Serial API is supported.
         console.log('the Web Serial API is supported.')
         console.log(this.param)
@@ -790,6 +792,13 @@ export default {
           baudRate: this.param,
         }) // set baud rate
         this.reader = port.readable.getReader()
+        console.log('beforeReader', port)
+        console.log('beforeReader', this.reader)
+        this.$store.dispatch('app/setReader', this.reader)
+      } else {
+        console.log('afterport', this.$store.state.app.reader)
+        this.reader = this.$store.state.app.reader
+      }
         // 监听来自串行设备的数据
         while (true) {
           const { value, done } = await this.reader.read()