From 5e13af047fdb41ad81623fa74d7eedfb4b36f311 Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Thu, 18 Dec 2025 12:37:46 +0800
Subject: [PATCH] commit

---
 .../components/plugins/sysSignature/pc.vue    | 154 ++++++++++--------
 .../views/layouts/v4/baseLayout.html          |   5 +-
 2 files changed, 86 insertions(+), 73 deletions(-)

diff --git a/src/main/resources/static/components/plugins/sysSignature/pc.vue b/src/main/resources/static/components/plugins/sysSignature/pc.vue
index 6afc4fd..b3801c7 100644
--- a/src/main/resources/static/components/plugins/sysSignature/pc.vue
+++ b/src/main/resources/static/components/plugins/sysSignature/pc.vue
@@ -1,96 +1,108 @@
 <template>
-    <el-card shadow="never" class="pc-signature-card">
-        <div class="pc-signature">
-            <el-link type="primary">扫描下方二维码进行签字</el-link>
-            <div class="signature-body">
-                <QrCode v-if="!signatureContent" :options="{ width: 126 }" :value="signatureAddress" class="signature-qrcode"></QrCode>
-                <el-image v-if="signatureContent" :src="signatureContent" class="signature-image"></el-image>
-            </div>
-            <el-link type="danger" icon="el-icon-edit" @click="signatureAgain" v-if="signatureContent">重签</el-link>
-        </div>
-    </el-card>
+  <el-card shadow="never" class="pc-signature-card">
+    <div class="pc-signature">
+      <el-link type="primary">扫描下方二维码进行签字</el-link>
+      <div class="signature-body" v-loading="loading">
+        <QrCode v-if="!signatureContent" :options="{ width: 126 }" :value="signatureAddress"
+                class="signature-qrcode"></QrCode>
+        <el-image v-if="signatureContent" :src="signatureContent" class="signature-image"></el-image>
+      </div>
+      <el-link type="danger" icon="el-icon-edit" @click="signatureAgain" v-if="signatureContent">重签</el-link>
+    </div>
+  </el-card>
 </template>
 
 <script>
 module.exports = {
-    name: "sysSignaturePc",
-    store,
-    props: {
-        value: {
-            type: String,
-            default: ""
-        }
-    },
-    watch: {
-        value: {
-            handler(val) {
-              if(val){
-                this.signatureContent = val
-                this.$emit("input", this.signatureContent)
-              }
-            },
-            immediate: true
-        }
-    },
-    data() {
-        return {
-            //前端唯一标识 当然后端还有用户id作为唯一标识
-            id: new Date().getTime() + Math.floor(Math.random() * 10000) + 1,
-            signatureAddress: null,
-            interval: null,
-            signatureContent: null
-        }
-    },
-    methods: {
-        async init() {
-            const { code, data } = await this.$axios.post("/platform/signature/get")
-            if (code === 0) {
-                this.signatureContent = data && data.signature
-                this.$emit("input", this.signatureContent)
-            }
-            this.signatureAddress = origin + "/platform/signature/scanPcCode?id=" + this.id
-            console.log(this.signatureAddress)
-        },
-        signatureAgain() {
-            const val = sessionStorage.getItem("h5-scan-code-signature-" + this.id)
-            this.signatureContent = val
-            this.$emit("input", val)
-        }
-    },
-    mounted() {
-        this.init()
-        webSocketPubSub.subscribe("h5-scan-code-signature", (data) => {
-            console.info("ws:收到签字成功消息:", data)
-            this.signatureContent = data.value
-            this.$emit("input", data.value)
-        })
+  name: "sysSignaturePc",
+  store,
+  props: {
+    value: {
+      type: String,
+      default: ""
     }
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val) {
+          this.signatureContent = val
+          this.$emit("input", this.signatureContent)
+        }
+      },
+      immediate: true
+    }
+  },
+  data() {
+    return {
+      //前端唯一标识 当然后端还有用户id作为唯一标识
+      id: new Date().getTime() + Math.floor(Math.random() * 10000) + 1,
+      signatureAddress: null,
+      interval: null,
+      signatureContent: null,
+      loading: true,
+    }
+  },
+  methods: {
+    async init() {
+      const {code, data} = await this.$axios.post("/platform/signature/get")
+      if (code === 0) {
+        this.signatureContent = data && data.signature
+        this.$emit("input", this.signatureContent)
+      }
+      this.signatureAddress = origin + "/platform/signature/scanPcCode?id=" + this.id
+      console.log(this.signatureAddress)
+    },
+    signatureAgain() {
+      const val = sessionStorage.getItem("h5-scan-code-signature-" + this.id)
+      this.signatureContent = val
+      this.$emit("input", val)
+    }
+  },
+  mounted() {
+    this.init()
+    webSocketPubSub.subscribe("h5-scan-code-signature", (data) => {
+      console.info("ws:收到签字成功消息:", data)
+      this.signatureContent = data.value
+      this.$emit("input", data.value)
+    })
+
+    // 可选：轮询或 watch ready 状态
+    const checkReady = () => {
+      if (window.webSocketPubSub.ws.readyState === 1) {
+        this.loading = false; // 允许签字
+      } else {
+        setTimeout(checkReady, 100);
+      }
+    };
+    checkReady();
+  }
 }
 </script>
 
 <style scoped>
 .pc-signature-card {
-    border: 1px solid var(--border-color-base);
+  border: 1px solid var(--border-color-base);
 }
 
 .pc-signature {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    align-items: center;
-    row-gap: 20px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  row-gap: 20px;
 }
 
 .signature-body {
-    position: relative;
+  position: relative;
 }
 
 .signature-qrcode {
-    transition: opacity 0.5s ease;
+  transition: opacity 0.5s ease;
 }
 
 .signature-image {
-    height: 100px;
-    width: auto;
+  height: 100px;
+  width: auto;
 }
 </style>
diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html
index c2f4a00..8bde804 100644
--- a/src/main/resources/views/layouts/v4/baseLayout.html
+++ b/src/main/resources/views/layouts/v4/baseLayout.html
@@ -168,7 +168,7 @@
                             this.isSubscribed = true
                             this.sendJoinMessage()
                         }
-                    }, 500)
+                    }, 1000)
                 }
 
                 // 事件处理
@@ -202,6 +202,7 @@
                         // )
                         // 连接建立时不立即发送 join，等待订阅完成
                         this.ping()
+                        console.log('websocket open success')
                     }
                 }
 
@@ -245,7 +246,7 @@
                                 }
                             }, 500)
                         }
-                    }, 2000) // 延迟2秒重连
+                    }, 1000) // 延迟2秒重连
                 }
 
                 // 窗口事件处理