system-clients 4.0.17 → 4.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "system-clients",
-    "version": "4.0.17",
+    "version": "4.0.19",
     "description": "系统基础框架",
     "main": "src/index.js",
     "directories": {

package/src/components/equipment/PosList.vue

@@ -21,6 +21,9 @@
 
 
             <div class="span" style="float:right;margin-top: 6px">
+              <button type="button" class="btn-danger btn " style="border-radius: 4px"
+                      @click="$parent.$parent.batchDelete">批量删除
+              </button>
               <button type="button" class="btn-success btn " style="border-radius: 4px"
                       @click="$parent.$parent.batchRoot('1')">批量启用
               </button>
@@ -214,6 +217,18 @@
       infoclose(){
         this.infoshow=false
       },
+      async batchDelete() {
+        let selPos = this.selPos
+        console.log('选择的数据', selPos)
+        let ids = []
+        for (const tmp of selPos) {
+          ids.push(tmp.id)
+        }
+        await this.$resetpost('api/af-system/logic/batchDeletePos', {data: {ids: ids}}, {
+          rejectMsg: null,
+          resolveMsg: null
+        })
+      },
       // 批量操作
       async batchRoot(val) {
         let arrs = []

package/src/filiale/ruihua/Main.vue

@@ -200,7 +200,8 @@ let createWaterMark = function (userName) {
         gasbrandIdData: [],
         showRemind: false,
         dataRemind: [],
-        connectNumber:10,
+        connectNumber: 0,
+        maxReconnectCount: 3,
         timeout: 1000,
         timeoutObj: null,
         serverTimeoutObj: null,
@@ -311,52 +312,117 @@ let createWaterMark = function (userName) {
       //如果服务端在一定时间内没有收到信息，就认为客户端断开了，服务端就会断开连接
       // 发送心跳--确保连接有效
       start () {
-        // 重置
-        vue.prototype.$connectNumber = this.connectNumber  // 重置重连次数
-        this.timeoutObj = setTimeout(() => {
-          this.$socket.send('ping')
-          console.log('ping!')
-          this.serverTimeoutObj = setTimeout(() => {
-            this.$socket.close()
+        this.reset()
+        // 检查WebSocket连接状态
+        if (this.$socket && this.$socket.readyState === WebSocket.OPEN) {
+          this.timeoutObj = setTimeout(() => {
+            try {
+              if (this.$socket && this.$socket.readyState === WebSocket.OPEN) {
+                this.$socket.send('ping')
+                console.log('发送心跳: ping')
+                this.serverTimeoutObj = setTimeout(() => {
+                  console.log('心跳超时，关闭连接')
+                  if (this.$socket) {
+                    this.$socket.close()
+                  }
+                }, this.timeout)
+              }
+            } catch (e) {
+              console.error('发送心跳失败:', e)
+              this.reconnect()
+            }
           }, this.timeout)
-        }, this.timeout)
+        }
       },
       // 重连
       reconnect () {
-        if (this.lockReconnect) return
+        console.log('reconnect()被调用，当前状态：', {
+          lockReconnect: this.lockReconnect,
+          connectNumber: this.connectNumber,
+          maxReconnectCount: this.maxReconnectCount
+        })
+        
+        if (this.lockReconnect) {
+          console.log('重连被锁定，跳过')
+          return
+        }
+        
+        // 检查重连次数
+        this.connectNumber++
+        if (this.connectNumber > this.maxReconnectCount) {
+          console.log(`重连失败，已达到最大重连次数(${this.maxReconnectCount})，停止重连`)
+          this.$showMessage(`WebSocket连接失败，已尝试${this.maxReconnectCount}次重连，请刷新页面或联系管理员`)
+          return
+        }
+        
+        this.lockReconnect = true
+        
+        // 清理旧连接
+        if (this.$socket) {
+          this.$socket.close()
+          this.$socket = null
+        }
+        
+        // 指数退避延迟
+        const delay = Math.min(1000 * Math.pow(2, this.connectNumber - 1), 30000)
+        console.log(`连接异常，${delay/1000}秒后进行第${this.connectNumber}次重连...`)
+        
         setTimeout(() => {
-          console.log('连接异常，尝试重新连接。。。。')
           this.initWebSocket()
           this.lockReconnect = false
-        }, 1000 * 60)
+        }, delay)
       },
       // 初始化
       initWebSocket () {
-        let path = `ws://${location.host}/ws?token=${this.$login.f.id}`
+        // 清理旧连接
+        if (this.$socket) {
+          this.$socket.close()
+          this.$socket = null
+        }
+        
+        // 自动检测协议
+        let protocol = location.protocol === 'https:' ? 'wss:' : 'ws:'
+        let path = `${protocol}//${location.host}/ws?token=${this.$login.f.id}`
+        
         try {
           if ('WebSocket' in window) {
-            // 创建对象
+            console.log(`正在连接WebSocket: ${path}`)
             vue.prototype.$socket = new WebSocket(path)
+            
+            // 检查WebSocket是否创建成功
+            if (this.$socket) {
+              this.$socket.onopen = this.onOpen  // 连接成功
+              this.$socket.onmessage = this.onMessage  // 收到消息时回调
+              this.$socket.onclose = this.onClose  // 连接关闭时回调
+              this.$socket.onerror = this.onError  // 通讯异常
+            } else {
+              console.error('WebSocket创建失败: $socket为null')
+              this.reconnect()
+            }
           } else {
-            this.$showMessage('您的浏览器不支持websocket的协议，建议使用新版谷歌浏览器，请勿使用IE浏览器，360浏览器请使用极速模式，不要使用兼容模式!"')
+            console.error('浏览器不支持WebSocket')
+            this.$showMessage('您的浏览器不支持websocket的协议，建议使用新版谷歌浏览器，请勿使用IE浏览器，360浏览器请使用极速模式，不要使用兼容模式!')
           }
         } catch (e) {
+          console.error('WebSocket创建失败:', e)
+          // 确保$socket被清空
+          vue.prototype.$socket = null
           this.reconnect()
         }
-
-        this.$socket.onopen = this.onOpen  // 连接成功
-        this.$socket.onmessage = this.onMessage  // 收到消息时回调
-        this.$socket.onclose = this.onClose  // 连接关闭时回调
-        this.$socket.onerror = this.onError  // 通讯异常
       },
       // 通讯异常
-      onError () {
-        console.log('通讯异常')
-        this.reconnect()
+      onError (error) {
+        console.log('WebSocket通讯异常:', error)
+        // 只有在还没达到最大重连次数时才重连
+        if (this.connectNumber < this.maxReconnectCount) {
+          this.reconnect()
+        }
       },
       // 连接成功
       onOpen () {
-        console.log('webSocket连接成功')
+        console.log('WebSocket连接成功')
+        // 重置重连计数
+        this.connectNumber = 0
         this.start()//每十秒发送心跳包，确保连接状态有效
       },
       // 收到消息时回调函数
@@ -381,10 +447,14 @@ let createWaterMark = function (userName) {
         }
       },
       // 关闭连接时回调函数
-      onClose () {
-        console.log('webSocket连接断开')
+      onClose (event) {
+        console.log('WebSocket连接断开, code:', event.code, 'reason:', event.reason)
         this.reset()
-        this.reconnect()  // 重连
+        
+        // 只有在非正常关闭且未达到最大重连次数时才重连
+        if (event.code !== 1000 && this.connectNumber < this.maxReconnectCount) {
+          this.reconnect()
+        }
       },
       getOrderList(){
         let times = this.config.times * 60 * 1000
@@ -660,6 +730,26 @@ let createWaterMark = function (userName) {
       })
     }
   },
+  beforeDestroy() {
+    // 清理定时器
+    if (this.interval) {
+      clearInterval(this.interval)
+      this.interval = null
+    }
+    if (this.intervaltx) {
+      clearInterval(this.intervaltx)
+      this.intervaltx = null
+    }
+    
+    // 清理WebSocket相关
+    this.reset()
+    if (this.$socket) {
+      this.$socket.close(1000, '页面关闭')
+      this.$socket = null
+    }
+    
+    console.log('组件销毁，已清理所有资源')
+  },
   computed: {
     orgpathnames(){
       let names = this.$login.f.name