非Dicom阅片临床数据展示方式更改

src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue

@@ -1,9 +1,15 @@
 <template>
   <div style="min-height:500px">
-    <h3 v-if="isReadingShowSubjectInfo" style="padding: 5px 0px;margin: 0;">
+    <div v-if="isReadingShowSubjectInfo" style="display:flex;align-items: center;
+    justify-content: space-between;">
+      <h3>
         <span v-if="subjectCode">{{ subjectCode }}</span>
         <span style="margin-left:5px;">{{ taskBlindName }}</span>
       </h3>
+      <div>
+        <el-button v-if="isExistsClinicalData" type="text" @click="previewCD">{{ $t('trials:reading:button:clinicalData') }}</el-button>
+      </div>
+    </div>
     <ECRF
       :trial-id="trialId"
       :subject-id="subjectId"
@@ -57,7 +63,11 @@ export default {
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
-    }
+    },
+    isExistsClinicalData: {
+      type: Boolean,
+      required: true
+    },
   },
   data() {
     return {
@@ -80,7 +90,10 @@ export default {
         this.activeName = this.criterions[0].ReadingQuestionCriterionTrialId
         this.loading = false
       }).catch(() => { this.loading = false })
-    }
+    },
+    previewCD() {
+      this.$emit('previewCD')
+    },
 
   }
 }

src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue

@@ -91,7 +91,7 @@
     </el-card>
 
     <el-card class="box-card" style="width:400px;height:100%;padding: 10px;margin-left:10px;overflow-y: auto;">
-      <div style="text-align:right;">
+      <!-- <div style="text-align:right;">
         <el-button
           v-if="otherInfo && otherInfo.IsExistsClinicalData"
           type="text"
@@ -99,7 +99,7 @@
         >
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </el-button>
-      </div>
+      </div> -->
       <Criterions
         v-if="otherInfo && visitTaskId!== '' && subjectId!== '' && readingCategory!==null && readingCategory!==4"
         :trial-id="trialId"
@@ -110,6 +110,8 @@
         :task-blind-name="taskBlindName"
         :is-reading-show-subject-info="isReadingShowSubjectInfo"
         :ise-c-r-f-show-in-dicom-reading="iseCRFShowInDicomReading"
+        :isExistsClinicalData="isExistsClinicalData"
+        @previewCD="previewCD"
       />
     </el-card>
   </div>
@@ -171,6 +173,10 @@ export default {
     iseCRFShowInDicomReading: {
       type: Boolean,
       required: true
+    },
+    isExistsClinicalData: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -314,11 +320,12 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     previewCD() {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`
-      })
-      window.open(routeData.href, '_blank')
+      // var token = getToken()
+      // const routeData = this.$router.resolve({
+      //   path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`
+      // })
+      // window.open(routeData.href, '_blank')
+      this.$emit('previewCD', this.visitTaskId)
     },
     getBodyPart(bodyPart) {
       if (!bodyPart) return ''

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

@@ -14,9 +14,11 @@
             :reading-category="readingCategory"
             :readingTool="readingTool"
             :criterionType="criterionType"
+            :isExistsClinicalData="isExistsClinicalData"
             :isReadingShowSubjectInfo="isReadingShowSubjectInfo"
             :is-reading-task-view-in-order="isReadingTaskViewInOrder"
             :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
+            @previewCD="previewCD"
           />
         </el-tab-pane>
         <!-- 报告 -->
@@ -77,25 +79,32 @@
     />
 
     <el-dialog
-      width="75%"
       :visible.sync="dialogVisible"
-      style="margin:0px"
-      custom-class="dialog-container"
+      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
       :show-close="false"
+      :close-on-click-modal="false"
+      :fullscreen="isFullscreen"
     >
       <span slot="title" class="dialog-footer">
-        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
+        <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
+        <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
+        <div style="position: absolute;right: 20px;top: 10px;">
+          <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isFullscreen=!isFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="dialogVisible = false" />
+        </div>
       </span>
-      <div :style="{'height':dialogH,'margin':0}">
+      <div style="height: 100%;margin:0;">
         <ClinicalData
+          v-if="dialogVisible"
           :trial-id="trialId"
           :subject-id="subjectId"
-          :visit-task-id="visitTaskId"
+          :visit-task-id="cdVisitTaskId"
+          :is-reading-show-subject-info="isReadingShowSubjectInfo"
         />
       </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">{{ $t("common:button:confirm") }}</el-button>
+      <span v-if="!closeCDVisible" slot="footer" class="dialog-footer">
+        <!-- 确认 -->
+        <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
       </span>
     </el-dialog>
 
@@ -145,7 +154,10 @@ export default {
       readingTool: null,
       isNewSubject: null,
       dialogVisible: false,
-      dialogH: 0,
+      closeCDVisible: false,
+      cdVisitTaskId: '',
+      isFullscreen: false,
+      // dialogH: 0,
       isShow: false,
       activeName:'',
       tabs: []
@@ -218,13 +230,22 @@ export default {
         localStorage.setItem('digitPlaces', 2)
         this.$nextTick(() => {
           if (this.isExistsClinicalData && this.isNeedReadClinicalData && !this.isReadClinicalData) {
+            this.isFullscreen = false
             this.dialogVisible = true
+            this.cdVisitTaskId = this.visitTaskId
           }
         })
         this.isShow = true
         this.loading = false
       }).catch(() => { this.loading = false })
     },
+    previewCD(taskId) {
+      this.closeCDVisible = true
+      this.isFullscreen = false
+      this.dialogVisible = true
+      this.cdVisitTaskId = taskId
+      this.dialogVisible = true
+    },
     async handleConfirmCD() {
       this.loading = true
       var visitTaskId = this.visitTaskId
@@ -304,10 +325,21 @@ export default {
   }
   /deep/.dialog-container{
     margin-top: 50px !important;
-
+    width:75%;
+    height:80%;
   }
   /deep/.el-dialog__body{
-      padding: 10px;
+      padding: 20px;
+      height: calc(100% - 50px);
+    }
+  .el-dialog__header{
+    position: relative;
+  }
+}
+
+.full-dialog-container{
+  /deep/.is-fullscreen .el-dialog__body{
+    height: calc(100% - 50px);
   }
 }