Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-naivevue

src/components/Websocket/index.vue

@@ -7,12 +7,18 @@
 
   const emit = defineEmits(['rollback']);
 
+  /**
+   * 定义接收的参数
+   */
   const props = defineProps({
     uri: {
       type: String,
     },
   });
 
+  /**
+   * 定义Socket状态
+   */
   const state = reactive({
     webSocket: ref(), // webSocket实例
     lockReconnect: false, // 重连锁，避免多次重连
@@ -27,6 +33,9 @@ const state = reactive({
     },
   });
 
+  /**
+   * 获取Token令牌
+   */
   const token = computed(() => {
     return useUserStore().getToken;
   });
@@ -35,6 +44,9 @@ const tenant = computed(() => {
     return Session.getTenant();
   });
 
+  /**
+   * 钩子函数
+   */
   onMounted(() => {
     initWebSocket();
   });
@@ -44,6 +56,9 @@ onUnmounted(() => {
     clearTimeoutObj(state.heartbeat);
   });
 
+  /**
+   * 初始化WebSocket对象
+   */
   const initWebSocket = () => {
     // ws地址
     let host = window.location.host;
@@ -61,11 +76,17 @@ const initWebSocket = () => {
     state.webSocket.onclose = onClose;
   };
 
+  /**
+   * 重连机制
+   */
   const reconnect = () => {
-	if (!token) {
+    if (!token.value) {
       return;
     }
-	if (state.lockReconnect || (state.maxReconnect !== -1 && state.reconnectTime > state.maxReconnect)) {
+    if (
+      state.lockReconnect ||
+      (state.maxReconnect !== -1 && state.reconnectTime > state.maxReconnect)
+    ) {
       return;
     }
     state.lockReconnect = true;
@@ -76,6 +97,7 @@ const reconnect = () => {
       state.lockReconnect = false;
     }, 5000);
   };
+
   /**
    * 清空定时器
    */
@@ -83,6 +105,7 @@ const clearTimeoutObj = (heartbeat: any) => {
     heartbeat.pingTimeoutObj && clearTimeout(heartbeat.pingTimeoutObj);
     heartbeat.pongTimeoutObj && clearTimeout(heartbeat.pongTimeoutObj);
   };
+
   /**
    * 开启心跳
    */
@@ -116,6 +139,7 @@ const onOpen = () => {
     startHeartbeat();
     state.reconnectTime = 0;
   };
+
   /**
    * 连接失败事件
    * @param e
@@ -133,9 +157,10 @@ const onClose = () => {
     //重连
     reconnect();
   };
+
   /**
    * 接收服务器推送的信息
- * @param msgEvent
+   * @param msgEvent 消息事件
    */
   const onMessage = (msgEvent: any) => {
     //收到服务器信息，心跳重置并发送

src/views/data/config/columns.ts

@@ -14,11 +14,6 @@ export const columns = [
   {
     title: '配置编码',
     key: 'code',
-    width: 100,
+    width: 200,
-  },
-  {
-    title: '排序',
-    key: 'sort',
-    width: 100,
   },
 ];

src/views/data/dict/columns.ts

@@ -14,6 +14,6 @@ export const columns = [
   {
     title: '字典编码',
     key: 'code',
-    width: 100,
+    width: 200,
   },
 ];