src/views/dictionary/checkConfig/index.vue

@@ -512,7 +512,7 @@
                     <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
                   </el-form-item>
                 </el-col>
-                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && (form.DataType === 'Array' || form.DataType === 'ArrayImage')" :span="12">
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                   <el-form-item>
                     <span slot="label">
                       子数据Value

src/views/trials/trials-panel/reading/none-dicoms/index.vue

@@ -3,37 +3,57 @@
     <!-- 访视阅片 -->
     <visit-review v-if="taskInfo && taskInfo.ReadingCategory=== 1" />
     <!-- 全局阅片 -->
-    <global-review v-else-if="taskInfo && taskInfo.ReadingCategory === 2" :trial-id="trialId"
+    <global-review
-      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
+      v-else-if="taskInfo && taskInfo.ReadingCategory=== 2"
-      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
+      :trial-id="trialId"
-      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+      :subject-id="taskInfo.SubjectId"
+      :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory"
+      :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName"
+      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
       :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
+    />
     <!-- 裁判阅片 -->
-    <ad-review v-else-if="taskInfo && taskInfo.ReadingCategory === 4" :trial-id="trialId"
+    <ad-review
-      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
+      v-else-if="taskInfo && taskInfo.ReadingCategory=== 4"
-      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
+      :trial-id="trialId"
-      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+      :subject-id="taskInfo.SubjectId"
+      :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory"
+      :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName"
+      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
       :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
+    />
     <!-- 肿瘤学阅片 -->
     <!-- <oncology-review v-else-if="taskInfo && taskInfo.ReadingCategory=== 5" /> -->
-    <el-dialog :visible.sync="clinicalDataVisible"
+    <el-dialog
-      :custom-class="isClinicalDataFullscreen ? 'full-dialog-container' : 'dialog-container'" :show-close="false"
+      :visible.sync="clinicalDataVisible"
-      :close-on-click-modal="false" :fullscreen="isClinicalDataFullscreen">
+      :custom-class="isClinicalDataFullscreen?'full-dialog-container':'dialog-container'"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :fullscreen="isClinicalDataFullscreen"
+    >
       <span slot="title" class="dialog-footer">
         <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
         <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
         <div style="position: absolute;right: 20px;top: 10px;">
-          <svg-icon :icon-class="isClinicalDataFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+          <svg-icon :icon-class="isClinicalDataFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen=!isClinicalDataFullscreen" />
-            style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen = !isClinicalDataFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="clinicalDataVisible = false" />
-          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
-            @click="clinicalDataVisible = false" />
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <clinical-data v-if="clinicalDataVisible" style="flex: 1" :trial-id="trialId" :subject-id="taskInfo.SubjectId"
+        <clinical-data
-          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo" />
+          v-if="clinicalDataVisible"
+          style="flex: 1"
+          :trial-id="trialId"
+          :subject-id="taskInfo.SubjectId"
+          :visit-task-id="cdVisitTaskId"
+          :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+        />
         <div v-if="!closeCDVisible" style="text-align:right">
           <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
         </div>
@@ -45,7 +65,6 @@
 <script>
 import { getNextTask, readClinicalData } from '@/api/trials'
 import store from '@/store'
-import { changeURLStatic } from '@/utils/history.js'
 import VisitReview from '@/views/trials/trials-panel/reading/visit-review'
 import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
 import AdReview from '@/views/trials/trials-panel/reading/ad-review'
@@ -73,10 +92,6 @@ export default {
   },
   mounted() {
     this.trialId = this.$route.query.trialId
-    if (this.$router.currentRoute.query.TokenKey) {
-      store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
-      changeURLStatic('TokenKey', '')
-    }
     this.getTaskInfo()
   },
   methods: {
@@ -127,22 +142,18 @@ export default {
 .reading-viewer-container {
   width: 100%;
   height: 100%;
-
   ::v-deep .dialog-container{
     margin-top: 50px !important;
     width:75%;
     height:80%;
   }
-
   ::v-deep .el-dialog__body{
       padding: 10px;
       height: calc(100% - 70px);
     }
-
   .el-dialog__header{
     position: relative;
   }
-
   .full-dialog-container{
     ::v-deep .is-fullscreen .el-dialog__body{
       height: calc(100% - 70px);