部分问题修复

src/api/export.js

@@ -239,7 +239,7 @@ export function getPatientList_Export(data) {
     data
   })
 }
-export function getTumor_CDISC_Export(data) {
+export function getTumor_CDISC_IVUSOCT_Export(data) {
   return requestDownload({
     url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
     responseType: 'blob',

src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue

@@ -27,18 +27,12 @@
       <el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop=""
         show-overflow-tooltip>
         <template>
-<<<<<<< HEAD
           <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
             width="150">
-=======
-          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
-            show-overflow-tooltip width="150">
->>>>>>> uat
             <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
                   }}
                 </span>
@@ -46,15 +40,6 @@
                   scope.row.BeforeQuestionList[index].Answer === '-2' ? "NA" : scope.row.BeforeQuestionList[index].Answer
                     === '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer
                   }}</span>
-=======
-                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.BeforeQuestionList[index].Answer))
-                  }}
-                </span>
-                <span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
-                  scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') :
-                    scope.row.BeforeQuestionList[index].Answer }}</span>
->>>>>>> uat
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
                 <span>
                   {{
@@ -98,12 +83,7 @@
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
-=======
-                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.AfterQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
@@ -134,23 +114,13 @@
       <!-- 评估结果 -->
       <el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
         <template>
-<<<<<<< HEAD
           <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
             width="150">
-=======
-          <el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
-            show-overflow-tooltip width="150">
->>>>>>> uat
             <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
-=======
-                    $fd(scope.row.BeforeQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.BeforeQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
@@ -185,12 +155,7 @@
                 </span>
                 <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
                   {{
-<<<<<<< HEAD
                     $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
-=======
-                    $fd(scope.row.AfterQuestionList[index].DictionaryCode,
-                      parseInt(scope.row.AfterQuestionList[index].Answer))
->>>>>>> uat
                   }}
                 </span>
                 <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>

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

@@ -184,12 +184,9 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
-<<<<<<< HEAD
 import { getAutoCutNextTask } from '@/api/user'
 import { openWindow } from "@/utils/splitScreen";
-=======
 import TargetSection from "./components/TargetSection"
->>>>>>> uat
 const searchDataDefault = () => {
   return {
     SubjectCode: '',

src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue

@@ -28,6 +28,7 @@ import {
   getReadingTaskList_Export,
   getTrialReadingCriterionCanExportDocumentList,
   getTumor_CDISC_Export,
+  getTumor_CDISC_IVUSOCT_Export,
   getOverallTumorEvaluationList_Export,
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
@@ -157,7 +158,7 @@ export default {
           break
         case 21:
           searchData.ReadingExportType = 21
-          getTumor_CDISC_Export(searchData)
+          getTumor_CDISC_IVUSOCT_Export(searchData)
             .then((res) => { })
             .catch(() => {
               this.loading = false
@@ -165,7 +166,7 @@ export default {
           break
         case 22:
           searchData.ReadingExportType = 22
-          getTumor_CDISC_Export(searchData)
+          getTumor_CDISC_IVUSOCT_Export(searchData)
             .then((res) => { })
             .catch(() => {
               this.loading = false