From 5861337d44450cb62daa93103efc8c92fb3bea86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 16 Nov 2023 09:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=88=86=E6=9E=90=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E4=BA=86=EF=BC=8C=E5=88=86=E6=9E=90=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97=E5=8D=B3=E4=BE=BF=E6=98=AF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8E=A5=E6=94=B6=E5=88=B0=E5=90=8E=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=20ws=20=E6=B6=88=E6=81=AF=E4=B9=9F=E8=A6=81=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=20ws=20=E5=88=9B=E5=BB=BA=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=90=8E=E9=9D=A2=E7=9A=84key=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAuserId+'=5F'+Date.now()=20=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/gamma-analysis.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 1650f26..75a3904 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -103,7 +103,7 @@
       :currStep="currStep"
       :checkBoxFlag="checkBox_updateCal"
       :newCheckBoxFlag="newCheckBox_updateCal"
-      @closeModal="haCndleCloseModal"
+      @closeModal="handleCloseModal"
     />
     <!-- ReProcessing 弹窗结束 -->
   </div>
@@ -230,6 +230,7 @@ export default {
       newCheckBox_updateCal: false, //update复选框状态
       currStep: '',
       isReAnalyed: false,
+      timerStamp: Date.now(),
     }
   },
   created() {
@@ -423,7 +424,12 @@ export default {
       // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
       var userId = store.getters.userInfo.id
       var url =
-        window._CONFIG['domianURL'].replace('https://', 'wss://').replace('http://', 'ws://') + '/websocket/' + userId
+        window._CONFIG['domianURL'].replace('https://', 'wss://').replace('http://', 'ws://') +
+        '/websocket/' +
+        userId +
+        '_' +
+        this.timerStamp
+
       //console.log(url);
       //update-begin-author:taoyan date:2022-4-22 for:  v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
       let token = Vue.ls.get(ACCESS_TOKEN)
@@ -1516,6 +1522,7 @@ export default {
 
     // 重新分析
     async reProcessing(showMessage = true) {
+      var userId = store.getters.userInfo.id
       if (this.isProcessing) {
         return
       }
@@ -1529,9 +1536,10 @@ export default {
         this.isLoading = true
         const { inputFileName: fileName } = this.sample
         const { success, result, message } = await postAction(
-          `/gamma/Reprocessing?fileName=${fileName}&processKey=userId_${Date.now()}`
+          `/gamma/Reprocessing?fileName=${fileName}&processKey=${userId}_${this.timerStamp}`
         )
         if (success) {
+          this.reprocessingModalVisible = false //如果分析成功了，分析进度的弹窗即便是没有接收到后面的 ws 消息也要关闭弹窗
           this.isReAnalyed = true
           this.bAnalyed = result.bAnalyed
           this.$emit('reAnalyed', this.isReAnalyed)
@@ -1554,7 +1562,7 @@ export default {
         this.isLoading = false
       }
     },
-    haCndleCloseModal() {
+    handleCloseModal() {
       this.reprocessingModalVisible = false
       this.abc = false
     },