From ed0dacccbbcae8b8aaa6f1d2bfe39085b29e18ad Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 5 Jul 2024 10:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=94=81=E5=B1=8F=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                              | 6 +++++-
 src/store/modules/trials.js                              | 9 ++++++++-
 src/views/login/index.vue                                | 2 +-
 .../visit/crc-upload/components/uploadDicomFiles2.vue    | 7 +++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 638ad4af..ca6f2088 100644
--- a/src/main.js
+++ b/src/main.js
@@ -361,13 +361,17 @@ async function VueInit() {
   window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-    if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
       count = 0;
       localStorage.setItem('count', '0')
       return
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
+      _vm.$msgbox.close();
+      isOpen = false
+      isLock = null
+      zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
       _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
diff --git a/src/store/modules/trials.js b/src/store/modules/trials.js
index 55cf5563..ed8ba8e1 100644
--- a/src/store/modules/trials.js
+++ b/src/store/modules/trials.js
@@ -6,7 +6,8 @@ const getDefaultState = () => {
     subjectQuery: null,
     visitPlanQuery: null,
     visitPointQuery: null,
-    studyListQuery: null
+    studyListQuery: null,
+    unlock: false,
   }
 }
 
@@ -16,6 +17,9 @@ const mutations = {
   RESET_TRIALS: (state) => {
     Object.assign(state, getDefaultState())
   },
+  SET_UNLOCK: (state, unlock) => {
+    state.unlock = unlock
+  },
   SET_ACTIVENAME: (state, activeName) => {
     state.trialDetailActiveName = activeName
   },
@@ -37,6 +41,9 @@ const mutations = {
 }
 
 const actions = {
+  setUnLock({ commit }, unlock) {
+    commit('SET_UNLOCK', unlock)
+  },
   setActiveName({ commit }, activeName) {
     commit('SET_ACTIVENAME', activeName)
   },
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a4d3df9e..caff7e70 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -166,7 +166,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.1.001</p>
+        <p style="margin-bottom: 20px">V1.5.2.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index b3fb0e59..cbe4b436 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -757,6 +757,7 @@ import { getToken } from "@/utils/auth";
 import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
 import { convertBytes } from "@/utils/dicom-character-set";
 import moment from "moment";
+import store from "@/store";
 export default {
   name: "UploadDicomFiles",
   components: { DicomPreview, uploadPetClinicalData },
@@ -827,6 +828,11 @@ export default {
       BodyPart: {},
     };
   },
+  watch: {
+    btnLoading() {
+      store.dispatch("trials/setUnLock", this.btnLoading);
+    },
+  },
   async mounted() {
     this.trialId = this.$route.query.trialId;
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
@@ -841,6 +847,7 @@ export default {
       clearInterval(v);
     });
     this.myInterval = [];
+    store.dispatch("trials/setUnLock", false);
   },
   methods: {
     handleHistorical(row) {