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

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -471,7 +471,7 @@ export default {
         this.loading = false
         if (res.IsSuccess) {
           this.TrialModality = res.OtherInfo.TrialModality.split('|')
-          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || 2
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || res.OtherInfo.IsReadingTaskViewInOrder === 0 ? res.OtherInfo.IsReadingTaskViewInOrder : 2
           this.StudyInstanceUidList = []
           this.SopInstanceUidList = []
           this.UploadStudyList = []

src/views/dicom-show/dicom-visit.vue

@@ -157,7 +157,7 @@
               </el-tab-pane>
               <el-tab-pane v-show="!visitTaskId" v-if="IsReadingTaskViewInOrder >= 2"
                 :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
-                <div class="viewerSidethumbinner">
+                <div class="viewerSidethumbinner"> 
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
                     <div v-for="item in relationStudyListByVisitName" :key="`${item.VisitName}`">

src/views/none-dicoms/components/file-viewer.vue

@@ -11,7 +11,8 @@
           <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
             <div class="left-top-text">
               <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
-              <div v-if="v.imageIds.length > 0">{{ `${ v.currentImageIdIndex + 1 } / ${ v.imageIds.length }` }}</div>
+              <div v-if="v.imageIds.length > 0">{{ `${v.currentImageIdIndex + 1} / ${v.imageIds.length}` }}</div>
+              <div v-if="isComparison" style="font-size: 30px;color: #428bca;margin-top: 10px;">{{ tip[index] }}</div>
             </div>
             <div class="left-bottom-text">
               <div v-if="v.zoomText">{{ `Zoom: ${v.zoomText}` }}</div>
@@ -226,7 +227,11 @@ export default {
       tools: [],
       viewportInfos: [],
       activeCanvasIndex: 0,
-      serie: {}
+      serie: {},
+      tip: [
+        this.$t('DicomViewer:anonymous:after'),
+        this.$t('DicomViewer:anonymous:before')
+      ]
     }
   },
   computed: {
@@ -252,8 +257,8 @@ export default {
     }
   },
   mounted() {
-    let type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''
-    this.hasAnonymous = type === 'Study'
+    // let type = this.$router.currentRoute.query.isQcCheck ? this.$router.currentRoute.query.type : ''
+    this.hasAnonymous = this.$router.currentRoute.query.isQcCheck
     this.tools = config.customizeStandardsNoneDicom
     this.trialId = this.$route.query.trialId
     this.viewportInfos = Array.from({ length: this.cellsMax }, (_, index) => ({

src/views/none-dicoms/index.vue

@@ -10,8 +10,8 @@
     <!-- 图像 -->
     <div class="middle-panel">
 
-      <file-viewer ref="fileViewer" :isComparison="isComparison" @toggleImage="toggleImage" @selectFile="selectFile"
-        @replaceImage="replaceImage" />
+      <file-viewer ref="fileViewer" :isComparison.sync="isComparison" @toggleImage="toggleImage"
+        @selectFile="selectFile" @replaceImage="replaceImage" />
     </div>
   </div>
 </template>

src/views/research/components/BaseInfo.vue

@@ -413,7 +413,10 @@ export default {
     handleSave(isAutoCommit, isCheck = false) {
       return new Promise((resolve, reject) => {
         if (this.IsOnlyUploadFile && !isCheck) {
-          if (!this.form.CommonUploadRecordId) return this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId"))
+          if (!this.form.CommonUploadRecordId) {
+            this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId"))
+            return resolve(false)
+          }
           this.btnLoading = true
           const param = {
             id: this.form.Id,
@@ -448,7 +451,7 @@ export default {
             this.btnLoading = false
             reject(false)
           })
-          return false
+          return resolve(true)
         }
         this.$refs['researchBSForm'].validate(valid => {
           if (valid) {

src/views/research/login.vue

@@ -357,8 +357,18 @@ export default {
           }
           verifySendCode(param).then(async res => {
             zzSessionStorage.clear()
-            this.$i18n.locale = this.$route.query.lang
-            this.setLanguage(this.$route.query.lang)
+            // this.$i18n.locale = this.$route.query.lang
+            // this.setLanguage(this.$route.query.lang)
+            let lang = this.$route.query.lang
+            if (!lang) {
+              const language = navigator.language
+              lang = 'en'
+              if (language.includes("zh")) {
+                lang = 'zh'
+              }
+            }
+            this.$i18n.locale = lang
+            this.setLanguage(lang)
             store.dispatch('user/setToken', res.Result.Token)
             zzSessionStorage.setItem('TokenKey', res.Result.Token)
             zzSessionStorage.setItem('userId', res.Result.UserRoleId);