Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/App.vue

@@ -120,10 +120,10 @@ export default {
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
     Vue.prototype.$openI18n = this.openI18n
-    // this.getIsLock()
-    // DicomEvent.$on("isLock", (isLock) => {
-    //   this.isLock = isLock
-    // })
+    this.getIsLock()
+    DicomEvent.$on("isLock", (isLock) => {
+      this.isLock = isLock
+    })
   },
   // watch: {
   //   '$route.query': {

src/main.js

@@ -1,6 +1,6 @@
 
 import Vue from 'vue'
-// import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
@@ -452,7 +452,7 @@ async function VueInit() {
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
-      // DicomEvent.$emit('isLock', false)
+      DicomEvent.$emit('isLock', false)
       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!', {
@@ -473,7 +473,7 @@ async function VueInit() {
           if (_vm.$route.path === '/login') {
             zzSessionStorage.removeItem('lastWorkbench')
             zzSessionStorage.removeItem('isLock')
-            // DicomEvent.$emit('isLock', false)
+            DicomEvent.$emit('isLock', false)
             isLock = null
           }
           return
@@ -483,7 +483,7 @@ async function VueInit() {
         }
         isOpen = true
         zzSessionStorage.setItem('isLock', 'true')
-        // DicomEvent.$emit('isLock', true)
+        DicomEvent.$emit('isLock', true)
         _vm.$msgbox({
           title: _vm.$t("env:lock:msgBox:title"),
           confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
@@ -516,7 +516,7 @@ async function VueInit() {
                   count = 0;
                   isLock = null
                   zzSessionStorage.removeItem('isLock')
-                  // DicomEvent.$emit('isLock', false)
+                  DicomEvent.$emit('isLock', false)
                   localStorage.setItem('count', '0')
                   document.querySelector('#my_username').value = null
                   document.querySelector('#my_password').value = null

src/views/trials/trials-panel/reading/read-task/index.vue

@@ -380,7 +380,6 @@ export default {
   },
   computed: {
     isTumor() {
-      return true
       let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
       if (criterion) {
         return [1, 18, 2, 3, 7, 10, 17].includes(Number(criterion.CriterionType))