11

src/views/student/bjgl.vue

@@ -40,7 +40,7 @@
               name="file"
               :multiple="false"
               :showUploadList="false"
-              action="http://192.168.3.123:10026/JX/student/readExcel"
+              :action="actionUrl"
               @change="handleUpload"
             >
               <a-button type="primary" icon="upload" ghost round> 导入 </a-button>
@@ -150,6 +150,7 @@ export default {
   data () {
     return {
       height: document.documentElement.clientHeight - 176,
+      actionUrl: window._CONFIG['domianURL'] + '/student/readExcel',
       data: [],
       dialogVisible: false,
       title: '',

src/views/student/xygl.vue

@@ -163,7 +163,6 @@ export default {
   created () {
     this.initData()
     this.initClass()
-    this.initWbSocket()
   },
 
   mounted() {
@@ -187,6 +186,7 @@ export default {
       if (res.code !== 99200) return this.$message(res.message)
       this.total = res.data.totalRows - 0
       this.data = res.data.records 
+      this.initWbSocket()
     },
     resClick () {
       this.searchData = {
@@ -272,7 +272,7 @@ export default {
       this.selectRow.epc = this.selectRow.studentNo
       const { data: res } = await this.$axios.post('/jxStudentCard/makeCard', this.selectRow)
       if (!res.data) return this.$message.error(res.message)
-      this.$message.success('写入成功')
+      this.$message.success(res.message)
     },
     initWbSocket() {
       this.websock = new WebSocket('ws://127.0.0.1:8081');
@@ -285,15 +285,18 @@ export default {
       console.log('WebSocket连接建立');
     },
     websocketOnerror: function (e) {
-      this.$message.warning('写入服务连接发生错误')
       console.log("WebSocket连接发生错误");
     },
     websocketOnmessage: function (e) {
       var backMessObj = JSON.parse(e.data);
       console.log(backMessObj)
       if(backMessObj.CmdType == 4) {
-        this.saveCard()
-      } else if(![0,1,2,5].includes(backMessObj.CmdType)) {
+        if (backMessObj.Content !== '操作失败，设备未连接') {
+          this.saveCard()
+        } else {
+          this.$message.error(backMessObj.Content)
+        }
+      } else if(![2,3,5].includes(backMessObj.CmdType)) {
         this.$message.error(backMessObj.Content)
       }  
     },