影像为加载前网速计算文件大小取值更改

package-lock.json

@@ -48,7 +48,6 @@
         "nprogress": "^0.2.0",
         "path-to-regexp": "^0.1.10",
         "pdfobject": "^2.3.0",
-        "prismjs": "^1.30.0",
         "qrcodejs2": "^0.0.2",
         "screenfull": "^6.0.2",
         "sortablejs": "^1.15.5",
@@ -63,7 +62,6 @@
         "vue-count-to": "^1.0.13",
         "vue-demi": "^0.14.10",
         "vue-i18n": "^8.28.2",
-        "vue-prism-editor": "^1.3.0",
         "vue-puzzle-vcode": "^1.1.10",
         "vue-router": "^3.0.6",
         "vue-seamless-scroll": "^1.1.23",
@@ -18046,15 +18044,6 @@
         "renderkid": "^3.0.0"
       }
     },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
@@ -23008,18 +22997,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/vue-prism-editor": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/vue-prism-editor/-/vue-prism-editor-1.3.0.tgz",
-      "integrity": "sha512-54RfgtMGRMNr9484zKMOZs1wyLDR6EfFylzE2QrMCD9alCvXyYYcS0vX8oUHh+6pMUu6ts59uSN9cHglpU2NRQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.11"
-      }
-    },
     "node_modules/vue-puzzle-vcode": {
       "version": "1.1.10",
       "resolved": "https://registry.npmmirror.com/vue-puzzle-vcode/-/vue-puzzle-vcode-1.1.10.tgz",

package.json

@@ -54,7 +54,6 @@
     "nprogress": "^0.2.0",
     "path-to-regexp": "^0.1.10",
     "pdfobject": "^2.3.0",
-    "prismjs": "^1.30.0",
     "qrcodejs2": "^0.0.2",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.5",
@@ -69,7 +68,6 @@
     "vue-count-to": "^1.0.13",
     "vue-demi": "^0.14.10",
     "vue-i18n": "^8.28.2",
-    "vue-prism-editor": "^1.3.0",
     "vue-puzzle-vcode": "^1.1.10",
     "vue-router": "^3.0.6",
     "vue-seamless-scroll": "^1.1.23",

src/api/dictionary.js

@@ -418,11 +418,10 @@ export function addOrUpdateBasicDic(param) {
   })
 }
 
-export function getDictionaryChildList(data) {
+export function getDictionaryChildList(id) {
   return request({
-    url: `/Dictionary/getChildList`,
-    method: 'post',
-    data
+    url: `/Dictionary/getChildList/${id}`,
+    method: 'get'
   })
 }
 
@@ -1358,42 +1357,3 @@ export function deleteAttachment(data) {
     data
   })
 }
-// 项目文档-获取历史记录列表
-export function getTrialHistoryRecordFileList(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/getTrialHistoryRecordFileList`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-新增/修改历史记录
-export function addOrUpdateTrialHistoryRecordFile(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/addOrUpdateTrialHistoryRecordFile`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-批量新增历史记录
-export function batchAddTrialHistoryRecordFile(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/batchAddTrialHistoryRecordFile`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-删除历史记录
-export function deleteTrialHistoryRecordFile(id) {
-  return request({
-    url: `/TrialHistoryRecordFile/deleteTrialHistoryRecordFile/${id}`,
-    method: 'delete',
-  })
-}
-// 邮件管理-批量修改邮件
-export function batchUpdateEmail(data) {
-  return request({
-    url: `/EmailNoticeConfig/batchUpdateEmail`,
-    method: 'post',
-    data
-  })
-}

src/api/dictionary/checkConfig.js

@@ -45,19 +45,10 @@ export function changeFrontAuditSort(param) {
   })
 }
 
-export function getModuleTypeDescriptionList(params) {
+export function getModuleTypeDescriptionList(param) {
   return request({
-    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
-    method: 'get',
-    params
-  })
-}
-
-export function getModuleTypeList(data) {
-  return request({
-    url: `/FrontAuditConfig/getModuleTypeList`,
-    method: 'post',
-    data
+    url: `${param === '' ? '/FrontAuditConfig/getModuleTypeDescriptionList' : '/FrontAuditConfig/getModuleTypeDescriptionList?moduleTypeId=' + param}`,
+    method: 'get'
   })
 }
 

src/api/export.js

@@ -72,14 +72,7 @@ export function getReadingTaskList_Export(param) {
     data: param
   })
 }
-export function getTrialVisitImageStatList_Export(param) {
-  return requestDownload({
-    url: '/ExcelExport/getTrialVisitImageStatList_Export',
-    method: 'post',
-    responseType: 'blob',
-    data: param
-  })
-}
+
 export function getReReadingTaskList_Export(param) {
   return requestDownload({
     url: '/ExcelExport/getReReadingTaskList_Export',

src/api/reading.js

@@ -75,10 +75,11 @@ export function getRelationVisitList(visitNum, tpCode) {
     method: 'get'
   })
 }
-export function getAllRelationStudyList(studyId) {
+export function getAllRelationStudyList(studyId, params) {
   return request({
     url: `/study/getAllRelationStudyList/${studyId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getTrialListByReviewer(param) {
@@ -134,7 +135,7 @@ export function AddAdjudicationReport(param) {
 }
 
 export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) {
-  let url =  `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
+  let url = `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
   url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url
   return request({
     url: url,

src/api/trials.js

@@ -969,13 +969,20 @@ export function takeOrReleaseQCTask(trialId, subjectVisitId, obtainOrCancel) {
     method: 'put'
   })
 }
-export function replaceQCTaskActionUser(trialId, subjectVisitId) {
+export function replaceQCTaskActionUser(trialId, subjectVisitId, params = {}) {
   return request({
     url: `/QCOperation/replaceQCTaskActionUser/${trialId}/${subjectVisitId}`,
-    method: 'put'
+    method: 'put',
+    params
+  })
+}
+export function getTrialUserRoleList(params) {
+  return request({
+    url: `/TrialMaintenance/getTrialUserRoleList`,
+    method: 'get',
+    params
   })
 }
-
 export function verifyReuploadIsCanJump(trialId, qcChallengeId) {
   return request({
     url: `/QCOperation/verifyReuploadIsCanJump/${trialId}/${qcChallengeId}`,
@@ -4123,78 +4130,4 @@ export function addFolder(data) {
     method: 'post',
     data
   })
-}
-
-
-// 配置-项目文档发布
-export function publishTrialDocument(data) {
-  return request({
-    url: `/TrialDocument/publishTrialDocument`,
-    method: 'post',
-    data
-  })
-}
-// 配置-获取项目文档附件列表
-export function getTrialDocumentAttachmentList(data) {
-  return request({
-    url: `/TrialDocument/getTrialDocumentAttachmentList`,
-    method: 'post',
-    data
-  })
-}
-// 配置-新增或修改项目文档附件
-export function addOrUpdateTrialDocumentAttachment(data) {
-  return request({
-    url: `/TrialDocument/addOrUpdateTrialDocumentAttachment`,
-    method: 'post',
-    data
-  })
-}
-// 配置-删除项目文档附件
-export function deleteTrialDocumentAttachment(data) {
-  return request({
-    url: `/TrialDocument/deleteTrialDocumentAttachment/${data}`,
-    method: 'delete',
-  })
-}
-
-// 配置-获取稽查管理列表
-export function getTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/getTrialShowInspection`,
-    method: 'post',
-    data
-  })
-}
-// 配置-设置稽查管理配置
-export function setTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/setTrialShowInspection`,
-    method: 'post',
-    data
-  })
-}
-// 影像汇总-获取列表
-export function getTrialVisitImageStatList(data) {
-  return request({
-    url: `/DownloadAndUpload/getTrialVisitImageStatList`,
-    method: 'post',
-    data
-  })
-}
-// 影像汇总-获取统计
-export function getTrialVisitImageStatInfo(params) {
-  return request({
-    url: `/DownloadAndUpload/getTrialVisitImageStatInfo`,
-    method: 'get',
-    params
-  })
-}
-// 影像汇总-影像下载
-export function getExportSubjectVisitImageList(data) {
-  return request({
-    url: `/DownloadAndUpload/getExportSubjectVisitImageList`,
-    method: 'post',
-    data
-  })
 }

src/api/trials/reading.js

@@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) {
   })
 }
 
-export function getTrialCriterionList(trialId, isRandom = false) {
+export function getTrialCriterionList(trialId) {
   return request({
-    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`,
+    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`,
     method: 'get'
   })
 }
@@ -487,4 +487,4 @@ export function setRandomTaskOrder(data) {
     method: 'post',
     data
   })
-}
+}

src/components/Dicom/DicomCanvas.vue

@@ -1,7 +1,15 @@
 <template>
-  <div id="canvas" ref="canvas" v-loading="loading" element-loading-text="Loading..."
-    element-loading-background="rgba(0, 0, 0, 0.8)" style="width:100%;height:100%;position:relative;"
-    class="cornerstone-element" @contextmenu.prevent="onContextmenu" @mouseup="sliderMouseup">
+  <div
+    id="canvas"
+    ref="canvas"
+    v-loading="loading"
+    :element-loading-text="NSTip"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    style="width:100%;height:100%;position:relative;"
+    class="cornerstone-element"
+    @contextmenu.prevent="onContextmenu"
+    @mouseup="sliderMouseup"
+  >
     <div v-show="dicomInfo.series" class="info-series">
       <div>Series #{{ dicomInfo.series }}</div>
       <div>Image #{{ dicomInfo.frame }}</div>
@@ -18,11 +26,9 @@
       <div v-show="dicomInfo.location">Location {{ dicomInfo.location }}mm</div> -->
       <!-- <div v-show="toolState.clipPlaying">FPS {{ dicomInfo.fps }}</div> -->
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
-          '' }}
+        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
       </div>
-      <div
-        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
         HU: {{ mousePosition.mo }}
       </div>
       <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
@@ -47,12 +53,8 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box"
-      style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
-      @click.stop="goViewer($event)">
-      <div :style="{ top: height + '%' }"
-        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
-        @mousedown="sliderMousedown($event)" />
+    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
       {{ markers.top }}
@@ -79,8 +81,15 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
-    <el-dialog v-if="dcmTag.visible" :visible.sync="dcmTag.visible" :close-on-click-modal="false" :title="dcmTag.title"
-      width="1000px" custom-class="base-dialog-wrapper" append-to-body>
+    <el-dialog
+      v-if="dcmTag.visible"
+      :visible.sync="dcmTag.visible"
+      :close-on-click-modal="false"
+      :title="dcmTag.title"
+      width="1000px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
       <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
@@ -112,6 +121,11 @@ import DicomTags from './DicomTags'
 export default {
   name: 'DicomCanvas',
   components: { DicomTags },
+  computed: {
+    NSTip() {
+      return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
+    }
+  },
   data() {
     return {
       loading: false,
@@ -254,9 +268,9 @@ export default {
             )
             if (!toolAlreadyAddedToElement) {
               if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true } })
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
               } else if (toolName === 'EllipticalRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true } })
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
               } else {
                 cornerstoneTools.addToolForElement(element, apiTool)
               }
@@ -319,7 +333,7 @@ export default {
       // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
       cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+      cornerstone.updateImage(element, true) 
       // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
       // preserveExistingPool: true })
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
@@ -359,8 +373,9 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
-        }`
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
+        this.stack.imageIds.length
+      }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
       )}`
@@ -378,7 +393,6 @@ export default {
       this.stack.imageIdIndex = newImageIdIndex
       this.series.imageIdIndex = newImageIdIndex
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-      this.resetWwwc()
     },
     stackScrollCallback(e) {
       const { detail } = e
@@ -669,7 +683,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = true
+      ).data[0].loop = false
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -1127,7 +1141,6 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
-
 .info-image {
   position: absolute;
   left: 10px;
@@ -1147,7 +1160,6 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
-
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1180,7 +1192,6 @@ export default {
   margin: 10px;
   cursor: default;
 }
-
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1200,8 +1211,7 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
-
-.my_slider_box:after {
+.my_slider_box:after{
   content: '';
   position: absolute;
   bottom: -20px;

src/components/PreviewFile/index.vue

@@ -11,8 +11,6 @@
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
     <!--    </pdf>-->
-    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
-      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
     <iframe v-else
       :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
@@ -53,6 +51,7 @@ export default {
   },
   computed: {
     documentType() {
+      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
       return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },

src/components/Preview_video/fun.js

@@ -1,23 +0,0 @@
-import Vue from "vue";
-import Video from "./index.vue";
-
-const PreviewConstructor = Vue.extend(Video);
-
-const video = options => {
-    const { path, type, title } = options;
-    if (!path) throw `path is requred.but ${path}`
-    const id = `OnlyOffice_${new Date().getTime()}`;
-    const instance = new PreviewConstructor();
-    instance.id = id;
-    instance.vm = instance.$mount();
-    if (instance.vm.visible) return;
-    document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
-    instance.vm.$on("closed", () => {
-        instance.vm.docEditor = null
-        document.body.removeChild(instance.vm.$el);
-        instance.vm.$destroy();
-    });
-    return instance.vm;
-}
-export default video;

src/components/Preview_video/index.js

@@ -1,7 +0,0 @@
-import Video from "./index.vue";
-import video from "./fun";
-
-export default Vue => {
-    Vue.component(Video.name, Video);
-    Vue.prototype.$video = video;
-};

src/components/Preview_video/index.vue

@@ -1,38 +0,0 @@
-<template>
-  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
-    custom-class="base-dialog-wrapper" @close="handleClose">
-    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <video :src="path" style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"></video>
-    </div>
-  </el-dialog>
-</template>
-<script>
-export default {
-  name: "Video",
-  data() {
-    return {
-      visible: false,
-      path: null,
-      type: null,
-      title: null,
-    };
-  },
-  methods: {
-
-    open(path, type, title) {
-      this.path = this.OSSclientConfig.basePath + path;
-      this.title = title;
-      this.visible = true;
-    },
-    handleClose() {
-      this.$emit("closed");
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-#placeholder {
-  width: 100%;
-  height: 100%;
-}
-</style>

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -16,20 +16,15 @@
           {{ question.QuestionName }}
         </span>
         <!-- 添加 -->
-        <el-button type="primary" size="mini" @click="openAddTableCol(question)">
+        <el-button type="primary" size="mini" @click="openAddTableCol(question)" v-if="SecondReviewState <= 0">
           {{ $t('trials:readingUnit:qsList:title:add') }}
         </el-button>
       </div>
       <el-table :data="questionForm[question.Id]">
         <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
-              scope.row[item.Id].join(" | ")
-              : scope.row[item.Id] }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip>
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
+        <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip
+          v-if="SecondReviewState <= 0">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ $t('common:button:edit') }}
@@ -81,7 +76,7 @@
             <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
           </template>
         </el-select>
-        <!-- 日期 -->
+        <!-- 单选 -->
         <el-date-picker v-if="question.ClinicalQuestionType === 'time'" v-model="questionForm[question.Id]"
           style="width: 200px" align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
         <!-- 单选 -->
@@ -164,7 +159,6 @@
 import { getTrialClinicalQuestionCalculateRelation } from '@/api/dictionary'
 import QuestionTableFormItem from './QuestionTableFormItem'
 import { mapGetters } from 'vuex'
-import DicomEvent from "../../../views/trials/trials-panel/reading/dicoms/components/DicomEvent";
 
 export default {
   name: 'QuestionFormItem',
@@ -176,6 +170,10 @@ export default {
         return ''
       }
     },
+    SecondReviewState: {
+      type: Number,
+      default: 0
+    },
     questionForm: {
       type: Object,
       default() {
@@ -319,6 +317,8 @@ export default {
                   })
                   break
                 case 6:
+                  console.log(this.questionForm[o.QuestionId])
+                  console.log(this.questionForm)
                   this.questionForm[o.QuestionId].forEach((q, qi) => {
                     if (qi === 0) {
                       num = parseFloat(q[o.TableQuestionId])
@@ -361,16 +361,11 @@ export default {
                   }
                   break
                 case 11:
-                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
-                    num = parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId]))
+                  if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                    num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
                   } else {
                     num = 0
                   }
-                  // if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
-                  //   num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
-                  // } else {
-                  //   num = 0
-                  // }
                   break
               }
             } else {
@@ -410,19 +405,19 @@ export default {
       } catch (e) {
         console.log(e)
       }
-      if (rules.DigitPlaces) {
-        num = num.toFixed(rules.DigitPlaces)
-      }
+      console.log(num)
       return num
     },
     formItemNumberChange(questionId, isTable) {
       try {
         if (isTable) {
           this.calculationList.forEach((v, i) => {
+            console.log(v, i)
             var find = v.CalculateQuestionList.filter(o => {
               return o.QuestionId === questionId
             })
             // find的自动计算值number
+            console.log('find', find)
             if (find) {
               var num = this.logic(v)
               if (num !== false) {
@@ -436,6 +431,7 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
+            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -506,9 +502,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .el-form-item__label{
-  color: #606266 !important;
-}
 .my_dialog {
   .criterion-form-item {
     ::v-deep .el-form-item__content {

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

@@ -1,65 +1,125 @@
 <template>
   <div class="criterion-form-item">
 
-    <el-form-item :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-      {
-        required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
-        message: $t('common:ruleMessage:specify'), trigger: ['blur'],
-        type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''
-      },
-    ]"
-      :class="[question.ClinicalTableQuestionType === 'group' ? 'mb' : question.ClinicalTableQuestionType === 'upload' ? 'uploadWrapper' : '']">
-      <el-input v-if="question.ClinicalTableQuestionType === 'input'" v-model="questionForm[question.Id]"
-        :max-length="200" :disabled="question.TableQuestionType === 2" />
+    <el-form-item
+      :label="`${question.QuestionName}`"
+      :prop="question.Id"
+      :rules="[
+        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
+          message: $t('common:ruleMessage:specify'), trigger: ['blur'],
+          type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''},
+      ]"
+      :class="[question.ClinicalTableQuestionType==='group'?'mb':question.ClinicalTableQuestionType==='upload'?'uploadWrapper':'']"
+    >
+      <el-input
+        v-if="question.ClinicalTableQuestionType==='input'"
+        v-model="questionForm[question.Id]"
+        :max-length="200"
+        :disabled="question.TableQuestionType === 2"
+      />
       <!-- 多行文本输入框 -->
-      <el-input v-if="question.ClinicalTableQuestionType === 'textarea'" v-model="questionForm[question.Id]"
-        :max-length="200" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+      <el-input
+        v-if="question.ClinicalTableQuestionType==='textarea'"
+        v-model="questionForm[question.Id]"
+        :max-length="200"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+      />
       <!-- 下拉框 -->
-      <el-select v-if="question.ClinicalTableQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode">
+      <el-select
+        v-if="question.ClinicalTableQuestionType==='select'"
+        v-model="questionForm[question.Id]"
+        clearable
+        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
+      >
         <template v-if="question.TableQuestionType === 1">
-          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]" />
+          <el-option
+            v-for="item in organList"
+            :key="item.Id"
+            :label="item[question.DataTableColumn]"
+            :value="item[question.DataTableColumn]"
+          />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
+          <el-option
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
         </template>
-        <template
-          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
+        <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <el-option
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
         </template>
         <template v-else>
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+            :value="val"
+          />
         </template>
 
       </el-select>
       <!-- 单选 -->
-      <el-date-picker v-if="question.ClinicalTableQuestionType === 'time'" v-model="questionForm[question.Id]"
-        format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px" align="right" type="date" />
+      <el-date-picker
+        v-if="question.ClinicalTableQuestionType === 'time'"
+        v-model="questionForm[question.Id]"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        style="width: 200px"
+        align="right"
+        type="date"
+      />
       <!-- 单选 -->
-      <el-radio-group v-if="question.ClinicalTableQuestionType === 'radio'" v-model="questionForm[question.Id]"
-        @change="((val) => { formItemChange(val, question) })">
+      <el-radio-group
+        v-if="question.ClinicalTableQuestionType==='radio'"
+        v-model="questionForm[question.Id]"
+        @change="((val)=>{formItemChange(val, question)})"
+      >
         <template v-if="question.DictionaryCode">
-          <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="item.value">
+          <el-radio
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :label="item.value"
+          >
             {{ item.label }}
           </el-radio>
         </template>
         <template v-if="question.TypeValue">
-          <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+          <el-radio
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
             {{ val }}
           </el-radio>
         </template>
       </el-radio-group>
       <!-- 复选框 -->
-      <el-checkbox-group v-if="question.ClinicalTableQuestionType === 'checkbox'" v-model="questionForm[question.Id]">
-        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+      <el-checkbox-group
+        v-if="question.ClinicalTableQuestionType==='checkbox'"
+        v-model="questionForm[question.Id]"
+      >
+        <el-checkbox
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+        >
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
-      <el-input v-if="question.ClinicalTableQuestionType === 'number'" v-model="questionForm[question.Id]" type="number"
-        @input="limitInput($event, questionForm, question)" style="width: 200px">
+      <el-input
+        v-if="question.ClinicalTableQuestionType === 'number'"
+        v-model="questionForm[question.Id]"
+        type="number"
+        style="width: 200px"
+      >
         <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
       </el-input>
     </el-form-item>
@@ -127,14 +187,6 @@ export default {
     }
   },
   methods: {
-    limitInput(value, form, row) {
-      if (value.indexOf('.') > -1) {
-        if (value.split('.')[1].length >= row.DigitPlaces) {
-          this.$set(form, row.Id, parseFloat(value).toFixed(row.DigitPlaces))
-        }
-      }
-      this.$forceUpdate()
-    },
     save() {
     },
     openAddTableCol(row) {
@@ -168,40 +220,34 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
-    ::v-deep .el-form-item__content {
+.my_dialog{
+  .criterion-form-item{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
 }
-
-.criterion-form-item {
-  .el-form-item {
+.criterion-form-item{
+  .el-form-item{
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-
-  ::v-deep .el-form-item__content {
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
   }
-
-  .mb {
+  .mb{
     margin-bottom: 0px;
   }
-
-  .disabled {
+  .disabled{
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
-
-  .uploadWrapper {
+  .uploadWrapper{
     display: flex;
     flex-direction: column;
     align-items: flex-start;

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -4,11 +4,12 @@
       :disabled="openType === 'look'">
       <template>
         <QuestionFormItem class="father" v-for="question of questions" :key="question.Id" :question="question"
-          :question-form="questionForm" :trial-clinical-id="trialClinicalId" @resetFormItemData="resetFormItemData"
-          @setFormItemData="setFormItemData" />
+          :question-form="questionForm" :trial-clinical-id="trialClinicalId" :SecondReviewState="SecondReviewState"
+          @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" />
       </template>
     </el-form>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel)"
+    <div class="base-dialog-footer"
+      v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel) && SecondReviewState <= 0"
       style="text-align:right;margin-top:10px;">
       <!-- 取消 -->
       <el-button size="small" type="primary" @click="close"
@@ -55,6 +56,10 @@ export default {
         return 2
       }
     },
+    SecondReviewState: {
+      type: Number,
+      default: 0
+    },
     openType: {
       type: String,
     },
@@ -370,7 +375,7 @@ export default {
           console.log(i.Answer ? i.Answer.split(',') : [])
           console.log(this.questionForm)
         } else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
+          this.$set(this.questionForm, i.Id, i.Answer)
         } else if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
         }

src/components/clinicalDataQuestions/index.vue

@@ -3,11 +3,13 @@
     <QuestionsForm v-if="clinicalUploadType === 2" :data="data" :trial-clinical-id="trialClinicalId"
       :is-viewer="isViewer" :visit-id="visitId" :subject-id="subjectId" :open-type="openType"
       :system-clinical-id="systemClinicalId" :trial-id="trialId" :reading-id="readingId"
-      :clinical-form-id="clinicalFormId" :clinical-data-level="clinicalDataLevel" @close="close"></QuestionsForm>
-    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :data="data" :enum-type="0" :allow-add-or-edit="true"
-      @getList="() => { }">
+      :clinical-form-id="clinicalFormId" :SecondReviewState="SecondReviewState" :clinical-data-level="clinicalDataLevel"
+      @close="close"></QuestionsForm>
+    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :SecondReviewState="SecondReviewState" :data="data"
+      :enum-type="0" :allow-add-or-edit="true" @getList="() => { }">
     </uploadClinicalData>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel)"
+    <div class="base-dialog-footer"
+      v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel) && SecondReviewState <= 0"
       style="text-align:right;margin-top:10px;">
       <!-- 保存 -->
       <el-button size="small" type="primary" @click="submitClinicalForm">
@@ -92,6 +94,10 @@ export default {
       type: String,
       default: () => ''
     },
+    SecondReviewState: {
+      type: Number,
+      default: 0
+    },
     clinicalUploadType: {
       type: Number,
       default: () => {

src/components/downloadDicomAndNonedicom/index.vue

@@ -24,7 +24,7 @@
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
     <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
-      class="dicomFiles-table" @sort-change="handleSortByColumn"
+      class="dicomFiles-table" 
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
@@ -37,10 +37,10 @@
         show-overflow-tooltip />
       <!--任务名称-->
       <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        sortable="custom" />
+        sortable />
       <!--检查类型-->
       <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
-        sortable="custom">
+        sortable>
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>
@@ -406,7 +406,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
       })
       this.open = window.open(routeData.href, '_blank')
     },

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -4,63 +4,123 @@
       <span>{{ $t('upload:dicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></div>
+        <div
+          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
+        ></div>
       </div>
     </div>
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:dicom:table:subjectCode')"
+      />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:dicom:table:taskBlindName')"
+      />
       <!--原始检查数-->
-      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
+      <el-table-column
+        prop="OrginalStudyList"
+        :label="$t('upload:dicom:table:orginalStudyListNum')"
+      >
         <template slot-scope="scope">
-          <el-button v-if="
-            scope.row.OrginalStudyList &&
-            scope.row.OrginalStudyList.length >= 1
-          " type="text" @click="handleOpenDialog(scope.row, 'OrginalStudyList')">
+          <el-button
+            v-if="
+              scope.row.OrginalStudyList &&
+              scope.row.OrginalStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
+          >
             <span>{{ scope.row.OrginalStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
       <!--后处理检查数-->
-      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
+      <el-table-column
+        prop="UploadStudyList"
+        :label="$t('upload:dicom:table:uploadStudyListNum')"
+      >
         <template slot-scope="scope">
-          <el-button v-if="
-            scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
-          " type="text" @click="handleOpenDialog(scope.row, 'UploadStudyList', true)">
+          <el-button
+            v-if="
+              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'UploadStudyList', true)"
+          >
             <span>{{ scope.row.UploadStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
+            <form
+              id="inputForm"
+              :ref="`uploadForm_${scope.row.Id}`"
+              enctype="multipart/form-data"
+            >
               <div class="form-group" style="margin-right: 10px">
-                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
-                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
-                    :title="$t('upload:dicom:button:upload')" />
-                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
-                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
+                <div
+                  :id="`directoryInputWrapper_${scope.row.Id}`"
+                  class="btn btn-link file-input"
+                >
+                  <el-button
+                    circle
+                    icon="el-icon-upload2"
+                    :disabled="btnLoading"
+                    :loading="btnLoading"
+                    :title="$t('upload:dicom:button:upload')"
+                  />
+                  <input
+                    :title="$t('upload:dicom:button:upload')"
+                    type="file"
+                    :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`"
+                    :disabled="btnLoading"
+                    webkitdirectory
+                    multiple
+                    @change="
                       ($event) => beginScanFiles($event, scope.row.VisitTaskId)
-                    " />
+                    "
+                  />
                 </div>
               </div>
             </form>
             <!--预览--->
-            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
-              scope.row.UploadStudyList.length <= 0
-              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
+            <el-button
+              circle
+              icon="el-icon-view"
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0
+              "
+              @click.stop="handleViewReadingImages(scope.row)"
+              :title="$t('upload:dicom:button:preview')"
+            />
             <!--删除--->
-            <el-button circle :disabled="!scope.row.UploadStudyList ||
-              scope.row.UploadStudyList.length <= 0 ||
-              scope.row.ReadingTaskState === 2
-              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
+            <el-button
+              circle
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0 ||
+                scope.row.ReadingTaskState === 2
+              "
+              icon="el-icon-delete"
+              :title="$t('upload:dicom:button:delete')"
+              @click.stop="remove(scope.row)"
+            />
           </div>
         </template>
       </el-table-column>
@@ -74,19 +134,38 @@
         <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
           <div class="form-group">
             <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
+              <el-button
+                type="primary"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+                size="mini"
+              >
                 {{ $t('upload:dicom:button:batchUpload') }}
               </el-button>
-              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
-                @change="beginScanFiles($event)" />
+              <input
+                type="file"
+                name="file"
+                ref="pathClear"
+                :disabled="btnLoading"
+                webkitdirectory
+                multiple
+                title=""
+                @change="beginScanFiles($event)"
+              />
             </div>
           </div>
         </form>
       </div>
     </div>
     <!--上传列表-->
-    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
-      class="dicomFiles-table" @selection-change="handleSelectionChange">
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 80 }"
+      height="100"
+      :data="uploadQueues"
+      class="dicomFiles-table"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="index" width="40" />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
@@ -103,21 +182,28 @@
           <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span>
+                <span v-if="scope.row.dicomInfo.accNumber"
+                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span
+                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join('、') }},</span>
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span
+                >
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
+                <span v-if="scope.row.seriesList.length"
+                  >{{ scope.row.seriesList.length }} Series,</span
+                >
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
+                <span v-if="scope.row.fileList.length"
+                  >{{ scope.row.fileList.length }} Instances</span
+                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -131,7 +217,8 @@
               </div>
               <div style="display: inline-block">
                 <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span>
+                  {{ scope.row.dicomInfo.description }}</span
+                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -155,12 +242,16 @@
         <template slot-scope="scope">
           <div style="line-height: 15px">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
-                scope.row.dicomInfo.patientId }}</span>
+              <span v-if="scope.row.dicomInfo.patientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.patientId }}</span
+              >
               <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
+              >
                 {{
                   scope.row.dicomInfo.patientName
                     ? scope.row.dicomInfo.patientName
@@ -169,7 +260,9 @@
               </span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
+              >
                 {{
                   scope.row.dicomInfo.patientSex
                     ? scope.row.dicomInfo.patientSex
@@ -177,7 +270,9 @@
                 }},
               </span>
 
-              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
+              >
                 {{
                   scope.row.dicomInfo.patientAge
                     ? scope.row.dicomInfo.patientAge
@@ -185,9 +280,11 @@
                 }},
               </span>
 
-              <span :class="[
-                scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-              ]">
+              <span
+                :class="[
+                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
                 {{
                   scope.row.dicomInfo.patientBirthDate
                     ? scope.row.dicomInfo.patientBirthDate
@@ -198,14 +295,21 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
-        show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        min-width="150"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <el-progress color="#409eff" :percentage="(
-            (scope.row.dicomInfo.uploadFileSize * 100) /
-            (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
-          ).toFixed(2) * 1
-            " />
+          <el-progress
+            color="#409eff"
+            :percentage="
+              (
+                (scope.row.dicomInfo.uploadFileSize * 100) /
+                scope.row.dicomInfo.fileSize
+              ).toFixed(2) * 1
+            "
+          />
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }}/{{
@@ -220,52 +324,85 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:status')"
+        min-width="140"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <span v-if="
-            !scope.row.dicomInfo.failedFileCount &&
-            !scope.row.dicomInfo.isInit
-          ">
-            {{ $t('trials:uploadDicomList:table:status1') }}</span>
-          <span style="color: #409eff" v-else-if="
-            !scope.row.dicomInfo.failedFileCount &&
-            scope.row.dicomInfo.isInit &&
-            btnLoading
-          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-          <span style="color: #409eff" v-else-if="
-            scope.row.dicomInfo.failedFileCount <
-            scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-          <span style="color: #2cc368" v-else-if="
-            scope.row.dicomInfo.failedFileCount ===
-            scope.row.dicomInfo.fileCount
-          ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
-          <span style="color: #f66" v-else-if="
-            scope.row.uploadState.record &&
-            scope.row.uploadState.record.fileCount === 0
-          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
+          <span
+            v-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              !scope.row.dicomInfo.isInit
+            "
+          >
+            {{ $t('trials:uploadDicomList:table:status1') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              scope.row.dicomInfo.isInit &&
+              btnLoading
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #2cc368"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount ===
+              scope.row.dicomInfo.fileCount
+            "
+            >{{ $t('trials:uploadDicomList:table:status3') }}</span
+          >
+          <span
+            style="color: #f66"
+            v-else-if="
+              scope.row.uploadState.record &&
+              scope.row.uploadState.record.fileCount === 0
+            "
+            >{{ $t('trials:uploadDicomList:table:status5') }}</span
+          >
           <span style="color: #f66" v-else>{{
             $t('trials:uploadDicomList:table:Failed')
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:record')"
+        min-width="140"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
               <div style="max-height: 500px; overflow-y: auto">
                 {{ $t('trials:uploadDicomList:table:Existed') }}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
-                    style="font-size: 12px; color: #baa72a">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Existed"
+                    :key="item"
+                    style="font-size: 12px; color: #baa72a"
+                  >
                     {{ item }}
                   </div>
                 </div>
                 <div v-else>&nbsp;</div>
                 {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
-                    style="font-size: 12px; color: #24b837">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    :key="item"
+                    style="font-size: 12px; color: #24b837"
+                  >
                     {{ item }}
                   </div>
                 </div>
@@ -273,8 +410,11 @@
                 <br />
                 {{ $t('trials:uploadDicomList:table:Failed') }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
-                    style="font-size: 12px; color: #f66">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Failed"
+                    :key="item"
+                    style="font-size: 12px; color: #f66"
+                  >
                     {{ item }}
                   </div>
                 </div>
@@ -298,8 +438,16 @@
         </template>
       </el-table-column>
     </el-table>
-    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :IsDicom="true"
+      :bodyPart="bodyPart"
+      :modelList="modelList"
+      :isUpload="openIsUpload"
+      :TrialModality="TrialModality"
+      @getList="getList"
+    />
   </div>
 </template>
 <script>
@@ -647,7 +795,7 @@ export default {
         })
         var validFilesCount = 0
         for (var i = 0; i < checkFiles.length; ++i) {
-          ; (function (index) {
+          ;(function (index) {
             p = p.then(function () {
               if (
                 checkFiles[index].name.toUpperCase().indexOf('DICOMDIR') === -1
@@ -686,7 +834,6 @@ export default {
             var studyUid = data.string('x0020000d')
             if (!studyUid) return resolve()
             var pixelDataElement = data.elements.x7fe00010
-            if (!pixelDataElement && modality !== 'SR') return resolve()
             var studyIndex = 0
             while (
               studyIndex < scope.uploadQueues.length &&
@@ -1132,14 +1279,16 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${params.subjectId
-                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
-                              }/${scope.getGuid(
-                                dicomInfo.studyUid +
+                            let path = `/${params.trialId}/Image/${
+                              params.subjectId
+                            }/${params.subjectVisitId}/${
+                              dicomInfo.visitTaskId
+                            }/${scope.getGuid(
+                              dicomInfo.studyUid +
                                 v.seriesUid +
                                 o.instanceUid +
                                 params.trialId
-                              )}`
+                            )}`
                             if (scope.isClose) return
                             let res = await dcmUpload(
                               {
@@ -1410,19 +1559,16 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
 .btnBox,
 .form-group {
   display: flex;
   align-items: center;
 }
-
 #inputForm .file-input {
   position: relative;
   overflow: hidden;
   display: inline-block;
 }
-
 #inputForm .file-input input[type='file'] {
   position: absolute;
   top: 0;
@@ -1432,12 +1578,10 @@ export default {
   opacity: 0;
   cursor: pointer;
 }
-
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
-
   i {
     margin: 3px 5px 0 0;
   }

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -29,7 +29,9 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    $FormatSize(scope.row.FileSize)
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                      : ''
                   }}</span>
                 </template>
               </el-table-column>
@@ -66,7 +68,9 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    $FormatSize(scope.row.FileSize)
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                      : ''
                   }}</span>
                 </template>
               </el-table-column>

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -40,13 +40,13 @@
           </el-table-column>
           <!--序列数量-->
           <el-table-column
-            prop="SeriesCount"
+            prop="ReadingSeriesCount"
             :label="$t('trials:uploadImage:table:SeriesCount')"
             v-if="IsDicom"
           />
           <!--图像数量-->
           <el-table-column
-            prop="InstanceCount"
+            prop="ReadingInstanceCount"
             :label="$t('trials:uploadImage:table:InstanceCount')"
             v-if="IsDicom"
           />
@@ -83,7 +83,7 @@
           </el-table-column>
           <!--文件数量-->
           <el-table-column
-            prop="FileCount"
+            prop="ReadingFileCount"
             :label="$t('trials:uploadImage:table:FileCount')"
             v-if="!IsDicom"
           />
@@ -245,13 +245,13 @@ export default {
       if (this.IsDicom) {
         var token = getToken()
         routeData = this.$router.resolve({
-          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}`,
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
         })
       } else {
         let trialId = this.$route.query.trialId
         var token = getToken()
         routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}&isReading=true`,
         })
       }
       window.open(routeData.href, '_blank')

src/const/sign-code.vue

@@ -29,6 +29,10 @@ export default {
     MedicalAudit: 215, // 医学审核
     HeavyReadingApproval: 216, // 重阅审批
     ResetAndAsyncCriterion: 218, //同步签名
+    ResetImageQualityControlQuestion: 112, // 重置影像质控问题
+    CreateReviewTask: 113, // 生成复核任务
+    ReviewImageQualityControlQuestion: 219, // 复核质控问题
+
   },
 };
 </script>

src/icons/svg/elliptical.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>

src/icons/svg/lengthscale.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751349783728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9505" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M838.4 279.466667zM802.133333 814.933333H279.466667c-38.4 0-70.4-32-70.4-70.4V219.733333c0-38.4 32-70.4 70.4-70.4h123.733333c38.4 0 70.4 32 70.4 70.4v339.2h347.733333c2.133333 0-2.133333 0 0 0 25.6-2.133333 51.2 21.333333 51.2 46.933334v136.533333c0 40.533333-32 72.533333-70.4 72.533333z m25.6-179.2c2.133333-29.866667-34.133333-27.733333-34.133333-27.733333H445.866667c-2.133333 0-2.133333-2.133333-4.266667-2.133333h-2.133333c-8.533333-4.266667-12.8-10.666667-12.8-21.333334v-362.666666c0-14.933333-12.8-27.733333-27.733334-27.733334h-117.333333c-14.933333 0-27.733333 12.8-27.733333 27.733334v64h115.2c12.8 0 23.466667 10.666667 23.466666 23.466666 0 12.8-10.666667 23.466667-23.466666 23.466667h-115.2v78.933333h78.933333c12.8 0 23.466667 10.666667 23.466667 23.466667 0 12.8-10.666667 23.466667-23.466667 23.466667h-78.933333v78.933333h115.2c12.8 0 23.466667 10.666667 23.466666 23.466667 0 12.8-10.666667 23.466667-23.466666 23.466666h-115.2v149.333334c0 14.933333 12.8 27.733333 27.733333 27.733333H426.666667v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h96v-68.266667c0-12.8 10.666667-25.6 23.466667-25.6 12.8 0 23.466667 10.666667 23.466666 25.6V768h78.933334v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h51.2c14.933333 0 27.733333-12.8 27.733333-27.733333l6.4-104.533334z" p-id="9506"></path></svg>

src/main.js

@@ -26,9 +26,6 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)
 
-import { formatSize } from "./utils"
-Vue.prototype.$FormatSize = formatSize
-
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
 Viewer.setDefaults({
@@ -59,8 +56,6 @@ import Preview from '@/components/Preview/index'
 Vue.use(Preview)
 import Onlyoffice from '@/components/Preview_onlyoffice/index'
 Vue.use(Onlyoffice)
-import Video from '@/components/Preview_video/index'
-Vue.use(Video)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
@@ -316,9 +311,9 @@ async function VueInit() {
       })
     }
     let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
-    if (CompanyInfo && CompanyInfo.SystemShortName) {
+    if(CompanyInfo&&CompanyInfo.SystemShortName){
       let test = new RegExp('IRC', 'ig')
-      text = text.replace(test, CompanyInfo.SystemShortName)
+        text = text.replace(test, CompanyInfo.SystemShortName)
     }
     // return i18n.t(key)
     return text;

src/store/getters.js

@@ -50,8 +50,6 @@ const getters = {
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr,
   lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
-  currentTaskState: state => state.noneDicomReview.currentTaskState,
-  operateInfo: state => state.dicom3d.operateInfo,
-  deleteAnnotationIds: state => state.dicom3d.deleteAnnotationIds
+  currentTaskState: state => state.noneDicomReview.currentTaskState
 }
 export default getters

src/store/index.js

@@ -13,7 +13,6 @@ import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
 import noneDicomReview from './modules/noneDicomReview'
-import dicom3d from './modules/dicom3d'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -29,8 +28,7 @@ const store = new Vuex.Store({
     financials,
     reading,
     lang,
-    noneDicomReview,
-    dicom3d
+    noneDicomReview
   },
   getters
 })

src/store/modules/dicom3d.js

@@ -1,28 +0,0 @@
-const getDefaultState = () => {
-  return {
-    operateInfo: [],
-    deleteAnnotationIds: []
-  }
-}
-const state = getDefaultState
-
-const mutations = {
-
-}
-
-const actions = {
-  setOperateInfo({ state }, arr) {
-    state.operateInfo = arr
-  },
-  setDeleteAnnotationIds({ state }, arr) {
-    state.deleteAnnotationIds = arr
-  },
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-

src/store/modules/reading.js

@@ -12,6 +12,7 @@ import { getCustomTag } from '@/api/reading'
 
 import requestPoolManager from '@/utils/request-pool'
 import { getReadingVisitStudyList } from '@/api/trials'
+import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
 const hangingAgreement = [
   { name: 'A', row: 1, col: 1 },
   { name: 'A|A', row: 1, col: 2 },
@@ -644,15 +645,15 @@ const actions = {
       resolve(noneDicomMeasureData)
     })
   },
-  addMeasuredData({ state }, obj) { 
+  addMeasuredData({ state }, obj) {
     return new Promise(resolve => {
       const criterionType = parseInt(localStorage.getItem('CriterionType'))
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
       // var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
-      
+
       if (criterionType === 21) {
-        let i = measureData.findIndex(i=>i.TableQuestionId === obj.data.TableQuestionId)
+        let i = measureData.findIndex(i => i.TableQuestionId === obj.data.TableQuestionId)
         if (i > -1) {
           for (const k in state.visitTaskList[index].MeasureData[i]) {
             if (k !== 'Id' && obj.data[k]) {
@@ -676,7 +677,7 @@ const actions = {
           console.log('新增标记成功')
         }
       }
-      
+
       // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
@@ -775,15 +776,15 @@ const actions = {
       const criterionType = parseInt(localStorage.getItem('CriterionType'))
       if (criterionType === 21) {
         const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
-          if (i > -1) {
-            if (measureData[i].FristAddTaskId) {
-              measureData[i].MeasureData = ''
-              console.log('清除标记成功', i)
-            } else {
-              measureData.splice(i, 1)
-              console.log('移除标记成功', i)
-            }
+        if (i > -1) {
+          if (measureData[i].FristAddTaskId) {
+            measureData[i].MeasureData = ''
+            console.log('清除标记成功', i)
+          } else {
+            measureData.splice(i, 1)
+            console.log('移除标记成功', i)
           }
+        }
         state.visitTaskList[index].MeasureData = measureData
       } else {
         var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
@@ -810,7 +811,7 @@ const actions = {
           state.visitTaskList[index].MeasureData = measureData
         }
       }
-      
+
       // if (idx > -1) {
       //   measureData.splice(idx, 1)
 
@@ -1072,16 +1073,22 @@ const actions = {
           }
         }
       }
-
+      let file = series.instanceInfoList.find(item => item.ImageId === obj.imageId)
+      if (file) {
+        getNetWorkSpeed()
+        setNetWorkSpeedSizeAll(obj.percentComplete, obj.FileTotal, obj.imageId)
+      }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100
         // 设置当前序列状态为已下载完成
         series.loadStatus = true
+        workSpeedclose()
       }
       if (prefetchInstanceCount2 !== null && instanceCount2 !== null && prefetchInstanceCount2 >= instanceCount2 * 100) {
         pSeries.prefetchInstanceCount = instanceCount2 * 100
         // 设置当前序列状态为已下载完成
         pSeries.loadStatus = true
+        workSpeedclose()
       }
     } catch (e) {
       console.log('error')

src/store/modules/trials.js

@@ -10,6 +10,7 @@ const getDefaultState = () => {
     unlock: false,
     config: {},
     uploadTip: '0.00KB/s',
+    uploadSize: '',
     timer: null,
     whiteList: [],
     checkTaskId: null

src/utils/index.js

@@ -1,4 +1,5 @@
 
+import store from "@/store";
 /**
  * Parse the time to string
  * @param {(Object|string|number)} time
@@ -92,7 +93,6 @@ export function deepClone(source, map = new WeakMap()) {
 
   return target;
 }
-
 export function formatSize(size, fixed = 2) {
   if (isNaN(parseFloat(size))) return ''
   let kbSize = size / 1024
@@ -101,4 +101,99 @@ export function formatSize(size, fixed = 2) {
   }
   let mbSize = kbSize / 1024
   return `${mbSize.toFixed(fixed)}MB`
+}
+
+let timer = null,  // 网速定时器
+  lastPercentage = 0,
+  percentageById = {},
+  imageId = null,
+  bytesReceivedPerSecond = {}; // 时间节点上传文件总量
+// 获取网速
+export function getNetWorkSpeed() {
+  if (timer) return false;
+  // if (lastPercentage < 100) return false;
+  if (imageId && imageId !== Id) return false
+  imageId = null
+  timer = setInterval(() => {
+    let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+    if (timeList.length > 0) {
+      let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
+      let unit = 'KB/s';
+      if (totalBytes > 1024) {
+        totalBytes = totalBytes / 1024;
+        unit = "MB/s";
+      }
+      store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
+    }
+    if (timeList.length >= 5) {
+      delete bytesReceivedPerSecond[timeList[0]]
+    }
+    let time = new Date().getTime();
+    bytesReceivedPerSecond[time] = 0;
+  }, 1000)
+
+}
+export function setNetWorkSpeedSize(totalPercentage, total, Id) {
+  if (imageId && imageId !== Id) return false
+  imageId = Id
+  let percentage = totalPercentage - lastPercentage
+  percentage = percentage / 100
+  lastPercentage = totalPercentage
+  // console.log(percentage, totalPercentage, total)
+  let time = new Date().getTime();
+  let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+  let bytesTime = timeList.find(item => time - item < 1000);
+  if (bytesTime) {
+    bytesReceivedPerSecond[bytesTime] += total * percentage;
+  } else {
+    // console.log("未查询到时间")
+    if (timeList.length > 0) {
+      bytesReceivedPerSecond[timeList[timeList.length - 1]] += total * percentage;
+    } else {
+      bytesReceivedPerSecond[time] = total * percentage;
+    }
+  }
+  store.state.trials.uploadSize = `${formatSize(totalPercentage / 100 * total)}/${formatSize(total)}`
+}
+export function setNetWorkSpeedSizeAll(totalPercentage, total, Id) {
+  if (!percentageById[Id]) {
+    percentageById[Id] = 0
+  }
+  let percentage = totalPercentage - percentageById[Id]
+  percentage = percentage / 100
+  percentageById[Id] = totalPercentage
+  // console.log(percentage, totalPercentage, total)
+  let time = new Date().getTime();
+  let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+  let bytesTime = timeList.find(item => time - item < 1000);
+  if (bytesTime) {
+    bytesReceivedPerSecond[bytesTime] += total * percentage;
+  } else {
+    // console.log("未查询到时间")
+    if (timeList.length > 0) {
+      bytesReceivedPerSecond[timeList[timeList.length - 1]] += total * percentage;
+    } else {
+      bytesReceivedPerSecond[time] = total * percentage;
+    }
+  }
+  let isComplete = Object.keys(percentageById).every(key => percentageById[key >= 100])
+  if (isComplete) {
+    workSpeedclose(true)
+  }
+}
+export function workSpeedclose(isForce = false) {
+  if (!isForce && lastPercentage < 100) {
+    return false
+  }
+  console.log('workSpeedclose')
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
+    store.state.trials.uploadTip = '0KB/s'
+    store.state.trials.uploadSize = ''
+  }
+  bytesReceivedPerSecond = {};
+  lastPercentage = 0;
+  imageId = null;
+  percentageById = {};
 }

src/utils/request-download.js

@@ -50,8 +50,7 @@ service.interceptors.response.use(
         const a = document.createElement('a')
         // xls类型: application/vnd.ms-excel
         // xlsx类型：application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-        // const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
-        const href = URL.createObjectURL(new Blob([res], { type: response.headers['content-type'] }))
+        const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
         a.download = fileName
         a.href = href
         a.click()

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

@@ -19,14 +19,9 @@
                 </div>
                 <div class="viewerSidethumbs ps" style="position: relative;">
                   <div class="viewerSidethumbinner">
-                    <div
-                      v-for="(item, index) in seriesList"
-                      :key="index"
-                      :class="{'viewerSideActive': index==0}"
+                    <div v-for="(item, index) in seriesList" :key="index" :class="{ 'viewerSideActive': index == 0 }"
                       style="position: relative;margin-bottom:5px;border-radius: 2px;border: 1px solid #404040;"
-                      series-type="current"
-                      @click="showSeriesImage($event,index,item)"
-                    >
+                      series-type="current" @click="showSeriesImage($event, index, item)">
                       <div class="viewernavigatorwrapper">
                         <!-- <el-image
                           class="image-preview"
@@ -34,14 +29,8 @@
                           :src="item.previewImageUrl"
                           fit="fill"
                         /> -->
-                        <img
-                          class="image-preview"
-                          :src="item.previewImageUrl"
-                          crossorigin="anonymous"
-                          alt=""
-                          style="width: 72px;height:72px;"
-                          fit="fill"
-                        >
+                        <img class="image-preview" :src="item.previewImageUrl" crossorigin="anonymous" alt=""
+                          style="width: 72px;height:72px;" fit="fill">
                         <div class="viewernavitextwrapper">
                           <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                             <div v-if="item.keySeries" style="color:red">
@@ -51,23 +40,17 @@
                               #{{ item.seriesNumber }}
                             </div>
                             <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
-                              <el-popover
-                                v-model="item.isShowPopper"
-                                placement="right-start"
-                                trigger="manual"
-                                popper-class="instance_frame_wrapper"
-                              >
+                              <el-popover v-model="item.isShowPopper" placement="right-start" trigger="manual"
+                                popper-class="instance_frame_wrapper">
                                 <div style="text-align: right;">
-                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;"
+                                    @click="item.isShowPopper = false" />
                                 </div>
                                 <div class="frame_list">
-                                  <div
-                                    v-for="(instance, idx) in item.instanceInfoList"
-                                    :key="instance.Id"
+                                  <div v-for="(instance, idx) in item.instanceInfoList" :key="instance.Id"
                                     class="frame_content"
-                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
-                                    @click="showMultiFrames(item, index, instance)"
-                                  >
+                                    :style="{ 'margin-bottom': idx < item.instanceInfoList.length - 1 ? '5px' : '0px' }"
+                                    @click="showMultiFrames(item, index, instance)">
                                     <div>
                                       <div>{{ instance.InstanceNumber }}</div>
                                       <div>
@@ -75,22 +58,17 @@
                                       </div>
                                       <div v-if="showDelete">
                                         <span>{{ $t('trials:audit:table:isDelete') }}</span>
-                                        <el-switch
-                                          v-model="instance.IsDeleted"
-                                          size="mini"
-                                          @change="changeInstanceDeleteStatus($event, item, instance)"
-                                        />
+                                        <el-switch v-model="instance.IsDeleted" size="mini"
+                                          @change="changeInstanceDeleteStatus($event, item, instance)" />
                                         <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
-                                        <el-switch
-                                          v-model="instance.IsReading"
-                                          size="mini"
-                                          @change="changeInstanceReadingStatus($event, item, instance)"
-                                        />
+                                        <el-switch v-model="instance.IsReading" size="mini"
+                                          @change="changeInstanceReadingStatus($event, item, instance)" />
                                       </div>
                                     </div>
                                   </div>
                                 </div>
-                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;"
+                                  @click="popperClick(seriesList, item)" />
                               </el-popover>
                             </div>
                           </div>
@@ -100,7 +78,8 @@
                           <div v-show="!item.keySeries && item.sliceThickness" style="padding: 1px;">
                             T: {{ parseFloat(item.sliceThickness).toFixed(2) }}
                           </div>
-                          <div v-show="!item.keySeries &&item.description" style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                          <div v-show="!item.keySeries && item.description"
+                            style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
                             {{ item.description }}
                           </div>
                           <div v-if="!item.keySeries" style="padding: 1px;">
@@ -109,27 +88,23 @@
 
                         </div>
                       </div>
-                      <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
+                      <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;"
+                        @click.stop="">
 
                         <div>
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading') }}</span>
-                          <el-switch
-                            v-model="item.isReading"
-                            size="mini"
-                            @change="changeReadingStatus($event, item)"
-                          />
+                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
+                          }}</span>
+                          <el-switch v-model="item.isReading" size="mini" @change="changeReadingStatus($event, item)" />
                         </div>
                         <div>
                           <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
-                          <el-switch
-                            v-model="item.isDeleted"
-                            size="mini"
-                            @change="changeDeleteStatus($event, item)"
-                          />
+                          <el-switch v-model="item.isDeleted" size="mini" @change="changeDeleteStatus($event, item)" />
                         </div>
                       </div>
-                      <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount * 100">
-                        <el-progress :percentage="parseInt((item.prefetchInstanceCount/item.instanceCount).toFixed(2))" />
+                      <div
+                        v-if="item.prefetchInstanceCount > 0 && item.prefetchInstanceCount < item.instanceCount * 100">
+                        <el-progress
+                          :percentage="parseInt((item.prefetchInstanceCount / item.instanceCount).toFixed(2))" />
                       </div>
 
                     </div>
@@ -164,6 +139,7 @@ import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
+import { getNetWorkSpeed, setNetWorkSpeedSize, workSpeedclose } from "@/utils"
 cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 var config = {
   maxWebWorkers: 4,
@@ -184,7 +160,7 @@ export default {
     'dicom-viewer': dicomViewer
   },
 
-  data: function() {
+  data: function () {
     return {
       trialId: '',
       studyId: '',
@@ -216,10 +192,12 @@ export default {
       imageList: [],
       showSeriesList: [],
       currentLoadIns: [],
-      isFromCRCUpload: false
+      isFromCRCUpload: false,
+      isReading: null,
+      activeSeriesId: null
     }
   },
-  created: function() {
+  created: function () {
     requestPoolManager.resetRequestPool()
     this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''
 
@@ -230,6 +208,9 @@ export default {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
+    if (this.$router.currentRoute.query.isReading) {
+      this.isReading = this.$router.currentRoute.query.isReading
+    }
     this.studyId = this.$router.currentRoute.query.studyId
     this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
@@ -256,6 +237,7 @@ export default {
       cornerstone.imageCache.purgeCache()
       requestPoolManager.resetRequestPool()
     })
+    workSpeedclose(true)
   },
   methods: {
     async loadStudy() {
@@ -267,7 +249,8 @@ export default {
           this.seriesCount = data.Result.SeriesCount
           this.description = data.Result.Description
         }
-        const url = `/series/list/${this.studyId}`
+        let isReading = !!this.isReading ? `?IsReading=true` : ''
+        const url = `/series/list/${this.studyId}${isReading}`
         this.getSeriesList(url)
       }
     },
@@ -462,6 +445,8 @@ export default {
       }
     },
     showSeriesImage(e, seriesIndex, series) {
+      this.activeSeriesId = series.seriesId
+      workSpeedclose(true)
       // if (seriesIndex === this.currentSeriesIndex) return
       const element = e.currentTarget
       const elements = document.querySelectorAll('[series-type]')
@@ -851,6 +836,9 @@ export default {
         const seriesIndex = params.seriesIndex
         var prefetchInstanceCount = this.seriesList[seriesIndex].prefetchInstanceCount
         var instanceCount = this.seriesList[seriesIndex].instanceCount
+        if (!this.activeSeriesId) {
+          this.activeSeriesId = this.seriesList[seriesIndex].seriesId
+        }
         if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.seriesList[seriesIndex].imageloadedArr.length < this.seriesList[seriesIndex].instanceCount) {
           const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
           if (i > -1) {
@@ -870,10 +858,16 @@ export default {
             this.seriesList[seriesIndex].imageloadedArr.push(imageId)
           }
         }
+        let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
+        if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) {
+          getNetWorkSpeed()
+          setNetWorkSpeedSize(percentComplete,  e.detail.total, imageId)
+        }
         if (prefetchInstanceCount >= instanceCount * 100) {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
+          workSpeedclose()
           if (!this.isFromCRCUpload) {
             this.loadAllImages()
           }
@@ -881,90 +875,102 @@ export default {
       }
     }
   }
-
 }
 </script>
 
 <style>
-.viewerContainer .el-tabs--border-card{
-  background:none;
+.viewerContainer .el-tabs--border-card {
+  background: none;
   border: none;
 }
-.viewerContainer .el-tabs__item{
+
+.viewerContainer .el-tabs__item {
   height: 35px;
   line-height: 35px;
 }
-.viewerContainer .el-tabs--border-card>.el-tabs__content{
+
+.viewerContainer .el-tabs--border-card>.el-tabs__content {
   padding: 5px 0px 0px 0px;
 }
+
 .viewerContainer ::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
+  width: 7px;
+  height: 7px;
 }
+
 .viewerContainer ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
+  border-radius: 10px;
+  background: #d0d0d0;
 }
-.viewerContainer .relationVisit{
+
+.viewerContainer .relationVisit {
   line-height: 20px;
   cursor: pointer;
 }
-  .viewerContainer{
-    display: block;
-    height: 100%;
-    margin-left: auto;
-    margin-right: auto;
-    background-color: #444;
-    overflow: hidden;
-  }
-.viewerContainer  .viewerBanner {
-    background: linear-gradient(0,#444,#222);
-    min-height: 28px;
-    font-size: 16px;
-    margin: 0;
-    height: 30px;
-    padding-top: 0;
-    padding-left: 5px;
-    padding-right: 5px;
-    font-weight: bold;
+
+.viewerContainer {
+  display: block;
+  height: 100%;
+  margin-left: auto;
+  margin-right: auto;
+  background-color: #444;
+  overflow: hidden;
 }
+
+.viewerContainer .viewerBanner {
+  background: linear-gradient(0, #444, #222);
+  min-height: 28px;
+  font-size: 16px;
+  margin: 0;
+  height: 30px;
+  padding-top: 0;
+  padding-left: 5px;
+  padding-right: 5px;
+  font-weight: bold;
+}
+
 .viewerContainer .viewerContentWrapper {
   display: flex;
   flex-direction: row;
-    width: 100%;
-    padding: 5px;
-    /* height: 95%; */
-    height: 99%;
-    overflow: hidden;
-    text-overflow: clip;
-    white-space: nowrap;
+  width: 100%;
+  padding: 5px;
+  /* height: 95%; */
+  height: 99%;
+  overflow: hidden;
+  text-overflow: clip;
+  white-space: nowrap;
 }
+
 .viewerContainer .viewerContentWrapper>div {
-    display: inline-block;
-    white-space: normal;
+  display: inline-block;
+  white-space: normal;
 }
+
 .viewerContainer .viewerLeftSidePanel {
-    width: 215px;
-    background-color: #323232;
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    margin-right: 2px;
-    color: #D0D0D0;
-    overflow-y: auto;
+  width: 215px;
+  background-color: #323232;
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  margin-right: 2px;
+  color: #D0D0D0;
+  overflow-y: auto;
 }
+
 .viewerContainer .viewerContentWrapper>div>.sidePanelBody {
-    background: rgba(50,50,50,1);
-    word-break: break-all;
-    display: table;
-    width: 100%;
-    border: 1px solid #3e3f3a;
+  background: rgba(50, 50, 50, 1);
+  word-break: break-all;
+  display: table;
+  width: 100%;
+  border: 1px solid #3e3f3a;
 }
+
 .viewerContainer .viewerContentWrapper>div>div.sidePanelBody>div {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
-.viewerContainer .studyDesc{
+
+.viewerContainer .studyDesc {
   font-weight: bold;
   font-size: 13px;
   text-align: center;
@@ -972,81 +978,96 @@ export default {
   color: #d0d0d0;
   padding: 2px;
 }
+
 .viewerContainer .ps {
-    overflow: hidden !important;
-    overflow-anchor: none;
-    -ms-overflow-style: none;
-    touch-action: auto;
-    -ms-touch-action: auto;
+  overflow: hidden !important;
+  overflow-anchor: none;
+  -ms-overflow-style: none;
+  touch-action: auto;
+  -ms-touch-action: auto;
 }
+
 .viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
-    display: flex;
-    width: 200px;
-    height: 84px;
-    padding: 1px 2px 1px 8px;
-    margin: 6px 0 6px 1px;
-    /* border-radius: 2px;
+  display: flex;
+  width: 200px;
+  height: 84px;
+  padding: 1px 2px 1px 8px;
+  margin: 6px 0 6px 1px;
+  /* border-radius: 2px;
     border: 1px solid #404040; */
 }
-.viewerContainer .viewernavigatorwrapper .el-progress__text{
+
+.viewerContainer .viewernavigatorwrapper .el-progress__text {
   display: none;
 }
-.viewerContainer .viewernavigatorwrapper .el-progress-bar{
-  padding-right:0px;
-}
-.viewerContainer .ui-draggable-handle {
-    -ms-touch-action: none;
-    touch-action: none;
-}
-.viewerContainer .viewerLeftSidePanel .image-preview {
-    border: 2px solid #252525;
-    cursor: pointer;
-}
-.viewerContainer .viewerLeftSidePanel .viewernavitextwrapper {
-    /* width: 120px;
-    height: 80px; */
-    flex:1;
-    padding: 3px 1px 3px 4px;
-    vertical-align: top;
-    font-size: 12px;
-}
-.viewerContainer .viewerLeftSidePanel .viewerlabelwrapper {
-    width: 20px;
 
-    font-size: 12px;
+.viewerContainer .viewernavigatorwrapper .el-progress-bar {
+  padding-right: 0px;
 }
+
+.viewerContainer .ui-draggable-handle {
+  -ms-touch-action: none;
+  touch-action: none;
+}
+
+.viewerContainer .viewerLeftSidePanel .image-preview {
+  border: 2px solid #252525;
+  cursor: pointer;
+}
+
+.viewerContainer .viewerLeftSidePanel .viewernavitextwrapper {
+  /* width: 120px;
+    height: 80px; */
+  flex: 1;
+  padding: 3px 1px 3px 4px;
+  vertical-align: top;
+  font-size: 12px;
+}
+
+.viewerContainer .viewerLeftSidePanel .viewerlabelwrapper {
+  width: 20px;
+
+  font-size: 12px;
+}
+
 .viewerContainer .viewerSideActive {
-    background: #16477b;
-    background: #16477b80;
-    border: 1px solid #23527b;
+  background: #16477b;
+  background: #16477b80;
+  border: 1px solid #23527b;
 }
+
 .viewerContainer .viewerContent {
-    flex: 1;
-    height: 100%;
-    display: block;
-    background-color: black;
-    color: #D0D0D0;
-    font-size: 13px;
+  flex: 1;
+  height: 100%;
+  display: block;
+  background-color: black;
+  color: #D0D0D0;
+  font-size: 13px;
 }
-.instance_frame_wrapper{
+
+.instance_frame_wrapper {
   min-width: 120px;
   background-color: #2c2c2c;
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
-.frame_list{
+
+.frame_list {
   max-height: 500px;
   overflow-y: auto;
 }
+
 .instance_frame_wrapper ::-webkit-scrollbar {
   width: 7px;
   height: 7px;
 }
-.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
   border-radius: 10px;
   background: #d0d0d0;
 }
-.frame_content{
+
+.frame_content {
   /* height: 50px; */
   padding: 10px;
   display: flex;
@@ -1055,6 +1076,7 @@ export default {
   font-size: 12px;
   border: 1px solid #404040;
 }
+
 .frame_content:hover {
   /* font-weight: bold; */
   /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
@@ -1063,6 +1085,7 @@ export default {
   border-color: #213a54 !important;
   background-color: #213a54;
 }
+
 /* .viewerRightSidePanel {
     width: 300px;
     height: 100%;

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

@@ -16,7 +16,8 @@
                       :key="index"
                     >  -->
                     <el-collapse v-model="activeNames">
-                      <el-collapse-item v-for="(study, index) in studyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
+                      <el-collapse-item v-for="(study, index) in studyList" :key="`${study.StudyId}`"
+                        :name="`${study.StudyId}`">
                         <template slot="title">
 
                           <div class="text-desc">
@@ -25,8 +26,10 @@
                           <!-- <div v-show="study.Description" class="text-desc">
                             {{ study.Description }}
                           </div> -->
-                          <el-tooltip v-show="study.Description" class="item" effect="dark" :content="study.Description" placement="bottom">
-                            <div v-show="study.Description" style="width: 50px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                          <el-tooltip v-show="study.Description" class="item" effect="dark" :content="study.Description"
+                            placement="bottom">
+                            <div v-show="study.Description"
+                              style="width: 50px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
                               {{ study.Description }}
                             </div>
                           </el-tooltip>
@@ -37,44 +40,29 @@
                         <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
                           {{ study.Description }}
                         </div>
-                        <div
-                          v-for="(series, i) in study.SeriesList"
-                          :key="i"
-                          :class="{'viewerSideActive': i==0 && index === 0}"
+                        <div v-for="(series, i) in study.SeriesList" :key="i"
+                          :class="{ 'viewerSideActive': i == 0 && index === 0 }"
                           style="position: relative;margin-bottom:5px;border-radius: 2px;border: 1px solid #404040;"
-                          series-type="current"
-                          @click="showSeriesImage($event,index,i,series)"
-                        >
+                          series-type="current" @click="showSeriesImage($event, index, i, series)">
                           <div class="viewernavigatorwrapper">
-                            <img
-                              class="image-preview"
-                              :src="series.previewImageUrl"
-                              crossorigin="anonymous"
-                              alt=""
-                              style="width: 85px;height:85px;"
-                              fit="fill"
-                            >
+                            <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
+                              style="width: 85px;height:85px;" fit="fill">
                             <div class="viewernavitextwrapper">
                               <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                                 <div>#{{ series.seriesNumber }}</div>
                                 <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
-                                  <el-popover
-                                    v-model="series.isShowPopper"
-                                    placement="right-start"
-                                    trigger="manual"
-                                    popper-class="instance_frame_wrapper"
-                                  >
+                                  <el-popover v-model="series.isShowPopper" placement="right-start" trigger="manual"
+                                    popper-class="instance_frame_wrapper">
                                     <div style="text-align: right;">
-                                      <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="series.isShowPopper = false" />
+                                      <i class="el-icon-circle-close"
+                                        style="font-size: 20px;cursor: pointer;color:#ddd;"
+                                        @click="series.isShowPopper = false" />
                                     </div>
                                     <div class="frame_list">
-                                      <div
-                                        v-for="(instance, idx) in series.instanceInfoList"
-                                        :key="instance.Id"
+                                      <div v-for="(instance, idx) in series.instanceInfoList" :key="instance.Id"
                                         class="frame_content"
-                                        :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                                        @click="showMultiFrames(index,series, i, instance)"
-                                      >
+                                        :style="{ 'margin-bottom': idx < series.instanceInfoList.length - 1 ? '5px' : '0px' }"
+                                        @click="showMultiFrames(index, series, i, instance)">
                                         <!-- <div>
                                           <img
                                             class="image-preview"
@@ -92,23 +80,20 @@
                                           </div>
                                           <div v-if="showDelete">
                                             <span>{{ $t('trials:audit:table:isDelete') }}</span>
-                                            <el-switch
-                                              v-model="instance.IsDeleted"
-                                              size="mini"
-                                              @change="changeInstanceDeleteStatus($event, series, instance)"
-                                            />
-                                            <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
-                                            <el-switch
-                                              v-model="instance.IsReading"
-                                              size="mini"
-                                              @change="changeInstanceReadingStatus($event, series, instance)"
-                                            />
+                                            <el-switch v-model="instance.IsDeleted" size="mini"
+                                              @change="changeInstanceDeleteStatus($event, series, instance)" />
+                                            <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading')
+                                            }}</span>
+                                            <el-switch v-model="instance.IsReading" size="mini"
+                                              @change="changeInstanceReadingStatus($event, series, instance)" />
                                           </div>
                                         </div>
 
                                       </div>
                                     </div>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(studyList, series)" />
+                                    <i slot="reference" class="el-icon-connection"
+                                      style="font-size: 15px;cursor: pointer;"
+                                      @click="popperClick(studyList, series)" />
                                   </el-popover>
                                 </div>
 
@@ -116,12 +101,14 @@
                               <div v-show="series.InstanceCount" style="padding: 1px;">
                                 {{ series.modality }}: {{ series.instanceCount }} image
                               </div>
-                              <div v-show=" series.sliceThickness" style="padding: 1px;">
+                              <div v-show="series.sliceThickness" style="padding: 1px;">
                                 T: {{ series.sliceThickness }}
                               </div>
 
-                              <el-tooltip v-show="series.description" class="item" effect="dark" :content="series.description" placement="bottom">
-                                <div v-show="series.description" style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                              <el-tooltip v-show="series.description" class="item" effect="dark"
+                                :content="series.description" placement="bottom">
+                                <div v-show="series.description"
+                                  style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
                                   {{ series.description }}
                                 </div>
                               </el-tooltip>
@@ -131,30 +118,27 @@
                               <div />
                             </div>
                           </div>
-                          <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
+                          <div v-if="showDelete"
+                            style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
 
                             <div>
                               <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                              <el-switch
-                                v-model="series.isReading"
-                                size="mini"
-                                @change="changeReadingStatus($event, series)"
-                              />
+                              <el-switch v-model="series.isReading" size="mini"
+                                @change="changeReadingStatus($event, series)" />
                             </div>
                             <div>
                               <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
-                              <el-switch
-                                v-model="series.isDeleted"
-                                size="mini"
-                                @change="changeDeleteStatus($event, series)"
-                              />
+                              <el-switch v-model="series.isDeleted" size="mini"
+                                @change="changeDeleteStatus($event, series)" />
                             </div>
                           </div>
                           <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                           <el-progress v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount" :percentage="Number(series.prefetchInstanceCount/series.instanceCount)*100" />
                         </div> -->
-                          <div v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount * 100">
-                            <el-progress :percentage="parseInt((series.prefetchInstanceCount/series.instanceCount).toFixed(2))" />
+                          <div
+                            v-if="series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100">
+                            <el-progress
+                              :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
                           </div>
 
                         </div>
@@ -165,102 +149,109 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane v-if="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
+              <el-tab-pane v-show="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study"
+                class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
-                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <el-collapse-item v-for="(study,studyIndex) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
-                      <template slot="title">
 
-                        <div class="text-desc">
-                          {{ study.StudyCode }}
+                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
+                    <template v-for="item in relationStudyListByVisitName">
+                      <div :key="`${item.VisitName}`">
+                        <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
+                          {{ item.VisitName }}
                         </div>
-                        <!-- <div v-show="study.Description" class="text-desc">
+                        <template v-for="(study, studyIndex) in relationStudyList">
+                          <el-collapse-item :key="`${study.StudyId}`" :name="`${study.StudyId}`"
+                            v-if="study.VisitName === item.VisitName">
+                            <template slot="title">
+
+                              <div class="text-desc">
+                                {{ study.StudyCode }}
+                              </div>
+                              <!-- <div v-show="study.Description" class="text-desc">
                           {{ study.Description }}
                         </div> -->
 
-                        <div v-show="study.SeriesCount" class="text-desc">
-                          {{ study.Modalities }} : {{ study.SeriesCount }} Series
-                        </div>
-                      </template>
-                      <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
-                        {{ study.Description }}
-                      </div>
-                      <div v-if="study.seriesList" class="viewerSidethumbs ps" style="position: relative;">
-                        <div class="viewerSidethumbinner">
-                          <div
-                            v-for="(seriesItem, index) in study.seriesList"
-                            :key="index"
-                            class="viewernavigatorwrapper"
-                            style="position: relative;border:1px solid #434343;"
-                            series-type="relation"
-                            @click="showRelationSeriesImage($event,seriesItem,studyIndex,index)"
-                          >
-                            <!-- <el-image
+                              <div v-show="study.SeriesCount" class="text-desc">
+                                {{ study.Modalities }} : {{ study.SeriesCount }} Series
+                              </div>
+                            </template>
+                            <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
+                              {{ study.Description }}
+                            </div>
+                            <div class="viewerSidethumbs ps" style="position: relative;">
+                              <div class="viewerSidethumbinner">
+                                <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
+                                  <div class="viewernavigatorwrapper"
+                                    style="position: relative;border:1px solid #434343;" series-type="relation"
+                                    @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
+                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
+                                      alt="" style="width: 85px;height:85px;" fit="fill">
+
+                                    <div class="viewernavitextwrapper">
+                                      <div
+                                        style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                        <div v-if="seriesItem.keySeries" style="color:red">
+                                          Key Images
+                                        </div>
+                                        <div v-else>#{{ seriesItem.seriesNumber }}</div>
+                                        <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
+                                          <el-popover placement="right-start" trigger="click"
+                                            popper-class="instance_frame_wrapper">
+                                            <div class="frame_list">
+                                              <div v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                                :key="instance.Id" class="frame_content"
+                                                :style="{ 'margin-bottom': idx < seriesItem.instanceInfoList.length - 1 ? '5px' : '0px' }"
+                                                @click="showMultiFrames(studyIndex, seriesItem, index, instance)">
+                                                <div>
+                                                  <div>{{ instance.InstanceNumber }}</div>
+                                                  <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1}
+                                                    frame`
+                                                  }}</div>
+                                                </div>
+
+                                              </div>
+                                            </div>
+                                            <i slot="reference" class="el-icon-connection"
+                                              style="font-size: 15px;cursor: pointer;" />
+                                          </el-popover>
+                                        </div>
+
+                                      </div>
+                                      <div v-show="seriesItem.instanceCount" style="padding: 1px;">
+                                        {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
+                                      </div>
+                                      <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
+                                        T: {{ seriesItem.sliceThickness }}
+                                      </div>
+                                      <el-tooltip v-show="seriesItem.description" class="item" effect="dark"
+                                        :content="seriesItem.description" placement="bottom">
+                                        <div v-show="seriesItem.description"
+                                          style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                                          {{ seriesItem.description }}
+                                        </div>
+                                      </el-tooltip>
+                                    </div>
+                                  </div>
+                                  <!-- <el-image
                             class="image-preview"
                             style="height:72px;width:72px;"
                             :src="seriesItem.previewImageUrl"
                             fit="fill"
                           /> -->
-                            <img
-                              class="image-preview"
-                              :src="seriesItem.previewImageUrl"
-                              crossorigin="anonymous"
-                              alt=""
-                              style="width: 85px;height:85px;"
-                              fit="fill"
-                            >
-
-                            <div class="viewernavitextwrapper">
-                              <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
-                                <div v-if="seriesItem.keySeries" style="color:red">
-                                  Key Images
+                                  <div
+                                    v-if="seriesItem.prefetchInstanceCount > 0 && seriesItem.prefetchInstanceCount < seriesItem.instanceCount * 100">
+                                    <el-progress
+                                      :percentage="parseInt((seriesItem.prefetchInstanceCount / seriesItem.instanceCount).toFixed(2))" />
+                                  </div>
                                 </div>
-                                <div v-else>#{{ seriesItem.seriesNumber }}</div>
-                                <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
-                                  <el-popover
-                                    placement="right-start"
-                                    trigger="click"
-                                    popper-class="instance_frame_wrapper"
-                                  >
-                                    <div class="frame_list">
-                                      <div
-                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
-                                        :key="instance.Id"
-                                        class="frame_content"
-                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
-                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
-                                      >
-                                        <div>
-                                          <div>{{ instance.InstanceNumber }}</div>
-                                          <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                        </div>
-
-                                      </div>
-                                    </div>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
-                                  </el-popover>
-                                </div>
-
                               </div>
-                              <div v-show="seriesItem.instanceCount" style="padding: 1px;">
-                                {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
-                              </div>
-                              <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
-                                T: {{ seriesItem.sliceThickness }}
-                              </div>
-                              <el-tooltip v-show="seriesItem.description" class="item" effect="dark" :content="seriesItem.description" placement="bottom">
-                                <div v-show="seriesItem.description" style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
-                                  {{ seriesItem.description }}
-                                </div>
-                              </el-tooltip>
                             </div>
-                          <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
-                            <el-progress v-if="seriesItem.prefetchInstanceCount>0 && seriesItem.prefetchInstanceCount<seriesItem.instanceCount" :percentage="Number(seriesItem.prefetchInstanceCount/seriesItem.instanceCount)*100" />
-                          </div> -->
-                          </div>
-                        </div>
+                          </el-collapse-item>
+                        </template>
+
                       </div>
-                    </el-collapse-item>
+                    </template>
+
                   </el-collapse>
 
                 </div>
@@ -287,6 +278,7 @@ import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+import { getNetWorkSpeed, setNetWorkSpeedSize, workSpeedclose } from "@/utils"
 import metaDataProvider from '@/utils/metaDataProvider'
 cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 // import * as cornerstoneTools from 'cornerstone-tools'
@@ -315,6 +307,7 @@ export default {
       visitInfo: '',
       activeName: 'current-study',
       relationStudyList: [],
+      relationStudyListByVisitName: [],
       cachedImages: [],
       isReading: null,
       isStartLoad: false,
@@ -328,7 +321,8 @@ export default {
       currentLoadIns: [],
       isFromCRCUpload: false,
       visitTaskId: null,
-      page: ''
+      page: '',
+      activeSeriesId: null
     }
   },
   mounted() {
@@ -361,6 +355,7 @@ export default {
       cornerstone.imageCache.purgeCache()
       requestPoolManager.resetRequestPool()
     })
+    workSpeedclose(true)
   },
   methods: {
     // 获取某个访视下所有的检查信息
@@ -459,6 +454,8 @@ export default {
       }
     },
     showSeriesImage(e, studyIndex, seriesIndex, series) {
+      this.activeSeriesId = series.seriesId
+      workSpeedclose(true)
       const element = e.currentTarget
       const elements = document.querySelectorAll('[series-type]')
       Array.from(elements).forEach((e) => {
@@ -707,10 +704,26 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const res = await getAllRelationStudyList(this.subjectVisitId)
+          let params = {
+            IsReading: !!this.isReading
+          }
+          const res = await getAllRelationStudyList(this.subjectVisitId, params)
           loading.close()
           this.relationStudyList = res.Result
+          this.relationStudyListByVisitName = []
+          res.Result.forEach(item => {
+            let index = this.relationStudyListByVisitName.findIndex(d => d.VisitName === item.VisitName)
+            if (index < 0) {
+              this.relationStudyListByVisitName.push({
+                VisitName: item.VisitName,
+                series: [item]
+              })
+            } else {
+              this.relationStudyListByVisitName[index].series.push(item)
+            }
+          })
         } catch (e) {
+          console.log(e)
           loading.close()
         }
       }
@@ -739,7 +752,8 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const data = await getSeriesList(`/series/list/${studyId}`)
+          let isReading = !!this.isReading ? `?IsReading=true` : ''
+          const data = await getSeriesList(`/series/list/${studyId}${isReading}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
@@ -749,9 +763,15 @@ export default {
               item.InstanceInfoList.forEach(i => {
                 if (i.NumberOfFrames && i.NumberOfFrames > 1) {
                   for (let j = 0; j < i.NumberOfFrames; j++) {
+                    if (!i.ImageId) {
+                      i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`
+                    }
                     imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                   }
                 } else {
+                  if (!i.ImageId) {
+                    i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`
+                  }
                   imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                 }
               })
@@ -775,9 +795,12 @@ export default {
                 isShowPopper: false
               })
             })
-            scope.relationStudyList[index].seriesCount = seriesList.length
-            scope.relationStudyList[index].seriesList = seriesList
-            scope.relationStudyList[index].showSeries = true
+            // scope.relationStudyList[index].seriesCount = seriesList.length
+            // scope.relationStudyList[index].seriesList = seriesList
+            // scope.relationStudyList[index].showSeries = true
+            scope.$set(scope.relationStudyList[index], 'seriesCount', seriesList.length)
+            scope.$set(scope.relationStudyList[index], 'seriesList', seriesList)
+            scope.$set(scope.relationStudyList[index], 'showSeries', true)
             scope.$forceUpdate()
           }
         } catch (e) {
@@ -786,6 +809,8 @@ export default {
       }
     },
     showRelationSeriesImage(e, series, studyIndex, index) {
+      this.activeSeriesId = series.seriesId
+      workSpeedclose(true)
       this.currentRelationIndex = index
       const element = e.currentTarget
       const elements = document.querySelectorAll('[series-type]')
@@ -805,6 +830,9 @@ export default {
             this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
           })
         }
+        if (this.imageList.length > 0) {
+          this.loopLoad()
+        }
       }
     },
     loadAllImages() {
@@ -864,8 +892,11 @@ export default {
       }
       const studyIndex = params.idx.split('|')[0]
       const seriesIndex = params.idx.split('|')[1]
-      var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : null
+      var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : this.relationStudyList[studyIndex].seriesList[seriesIndex]
       if (!series) return
+      if (!this.activeSeriesId) {
+        this.activeSeriesId = series.seriesId
+      }
       var prefetchInstanceCount = series.prefetchInstanceCount
       var instanceCount = series.instanceCount
       if (series.imageloadedArr.indexOf(imageId) < 0) {
@@ -887,6 +918,11 @@ export default {
           series.imageloadedArr.push(imageId)
         }
       }
+      let file = series.instanceInfoList.find(item => item.ImageId === imageId)
+      if (file && this.activeSeriesId === series.seriesId) {
+        getNetWorkSpeed()
+        setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
+      }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100
         // 设置当前序列状态为已下载完成
@@ -894,96 +930,110 @@ export default {
         if (!this.isFromCRCUpload) {
           this.loadAllImages()
         }
+        workSpeedclose()
       }
     }
   }
 }
 </script>
 
-<style >
-.viewerContainer .el-tabs--border-card{
-  background:none;
+<style>
+.viewerContainer .el-tabs--border-card {
+  background: none;
   border: none;
 }
-.viewerContainer .el-tabs__item{
+
+.viewerContainer .el-tabs__item {
   height: 35px;
   line-height: 35px;
   width: 100px;
-  padding: 0!important;
+  padding: 0 !important;
   text-align: center;
   transform: scale(.8);
 }
-.viewerContainer .el-tabs--border-card>.el-tabs__content{
+
+.viewerContainer .el-tabs--border-card>.el-tabs__content {
   padding: 5px 0px 0px 0px;
 }
+
 .viewerContainer ::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
+  width: 7px;
+  height: 7px;
 }
+
 .viewerContainer ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
+  border-radius: 10px;
+  background: #d0d0d0;
 }
-.viewerContainer .relationVisit{
+
+.viewerContainer .relationVisit {
   line-height: 20px;
   cursor: pointer;
 }
-  .viewerContainer{
-    display: block;
-    height: 100%;
-    margin-left: auto;
-    margin-right: auto;
-    background-color: #444;
-    overflow: hidden;
-  }
-.viewerContainer  .viewerBanner {
-    background: linear-gradient(0,#444,#222);
-    min-height: 28px;
-    font-size: 16px;
-    margin: 0;
-    height: 30px;
-    padding-top: 0;
-    padding-left: 5px;
-    padding-right: 5px;
-    font-weight: bold;
+
+.viewerContainer {
+  display: block;
+  height: 100%;
+  margin-left: auto;
+  margin-right: auto;
+  background-color: #444;
+  overflow: hidden;
 }
+
+.viewerContainer .viewerBanner {
+  background: linear-gradient(0, #444, #222);
+  min-height: 28px;
+  font-size: 16px;
+  margin: 0;
+  height: 30px;
+  padding-top: 0;
+  padding-left: 5px;
+  padding-right: 5px;
+  font-weight: bold;
+}
+
 .viewerContainer .viewerContentWrapper {
   display: flex;
   flex-direction: row;
-    width: 100%;
-    padding: 5px;
-    /* height: 95%; */
-    height: 99%;
-    /* overflow: hidden;
+  width: 100%;
+  padding: 5px;
+  /* height: 95%; */
+  height: 99%;
+  /* overflow: hidden;
     text-overflow: clip; */
-    /* white-space: nowrap; */
+  /* white-space: nowrap; */
 }
+
 .viewerContainer .viewerContentWrapper>div {
-    display: inline-block;
-    white-space: normal;
+  display: inline-block;
+  white-space: normal;
 }
+
 .viewerContainer .viewerLeftSidePanel {
-    width: 220px;
-    background-color: #323232;
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    margin-right: 2px;
-    color: #D0D0D0;
-    overflow-y: auto;
+  width: 220px;
+  background-color: #323232;
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  margin-right: 2px;
+  color: #D0D0D0;
+  overflow-y: auto;
 }
+
 .viewerContainer .viewerContentWrapper>div>.sidePanelBody {
-    background: rgba(50,50,50,1);
-    word-break: break-all;
-    display: table;
-    width: 100%;
-    border: 1px solid #3e3f3a;
+  background: rgba(50, 50, 50, 1);
+  word-break: break-all;
+  display: table;
+  width: 100%;
+  border: 1px solid #3e3f3a;
 }
+
 .viewerContainer .viewerContentWrapper>div>div.sidePanelBody>div {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
-.viewerContainer .text-desc{
+
+.viewerContainer .text-desc {
   font-weight: bold;
   font-size: 13px;
   text-align: center;
@@ -991,107 +1041,126 @@ export default {
   color: #d0d0d0;
   padding: 2px;
 }
+
 .viewerContainer .ps {
-    overflow: hidden !important;
-    overflow-anchor: none;
-    -ms-overflow-style: none;
-    touch-action: auto;
-    -ms-touch-action: auto;
+  overflow: hidden !important;
+  overflow-anchor: none;
+  -ms-overflow-style: none;
+  touch-action: auto;
+  -ms-touch-action: auto;
 }
+
 .viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
-    display: flex;
-    width: 220px;
-    /* height: 84px; */
-    padding: 1px 2px 1px 2px;
-    margin: 2px 0 1px 1px;
-    /* border-radius: 2px;
+  display: flex;
+  width: 220px;
+  /* height: 84px; */
+  padding: 1px 2px 1px 2px;
+  margin: 2px 0 1px 1px;
+  /* border-radius: 2px;
     border: 1px solid #404040; */
 
 }
-.viewerContainer .viewernavigatorwrapper .el-progress__text{
+
+.viewerContainer .viewernavigatorwrapper .el-progress__text {
   display: none;
 }
-.viewerContainer .viewernavigatorwrapper .el-progress-bar{
-  padding-right:0px;
-}
-.viewerContainer .ui-draggable-handle {
-    -ms-touch-action: none;
-    touch-action: none;
-}
-.viewerContainer .viewerLeftSidePanel .image-preview {
-    border: 2px solid #252525;
-    cursor: pointer;
-}
-.viewerContainer .viewerLeftSidePanel .viewernavitextwrapper {
-    /* width: 120px;
-    height: 80px; */
-    flex:1;
-    padding: 3px 1px 3px 4px;
-    vertical-align: top;
-    font-size: 12px;
-}
-.viewerContainer .viewerLeftSidePanel .viewerlabelwrapper {
-    width: 20px;
 
-    font-size: 12px;
+.viewerContainer .viewernavigatorwrapper .el-progress-bar {
+  padding-right: 0px;
 }
+
+.viewerContainer .ui-draggable-handle {
+  -ms-touch-action: none;
+  touch-action: none;
+}
+
+.viewerContainer .viewerLeftSidePanel .image-preview {
+  border: 2px solid #252525;
+  cursor: pointer;
+}
+
+.viewerContainer .viewerLeftSidePanel .viewernavitextwrapper {
+  /* width: 120px;
+    height: 80px; */
+  flex: 1;
+  padding: 3px 1px 3px 4px;
+  vertical-align: top;
+  font-size: 12px;
+}
+
+.viewerContainer .viewerLeftSidePanel .viewerlabelwrapper {
+  width: 20px;
+
+  font-size: 12px;
+}
+
 .viewerContainer .viewerSideActive {
-    background: #16477b;
-    background: #16477b80;
-    border: 1px solid #23527b;
+  background: #16477b;
+  background: #16477b80;
+  border: 1px solid #23527b;
 }
+
 .viewerContainer .viewerContent {
-    flex: 1;
-    height: 100%;
-    display: block;
-    background-color: black;
-    color: #D0D0D0;
-    font-size: 13px;
+  flex: 1;
+  height: 100%;
+  display: block;
+  background-color: black;
+  color: #D0D0D0;
+  font-size: 13px;
 }
-.viewerContainer .pane-relation-wrapper{
+
+.viewerContainer .pane-relation-wrapper {
   min-height: 500px;
 }
-.viewerContainer .el-collapse{
+
+.viewerContainer .el-collapse {
   border: none;
 }
 
-.viewerContainer  .el-collapse-item{
-  background-color: #585453!important;
+.viewerContainer .el-collapse-item {
+  background-color: #585453 !important;
   color: #ddd;
 
 }
-.viewerContainer .el-collapse-item__content{
-  padding-bottom:5px;
-  background-color: #2c2c2c!important;
+
+.viewerContainer .el-collapse-item__content {
+  padding-bottom: 5px;
+  background-color: #2c2c2c !important;
   color: #ddd;
 }
-.viewerContainer .el-collapse-item__header{
-  background-color: #585453!important;
+
+.viewerContainer .el-collapse-item__header {
+  background-color: #585453 !important;
   color: #ddd;
-  border-bottom-color:#5a5a5a;
+  border-bottom-color: #5a5a5a;
   padding-left: 5px;
   height: 40px;
   line-height: 20px;
 }
-.instance_frame_wrapper{
+
+.instance_frame_wrapper {
   min-width: 120px;
   background-color: #2c2c2c;
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
-.frame_list{
+
+.frame_list {
   max-height: 500px;
   overflow-y: auto;
 }
+
 .instance_frame_wrapper ::-webkit-scrollbar {
   width: 7px;
   height: 7px;
 }
-.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
   border-radius: 10px;
   background: #d0d0d0;
 }
-.frame_content{
+
+.frame_content {
   /* height: 50px; */
   padding: 10px;
   display: flex;
@@ -1100,6 +1169,7 @@ export default {
   font-size: 12px;
   border: 1px solid #404040;
 }
+
 .frame_content:hover {
   /* font-weight: bold; */
   /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
@@ -1121,4 +1191,3 @@ export default {
     font-size: 13px;
 } */
 </style>
-

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -10,7 +10,7 @@
 
       <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
+          <el-upload class="upload-demo" action accept=".pdf" :before-upload="beforeUpload"
             :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
             :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
             :disabled="form.Type === ''">
@@ -229,7 +229,7 @@ export default {
       this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['pdf', 'mp4']
+      var typeArr = ['pdf']
       var extendName = fileName
         .substring(fileName.lastIndexOf('.') + 1)
         .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentForm.vue

@@ -16,7 +16,7 @@
                         :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
                         :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
                         <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                            }}</el-button>
+                        }}</el-button>
                         <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
                             ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
                         </span>
@@ -82,8 +82,7 @@ export default {
                 '.doc',
                 '.docx',
                 '.xls',
-                '.xlsx',
-                '.mp4']
+                '.xlsx']
         }
     },
     mounted() {
@@ -173,7 +172,18 @@ export default {
             this.$message.warning(this.$t('upload:rule:maxFile1'))
         },
         checkFileSuffix(fileName) {
-            var typeArr = this.accept.map(item => item.split('.')[1])
+            var typeArr = [
+                'jpg',
+                'jpeg',
+                'png',
+                'pdf',
+                'ppt',
+                'pptx',
+                'doc',
+                'docx',
+                'xls',
+                'xlsx',
+            ]
             var extendName = fileName
                 .substring(fileName.lastIndexOf('.') + 1)
                 .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue

@@ -46,16 +46,16 @@
                 <!-- 新增/编辑附件 -->
                 <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
                     width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowDATA" :SystemDocumentId="SystemDocumentId"
+                    <attachmentForm v-if="visible" :data="rowData" :SystemDocumentId="SystemDocumentId"
                         @closeDialog="closeDialog" @getList="getAllList" />
                 </el-dialog>
             </template>
         </base-model>
         <viewer ref="picture_perview2" style="margin: 0 10px"
-            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
+            v-if="rowData.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowData.FileFormat.toLowerCase())"
+            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
 
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
         </viewer>
         <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
             v-if="perview_visible" /> -->
@@ -113,7 +113,7 @@ export default {
             visible: false,
             title: null,
             list: [],
-            rowDATA: {},
+            rowData: {},
             loading: false,
             viewerOptions: {
                 toolbar: {
@@ -167,7 +167,7 @@ export default {
             if (!row.Id) {
                 this.title = this.$t('dictionary:signature:attachmentForm:title:add')
             }
-            this.rowDATA = Object.assign({}, row)
+            this.rowData = Object.assign({}, row)
             this.visible = true
         },
         async getList() {
@@ -207,7 +207,7 @@ export default {
         },
         preview(data) {
             // return this.perview_visible = true
-            this.rowDATA = Object.assign({}, data)
+            this.rowData = Object.assign({}, data)
             if (['.ppt',
                 '.pptx',
                 '.doc',
@@ -234,13 +234,6 @@ export default {
                     title: data.Name,
                 })
             }
-            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$video({
-                    path: data.Path || data.FilePath,
-                    type: 'mp4',
-                    title: data.Name,
-                })
-            }
         },
         // 排序
         handleSortByColumn(column) {

src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue

@@ -70,10 +70,10 @@ import ppt from '@/assets/file_icon/ppt.png'
 import pptx from '@/assets/file_icon/pptx.png'
 import xls from '@/assets/file_icon/xls.png'
 import xlsx from '@/assets/file_icon/xlsx.png'
+import mp4 from '@/assets/file_icon/xlsx.png'
 import PreviewFile from '@/components/PreviewFile'
 import imageViewer from './image-viewer'
 import { getSystemDocumentAttachmentList } from '@/api/dictionary'
-import { getTrialDocumentAttachmentList } from '@/api/trials'
 const defaultSearchData = () => {
     return {
         PageIndex: 1,
@@ -101,10 +101,6 @@ export default {
         isView: {
             type: Boolean,
             default: false
-        },
-        isTrial: {
-            type: Boolean,
-            default: false
         }
     },
     data() {
@@ -117,6 +113,7 @@ export default {
             pptx,
             xls,
             xlsx,
+            mp4,
             rowData: {},
             list: [],
             searchData: defaultSearchData(),
@@ -145,20 +142,11 @@ export default {
             try {
                 if (!this.SystemDocumentId) return false
                 this.loading = true
-                if (!this.isTrial) {
-                    this.searchData.SystemDocumentId = this.SystemDocumentId
-                } else {
-                    this.searchData.TrialDocumentId = this.SystemDocumentId
-                }
+                this.searchData.SystemDocumentId = this.SystemDocumentId
                 if (this.isView) {
                     this.searchData.OffLine = false
                 }
-                let res = null
-                if (!this.isTrial) {
-                    res = await getSystemDocumentAttachmentList(this.searchData)
-                } else {
-                    res = await getTrialDocumentAttachmentList(this.searchData)
-                }
+                let res = await getSystemDocumentAttachmentList(this.searchData)
                 this.loading = false
                 if (res.IsSuccess) {
                     this.list = res.Result.CurrentPageData

src/views/dictionary/checkConfig/index.vue

@@ -244,7 +244,15 @@
                   <el-form-item label="前端展示类型">
                     <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;" @change="(v) => {if (v === 'Table'){rowDrop2()}}">
                       <el-radio :label="''">字符串</el-radio>
-                      <el-radio :label="item.value" v-for="item in $d.AuditDataType" :key="item.id">{{item.label}}</el-radio>
+                      <el-radio label="Array">数组(类似QC问题审核)</el-radio>
+                      <el-radio label="Dialog">对话</el-radio>
+                      <el-radio label="Link">外链</el-radio>
+                      <el-radio label="DialogTable">弹框列表</el-radio>
+                      <el-radio label="Table">表格</el-radio>
+                      <el-radio label="Router">路由</el-radio>
+                      <el-radio label="Image">图片</el-radio>
+                      <el-radio label="ImageList">图片数组</el-radio>
+                      <el-radio label="OSS">OSS</el-radio>
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
@@ -606,18 +614,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-show="title !== '复制'" :span="24">
-              <el-form-item>
-              <span slot="label">
-                是否默认
-              </span>
-                <el-switch
-                  v-model="form.IsDefaultChoice"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
-              </el-form-item>
-            </el-col>
             <!--分割线-->
             <el-col v-show="title !== '复制' && form.ConfigType == 'M'" :span="24">
               <el-divider content-position="left">其他信息</el-divider>
@@ -663,15 +659,11 @@
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
           <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-              <template v-for="item of list">
-                <el-option :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
-              </template>
-            </el-select>
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+          </el-select>
           <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
           <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <template v-for="item of list">
-              <el-option  :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
-            </template>
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>
@@ -1138,7 +1130,6 @@ export default {
         DescriptionCN: null,
         InterfaceName: null,
         IsEnable: true,
-        IsDefaultChoice: true,
         ModuleTypeId: null,
         OptTypeId: null,
         ChildrenTypeId: null,

src/views/dictionary/newdictionary/components/DictionaryChild.vue

@@ -7,28 +7,74 @@
         <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
       </span>
     </div>
-    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
-      @sort-change="handleSortByColumn">
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      size="small"
+      height="100"
+    >
       <el-table-column type="index" width="60" />
-      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
-        show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column
+        v-if="!~$route.path.indexOf('select')"
+        prop="Code"
+        label="字典键值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="中文值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Value"
+        label="英文值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ChildGroup"
+        label="分组"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ShowOrder"
+        label="显示顺序"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Description"
+        label="描述"
+        min-width="180"
+        show-overflow-tooltip
+      />
       <el-table-column label="是否可用" width="100" fixed="right">
         <template slot-scope="scope">
-          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-            @change="(event) => { return switchChange(event, scope.row) }" />
+          <el-switch
+            v-model="scope.row.IsEnable"
+            :active-value="true"
+            :inactive-value="false"
+            @change="(event) => {return switchChange(event, scope.row)}"
+          />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="scope">
-          <el-button type="text" @click="handleEdit(scope.row)">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
             编辑
           </el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+          >
             删除
           </el-button>
         </template>
@@ -45,8 +91,7 @@ import DictionaryChildAddOrUpdateForm from './DictionaryChildAddOrUpdateForm'
 
 const searchDataDefault = () => {
   return {
-    Asc: true,
-    SortField: 'ShowOrder',
+    parentId: ''
   }
 }
 export default {
@@ -76,17 +121,6 @@ export default {
     this.getList()
   },
   methods: {
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
     handleChild(row) {
       this.drawerChild = true
       this.getDictionaryChildList(row.Id)
@@ -138,8 +172,7 @@ export default {
     // 获取匿名化配置信息
     getList() {
       this.loading = true
-      this.searchData.ParentId = this.parent.Id
-      getDictionaryChildList(this.searchData).then(res => {
+      getDictionaryChildList(this.parent.Id).then(res => {
         this.loading = false
         this.list = res.Result
       }).catch(() => { this.loading = false })
@@ -157,4 +190,6 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+
+</style>

src/views/dictionary/template/components/CriterionDictionary.vue

@@ -5,81 +5,151 @@
       </div>
       <div>
         <!-- 配置 -->
-        <el-button size="mini" type="primary" :disabled="isCompleteConfig" @click="handleAdd"
-          style="margin-right: 10px;">
+        <el-button
+          size="mini"
+          type="primary"
+          :disabled="isCompleteConfig"
+          @click="handleAdd"
+          style="margin-right: 10px;"
+        >
           {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
-    <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
+    <el-table
+      v-loading="loading"
+      style="width: 100%"
+      :data="list"
+      stripe
+    >
       <!-- 序号 -->
-      <el-table-column prop="" label="" width="50">
+      <el-table-column
+        prop=""
+        label=""
+        width="50"
+      >
         <template slot-scope="scope">
-          {{ scope.$index + 1 }}
+          {{scope.$index + 1}}
         </template>
       </el-table-column>
       <!-- 字典表名 -->
-      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Code"
+        :label="$t('dictionary:template:criterionDictionary:table:code')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 描述 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:description')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 子项数量 -->
-      <el-table-column prop="Count" :label="$t('dictionary:template:criterionDictionary:table:count')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Count"
+        :label="$t('dictionary:template:criterionDictionary:table:count')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 排序 -->
-      <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="ShowOrder"
+        :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 操作 -->
-      <el-table-column prop="Description" :label="$t('common:action:action')" show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('common:action:action')"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <!-- 配置 -->
-          <el-button type="text" @click="openChildren(scope.row)">
+          <el-button :disabled="isCompleteConfig" type="text" @click="openChildren(scope.row)">
             {{ $t('dictionary:template:criterionDictionary:button:config') }}
           </el-button>
           <!-- 删除 -->
-          <el-button type="text" :disabled="isCompleteConfig" @click="handleDelete(scope.row)">
+          <el-button
+            type="text"
+            :disabled="isCompleteConfig"
+            @click="handleDelete(scope.row)"
+          >
             {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <el-drawer :title="drawer_cfg.title" :append-to-body="true" :modal-append-to-body="false"
-      :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
-      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :isCompleteConfig="isCompleteConfig"
-        :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
+    <el-drawer
+      :title="drawer_cfg.title"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      :visible.sync="drawer_cfg.drawerChild"
+      direction="rtl"
+      size="80%"
+    >
+      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
     </el-drawer>
-    <el-drawer :title="drawer_cfg2.title" :append-to-body="true" :modal-append-to-body="false"
-      :visible.sync="drawer_cfg2.drawerChild" direction="rtl" size="80%">
+    <el-drawer
+      :title="drawer_cfg2.title"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      :visible.sync="drawer_cfg2.drawerChild"
+      direction="rtl"
+      size="80%"
+    >
       <div style="text-align: right;">
-        <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-          {{ $t('common:button:save') }}
+        <el-button
+          size="mini"
+          type="primary"
+          @click="handleSave"
+          v-loading="loading"
+        >
+          {{ $t('common:button:save')}}
         </el-button>
       </div>
-      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" ref="multipleTable" style="width: 100%"
-        :data="dicList" stripe @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{bottomOffset:0}"
+        height="100"
+        ref="multipleTable"
+        style="width: 100%"
+        :data="dicList"
+        stripe
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55">
         </el-table-column>
-        <el-table-column width="55">
+        <el-table-column
+          width="55">
           <template slot-scope="scope">
-            {{ scope.$index + 1 }}
+            {{ scope.$index + 1}}
           </template>
         </el-table-column>
         <!-- 字典表名 -->
-        <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="Code"
+          :label="$t('dictionary:template:criterionDictionary:table:code')"
+          show-overflow-tooltip
+        >
         </el-table-column>
         <!-- 描述 -->
-        <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="Description"
+          :label="$t('dictionary:template:criterionDictionary:table:description')"
+          show-overflow-tooltip
+        >
         </el-table-column>
         <!-- 排序 -->
-        <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="ShowOrder"
+          :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
+          show-overflow-tooltip
+        >
         </el-table-column>
       </el-table>
     </el-drawer>
@@ -194,7 +264,7 @@ export default {
       this.loading = true
       // 是否确认删除
       this.$confirm(this.$t('template:criterionDictionary:message:msg1')).then(() => {
-        deleteSystemCriterionDictionary({ Id: row.Id }).then(res => {
+        deleteSystemCriterionDictionary({Id: row.Id}).then(res => {
           this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.loading = false
           this.getList()
@@ -207,7 +277,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item__content {
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

src/views/dictionary/template/components/CriterionDictionaryConfig.vue

@@ -4,74 +4,134 @@
       <div>
       </div>
       <div>
-        <el-button size="mini" type="primary" @click="handleAdd" style="margin-right: 10px;" v-if="!isCompleteConfig">
+        <el-button
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+          style="margin-right: 10px;"
+        >
           {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
-    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" style="width: 100%" :data="list" stripe>
-      <el-table-column prop="" label="" width="50">
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:0}"
+      height="100"
+      style="width: 100%"
+      :data="list"
+      stripe
+    >
+      <el-table-column
+        prop=""
+        label=""
+        width="50"
+      >
         <template slot-scope="scope">
-          {{ scope.$index + 1 }}
+          {{scope.$index + 1}}
         </template>
       </el-table-column>
       <!-- 键值 -->
-      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip />
+      <el-table-column
+        prop="Code"
+        :label="$t('dictionary:template:criterionDictionary:table:code')"
+        show-overflow-tooltip
+      />
       <!-- 中文值 -->
-      <el-table-column prop="ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="ValueCN"
+        :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 英文值 -->
-      <el-table-column prop="Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Value"
+        :label="$t('dictionary:template:criterionDictionary:table:value')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 描述 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:description')"
+        show-overflow-tooltip
+      >
       </el-table-column>
       <!-- 分组 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:group')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:group')"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <div v-if="!isCompleteConfig">
-            <el-radio-group v-model="scope.row.CrterionDictionaryGroup"
-              @change="(v) => { crterionDictionaryGroupChange(v, scope.row) }" size="mini">
-              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{
-                item.label }}</el-radio-button>
+          <div>
+            <el-radio-group v-model="scope.row.CrterionDictionaryGroup" @change="(v) => {crterionDictionaryGroupChange(v, scope.row)}" size="mini">
+              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{item.label}}</el-radio-button>
             </el-radio-group>
           </div>
-          <div v-else>{{ $fd('CrterionDictionaryGroup', scope.row.CrterionDictionaryGroup) }}</div>
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog v-if="config.visible" :visible.sync="config.visible" :close-on-click-modal="false" :title="config.title"
-      width="90%" append-to-body>
+    <el-dialog
+      v-if="config.visible"
+      :visible.sync="config.visible"
+      :close-on-click-modal="false"
+      :title="config.title"
+      width="90%"
+      append-to-body
+    >
       <div>
         <div style="text-align: right;">
-          <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-            {{ $t('common:button:save') }}
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleSave"
+            v-loading="loading"
+          >
+            {{ $t('common:button:save')}}
           </el-button>
         </div>
-        <el-table v-loading="loading" v-adaptive="{ bottomOffset: 100 }" height="100" ref="multipleTable"
-          :data="$d[parentCode]" stripe @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55">
+        <el-table
+          v-loading="loading"
+          v-adaptive="{bottomOffset:100}"
+          height="100"
+          ref="multipleTable"
+          :data="$d[parentCode]"
+          stripe
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
           </el-table-column>
           <!-- 键值 -->
-          <el-table-column prop="raw.Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Code"
+            :label="$t('dictionary:template:criterionDictionary:table:code')"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <!-- 中文值 -->
-          <el-table-column prop="raw.ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.ValueCN"
+            :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <!-- 英文值 -->
-          <el-table-column prop="raw.Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Value"
+            :label="$t('dictionary:template:criterionDictionary:table:value')"
+            show-overflow-tooltip
+          >
           </el-table-column>
           <!-- 描述 -->
-          <el-table-column prop="raw.Description"
-            :label="$t('dictionary:template:criterionDictionary:table:description')" show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Description"
+            :label="$t('dictionary:template:criterionDictionary:table:description')"
+            show-overflow-tooltip
+          >
           </el-table-column>
         </el-table>
       </div>
@@ -90,10 +150,6 @@ export default {
     parentCode: {
       type: String,
       required: true
-    },
-    isCompleteConfig: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -122,7 +178,7 @@ export default {
         this.loading = false
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.getList()
-      }).catch(() => { this.loading = false })
+      }).catch(() => {this.loading = false})
     },
     toggleSelection(rows) {
       console.log(this.$refs.multipleTable)
@@ -184,7 +240,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item__content {
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

src/views/dictionary/template/email/components/EmailForm.vue

@@ -1,5 +1,12 @@
 <template>
-  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
+  <el-form
+    ref="emailForm"
+    v-loading="loading"
+    :model="form"
+    label-width="180px"
+    size="small"
+    :rules="rules"
+  >
     <el-row>
       <el-col :span="24">
         <!-- Code -->
@@ -22,7 +29,12 @@
       <el-col :span="12">
         <!-- 邮件延时发送s数 -->
         <el-form-item :label="$t('dictionary:email:label:emailDelaySeconds')" prop="EmailDelaySeconds">
-          <el-input v-model.number="form.EmailDelaySeconds" style="width: 300px" type="number" clearable>
+          <el-input
+            v-model.number="form.EmailDelaySeconds"
+            style="width: 300px"
+            type="number"
+            clearable
+          >
           </el-input>
         </el-form-item>
       </el-col>
@@ -30,8 +42,12 @@
         <!-- 业务层级 -->
         <el-form-item :label="$t('dictionary:email:label:businessLevel')" prop="BusinessLevelEnum">
           <el-select v-model="form.BusinessLevelEnum" clearable class="mr">
-            <el-option v-for="item of $d.BusinessLevel" :key="`BusinessLevel${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.BusinessLevel"
+              :key="`BusinessLevel${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -39,8 +55,12 @@
         <!-- 业务模块 -->
         <el-form-item :label="$t('dictionary:email:label:businessModule')" prop="BusinessModuleEnum">
           <el-select v-model="form.BusinessModuleEnum" clearable class="mr">
-            <el-option v-for="item of $d.BusinessModule" :key="`BusinessModule${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :key="`BusinessModule${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -48,46 +68,80 @@
         <!-- 业务场景 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
           <el-select v-model="form.BusinessScenarioEnum" clearable class="mr">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label" :value="item.value" />
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="`BusinessScenarioEnum${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 收件人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of $d.UserType" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.ToUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 抄送人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:copyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of $d.UserType" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.CopyUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="`CopyUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 加急状态 -->
         <el-form-item :label="$t('dictionary:email:label:IsUrgent')" prop="EmailUrgentEnum">
-          <el-select v-model="form.EmailUrgentEnum" @change="
-            (v) => {
-              v === 1 ? (form.EmailCron = null) : null
-            }
-          " clearable class="mr">
-            <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.EmailUrgentEnum"
+            @change="
+              (v) => {
+                v === 1 ? (form.EmailCron = null) : null
+              }
+            "
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :key="`EmailUrgent${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 发送周期和时间 -->
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1"
-          prop="EmailCron">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailCron')"
+          v-if="form.EmailUrgentEnum !== 1"
+          prop="EmailCron"
+        >
           <el-input style="width: 300px" readonly v-model="form.EmailCron" />
           <!-- 生成 cron -->
           <el-button type="primary" @click="showDialog"> {{ $t('dictionary:email:button:cron') }} </el-button>
@@ -97,8 +151,12 @@
         <!-- 是否需要回执 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsReturnRequired${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -106,30 +164,48 @@
         <!-- 是否自动发送 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsAutoSend${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="systemLevel">
         <!-- 是否区分标准 -->
         <el-form-item :label="$t('dictionary:email:button:isDistinguishCriteria')" prop="IsDistinguishCriteria">
-          <el-radio-group v-model="form.IsDistinguishCriteria" @change="
-            () => {
-              form.CriterionTypeEnum = null
-            }
-          ">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsDistinguishCriteria${item.value}`">{{
-              item.label }}</el-radio>
+          <el-radio-group
+            v-model="form.IsDistinguishCriteria"
+            @change="
+              () => {
+                form.CriterionTypeEnum = null
+              }
+            "
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsDistinguishCriteria${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="form.IsDistinguishCriteria"
-          prop="CriterionTypeList">
-          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
-            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:auditRecord:table:criterion')"
+          v-if="form.IsDistinguishCriteria"
+          prop="CriterionTypeEnum"
+        >
+          <el-select v-model="form.CriterionTypeEnum" clearable class="mr">
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="`CriterionType${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -137,65 +213,106 @@
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsEnable${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（CN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :limit="1"
-            :file-list="fileListCN">
-            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{ $t('common:button:upload')
-            }}</el-button>
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadCN"
+            :http-request="handleUploadFileCN"
+            :on-preview="handlePreviewCN"
+            :on-remove="handleRemoveFileCN"
+            :show-file-list="true"
+            :limit="1"
+            :file-list="fileListCN"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListCN.length > 0"
+              >{{ $t('common:button:upload') }}</el-button
+            >
           </el-upload>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（EN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :limit="1"
-            :file-list="fileListEN">
-            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{ $t('common:button:upload')
-            }}</el-button>
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadEN"
+            :http-request="handleUploadFileEN"
+            :on-preview="handlePreviewEN"
+            :on-remove="handleRemoveFileEN"
+            :show-file-list="true"
+            :limit="1"
+            :file-list="fileListEN"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListEN.length > 0"
+              >{{ $t('common:button:upload') }}</el-button
+            >
           </el-upload>
         </el-form-item>
       </el-col>
     </el-row>
     <!-- 邮件内容模版（CN） -->
-    <el-form-item :label="$t('dictionary:email:label:emailHtmlContentCN')" prop="EmailHtmlContentCN"
-      style="position: relative">
-      <div class="html_temp">
-        <prism-editor class="my-editor" v-model="form.EmailHtmlContentCN" :highlight="highlighter" :line-numbers="true"
-          style="width: 50%;max-height: 500px;"></prism-editor>
-        <div v-html="form.EmailHtmlContentCN" style="width: 50%;"></div>
-      </div>
-      <!-- <el-input v-model="form.EmailHtmlContentCN" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
+    <el-form-item
+      :label="$t('dictionary:email:label:emailHtmlContentCN')"
+      prop="EmailHtmlContentCN"
+      style="position: relative"
+    >
+      <el-input
+        v-model="form.EmailHtmlContentCN"
+        type="textarea"
+        :autosize="{ minRows: 8, maxRows: 8 }"
+      />
+      <el-button
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
+        type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px">
+        style="position: absolute; left: -50px; top: 30px"
+      >
         {{ $t('common:button:preview') }}
-      </el-button> -->
+      </el-button>
     </el-form-item>
     <!-- 邮件内容模版（EN） -->
-    <el-form-item :label="$t('dictionary:email:label:emailHtmlContent')" prop="EmailHtmlContent"
-      style="position: relative">
-      <div class="html_temp">
-        <prism-editor class="my-editor" v-model="form.EmailHtmlContent" :highlight="highlighter" :line-numbers="true"
-          style="width: 50%;max-height: 500px;"></prism-editor>
-        <div v-html="form.EmailHtmlContent" style="width: 50%;"></div>
-      </div>
-      <!-- <el-input v-model="form.EmailHtmlContent" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
+    <el-form-item
+      :label="$t('dictionary:email:label:emailHtmlContent')"
+      prop="EmailHtmlContent"
+      style="position: relative"
+    >
+      <el-input
+        v-model="form.EmailHtmlContent"
+        type="textarea"
+        :autosize="{ minRows: 8, maxRows: 8 }"
+      />
+      <el-button
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
+        type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px">
+        style="position: absolute; left: -50px; top: 30px"
+      >
         {{ $t('common:button:preview') }}
-      </el-button> -->
+      </el-button>
     </el-form-item>
-    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
       <el-form-item style="text-align: right">
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
@@ -204,7 +321,12 @@
     </div>
     <!-- 生成 cron -->
     <el-dialog append-to-body :title="$t('dictionary:email:button:cron')" :visible.sync="showCron">
-      <vcrontab :hideComponent="['year']" @hide="showCron = false" @fill="crontabFill" :expression="expression">
+      <vcrontab
+        :hideComponent="['year']"
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      >
       </vcrontab>
     </el-dialog>
   </el-form>
@@ -212,14 +334,6 @@
 <script>
 import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
 import vcrontab from 'vcrontab'
-
-import { PrismEditor } from 'vue-prism-editor';
-import 'vue-prism-editor/dist/prismeditor.min.css';
-import { highlight, languages } from 'prismjs/components/prism-core';
-import 'prismjs/components/prism-clike';
-import 'prismjs/components/prism-javascript';
-import 'prismjs/themes/prism.css';
-
 export default {
   props: {
     data: {
@@ -241,7 +355,7 @@ export default {
       },
     },
   },
-  components: { vcrontab, PrismEditor },
+  components: { vcrontab },
   data() {
     return {
       expression: '',
@@ -271,7 +385,6 @@ export default {
         IsAutoSend: true,
         CriterionTypeEnum: null,
         EmailDelaySeconds: null,
-        CriterionTypeList: []
       },
       rules: {
         Code: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
@@ -302,8 +415,8 @@ export default {
         EmailHtmlContent: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
-        CriterionTypeList: [
-          { required: true, type: 'array', message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        CriterionTypeEnum: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
       },
       scenarioOption: [],
@@ -327,9 +440,6 @@ export default {
     }
   },
   methods: {
-    highlighter(code) {
-      return highlight(code, languages.js);
-    },
     showDialog() {
       this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
       this.showCron = true
@@ -453,13 +563,3 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped>
-.html_temp {
-  display: flex;
-
-  .my-editor {
-    border: 1px solid #333;
-  }
-
-}
-</style>

src/views/dictionary/template/email/components/EmailList.vue

@@ -67,26 +67,20 @@
           <el-button type="primary" @click="handleAdd">
             {{ $t('common:button:new') }}
           </el-button>
-          <el-button type="primary" @click="openDrawer" :disabled="multipleSelection.length <= 0">
-            {{ $t('trials:emailManageCfg:button:batchAudit') }}
-          </el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 受试者列表 -->
     <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100" style="width: 100%"
-      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="index" width="40" /> -->
-      <el-table-column type="selection" width="55">
-      </el-table-column>
+      @sort-change="handleSortByColumn">
+      <el-table-column type="index" width="40" />
       <!-- Code -->
       <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
         show-overflow-tooltip min-width="100" />
       <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
         :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
-          {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
-          : ''}}
+          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
@@ -255,76 +249,12 @@
         </div>
       </div>
     </el-dialog>
-    <el-drawer :title="$t('trials:emailManageCfg:title:audit')" :visible.sync="drawer" direction="rtl" size="80%">
-      <!-- <div style="width: 800px">
-        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
-          <el-form-item :label="$t('il8n:search:keyword')">
-            <el-input v-model="key" @input="keyChange" />
-          </el-form-item>
-          <el-form-item :label="$t('il8n:search:state')">
-            <el-select v-model="State" clearable filterable @change="handleStateChange">
-              <el-option v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div> -->
-      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
-        @sort-change="handleSortByColumnDrawer">
-        <!-- Code -->
-        <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
-          show-overflow-tooltip min-width="100" />
-        <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
-          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
-          <template slot-scope="scope">
-            {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
-          </template>
-        </el-table-column>
-        <!-- 邮件主题（中文） -->
-        <el-table-column prop="EmailTopicCN" :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom"
-          show-overflow-tooltip min-width="160">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.EmailTopicCN" @input="
-              (e) => {
-                $set(scope.row, 'EmailTopicCN', e)
-              }
-            " size="mini"></el-input>
-          </template>
-        </el-table-column>
-        <!-- 邮件主题（英文） -->
-        <el-table-column prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
-          show-overflow-tooltip min-width="160">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.EmailTopic" @input="
-              (e) => {
-                $set(scope.row, 'EmailTopic', e)
-              }
-            " size="mini"></el-input>
-          </template>
-        </el-table-column>
-        <!-- 业务层级 -->
-        <el-table-column prop="BusinessLevelEnum" :label="$t('dictionary:email:label:businessLevel')" sortable="custom"
-          show-overflow-tooltip min-width="150">
-          <template slot-scope="scope">
-            {{ $fd('BusinessLevel', scope.row.BusinessLevelEnum) }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button size="mini" type="primary" @click="handleSave">{{
-          $t('common:button:save')
-        }}</el-button>
-      </div>
-    </el-drawer>
   </box-content>
 </template>
 <script>
 import {
   getEmailNoticeConfigList,
   deleteEmailNoticeConfig,
-  batchUpdateEmail
 } from '@/api/dictionary'
 import { GetEmailNoticeConfigList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
@@ -378,9 +308,6 @@ export default {
       previewVisible: false,
       previewHTML: null,
       previewHTMLEN: null,
-      multipleSelection: [],
-      drawer: false,
-      tableData: []
     }
   },
   computed: {
@@ -398,50 +325,6 @@ export default {
     this.getList()
   },
   methods: {
-    async handleSave() {
-      try {
-        let arr = []
-        this.tableData.forEach(item => {
-          let obj = {
-            EmailTopic: item.EmailTopic,
-            EmailTopicCN: item.EmailTopicCN,
-            Id: item.Id
-          }
-          arr.push(obj)
-        })
-        this.drawer = false
-        let res = await batchUpdateEmail(arr)
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('trials:emailManageCfg:message:auditSuccess'))
-          this.getList()
-        }
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    // 排序
-    handleSortByColumnDrawer(column) {
-      if (column.order === 'ascending') {
-        this.tableData.sort((a, b) =>
-          a[column.prop].localeCompare(b[column.prop])
-        )
-      } else {
-        this.tableData.sort((a, b) =>
-          b[column.prop].localeCompare(a[column.prop])
-        )
-      }
-    },
-    openDrawer() {
-      this.tableData = []
-      this.multipleSelection.forEach(item => {
-        let obj = Object.assign({}, item)
-        this.tableData.push(obj)
-      })
-      this.drawer = true
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     // 获取受试者列表
     getList() {
       this.loading = true

src/views/dictionary/template/sign/components/SceneConfigForm.vue

@@ -14,7 +14,7 @@
       <el-form-item :label="$t('dictionary:sign:label:sceneType')" prop="Name">
         <el-input v-model="form.Name" />
       </el-form-item>
-      <el-form-item label="$t('dictionary:sign:label:value')" prop="Value">
+      <el-form-item :label="$t('dictionary:sign:label:value')" prop="Value">
         <el-input v-model="form.Value" type="textarea" rows="5" />
       </el-form-item>
       <el-form-item :label="$t('dictionary:sign:label:valueCN')" prop="ValueCN">

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -62,9 +62,8 @@
         <!-- 用户类型 -->
         <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc">
           <el-select v-model="searchData.UserTypeId" clearable filterable style="width: 120px">
-            <el-option v-for="item of userTypeOptions"
-              v-show="isSystem || (item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27)" :key="item.Id"
-              :label="item.UserTypeShortName" :value="item.Id">
+            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27"
+              :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
               <span>{{ item.UserType }}</span>
             </el-option>
           </el-select>

src/views/trials/trials-panel/attachments/reReading-tracking/index.vue

@@ -6,8 +6,12 @@
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:reviewAssign:readingTask:table:siteCode')">
           <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
-            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-              :value="item.TrialSiteId" />
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteCode"
+              :value="item.TrialSiteId"
+            />
           </el-select>
         </el-form-item>
         <!-- 受试者编号 -->
@@ -16,47 +20,51 @@
         </el-form-item>
         <!-- 访视/阅片期名称 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:visitName')">
-          <el-input v-model="searchData.TaskName" style="width:100px;" clearable />
+          <el-input
+            v-model="searchData.TaskName"
+            style="width:100px;"
+            clearable
+          />
         </el-form-item>
         <!-- 阅片人 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:reader')">
           <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
-            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId"
-              :value="item.DoctorUserId" :label="item.UserName" />
+            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="item.UserName" />
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:isUrgent')">
           <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 任务状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskStatus')">
           <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 任务类型 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskType')">
           <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分配状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignStatus')">
           <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label"
-              :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分配时间 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignTime')">
-          <el-date-picker v-model="timeList" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" />
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+          />
         </el-form-item>
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -69,117 +77,180 @@
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
-        @sort-change="handleSortChange">
-        <el-table-column prop="OriginalReReadingTask.IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
-          show-overflow-tooltip min-width="100" sortable="custom">
+      <el-table
+        v-adaptive="{bottomOffset:60}"
+        v-loading="loading"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortChange"
+      >
+        <el-table-column
+          prop="OriginalReReadingTask.IsUrgent"
+          :label="$t('trials:consistencyCheck:table:isUrgent')"
+          show-overflow-tooltip
+          min-width="100"
+          sortable="custom"
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo',
-              scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 任务编号 -->
-        <el-table-column prop="OriginalReReadingTask.TaskCode" :label="$t('trials:readTask:table:taskCode')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskCode"
+          :label="$t('trials:readTask:table:taskCode')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 中心编号 -->
-        <el-table-column prop="OriginalReReadingTask.TrialSiteCode" :label="$t('trials:readTask:table:siteCode')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TrialSiteCode"
+          :label="$t('trials:readTask:table:siteCode')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 受试者编号 -->
-        <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:readTask:table:subjectCode')"
-          min-width="120" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.SubjectCode"
+          :label="$t('trials:readTask:table:subjectCode')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 访视/阅片期名称 -->
-        <el-table-column prop="OriginalReReadingTask.TaskName"
-          :label="$t('trials:reviewAssign:readingTask:table:visitName')" min-width="160" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskName"
+          :label="$t('trials:reviewAssign:readingTask:table:visitName')"
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 盲态任务标识 -->
-        <el-table-column prop="OriginalReReadingTask.TaskBlindName"
-          :label="$t('trials:reviewAssign:readingTask:table:blindName')" min-width="140" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskBlindName"
+          :label="$t('trials:reviewAssign:readingTask:table:blindName')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 任务创建时间 -->
-        <el-table-column prop="OriginalReReadingTask.CreateTime"
-          :label="$t('trials:reviewAssign:readingTask:table:createTime')" min-width="140" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.CreateTime"
+          :label="$t('trials:reviewAssign:readingTask:table:createTime')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 任务状态 -->
-        <el-table-column prop="OriginalReReadingTask.TaskState"
-          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.TaskState"
+          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 任务类型 -->
-        <el-table-column prop="OriginalReReadingTask.ReadingCategory"
-          :label="$t('trials:reviewAssign:readingTask:table:taskType')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.ReadingCategory"
+          :label="$t('trials:reviewAssign:readingTask:table:taskType')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{
-              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
-              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
-              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{
-              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 角色 -->
-        <el-table-column prop="OriginalReReadingTask.ArmEnum" :label="$t('trials:reviewAssign:readingTask:table:role')"
-          min-width="80" sortable="custom" show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.ArmEnum"
+          :label="$t('trials:reviewAssign:readingTask:table:role')"
+          min-width="80"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 阅片人 -->
-        <el-table-column prop="OriginalReReadingTask.UserName"
-          :label="$t('trials:reviewAssign:readingTask:table:reader')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.UserName"
+          :label="$t('trials:reviewAssign:readingTask:table:reader')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             {{ scope.row.OriginalReReadingTask.UserName }}({{ scope.row.OriginalReReadingTask.FullName }})
           </template>
         </el-table-column>
         <!-- 阅片完成时间 -->
-        <el-table-column prop="OriginalReReadingTask.SignTime" :label="$t('trials:reviewTrack:table:signTime')"
-          min-width="180" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.SignTime"
+          :label="$t('trials:reviewTrack:table:signTime')"
+          min-width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 重阅申请类型 -->
-        <el-table-column prop="OriginalReReadingTask.RequestReReadingType"
-          :label="$t('trials:rereadTask:table:requestReReadingType')" min-width="140" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.RequestReReadingType"
+          :label="$t('trials:rereadTask:table:requestReReadingType')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <div v-if="scope.row.RequestReReadingType">
-              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType',
-                scope.row.RequestReReadingType) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
               <el-tag v-else type="primary">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
             </div>
           </template>
         </el-table-column>
         <!-- 申请时间 -->
-        <el-table-column prop="RequestReReadingTime" :label="$t('trials:rereadTask:table:requestReReadingTime')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="RequestReReadingTime"
+          :label="$t('trials:rereadTask:table:requestReReadingTime')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 申请原因 -->
-        <el-table-column prop="RequestReReadingReason" :label="$t('trials:rereadTask:table:requestReReadingReason')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="RequestReReadingReason"
+          :label="$t('trials:rereadTask:table:requestReReadingReason')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 审批结果 -->
-        <el-table-column prop="AllocateTime" :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
-          min-width="100" sortable="custom" show-overflow-tooltip>
+        <el-table-column
+          prop="AllocateTime"
+          :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <div v-if="scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingResultEnum === 0">
               <el-tooltip v-if="scope.row.RequestReReadingResultEnum === 2" class="item" effect="dark" placement="top">
@@ -188,217 +259,90 @@
                 </div>
                 <el-tag type="danger">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
               </el-tooltip>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult',
-                scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult',
-                scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
             </div>
           </template>
         </el-table-column>
         <!-- 新任务编号 -->
-        <el-table-column prop="ReReadingNewTaskCode" :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
-          min-width="120" sortable="custom" show-overflow-tooltip />
-        <el-table-column v-if="hasPermi(['role:spm'])" fixed="right" :label="$t('common:action:action')" width="210">
+        <el-table-column
+          prop="ReReadingNewTaskCode"
+          :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          v-if="hasPermi(['role:spm'])"
+          fixed="right"
+          :label="$t('common:action:action')"
+          width="210"
+        >
           <template slot-scope="scope">
             <!-- 同意 -->
-            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-check" circle :title="$t('trials:spmAudit:button:agree')"
-              @click="openReReadingOrBackList(scope.row, 1)" /> -->
+            <el-button
+              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-check"
+              circle
+              :title="$t('trials:spmAudit:button:agree')"
+              @click="openReReadingOrBackList(scope.row,1)"
+            />
             <!-- 拒绝 -->
-            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-close" circle :title="$t('trials:spmAudit:button:reject')"
-              @click="confirmReReading(scope.row, 2, true)" /> -->
-            <el-button :disabled="!!scope.row.RequestReReadingResultEnum ||
-              scope.row.RequestReReadingType === 1
-              " icon="el-icon-edit-outline" circle :title="$t('trials:spmAudit:table:Approval')"
-              @click="audit(scope.row)" />
+            <el-button
+              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-close"
+              circle
+              :title="$t('trials:spmAudit:button:reject')"
+              @click="confirmReReading(scope.row,2, true)"
+            />
             <!-- 已影响任务列表 -->
-            <el-button :disabled="scope.row.RequestReReadingResultEnum !== 1" icon="el-icon-document-copy" circle
-              :title="$t('trials:spmAudit:button:influenceList')" @click="getInfluencedTaskList(scope.row)" />
+            <el-button
+              :disabled="scope.row.RequestReReadingResultEnum !== 1"
+              icon="el-icon-document-copy"
+              circle
+              :title="$t('trials:spmAudit:button:influenceList')"
+              @click="getInfluencedTaskList(scope.row)"
+            />
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        @pagination="getList" />
-      <base-model v-if="config.visible" :config="config">
-        <template slot="dialog-body">
-          <el-form ref="imageBackform" :model="form" class="demo-form-inline" :rules="rules"
-            :label-width="isEN ? '200px' : '150px'">
-            <el-form-item :label="$t('trials:spmAudit:table:Matters')" prop="Matters">
-              <span>{{ rowData.title }}</span>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ApplyReason')" prop="ApplyReason">
-              <span>{{ rowData.RequestReReadingReason }}</span>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:IsAgree')" prop="RequestReReadingResultEnum">
-              <el-radio-group v-model="form.RequestReReadingResultEnum">
-                <el-radio :label="1">{{ $t('trials:spmAudit:button:auditYes') }}</el-radio>
-                <el-radio :label="2">{{ $t('trials:spmAudit:button:auditNo') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ResultRemark')" v-if="form.RequestReReadingResultEnum !== 2"
-              key="1">
-              <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder=""
-                v-model="form.RequestReReadingRejectReason">
-              </el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ResultRemark')" prop="RequestReReadingRejectReason" v-else
-              key="2">
-              <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder=""
-                v-model="form.RequestReReadingRejectReason">
-              </el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:reviewTrack:dialog:backImpactList')" />
-            <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height:200px;max-height: 300px">
-              <!-- 任务编号 -->
-              <el-table-column prop="TaskCode" :label="$t('trials:reviewTrack:table:taskCode')" min-width="100"
-                show-overflow-tooltip />
-              <!-- 中心编号 -->
-              <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewTrack:table:siteCode')" min-width="100"
-                show-overflow-tooltip />
-              <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewTrack:table:subjectCode')" min-width="120"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span v-if="
-                    scope.row.BlindSubjectCode &&
-                    scope.row.BlindSubjectCode !== scope.row.SubjectCode
-                  ">
-                    {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
-                  </span>
-                  <span v-else>{{ scope.row.SubjectCode }}</span>
-                </template>
-              </el-table-column>
-              <!-- 任务名称 -->
-              <el-table-column prop="VisitTaskNum" :label="$t('trials:reviewTrack:table:taskName')" min-width="120"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span v-if="
-                    scope.row.TaskBlindName &&
-                    scope.row.TaskName !== scope.row.TaskBlindName
-                  ">
-                    {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
-                  </span>
-                  <span v-else>{{ scope.row.TaskName }}</span>
-                </template>
-              </el-table-column>
-              <!-- 盲态任务标识 -->
-              <!-- <el-table-column
-              prop="TaskBlindName"
-              :label="$t('trials:reviewTrack:table:blindName')"
-              min-width="120"
-              show-overflow-tooltip
-            /> -->
-              <!-- 阅片标准 -->
-              <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:reviewTrack:table:criterionName')"
-                min-width="100" show-overflow-tooltip />
-              <!-- 任务状态 -->
-              <el-table-column prop="TaskState" :label="$t('trials:reviewTrack:table:taskStatus')" min-width="100"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.TaskState === 0" type="primary">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 1" type="info">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 3" type="danger">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 4" type="warning">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 5" type="danger">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 任务类型 -->
-              <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:reviewTrack:table:taskType')"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 阅片状态 -->
-              <el-table-column prop="ReadingTaskState" :label="$t('trials:reviewTrack:table:readingStatus')"
-                min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{
-                    $fd('ReadingTaskState', scope.row.ReadingTaskState)
-                  }}</el-tag>
-                  <el-tag v-else type="danger">{{
-                    $fd('ReadingTaskState', scope.row.ReadingTaskState)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 生效后影响 -->
-              <el-table-column prop="OptType" :label="$t('trials:reviewTrack:applyReread:title:postEffectiveImpacts')
-                " min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.OptType === 0" type="primary">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.OptType === 1" type="danger">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.OptType === 2" type="warning">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 阅片人 -->
-              <el-table-column prop="UserName" :label="$t('trials:reviewTrack:table:reader')" min-width="160"
-                show-overflow-tooltip>
-                <template v-if="scope.row.DoctorUser" slot-scope="scope">
-                  {{ scope.row.DoctorUser.UserName }}({{
-                    scope.row.DoctorUser.FullName
-                  }})
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
-        </template>
-        <template slot="dialog-footer">
-          <el-button type="primary" @click="auditImageBack" :loading="loading">
-            {{ $t('common:button:confirm') }}
-          </el-button>
-          <el-button @click="config.visible = false" :loading="loading">
-            {{ $t('common:button:cancel') }}
-          </el-button>
-        </template>
-      </base-model>
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
       <!-- 驳回  +++-->
-      <el-dialog v-if="ConfirmReReadingVisible" :title="$t('trials:spmAudit:title:rejected')"
-        :visible.sync="ConfirmReReadingVisible" width="600px" append-to-body :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        v-if="ConfirmReReadingVisible"
+        :title="$t('trials:spmAudit:title:rejected')"
+        :visible.sync="ConfirmReReadingVisible"
+        width="600px"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+      >
         <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-          <el-form ref="reasonForm" :rules="rules" :model="ConfirmReReadingForm" class="demo-ruleForm" size="small"
-            label-width="120px">
+          <el-form
+            ref="reasonForm"
+            :rules="rules"
+            :model="ConfirmReReadingForm"
+            class="demo-ruleForm"
+            size="small"
+            label-width="120px"
+          >
             <!-- 驳回原因 -->
             <el-form-item :label="$t('trials:spmAudit:title:rejectedReason')" prop="RequestReReadingRejectReason">
-              <el-input v-model="ConfirmReReadingForm.RequestReReadingRejectReason" type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4 }" :placeholder="$t('common:ruleMessage:specify')" maxlength="500"
-                show-word-limit />
+              <el-input
+                v-model="ConfirmReReadingForm.RequestReReadingRejectReason"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4}"
+                :placeholder="$t('common:ruleMessage:specify')"
+                maxlength="500"
+                show-word-limit
+              />
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
           <!-- 取消 -->
-          <el-button :disabled="btnLoading" size="small" type="primary"
-            @click="ConfirmReReadingVisible = false; ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
+          <el-button :disabled="btnLoading" size="small" type="primary" @click="ConfirmReReadingVisible = false;ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
             {{ $t('common:button:cancel') }}
           </el-button>
           <!-- 保存 -->
@@ -408,95 +352,137 @@
         </div>
       </el-dialog>
       <!-- '重阅影响任务列表' : '已影响任务列表'" +++-->
-      <el-dialog v-if="ReReadingOrBackVisible"
-        :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1') : this.$t('trials:spmAudit:title:title2')"
-        :visible.sync="ReReadingOrBackVisible" width="1460px" append-to-body :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        v-if="ReReadingOrBackVisible"
+        :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1'):this.$t('trials:spmAudit:title:title2')"
+        :visible.sync="ReReadingOrBackVisible"
+        width="1460px"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+      >
         <div class="base-dialog-body">
-          <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height: 400px;">
+          <el-table
+            v-loading="loading"
+            :data="InfluenceTaskList"
+            stripe
+            height="100"
+            style="min-height: 400px;"
+          >
             <!-- 任务编号 -->
-            <el-table-column prop="TaskCode" :label="$t('trials:readTask:table:taskCode')" min-width="100"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TaskCode"
+              :label="$t('trials:readTask:table:taskCode')"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <!-- 中心编号 -->
-            <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TrialSiteCode"
+              :label="$t('trials:readTask:table:siteCode')"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <!-- 受试者编号 -->
-            <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="SubjectCode"
+              :label="$t('trials:readTask:table:subjectCode')"
+              min-width="120"
+              show-overflow-tooltip
+            />
             <!-- 访视/阅片期名称 -->
-            <el-table-column prop="VisitTaskNum" :label="$t('trials:consistencyCheck:table:visitName')" min-width="140"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="VisitTaskNum"
+              :label="$t('trials:consistencyCheck:table:visitName')"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.TaskName }}
               </template>
             </el-table-column>
             <!-- 盲态任务标识 -->
-            <el-table-column prop="TaskBlindName" :label="$t('trials:readTask:table:blindName')" min-width="120"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TaskBlindName"
+              :label="$t('trials:readTask:table:blindName')"
+              min-width="120"
+              show-overflow-tooltip
+            />
             <!-- 阅片标准 -->
-            <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readTask:table:criterionName')"
-              min-width="100" show-overflow-tooltip />
+            <el-table-column
+              prop="TrialReadingCriterionName"
+              :label="$t('trials:readTask:table:criterionName')"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <!-- 任务状态 -->
-            <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="TaskState"
+              :label="$t('trials:readTask:table:taskState')"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 任务类型 -->
-            <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:readTask:table:readingCategory')"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="ReadingCategory"
+              min-width="100"
+              :label="$t('trials:readTask:table:readingCategory')"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 阅片状态 -->
-            <el-table-column prop="ReadingTaskState" :label="$t('trials:readTask:table:readingTaskState')"
-              min-width="100" show-overflow-tooltip>
+            <el-table-column
+              prop="ReadingTaskState"
+              :label="$t('trials:readTask:table:readingTaskState')"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState',
-                  scope.row.ReadingTaskState) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
                 <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 生效后影响 -->
-            <el-table-column prop="OptType" :label="$t('trials:readTask:table:optType')" min-width="100"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="OptType"
+              :label="$t('trials:readTask:table:optType')"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType',
-                  scope.row.OptType) }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
-                }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType',
-                  scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 阅片人 -->
-            <el-table-column prop="UserName" :label="$t('trials:readTask:table:reader')" min-width="160"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="UserName"
+              :label="$t('trials:readTask:table:reader')"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template v-if="scope.row.DoctorUser" slot-scope="scope">
                 {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
               </template>
             </el-table-column>
           </el-table>
         </div>
-        <div v-if="opentype === 'read'" slot="footer" class="dialog-footer">
+        <div v-if="opentype==='read'" slot="footer" class="dialog-footer">
           <!-- 取消 -->
           <el-button :disabled="btnLoading" size="small" type="primary" @click="ReReadingOrBackVisible = false">
             {{ $t('common:button:cancel') }}
@@ -507,11 +493,16 @@
           </el-button>
         </div>
       </el-dialog>
-      <el-dialog :destroy-on-close="true" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        :destroy-on-close="true"
+        :visible.sync="signVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        custom-class="base-dialog-wrapper"
+      >
         <div slot="title">
           <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-          <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
+          <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
         </div>
         <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
       </el-dialog>
@@ -527,7 +518,7 @@ import { getToken } from '@/utils/auth'
 import { changeURLStatic } from '@/utils/history.js'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
-import baseModel from '@/components/BaseModel'
+
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -551,7 +542,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, SignForm, baseModel },
+  components: { BaseContainer, Pagination, SignForm },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -602,40 +593,9 @@ export default {
       readVisible: false,
       TaskOptType: null,
       OtherInfo: null,
-      ReadingType: null,
-      config: {
-        visible: false,
-        title: this.$t("trials:spmAudit:confirmMessage:imageBack"),
-        width: '1000px',
-        appendToBody: true,
-      },
-      form: {
-        RequestReReadingResultEnum: null,
-        RequestReReadingRejectReason: null
-      },
-      rules: {
-        RequestReReadingResultEnum: [
-          {
-            required: true,
-            message: this.$t('common:ruleMessage:select'),
-            trigger: ['blur', 'change'],
-          },
-        ],
-        RequestReReadingRejectReason: [
-          {
-            required: true,
-            message: this.$t('common:ruleMessage:specify'),
-            trigger: ['blur', 'change'],
-          },
-        ]
-      }
+      ReadingType: null
     }
   },
-  computed: {
-    isEN() {
-      return this.$i18n.locale !== 'zh'
-    },
-  },
   mounted() {
     if (this.$route.query.SiteId) {
       this.searchData.TrialSiteId = this.$route.query.SiteId
@@ -652,39 +612,6 @@ export default {
     this.getDoctorUserSelectList()
   },
   methods: {
-    async auditImageBack() {
-      try {
-        console.log(this.form)
-        let validate = await this.$refs.imageBackform.validate()
-        if (!validate) return false
-        this.confirmSign(this.form.RequestReReadingResultEnum)
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    async audit(row) {
-      try {
-        this.rowData = Object.assign({}, row)
-        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:spmAudit:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
-        Object.keys(this.form).forEach(key => {
-          this.form[key] = null
-        })
-        this.loading = true
-        let res = await getReReadingOrBackInfluenceTaskList(
-          row.OriginalReReadingTaskId,
-          true,
-          row.Id
-        )
-        if (res.IsSuccess) {
-          this.InfluenceTaskList = res.Result
-          this.config.visible = true
-          this.loading = false
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
-    },
     getInfluencedTaskList(row) {
       this.loading = true
       this.opentype = 'look'
@@ -736,7 +663,7 @@ export default {
         return
       }
       if (type === 2) {
-        this.$refs.imageBackform.validate((valid) => {
+        this.$refs.reasonForm.validate((valid) => {
           if (!valid) return
           var params = {
             data: {
@@ -748,7 +675,7 @@ export default {
                   NewReReadingTaskId: row.NewReReadingTaskId
                 }
               ],
-              RequestReReadingRejectReason: this.form.RequestReReadingRejectReason,
+              RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
               TrialId: this.$route.query.trialId,
               RequestReReadingResultEnum: type
             },
@@ -761,7 +688,7 @@ export default {
             this.btnLoading = false
             this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
             this.getList()
-            this.config.visible = false
+            this.ConfirmReReadingVisible = false
             this.$refs['signForm'].btnLoading = false
             this.signVisible = false
           }).catch(() => {
@@ -793,7 +720,7 @@ export default {
         this.loading = false
         this.btnLoading = false
         this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
-        this.config.visible = false
+        this.ReReadingOrBackVisible = false
         this.$refs['signForm'].btnLoading = false
         this.signVisible = false
         this.getList()
@@ -860,25 +787,22 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .hidden-row {
+::v-deep .hidden-row{
   display: none;
 }
-
 ::v-deep .el-dialog__body {
   padding: 15px 20px;
 }
 
 ::v-deep .el-tag--danger.el-tag--dark {
   // background-color: #f56c6c!important;
-  border-color: none !important;
+  border-color: none!important;
   // color: #fff!important;
 }
-
-::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
+::v-deep #TaskAllocationRuleList thead .el-checkbox__inner{
   display: none;
 }
-
-::v-deep .el-descriptions-item__label.has-colon:after {
+::v-deep .el-descriptions-item__label.has-colon:after{
   display: none;
 }
 </style>

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -130,12 +130,10 @@
       <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName"
         :trial-id="trialId" @closeDialog="closeSignDialog" />
     </el-dialog>
-    <attachmentList2 v-if="config.visible && !currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      :TrialDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
-    <attachmentList v-if="config.visible && currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      :SystemDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
-    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="!currentRow.IsSystemDoc"
-      :visible.sync="perview_visible" :isView="true" v-if="perview_visible" />
+    <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :SystemDocumentId="SystemDocumentId"
+      :isView="true" @getList="getList" />
+    <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
+      v-if="perview_visible" />
   </BaseContainer>
 </template>
 <script>
@@ -147,7 +145,6 @@ import SignForm from './components/SignForm'
 import store from '@/store'
 import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 import attachmentList from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentList'
-import attachmentList2 from '@/views/trials/trials-panel/setting/attachment/components/attachmentList'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
@@ -161,7 +158,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialAttachments',
-  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList, attachmentList2 },
+  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -183,7 +180,7 @@ export default {
       currentUser: zzSessionStorage.getItem('userName'),
       typeOptions: [],
       trialId: this.$route.query.trialId,
-      TrialDocumentId: null,
+      SystemDocumentId: null,
       perview_visible: null,
       config: {
         visible: false,
@@ -208,7 +205,7 @@ export default {
   methods: {
     openAttachment(row, isList = false) {
       if (!row.AttachmentCount) return false
-      this.TrialDocumentId = row.Id
+      this.SystemDocumentId = row.Id
       this.currentRow = { ...row }
       if (!isList) {
         this.perview_visible = true

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -12,18 +12,35 @@
 
     <template slot="main-container">
       <!-- 入组医生列表 -->
-      <el-table ref="myTable" v-loading="listLoading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe height="100"
-        @sort-change="handleSortByColumn">
-        <el-table-column type="index" width="40" fixed />
+      <el-table
+        ref="myTable"
+        v-loading="listLoading"
+        v-adaptive="{ bottomOffset: 55 }"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortByColumn"
+      >
+        <el-table-column type="index" width="40" />
         <!-- Name -->
-        <el-table-column :label="$t('trials:enrolledReviews:table:name')" show-overflow-tooltip fixed width="150"
-          prop="FirstName" sortable="custom" v-if="!hasPermi(['role:ea'])">
+        <el-table-column
+          :label="$t('trials:enrolledReviews:table:name')"
+          show-overflow-tooltip
+          width="150"
+          prop="FirstName"
+          sortable="custom"
+          v-if="!hasPermi(['role:ea'])"
+        >
           <template slot-scope="scope">
-            <el-button type="text" @click="
-              go(
-                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
-              )
-              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <el-button
+              type="text"
+              @click="
+                go(
+                  `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
+                )
+              "
+              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button
+            >
           </template>
         </el-table-column>
         <!-- Name CN -->
@@ -36,11 +53,21 @@
           show-overflow-tooltip
         /> -->
         <!-- 用户名 -->
-        <el-table-column prop="UserName" :label="$t('trials:enrolledReviews:table:userName')"
-          :width="hasPermi(['role:ea']) ? 300 : 150" sortable="custom" show-overflow-tooltip fixed />
+        <el-table-column
+          prop="UserName"
+          :label="$t('trials:enrolledReviews:table:userName')"
+          :width="hasPermi(['role:ea']) ? 300 : 150"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 入组时间 -->
-        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          :width="hasPermi(['role:ea']) ? 320 : 130" sortable="custom" show-overflow-tooltip fixed>
+        <el-table-column
+          prop="EnrollTimeStr"
+          :label="$t('trials:enrolledReviews:table:enrollmentTime')"
+          :width="hasPermi(['role:ea']) ? 320 : 130"
+          sortable="custom"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             {{
               scope.row.EnrollTime
@@ -49,39 +76,64 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:status')" width="200"
-          sortable="custom" fixed>
+        <el-table-column
+          prop="EnrollTimeStr"
+          :label="$t('trials:enrolledReviews:table:status')"
+          width="200"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <div>
-              <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-                :active-text="$fd('IsEnable', true)" :inactive-text="$fd('IsEnable', false)" @change="
+              <el-switch
+                v-model="scope.row.IsEnable"
+                :active-value="true"
+                :inactive-value="false"
+                :active-text="$fd('IsEnable', true)"
+                :inactive-text="$fd('IsEnable', false)"
+                @change="
                   (v) => {
                     return isEnableChange(scope.row, v)
                   }
-                " :disabled="!hasPermi([
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ])
-                  " />
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
+              />
               <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-for="ite of TrialReadingCriterionList" :key="ite.TrialReadingCriterionName"
-          :label="ite.TrialReadingCriterionName" width="360" header-align="center" show-overflow-tooltip>
-          <el-table-column :label="$t('trials:enrolledReviews:table:readingType')" width="300">
+        <el-table-column
+          v-for="ite of TrialReadingCriterionList"
+          :key="ite.TrialReadingCriterionName"
+          :label="ite.TrialReadingCriterionName"
+          width="360"
+          header-align="center"
+          show-overflow-tooltip
+        >
+          <el-table-column
+            :label="$t('trials:enrolledReviews:table:readingType')"
+            width="300"
+          >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find((v) => {
-                return (
-                  v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                )
-              })
-                ? scope.row.CriterionCategoryList.find((v) => {
+              <span
+                v-for="item of scope.row.CriterionCategoryList.find((v) => {
                   return (
-                    v.TrialReadingCriterionId ===
-                    ite.TrialReadingCriterionId
+                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                   )
-                }).ReadingCategorys
-                : []" :key="item.TrialReadingCriterionId" style="margin: 5px 5px 5px 0">
+                })
+                  ? scope.row.CriterionCategoryList.find((v) => {
+                      return (
+                        v.TrialReadingCriterionId ===
+                        ite.TrialReadingCriterionId
+                      )
+                    }).ReadingCategorys
+                  : []"
+                :key="item.TrialReadingCriterionId"
+                style="margin: 5px 5px 5px 0"
+              >
                 <el-tag v-if="item === 1" type="primary">{{
                   $fd('ReadingCategory', item) +
                   ' & ' +
@@ -95,101 +147,152 @@
                   $fd('ReadingCategory', item)
                 }}</el-tag>
               </span>
-              <el-button v-hasPermi="[
-                'trials:trials-panel:enrolled-reviewers:list:edit',
-              ]" type="text" @click="
-                openSetEnrollReadingCategory(
-                  scope.row,
-                  ite.TrialReadingCriterionId
-                )
-                ">
+              <el-button
+                v-hasPermi="[
+                  'trials:trials-panel:enrolled-reviewers:list:edit',
+                ]"
+                type="text"
+                @click="
+                  openSetEnrollReadingCategory(
+                    scope.row,
+                    ite.TrialReadingCriterionId
+                  )
+                "
+              >
                 {{ $t('trials:enrolledReviews:button:config') }}
               </el-button>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:table:consistency-analysis')" width="160"
-            show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:table:consistency-analysis')"
+            width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.CriterionCategoryList.find((v) => {
-                return (
-                  v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                )
-              }).IsJoinAnalysis
-                " :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
-                :inactive-text="$fd('YesOrNo', false)" @change="
+              <el-switch
+                v-model="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).IsJoinAnalysis
+                "
+                :active-value="true"
+                :inactive-value="false"
+                :active-text="$fd('YesOrNo', true)"
+                :inactive-text="$fd('YesOrNo', false)"
+                @change="
                   (v) => {
                     return isConsistencyChange(scope.row, ite, v, true)
                   }
-                " :disabled="!hasPermi([
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ])
-                  " />
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
+              />
               <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
               <span v-else> {{$fd('YesOrNo',false)}}</span> -->
             </template>
           </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:message:SOW')" width="160" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:message:SOW')"
+            width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <div v-if="
-                scope.row.CriterionCategoryList.find((v) => {
-                  return (
-                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                  )
-                }).StatementCriterionFileList.length > 0
-              ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">View</el-button>
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).StatementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                  >View</el-button
+                >
                 <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                 <!-- 上传 -->
-                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ]" type="text" style="margin-left: 10px" @click="
-                  addCol(
-                    0,
-                    scope.row,
-                    ite,
-                    $t('trials:enrolledReviews:message:SOW')
-                  )
-                  ">
+                <el-button
+                  v-if="ite.CriterionType === 0"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
+                  type="text"
+                  style="margin-left: 10px"
+                  @click="
+                    addCol(
+                      0,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
+                >
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:message:EQC')" width="160" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:message:EQC')"
+            width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <div v-if="
-                scope.row.CriterionCategoryList.find((v) => {
-                  return (
-                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                  )
-                }).AcknowledgementCriterionFileList.length > 0
-              ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).AcknowledgementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                >
                   View
                 </el-button>
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                 <!-- 上传 -->
-                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ]" type="text" style="margin-left: 10px" @click="
-                  addCol(
-                    1,
-                    scope.row,
-                    ite,
-                    $t('trials:enrolledReviews:message:SOW')
-                  )
-                  ">
+                <el-button
+                  v-if="ite.CriterionType === 0"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
+                  type="text"
+                  style="margin-left: 10px"
+                  @click="
+                    addCol(
+                      1,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
+                >
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:button:tackNum')" width="300" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:button:tackNum')"
+            width="300"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               <div>
                 {{
@@ -239,17 +342,31 @@
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select v-model="readingType" filterable allow-create default-first-option style="width: 70%">
+        <el-select
+          v-model="readingType"
+          filterable
+          allow-create
+          default-first-option
+          style="width: 70%"
+        >
           <el-option :value="0" label="TP&GL&AD" />
           <el-option :value="1" label="TP&GL" />
           <el-option :value="2" label="AD" />
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="readingType_model.btnLoading" type="primary" @click="readingType_model.visible = false">
+        <el-button
+          :disabled="readingType_model.btnLoading"
+          type="primary"
+          @click="readingType_model.visible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button type="primary" :loading="readingType_model.btnLoading" @click="handleUpdateReadingType">
+        <el-button
+          type="primary"
+          :loading="readingType_model.btnLoading"
+          @click="handleUpdateReadingType"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -259,28 +376,56 @@
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select v-model="ReadingCategorys" filterable allow-create multiple default-first-option style="width: 50%">
+        <el-select
+          v-model="ReadingCategorys"
+          filterable
+          allow-create
+          multiple
+          default-first-option
+          style="width: 50%"
+        >
           <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
-              " />
+            <el-option
+              v-if="item.value === 1"
+              :key="item.id"
+              :value="1"
+              :label="
+                $fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
+              "
+            />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value"
-              :label="$fd('ReadingCategory', 4)" />
+            <el-option
+              v-if="item.value === 4 && IsArbitrationReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 4)"
+            />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value"
-              :label="$fd('ReadingCategory', 5)" />
+            <el-option
+              v-if="item.value === 5 && IsOncologyReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 5)"
+            />
           </template>
         </el-select>
       </template>
       <template slot="dialog-footer">
         <div style="margin-top: 30px">
-          <el-button :disabled="readingCategory_model.btnLoading" type="primary"
-            @click="readingCategory_model.visible = false">
+          <el-button
+            :disabled="readingCategory_model.btnLoading"
+            type="primary"
+            @click="readingCategory_model.visible = false"
+          >
             {{ $t('common:button:cancel') }}
           </el-button>
-          <el-button type="primary" :loading="readingCategory_model.btnLoading" @click="handleUpdateReadingCategory">
+          <el-button
+            type="primary"
+            :loading="readingCategory_model.btnLoading"
+            @click="handleUpdateReadingCategory"
+          >
             {{ $t('common:button:save') }}
           </el-button>
         </div>
@@ -289,52 +434,112 @@
     <!-- 修改医生状态 -->
     <base-model :config="reviewerStatus_model">
       <template slot="dialog-body">
-        <el-form ref="updateStatusForm" :model="updateStatusForm" :rules="updateStatusFormrules">
-          <el-form-item :label="$t('trials:enrolledReviews:label:enrollmentStatus')" prop="Status">
+        <el-form
+          ref="updateStatusForm"
+          :model="updateStatusForm"
+          :rules="updateStatusFormrules"
+        >
+          <el-form-item
+            :label="$t('trials:enrolledReviews:label:enrollmentStatus')"
+            prop="Status"
+          >
             <el-select v-model="updateStatusForm.Status" style="width: 60%">
               <!-- 0：回退；1：出组； -->
-              <el-option v-for="item of $d.OutOrInEnrollment" :key="`OutOrInEnrollment${item.value}`"
-                :value="item.value" :label="item.label" :disabled="item.value === 0 && currentWorkload > 0" />
+              <el-option
+                v-for="item of $d.OutOrInEnrollment"
+                :key="`OutOrInEnrollment${item.value}`"
+                :value="item.value"
+                :label="item.label"
+                :disabled="item.value === 0 && currentWorkload > 0"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="updateStatusForm.Status == 1"
-            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')" prop="OutEnrollmentTime">
-            <el-date-picker v-model="updateStatusForm.OutEnrollmentTime" type="date" value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd" />
+          <el-form-item
+            v-if="updateStatusForm.Status == 1"
+            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')"
+            prop="OutEnrollmentTime"
+          >
+            <el-date-picker
+              v-model="updateStatusForm.OutEnrollmentTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+            />
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="reviewerStatus_model.btnLoading" type="primary"
-          @click="reviewerStatus_model.visible = false">
+        <el-button
+          :disabled="reviewerStatus_model.btnLoading"
+          type="primary"
+          @click="reviewerStatus_model.visible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button type="primary" :loading="reviewerStatus_model.btnLoading" @click="handleUpdateReviewerStatus">
+        <el-button
+          type="primary"
+          :loading="reviewerStatus_model.btnLoading"
+          @click="handleUpdateReviewerStatus"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
     </base-model>
     <BaseModel :config="model_cfg">
       <template slot="dialog-body">
-        <el-form ref="DictionaryTypeConfigForm" :model="form" label-width="120px" size="small">
-          <el-form-item :label="$t('trials:enrolledReviews:table:criterionName')" prop="CriterionType">
+        <el-form
+          ref="DictionaryTypeConfigForm"
+          :model="form"
+          label-width="120px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:criterionName')"
+            prop="CriterionType"
+          >
             <el-input v-model="form.CriterionName" disabled />
           </el-form-item>
-          <el-form-item :label="$t('trials:enrolledReviews:table:file')" prop="FilePath">
-            <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
-              :on-preview="handlePreview2" :on-remove="handleRemoveFile2" :show-file-list="true" accept=".pdf"
-              :limit="1" :file-list="fileList">
-              <el-button size="small" type="primary" :disabled="fileList.length > 0">{{ $t('common:button:upload')
-              }}</el-button>
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:file')"
+            prop="FilePath"
+          >
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview2"
+              :on-remove="handleRemoveFile2"
+              :show-file-list="true"
+              accept=".pdf"
+              :limit="1"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t('common:button:upload') }}</el-button
+              >
             </el-upload>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancle"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -574,7 +779,8 @@ export default {
       var fileName = param.file.name
       let file = await this.fileToBlob(param.file)
       let res = await this.OSSclient.put(
-        `/SystemData/reviewer/${this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        `/SystemData/reviewer/${
+          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
         }/${this.rowData.DoctorId}/${fileName}`,
         file
       )
@@ -683,15 +889,15 @@ export default {
         return v.TrialReadingCriterionId === TrialReadingCriterionId
       })
         ? row.CriterionCategoryList.find((v) => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        })
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
         : null
       var i = row.TrialReadingCriterionList.find((v) => {
         return v.TrialReadingCriterionId === TrialReadingCriterionId
       })
         ? row.TrialReadingCriterionList.find((v) => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        })
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
         : null
       if (i) {
         this.IsArbitrationReading = i.IsArbitrationReading
@@ -842,8 +1048,8 @@ export default {
       zzSessionStorage.setItem(
         'ReviewerName',
         this.currentClickRowData.FirstName +
-        ' ' +
-        this.currentClickRowData.LastName
+          ' ' +
+          this.currentClickRowData.LastName
       )
       this.$router.push({
         path: `/trials/trials-panel/enrolled-reviewers/stats?doctorId=${this.currentClickRowData.DoctorId}&trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}&doctorName=${this.currentClickRowData.LastName}/${this.currentClickRowData.FirstName}`,
@@ -879,7 +1085,6 @@ export default {
 <style lang="scss">
 .enroll-list {
   height: 100%;
-
   .readingCategory_model {
     .base-modal-body {
       min-height: 150px;

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
-    id="canvas"
-    ref="canvas"
-    v-loading="loading"
-    element-loading-text="Loading..."
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    style="position:relative;"
-    class="cornerstone-element"
-    @mouseup="sliderMouseup"
-    @contextmenu.prevent="onContextmenu"
-  >
+  <div id="canvas" ref="canvas" v-loading="loading" :element-loading-text="NSTip"
+    element-loading-background="rgba(0, 0, 0, 0.8)" style="position:relative;" class="cornerstone-element"
+    @mouseup="sliderMouseup" @contextmenu.prevent="onContextmenu">
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
@@ -18,46 +10,39 @@
 
     </div>
     <!-- 切换访视 -->
-    <div
-      v-if="stack.imageRendered && isReadingTaskViewInOrder === 1"
-      class="info-visit"
-      @dblclick.stop="preventDefault($event)"
-    >
-      <div
-        class="arrw_div_wrapper"
-        :style="{cursor:stack.visitTaskNum <= minVistNum?'not-allowed':'pointer',color:stack.visitTaskNum <= minVistNum?'#888':'#fff'}"
-        @click.stop.prevent="toggleSeries($event,-1)"
-        @dblclick.stop="preventDefault($event)"
-      >
+    <div v-if="stack.imageRendered && isReadingTaskViewInOrder === 1" class="info-visit"
+      @dblclick.stop="preventDefault($event)">
+      <div class="arrw_div_wrapper"
+        :style="{ cursor: stack.visitTaskNum <= minVistNum ? 'not-allowed' : 'pointer', color: stack.visitTaskNum <= minVistNum ? '#888' : '#fff' }"
+        @click.stop.prevent="toggleSeries($event, -1)" @dblclick.stop="preventDefault($event)">
         <i class="el-icon-caret-left" />
       </div>
       <div class="blind_name_wrapper">
         {{ stack.taskBlindName }}
       </div>
-      <div
-        class="arrw_div_wrapper"
-        :style="{cursor:stack.visitTaskNum >= maxVistNum?'not-allowed':'pointer',color:stack.visitTaskNum >= maxVistNum?'#888':'#fff'}"
-        @click.stop.prevent="toggleSeries($event,1)"
-        @dblclick.stop="preventDefault($event)"
-      >
+      <div class="arrw_div_wrapper"
+        :style="{ cursor: stack.visitTaskNum >= maxVistNum ? 'not-allowed' : 'pointer', color: stack.visitTaskNum >= maxVistNum ? '#888' : '#fff' }"
+        @click.stop.prevent="toggleSeries($event, 1)" @dblclick.stop="preventDefault($event)">
         <i class="el-icon-caret-right" />
       </div>
     </div>
     <div class="info-series">
-      <h2 v-if="isReadingShowSubjectInfo" style="color:#f44336;padding: 5px 0px;margin: 0;">{{ subjectCode }} {{ stack.taskBlindName }}</h2>
+      <h2 v-if="isReadingShowSubjectInfo" style="color:#f44336;padding: 5px 0px;margin: 0;">{{ subjectCode }} {{
+        stack.taskBlindName }}</h2>
       <div v-show="dicomInfo.series">Series: #{{ dicomInfo.series }}</div>
       <div>Image: #{{ dicomInfo.frame }}</div>
       <div>{{ dicomInfo.modality }}</div>
     </div>
     <div class="info-image">
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) : '' }}
       </div>
-      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div
+        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
         HU: {{ mousePosition.mo }}
       </div>
       <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
-        SUVbw(g/ml): {{ digitPlaces === -1 ?mousePosition.suv.toFixed(3) :mousePosition.suv.toFixed(digitPlaces) }}
+        SUVbw(g/ml): {{ digitPlaces === -1 ? mousePosition.suv.toFixed(3) : mousePosition.suv.toFixed(digitPlaces) }}
       </div>
       <div v-else-if="mousePosition.mo">
         Density: {{ mousePosition.mo }}
@@ -81,8 +66,12 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+    <div ref="sliderBox" class="my_slider_box"
+      style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
+      @click.stop="goViewer($event)">
+      <div :style="{ top: height + '%' }"
+        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
+        @click.stop.prevent="() => { return }" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
@@ -117,7 +106,7 @@
   </div>
 </template>
 <style>
-.my_slider_box:after{
+.my_slider_box:after {
   content: '';
   position: absolute;
   bottom: -20px;
@@ -137,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -308,7 +297,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['visitTaskList', 'currentReadingTaskState'])
+    ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
+    NSTip() {
+      return `NS: ${this.$store.state.trials.uploadTip}`
+    }
   },
   watch: {
     currentReadingTaskState: {
@@ -572,7 +564,7 @@ export default {
             type: 'warning'
           }).then(() => {
 
-          }).catch(() => {})
+          }).catch(() => { })
           e.stopImmediatePropagation()
           e.stopPropagation()
           e.preventDefault()
@@ -1111,7 +1103,7 @@ export default {
         var frame = imageInfo.frame
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
-        
+
         const element = this.$refs.canvas
         cornerstone.enable(element)
         element.tabIndex = 0
@@ -1134,7 +1126,6 @@ export default {
         //   resolve()
         // })
         this.loading = true
-        cornerstone.metaData.addProvider(metaDataProvider, 1);
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
           .then(async image => {
             if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1165,7 +1156,7 @@ export default {
 
           // const scope = this
           Array.from(toolButtons).forEach((toolBtn) => {
-          // Add the tool
+            // Add the tool
             const toolName = toolBtn.getAttribute('data-tool')
             const apiTool = cornerstoneTools[`${toolName}Tool`]
             if (apiTool) {
@@ -1173,17 +1164,17 @@ export default {
 
               if (!toolAlreadyAddedToElement) {
                 if (toolName === 'Length') {
-                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
+                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true } })
                 } else if (toolName === 'Bidirectional') {
-                // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
-                // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
-                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
+                  // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
+                  // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
+                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true } })
                 } else if (toolName === 'ArrowAnnotate') {
-                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true } })
                 } else if (toolName === 'RectangleRoi') {
-                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true } })
                 } else if (toolName === 'Probe' && parseInt(localStorage.getItem('CriterionType')) === 21) {
-                   cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 5, handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces }})
+                  cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 5, handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces } })
                 } else {
                   cornerstoneTools.addToolForElement(element, apiTool)
                 }
@@ -1209,10 +1200,10 @@ export default {
             mouseButtonMask: 4
           })
 
-        // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
-        //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
-        // }
-        // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
+          // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
+          //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
+          // }
+          // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
         }
 
         // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
@@ -1229,7 +1220,7 @@ export default {
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-        
+
         resolve()
       })
     },
@@ -1257,9 +1248,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
-        this.stack.imageIds.length
-      }`
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
+        }`
       this.dicomInfo.size = `${data.uint16('x00280011')}*${data.uint16(
         'x00280010'
       )}`
@@ -1462,9 +1452,9 @@ export default {
       var element = cornerstone.getEnabledElement(this.canvas)
       const { rowPixelSpacing, colPixelSpacing } = this.getPixelSpacing(element.image)
       const dx =
-      (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
+        (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
       const dy =
-      (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
+        (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
       const length = Math.sqrt(dx * dx + dy * dy)
 
       return length.toFixed(this.digitPlaces)
@@ -1478,9 +1468,9 @@ export default {
       if (imagePlane) {
         return {
           rowPixelSpacing:
-        imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
+            imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
           colPixelSpacing:
-        imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
+            imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
         }
       }
 
@@ -1537,7 +1527,7 @@ export default {
     },
     debounce(callback, delay) {
       let timerId
-      return function() {
+      return function () {
         clearTimeout(timerId)
         timerId = setTimeout(() => {
           callback.apply(this, arguments)
@@ -1695,7 +1685,7 @@ export default {
         cornerstoneTools.getToolState(
           this.canvas,
           'playClip'
-        ).data[0].loop = true
+        ).data[0].loop = false
       } else {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -2020,88 +2010,102 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .context-menu-wrapper{
-    position: absolute;
-    ul{
-      list-style: none;
-      margin: 0px;
-      padding: 0px;
+.context-menu-wrapper {
+  position: absolute;
+
+  ul {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+    background: #343333;
+    color: #fff;
+    margin: 0;
+    border: 1px solid #2a2a2a;
+    border-radius: 3px;
+    height: auto;
+    min-height: 50px;
+    line-height: 1.5em;
+    width: 80px;
+    box-sizing: border-box;
+  }
+
+  .menu {
+    li {
+      padding: 2px 5px;
+      position: relative;
+      border-bottom: 1px solid #666;
+
+      div {
+        padding: 5px;
+      }
+    }
+
+    .submenu {
+      position: absolute;
+      left: 77px;
+      top: -1px;
       background: #343333;
       color: #fff;
-      margin: 0;
-      border: 1px solid #2a2a2a;
-      border-radius: 3px;
-      height: auto;
-      min-height: 50px;
-      line-height: 1.5em;
-      width:80px;
-      box-sizing: border-box;
-    }
-    .menu{
+      display: none;
+
       li {
         padding: 2px 5px;
-        position: relative;
         border-bottom: 1px solid #666;
-        div{
+
+        div {
           padding: 5px;
         }
       }
-      .submenu{
-        position: absolute;
-        left: 77px;
-        top: -1px;
-        background: #343333;
-        color: #fff;
-        display: none;
-        li {
-          padding: 2px 5px;
-          border-bottom: 1px solid #666;
-          div{
-            padding: 5px;
-          }
-        }
-      }
-
-    }
-    .menu li:hover{
-      background-color: #ff5722;
-      .submenu{
-        display:block;
-      }
-    }
-    .menu_active{
-      cursor: pointer;
-    }
-    .menu_disabled{
-      cursor: not-allowed;
     }
 
   }
-  .info-visit{
-    position: absolute;
-    left:50%;
-    top: 5px;
-    transform: translateX(-50%);
-    display: flex;
-    flex-direction: row;
-    .arrw_div_wrapper{
-      width: 20px;
-      height: 20px;
-      background-color: #3f3f3f;
-      text-align: center;
-      line-height: 20px;
-      border-radius: 10%;
-    }
-    .blind_name_wrapper{
-      height: 20px;
-      line-height: 20px;
-      background-color: #00000057;
-      color: #fff;
-      padding:0 10px;
-      font-size: 14px;
+
+  .menu li:hover {
+    background-color: #ff5722;
+
+    .submenu {
+      display: block;
     }
   }
-.info-cd{
+
+  .menu_active {
+    cursor: pointer;
+  }
+
+  .menu_disabled {
+    cursor: not-allowed;
+  }
+
+}
+
+.info-visit {
+  position: absolute;
+  left: 50%;
+  top: 5px;
+  transform: translateX(-50%);
+  display: flex;
+  flex-direction: row;
+
+  .arrw_div_wrapper {
+    width: 20px;
+    height: 20px;
+    background-color: #3f3f3f;
+    text-align: center;
+    line-height: 20px;
+    border-radius: 10%;
+  }
+
+  .blind_name_wrapper {
+    height: 20px;
+    line-height: 20px;
+    background-color: #00000057;
+    color: #fff;
+    padding: 0 10px;
+    font-size: 14px;
+  }
+}
+
+.info-cd {
   position: absolute;
   left: 10px;
   top: 5px;
@@ -2110,6 +2114,7 @@ export default {
   font-size: 18px;
   cursor: pointer;
 }
+
 .info-series {
   position: absolute;
   left: 10px;
@@ -2119,6 +2124,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -2138,6 +2144,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -2170,6 +2177,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -2189,11 +2197,12 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
+
 .msg-div {
-    position: absolute;
-    z-index: 10;
-    background-color: rgba(255, 255, 255, 0.5);
-    color: #000;
-    padding: 5px 20px;
-  }
+  position: absolute;
+  z-index: 10;
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #000;
+  padding: 5px 20px;
+}
 </style>

src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue

@@ -570,7 +570,7 @@ export default {
             end: { x: e.offsetX, y: e.offsetY }
           },
           remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
+          uuid: `${this.imgId}-${this.lesionName}`,
           toolName: 'ArrowAnnotate',
           toolType: 'ArrowAnnotate'
         }
@@ -601,7 +601,7 @@ export default {
             end: { x: e.offsetX, y: e.offsetY }
           },
           remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
+          uuid: `${this.imgId}-${this.lesionName}`,
           toolName: 'RectangleRoi',
           toolType: 'RectangleRoi'
         }

src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue

@@ -7,14 +7,10 @@
             <div class="visit-name-wrapper">
 
               <div v-if="(visitTaskList.length > 0)" style="display: flex;flex-direction: row;">
-                <div
-                  v-for="s in visitTaskList"
-                  :key="s.VisitTaskId"
-                  class="visit-item"
-                  :class="{'visit-item-active': activeTaskVisitId==s.VisitTaskId}"
-
-                  @click.prevent="handleClick(s)"
-                >{{ s.TaskBlindName }}</div>
+                <div v-for="s in visitTaskList" :key="s.VisitTaskId" class="visit-item"
+                  :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">
+                  {{
+                    s.TaskBlindName }}</div>
 
               </div>
 
@@ -22,23 +18,12 @@
 
           </div>
           <div class="right">
-            <div
-              v-for="s in visitTaskList"
-              v-show="activeTaskVisitId === s.VisitTaskId"
-              :key="s.VisitTaskId"
-              class="study-wrapper"
-            >
-              <StudyList
-                v-if="selectArr.includes(s.VisitTaskId)"
-                :ref="s.VisitTaskId"
-                :visit-task-id="s.VisitTaskId"
-                :trial-id="trialId"
-                :subject-visit-id="s.VisitId"
-                :task-blind-name="s.TaskBlindName"
-                :is-reading-show-subject-info="isReadingShowSubjectInfo"
-                @loadImageStack="loadImageStack"
-                @previewNoneDicoms="previewNoneDicoms"
-              />
+            <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
+              class="study-wrapper">
+              <StudyList v-if="selectArr.includes(s.VisitTaskId)" :ref="s.VisitTaskId" :visit-task-id="s.VisitTaskId"
+                :trial-id="trialId" :subject-visit-id="s.VisitId" :task-blind-name="s.TaskBlindName"
+                :is-reading-show-subject-info="isReadingShowSubjectInfo" @loadImageStack="loadImageStack"
+                @previewNoneDicoms="previewNoneDicoms" />
             </div>
           </div>
         </div>
@@ -46,20 +31,12 @@
     </div>
     <div class="dicom-viewer">
       <div class="container">
-        <DicomViewer
-          v-if="activeTaskVisitId"
-          ref="dicomViewer"
-          :is-show="isShow"
-          :question-form-change-state="questionFormChangeState"
-          :question-form-change-num="questionFormChangeNum"
-          :is-exists-clinical-data="isExistsClinicalData"
-          :is-exists-no-dicom-file="isExistsNoDicomFile"
+        <DicomViewer v-if="activeTaskVisitId" ref="dicomViewer" :is-show="isShow"
+          :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
+          :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-          :is-exists-manual="isExistsManual"
-          :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
-          @previewCD="previewCD"
-        />
+          :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual"
+          :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" />
       </div>
 
     </div>
@@ -75,6 +52,7 @@ import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
+import { workSpeedclose } from "@/utils"
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 // import metaDataProvider from '@/utils/metaDataProvider'
 // cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
@@ -248,6 +226,7 @@ export default {
     DicomEvent.$off('addNoneDicomMeasureData')
     DicomEvent.$off('selectSeries')
     window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
+    workSpeedclose(true)
   },
   methods: {
     async getVisitInfo() {
@@ -474,7 +453,7 @@ export default {
     getSeriesInfoByMark(baseSeries, visitTaskId, obj, visitTaskIdx) {
       var seriesInfo = null
       if (obj) {
-      // 根据任务ID测量病灶信息
+        // 根据任务ID测量病灶信息
         var index = visitTaskIdx
         if (index > -1) {
           var idx = -1
@@ -497,7 +476,7 @@ export default {
                 // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
                 const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
                 // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-                let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+                let n = series.instanceInfoList.findIndex(k => k.Id === instanceId)
                 let filterStr = ''
                 if (n > -1 && series.isExistMutiFrames) {
                   if (series.instanceInfoList[n].NumberOfFrames > 0) {
@@ -538,13 +517,15 @@ export default {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
+      params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.dicom-container{
+.dicom-container {
   width: 100%;
   height: 100%;
   display: flex;
@@ -553,32 +534,35 @@ export default {
   background-color: #000;
   box-sizing: border-box;
   user-select: none;
+
   ::-webkit-scrollbar {
     width: 5px;
     height: 5px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
 
-  .dicom-viewer{
+  .dicom-viewer {
     flex: 1;
     width: 100%;
     box-sizing: border-box;
 
-    .container{
+    .container {
       width: 100%;
       height: 100%;
       box-sizing: border-box;
     }
   }
-  .dicom-list{
-     width: 200px;
-     padding: 5px 0px;
+
+  .dicom-list {
+    width: 200px;
+    padding: 5px 0px;
     box-sizing: border-box;
 
-    .container{
+    .container {
       width: 100%;
       height: 100%;
       box-sizing: border-box;
@@ -586,7 +570,8 @@ export default {
       // border: 1px solid #ccc;
 
     }
-    ::v-deep.el-tabs{
+
+    ::v-deep.el-tabs {
       box-sizing: border-box;
       padding: 0 5px;
       height: 100%;
@@ -594,26 +579,31 @@ export default {
       flex-direction: column;
       // justify-content: flex-start;
       border: 1px solid #727272;
-      .el-tabs__item{
+
+      .el-tabs__item {
         color: #fff;
       }
-      .el-tabs__header{
+
+      .el-tabs__header {
         height: 55px;
-        margin:0px;
+        margin: 0px;
         box-sizing: border-box;
       }
-      .el-tabs__content{
+
+      .el-tabs__content {
         flex: 1;
-        margin:0px;
+        margin: 0px;
         overflow-y: auto;
         box-sizing: border-box;
       }
-      .el-tabs__item{
+
+      .el-tabs__item {
         color: #fff;
       }
 
     }
-    .dicom-desc{
+
+    .dicom-desc {
       font-weight: bold;
       font-size: 13px;
       text-align: center;
@@ -621,23 +611,28 @@ export default {
       color: #d0d0d0;
       padding: 2px;
     }
+
     .ps {
       overflow-anchor: none;
       touch-action: auto;
     }
+
     .series-active {
-      background-color: #607d8b!important;
-      border: 1px solid #607d8b!important;
+      background-color: #607d8b !important;
+      border: 1px solid #607d8b !important;
     }
-    ::v-deep.el-progress__text{
+
+    ::v-deep.el-progress__text {
       color: #ccc;
       font-size: 12px;
     }
-    .series{
+
+    .series {
       width: 100%;
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
+
       .series-wrapper {
         display: flex;
         flex-direction: row;
@@ -650,11 +645,13 @@ export default {
         border-radius: 2px;
         border: 1px solid #404040;
         background-color: #3a3a3a;
-        .el-progress__text{
+
+        .el-progress__text {
           display: none;
         }
-        .el-progress-bar{
-          padding-right:0px;
+
+        .el-progress-bar {
+          padding-right: 0px;
         }
 
         .image-preview {
@@ -663,9 +660,11 @@ export default {
           border: 2px solid #252525;
           cursor: pointer;
         }
+
         .image-desc {
           vertical-align: top;
-          p{
+
+          p {
             width: 100px;
             white-space: nowrap;
             overflow: hidden;
@@ -678,7 +677,8 @@ export default {
         }
       }
     }
-    .related-study-wrapper{
+
+    .related-study-wrapper {
       box-sizing: border-box;
       height: 100%;
       padding-bottom: 5px;
@@ -686,14 +686,15 @@ export default {
       flex-direction: row;
       justify-content: space-between;
 
-      .left{
+      .left {
         position: relative;
         width: 25px;
         height: 100%;
         overflow-x: hidden;
         overflow-y: auto;
         box-sizing: border-box;
-        .visit-name-wrapper{
+
+        .visit-name-wrapper {
           position: absolute;
           top: 5px;
 
@@ -708,30 +709,34 @@ export default {
           // flex-direction: row;
           // align-content: flex-start;
         }
-        .visit-item{
+
+        .visit-item {
           margin-left: 10px;
           white-space: nowrap;
-          padding: 0px  4px;
+          padding: 0px 4px;
           border: 1px solid #999999;
-          border-bottom:none ;
+          border-bottom: none;
           text-align: center;
           background-color: #4e4e4e;
           color: #d5d5d5;
           cursor: pointer;
           // margin-left: 10px;
         }
-        .visit-item-active{
+
+        .visit-item-active {
           background-color: #607d8b;
           border: 1px solid #607d8b;
         }
       }
-      .right{
-        width:170px;
-        flex:1;
+
+      .right {
+        width: 170px;
+        flex: 1;
         height: 100%;
         border-left: 1px solid #4a4a4a;
         color: #d5d5d5;
-        .study-wrapper{
+
+        .study-wrapper {
           width: 100%;
           height: 100%;
         }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
-    id="canvas"
-    ref="canvas"
-    v-loading="loading"
-    element-loading-text="Loading..."
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    style="position:relative;"
-    class="cornerstone-element"
-    @mouseup="sliderMouseup"
-    @contextmenu.prevent="onContextmenu"
-  >
+  <div id="canvas" ref="canvas" v-loading="loading" :element-loading-text="NSTip"
+    element-loading-background="rgba(0, 0, 0, 0.8)" style="position:relative;" class="cornerstone-element"
+    @mouseup="sliderMouseup" @contextmenu.prevent="onContextmenu">
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
@@ -18,46 +10,39 @@
 
     </div>
     <!-- 切换访视 -->
-    <div
-      v-if="stack.imageRendered && isReadingTaskViewInOrder === 1"
-      class="info-visit"
-      @dblclick.stop="preventDefault($event)"
-    >
-      <div
-        class="arrw_div_wrapper"
-        :style="{cursor:stack.visitTaskNum <= minVistNum?'not-allowed':'pointer',color:stack.visitTaskNum <= minVistNum?'#888':'#fff'}"
-        @click.stop.prevent="toggleSeries($event,-1)"
-        @dblclick.stop="preventDefault($event)"
-      >
+    <div v-if="stack.imageRendered && isReadingTaskViewInOrder === 1" class="info-visit"
+      @dblclick.stop="preventDefault($event)">
+      <div class="arrw_div_wrapper"
+        :style="{ cursor: stack.visitTaskNum <= minVistNum ? 'not-allowed' : 'pointer', color: stack.visitTaskNum <= minVistNum ? '#888' : '#fff' }"
+        @click.stop.prevent="toggleSeries($event, -1)" @dblclick.stop="preventDefault($event)">
         <i class="el-icon-caret-left" />
       </div>
       <div class="blind_name_wrapper">
         {{ stack.taskBlindName }}
       </div>
-      <div
-        class="arrw_div_wrapper"
-        :style="{cursor:stack.visitTaskNum >= maxVistNum?'not-allowed':'pointer',color:stack.visitTaskNum >= maxVistNum?'#888':'#fff'}"
-        @click.stop.prevent="toggleSeries($event,1)"
-        @dblclick.stop="preventDefault($event)"
-      >
+      <div class="arrw_div_wrapper"
+        :style="{ cursor: stack.visitTaskNum >= maxVistNum ? 'not-allowed' : 'pointer', color: stack.visitTaskNum >= maxVistNum ? '#888' : '#fff' }"
+        @click.stop.prevent="toggleSeries($event, 1)" @dblclick.stop="preventDefault($event)">
         <i class="el-icon-caret-right" />
       </div>
     </div>
     <div class="info-series">
-      <h2 v-if="isReadingShowSubjectInfo" style="color:#f44336;padding: 5px 0px;margin: 0;">{{ subjectCode }} {{ stack.taskBlindName }}</h2>
+      <h2 v-if="isReadingShowSubjectInfo" style="color:#f44336;padding: 5px 0px;margin: 0;">{{ subjectCode }} {{
+        stack.taskBlindName }}</h2>
       <div v-show="dicomInfo.series">Series: #{{ dicomInfo.series }}</div>
       <div>Image: #{{ dicomInfo.frame }}</div>
       <div>{{ dicomInfo.modality }}</div>
     </div>
     <div class="info-image">
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) : '' }}
       </div>
-      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div
+        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
         HU: {{ mousePosition.mo }}
       </div>
       <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
-        SUVbw(g/ml): {{ digitPlaces === -1 ?mousePosition.suv.toFixed(3) :mousePosition.suv.toFixed(digitPlaces) }}
+        SUVbw(g/ml): {{ digitPlaces === -1 ? mousePosition.suv.toFixed(3) : mousePosition.suv.toFixed(digitPlaces) }}
       </div>
       <div v-else-if="mousePosition.mo">
         Density: {{ mousePosition.mo }}
@@ -81,8 +66,12 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+    <div ref="sliderBox" class="my_slider_box"
+      style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
+      @click.stop="goViewer($event)">
+      <div :style="{ top: height + '%' }"
+        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
+        @click.stop.prevent="() => { return }" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
@@ -117,7 +106,7 @@
   </div>
 </template>
 <style>
-.my_slider_box:after{
+.my_slider_box:after {
   content: '';
   position: absolute;
   bottom: -20px;
@@ -137,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -306,7 +295,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['visitTaskList', 'currentReadingTaskState'])
+    ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
+    NSTip() {
+      return `NS: ${this.$store.state.trials.uploadTip}`
+    }
   },
   watch: {
     currentReadingTaskState: {
@@ -562,7 +554,7 @@ export default {
     mouseDown(e) {
       this.image = e.detail.image
       var pointNearTool = this.pointNearTool(e)
-       if (pointNearTool) {
+      if (pointNearTool) {
         e.stopImmediatePropagation()
         e.stopPropagation()
         e.preventDefault()
@@ -574,7 +566,7 @@ export default {
             type: 'warning'
           }).then(() => {
 
-          }).catch(() => {})
+          }).catch(() => { })
           e.stopImmediatePropagation()
           e.stopPropagation()
           e.preventDefault()
@@ -672,7 +664,7 @@ export default {
       this.sliderInfo.isMove = false
     },
     getMeasureData() {
-      console.log('getMeasureData') 
+      console.log('getMeasureData')
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       this.measureData = this.visitTaskList[idx].MeasureData
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
@@ -889,7 +881,7 @@ export default {
           } else {
             // cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
             cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
-            
+
           }
           if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && (data.MeasureData.frame === this.stack.frame) && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
             //  console.log('renderMeasuredData', this.stack.frame,data.MeasureData.frame,this.stack.isExistMutiFrames)
@@ -991,32 +983,32 @@ export default {
           var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === toolState.data[i].uuid)
           if (idx > -1) {
             DicomEvent.$emit('setCollapseActive', this.measureData[idx])
-              const measureData = {}
-              // var markName = this.measureData[idx].OrderMarkName
-              var markName = this.measureData[idx].MeasureData.data.remark
-              if (this.activeToolName === 'Eraser' && this.disabledMarks.indexOf(markName) === -1) {
-                const questionInfo = this.measureData[idx]
-                measureData.orderMarkName = markName
-                this.$emit('moveMeasureData', { measureData, questionInfo, orderMarkName: markName})
-              }
-              if ((this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) && this.activeToolName !== 'Eraser') {
-                const questionInfo = this.measureData[idx]
-                const canvas = this.canvas.querySelector('canvas')
-                measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
-                measureData.studyId = this.stack.studyId
-                measureData.seriesId = this.stack.seriesId
-                measureData.instanceId = instanceId
-                measureData.frame = this.stack.frame ? this.stack.frame : 0
-                measureData.data = toolState.data[i]
-                measureData.type = toolType
-                measureData.thick = this.dicomInfo.thick
-                measureData.location = this.dicomInfo.location
-                measureData.ww = Math.round(viewport.voi.windowWidth)
-                measureData.wc = Math.round(viewport.voi.windowCenter)
-                measureData.data.active = false
-                this.$emit('modifyMeasureData', { measureData, questionInfo })
-              }
-            
+            const measureData = {}
+            // var markName = this.measureData[idx].OrderMarkName
+            var markName = this.measureData[idx].MeasureData.data.remark
+            if (this.activeToolName === 'Eraser' && this.disabledMarks.indexOf(markName) === -1) {
+              const questionInfo = this.measureData[idx]
+              measureData.orderMarkName = markName
+              this.$emit('moveMeasureData', { measureData, questionInfo, orderMarkName: markName })
+            }
+            if ((this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) && this.activeToolName !== 'Eraser') {
+              const questionInfo = this.measureData[idx]
+              const canvas = this.canvas.querySelector('canvas')
+              measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+              measureData.studyId = this.stack.studyId
+              measureData.seriesId = this.stack.seriesId
+              measureData.instanceId = instanceId
+              measureData.frame = this.stack.frame ? this.stack.frame : 0
+              measureData.data = toolState.data[i]
+              measureData.type = toolType
+              measureData.thick = this.dicomInfo.thick
+              measureData.location = this.dicomInfo.location
+              measureData.ww = Math.round(viewport.voi.windowWidth)
+              measureData.wc = Math.round(viewport.voi.windowCenter)
+              measureData.data.active = false
+              this.$emit('modifyMeasureData', { measureData, questionInfo })
+            }
+
             break
           }
         }
@@ -1088,7 +1080,6 @@ export default {
         //   resolve()
         // })
         this.loading = true
-        cornerstone.metaData.addProvider(metaDataProvider, 1);
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
           .then(async image => {
             if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1118,7 +1109,7 @@ export default {
           const toolButtons = document.querySelectorAll('[data-tool]')
           // const scope = this
           Array.from(toolButtons).forEach((toolBtn) => {
-          // Add the tool
+            // Add the tool
             const toolName = toolBtn.getAttribute('data-tool')
             const apiTool = cornerstoneTools[`${toolName}Tool`]
             if (apiTool) {
@@ -1126,17 +1117,17 @@ export default {
 
               if (!toolAlreadyAddedToElement) {
                 if (toolName === 'Length') {
-                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
+                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true } })
                 } else if (toolName === 'Bidirectional') {
-                // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
-                // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
-                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
+                  // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
+                  // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
+                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true } })
                 } else if (toolName === 'ArrowAnnotate') {
-                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true } })
                 } else if (toolName === 'RectangleRoi') {
-                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true } })
                 } else if (toolName === 'CircleRoi') {
-                  cornerstoneTools.addToolForElement(element, CircleRoiTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true, showMinMax: true }})
+                  cornerstoneTools.addToolForElement(element, CircleRoiTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true, showMinMax: true } })
                 } else {
                   cornerstoneTools.addToolForElement(element, apiTool)
                 }
@@ -1162,10 +1153,10 @@ export default {
             mouseButtonMask: 4
           })
 
-        // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
-        //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
-        // }
-        // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
+          // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
+          //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
+          // }
+          // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
         }
 
         // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
@@ -1210,9 +1201,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
-        this.stack.imageIds.length
-      }`
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
+        }`
       this.dicomInfo.size = `${data.uint16('x00280011')}*${data.uint16(
         'x00280010'
       )}`
@@ -1286,6 +1276,7 @@ export default {
         'imagePlaneModule',
         enabledElement.image.imageId
       )
+
       if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
         return
       }
@@ -1392,9 +1383,9 @@ export default {
       var element = cornerstone.getEnabledElement(this.canvas)
       const { rowPixelSpacing, colPixelSpacing } = this.getPixelSpacing(element.image)
       const dx =
-      (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
+        (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1)
       const dy =
-      (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
+        (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1)
       const length = Math.sqrt(dx * dx + dy * dy)
 
       return length.toFixed(this.digitPlaces)
@@ -1408,9 +1399,9 @@ export default {
       if (imagePlane) {
         return {
           rowPixelSpacing:
-        imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
+            imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing,
           colPixelSpacing:
-        imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
+            imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing
         }
       }
 
@@ -1462,7 +1453,7 @@ export default {
     },
     debounce(callback, delay) {
       let timerId
-      return function() {
+      return function () {
         clearTimeout(timerId)
         timerId = setTimeout(() => {
           callback.apply(this, arguments)
@@ -1480,7 +1471,7 @@ export default {
       if (imageId) {
         ToolStateManager.clearImageIdToolState(imageId)
         let elements = cornerstone.getEnabledElementsByImageId(imageId)
-        elements.map(el=>{
+        elements.map(el => {
           cornerstone.updateImage(el.element)
         })
       }
@@ -1624,7 +1615,7 @@ export default {
         cornerstoneTools.getToolState(
           this.canvas,
           'playClip'
-        ).data[0].loop = true
+        ).data[0].loop = false
       } else {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -1766,7 +1757,7 @@ export default {
       this.activeToolName = toolName
       this.$nextTick(() => {
         // console.log(cornerstoneTools.isToolActiveForElement(this.canvas, 'Bidirectional'))
-        
+
         if (toolName === 'Zoom') {
           cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
             mouseButtonMask: [1, 2]
@@ -1920,7 +1911,7 @@ export default {
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
-      if (isNaN(params.frame)){
+      if (isNaN(params.frame)) {
         params.frame = 0
       }
       return params
@@ -1942,88 +1933,102 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .context-menu-wrapper{
-    position: absolute;
-    ul{
-      list-style: none;
-      margin: 0px;
-      padding: 0px;
+.context-menu-wrapper {
+  position: absolute;
+
+  ul {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+    background: #343333;
+    color: #fff;
+    margin: 0;
+    border: 1px solid #2a2a2a;
+    border-radius: 3px;
+    height: auto;
+    min-height: 50px;
+    line-height: 1.5em;
+    width: 80px;
+    box-sizing: border-box;
+  }
+
+  .menu {
+    li {
+      padding: 2px 5px;
+      position: relative;
+      border-bottom: 1px solid #666;
+
+      div {
+        padding: 5px;
+      }
+    }
+
+    .submenu {
+      position: absolute;
+      left: 77px;
+      top: -1px;
       background: #343333;
       color: #fff;
-      margin: 0;
-      border: 1px solid #2a2a2a;
-      border-radius: 3px;
-      height: auto;
-      min-height: 50px;
-      line-height: 1.5em;
-      width:80px;
-      box-sizing: border-box;
-    }
-    .menu{
+      display: none;
+
       li {
         padding: 2px 5px;
-        position: relative;
         border-bottom: 1px solid #666;
-        div{
+
+        div {
           padding: 5px;
         }
       }
-      .submenu{
-        position: absolute;
-        left: 77px;
-        top: -1px;
-        background: #343333;
-        color: #fff;
-        display: none;
-        li {
-          padding: 2px 5px;
-          border-bottom: 1px solid #666;
-          div{
-            padding: 5px;
-          }
-        }
-      }
-
-    }
-    .menu li:hover{
-      background-color: #ff5722;
-      .submenu{
-        display:block;
-      }
-    }
-    .menu_active{
-      cursor: pointer;
-    }
-    .menu_disabled{
-      cursor: not-allowed;
     }
 
   }
-  .info-visit{
-    position: absolute;
-    left:50%;
-    top: 5px;
-    transform: translateX(-50%);
-    display: flex;
-    flex-direction: row;
-    .arrw_div_wrapper{
-      width: 20px;
-      height: 20px;
-      background-color: #3f3f3f;
-      text-align: center;
-      line-height: 20px;
-      border-radius: 10%;
-    }
-    .blind_name_wrapper{
-      height: 20px;
-      line-height: 20px;
-      background-color: #00000057;
-      color: #fff;
-      padding:0 10px;
-      font-size: 14px;
+
+  .menu li:hover {
+    background-color: #ff5722;
+
+    .submenu {
+      display: block;
     }
   }
-.info-cd{
+
+  .menu_active {
+    cursor: pointer;
+  }
+
+  .menu_disabled {
+    cursor: not-allowed;
+  }
+
+}
+
+.info-visit {
+  position: absolute;
+  left: 50%;
+  top: 5px;
+  transform: translateX(-50%);
+  display: flex;
+  flex-direction: row;
+
+  .arrw_div_wrapper {
+    width: 20px;
+    height: 20px;
+    background-color: #3f3f3f;
+    text-align: center;
+    line-height: 20px;
+    border-radius: 10%;
+  }
+
+  .blind_name_wrapper {
+    height: 20px;
+    line-height: 20px;
+    background-color: #00000057;
+    color: #fff;
+    padding: 0 10px;
+    font-size: 14px;
+  }
+}
+
+.info-cd {
   position: absolute;
   left: 10px;
   top: 5px;
@@ -2032,6 +2037,7 @@ export default {
   font-size: 18px;
   cursor: pointer;
 }
+
 .info-series {
   position: absolute;
   left: 10px;
@@ -2041,6 +2047,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -2060,6 +2067,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -2092,6 +2100,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -2111,11 +2120,12 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
+
 .msg-div {
-    position: absolute;
-    z-index: 10;
-    background-color: rgba(255, 255, 255, 0.5);
-    color: #000;
-    padding: 5px 20px;
-  }
+  position: absolute;
+  z-index: 10;
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #000;
+  padding: 5px 20px;
+}
 </style>

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue

@@ -1,48 +1,61 @@
 <template>
   <div class="criterion-form-item">
-    <div v-if="!!question.GroupName && question.Type === 'group'"
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;">
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;"
+    >
       {{ question.GroupName }}
     </div>
-    <div v-if="question.Type === 'table' || question.Type === 'basicTable'"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
+    <div
+      v-if="question.Type==='table' || question.Type==='basicTable'"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
+    >
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
-        <span :title="question.Remark">{{ question.QuestionName }}</span>
-        <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
+        <span>{{ question.QuestionName }}</span>
+        <el-button size="mini" v-if="readingTaskState<2" @click="openAddTableCol(question)">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
-      <el-table :data="questionForm[question.Id]">
+      <el-table
+        :data="questionForm[question.Id]">
         <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ question.OrderMark }}{{ scope.$index + 1 }}
+            {{question.OrderMark}}{{scope.$index + 1}}
           </template>
         </el-table-column>
-        <el-table-column :prop="item.Id" :label="item.QuestionName" :key="item.Id"
-          v-for="item of question.TableQuestions.Questions" show-overflow-tooltip :render-header="renderHeader">
+        <el-table-column
+          :prop="item.Id"
+          :label="item.QuestionName"
+          :key="item.Id"
+          v-for="item of question.TableQuestions.Questions"
+          show-overflow-tooltip
+          :render-header="renderHeader"
+        >
           <template slot-scope="scope">
             <span v-if="item.Type === 'upload'">
-              {{ scope.row[item.Id] === '' ? '' : scope.row[item.Id] ? scope.row[item.Id].split('|').length : '' }}
+              {{scope.row[item.Id] === '' ? '' : scope.row[item.Id] ? scope.row[item.Id].split('|').length : ''}}
             </span>
             <span v-else-if="item.Type === 'number'">
-              {{ !isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) :
-                scope.row[item.Id] }}
+              {{!isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : scope.row[item.Id]}}
             </span>
             <span v-else>
-              {{ scope.row[item.Id] }}
+              {{scope.row[item.Id]}}
             </span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('common:action:action')" show-overflow-tooltip width="100px"
-          v-if="readingTaskState < 2" fixed="right">
+        <el-table-column
+            :label="$t('common:action:action')"
+            show-overflow-tooltip
+            width="100px"
+            v-if="readingTaskState < 2"
+            fixed="right"
+        >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
-              {{ $t('common:button:edit') }}
+              {{$t('common:button:edit')}}
             </el-button>
-            <el-button type="text" size="mini"
-              v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline"
-              @click="deleteTableCol(question, scope.$index)">
-              {{ $t('common:button:delete') }}
+            <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline" @click="deleteTableCol(question, scope.$index)">
+              {{$t('common:button:delete')}}
             </el-button>
           </template>
         </el-table-column>
@@ -50,149 +63,284 @@
     </div>
     <template v-else>
       <el-form-item
-        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`" :title="question.Remark" :prop="question.Id" :rules="[
-          {
-            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type !== 'group' && question.Type !== 'summary',
-            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-          },
-          {
-            validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
-            trigger: ['blur', 'change']
-          }
-        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion===0"
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type!=='group' && question.Type!=='summary',
+            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+            {
+              validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput :(rule,value,callback )=>{callback()},
+              trigger: ['blur', 'change']
+            }
+        ]"
+        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
+      >
         <!-- 输入框 -->
-        <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || readingTaskState === 2" />
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="question.TableQuestionType === 2 || readingTaskState === 2"
+        />
         <!-- 多行文本输入框 -->
-        <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
+        <el-input
+          v-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          :disabled="readingTaskState === 2"
+        />
         <!-- 下拉框 -->
-        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+        <el-select
+          v-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          clearable
           :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
-          @change="((val) => { formItemChange(val, question) })">
+          @change="((val)=>{formItemChange(val, question)})"
+        >
           <template v-if="question.TableQuestionType === 1">
-            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]" />
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :label="item.label" />
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
           </template>
-          <template
-            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :label="item.label" />
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
           </template>
           <template v-else>
-            <el-option v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()"
-              :value="val.trim()" />
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val.trim()"
+              :label="val.trim()"
+              :value="val.trim()"
+            />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
-          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+        <el-radio-group
+          v-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          @change="((val)=>{formItemChange(val, question)})"
+          :disabled="readingTaskState === 2"
+        >
+          <el-radio
+            v-for="val in question.TypeValue.split('|')"
+            :key="val.trim()"
+            :label="val.trim()"
+          >
             {{ val.trim() }}
           </el-radio>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
-          :disabled="readingTaskState === 2">
-          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()">
+        <el-checkbox-group
+          v-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState === 2"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+          >
             {{ val.trim() }}
           </el-checkbox>
         </el-checkbox-group>
         <!-- 自动分类 -->
-        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2" />
-        <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+        <el-input
+          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+        />
+        <el-select
+          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }"
+        >
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+            :value="val.trim()"
+          />
         </el-select>
-        <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }">
-          <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
+        <el-radio-group
+          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }"
+        >
+          <el-radio
+            v-for="item of question.TypeValue.split('|')"
+            :key="item.trim()"
+            :label="item.trim()"
+          >
             {{ item.trim() }}
           </el-radio>
         </el-radio-group>
-        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
-          @change="(val) => { formItemNumberChange(val, question) }" />
+        <el-input
+          v-if="question.Type === 'class' && question.ClassifyShowType === 4"
+          type="number"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          v-model="questionForm[question.Id]"
+          @change="(val) => { formItemNumberChange(val, question) }"
+        />
         <!-- 自动计算 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-          @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
+        <el-input
+          v-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          @input="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
+          disabled
+        />
         <!-- 自增 -->
-        <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
+        <el-input
+          v-if="question.Type==='increment'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+        <el-select
+          v-if="question.Type === 'number' && question.TypeValue"
+          v-model="questionForm[question.Id]"
+          clearable
+          @change="(val) => { formItemNumberChange(val, question) }"
+          :disabled="readingTaskState === 2"
+        >
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+            :value="val.trim()"
+          />
         </el-select>
-        <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
+        <el-input
+          type="text"
+          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
+          @change="(val) => { formItemNumberChange(val, question) }"
+          @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
+          v-model.trim="questionForm[question.Id]"
+          :disabled="readingTaskState === 2"
+        >
           <!-- <template slot="append">1</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
-        <el-input type="text" @input="numberInput(question.Id)"
+        <el-input
+          type="text"
+          @input="numberInput(question.Id)"
           v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
+          :disabled="question.DataSource === 1 || readingTaskState === 2"
+          v-model.trim="questionForm[question.Id]"
+        >
           <!-- <template slot="append">2</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
         <!-- 上传图像 -->
-        <el-upload v-if="question.Type === 'upload'" :disabled="readingTaskState === 2" action
-          :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
+        <el-upload
+          v-if="question.Type==='upload'"
+          :disabled="readingTaskState === 2"
+          action
+          :accept="question.FileType"
+          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
           :on-preview="handlePictureCardPreview"
-          :before-upload="(file) => { return handleBeforeUpload(file, question.FileType) }"
-          :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
-          :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
+          :before-upload="(file) => {return handleBeforeUpload(file, question.FileType)}"
+          :http-request="uploadScreenshot"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :class="{disabled:question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
+        >
           <el-button slot="default" class="el-icon-plus" v-if="readingTaskState < 2">
-            {{ this.$t('common:button:upload') }}
+            {{this.$t('common:button:upload')}}
           </el-button>
         </el-upload>
-        <viewer v-if="question.Type === 'upload' && imgVisible" :ref="imageUrl" style="margin:0 10px;"
-          :images="[imageUrl]">
-          <img v-show="false" crossorigin="anonymous" :src="imageUrl" alt="Image">
+        <viewer
+          v-if="question.Type==='upload' && imgVisible"
+          :ref="imageUrl"
+          style="margin:0 10px;"
+          :images="[imageUrl]"
+        >
+          <img
+            v-show="false"
+            crossorigin="anonymous"
+            :src="imageUrl"
+            alt="Image"
+          >
         </viewer>
       </el-form-item>
     </template>
 
-    <template
-      v-if="question.Childrens && question.Childrens.length > 0 && question.Type !== 'table' && question.Type !== 'basicTable'">
-      <CustomizeQuestionFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
-        :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="questionForm"
-        :visit-task-id="visitTaskId" :criterion-id="criterionId" :CalculationList="CalculationList"
-        @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData" />
+    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
+      <CustomizeQuestionFormItem
+        v-for="(item) in question.Childrens"
+        :key="item.Id"
+        :question="item"
+        :IsBaseline="IsBaseline"
+        :reading-task-state="readingTaskState"
+        :question-form="questionForm"
+        :visit-task-id="visitTaskId"
+        :criterion-id="criterionId"
+        :CalculationList="CalculationList"
+        @formItemNumberChange="formItemNumberChange"
+        @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData"
+      />
     </template>
-    <base-model :config="addOrEdit" class="my_dialog" :close-on-click-modal="false" width="400px" append-to-body>
+    <base-model :config="addOrEdit"
+      class="my_dialog"
+      :close-on-click-modal="false"
+      width="400px"
+      append-to-body
+    >
       <template slot="dialog-body">
-        <el-form ref="tableQsForm" :model="QuestionsForm" v-loading="loading" size="small">
-          <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
-            :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="QuestionsForm"
-            :visit-task-id="visitTaskId" :criterion-id="criterionId" :type="addOrEdit.type"
-            :CalculationList="CalculationTabelList" @formItemTableNumberChange="formItemTableNumberChange"
-            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData" />
+        <el-form
+            ref="tableQsForm"
+            :model="QuestionsForm"
+            v-loading="loading"
+            size="small"
+        >
+          <QuestionTableFormItem
+              v-for="(item) in QuestionsList"
+              :key="item.Id"
+              :question="item"
+              :IsBaseline="IsBaseline"
+              :reading-task-state="readingTaskState"
+              :question-form="QuestionsForm"
+              :visit-task-id="visitTaskId"
+              :criterion-id="criterionId"
+              :type="addOrEdit.type"
+              :CalculationList="CalculationTabelList"
+              @formItemTableNumberChange="formItemTableNumberChange"
+              @resetFormItemData="resetTableFormItemData"
+              @setFormItemData="setFormTableItemData" 
+          />
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button size="small" @click="addOrEdit.visible = false">
+        <el-button
+            size="small"
+            @click="addOrEdit.visible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -202,10 +350,23 @@
       </template>
     </base-model>
     <!-- 预览文件 -->
-    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="$t('common:button:preview')"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+        />
       </div>
     </el-dialog>
   </div>
@@ -352,15 +513,15 @@ export default {
     },
     validatorNumberInput(rule, value, callback) {
       let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
-      if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
-      } else {
-        if (!reg.test(value)) {
-          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+       if (value === '') {
+          callback(new Error(this.$t('common:ruleMessage:specify')));
         } else {
-          callback();
+          if (!reg.test(value)) {
+            callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+          }else{
+            callback();
+          }
         }
-      }
     },
     limitInput(value, a, b) {
       if (value.indexOf('.') > -1) {
@@ -371,7 +532,7 @@ export default {
     },
     handleBlur(value, a, b) {
       if (!value) return false
-      if (!isNaN(parseFloat(value))) {
+      if(!isNaN(parseFloat(value))) {
         this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
       }
     },
@@ -392,19 +553,19 @@ export default {
               this.AnswersList = row.TableQuestions.Answers
               var index = this.AnswersList.findIndex(v => v.RowId === RowId)
               this.AnswersList.splice(index, 1)
-              this.$emit('setFormItemData', { key: this.question.Id, val: this.AnswersList, question: this.question })
+              this.$emit('setFormItemData', {key: this.question.Id, val: this.AnswersList, question: this.question})
               this.formItemNumberChange(this.question.Id, true)
             }
             loading.close()
           }).catch(() => {
-            loading.close()
-          })
+          loading.close()
+        })
       })
 
     },
     setFormTableItemData(obj) {
       this.$set(this.QuestionsForm, obj.key, obj.val)
-      this.classArr.map(i => {
+      this.classArr.map(i=>{
         if (i.triggerId === obj.key) {
           let answer = null
           let list = JSON.parse(i.classifyAlgorithms)
@@ -415,12 +576,12 @@ export default {
                 parseFloat(obj.val) < parseFloat(v.lt)
               )
             })
-            answer = o ? o.label : null
+            answer = o ? o.label : null 
           } else if (i.classifyType === 1) {
             let o = list.find(v => {
               return v.val.includes(obj.val)
             })
-            answer = o ? o.label : null
+            answer = o ? o.label : null 
           }
           this.$set(this.QuestionsForm, i.classId, answer)
         }
@@ -519,8 +680,8 @@ export default {
           var index = this.AnswersList.findIndex(v => v.RowId === this.QuestionsForm.RowId)
           this.AnswersList.splice(index, 1, this.QuestionsForm)
         }
-        console.log({ key: this.question.Id, val: this.AnswersList, question: this.question })
-        this.$emit('setFormItemData', { key: this.question.Id, val: this.AnswersList, question: this.question })
+        console.log({key: this.question.Id, val: this.AnswersList, question: this.question})
+        this.$emit('setFormItemData', {key: this.question.Id, val: this.AnswersList, question: this.question})
         this.formItemNumberChange(this.question.Id, true)
         this.addOrEdit.visible = false
       })
@@ -551,9 +712,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   break;
                 case 6:
@@ -568,9 +726,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   break;
                 case 7:
@@ -585,9 +740,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break;
@@ -625,9 +777,6 @@ export default {
               }
             }
           } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 if (isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -658,8 +807,8 @@ export default {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                  return acc + (typeof curr === "number" ? curr : 0);
-                }, 0) / dataArr.length;
+                    return acc + (typeof curr === "number" ? curr : 0);
+                  }, 0) / dataArr.length;
                 break;
               case 11:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -674,7 +823,7 @@ export default {
                 num = Math.min(...dataArr);
                 break;
               case 13:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                 }
                 num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
@@ -702,7 +851,7 @@ export default {
       } else {
         return num.toFixed(this.digitPlaces)
       }
-
+      
     },
     formItemNumberChange(questionId, isTable) {
       if (typeof isTable === 'object') {
@@ -766,7 +915,7 @@ export default {
     //       this.$set(this.QuestionsForm, v.Id, num.toString())
     //     }
     //   })
-
+ 
     // },
     formItemTableNumberChange() {
       this.question.TableQuestions.Questions.forEach((v) => {
@@ -812,8 +961,8 @@ export default {
                     arr.length === 0
                       ? 0
                       : arr.reduce((acc, curr) => {
-                        return acc + (typeof curr === "number" ? curr : 0);
-                      }, 0) / arr.length;
+                          return acc + (typeof curr === "number" ? curr : 0);
+                        }, 0) / arr.length;
                   break;
                 case 8:
                   if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
@@ -834,7 +983,7 @@ export default {
           if (isNE) {
             num = 'NE'
           } else {
-            num = num.toFixed(this.digitPlaces)
+           num =  num.toFixed(this.digitPlaces)
           }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
@@ -844,9 +993,9 @@ export default {
       this.addOrEdit.visible = true
       this.addOrEdit.title = row.QuestionName + this.$t('trials:readingUnit:qsList:title:tableQs')
       this.QuestionsList = row.TableQuestions.Questions
-      row.TableQuestions.Questions.map(v => {
+      row.TableQuestions.Questions.map(v=>{
         if (v.Type === 'class') {
-          this.classArr.push({ triggerId: v.ClassifyTableQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType })
+          this.classArr.push({triggerId: v.ClassifyTableQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType})
         }
       })
       this.AnswersList = row.TableQuestions.Answers
@@ -955,17 +1104,17 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      var suffix = file.url.substring(file.url.lastIndexOf(".") + 1)
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
       suffix = suffix ? suffix.toLowerCase() : ''
-      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf') {
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
         // window.open(this.OSSclientConfig.basePath + file.url,'_blank')
         this.currentPath = file.url
         this.currentType = suffix
         this.previewVisible = true
-      } else {
+      }else{
         this.imageUrl = this.OSSclientConfig.basePath + file.url
         this.imgVisible = true
-        this.$nextTick(() => {
+        this.$nextTick(()=>{
           this.$refs[this.imageUrl].$viewer.show()
         })
       }
@@ -975,8 +1124,8 @@ export default {
       if (file && file.status === "success") {
         this.imageUrl = ''
         this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
-        this.fileList.forEach((i, index) => {
-          i.name = `${this.$t('trials:emailManageCfg:title:fileName')}${index + 1}`
+        this.fileList.forEach((i,index)=>{
+          i.name = `${this.$t('trials:emailManageCfg:title:fileName')}${index+ 1}`
         })
         this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
         this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
@@ -987,14 +1136,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
+.my_dialog{
+  .criterion-form-item{
     width: 100%;
-
-    ::v-deep .el-form-item__content {
+    ::v-deep .el-form-item__content{
       width: auto;
     }
-
     //::v-deep .el-input-goup__append{
     //  background-color: transparent;
     //  color: #ddd;
@@ -1002,88 +1149,63 @@ export default {
     //}
   }
 }
-
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
-::v-deep .el-form-item__label {
+::v-deep .el-form-item__label{
   color: #c3c3c3;
 }
-
-::v-deep .el-radio__label {
+::v-deep .el-radio__label{
   color: #c3c3c3;
 }
-
-::v-deep .el-input-group__append {
+::v-deep .el-input-group__append{
   background: #000;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
-
-::v-deep .el-input .el-input__inner {
+::v-deep .el-input .el-input__inner{
   background-color: transparent;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
-
-.criterion-form-item {
-  ::v-deep .criterion-form-item .el-form-item {
+.criterion-form-item{
+  ::v-deep .criterion-form-item .el-form-item{
     display: block;
-
-    .el-form-item__label {
+    .el-form-item__label{
       display: block;
       color: #c8c8c8;
       float: none;
       text-align: left;
     }
   }
-
-  .el-form-item {
+  .el-form-item{
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
   }
-
-  .mb {
-    margin-bottom: 0px;
-  }
-
-  .disabled {
-    ::v-deep .el-upload--picture-card {
-      display: none;
-    }
-  }
-
-  .uploadWrapper {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  ::v-deep .el-upload--picture-card {
+    display: none;
   }
 }
-
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  height: 10px !important;
+.uploadWrapper{
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
 }
-
-::v-deep .el-table__fixed-right::before {
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar{
+  height: 10px!important;
+}
+::v-deep .el-table__fixed-right::before{
   display: none;
 }
-
-::v-deep .el-upload-list__item-name {
+::v-deep .el-upload-list__item-name{
   color: #0a84ff;
-
-  .el-icon-document {
+  .el-icon-document{
     color: #0a84ff;
   }
 }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue

@@ -2,7 +2,7 @@
   <div class="criterion-form-item">
     <el-form-item
       v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :label="`${question.QuestionName}`" :prop="question.Id" :title="question.Remark" :rules="[
+      :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
         {
           required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
           message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
@@ -83,9 +83,6 @@
         @change="(val) => { formItemNumberChange(val, question) }"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
       </el-select>
       <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
@@ -453,8 +450,7 @@ export default {
       return num.toFixed(this.digitPlaces)
     },
     formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange')
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
+      this.$emit('formItemTableNumberChange', v, question)
       // this.$emit('formItemTableNumberChange', v, question)
     },
     resetChild(obj) {
@@ -544,16 +540,6 @@ export default {
   }
 }
 
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
 .criterion-form-item {
   .el-form-item {
     display: flex;

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue

@@ -233,7 +233,9 @@ export default {
       this.questionForm[v] = ''
     },
     setFormItemData(obj) {
+      console.log('setFormItemData', obj)
       this.$set(this.questionForm, obj.key, JSON.parse(JSON.stringify(obj.val)))
+      console.log(this.questionForm)
       this.classArr.map(i=>{
         if (i.triggerId === obj.key) {
           let answer = null

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue

@@ -5,42 +5,22 @@
         <div class="related-study-wrapper">
           <div class="left">
             <div class="visit-name-wrapper">
-              <div
-                v-if="visitTaskList.length > 0"
-                style="display: flex; flex-direction: row"
-              >
-                <div
-                  v-for="s in visitTaskList"
-                  :key="s.VisitTaskId"
-                  class="visit-item"
-                  :class="{
-                    'visit-item-active': activeTaskVisitId == s.VisitTaskId,
-                  }"
-                  @click.prevent="handleClick(s)"
-                >
+              <div v-if="visitTaskList.length > 0" style="display: flex; flex-direction: row">
+                <div v-for="s in visitTaskList" :key="s.VisitTaskId" class="visit-item" :class="{
+                  'visit-item-active': activeTaskVisitId == s.VisitTaskId,
+                }" @click.prevent="handleClick(s)">
                   {{ s.TaskBlindName }}
                 </div>
               </div>
             </div>
           </div>
           <div class="right">
-            <div
-              v-for="s in visitTaskList"
-              v-show="activeTaskVisitId === s.VisitTaskId"
-              :key="s.VisitTaskId"
-              class="study-wrapper"
-            >
-              <StudyList
-                v-if="selectArr.includes(s.VisitTaskId)"
-                :ref="s.VisitTaskId"
-                :visit-task-id="s.VisitTaskId"
-                :trial-id="trialId"
-                :subject-visit-id="s.VisitId"
-                :task-blind-name="s.TaskBlindName"
-                :is-reading-show-subject-info="isReadingShowSubjectInfo"
-                @loadImageStack="loadImageStack"
-                @previewNoneDicoms="previewNoneDicoms"
-              />
+            <div v-for="s in visitTaskList" v-show="activeTaskVisitId === s.VisitTaskId" :key="s.VisitTaskId"
+              class="study-wrapper">
+              <StudyList v-if="selectArr.includes(s.VisitTaskId)" :ref="s.VisitTaskId" :visit-task-id="s.VisitTaskId"
+                :trial-id="trialId" :subject-visit-id="s.VisitId" :task-blind-name="s.TaskBlindName"
+                :is-reading-show-subject-info="isReadingShowSubjectInfo" @loadImageStack="loadImageStack"
+                @previewNoneDicoms="previewNoneDicoms" />
             </div>
           </div>
         </div>
@@ -48,21 +28,12 @@
     </div>
     <div class="dicom-viewer">
       <div class="container">
-        <DicomViewer
-          v-if="activeTaskVisitId"
-          ref="dicomViewer"
-          :trial-id="trialId"
-          :trial-reading-criterion-id="trialReadingCriterionId"
-          :subject-id="subjectId"
-          :is-show="isShow"
-          :is-exists-clinical-data="isExistsClinicalData"
-          :is-exists-no-dicom-file="isExistsNoDicomFile"
+        <DicomViewer v-if="activeTaskVisitId" ref="dicomViewer" :trial-id="trialId"
+          :trial-reading-criterion-id="trialReadingCriterionId" :subject-id="subjectId" :is-show="isShow"
+          :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile"
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-          :isExistsManual="isExistsManual"
-          :IseCRFShowInDicomReading="IseCRFShowInDicomReading"
-          @previewCD="previewCD"
-        />
+          :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isExistsManual="isExistsManual"
+          :IseCRFShowInDicomReading="IseCRFShowInDicomReading" @previewCD="previewCD" />
       </div>
     </div>
   </div>
@@ -77,6 +48,7 @@ import { mapGetters } from "vuex";
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+import { workSpeedclose } from "@/utils"
 // import metaDataProvider from '@/utils/metaDataProvider'
 // cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 var config = {
@@ -261,6 +233,7 @@ export default {
     DicomEvent.$off("addNoneDicomMeasureData");
     DicomEvent.$off("selectSeries");
     window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
+    workSpeedclose(true)
   },
   methods: {
     async getVisitInfo() {
@@ -547,7 +520,7 @@ export default {
       if (obj) {
         let index = Math.floor(
           obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds)
+          ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds)
         );
         obj.imageIdIndex = index > 0 ? index - 1 : 0;
       }
@@ -636,7 +609,7 @@ export default {
                 // );
                 let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
                 // let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-                let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+                let n = series.instanceInfoList.findIndex(k => k.Id === instanceId)
                 let filterStr = ''
                 if (n > -1 && series.isExistMutiFrames) {
                   if (series.instanceInfoList[n].NumberOfFrames > 0) {
@@ -683,12 +656,15 @@ export default {
     },
     cornerstoneimageloadprogress(e) {
       const imageId = e.detail.imageId
+      console.log(imageId,'imageId')
       const params = {}
       const searchParams = new URLSearchParams(imageId.split('?')[1])
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
+      params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }
   },
@@ -699,22 +675,27 @@ export default {
   height: 100%;
   // background-color: #fff;
   background-color: #000;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   .report-header {
     display: flex;
   }
+
   .el-card {
     background-color: #000;
     color: #ffffff;
     border: none;
   }
+
   ::v-deep .el-table,
   .el-table__expanded-cell {
     background-color: #000;
@@ -728,19 +709,23 @@ export default {
     color: #fff;
     border-color: #444444;
   }
-  ::v-deep .el-table__body tr > td {
+
+  ::v-deep .el-table__body tr>td {
     background-color: #000 !important;
     color: #fff;
     border-color: #444444;
   }
-  ::v-deep .el-table__body tr:hover > td {
+
+  ::v-deep .el-table__body tr:hover>td {
     background-color: #858282 !important;
     color: #fff;
     border-color: #444444;
   }
+
   ::v-deep .el-table--border th.gutter:last-of-type {
     border: none;
   }
+
   ::v-deep .el-card__header {
     border: none;
     padding: 10px;
@@ -753,10 +738,12 @@ export default {
   justify-content: flex-start;
   background-color: #000;
   box-sizing: border-box;
+
   ::-webkit-scrollbar {
     width: 5px;
     height: 5px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
@@ -773,6 +760,7 @@ export default {
       box-sizing: border-box;
     }
   }
+
   .dicom-list {
     width: 200px;
     padding: 5px 0px;
@@ -785,6 +773,7 @@ export default {
       border: 1px solid #727272;
       // border: 1px solid #ccc;
     }
+
     .el-tabs {
       box-sizing: border-box;
       padding: 0 5px;
@@ -793,24 +782,29 @@ export default {
       flex-direction: column;
       // justify-content: flex-start;
       border: 1px solid #727272;
+
       .el-tabs__item {
         color: #fff;
       }
+
       ::v-deep .el-tabs__header {
         height: 55px;
         margin: 0px;
         box-sizing: border-box;
       }
+
       ::v-deep .el-tabs__content {
         flex: 1;
         margin: 0px;
         overflow-y: auto;
         box-sizing: border-box;
       }
+
       ::v-deep .el-tabs__item {
         color: #fff;
       }
     }
+
     .dicom-desc {
       font-weight: bold;
       font-size: 13px;
@@ -819,23 +813,28 @@ export default {
       color: #d0d0d0;
       padding: 2px;
     }
+
     .ps {
       overflow-anchor: none;
       touch-action: auto;
     }
+
     .series-active {
       background-color: #607d8b !important;
       border: 1px solid #607d8b !important;
     }
+
     ::v-deep .el-progress__text {
       color: #ccc;
       font-size: 12px;
     }
+
     .series {
       width: 100%;
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
+
       .series-wrapper {
         display: flex;
         flex-direction: row;
@@ -848,9 +847,11 @@ export default {
         border-radius: 2px;
         border: 1px solid #404040;
         background-color: #3a3a3a;
+
         .el-progress__text {
           display: none;
         }
+
         .el-progress-bar {
           padding-right: 0px;
         }
@@ -861,8 +862,10 @@ export default {
           border: 2px solid #252525;
           cursor: pointer;
         }
+
         .image-desc {
           vertical-align: top;
+
           p {
             width: 100px;
             white-space: nowrap;
@@ -876,6 +879,7 @@ export default {
         }
       }
     }
+
     .related-study-wrapper {
       box-sizing: border-box;
       height: 100%;
@@ -891,6 +895,7 @@ export default {
         overflow-x: hidden;
         overflow-y: auto;
         box-sizing: border-box;
+
         .visit-name-wrapper {
           position: absolute;
           top: 5px;
@@ -906,6 +911,7 @@ export default {
           // flex-direction: row;
           // align-content: flex-start;
         }
+
         .visit-item {
           margin-left: 10px;
           white-space: nowrap;
@@ -918,17 +924,20 @@ export default {
           cursor: pointer;
           // margin-left: 10px;
         }
+
         .visit-item-active {
           background-color: #607d8b;
           border: 1px solid #607d8b;
         }
       }
+
       .right {
         width: 170px;
         flex: 1;
         height: 100%;
         border-left: 1px solid #4a4a4a;
         color: #d5d5d5;
+
         .study-wrapper {
           width: 100%;
           height: 100%;

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

@@ -1,7 +1,7 @@
 <template>
   <div ref="container" style="width:100%;height:100%" class="dicom-container">
     <!-- 访视阅片 -->
-    <div v-if="readingCategory === 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1)) " class="reading-wrapper">
+    <div v-if="readingCategory=== 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1)) " class="reading-wrapper">
       <VisitReview :reading-tool="readingTool" />
     </div>
     <div v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType !== 0" class="reading-wrapper">

src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="viewport-fusion" class="viewport-wrapper" v-loading="loading" element-loading-text="Loading..."
+  <div ref="viewport-fusion" class="viewport-wrapper" v-loading="loading" :element-loading-text="NSTip"
     element-loading-background="rgba(0, 0, 0, 0.8)" @mouseup="sliderMouseup" @mousemove="sliderMousemove"
     @mouseleave="sliderMouseleave" :style="{ color: series.Modality === 'PT' || isMip ? '#666' : '#ddd' }">
     <div v-if="series && taskInfo" class="left-top-text">
@@ -786,7 +786,12 @@ export default {
       e.stopPropagation()
       e.preventDefault()
     }
-  }
+  },
+  computed: {
+    NSTip() {
+      return `NS: ${this.$store.state.trials.uploadTip}`
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -794,7 +799,6 @@ export default {
   width: 100%;
   height: 100%;
   position: relative;
-  cursor: default !important;
 
   .left-top-text {
     position: absolute;

src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue

@@ -8,24 +8,35 @@
           <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            placement="bottom">
-            <i class="el-icon-refresh-left" @click="resetForm" />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetForm"
+            />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量评估 -->
       <div v-if="outerQuestions.length > 0" class="outer_form_wrapper">
-        <el-form ref="outerForm" size="small" :model="outerForm">
-          <question-form-item v-for="outerQs in outerQuestions" :key="outerQs.Id" :question="outerQs"
-            :question-form="outerForm" :reading-task-state="readingTaskState" :visit-task-id="visitTaskId"
-            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" />
+        <el-form
+          ref="outerForm"
+          size="small"
+          :model="outerForm"
+        >
+          <question-form-item
+            v-for="outerQs in outerQuestions"
+            :key="outerQs.Id"
+            :question="outerQs"
+            :question-form="outerForm"
+            :reading-task-state="readingTaskState"
+            :visit-task-id="visitTaskId"
+            @resetFormItemData="resetOuterFormItemData"
+            @setFormItemData="setOuterFormItemData"
+          />
           <el-form-item v-if="readingTaskState < 2">
             <div class="outer_form-footer">
-              <i class="el-icon-warning feedback-icon"
-                :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }"
-                @click="openFeedBackTable" />
+              <i class="el-icon-warning feedback-icon" :style="{color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}" @click="openFeedBackTable" />
               <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
             </div>
           </el-form-item>
@@ -33,116 +44,146 @@
       </div>
       <!-- 病灶评估 -->
       <template v-if="tableQuestions.length > 0 && criterionType !== 10">
-        <div v-for="(qs, index) in tableQuestions" :key="index" class="lesions lesions_wrapper">
-          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
+        <div
+          v-for="(qs,index) in tableQuestions"
+          :key="index"
+          class="lesions lesions_wrapper"
+        >
+          <h4
+            v-if="qs.Type === 'group'"
+            style="color: #ddd;padding: 5px 0px;margin: 0;"
+          >
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <div v-for="table in qs.Childrens" v-show="!(isBaseLineTask && table.LesionType === 2)" :key="table.Id">
-              <div v-if="table.Type === 'table'" class="flex-row" style="margin:3px 0;">
+            <div
+              v-for="table in qs.Childrens"
+              v-show="!(isBaseLineTask && table.LesionType === 2)"
+              :key="table.Id"
+            >
+              <div
+                v-if="table.Type === 'table'"
+                class="flex-row"
+                style="margin:3px 0;"
+              >
                 <div class="title">{{ table.QuestionName }}</div>
-                <div v-if="readingTaskState < 2 && (isBaseLineTask || table.LesionType === 2)" class="add-icon"
-                  @click.prevent="addTarget(table)">
+                <div
+                  v-if="readingTaskState<2 && (isBaseLineTask || table.LesionType === 2)"
+                  class="add-icon"
+                  @click.prevent="addTarget(table)"
+                >
                   <i class="el-icon-plus" />
                 </div>
               </div>
-              <el-collapse v-if="table.Type === 'table' && table.TableQuestions" v-model="activeName" accordion
-                @change="handleCollapseChange">
-                <el-collapse-item v-for="(answer, i) in table.TableQuestions.Answers"
-                  :key="`${table.Id}_${answer.RowIndex}`" :name="`${table.Id}_${answer.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)">
+              <el-collapse
+                v-if="table.Type === 'table' && table.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(answer,i) in table.TableQuestions.Answers"
+                  :key="`${table.Id}_${answer.RowIndex}`"
+                  :name="`${table.Id}_${answer.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)"
+                >
                   <template slot="title">
-                    <div style="width:340px;position: relative;"
-                      :style="{ color: (activeName === table.Id + answer.RowIndex ? '#ffeb3b' : '#fff') }">
-                      {{ getLesionName(table.OrderMark, answer.RowIndex) }}
+                    <div
+                      style="width:340px;position: relative;"
+                      :style="{color:(activeName===table.Id+answer.RowIndex?'#ffeb3b':'#fff')}"
+                    >
+                      {{ getLesionName(table.OrderMark,answer.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip
-                        v-if="readingTaskState < 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0"
-                        class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                         <i class="el-icon-warning" style="color:red" />
                       </el-tooltip>
                       <!-- 信息不完整 -->
-                      <el-tooltip
-                        v-if="readingTaskState < 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 1"
-                        class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')"
-                        placement="bottom">
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
                       <div style="position: absolute;left: 50px;top: 2px;">
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          <div
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
                             style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart">
+                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          >
                             {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart }}
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="table.LesionType === 0">
-                              {{
-                                $fd('TargetState', parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('TargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                             </span>
                             <span v-else-if="table.LesionType === 1">
-                              {{
-                                $fd('NoTargetState',
-                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('NoTargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                             </span>
                             <span v-else>
-                              {{
-                                $fd('NewLesionState',
-                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                             </span>
                           </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
-                            <template
-                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
                             </template>
-                            <template
-                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
                             </template>
                           </div>
                         </div>
                       </div>
                       <!-- 分裂 -->
-                      <div
-                        v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0, 1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'"
-                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
-                        <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false"
-                          class="table" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
-                            @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
+                      <div v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0,1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <el-tooltip v-show="readingTaskState<2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false" class="table" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <el-form :ref="`${table.Id}_${answer.RowIndex}`" size="small"
-                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]">
-                    <table-question-form-item :ref="`form_${table.Id}_${answer.RowIndex}`" :table-info="table"
-                      :answer="answer" :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
-                      :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
-                      :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
-                      @lesionTypeChange="lesionTypeChange" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                  <el-form
+                    :ref="`${table.Id}_${answer.RowIndex}`"
+                    size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                  >
+                    <table-question-form-item
+                      :ref="`form_${table.Id}_${answer.RowIndex}`"
+                      :table-info="table"
+                      :answer="answer"
+                      :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                      :reading-task-state="readingTaskState"
+                      :organs="organs"
+                      :is-base-line-task="isBaseLineTask"
+                      :is-current-task="isCurrentTask"
+                      @update="innerFormDataUpdate"
+                      @close="closeInnerForm"
+                      @lesionTypeChange="lesionTypeChange"
+                    />
+                    <div
+                      v-if="readingTaskState<2"
+                      style="text-align:right;margin-top:10px;"
+                    >
                       <!-- 清除标记 -->
-                      <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
-                        @click="clearMeasureData(table, answer.RowIndex)">
+                      <el-button
+                        v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData"
+                        size="mini"
+                        @click="clearMeasureData(table, answer.RowIndex)"
+                      >
                         {{ $t('trials:reading:button:removeMark') }}
                       </el-button>
                       <!-- 删除 -->
-                      <el-button v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'" size="mini"
-                        @click="deleteLesion(table, answer.RowIndex)">
+                      <el-button
+                        v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'"
+                        size="mini"
+                        @click="deleteLesion(table, answer.RowIndex)"
+                      >
                         {{ $t('common:button:delete') }}
                       </el-button>
                       <!-- 保存 -->
-                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
+                      <el-button
+                        size="mini"
+                        @click="saveLesion(table, answer.RowIndex)"
+                      >
                         {{ $t('common:button:save') }}
                       </el-button>
                     </div>
@@ -171,7 +212,6 @@ import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
 import QuestionFormItem from './QuestionFormItem'
 import TableQuestionFormItem from './TableQuestionFormItem'
-import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
   name: 'QuestionList',
   components: {
@@ -243,7 +283,6 @@ export default {
     this.getOrganList()
     this.getOuterQuestions()
     this.getTableQuestions()
-    window.addEventListener('message', this.receiveMsg)
   },
   methods: {
     // 获取器官信息
@@ -305,7 +344,7 @@ export default {
       this.$set(this.outerForm, v, null)
     },
     setOuterFormItemData(obj) {
-
+      
     },
     // 获取表格问题
     async getTableQuestions() {
@@ -429,7 +468,7 @@ export default {
       }
     },
     setAnnotation(obj) {
-      const annotation = Object.assign({}, !Object.hasOwn(obj, 'isDicomReading') ? obj.annotation : obj)
+      const annotation = Object.assign({}, obj.annotation)
       if (this.activeName) {
         // 判断当前激活的病灶是否有标注信息
         const tableId = this.activeName.split('_')[0]
@@ -454,13 +493,6 @@ export default {
             child => child.Id === tableId
           )
           if (typeof targetTable !== 'object') return
-          if (Object.hasOwn(annotation, 'isDicomReading') && !annotation.isDicomReading) {
-            // 非dicom获取名称进行重绘
-            annotation.data.remark = innerForm.LesionName
-            annotation.markTool = annotation.data.toolName
-            DicomEvent.$emit('addNoneDicomMeasureData', annotation)
-            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'IsDicomReading', false)
-          }
           this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
           let length = null
           let short = null
@@ -512,7 +544,7 @@ export default {
           }
           this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
           this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation)
-
+          
         }
       } else {
         if (this.isBaseLineTask) {
@@ -624,7 +656,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
         })
         return
       }
@@ -635,7 +667,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
         })
         return
       }
@@ -644,16 +676,10 @@ export default {
       answer.RowId = ''
       const maxIndex = this.getMaxRowIndex(tableInfo.TableQuestions.Answers)
       answer.RowIndex = `${maxIndex + 1}.00`
-      answer.IsDicomReading = annotation && Object.hasOwn(annotation, 'isDicomReading') ? annotation.isDicomReading : true
+      answer.IsDicomReading = true
       answer.SaveTypeEnum = 0
       answer.LesionType = tableInfo.LesionType
       answer.LesionName = this.getLesionName(tableInfo.OrderMark, answer.RowIndex)
-      if (!answer.IsDicomReading) {
-        // 非dicom获取名称进行重绘
-        annotation.data.remark = answer.LesionName
-        annotation.markTool = annotation.data.toolName
-        DicomEvent.$emit('addNoneDicomMeasureData', annotation)
-      }
       let state = null
       if (this.isBaseLineTask && tableInfo.LesionType === 0) {
         state = 0
@@ -667,14 +693,14 @@ export default {
       tableInfo.TableQuestions.Answers.push(answer)
       if (typeof annotation === 'object') {
         answer.MeasureData = annotation
-        if (annotation.metadata?.toolName === 'Length') {
+        if (annotation.metadata.toolName === 'Length') {
           const referencedImageId = annotation.metadata.referencedImageId
           let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
           length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
           const lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
           answer.LesionLength = length
           answer[lengthId] = length
-        } else if (annotation.metadata?.toolName === 'Bidirectional') {
+        } else if (annotation.metadata.toolName === 'Bidirectional') {
           const referencedImageId = annotation.metadata.referencedImageId
           let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
           length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
@@ -749,11 +775,7 @@ export default {
       this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionState', null)
       const obj = Object.assign({}, innerForm.MeasureData)
       // 移除标注信息
-      if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-        this.$emit('removeAnnotation', obj)
-      } else {
-        DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-      }
+      this.$emit('removeAnnotation', obj)
       // 重置标注信息
       this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
       // 重置保存标志
@@ -784,11 +806,7 @@ export default {
             if (innerForm.MeasureData) {
               // 移除标注信息
               const obj = Object.assign({}, innerForm.MeasureData)
-              if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-                this.$emit('removeAnnotation', obj)
-              } else {
-                DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-              }
+              this.$emit('removeAnnotation', obj)
             }
             // 刷新表格问题
             await this.getTableQuestions()
@@ -801,11 +819,7 @@ export default {
           if (innerForm.MeasureData) {
             // 移除标注信息
             const obj = Object.assign({}, innerForm.MeasureData)
-            if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-              this.$emit('removeAnnotation', obj)
-            } else {
-              DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-            }
+            this.$emit('removeAnnotation', obj)
           }
           // 移除病灶
           this.removeAnswer(table.Id, rowIndex)
@@ -843,7 +857,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -855,7 +869,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -867,25 +881,24 @@ export default {
           if (lesionType === 1 && lesionState === 0) {
             if (lymphNodes === 1) {
               // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
                 this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具或箭头工具
-              console.log(measureData, 'measureData')
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -903,7 +916,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -915,7 +928,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -931,7 +944,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -948,7 +961,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -970,7 +983,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -982,7 +995,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -998,7 +1011,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1010,7 +1023,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1027,24 +1040,24 @@ export default {
           if (lesionType === 1 && lesionState === 0) {
             if (lymphNodes === 1) {
               // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1056,24 +1069,24 @@ export default {
           if (lesionType === 1 && lesionState === 1) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
                 this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1090,7 +1103,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1102,7 +1115,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1119,7 +1132,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1131,7 +1144,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1148,7 +1161,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1160,7 +1173,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1177,7 +1190,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1189,7 +1202,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1206,7 +1219,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1218,7 +1231,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1235,7 +1248,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1247,7 +1260,7 @@ export default {
                 this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                   type: 'warning',
                   showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                 })
                 loading.close()
                 return
@@ -1377,7 +1390,7 @@ export default {
         if (annotation) {
           this.setMarkName(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionType, obj.val, this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionName, annotation)
         }
-
+        
       }
       if (obj.questionMark === 8) {
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val)
@@ -1435,7 +1448,7 @@ export default {
           this.$confirm(msg, {
             type: 'warning',
             showCancelButton: false,
-            callback: action => { }
+            callback: action => {}
           })
           return
         }
@@ -1538,7 +1551,7 @@ export default {
         type: 'imgfail',
         trialId: this.$route.query.trialId,
         visitTaskId: this.visitTaskId,
-        callBack: async () => {
+        callBack: async() => {
           const confirm = await this.$confirm(
             this.$t('trials:reading:confirm:feedbackmsg'),
             {
@@ -1575,7 +1588,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1592,7 +1605,7 @@ export default {
         this.$confirm(msg, {
           type: 'warning',
           showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1603,7 +1616,7 @@ export default {
         this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
           type: 'warning',
           showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
         })
         this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
         return
@@ -1681,11 +1694,7 @@ export default {
         // 移除标注信息
         if (innerForm.MeasureData) {
           const obj = Object.assign({}, innerForm.MeasureData)
-          if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-            this.$emit('removeAnnotation', obj)
-          } else {
-            DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-          }
+          this.$emit('removeAnnotation', obj)
         }
         // 关闭窗口
         this.activeName = ''
@@ -1745,9 +1754,9 @@ export default {
         if (this.activeName) {
           return this.checkToolCanActive(toolName)
         } else {
-          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
             return { isCanActiveTool: true, reason: '' }
-          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi')) {
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
             return { isCanActiveTool: true, reason: '' }
           } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
@@ -1770,10 +1779,10 @@ export default {
           } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
             // '非淋巴结靶病灶需使用直径测量工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleROI') {
             // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleROI') {
             // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
           } else if (toolName === 'ArrowAnnotate') {
@@ -1788,10 +1797,10 @@ export default {
           } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
             // 非淋巴结靶病灶需使用直径测量工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
             // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
             // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
           } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
@@ -1810,44 +1819,28 @@ export default {
       } else {
         return { isCanActiveTool: true, reason: '' }
       }
-    },
-    receiveMsg(event) {
-      if (event.data.type === 'isCanActiveNoneDicomTool') {
-        let obj = { isCanActiveTool: true, lesionName: '', reason: '', toolName: event.data.toolName }
-        let { isCanActiveTool, reason } = this.validTool(event.data.toolName)
-        obj.isCanActiveTool = isCanActiveTool
-        obj.reason = reason
-        DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
-      } else if (event.data.type === 'setMeasurement') {
-        if (JSON.stringify(event.data.data) !== "{}") {
-          this.setAnnotation(event.data.data)
-        }
-      }
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.questionList-wrapper {
+.questionList-wrapper{
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container {
+  .container{
     padding: 10px;
-
-    .basic-info {
+    .basic-info{
       display: flex;
       justify-content: space-between;
       align-items: center;
-
-      h3 {
+      h3{
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-
-      i {
+      i{
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -1855,75 +1848,64 @@ export default {
       }
     }
   }
-
-  .outer_form_wrapper {
-    ::v-deep .el-form-item__label {
+  .outer_form_wrapper{
+    ::v-deep .el-form-item__label{
       color: #c3c3c3;
       text-align: left;
     }
-
-    ::v-deep .el-input__inner {
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
 
-    ::v-deep .el-textarea__inner {
-      background-color: transparent;
-      color: #ddd;
-      border: 1px solid #5e5e5e;
-    }
-
-    ::v-deep .el-form-item {
+    ::v-deep .el-form-item{
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
       flex-wrap: wrap;
     }
-
-    ::v-deep .el-form-item__content {
+    ::v-deep .el-form-item__content{
       flex: 1;
     }
-
-    ::v-deep .el-button--mini,
-    .el-button--mini.is-round {
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
       padding: 7px 10px;
     }
-
-    ::v-deep .el-form-item__content .el-select {
+    ::v-deep .el-form-item__content
+    .el-select{
       width: 100%;
     }
-
-    .outer_form-footer {
+    .outer_form-footer{
       display: flex;
       flex-direction: row;
       justify-content: flex-end;
       align-items: center;
-
-      .feedback-icon {
+      .feedback-icon{
         padding: 0 10px;
         color: #fff;
         font-weight: 400;
         font-size: 22px;
         cursor: pointer;
-
-        &:hover {
+        &:hover{
           color: #68a2d5;
         }
       }
     }
 
   }
-
-  .title {
+  .title{
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-
-  .add-icon {
+  .add-icon{
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -1932,49 +1914,42 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-
-  .add-icon:hover {
+  .add-icon:hover{
     background-color: #607d8b;
   }
 
-  .flex-row {
+  .flex-row{
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-
-  .lesion_list {
+  .lesion_list{
     position: relative;
   }
-
-  .el-collapse {
-    border-bottom: none;
-    border-top: none;
-
-    ::v-deep .el-collapse-item {
-      background-color: #000 !important;
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
       color: #ddd;
 
     }
-
-    ::v-deep .el-collapse-item__header {
-      background-color: #000 !important;
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
       color: #ddd;
-      border-bottom-color: #5a5a5a;
+      border-bottom-color:#5a5a5a;
       padding-left: 5px;
       height: 35px;
       line-height: 35px;
     }
-
-    ::v-deep .el-collapse-item__wrap {
-      background-color: #000 !important;
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
       color: #ddd;
     }
-
-    ::v-deep .el-collapse-item__content {
-      width: 260px;
+    ::v-deep .el-collapse-item__content{
+      width:260px;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1983,7 +1958,7 @@ export default {
       z-index: 1;
       color: #ddd;
       padding: 5px;
-      background-color: #1e1e1e;
+      background-color:#1e1e1e;
     }
 
   }

src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue

@@ -59,7 +59,7 @@
                 <div class="series-image">
                   <el-image
                     style="width: 100%;height: 100%;"
-                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath || series.NoneDicomFileFirstFile}`"
+                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath}`"
                     fit="fill"
                     crossorigin="anonymous"
                   />

src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue

@@ -3,7 +3,7 @@
     ref="viewport"
     class="viewport-wrapper"
     v-loading="loading"
-    element-loading-text="Loading..."
+    :element-loading-text="NSTip"
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @mouseup="sliderMouseup"
     @mousemove="sliderMousemove"
@@ -323,7 +323,7 @@ export default {
       const viewport = renderingEngine.getViewport(this.viewportId)
 
       if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
+        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false })
       } else {
         cornerstoneTools.utilities.cine.stopClip(viewport.element)
       }
@@ -403,7 +403,6 @@ export default {
         }
         // if (isLocate && obj.SliceIndex === this.series.SliceIndex) return
         if (this.series?.Stack && obj.Stack[obj.SliceIndex] === this.series.Stack[this.series.SliceIndex]) return
-        this.toggleClipPlay(false)
         this.series = { ...obj }
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         const viewport = renderingEngine.getViewport(this.viewportId)
@@ -416,7 +415,6 @@ export default {
         }
         this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
         await viewport.setStack(this.series.Stack, obj.SliceIndex)
-        
         viewport.render()
       } catch (e) {
         console.log(e)
@@ -539,7 +537,12 @@ export default {
       e.stopPropagation()
       e.preventDefault()
     }
-  }
+  },
+  computed: {
+    NSTip() {
+      return `NS: ${this.$store.state.trials.uploadTip}`
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -547,7 +550,6 @@ export default {
   width:100%;
   height:100%;
   position: relative;
-  cursor: default !important;
   .left-top-text {
     position: absolute;
     left: 5px;

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue

@@ -1,666 +0,0 @@
-<template>
-  <div class="criterion-table-form-item">
-    <el-form-item
-      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :title="question.Remark" :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-        {
-          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
-          message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
-        },
-        {
-          validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
-          trigger: ['blur', 'change']
-        }
-      ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-      <!-- 输入框 -->
-      <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')" />
-      <!-- 多行文本输入框 -->
-      <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        :autosize="{ minRows: 2, maxRows: 4 }" />
-      <!-- 下拉框 -->
-      <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        @change="((val) => { formItemChange(val, question) })">
-        <template v-if="question.TableQuestionType === 1">
-          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]" />
-        </template>
-        <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
-        </template>
-        <template
-          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
-        </template>
-        <template v-else>
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-        </template>
-
-      </el-select>
-      <!-- 单选 -->
-      <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        @change="((val) => { formItemChange(val, question) })">
-        <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-          {{ val }}
-        </el-radio>
-      </el-radio-group>
-      <!-- 复选框 -->
-      <el-checkbox-group v-if="question.Type === 'checkbox'"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        v-model="questionForm[question.Id]">
-        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-          {{ val }}
-        </el-checkbox>
-      </el-checkbox-group>
-      <!-- 自动分类 -->
-      <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-        v-model="questionForm[question.Id]" />
-      <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-      </el-select>
-      <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }">
-        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-          {{ item.trim() }}
-        </el-radio>
-      </el-radio-group>
-      <!-- 自动计算 -->
-      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-        oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-      <!-- 自增 -->
-      <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-      <!-- 数值 -->
-      <template v-if="question.Type === 'number' && (question.ImageMarkEnum === 1 || question.ImageMarkEnum === 2)">
-        <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
-          <el-input type="number" @change="(val) => { formItemNumberChange(val, question) }"
-            @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? () => { } : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question)"
-            v-model="questionForm[question.Id]"
-            :title="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] ? questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].OrderMarkName : ''"
-            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
-            style="width: 150px;">
-            <template v-if="question.Unit !== 0" slot="append">
-              {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
-            </template>
-          </el-input>
-          <!-- 测量 -->
-          <el-button
-            v-if="readingTaskState < 2 && (!questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] || (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked))"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 1, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:measure') }}
-          </el-button>
-          <!-- 绑定 -->
-          <el-button
-            v-if="readingTaskState < 2 && (!questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] || (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked))"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 0, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:bind') }}
-          </el-button>
-          <!-- 查看 -->
-          <el-button
-            v-if="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 2, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:view') }}
-          </el-button>
-          <!-- 更改 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 3, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:edit') }}
-          </el-button>
-          <!-- 移除 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 4, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:remove') }}
-          </el-button>
-          <!-- 保存 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isSaved)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 7, question })">
-            <el-tooltip
-              v-if="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isSaved"
-              class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
-              <i class="el-icon-warning" style="color:red" />
-            </el-tooltip>
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:save') }}
-          </el-button>
-        </div>
-      </template>
-      <template v-else-if="question.Type === 'number'">
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="((val) => { formItemChange(val, question) })">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-        </el-select>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
-          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)" v-model="questionForm[question.Id]">
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-        </el-input>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
-          @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-        </el-input>
-      </template>
-      <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
-        :limit="question.ImageCount === 0 ? 100 : question.ImageCount" :on-preview="handlePictureCardPreview"
-        :before-upload="handleBeforeUpload" :http-request="uploadScreenshot" list-type="picture-card"
-        :on-remove="handleRemove" :file-list="fileList"
-        :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
-        <i slot="default" class="el-icon-plus" />
-        <div slot="file" slot-scope="{file}">
-          <viewer :ref="file.url" :images="[imageUrl]" style="
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              width: 100%;
-              height: 100%;
-            ">
-            <img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url"
-              crossOrigin="anonymous" alt="" style="max-width: 100%; max-height: 100%" />
-            <span class="el-upload-list__item-actions">
-              <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                <i class="el-icon-zoom-in" />
-              </span>
-
-              <span v-if="readingTaskState < 2" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                <i class="el-icon-delete" />
-              </span>
-            </span>
-          </viewer>
-        </div>
-      </el-upload>
-      <el-dialog v-if="question.Type === 'upload'" append-to-body :visible.sync="imgVisible" width="600px">
-        <el-image :src="imageUrl" width="100%">
-          <div slot="placeholder" class="image-slot">
-            {{ $t('trials:readingUnit:qsList:message:loading') }}<span class="dot">...</span>
-          </div>
-        </el-image>
-      </el-dialog>
-    </el-form-item>
-  </div>
-</template>
-<script>
-export default {
-  name: 'QuestionTableFormItem',
-  props: {
-    isBaseline: {
-      type: Boolean,
-      required: true
-    },
-    questionForm: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    question: {
-      type: Object,
-      default() {
-        return []
-      }
-    },
-    criterionId: {
-      type: String,
-      required: true
-    },
-    calculationList: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingTaskState: {
-      type: Number,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'add'
-    },
-    questionsMarkStatus: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    parentQsId: {
-      type: String,
-      default: ''
-    },
-  },
-  computed: {
-    calculationValue: {
-      get() {
-        return this.questionForm[this.question.Id]
-      },
-      set() {
-
-      }
-    }
-  },
-  data() {
-    return {
-      addOrEdit: { visible: false, title: '' },
-      fileList: [],
-      accept: '.png,.jpg,.jpeg',
-      imgVisible: false,
-      imageUrl: '',
-      urls: [],
-      organList: [],
-      QuestionsList: [],
-      QuestionsForm: {},
-      digitPlaces: 2,
-      rowId: ''
-    }
-  },
-  watch: {
-    questionForm: {
-      deep: true,
-      immediate: true,
-      handler(v, oldv) {
-        // try {
-        //   if (!v[this.question.Id] || !oldv[this.question.Id]) return
-        // } catch (e) {
-        // }
-        // this.formItemNumberChange(this.question.Id, false)
-        this.rowId = this.questionForm.RowId
-      }
-    },
-    questionsMarkStatus: {
-      deep: true,
-      immediate: true,
-      handler(v) {
-        this.$forceUpdate()
-      }
-    }
-  },
-  mounted() {
-
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    if (this.question.Type === 'upload') {
-      if (this.questionForm[this.question.Id]) {
-        this.urls = this.questionForm[this.question.Id].split('|')
-        this.fileList = []
-        this.urls.map(url => {
-          this.fileList.push({ name: '', url: `${url}` })
-        })
-      }
-    }
-    if (this.type === 'edit') return
-  },
-  methods: {
-    numberInput(id, notId = false) {
-      if (notId) {
-        this.calculationValue = this.calculationValue.toUpperCase();
-      } else {
-        this.questionForm[id] = this.questionForm[id].toUpperCase();
-      }
-    },
-    validatorNumberInput(rule, value, callback) {
-      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
-      if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
-      } else {
-        if (!reg.test(value)) {
-          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
-        } else {
-          callback();
-        }
-      }
-    },
-    save() {
-    },
-    openAddTableCol(row) {
-      this.addOrEdit.visible = true
-      this.addOrEdit.title = row.QuestionName + this.$t('trials:readingUnit:qsList:title:tableQs')
-      this.QuestionsList = row.TableQuestions.Questions
-      this.AnswersList = row.TableQuestions.Answers
-      this.QuestionsForm = {}
-    },
-    formItemChange(v, question) {
-      if (question.Childrens && question.Childrens.length > 0) {
-        this.resetChild(question.Childrens)
-      }
-      if (question.TableQuestionType === 1 && question.RelationQuestions.length > 0) {
-        var index = this.organList.findIndex(item => item[question.DataTableColumn] === v)
-        if (index < 0) return
-        var selected = this.organList[index]
-        this.question.RelationQuestions.map(qs => {
-          var val = selected[qs.DataTableColumn]
-          // if (typeof val === 'boolean') {
-          //   // val = String(val)
-          // }
-          this.$emit('setFormItemData', { key: qs.Id, val: val, question: qs })
-        })
-      } else {
-        this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
-      }
-    },
-    handleBlur(value, a, b) {
-      if (!value) return false
-      if (!isNaN(parseFloat(value))) {
-        this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
-      }
-    },
-    handleMarkedQsBlur(value, a, b, question) {
-      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
-      question.IsTableQuestion = true
-      // this.$emit('operateImageMarker', {operateStateEnum: 6, question})
-    },
-    handleCalculationBlur(v) {
-      if (!v) return false
-      if (!isNaN(parseFloat(v))) {
-        this.calculationValue = parseFloat(v).toFixed(this.digitPlaces)
-      }
-    },
-    limitInput(value, q) {
-      if (value.indexOf('.') > -1) {
-        if (value.split('.')[1].length >= this.digitPlaces) {
-          this.$set(this.questionForm, q.Id, parseFloat(value).toFixed(this.digitPlaces))
-        }
-      } else {
-      }
-    },
-    logic(rules, num = 0) {
-      let isNE = false
-      try {
-        if (rules.CalculateQuestionList.length === 0) {
-          return false
-        }
-        let dataArr = []
-        var count = 0
-        var maxList = [], minList = []
-        rules.CalculateQuestionList.forEach((o, i) => {
-          if (this.questionForm[o.TableQuestionId] === 'NE') {
-            isNE = true
-          }
-          if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 7:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    count += parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = count / rules.CalculateQuestionList.length
-                  }
-                  break;
-                case 8:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    maxList.push(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = minList.length > 0 ? Math.max(...maxList) : 0
-                  }
-                  break;
-                case 9:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    minList.push(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = minList.length > 0 ? Math.min(...minList) : 0
-                  }
-                  break;
-              }
-            } else {
-              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                maxList.push(this.questionForm[o.TableQuestionId])
-                minList.push(this.questionForm[o.TableQuestionId])
-                count = parseFloat(this.questionForm[o.TableQuestionId])
-                num = parseFloat(this.questionForm[o.TableQuestionId])
-                dataArr.push(num)
-              }
-
-            }
-          } else {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 1:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num += parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 2:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num -= parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 3:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num *= parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 4:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
-                      num = 0
-                    } else {
-                      num /= parseFloat(this.questionForm[o.TableQuestionId])
-                    }
-                  }
-
-                  break;
-                case 10:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                    return acc + (typeof curr === "number" ? curr : 0);
-                  }, 0) / dataArr.length;
-                  break;
-                case 11:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = Math.max(...dataArr);
-                  break;
-                case 12:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = Math.min(...dataArr);
-                  break;
-              }
-            } else {
-              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                num = parseFloat(this.questionForm[o.TableQuestionId])
-              }
-
-            }
-          }
-        })
-      } catch (e) {
-        console.log(e)
-      }
-      if (isNE) {
-        return 'NE'
-      }
-      if (rules.ValueType === 2) {
-        num = num * 100
-      }
-      return num.toFixed(this.digitPlaces)
-    },
-    formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange', v, question)
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
-      // this.$emit('formItemTableNumberChange', v, question)
-    },
-    resetChild(obj) {
-      obj.forEach(i => {
-        this.$emit('resetFormItemData', i.Id)
-        if (i.Childrens && i.Childrens.length > 0) {
-          this.resetChild(i.Childrens)
-        }
-      })
-    },
-    resetFormItemData(v) {
-      this.$emit('resetFormItemData', v)
-    },
-    setFormItemData(obj) {
-      this.$emit('setFormItemData', obj)
-    },
-    async operateImageMarker(obj) {
-      obj.question.IsTableQuestion = true
-      obj.question.RowId = this.rowId
-      obj.question.ParentQsId = this.parentQsId
-      if (obj.operateStateEnum === 7) {
-        // 保存表格问题标记
-        // if (!obj.question.RowId) {
-        //   // 生成rowId
-        //   const loading = this.$loading({ fullscreen: true })
-        //   try {
-        //     let params = {
-        //       questionId: this.parentQsId,
-        //       RowIndex: this.questionForm.RowIndex,
-        //       visitTaskId: this.visitTaskId,
-        //       trialId: this.$route.query.trialId,
-        //       answerList: [],
-        //     }
-        //     let res = await submitTableQuestion(params)
-        //     // this.$emit('save',rowId)
-        //     this.QuestionsForm.RowId = res.Result.RowId
-        //     obj.rowId = res.Result.RowId
-        //     this.rowId = res.Result.RowId
-        //     loading.close()
-        //   } catch(e) {
-        //     loading.close()
-        //   }
-        // }
-        obj.rowIndex = this.questionForm.RowIndex
-        // obj.parentQsId = this.parentQsId
-        obj.answer = this.questionForm[obj.question.Id]
-      }
-      this.$emit('operateImageMarker', obj)
-    },
-    async uploadScreenshot(param) {
-      if (!this.visitTaskId) return
-      const loading = this.$loading({
-        target: document.querySelector('.el-dialog'),
-        fullscreen: false,
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading'
-      })
-      var trialId = this.$route.query.trialId
-      var subjectId = this.$route.query.trialId
-      var file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
-      this.urls.push(this.$getObjectName(res.url))
-      this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
-      loading.close()
-    },
-    handleBeforeUpload(file) {
-      // 检测文件类型是否符合要求
-      if (this.checkFileSuffix(file.name)) {
-        // this.fileList = []
-        return true
-      } else {
-        let msg = this.$t(
-          "trials:readingUnit:qsList:message:imageFormat"
-        ).replace("xxx", this.question.FileType)
-        this.$alert(msg)
-        return false
-      }
-    },
-    checkFileSuffix(fileName) {
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length)
-      if (this.question.FileType.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 预览图片
-    handlePictureCardPreview(file) {
-      var suffix = file.url.substring(file.url.lastIndexOf(".") + 1)
-      suffix = suffix ? suffix.toLowerCase() : ''
-      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf') {
-        window.open(this.OSSclientConfig.basePath + file.url, '_blank')
-      } else {
-        this.imageUrl = this.OSSclientConfig.basePath + file.url
-        // this.imgVisible = true
-        this.$refs[file.url].$viewer.show()
-      }
-
-    },
-    // 删除图片
-    handleRemove(file, fileList) {
-      this.imageUrl = ''
-      this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
-      this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
-      this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.criterion-table-form-item {
-  .el-form-item {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-  }
-
-  ::v-deep .el-select .el-input__prefix {
-    left: calc(100% - 50px);
-    cursor: pointer;
-  }
-
-  ::v-deep .el-select .el-input__inner {
-    padding-left: 15px;
-    padding-right: 50px;
-  }
-
-  .el-input {
-    width: 100%;
-  }
-
-  .el-select {
-    width: 100%;
-  }
-
-  .mb {
-    margin-bottom: 0px;
-  }
-
-  .disabled {
-    ::v-deep .el-upload--picture-card {
-      display: none;
-    }
-  }
-
-  .uploadWrapper {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-}
-</style>

src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue

@@ -73,13 +73,13 @@
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
                   </el-select>
-                  <span
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
+                  <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select'">
                     {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                   </span>
                   <el-select
-                    v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
-                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
+                    v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio' || (scope.row.Type === 'number' && scope.row.TypeValue)) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable
+                    @focus="() => { questionId = scope.row.QuestionId }">
                     <template>
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
@@ -200,12 +200,12 @@
     </el-dialog>
 
     <!-- 预览文件 -->
-    <viewer ref="picture_perview_customizeReportPage" style="margin: 0 10px"
-      v-if="currentType && ['png', 'jpg', 'jpeg'].includes(currentType.toLowerCase())"
-      :images="[`${OSSclientConfig.basePath}${currentPath}`]" :options="viewerOptions">
-
-      <img v-show="false" :src="`${OSSclientConfig.basePath}${currentPath}`" alt="Image" />
-    </viewer>
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -214,10 +214,12 @@ import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
+import PreviewFile from '@/components/PreviewFile/index'
 import { getToken } from '@/utils/auth'
+import store from '@/store'
 export default {
   name: 'CustomizeReportPage',
-  components: { SignForm },
+  components: { SignForm, PreviewFile },
   data() {
     return {
       trialId: '',
@@ -242,23 +244,9 @@ export default {
       questionForm: {},
       questionId: null,
       taskInfo: null,
+      previewVisible: false,
       currentPath: '',
-      currentType: '',
-
-
-      viewerOptions: {
-        toolbar: {
-          zoomIn: true,
-          zoomOut: true,
-          reset: true,
-          prev: false,
-          next: false,
-          rotateLeft: true,
-          rotateRight: true,
-          flipHorizontal: true,
-          flipVertical: true,
-        }
-      }
+      currentType: ''
     }
   },
   watch: {
@@ -820,33 +808,7 @@ export default {
       this.currentPath = path
       const arr = path.split('.')
       this.currentType = arr[arr.length - 1]
-      // this.previewVisible = true
-      if (['.ppt',
-        '.pptx',
-        '.doc',
-        '.docx',
-        '.xls',
-        '.xlsx'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$onlyOffice({
-          path: path,
-          type: this.currentType,
-          title: this.$t('trials:readingReport:title:preview')
-        })
-      }
-      if (['.jpg',
-        '.jpeg',
-        '.png'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$nextTick(() => {
-          this.$refs['picture_perview_customizeReportPage'].$viewer.show()
-        })
-      }
-      if (['.pdf'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$preview({
-          path: path,
-          type: 'pdf',
-          title: this.$t('trials:readingReport:title:preview')
-        })
-      }
+      this.previewVisible = true
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js

@@ -234,7 +234,6 @@ const config = {
       'name': '直径测量工具',
       'icon': 'length',
       'toolName': 'Length',
-      'props': ['length'],
       'i18nKey': 'trials:reading:button:length',
       'isDisabled': false,
       'disabledReason': ''
@@ -243,7 +242,6 @@ const config = {
       'name': '长短径测量工具',
       'icon': 'bidirection',
       'toolName': 'Bidirectional',
-      'props': ['length', 'width'],
       'i18nKey': 'trials:reading:button:bidirectional',
       'isDisabled': false,
       'disabledReason': ''
@@ -252,7 +250,6 @@ const config = {
       'name': '矩形工具',
       'icon': 'rectangle',
       'toolName': 'RectangleROI',
-      'props': ['area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:rectangle',
       'isDisabled': false,
       'disabledReason': ''
@@ -261,7 +258,6 @@ const config = {
       'name': '箭头工具',
       'icon': 'arrow',
       'toolName': 'ArrowAnnotate',
-      'props': [],
       'i18nKey': 'trials:reading:button:arrowAnnotate',
       'isDisabled': false,
       'disabledReason': ''
@@ -270,28 +266,9 @@ const config = {
       'name': '椭圆工具',
       'icon': 'oval',
       'toolName': 'CircleROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:Circle',
       'isDisabled': false,
       'disabledReason': ''
-    },
-    {
-      'name': '角度工具',
-      'icon': 'angle',
-      'toolName': 'Angle',
-      'props': ['angle'],
-      'i18nKey': 'trials:reading:button:Angle',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '角度工具',
-      'icon': 'cobb',
-      'toolName': 'CobbAngle',
-      'props': ['angle'],
-      'i18nKey': 'trials:reading:button:CobbAngle',
-      'isDisabled': false,
-      'disabledReason': ''
     }
   ]
 }

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

@@ -2,7 +2,7 @@
   <div v-loading="loading" class="reading-viewer-container">
     <!-- 访视阅片 -->
     <visit-review 
-      v-if="taskInfo && taskInfo.ReadingCategory === 1" 
+      v-if="taskInfo && taskInfo.ReadingCategory=== 1" 
     />
     <!-- 临床数据 -->
     <el-dialog

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

@@ -2,15 +2,18 @@
 <template>
   <BaseContainer class="read-task-allocation">
     <el-tabs type="border-card" v-model="TrialReadingCriterionId">
-      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId"
-        v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
+      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId" v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === i.TrialReadingCriterionId">
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:reviewAssign:table:siteCode')">
                 <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:240px;">
-                  <el-option v-for="(item, index) of siteOptions" :key="'taskSearchData' + index"
-                    :label="item.TrialSiteCode" :value="item.TrialSiteId" />
+                  <el-option
+                    v-for="(item,index) of siteOptions"
+                    :key="'taskSearchData' + index"
+                    :label="item.TrialSiteCode"
+                    :value="item.TrialSiteId"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
@@ -20,22 +23,20 @@
               <!-- 阅片人 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:reader')">
                 <el-select v-model="searchData.DoctorUserId" clearable style="width:240px;">
-                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId"
-                    :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
+                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
                 </el-select>
               </el-form-item>
-              <!-- 分配状态 -->
+                <!-- 分配状态 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:status')">
                 <el-select v-model="searchData.SubjectAllocateState" clearable style="width:240px;">
-                  <el-option v-for="item of $d.SubjectAllocateState" :key="item.id" :value="item.value"
-                    :label="item.label" />
+                  <el-option v-for="item of $d.SubjectAllocateState" :key=" item.id" :value="item.value" :label="item.label" />
                 </el-select>
               </el-form-item>
-              <!-- 分配角色 -->
+                <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
                 <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
                   <template v-for="item of $d.ArmEnum">
-                    <el-option :key="item.id" :value="item.value" :label="item.label" v-if="item.label !== 'GR'" />
+                    <el-option  :key="item.id" :value="item.value" :label="item.label" v-if="item.label!=='GR'"/>
                   </template>
                 </el-select>
               </el-form-item>
@@ -49,14 +50,11 @@
                   {{ $t('common:button:reset') }}
                 </el-button>
                 <!-- 分配规则 -->
-                <el-button type="primary" icon="el-icon-edit-outline"
-                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']"
-                  @click="openAllocationConfigVisible">
+                <el-button type="primary" icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="openAllocationConfigVisible">
                   {{ $t('trials:reviewAssign:button:assignRules') }}
                 </el-button>
                 <!-- 手动分配 -->
-                <el-button type="primary" :loading="btnLoading"
-                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
+                <el-button type="primary" :loading="btnLoading" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
                   {{ $t('trials:reviewAssign:button:manualAllocation') }}
                 </el-button>
                 <!-- 访视、全局、肿瘤学阅片任务 -->
@@ -65,216 +63,320 @@
                 </el-button>
                 <!-- 裁判阅片任务 -->
                 <el-button type="primary" :loading="btnLoading" @click="openAllocation('referee')">
-                  {{ $t('trials:reviewAssign:button:adReadingTasks') }}
+                  {{$t('trials:reviewAssign:button:adReadingTasks')}}
                 </el-button>
               </el-form-item>
             </el-form>
           </div>
           <div slot="main-container">
-            <el-table :ref="TrialReadingCriterionId" v-loading="loading" v-adaptive="{ bottomOffset: 85 }" border
-              :data="list" stripe height="100" @selection-change="handleSubjectAssignListSelectChange"
-              @sort-change="handleSortChange">
+            <el-table
+              :ref="TrialReadingCriterionId"
+              v-loading="loading"
+              v-adaptive="{bottomOffset:85}"
+              border
+              :data="list"
+              stripe
+              height="100"
+              @selection-change="handleSubjectAssignListSelectChange"
+              @sort-change="handleSortChange"
+            >
               <el-table-column type="selection" align="left" width="45" />
               <!-- 中心编号 -->
-              <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewAssign:table:siteCode')" width="140"
-                show-overflow-tooltip sortable="custom" />
+              <el-table-column
+                prop="TrialSiteCode"
+                :label="$t('trials:reviewAssign:table:siteCode')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              />
               <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:subjectCode')" width="140"
-                show-overflow-tooltip sortable="custom" />
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:subjectCode')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              />
               <!-- 访视 -->
-              <el-table-column prop="VisitTaskTypeCount" :label="$t('trials:reviewAssign:table:visit')" width="140"
-                show-overflow-tooltip sortable="custom">
+              <el-table-column
+                prop="VisitTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:visit')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              >
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.VisitTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.VisitTaskTypeCount}}</span>
                 </template>
               </el-table-column>
               <!-- 全局 -->
-              <el-table-column prop="GlobalTaskTypeCount" :label="$t('trials:reviewAssign:table:global')" width="140"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsGlobalReading" sortable="custom">
+              <el-table-column
+                prop="GlobalTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:global')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsGlobalReading"
+                sortable="custom"
+              >
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.GlobalTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.GlobalTaskTypeCount}}</span>
                 </template>
               </el-table-column>
               <!-- 裁判 -->
-              <el-table-column prop="JudgeTaskTypeCount" :label="$t('trials:reviewAssign:table:ad')" width="140"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
-                sortable="custom">
+              <el-table-column
+                prop="JudgeTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:ad')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+                sortable="custom"
+              >
                 <template slot-scope="scope">
-                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.JudgeTaskTypeCount }}</span>
+                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.JudgeTaskTypeCount}}</span>
                 </template>
               </el-table-column>
               <!-- 肿瘤学 -->
-              <el-table-column prop="OncologyTaskTypeCount" :label="$t('trials:reviewAssign:table:oncology')"
-                width="140" show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading" sortable="custom">
+              <el-table-column
+                prop="OncologyTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:oncology')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsOncologyReading"
+                sortable="custom"
+              >
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.OncologyTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.OncologyTaskTypeCount}}</span>
                 </template>
               </el-table-column>
               <!-- 阅片人（R1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 1">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 1"
+              >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 阅片人（R1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 2"
+              >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 阅片人（R2） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r2')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r2')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 2"
+              >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 裁判(AD) -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:ad')" min-width="100"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:ad')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+              >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 肿瘤阅片人（O1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:o1')" min-width="100"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:o1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsOncologyReading"
+              >
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="" :label="$t('common:action:action')" width="180" show-overflow-tooltip
-                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])">
+              <el-table-column
+                prop=""
+                :label="$t('common:action:action')"
+                width="180"
+                show-overflow-tooltip
+                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])"
+              >
                 <template slot-scope="scope">
                   <!-- 手动分配 -->
-                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 4" icon="el-icon-thumb"
+                  <el-button
+                    circle
+                    :disabled="scope.row.NowDoctorUserList.length === 4"
+                    icon="el-icon-thumb"
                     :title="$t('trials:reviewAssign:tableAction:manualAssignment')"
-                    @click="manualAllocation(scope.row)" />
+                    @click="manualAllocation(scope.row)"
+                  />
                   <!-- 清除阅片人 -->
-                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 0" icon="el-icon-close"
-                    :title="$t('trials:reviewAssign:tableAction:clearReaders')" @click="openClearAudience(scope.row)" />
+                  <el-button
+                    circle
+                    :disabled="scope.row.NowDoctorUserList.length === 0"
+                    icon="el-icon-close"
+                    :title="$t('trials:reviewAssign:tableAction:clearReaders')"
+                    @click="openClearAudience(scope.row)"
+                  />
                   <!-- 查看取消历史 -->
-                  <el-button circle icon="el-icon-document-copy"
+                  <el-button
+                    circle
+                    icon="el-icon-document-copy"
                     :title="$t('trials:reviewAssign:tableAction:viewHistory')"
-                    @click="openSubjectCancelDoctorHistoryList(scope.row)" />
+                    @click="openSubjectCancelDoctorHistoryList(scope.row)"
+                  />
                 </template>
               </el-table-column>
             </el-table>
-            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total"
-              :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
             <!-- 分配规则 -->
-            <el-dialog :title="$t('trials:reviewAssign:dialog:allocationRules')" :visible.sync="AllocationConfigVisible"
-              width="1400px" :close-on-click-modal="false" custom-class="base-dialog-wrapper">
+            <el-dialog
+              :title="$t('trials:reviewAssign:dialog:allocationRules')"
+              :visible.sync="AllocationConfigVisible"
+              width="1400px"
+              :close-on-click-modal="false"
+              custom-class="base-dialog-wrapper"
+            >
               <div class="base-dialog-body" style="position: relative;">
                 <!-- 阅片人列表 -->
                 <el-divider content-position="left" style="margin-bottom: 40px;">
-                  {{ $t('trials:reviewAssign:allocationRules:title:readersList') }}
+                  {{$t('trials:reviewAssign:allocationRules:title:readersList')}}
                 </el-divider>
-                <el-form style="margin-top: 40px" ref="signForm" size="small" label-width="0px">
+                <el-form
+                  style="margin-top: 40px"
+                  ref="signForm"
+                  size="small"
+                  label-width="0px"
+                >
                   <el-form-item>
-                    <el-table v-loading="loading" border :data="TaskAllocationRuleList" stripe>
-                      <!-- 阅片人 -->
-                      <el-table-column prop="DoctorUser.UserName"
-                        :label="$t('trials:reviewAssign:allocationRules:table:reader')" min-width="180"
-                        show-overflow-tooltip>
+                    <el-table
+                      v-loading="loading"
+                      border
+                      :data="TaskAllocationRuleList"
+                      stripe
+                    >
+                    <!-- 阅片人 -->
+                      <el-table-column
+                        prop="DoctorUser.UserName"
+                        :label="$t('trials:reviewAssign:allocationRules:table:reader')"
+                        min-width="180"
+                        show-overflow-tooltip
+                      >
                         <template slot-scope="scope">
                           {{ `${scope.row.DoctorUser.UserName}(${scope.row.DoctorUser.FullName})` }}
                         </template>
                       </el-table-column>
                       <!-- 计划受试者数量 -->
-                      <el-table-column prop="PlanSubjectCount"
-                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')" min-width="130"
-                        show-overflow-tooltip />
+                      <el-table-column
+                        prop="PlanSubjectCount"
+                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')"
+                        min-width="130"
+                        show-overflow-tooltip
+                      />
                       <!-- 阅片类型 -->
-                      <el-table-column prop="ReadingCategorys"
+                      <el-table-column
+                        prop="ReadingCategorys"
                         :label="$t('trials:reviewAssign:allocationRules:table:readingType')"
-                        :width="360 * TrialReadingCriterionList.length" show-overflow-tooltip>
-                        <template v-for="ite of TrialReadingCriterionList">
-                          <el-table-column :label="ite.TrialReadingCriterionName" :key="ite.TrialReadingCriterionId"
-                            v-if="TrialReadingCriterionId === ite.TrialReadingCriterionId" width="260"
-                            show-overflow-tooltip>
-                            <template slot-scope="scope">
-                              <span
-                                v-for="item of scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }) ? scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }).ReadingCategorys : []"
-                                :key="item">
-                                <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' +
-                                  $fd('ReadingCategory', 2) }}</el-tag>
-                                <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
-                                <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
-                                <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-                              </span>
-                            </template>
-                          </el-table-column>
-                        </template>
+                        :width="360 * TrialReadingCriterionList.length"
+                        show-overflow-tooltip
+                      >
+                        <el-table-column
+                          v-for="ite of TrialReadingCriterionList"
+                          :label="ite.TrialReadingCriterionName"
+                          :key="ite.TrialReadingCriterionId"
+                          width="260"
+                          show-overflow-tooltip
+                        >
+                          <template slot-scope="scope">
+                        <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []"  :key="item">
+                          <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
+                          <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
+                          <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
+                          <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
+                        </span>
+                          </template>
+                        </el-table-column>
                       </el-table-column>
                       <!-- 状态 -->
-                      <el-table-column prop="IsEnable" :label="$t('trials:reviewAssign:allocationRules:table:status')"
-                        min-width="80" show-overflow-tooltip>
+                      <el-table-column
+                        prop="IsEnable"
+                        :label="$t('trials:reviewAssign:allocationRules:table:status')"
+                        min-width="80"
+                        show-overflow-tooltip
+                      >
                         <template slot-scope="scope">
-                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable)
-                          }}</el-tag>
+                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
                           <el-tag v-else>{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
                         </template>
                       </el-table-column>
                       <!-- 备注 -->
-                      <el-table-column prop="Note" :label="$t('trials:reviewAssign:allocationRules:table:remark')"
-                        min-width="100" show-overflow-tooltip />
-                      <el-table-column fixed="right" :label="$t('common:action:action')" width="80">
+                      <el-table-column
+                        prop="Note"
+                        :label="$t('trials:reviewAssign:allocationRules:table:remark')"
+                        min-width="100"
+                        show-overflow-tooltip
+                      />
+                      <el-table-column
+                        fixed="right"
+                        :label="$t('common:action:action')"
+                        width="80"
+                      >
                         <template slot-scope="scope">
                           <!-- 编辑 -->
-                          <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
-                            @click="addOrEdit(scope.row)" />
+                          <el-button
+                            circle
+                            icon="el-icon-edit-outline"
+                            :title="$t('common:button:edit')"
+                            @click="addOrEdit(scope.row)"
+                          />
                         </template>
                       </el-table-column>
                     </el-table>
                   </el-form-item>
                   <!-- 后续分配规则 -->
                   <el-divider content-position="left">
-                    {{ $t('trials:reviewAssign:allocationRules:title:subsequentAllocationRules') }}
+                    {{$t('trials:reviewAssign:allocationRules:title:subsequentAllocationRules')}}
                   </el-divider>
                   <el-descriptions class="margin-top" :column="1">
                     <el-descriptions-item>
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowVisitAutoAssign" disabled>
                           <!-- 同一病例随访阅片任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message1') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowVisitAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message1')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowVisitAutoAssignDefaultState)}} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;">
                       </div>
@@ -284,8 +386,7 @@
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowGlobalVisitAutoAssign" disabled>
                           <!-- 同一病例全局任务自动分配（在拟分配的阅片人未标记为退出项目状态时 默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message3') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message3')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState)}} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;">
 
@@ -295,8 +396,7 @@
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowJudgeTaskAutoAssign" disabled>
                           <!-- 同一病例第二次裁判任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message4') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message4')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState)}} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;" />
                     </el-descriptions-item>
@@ -305,7 +405,12 @@
               </div>
               <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                 <!-- 取消 -->
-                <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">
+                <el-button
+                  :disabled="btnLoading"
+                  size="small"
+                  type="primary"
+                  @click="handleCancel"
+                >
                   {{ $t('common:button:cancel') }}
                 </el-button>
                 <!-- 保存 -->
@@ -314,47 +419,72 @@
                 </el-button>
               </div>
             </el-dialog>
-            <el-dialog v-if="taskAllocationRuleVisible" :title="title" :visible.sync="taskAllocationRuleVisible"
-              width="600px" :close-on-click-modal="false">
-              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList"
-                :doctor-user-list="DoctorUserList" @close="() => { taskAllocationRuleVisible = false }"
-                @getList="openAllocationConfigVisible" />
+            <el-dialog
+              v-if="taskAllocationRuleVisible"
+              :title="title"
+              :visible.sync="taskAllocationRuleVisible"
+              width="600px"
+              :close-on-click-modal="false"
+            >
+              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList" :doctor-user-list="DoctorUserList" @close="() => {taskAllocationRuleVisible = false}" @getList="openAllocationConfigVisible" />
             </el-dialog>
             <!--分配阅片人  -->
-            <el-dialog v-if="manualAllocationVisible" :title="$t('trials:reviewAssign:dialog:assignReader')"
-              :visible.sync="manualAllocationVisible" width="1320px" :close-on-click-modal="false">
-              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
-                :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList"
-                @close="() => { manualAllocationVisible = false }" @getList="getList"></ManualAllocationTable>
+            <el-dialog
+              v-if="manualAllocationVisible"
+              :title="$t('trials:reviewAssign:dialog:assignReader')"
+              :visible.sync="manualAllocationVisible"
+              width="1320px"
+              :close-on-click-modal="false"
+            >
+              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList" @close="() => {manualAllocationVisible = false}" @getList="getList"></ManualAllocationTable>
             </el-dialog>
             <!-- 清除阅片人 -->
-            <el-dialog v-if="ClearAudienceVisible" :title="$t('trials:reviewAssign:dialog:clearReader')"
-              :visible.sync="ClearAudienceVisible" width="500px" :close-on-click-modal="false">
-              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
-                @close="() => { ClearAudienceVisible = false }" @getList="getList"></ClearAudienceList>
+            <el-dialog
+              v-if="ClearAudienceVisible"
+              :title="$t('trials:reviewAssign:dialog:clearReader')"
+              :visible.sync="ClearAudienceVisible"
+              width="500px"
+              :close-on-click-modal="false"
+            >
+              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"  @close="() => {ClearAudienceVisible = false}" @getList="getList"></ClearAudienceList>
             </el-dialog>
             <!-- 访视/全局/肿瘤学阅片任务 : 裁判阅片任务 -->
-            <el-dialog v-if="AllocationVisible"
+            <el-dialog
+              v-if="AllocationVisible"
               :title="AllocationType === 'task' ? $t('trials:reviewAssign:button:visitReadingTasks') : $t('trials:reviewAssign:button:adReadingTasks')"
-              :visible.sync="AllocationVisible" :fullscreen="true" :close-on-click-modal="false">
-              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId"
-                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
-                v-if="AllocationType === 'task'"></taskAllacation>
-              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId"
-                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
-                v-else>
-              </refereeAllacation>
+              :visible.sync="AllocationVisible"
+              :fullscreen="true"
+              :close-on-click-modal="false"
+            >
+              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-if="AllocationType === 'task'"></taskAllacation>
+              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-else></refereeAllacation>
             </el-dialog>
             <!-- 取消历史 -->
-            <el-dialog v-if="SubjectCancelDoctorHistoryVisible" :title="$t('trials:reviewAssign:dialog:cancelHistory')"
-              :visible.sync="SubjectCancelDoctorHistoryVisible" width="800px" :close-on-click-modal="false">
-              <el-table border :data="SubjectCancelDoctorHistoryList" stripe>
-                <!-- 取消时间 -->
-                <el-table-column prop="CreateTime" :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
-                  width="180" show-overflow-tooltip />
+            <el-dialog
+              v-if="SubjectCancelDoctorHistoryVisible"
+              :title="$t('trials:reviewAssign:dialog:cancelHistory')"
+              :visible.sync="SubjectCancelDoctorHistoryVisible"
+              width="800px"
+              :close-on-click-modal="false"
+            >
+              <el-table
+                border
+                :data="SubjectCancelDoctorHistoryList"
+                stripe
+              >
+              <!-- 取消时间 -->
+                <el-table-column
+                  prop="CreateTime"
+                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
+                  width="180"
+                  show-overflow-tooltip
+                />
                 <!-- 原因 -->
-                <el-table-column prop="Note" :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
-                  show-overflow-tooltip />
+                <el-table-column
+                  prop="Note"
+                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
+                  show-overflow-tooltip
+                />
               </el-table>
             </el-dialog>
           </div>
@@ -387,8 +517,8 @@ const searchDataDefault = () => {
     IsHaveAssigned: null,
     IsAssignConfirmed: null,
     TrialReadingCriterionId: null,
-    SubjectAllocateState: null,
-    ArmList: []
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 const taskSearchDataDefault = () => {
@@ -409,8 +539,8 @@ const taskSearchDataDefault = () => {
     TaskAllocationState: null,
     BeginAllocateDate: null,
     EndAllocateDate: null,
-    SubjectAllocateState: null,
-    ArmList: []
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 export default {
@@ -477,7 +607,7 @@ export default {
     }
   },
   watch: {
-    TrialReadingCriterionId(v) {
+    TrialReadingCriterionId (v) {
       if (v) {
         this.getList()
       }
@@ -501,10 +631,10 @@ export default {
       getTrialCriterionList(this.trialId).then(res => {
         this.trialCriterionList = res.Result
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-      }).catch(() => { })
+      }).catch(() => {})
     },
     openSubjectCancelDoctorHistoryList(row) {
-      getSubjectCancelDoctorHistoryList(row.SubjectId, this.TrialReadingCriterionId).then((res) => {
+      getSubjectCancelDoctorHistoryList(row.SubjectId,this.TrialReadingCriterionId).then((res) => {
         this.SubjectCancelDoctorHistoryVisible = true
         this.SubjectCancelDoctorHistoryList = res.Result
       })
@@ -516,7 +646,7 @@ export default {
       this.AllocationSubjectCode = SubjectCode
     },
     openClearAudience(row) {
-      this.rowData = { ...row }
+      this.rowData = {...row}
       this.ClearAudienceVisible = true
     },
     findDoctorUser(list, type) {
@@ -680,7 +810,7 @@ export default {
       if (this.TaskAllocationRuleSelectList.length !== num) {
         // 当前阅片模式为xxx，请选择正确阅片人数量
         var msg = this.$t('trials:reviewAssign:message:message08')
-        msg = msg.replaceAll('xxx', this.$fd('ReadingMethod', this.ReadingType))
+        msg = msg.replaceAll('xxx',this.$fd('ReadingMethod', this.ReadingType))
         this.$alert(msg)
         return
       }
@@ -772,7 +902,7 @@ export default {
     handleDelete(row) {
       // 确定要删除${row.DoctorUser.UserName}(${row.DoctorUser.FullName})的任务分配规则?
       var msg = this.$t('trials:reviewAssign:message:message11')
-      msg = msg.replaceAll('xxx', `${row.DoctorUser.UserName}(${row.DoctorUser.FullName})`)
+        msg = msg.replaceAll('xxx',`${row.DoctorUser.UserName}(${row.DoctorUser.FullName})`)
       this.$confirm(msg, {
         type: 'warning',
         distinguishCancelAndClose: true
@@ -817,7 +947,7 @@ export default {
       this.loading = true
       getTaskAllocationRuleList({
         TrialId: this.$route.query.trialId
-      }).then(async (res) => {
+      }).then(async(res) => {
         this.taskSearchData.TrialId = this.$route.query.trialId
         var params = Object.assign({}, this.taskSearchData)
         var SubjectAssignListRes = await getSubjectAssignList(params)
@@ -883,35 +1013,30 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.read-task-allocation {
-  ::v-deep.search {
-    padding: 0px !important;
+  .read-task-allocation{
+    ::v-deep.search {
+      padding: 0px !important;
+    }
+  }
+  ::v-deep .hidden-row{
+    display: none;
+  }
+  ::v-deep .el-dialog__body {
+    padding: 15px 20px;
   }
-}
 
-::v-deep .hidden-row {
-  display: none;
-}
-
-::v-deep .el-dialog__body {
-  padding: 15px 20px;
-}
-
-::v-deep .el-tag--danger.el-tag--dark {
-  // background-color: #f56c6c!important;
-  border-color: none !important;
-  // color: #fff!important;
-}
-
-::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
-  display: none;
-}
-
-::v-deep .el-descriptions-item__label.has-colon:after {
-  display: none;
-}
-
-::v-deep .base-dialog-wrapper .base-dialog-body {
-  max-height: 1000px;
-}
+  ::v-deep .el-tag--danger.el-tag--dark {
+    // background-color: #f56c6c!important;
+    border-color: none!important;
+    // color: #fff!important;
+  }
+  ::v-deep #TaskAllocationRuleList thead .el-checkbox__inner{
+    display: none;
+  }
+  ::v-deep .el-descriptions-item__label.has-colon:after{
+    display: none;
+  }
+  ::v-deep .base-dialog-wrapper .base-dialog-body{
+    max-height: 1000px;
+  }
 </style>

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

@@ -45,7 +45,7 @@
           <el-input 
             v-model="scope.row.CDISCCode"
             size="mini"
-            :disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0)"
+            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
             v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
@@ -68,7 +68,7 @@ export default {
   data() {
     return {
       loading: false,
-      exportInfo: {}
+      exportInfo: []
     }
   },
   mounted() {
@@ -152,8 +152,7 @@ export default {
       } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
         // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
         return true
-      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
-        // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
+      } else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion)) {
         // CDISC导出不能配置表格问题
         return true
       } else if (item.Code === 2 && row.HasChildren) {

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

@@ -205,10 +205,6 @@
               {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
             </span>
             <span v-else>{{ scope.row.SubjectCode }}</span>
-            <!-- 终止 -->
-            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
-              {{ $t('trials:crcUpload:label:ISQ') }}
-            </span>
           </template>
         </el-table-column>
         <!-- 任务名称 -->
@@ -253,7 +249,7 @@
         <!-- 阅片人 -->
         <el-table-column prop="UserName" :label="$t('trials:reviewTrack:table:reader')" width="130" sortable="custom"
           show-overflow-tooltip>
-          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
+          <template v-if="scope.row.UserName" slot-scope="scope">
             <span v-if="viewStatus">{{ scope.row.UserName }}</span>
             <span v-else>{{ scope.row.UserName }}({{ scope.row.FullName }})</span>
           </template>
@@ -340,29 +336,27 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
-              circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
+            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view" circle
+              :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||
               (scope.row.TaskState !== 0 && scope.row.TaskState !== 5) ||
               scope.row.ReadingTaskState !== 2 ||
               scope.row.ReReadingApplyState === 2 ||
               scope.row.ReReadingApplyState === 4 ||
-              scope.row.ReReadingApplyState === 5 || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
+              scope.row.ReReadingApplyState === 5
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-collection" circle :title="$t('trials:reviewTrack:action:applyReread')"
               @click="openApplyReReading(scope.row)" />
             <!-- 退回重阅历史 -->
-            <el-button
-              :disabled="!scope.row.ReReadingApplyState || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)"
-              icon="el-icon-toilet-paper" v-if="!isDoc" circle
+            <el-button :disabled="!scope.row.ReReadingApplyState" icon="el-icon-toilet-paper" v-if="!isDoc" circle
               :title="$t('trials:reviewTrack:action:backToRereadHistory')" @click="reReadingHistory(scope.row, 1)" />
             <!-- 退回 -->
             <el-button :disabled="scope.row.ReadingTaskState === 2 ||
               scope.row.ReadingCategory !== 1 ||
               scope.row.TaskState !== 0 ||
-              scope.row.IsManualGeneration || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
+              scope.row.IsManualGeneration
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-back" circle :title="$t('trials:reviewTrack:action:back')"
@@ -381,12 +375,6 @@
       <!-- 分页组件 -->
       <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
         @pagination="getList" />
-      <div class="remark">
-        <span class="status-primary-circle">
-          {{ $t('trials:crcUpload:label:ISQ') }}
-        </span>
-        <span>: {{ $t('trials:crcUpload:label:IsSubjectQuit') }}</span>
-      </div>
       <!-- 阅片任务规则 -->
       <el-dialog title="阅片任务规则" :visible.sync="ReadingRulesVisible" width="500px" :close-on-click-modal="false"
         custom-class="base-dialog-wrapper">
@@ -1385,25 +1373,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.remark {
-  position: absolute;
-  left: 5px;
-  bottom: 7px;
-  font-size: 12px;
-}
-
-.status-primary-circle {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  text-align: center;
-  line-height: 18px;
-  border-radius: 50%;
-  border: 1px solid #f56c6c;
-  color: #f56c6c;
-  font-size: 10px;
-}
-
 .title {
   line-height: 40px;
   font-weight: bold;

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

@@ -230,7 +230,7 @@
           sortable="custom"
           show-overflow-tooltip
         >
-          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
+          <template v-if="scope.row.UserName" slot-scope="scope">
             {{ `${scope.row.UserName}(${scope.row.FullName})` }}
           </template>
         </el-table-column>

src/views/trials/trials-panel/reading/visit-review/components/EcrfList.vue

@@ -104,8 +104,7 @@ export default {
       classArr: [],
       calculationList: [],
       taskInfo: null,
-      isBaseline: false,
-      digitPlaces: 2
+      isBaseline: false
     }
   },
   computed: {
@@ -136,8 +135,6 @@ export default {
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.isBaseline = this.taskInfo.IsBaseLine
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {
     async getQuestions(visitTaskId) {

src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue

@@ -17,61 +17,51 @@
           </el-dropdown>
         </div>
         <!-- 缩放 -->
-        <div :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:zoom')" @click.prevent="setToolActive('Zoom')">
+        <div
+          :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:zoom')"
+          @click.prevent="setToolActive('Zoom')"
+        >
           <svg-icon icon-class="magnifier" class="svg-icon" />
         </div>
         <!-- 移动 -->
-        <div :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:move')" @click.prevent="setToolActive('Pan')">
+        <div
+          :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:move')"
+          @click.prevent="setToolActive('Pan')"
+        >
           <svg-icon icon-class="move" class="svg-icon" />
         </div>
         <!-- 旋转 -->
-        <div :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:rotate')" @click.prevent="setToolActive('PlanarRotate')">
-          <svg-icon icon-class="rotate" class="svg-icon" />
-        </div>
-        <!--直线工具-->
         <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Length' ? 'tool-item-active' : '']"
-          :title="$t('trials:nondicom-show:length')" @click.prevent="setAnnotateToolActive('Length')">
-          <svg-icon icon-class="length" class="svg-icon" />
+          :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:rotate')"
+          @click.prevent="setToolActive('PlanarRotate')"
+        >
+          <svg-icon icon-class="rotate" class="svg-icon" />
         </div>
         <!-- 箭头工具 -->
         <div
           :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'ArrowAnnotate' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:arrowAnnotate')" @click.prevent="setAnnotateToolActive('ArrowAnnotate')">
+          :title="$t('trials:reading:button:arrowAnnotate')"
+          @click.prevent="setAnnotateToolActive('ArrowAnnotate')"
+        >
           <svg-icon icon-class="arrow" class="svg-icon" />
         </div>
-        <!-- 角度工具 -->
-        <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Angle' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:Angle')" @click.prevent="setAnnotateToolActive('Angle')">
-          <svg-icon icon-class="cobb" class="svg-icon" />
-        </div>
         <!-- 矩形工具 -->
         <div
           :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'RectangleROI' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:RectangleRoi')" @click.prevent="setAnnotateToolActive('RectangleROI')">
+          :title="$t('trials:dicom-show:RectangleRoi')"
+          @click.prevent="setAnnotateToolActive('RectangleROI')"
+        >
           <svg-icon icon-class="rectangle" class="svg-icon" />
         </div>
-        <!-- 圆形工具 -->
-        <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'CircleROI' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:CircleROI')" @click.prevent="setAnnotateToolActive('CircleROI')">
-          <svg-icon icon-class="oval" class="svg-icon" />
-        </div>
-        <!-- 椭圆工具 -->
-        <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'EllipticalROI' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:EllipticalROI')" @click.prevent="setAnnotateToolActive('EllipticalROI')">
-          <svg-icon icon-class="elliptical" class="svg-icon" />
-        </div>
         <!-- 自由曲线 -->
         <div
           :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'PlanarFreehandROI' ? 'tool-item-active' : '']"
           :title="$t('trials:reading:button:planarFreehandROI')"
-          @click.prevent="setAnnotateToolActive('PlanarFreehandROI')">
+          @click.prevent="setAnnotateToolActive('PlanarFreehandROI')"
+        >
           <svg-icon icon-class="polygon" class="svg-icon" />
         </div>
         <!-- <div
@@ -84,14 +74,17 @@
 
         <div
           :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Eraser' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:Eraser')" @click.prevent="setAnnotateToolActive('Eraser')">
+          :title="$t('trials:dicom-show:Eraser')"
+          @click.prevent="setAnnotateToolActive('Eraser')"
+        >
           <svg-icon icon-class="clear" class="svg-icon" />
         </div>
-        <!--比例尺-->
         <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Lengthscale' ? 'tool-item-active' : '']"
-          :title="$t('trials:nondicom-show:scale')" @click.prevent="setAnnotateToolActive('Lengthscale')">
-          <svg-icon icon-class="lengthscale" class="svg-icon" />
+          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Length' ? 'tool-item-active' : '']"
+          :title="$t('trials:nondicom-show:scale')"
+          @click.prevent="setAnnotateToolActive('Length')"
+        >
+          <svg-icon icon-class="length" class="svg-icon" />
         </div>
         <!-- 截图 -->
         <!-- <div
@@ -102,7 +95,11 @@
           <svg-icon icon-class="image" class="svg-icon" />
         </div> -->
         <!-- 重置 -->
-        <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
+        <div
+          class="tool-item"
+          :title="$t('trials:reading:button:reset')"
+          @click.prevent="resetViewport"
+        >
           <svg-icon icon-class="refresh" class="svg-icon" />
         </div>
       </div>
@@ -114,84 +111,112 @@
     <!-- viewports -->
     <div class="viewports-wrapper">
       <div class="grid-container" :style="gridStyle">
-        <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
+        <div
+          v-for="(v, index) in viewportInfos"
+          v-show="index < cells.length"
+          :key="index"
+          :style="cellStyle"
           :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
-          @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
-          @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)"
-          @mouseleave="sliderMouseleave($event, index)">
+          @dblclick="toggleFullScreen($event, index)"
+          @click="activeCanvas(index)"
+          @mouseup="sliderMouseup($event, index)"
+          @mousemove="sliderMousemove($event, index)"
+          @mouseleave="sliderMouseleave($event, index)"
+        >
           <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
             <div class="left-top-text">
-              <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
-                :title="$t('trials:reading:button:clinicalData')">
-                <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
-                  @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
+              <div
+                v-if="v.taskInfo.IsExistsClinicalData"
+                class="cd-info"
+                :title="$t('trials:reading:button:clinicalData')"
+              >
+                <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon" @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
               </div>
-              <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
+              <h2
+                v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo"
+                class="subject-info"
+              >
                 {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
               </h2>
               <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
             </div>
-            <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
+            <div
+              v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo"
+              class="top-center-tool"
+            >
               <div class="toggle-visit-container">
-                <div class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
+                <div
+                  class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
                   @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1, v.index)"
-                  @dblclick.stop="preventDefault($event)">
+                  @dblclick.stop="preventDefault($event)"
+                >
                   <i class="el-icon-caret-left" />
                 </div>
                 <div class="arrow_text">
                   {{ v.taskInfo.TaskBlindName }}
                 </div>
-                <div class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
+                <div
+                  class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
                   @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1, v.index)"
-                  @dblclick.stop="preventDefault($event)">
+                  @dblclick.stop="preventDefault($event)"
+                >
                   <i class="el-icon-caret-right" />
                 </div>
               </div>
             </div>
             <div :ref="`sliderBox-${index}`" class="right-slider-box" @click.stop="clickSlider($event, index)">
-              <div :style="{ top: v.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
-                @mousedown.stop="sliderMousedown($event, index)" />
+              <div :style="{top: v.height + '%'}" class="slider" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event, index)" />
             </div>
           </div>
-          <div v-show="v.fileType === 'application/pdf' && fullScreenIndex === null" class="content flex_col">
+          <div v-show="v.fileType === 'application/pdf' && fullScreenIndex === null " class="content flex_col">
             <div class="content-top" style="height: 50px;">
               <div class="left-top-text">
-                <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
-                  :title="$t('trials:reading:button:clinicalData')">
-                  <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
-                    @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
+                <div
+                  v-if="v.taskInfo.IsExistsClinicalData"
+                  class="cd-info"
+                  :title="$t('trials:reading:button:clinicalData')"
+                >
+                  <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon" @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
                 </div>
-                <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
+                <h2
+                  v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo"
+                  class="subject-info"
+                >
                   {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
                 </h2>
-                <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
+              <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
               </div>
-              <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
+              <div
+                v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo"
+                class="top-center-tool"
+              >
                 <div class="toggle-visit-container">
-                  <div class="arrw_icon"
-                    :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
+                  <div
+                    class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
                     @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1, v.index)"
-                    @dblclick.stop="preventDefault($event)">
+                    @dblclick.stop="preventDefault($event)"
+                  >
                     <i class="el-icon-caret-left" />
                   </div>
                   <div class="arrow_text">
                     {{ v.taskInfo.TaskBlindName }}
                   </div>
-                  <div class="arrw_icon"
-                    :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
+                  <div
+                    class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
                     @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1, v.index)"
-                    @dblclick.stop="preventDefault($event)">
+                    @dblclick.stop="preventDefault($event)"
+                  >
                     <i class="el-icon-caret-right" />
                   </div>
                 </div>
               </div>
             </div>
             <div class="content-main" style="flex: 1;">
-              <iframe v-if="v.currentFilePath" :ref="`iframe-${index}`"
-                :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${v.currentFilePath}?index=${index}`"
-                width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+              <iframe v-if="v.currentFilePath" :ref="`iframe-${index}`" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${v.currentFilePath}?index=${index}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
             </div>
 
           </div>
@@ -199,8 +224,14 @@
       </div>
     </div>
 
-    <el-dialog :title="$t('trials:noneDicom:message:msg2')" :visible.sync="dialogVisible" :close-on-click-modal="false"
-      :close-on-press-escape="false" :show-close="false" width="400px">
+    <el-dialog
+      :title="$t('trials:noneDicom:message:msg2')"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      width="400px"
+    >
       <el-form ref="lengthForm" :model="form" :rules="rules">
         <el-form-item label="" prop="length">
           <el-input v-model="form.length" type="number">
@@ -213,8 +244,13 @@
       </span>
     </el-dialog>
 
-    <el-dialog v-if="personalConfigDialog.visible" :visible.sync="personalConfigDialog.visible"
-      :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
+    <el-dialog
+      v-if="personalConfigDialog.visible"
+      :visible.sync="personalConfigDialog.visible"
+      :close-on-click-modal="false"
+      :title="personalConfigDialog.title"
+      width="600px"
+    >
       <Others />
     </el-dialog>
   </div>
@@ -241,7 +277,6 @@ import store from '@/store'
 import Others from '@/views/trials/trials-panel/reading/dicoms/components/Others'
 const { ViewportType } = Enums
 const renderingEngineId = 'myRenderingEngine'
-import LengthscaleTool from "../tools/LengthscaleTool"
 const {
   ToolGroupManager,
   Enums: csToolsEnums,
@@ -254,10 +289,7 @@ const {
   PlanarFreehandROITool,
   SplineROITool,
   EraserTool,
-  LengthTool,
-  EllipticalROITool,
-  CircleROITool,
-  AngleTool
+  LengthTool
   // cursors
 } = cornerstoneTools
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
@@ -448,14 +480,10 @@ export default {
       cornerstoneTools.addTool(PlanarRotateTool)
       cornerstoneTools.addTool(ArrowAnnotateTool)
       cornerstoneTools.addTool(RectangleROITool)
-      cornerstoneTools.addTool(EllipticalROITool)
-      cornerstoneTools.addTool(CircleROITool)
-      cornerstoneTools.addTool(AngleTool)
       cornerstoneTools.addTool(PlanarFreehandROITool)
       cornerstoneTools.addTool(SplineROITool)
       cornerstoneTools.addTool(EraserTool)
       cornerstoneTools.addTool(LengthTool)
-      cornerstoneTools.addTool(LengthscaleTool)
 
       viewportIds.forEach((viewportId, i) => {
         const toolGroupId = `canvas-${i}`
@@ -467,10 +495,10 @@ export default {
         toolGroup.addTool(PlanarRotateTool.toolName)
         toolGroup.addTool(ArrowAnnotateTool.toolName, {
           arrowHeadStyle: 'standard',
-          changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
+          changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
             return doneChangingTextCallback(await this.customPrompt())
           },
-          getTextCallback: async (doneChangingTextCallback) => {
+          getTextCallback: async(doneChangingTextCallback) => {
             return doneChangingTextCallback(await this.customPrompt())
           }
         })
@@ -478,15 +506,6 @@ export default {
           cachedStats: false,
           getTextLines: this.getRectangleROIToolTextLines
         })
-        toolGroup.addTool(EllipticalROITool.toolName, {
-          cachedStats: false,
-          getTextLines: this.getEllipticalROIToolTextLines
-        })
-        toolGroup.addTool(CircleROITool.toolName, {
-          cachedStats: false,
-          getTextLines: this.getCircleROIToolTextLines
-        })
-        toolGroup.addTool(AngleTool.toolName)
         toolGroup.addTool(PlanarFreehandROITool.toolName, {
           allowOpenContours: false,
           cachedStats: false,
@@ -503,10 +522,6 @@ export default {
           getTextLines: this.getLengthToolTextLines,
           cachedStats: false
         })
-        toolGroup.addTool(LengthscaleTool.toolName, {
-          getTextLines: this.getLengthscaleToolTextLines,
-          cachedStats: false
-        })
 
         toolGroup.setToolActive(StackScrollTool.toolName, {
           bindings: [{ mouseButton: MouseBindings.Wheel }]
@@ -517,23 +532,15 @@ export default {
         if (this.readingTaskState < 2) {
           toolGroup.setToolPassive(ArrowAnnotateTool.toolName)
           toolGroup.setToolPassive(RectangleROITool.toolName)
-          toolGroup.setToolPassive(EllipticalROITool.toolName)
-          toolGroup.setToolPassive(CircleROITool.toolName)
-          toolGroup.setToolPassive(AngleTool.toolName)
           toolGroup.setToolPassive(PlanarFreehandROITool.toolName)
           toolGroup.setToolPassive(SplineROITool.toolName)
           toolGroup.setToolPassive(LengthTool.toolName)
-          toolGroup.setToolPassive(LengthscaleTool.toolName)
         } else {
           toolGroup.setToolEnabled(ArrowAnnotateTool.toolName)
           toolGroup.setToolEnabled(RectangleROITool.toolName)
-          toolGroup.setToolEnabled(EllipticalROITool.toolName)
-          toolGroup.setToolEnabled(CircleROITool.toolName)
-          toolGroup.setToolEnabled(AngleTool.toolName)
           toolGroup.setToolEnabled(PlanarFreehandROITool.toolName)
           toolGroup.setToolEnabled(SplineROITool.toolName)
           toolGroup.setToolEnabled(LengthTool.toolName)
-          toolGroup.setToolEnabled(LengthscaleTool.toolName)
         }
         toolGroup.setToolPassive(EraserTool.toolName)
       })
@@ -797,12 +804,12 @@ export default {
           if (this.activeTool) {
             toolGroup.setToolPassive(this.activeTool)
           }
-          if (toolName === 'Lengthscale') {
+          if (toolName === 'Length') {
             const renderingEngine = getRenderingEngine(renderingEngineId)
             const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
             const imageId = viewport.csImage.imageId
             const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
-            const idx = annotations.findIndex(i => i.metadata.referencedImageId === imageId && i.metadata.toolName === 'Lengthscale')
+            const idx = annotations.findIndex(i => i.metadata.referencedImageId === imageId && i.metadata.toolName === 'Length')
             if (idx > -1) {
               this.activeTool = ''
               // 当前图像已存在比例尺！
@@ -867,7 +874,7 @@ export default {
       const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
       const fileList = this.viewportInfos[i].fileList
       const fileIndex = fileList.findIndex(f => f.Path === path)
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
         this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: null })
       }
     },
@@ -886,7 +893,7 @@ export default {
       const fileList = this.viewportInfos[i].fileList
       const fileIndex = fileList.findIndex(f => f.Path === path)
       if (fileIndex === -1) return
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
         const value = annotation.data.l
         if (value) {
           const cachedStats = Object.keys(annotation.data.cachedStats)
@@ -922,7 +929,7 @@ export default {
       const fileList = this.viewportInfos[i].fileList
       const fileIndex = fileList.findIndex(f => f.Path === path)
       if (fileIndex === -1) return
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
         this.form.annotationObj = {
           id: '',
           visitTaskId: this.viewportInfos[i].taskInfo.VisitTaskId,
@@ -989,7 +996,7 @@ export default {
       viewport.render()
       this.dialogVisible = false
     },
-    getLengthscaleToolTextLines(data, targetId) {
+    getLengthToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
       const { length, unit } = cachedVolumeStats
       if (length === undefined || length === null || isNaN(length)) {
@@ -1006,27 +1013,6 @@ export default {
       }
       return textLines
     },
-    // 直线工具注释
-    getLengthToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { length, unit } = cachedVolumeStats
-      if (length === undefined || length === null || isNaN(length)) {
-        return
-      }
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      const textLines = []
-      if (ps) {
-        textLines.push(`${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`)
-      } else {
-        textLines.push(`${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}`)
-      }
-      return textLines
-    },
     getPlanarFreehandROIToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
       const {
@@ -1052,26 +1038,26 @@ export default {
       if (area) {
         const areaLine = isEmptyArea
           ? `Area: Oblique not supported`
-          : `Area: ${ps ? this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces) : this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
+          : `Area: ${ps ? parseFloat(area * ps * ps).toFixed(this.digitPlaces) : parseFloat(area).toFixed(this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
         textLines.push(areaLine)
       }
       if (mean) {
-        textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
+        textLines.push(`Mean: ${parseFloat(mean).toFixed(this.digitPlaces)} ${modalityUnit}`)
       }
 
-      if (max) {
-        textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
+      if (Number.isFinite(max)) {
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
       }
 
       if (stdDev) {
-        textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
       }
 
       if (perimeter) {
         if (ps) {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
+          textLines.push(`Perimeter: ${parseFloat(perimeter * ps).toFixed(this.digitPlaces)} mm`)
         } else {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} ${unit}`)
+          textLines.push(`Perimeter: ${parseFloat(perimeter).toFixed(this.digitPlaces)} ${unit}`)
         }
       }
 
@@ -1084,7 +1070,6 @@ export default {
     },
     getRectangleROIToolTextLines(data, targetId) {
       const cachedVolumeStats = data.cachedStats[targetId]
-      const points = data.handles.points
       const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
 
       if (mean === undefined) {
@@ -1099,104 +1084,20 @@ export default {
         ps = parseFloat(this.psArr[i].PS).toFixed(3)
       }
       if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
+        textLines.push(`Area: ${parseFloat(area * ps * ps).toFixed(this.digitPlaces)} ${'mm' + '\xb2'}`)
       } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      if (Array.isArray(points) && points.length === 4) {
-        let perimeter = 2 * Math.abs(points[0][0] - points[1][0]) + 2 * Math.abs(points[1][1] - points[2][1])
-        if (perimeter) {
-          if (ps) {
-            textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
-          } else {
-            textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} px`)
-          }
-        }
+        textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
       }
+
+      textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+      textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+      textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+
       return textLines
     },
-    // 椭圆工具注释信息
-    getEllipticalROIToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
-
-      if (mean === undefined) {
-        return
-      }
-
-      const textLines = []
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
-      } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      return textLines
-    },
-    // 圆形工具注释信息
-    getCircleROIToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { area, mean, max, stdDev, perimeter, areaUnit, modalityUnit } = cachedVolumeStats
-
-      if (mean === undefined) {
-        return
-      }
-
-      const textLines = []
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
-      } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      if (perimeter) {
-        if (ps) {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
-        } else {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} px`)
-        }
-      }
-      return textLines
-    },
-    reRound(result, finalPrecision) {
-      if (typeof result === 'string' && result.includes(', ')) {
-        const numStrs = result.split(', ')
-        const processed = numStrs.map(str => this.processSingle(str, finalPrecision))
-        return processed.join(', ')
-      }
-      return this.processSingle(result, finalPrecision)
-    },
-    processSingle(str, precision) {
-      const num = parseFloat(str)
-      if (isNaN(num)) return 'NaN'
-
-      // 保留原极小值处理逻辑
-      if (Math.abs(num) < 0.0001) return str
-      const factor = 10 ** precision
-      return (Math.round(num * factor + 0.0000001) / factor).toFixed(precision)
-    },
     debounce(callback, delay) {
       let timerId
-      return function () {
+      return function() {
         clearTimeout(timerId)
         timerId = setTimeout(() => {
           callback.apply(this, arguments)
@@ -1306,17 +1207,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.content {
-  cursor: default !important;
-}
-
 .none-dicom-viewer {
   display: flex;
   flex-direction: column;
-  width: 100%;
+  width:100%;
   height: 100%;
   user-select: none;
-
   .tools-wrapper {
     height: 50px;
     display: flex;
@@ -1324,7 +1220,6 @@ export default {
     border-bottom: 1px solid #727272;
     color: #ddd;
     padding: 0 5px;
-
     .tools-left {
       flex: 1;
       display: flex;
@@ -1332,7 +1227,6 @@ export default {
       justify-content: flex-start;
       align-items: center;
     }
-
     .tool-item {
       padding: 5px;
       margin: 0 5px;
@@ -1340,19 +1234,15 @@ export default {
       font-size: 20px;
       cursor: pointer;
     }
-
     .tool-item-active {
       background-color: #607d8b;
     }
-
     .tool-disabled {
       cursor: not-allowed;
     }
   }
-
   .viewports-wrapper {
     flex: 1;
-
     .grid-container {
       display: grid;
       height: 100%;
@@ -1361,32 +1251,26 @@ export default {
     }
 
     .grid-cell {
-      border: 1px dashed #ccc;
-      ;
+      border: 1px dashed #ccc;;
       display: flex;
       align-items: center;
       justify-content: center;
     }
-
     .cell_active {
-      border-color: #fafa00 !important;
+      border-color: #fafa00!important;
     }
-
     .cell-full-screen {
       grid-column: 1 / -1;
       grid-row: 1 / -1;
     }
-
     .flex_col {
       display: flex;
       flex-direction: column;
     }
-
     .content {
       width: 100%;
       height: 100%;
       position: relative;
-
       .left-top-text {
         position: absolute;
         left: 5px;
@@ -1394,31 +1278,26 @@ export default {
         color: #ddd;
         z-index: 1;
         font-size: 12px;
-
         .cd-info {
           color: #ddd;
           font-size: 18px;
         }
-
         .subject-info {
-          color: #f44336;
+          color:#f44336;
           padding: 5px 0px;
           margin: 0;
         }
       }
-
       .top-center-tool {
         position: absolute;
-        left: 50%;
+        left:50%;
         top: 5px;
         transform: translateX(-50%);
         z-index: 1;
-
         .toggle-visit-container {
           display: flex;
         }
-
-        .arrw_icon {
+        .arrw_icon{
           width: 20px;
           height: 20px;
           background-color: #3f3f3f;
@@ -1426,17 +1305,15 @@ export default {
           line-height: 20px;
           border-radius: 10%;
         }
-
-        .arrow_text {
+        .arrow_text{
           height: 20px;
           line-height: 20px;
           background-color: #00000057;
           color: #fff;
-          padding: 0 10px;
+          padding:0 10px;
           font-size: 14px;
         }
       }
-
       .right-slider-box {
         position: absolute;
         right: 1px;
@@ -1448,8 +1325,7 @@ export default {
         z-index: 1;
         cursor: pointer;
       }
-
-      .right-slider-box:after {
+      .right-slider-box:after{
         content: '';
         position: absolute;
         bottom: -20px;
@@ -1458,39 +1334,33 @@ export default {
         width: 100%;
         background: #333;
       }
-
       .slider {
         height: 20px;
         width: 100%;
         position: absolute;
         top: 0;
-        z-index: 10;
+        z-index:10;
         background: #9e9e9e;
         cursor: move
       }
     }
   }
-
-  ::v-deep .el-dialog {
+  ::v-deep .el-dialog{
     background: #1e1e1e;
     border: 1px solid #ddd;
     color: #ddd;
-
-    .el-dialog__title {
-      color: #fff;
+    .el-dialog__title{
+      color:#fff;
     }
-
-    .el-input .el-input__inner {
+    .el-input .el-input__inner{
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-
-    .el-input.is-disabled .el-input__inner {
+    .el-input.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
-
-    .el-form-item__label {
+    .el-form-item__label{
       color: #dfdfdf
     }
   }

src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue

@@ -264,7 +264,7 @@ export default {
             if (typeof i.MeasureData === 'string') {
               i.MeasureData = JSON.parse(i.MeasureData)
             }
-            if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
+            if (i.MeasureData.metadata.toolName === 'Length' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
               this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
             }
             return i

src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue

@@ -444,9 +444,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   break
                 case 6:
@@ -462,9 +459,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   break
                 case 7:
@@ -480,9 +474,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break
@@ -551,9 +542,6 @@ export default {
 
             }
           } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {

src/views/trials/trials-panel/reading/visit-review/tools/LengthscaleTool.js

@@ -1,11 +0,0 @@
-import * as cornerstoneTools from '@cornerstonejs/tools'
-class LengthscaleTool extends cornerstoneTools.LengthTool {
-  static { this.toolName = 'Lengthscale'; }
-  constructor(
-    toolProps,
-    defaultToolProps
-  ) {
-    super(toolProps, defaultToolProps);
-  }
-}
-export default LengthscaleTool;

src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue

@@ -1,213 +1,288 @@
 <template>
-    <el-form ref="attachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
-        class="upload-temporary-file">
-        <div class="base-dialog-body">
-            <el-form-item :label="$t('trials:attachment:form:FileName')" prop="Name">
-                <el-input v-model="form.Name" clearable></el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:attachment:form:OffLine')" prop="OffLine">
-                <el-switch v-model="form.OffLine" :active-value="true" :inactive-value="false"
-                    :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-                </el-switch>
-            </el-form-item>
-            <el-form-item :label="$t('trials:attachment:form:File')">
-                <div class="upload-container">
-                    <el-upload class="upload-demo" action :accept="this.accept.join(',')" :before-upload="beforeUpload"
-                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
-                        :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
-                        <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                            }}</el-button>
-                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
-                        </span>
-                    </el-upload>
-                </div>
-            </el-form-item>
+  <el-form
+    ref="trialAttachmentFrom"
+    v-loading="loading"
+    :model="form"
+    label-width="240px"
+    size="small"
+    :rules="rules"
+    class="upload-temporary-file"
+  >
+    <div class="base-dialog-body">
+      <!-- 文件类型 -->
+      <el-form-item :label="$t('trials:attachment:table:fileType')" prop="FileTypeId">
+        <el-select
+          v-model="form.FileTypeId"
+          style="width:100%;"
+          size="small"
+        >
+          <el-option
+            v-for="item of dictionaryList.Trial_Document"
+            :key="item.Id"
+            :label="item.Value"
+            :value="item.Id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 文件 -->
+      <el-form-item :label="$t('trials:attachment:form:file')">
+        <div class="upload-container">
+          <el-upload
+            class="upload-demo"
+            action
+            accept=".pdf"
+            :before-upload="beforeUpload"
+            :http-request="handleUploadFile"
+            :on-remove="handleRemoveFile"
+            :show-file-list="true"
+            :file-list="fileList"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :disabled="form.FileTypeId === ''"
+          >
+            <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || saveBtnLoading" :loading="btnLoading">
+              {{ $t('trials:attachment:button:select') }}
+            </el-button>
+            <span
+              slot="tip"
+              style="margin-left:10px;"
+              class="el-upload__tip"
+            >
+              {{ $t('system:tip:file:pdf') }}
+            </span>
+          </el-upload>
         </div>
-        <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
-            <el-form-item style="text-align: right">
-                <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-                    :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
-            </el-form-item>
-        </div>
-    </el-form>
+      </el-form-item>
+      <!-- 需要签署的用户类型 -->
+      <el-form-item :label="$t('trials:attachment:table:userType')" prop="NeedConfirmedUserTypeIdList">
+        <el-select
+          v-model="form.NeedConfirmedUserTypeIdList"
+          style="width:100%;"
+          multiple
+        >
+          <el-option
+            v-for="item of userTypeOptions"
+            v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27 && item.UserTypeEnum !== 31"
+            :key="item.Id"
+            :label="item.UserTypeShortName"
+            :value="item.Id"
+          >
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 查看最短时间（分钟） -->
+      <el-form-item :label="$t('trials:attachment:table:min')" prop="SignViewMinimumMinutes">
+        <el-input-number
+          v-model="form.SignViewMinimumMinutes"
+          controls-position="right"
+          :min="1"
+          :max="50"
+        />
+      </el-form-item>
+      <!-- 描述 -->
+      <el-form-item :label="$t('trials:attachment:table:description')" prop="Description">
+        <el-input
+          v-model="form.Description"
+          type="textarea"
+          :autosize="{ minRows: 5, maxRows: 6}"
+          maxlength="500"
+          show-word-limit
+        />
+      </el-form-item>
+    </div>
+    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <el-form-item style="text-align:right;">
+        <!-- Save -->
+        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''" :loading="saveBtnLoading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </el-form-item>
+    </div>
+  </el-form>
 </template>
 <script>
-import { addOrUpdateTrialDocumentAttachment } from '@/api/trials'
+import { addOrUpdateTrialDocument, uploadTrialDoc, getTrialUserTypeList } from '@/api/trials'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
-    props: {
-        data: {
-            type: Object,
-            default() {
-                return {}
-            },
-        },
-        TrialDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
+  name: 'TrialAttachmentFrom',
+  props: {
+    data: {
+      type: Object,
+      default() { return {} }
+    }
+  },
 
-    data() {
-        return {
-            form: {
-                Id: '',
-                Name: null,
-                FileFormat: null,
-                FileName: null,
-                FilePath: null,
-                FileSize: null,
-                OffLine: false,
-                TrialDocumentId: null,
-            },
-            rules: {
-                Name: [
-                    {
-                        required: true,
-                        message: this.$t('common:ruleMessage:specify'),
-                        trigger: ['change'],
-                    },
-                ],
-            },
-            fileList: [],
-            btnLoading: false,
-            saveBtnLoading: false,
-            loading: false,
-            accept: ['.jpg',
-                '.jpeg',
-                '.png',
-                '.pdf',
-                '.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx',
-                ".mp4"]
+  data() {
+    return {
+      form: {
+        Id: '',
+        TrialId: '',
+        FileTypeId: '',
+        Name: '',
+        Path: '',
+        IsDeleted: false,
+        SignViewMinimumMinutes: null,
+        Description: '',
+        NeedConfirmedUserTypeIdList: []
+      },
+      rules: {
+        FileTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        SignViewMinimumMinutes: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }],
+        NeedConfirmedUserTypeIdList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        Description: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }]
+      },
+      fileList: [],
+      userTypeOptions: [],
+      btnLoading: false,
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {}
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    // 保存
+    handleSave() {
+      this.$refs.trialAttachmentFrom.validate(valid => {
+        if (!valid) return
+        if (!this.form.Name) {
+          this.$alert(this.$t('trials:attachment:message:selectFile'))
+          return
         }
+        if (this.form.TrialId === '') {
+          this.form.TrialId = this.$route.query.trialId
+        }
+        this.saveBtnLoading = true
+        addOrUpdateTrialDocument(this.form).then(res => {
+          this.saveBtnLoading = false
+          this.$emit('closeDialog')
+          this.$emit('getList')
+          if (this.form.Id) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          } else {
+            this.$message.success(this.$t('common:message:addedSuccessfully'))
+          }
+          // this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }).catch(() => {
+          this.saveBtnLoading = false
+        })
+      })
     },
-    mounted() {
-        this.initForm()
-    },
-    methods: {
-        async initForm() {
-            this.loading = true
-            if (this.data && this.data.Id) {
-                Object.keys(this.form).forEach(key => {
-                    this.form[key] = this.data[key]
-                })
-                this.fileList = [
-                    {
-                        name: this.data.FileName,
-                        url: this.data.FilePath,
-                        path: this.data.FilePath,
-                    },
-                ]
+    async initForm() {
+      this.loading = true
+      await this.getDicData()
+      await this.getUserType()
+      if (Object.keys(this.data).length > 0) {
+        if (this.data.Path) {
+          this.fileList = [
+            {
+              name: this.data.Name,
+              path: this.data.Path,
+              url: this.data.Path,
             }
-            this.loading = false
-        },
-        beforeUpload(file) {
-            // 检测文件类型是否符合要求
-            if (this.checkFileSuffix(file.name)) {
-                this.fileList = []
-                return true
-            } else {
-                this.$alert(this.$t('trials:signature:label:type').replace("xxx", this.accept.join(", ")))
+          ]
+        }
+        this.form.Id = this.data.Id
+        this.form.FileTypeId = this.data.FileTypeId
+        this.form.Name = this.data.Name
+        this.form.Path = this.data.Path
+        this.form.IsDeleted = this.data.IsDeleted
+        this.form.Description = this.data.Description
+        this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
+      }
+      this.loading = false
+    },
+    // 获取文件类型下拉框数据
+    getDicData() {
+      getBasicDataSelects(['Trial_Document']).then(res => {
+        this.dictionaryList = { ...res.Result }
+      })
+    },
+    // 获取用户类型下拉数据
+    getUserType() {
+      getTrialUserTypeList().then(res => {
+        this.userTypeOptions = res.Result
+        if (this.form.Id) {
+          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
+        }
+      }).catch(() => { this.loading = false })
+    },
+    handleViewableUserTypeChange(valArr) {
+      this.form.NeedConfirmedUserTypeIdList = []
+      this.needConfirmedUserTypeOptions = []
+      valArr.forEach((val) => {
+        const i = this.userTypeOptions.findIndex(userType => { return userType.Id === val })
+        this.needConfirmedUserTypeOptions.push(this.userTypeOptions[i])
+      })
+    },
+    // 检测文件类型是否符合要求
+    beforeUpload(file) {
+      if (this.checkFileSuffix(file.name)) {
+        this.fileList = []
+        return true
+      } else {
+        this.$alert(this.$t('trials:attachment:message:pdf'))
 
-                return false
-            }
-        },
-        async handleUploadFile(param) {
-            this.loading = true
-            var file = await this.fileToBlob(param.file)
-            const res = await this.OSSclient.put(
-                `/${this.$route.query.trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`,
-                file
-            )
-            this.fileList.push({
-                name: param.file.name,
-                path: this.$getObjectName(res.url),
-                url: this.$getObjectName(res.url),
-            })
-            this.form.Name = param.file.name
-            this.form.FileName = param.file.name
-            this.form.FilePath = this.$getObjectName(res.url)
-            this.form.FileSize = param.file.size
-            this.form.FileFormat = param.file.name
-                .substring(param.file.name.lastIndexOf('.'))
-                .toLocaleLowerCase().split('.')[1]
-            this.loading = false
-        },
-        handleSave() {
-            this.$refs.attachmentFrom.validate((valid) => {
-                if (!valid) return false
-                if (!this.form.FilePath)
-                    return this.$alert(this.$t('trials:signature:message:selectFile'))
-                this.saveBtnLoading = true
-                if (this.TrialDocumentId) this.form.TrialDocumentId = this.TrialDocumentId
-                addOrUpdateTrialDocumentAttachment(this.form)
-                    .then((res) => {
-                        this.saveBtnLoading = false
-                        this.$emit('closeDialog')
-                        this.$emit('getList')
-                        this.$message.success(this.$t('common:message:updatedSuccessfully'))
-                    })
-                    .catch(() => {
-                        this.saveBtnLoading = false
-                    })
-            })
-        },
-        handleRemoveFile() {
-            this.fileList = []
-            this.form.FilePath = ''
-            this.form.FileSize = ''
-            this.form.FileFormat = ''
-            this.form.FileName = ''
-        },
-        handlePreview(file) {
-            if (file.fullPath) {
-                window.open(file.fullPath, '_blank')
-            }
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(this.$t('upload:rule:maxFile1'))
-        },
-        checkFileSuffix(fileName) {
-            var typeArr = this.accept.map(item => item.split('.')[1])
-            var extendName = fileName
-                .substring(fileName.lastIndexOf('.') + 1)
-                .toLocaleLowerCase()
-            if (typeArr.indexOf(extendName) !== -1) {
-                return true
-            } else {
-                return false
-            }
-        },
+        return false
+      }
     },
+    // 上传文件
+    async handleUploadFile(param) {
+      this.loading = true
+      var file = await this.fileToBlob(param.file)
+      const trialId = this.$route.query.trialId
+      console.log(this.OSSclient.put)
+      const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}`, file)
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
+      this.form.Path = this.$getObjectName(res.url)
+      this.form.Name = param.file.name
+      this.loading = false
+    },
+    // 移除
+    handleRemoveFile() {
+      this.fileList = []
+      this.form.Path = ''
+      this.form.Name = ''
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(this.$t('trials:attachment:message:uploadFile'))
+    },
+    // 文件类型是否是pdf
+    checkFileSuffix(fileName) {
+      var typeArr = ['pdf']
+      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    }
+  }
 }
 </script>
 
 <style lang="scss">
-.upload-temporary-file {
-    .upload-container .el-upload--text {
-        border: none;
-        width: 80px;
-        height: 40px;
+.upload-temporary-file{
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+  .account_item_clear{
+    .el-tag__close{
+      display: none !important;
     }
+  }
 
-    .upload-container .el-input--small {
-        margin-bottom: 5px;
-    }
-
-    .upload-container .el-icon-circle-check {
-        color: #428bca;
-        font-size: 13px;
-    }
-
-    .account_item_clear {
-        .el-tag__close {
-            display: none !important;
-        }
-    }
 }
-</style>
+</style>

src/views/trials/trials-panel/setting/attachment/components/attachmentList.vue

@@ -1,265 +0,0 @@
-<template>
-    <div v-if="config.visible">
-        <base-model :config="config">
-            <template slot="dialog-body">
-                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
-                    <el-form-item :label="`${$t('trials:attachment:table:Name')}: `">
-                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
-                    </el-form-item>
-                </el-form>
-                <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})" v-if="!isView">
-                    {{ $t('common:button:add') }}</el-button>
-                <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
-                    @sort-change="handleSortByColumn">
-                    <el-table-column type="index" width="60" />
-                    <el-table-column prop="Name" :label="$t('trials:attachment:attachmentList:FileName')"
-                        sortable="custom" />
-                    <el-table-column prop="OffLine" :label="$t('trials:attachment:attachmentList:OffLine')"
-                        sortable="custom" v-if="!isView">
-                        <template slot-scope="scope">
-                            <el-switch v-model="scope.row.OffLine" @change="(val) => OffLine(scope.row, val)"
-                                :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
-                                :inactive-text="$fd('YesOrNo', false)">
-                            </el-switch>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="CreateTime" :label="$t('trials:attachment:attachmentList:CreateTime')"
-                        sortable="custom" />
-                    <el-table-column :label="$t('common:action:action')" min-width="120px">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click.stop="preview(scope.row)">
-                                {{ $t('common:button:preview') }}
-                            </el-button>
-                            <el-button size="mini" type="text" @click.stop="edit(scope.row)" v-if="!isView">
-                                {{ $t('common:button:edit') }}
-                            </el-button>
-                            <!-- <el-button size="mini" type="text" @click.stop="OffLine(scope.row, true)"
-                                :disabled="scope.row.OffLine">
-                                {{ $t('trials:attachment:attachmentList:OffLine') }}
-                            </el-button> -->
-                            <el-button size="mini" type="text" @click.stop="del(scope.row)" v-if="!isView">
-                                {{ $t('common:button:delete') }}
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <!-- 新增/编辑附件 -->
-                <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
-                    width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowDATA" :TrialDocumentId="TrialDocumentId"
-                        @closeDialog="closeDialog" @getList="getAllList" />
-                </el-dialog>
-            </template>
-        </base-model>
-        <viewer ref="picture_perview3" style="margin: 0 10px"
-            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
-
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
-        </viewer>
-        <!-- <attachmentPreview :TrialDocumentId="TrialDocumentId" :visible.sync="perview_visible"
-            v-if="perview_visible" /> -->
-    </div>
-</template>
-<script>
-import BaseModel from '@/components/BaseModel'
-import attachmentForm from './attachmentForm'
-// import attachmentPreview from './attachmentPreview'
-import { addOrUpdateTrialDocumentAttachment, getTrialDocumentAttachmentList, deleteTrialDocumentAttachment } from '@/api/trials'
-const defaultSearchData = () => {
-    return {
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        OffLine: null,
-        SortField: null
-    }
-}
-export default {
-    components: {
-        BaseModel,
-        attachmentForm,
-        //  attachmentPreview 
-    },
-    props: {
-        config: {
-            type: Object,
-            default: () => {
-                return {
-                    visible: false,
-                    title: this.$t('trials:attachment:attachmentList:title'),
-                    width: '800px',
-                }
-            }
-        },
-        isView: {
-            type: Boolean,
-            default: false
-        },
-        rowData: {
-            type: Object,
-            default: () => {
-                return {}
-            }
-        },
-        TrialDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
-    data() {
-        return {
-            searchData: defaultSearchData(),
-            visible: false,
-            title: null,
-            list: [],
-            rowDATA: {},
-            loading: false,
-            viewerOptions: {
-                toolbar: {
-                    zoomIn: true,
-                    zoomOut: true,
-                    reset: true,
-                    prev: false,
-                    next: false,
-                    rotateLeft: true,
-                    rotateRight: true,
-                    flipHorizontal: true,
-                    flipVertical: true,
-                }
-            },
-            // perview_visible: false
-        }
-    },
-    watch: {
-        TrialDocumentId: {
-            handler() {
-                this.getList()
-            },
-            immediate: true,
-        }
-    },
-    methods: {
-        closeDialog() {
-            this.visible = false
-        },
-        getAllList() {
-            this.getList()
-            this.$emit("getList")
-        },
-        async del(row) {
-            try {
-                let confirm = await this.$confirm(this.$t("trials:attachment:attachmentList:message:del"))
-                if (!confirm) return false
-                this.loading = true
-                let res = await deleteTrialDocumentAttachment(row.Id)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getAllList()
-                }
-            } catch (err) {
-                console.log(err)
-                this.loading = false
-            }
-        },
-        edit(row) {
-            this.title = this.$t('trials:attachment:attachmentForm:title:update')
-            if (!row.Id) {
-                this.title = this.$t('trials:attachment:attachmentForm:title:add')
-            }
-            this.rowDATA = Object.assign({}, row)
-            this.visible = true
-        },
-        async getList() {
-            try {
-                if (!this.TrialDocumentId) return false
-                this.loading = true
-                this.searchData.TrialDocumentId = this.TrialDocumentId
-                if (this.isView) {
-                    this.searchData.OffLine = false
-                }
-                let res = await getTrialDocumentAttachmentList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        async OffLine(row, val) {
-            try {
-                let data = Object.assign({}, row)
-                data.OffLine = val
-                this.loading = true
-                let res = await addOrUpdateTrialDocumentAttachment(data)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.$t('trials:attachment:attachmentList:updateSuccessfully')
-                    this.getList()
-                }
-            } catch (err) {
-                this.loading = false
-                row.OffLine = !row.OffLine
-                console.log(err)
-            }
-        },
-        preview(data) {
-            // return this.perview_visible = true
-            this.rowDATA = Object.assign({}, data)
-            if (['.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$onlyOffice({
-                    path: data.FilePath,
-                    type: data.FileFormat,
-                    title: data.Name
-                })
-            }
-            if (['.jpg',
-                '.jpeg',
-                '.png'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$nextTick(() => {
-                    this.$refs['picture_perview3'].$viewer.show()
-                })
-            }
-            if (['.pdf'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$preview({
-                    path: data.Path || data.FilePath,
-                    type: 'pdf',
-                    title: data.Name,
-                })
-            }
-            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$video({
-                    path: data.Path || data.FilePath,
-                    type: 'mp4',
-                    title: data.Name,
-                })
-            }
-        },
-        // 排序
-        handleSortByColumn(column) {
-            if (column.order === 'ascending') {
-                this.searchData.Asc = true
-            } else {
-                this.searchData.Asc = false
-            }
-            this.searchData.SortField = column.prop
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.name {
-    display: block;
-    width: 90%;
-}
-</style>

src/views/trials/trials-panel/setting/attachment/components/templateForm.vue

@@ -1,257 +0,0 @@
-<template>
-  <el-form ref="trialAttachmentFrom" v-loading="loading" :model="form" label-width="240px" size="small" :rules="rules"
-    class="upload-temporary-file">
-    <div class="base-dialog-body">
-      <!-- 文件类型 -->
-      <el-form-item :label="$t('trials:attachment:table:fileType')" prop="FileTypeId">
-        <el-select v-model="form.FileTypeId" style="width:100%;" size="small">
-          <el-option v-for="item of dictionaryList.Trial_Document" :key="item.Id" :label="item.Value"
-            :value="item.Id" />
-        </el-select>
-      </el-form-item>
-      <!-- 文件 -->
-      <el-form-item :label="$t('trials:attachment:form:file')">
-        <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
-            :http-request="handleUploadFile" :on-remove="handleRemoveFile" :show-file-list="true" :file-list="fileList"
-            :limit="1" :on-exceed="handleExceed" :disabled="form.FileTypeId === ''">
-            <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || saveBtnLoading"
-              :loading="btnLoading">
-              {{ $t('trials:attachment:button:select') }}
-            </el-button>
-            <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
-              {{ $t('system:tip:file:pdf') }}
-            </span>
-          </el-upload>
-        </div>
-      </el-form-item>
-      <!-- 需要签署的用户类型 -->
-      <el-form-item :label="$t('trials:attachment:table:userType')" prop="NeedConfirmedUserTypeIdList">
-        <el-select v-model="form.NeedConfirmedUserTypeIdList" style="width:100%;" multiple>
-          <el-option v-for="item of userTypeOptions"
-            v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27 && item.UserTypeEnum !== 31"
-            :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
-            <span>{{ item.UserType }}</span>
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 查看最短时间（分钟） -->
-      <el-form-item :label="$t('trials:attachment:table:min')" prop="SignViewMinimumMinutes">
-        <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
-      </el-form-item>
-      <el-form-item :label="$t('trials:attachment:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
-        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
-      </el-form-item>
-      <el-form-item :label="$t('trials:attachment:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
-        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
-      </el-form-item>
-      <!-- 描述 -->
-      <el-form-item :label="$t('trials:attachment:table:description')" prop="Description">
-        <el-input v-model="form.Description" type="textarea" :autosize="{ minRows: 5, maxRows: 6 }" maxlength="500"
-          show-word-limit />
-      </el-form-item>
-    </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <!-- Save -->
-        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-          :loading="saveBtnLoading" @click="handleSave">
-          {{ $t('common:button:save') }}
-        </el-button>
-      </el-form-item>
-    </div>
-  </el-form>
-</template>
-<script>
-import { addOrUpdateTrialDocument, uploadTrialDoc, getTrialUserTypeList } from '@/api/trials'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
-export default {
-  name: 'TrialAttachmentFrom',
-  props: {
-    data: {
-      type: Object,
-      default() { return {} }
-    }
-  },
-
-  data() {
-    return {
-      form: {
-        Id: '',
-        TrialId: '',
-        FileTypeId: '',
-        Name: '',
-        Path: '',
-        IsPublish: false,
-        IsDeleted: false,
-        SignViewMinimumMinutes: null,
-        Description: '',
-        NeedConfirmedUserTypeIdList: [],
-        CurrentStaffTrainDays: 1,
-        NewStaffTrainDays: 14,
-      },
-      rules: {
-        FileTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        SignViewMinimumMinutes: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }],
-        NeedConfirmedUserTypeIdList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        Description: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }]
-      },
-      fileList: [],
-      userTypeOptions: [],
-      btnLoading: false,
-      saveBtnLoading: false,
-      loading: false,
-      dictionaryList: {}
-    }
-  },
-  mounted() {
-    this.initForm()
-  },
-  methods: {
-    // 保存
-    handleSave() {
-      this.$refs.trialAttachmentFrom.validate(valid => {
-        if (!valid) return
-        if (!this.form.Name) {
-          this.$alert(this.$t('trials:attachment:message:selectFile'))
-          return
-        }
-        if (this.form.TrialId === '') {
-          this.form.TrialId = this.$route.query.trialId
-        }
-        this.saveBtnLoading = true
-        addOrUpdateTrialDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          if (this.form.Id) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          } else {
-            this.$message.success(this.$t('common:message:addedSuccessfully'))
-          }
-          // this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
-      })
-    },
-    async initForm() {
-      this.loading = true
-      await this.getDicData()
-      await this.getUserType()
-      if (Object.keys(this.data).length > 0) {
-        if (this.data.Path) {
-          this.fileList = [
-            {
-              name: this.data.Name,
-              path: this.data.Path,
-              url: this.data.Path,
-            }
-          ]
-        }
-        this.form.Id = this.data.Id
-        this.form.FileTypeId = this.data.FileTypeId
-        this.form.Name = this.data.Name
-        this.form.Path = this.data.Path
-        this.form.IsDeleted = this.data.IsDeleted
-        this.form.IsPublish = this.data.IsPublish
-        this.form.Description = this.data.Description
-        this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
-        this.form.CurrentStaffTrainDays = this.data.CurrentStaffTrainDays
-        this.form.NewStaffTrainDays = this.data.NewStaffTrainDays
-      }
-      this.loading = false
-    },
-    // 获取文件类型下拉框数据
-    getDicData() {
-      getBasicDataSelects(['Trial_Document']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      })
-    },
-    // 获取用户类型下拉数据
-    getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-        if (this.form.Id) {
-          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
-        }
-      }).catch(() => { this.loading = false })
-    },
-    handleViewableUserTypeChange(valArr) {
-      this.form.NeedConfirmedUserTypeIdList = []
-      this.needConfirmedUserTypeOptions = []
-      valArr.forEach((val) => {
-        const i = this.userTypeOptions.findIndex(userType => { return userType.Id === val })
-        this.needConfirmedUserTypeOptions.push(this.userTypeOptions[i])
-      })
-    },
-    // 检测文件类型是否符合要求
-    beforeUpload(file) {
-      if (this.checkFileSuffix(file.name)) {
-        this.fileList = []
-        return true
-      } else {
-        this.$alert(this.$t('trials:attachment:message:pdf'))
-
-        return false
-      }
-    },
-    // 上传文件
-    async handleUploadFile(param) {
-      this.loading = true
-      var file = await this.fileToBlob(param.file)
-      const trialId = this.$route.query.trialId
-      const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
-      this.form.Path = this.$getObjectName(res.url)
-      this.form.Name = param.file.name
-      this.loading = false
-    },
-    // 移除
-    handleRemoveFile() {
-      this.fileList = []
-      this.form.Path = ''
-      this.form.Name = ''
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(this.$t('trials:attachment:message:uploadFile'))
-    },
-    // 文件类型是否是pdf
-    checkFileSuffix(fileName) {
-      var typeArr = ['pdf', 'mp4']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
-      if (typeArr.indexOf(extendName) !== -1) {
-        return true
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.upload-temporary-file {
-  .upload-container .el-upload--text {
-    border: none;
-    width: 80px;
-    height: 40px;
-  }
-
-  .upload-container .el-input--small {
-    margin-bottom: 5px;
-  }
-
-  .upload-container .el-icon-circle-check {
-    color: #428bca;
-    font-size: 13px;
-  }
-
-  .account_item_clear {
-    .el-tag__close {
-      display: none !important;
-    }
-  }
-
-}
-</style>

src/views/trials/trials-panel/setting/attachment/index.vue

@@ -5,8 +5,17 @@
       <el-form :inline="true" class="base-search-form">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:attachment:table:fileType')">
-          <el-select v-model="searchData.FileTypeId" clearable style="width: 150px">
-            <el-option v-for="item of $d.Trial_Document" :key="item.id" :label="item.label" :value="item.id" />
+          <el-select
+            v-model="searchData.FileTypeId"
+            clearable
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Trial_Document"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
+            />
           </el-select>
         </el-form-item>
         <!-- 文件名称 -->
@@ -15,20 +24,40 @@
         </el-form-item>
         <!-- 培训状态 -->
         <el-form-item :label="$t('trials:attachment:table:isDeleted')">
-          <el-select clearable v-model="searchData.IsDeleted" style="width: 150px">
-            <el-option v-for="item of $d.TrainingStatus" :key="item.value" :label="item.label" :value="item.value" />
+          <el-select
+            clearable
+            v-model="searchData.IsDeleted"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.TrainingStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <!-- 培训角色 -->
         <el-form-item :label="$t('trials:attachment:table:userType')">
-          <el-select v-model="searchData.UserTypeId" clearable style="width: 100%">
-            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 1 &&
-              item.UserTypeEnum !== 8 &&
-              item.UserTypeEnum !== 20 &&
-              item.UserTypeEnum !== 26 &&
-              item.UserTypeEnum !== 27 &&
-              item.UserTypeEnum !== 31
-              " :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+          <el-select
+            v-model="searchData.UserTypeId"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item of userTypeOptions"
+              v-show="
+                item.UserTypeEnum !== 1 &&
+                item.UserTypeEnum !== 8 &&
+                item.UserTypeEnum !== 20 &&
+                item.UserTypeEnum !== 26 &&
+                item.UserTypeEnum !== 27 &&
+                item.UserTypeEnum !== 31
+              "
+              :key="item.Id"
+              :label="item.UserTypeShortName"
+              :value="item.Id"
+            >
               <span>{{ item.UserType }}</span>
             </el-option>
           </el-select>
@@ -40,52 +69,71 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
         <!-- 新增 -->
-        <el-button v-hasPermi="['trials:trials-panel:setting:attachment:add']" type="primary" icon="el-icon-plus"
-          @click="handleAdd">
+        <el-button
+          v-hasPermi="['trials:trials-panel:setting:attachment:add']"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        >
           {{ $t('common:button:add') }}
         </el-button>
       </span>
     </div>
 
     <!-- 系统文件列表 -->
-    <el-table ref="attachmentList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
-      height="100" @sort-change="handleSortByColumn">
+    <el-table
+      ref="attachmentList"
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 60 }"
+      :data="list"
+      stripe
+      height="100"
+      @sort-change="handleSortByColumn"
+    >
       <el-table-column type="index" width="40" />
       <!-- 文件类型 -->
-      <el-table-column prop="FileType" :label="$t('trials:attachment:table:fileType')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
+      <el-table-column
+        prop="FileType"
+        :label="$t('trials:attachment:table:fileType')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
       <!-- 文件名称 -->
-      <el-table-column prop="Name" :label="$t('trials:attachment:table:fileName')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
-      <!--附件-->
-      <el-table-column prop="AttachmentCount" :label="$t('trials:attachment:table:AttachmentCount')"
-        show-overflow-tooltip sortable="custom" min-width="150px">
-        <template slot-scope="scope">
-          <el-button type="text" @click.stop="openAttachment(scope.row, true)">
-            {{ scope.row.AttachmentCount }}
-            <i class="el-icon-upload2" />
-          </el-button>
-        </template>
-      </el-table-column>
+      <el-table-column
+        prop="Name"
+        :label="$t('trials:attachment:table:fileName')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
       <!-- 查看最短时间(分钟) -->
-      <el-table-column prop="SignViewMinimumMinutes" :label="$t('trials:attachment:table:min')" show-overflow-tooltip
-        sortable="custom" min-width="150" />
-      <!-- 已有成员(分钟) -->
-      <el-table-column prop="CurrentStaffTrainDays" :label="$t('trials:attachment:table:CurrentStaffTrainDays')"
-        show-overflow-tooltip sortable="custom" min-width="150" />
-      <!-- 新加入成员(分钟) -->
-      <el-table-column prop="NewStaffTrainDays" :label="$t('trials:attachment:table:NewStaffTrainDays')"
-        show-overflow-tooltip sortable="custom" min-width="150" />
+      <el-table-column
+        prop="SignViewMinimumMinutes"
+        :label="$t('trials:attachment:table:min')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="150"
+      />
       <!-- 是否废除 -->
-      <el-table-column prop="IsDeleted" :label="$t('trials:attachment:table:isDeleted')" show-overflow-tooltip
-        sortable="custom" min-width="100">
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('trials:attachment:table:isDeleted')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="100"
+      >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsDeleted" type="danger">{{
             $fd('TrainingStatus', scope.row.IsDeleted)
@@ -95,18 +143,13 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <!--发布状态-->
-      <el-table-column prop="IsPublish" :label="$t('trials:attachment:table:IsPublish')" show-overflow-tooltip
-        sortable="custom" min-width="120px">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.IsPublish ? 'primary' : 'danger'">{{
-            $fd('AttachmentPublishStatus', scope.row.IsPublish)
-          }}</el-tag>
-        </template>
-      </el-table-column>
       <!-- 需要签署的用户类型 -->
-      <el-table-column prop="NeedConfirmedUserTypes" :label="$t('trials:attachment:table:userType')"
-        show-overflow-tooltip min-width="100">
+      <el-table-column
+        prop="NeedConfirmedUserTypes"
+        :label="$t('trials:attachment:table:userType')"
+        show-overflow-tooltip
+        min-width="100"
+      >
         <template slot-scope="scope">
           {{
             scope.row.NeedConfirmedUserTypes
@@ -131,52 +174,91 @@
         min-width="160"
       /> -->
       <!--创建时间-->
-      <el-table-column prop="CreateTime" :label="$t('trials:attachment:table:CreateTime')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
-      <el-table-column :label="$t('common:action:action')" min-width="200" fixed="right">
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:attachment:table:CreateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        min-width="140"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button icon="el-icon-view" circle :title="$t('trials:attachment:action:preview')"
-            @click="handlePreview(scope.row)" />
+          <el-button
+            icon="el-icon-view"
+            circle
+            :title="$t('trials:attachment:action:preview')"
+            @click="handlePreview(scope.row)"
+          />
           <!-- 编辑 -->
-          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:edit']" circle
-            :title="$t('trials:attachment:action:edit')" icon="el-icon-edit-outline"
-            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted" @click="handleEdit(scope.row)" />
-          <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
-            :title="$t('dictionary:signature:button:publish')" @click="publishTrialDocument([scope.row])">
-          </el-button>
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:attachment:edit']"
+            circle
+            :title="$t('trials:attachment:action:edit')"
+            icon="el-icon-edit-outline"
+            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted"
+            @click="handleEdit(scope.row)"
+          />
           <!-- 废除 -->
-          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:abolish']" :disabled="scope.row.IsDeleted"
-            circle :title="$t('trials:attachment:action:apolish')" icon="el-icon-delete"
-            @click="handleRepeal(scope.row)" />
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:attachment:abolish']"
+            :disabled="scope.row.IsDeleted"
+            circle
+            :title="$t('trials:attachment:action:apolish')"
+            icon="el-icon-delete"
+            @click="handleRepeal(scope.row)"
+          />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      @pagination="getList" />
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
 
     <!-- 新增/编辑 -->
-    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="800px"
-      custom-class="base-dialog-wrapper">
-      <templateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="800px"
+      custom-class="base-dialog-wrapper"
+    >
+      <AttachmentForm
+        :data="currentRow"
+        @closeDialog="closeDialog"
+        @getList="getList"
+      />
     </el-dialog>
-    <!--附件列表-->
-    <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :TrialDocumentId="TrialDocumentId"
-      @getList="getList" />
+
     <!-- 预览文件 -->
-    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="true" :visible.sync="perview_visible"
-      :isView="true" v-if="perview_visible" />
-    <!-- 预览文件 -->
-    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('trials:attachment:dialogTitle:preview')"
-      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      <span style="position: fixed; left: 16px; top: 45px;cursor: pointer;font-size: 18px;color:#409EFF"
-        @click.stop="openAttachment(currentRow)" v-if="currentRow.AttachmentCount">{{
-          $t('trials:attachment:table:AttachmentCount') }} ({{
-          currentRow.AttachmentCount }})</span>
-      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="$t('trials:attachment:dialogTitle:preview')"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+        />
       </div>
     </el-dialog>
   </box-content>
@@ -186,14 +268,11 @@ import {
   getTrialDocumentList,
   userAbandonDoc,
   getTrialUserTypeList,
-  publishTrialDocument
 } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
-import templateForm from './components/templateForm'
+import AttachmentForm from './components/attachmentForm'
 import PreviewFile from './components/previewFile'
-import attachmentList from './components/attachmentList'
-import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
@@ -208,7 +287,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialAttachmentList',
-  components: { BoxContent, Pagination, templateForm, PreviewFile, attachmentList, attachmentPreview },
+  components: { BoxContent, Pagination, AttachmentForm, PreviewFile },
   dicts: ['Trial_Document'],
   data() {
     return {
@@ -224,13 +303,6 @@ export default {
       currentType: '',
       trialId: '',
       userTypeOptions: [],
-      TrialDocumentId: null,
-      perview_visible: false,
-      config: {
-        visible: false,
-        title: this.$t('dictionary:signature:attachmentList:title'),
-        width: '800px',
-      },
     }
   },
   mounted() {
@@ -239,39 +311,6 @@ export default {
     this.getUserType()
   },
   methods: {
-    openAttachment(row, isList = false) {
-      this.TrialDocumentId = row.Id
-      this.currentRow = { ...row }
-      if (!isList) {
-        this.perview_visible = true
-      } else {
-        this.config.visible = true
-      }
-    },
-    // 发布
-    async publishTrialDocument(list) {
-      try {
-        let confirm = await this.$confirm(this.$t('trials:attachment:confirm:publishFile'), {
-          type: 'warning',
-          distinguishCancelAndClose: true,
-        })
-        if (!confirm) return false
-        let arr = list.filter(item => !item.IsPublish)
-        if (arr.length <= 0) return this.getList()
-        let data = {
-          ids: arr.map(item => item.Id)
-        }
-        this.loading = true
-        let res = await publishTrialDocument(data)
-        this.loading = false
-        if (res.IsSuccess) {
-          this.getList()
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
-    },
     // 获取系统文件数据
     getList() {
       this.loading = true
@@ -322,7 +361,6 @@ export default {
       this.currentType = row.Name
         ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
         : ''
-      this.currentRow = Object.assign({}, row)
       this.previewVisible = true
     },
     // 编辑
@@ -353,7 +391,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => { })
+        .catch(() => {})
     },
     // 关闭编辑弹窗
     closeDialog() {

src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue

@@ -5,34 +5,81 @@
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
         <!-- 审核问题 -->
-        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="item.value" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:businessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item style="margin-bottom: 10px" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')">
-          <el-select v-model="searchData.BusinessModuleEnum" clearable style="width: 120px">
-            <el-option v-for="item of $d.BusinessModule" :key="item.id" :label="item.label" :value="item.value" />
+        <el-form-item
+          style="margin-bottom: 10px"
+          :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+        >
+          <el-select
+            v-model="searchData.BusinessModuleEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          :label="$t('trials:reviewTrack:table:criterionName')">
-          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width: 120px">
-            <el-option v-for="item of $d.CriterionType" :key="item.id" :label="item.label" :value="item.value" />
+        <el-form-item
+          v-if="isDistinguishCriteria"
+          style="margin-bottom: 10px"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+        >
+          <el-select
+            v-model="searchData.CriterionTypeEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          prop="ToUserTypeList"
+        >
           <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum"
-          v-if="!isDistinguishCriteria">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+          prop="EmailUrgentEnum"
+          v-if="!isDistinguishCriteria"
+        >
           <el-select v-model="searchData.EmailUrgentEnum" clearable class="mr">
-            <el-option v-for="item of $d.EmailUrgent" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -42,19 +89,40 @@
           <el-button type="primary" @click="handleReset">{{
             $t('common:button:reset')
           }}</el-button>
-          <el-button type="primary" @click="handleAdd" class="el-icon-plus" v-if="!isDistinguishCriteria && isShow">{{
-            $t('trials:reviewTrack:button:addDefault') }}</el-button>
+          <el-button
+            type="primary"
+            @click="handleAdd"
+            class="el-icon-plus"
+            v-if="!isDistinguishCriteria && isShow"
+            >{{ $t('trials:reviewTrack:button:addDefault') }}</el-button
+          >
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
-        <el-button type="primary" size="mini" :disabled="selectArr.length <= 0" @click="handleSubmit">
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="selectArr.length <= 0"
+          @click="handleSubmit"
+        >
           {{ $t('common:button:submit') }}
         </el-button>
       </span>
     </div>
 
-    <el-table :data="list" stripe size="small" height="400" @selection-change="handleSelectChange">
-      <el-table-column type="selection" align="left" :selectable="selectable" width="45" />
+    <el-table
+      :data="list"
+      stripe
+      size="small"
+      height="400"
+      @selection-change="handleSelectChange"
+    >
+      <el-table-column
+        type="selection"
+        align="left"
+        :selectable="selectable"
+        width="45"
+      />
       <el-table-column type="index" width="40" />
       <!-- Code -->
       <!-- <el-table-column
@@ -64,89 +132,155 @@
         show-overflow-tooltip
         width="100"
       /> -->
-      <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-        :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
+      <el-table-column
+        v-if="isDistinguishCriteria"
+        prop="TrialReadingCriterionId"
+        :label="$t('trials:reviewTrack:table:criterionName')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="120"
+      >
         <template slot-scope="scope">
-          {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
-            scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
-            ).join(', ') : ''}}
+          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
         </template>
       </el-table-column>
-      <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-        :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip width="160" />
-      <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
-        show-overflow-tooltip width="160" />
-      <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-        sortable="custom" show-overflow-tooltip width="100">
+      <el-table-column
+        v-if="$i18n.locale === 'zh'"
+        prop="EmailTopicCN"
+        :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      />
+      <el-table-column
+        v-else
+        prop="EmailTopic"
+        :label="$t('trials:emailManageCfg:table:EmailTopic')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      />
+      <el-table-column
+        prop="BusinessModuleEnum"
+        :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
           {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
         </template>
       </el-table-column>
-      <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-        sortable="custom" show-overflow-tooltip width="130">
+      <el-table-column
+        prop="BusinessScenarioEnum"
+        :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="130"
+      >
         <template slot-scope="scope">
           {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
       <!-- 收件人 -->
-      <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        prop="ToUserTypeList"
+        :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
           {{
             scope.row.ToUserTypeList.length > 0
               ? scope.row.ToUserTypeList.map((v) => $fd('UserType', v)).join(
-                '、'
-              )
+                  '、'
+                )
               : ''
           }}
         </template>
       </el-table-column>
       <!-- 抄送人 -->
-      <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        prop="CopyUserTypeList"
+        :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
           {{
             scope.row.CopyUserTypeList.length > 0
               ? scope.row.CopyUserTypeList.map((v) => $fd('UserType', v)).join(
-                '、'
-              )
+                  '、'
+                )
               : ''
           }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" sortable="custom"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
           {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
-      <el-table-column prop="EmailCron" :label="$t('trials:emailManageCfg:table:EmailCron')" sortable="custom"
-        show-overflow-tooltip width="160">
+      <el-table-column
+        prop="EmailCron"
+        :label="$t('trials:emailManageCfg:table:EmailCron')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      >
         <template slot-scope="scope">
           <span>{{ getEmailCron(scope.row.EmailCron) }}</span>
         </template>
       </el-table-column>
       <!-- 附件 -->
-      <el-table-column v-if="$i18n.locale === 'zh'" prop="AttachNameCN"
-        :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip width="100">
+      <el-table-column
+        v-if="$i18n.locale === 'zh'"
+        prop="AttachNameCN"
+        :label="$t('trials:emailManageCfg:title:fileName')"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.AttachCNPath" type="text" @click="handlePreview(scope.row.AttachCNPath)">
+          <el-button
+            v-if="scope.row.AttachCNPath"
+            type="text"
+            @click="handlePreview(scope.row.AttachCNPath)"
+          >
             {{ scope.row.AttachNameCN }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 附件 -->
-      <el-table-column v-else prop="AttachName" :label="$t('trials:emailManageCfg:title:fileName')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        v-else
+        prop="AttachName"
+        :label="$t('trials:emailManageCfg:title:fileName')"
+        show-overflow-tooltip
+        width="100"
+      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
+          <el-button
+            v-if="scope.row.AttachPath"
+            type="text"
+            @click="handlePreview(scope.row.AttachPath)"
+          >
             {{ scope.row.AttachName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 是否需要回执 -->
-      <el-table-column prop="IsReturnRequired" :label="$t('trials:emailManageCfg:title:isReturnRequired')"
-        show-overflow-tooltip sortable="custom" width="140">
+      <el-table-column
+        prop="IsReturnRequired"
+        :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="140"
+      >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsReturnRequired" type="danger">
             {{ $fd('YesOrNo', scope.row.IsReturnRequired) }}
@@ -157,8 +291,13 @@
         </template>
       </el-table-column>
       <!-- 是否自动发送 -->
-      <el-table-column prop="IsAutoSend" :label="$t('trials:emailManageCfg:title:isAutoSend')" show-overflow-tooltip
-        sortable="custom" width="160">
+      <el-table-column
+        prop="IsAutoSend"
+        :label="$t('trials:emailManageCfg:title:isAutoSend')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsAutoSend" type="danger">
             {{ $fd('YesOrNo', scope.row.IsAutoSend) }}
@@ -168,8 +307,13 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-        sortable="custom" width="160">
+      <el-table-column
+        prop="IsEnable"
+        :label="$t('trials:emailManageCfg:table:IsEnable')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" type="danger">
             {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -180,14 +324,29 @@
         </template>
       </el-table-column>
       <!-- 更新时间 -->
-      <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-        sortable="custom" width="160" />
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:emailManageCfg:title:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      />
       <!-- 创建时间 -->
-      <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-        sortable="custom" width="160" />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:emailManageCfg:title:createTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      />
     </el-table>
-    <Pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      @pagination="getList" />
+    <Pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
   </box-content>
 </template>
 <script>

src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue

@@ -1,5 +1,12 @@
 <template>
-  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
+  <el-form
+    ref="emailForm"
+    v-loading="loading"
+    :model="form"
+    label-width="180px"
+    size="small"
+    :rules="rules"
+  >
     <el-row>
       <el-col :span="24">
         <el-form-item label="Code" prop="Code">
@@ -7,111 +14,242 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopicCN')" prop="EmailTopicCN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+          prop="EmailTopicCN"
+        >
           <el-input style="width: 300px" disabled v-model="form.EmailTopicCN" />
         </el-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopic')" prop="EmailTopic">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopic')"
+          prop="EmailTopic"
+        >
           <el-input style="width: 300px" disabled v-model="form.EmailTopic" />
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
-          <el-select v-model="form.BusinessScenarioEnum" disabled clearable class="mr">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label" :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          prop="BusinessScenarioEnum"
+        >
+          <el-select
+            v-model="form.BusinessScenarioEnum"
+            disabled
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="`BusinessScenarioEnum${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:ToUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:ToUserTypeList')"
+          prop="ToUserTypeList"
+        >
+          <el-select
+            v-model="form.ToUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CopyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of UserTypeList" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CopyUserTypeList')"
+          prop="CopyUserTypeList"
+        >
+          <el-select
+            v-model="form.CopyUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`CopyUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:blackUserIdList')" prop="blackUserIdList">
-          <el-select v-model="form.blackUserIdList" clearable multiple class="mr">
-            <el-option v-for="item of UserList" :key="`blackUserIdList${item.UserName}`"
-              :label="`${item.UserName}(${item.RealName})`" :value="item.UserId" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:blackUserIdList')"
+          prop="blackUserIdList"
+        >
+          <el-select
+            v-model="form.blackUserIdList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserList"
+              :key="`blackUserIdList${item.UserName}`"
+              :label="`${item.UserName}(${item.RealName})`"
+              :value="item.UserId"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum">
-            <el-select v-model="form.EmailUrgentEnum" disabled clearable class="mr">
-              <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-                :value="item.value" />
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+            prop="EmailUrgentEnum"
+          >
+            <el-select
+              v-model="form.EmailUrgentEnum"
+              disabled
+              clearable
+              class="mr"
+            >
+              <el-option
+                v-for="item of $d.EmailUrgent"
+                :key="`EmailUrgent${item.label}`"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')"
-            v-if="form.EmailUrgentEnum !== 1 && IntervalShow" prop="EmailCron">
-            <el-input-number v-model="Interval" @change="handleIntervalChange" :min="1" :max="365"></el-input-number>
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailCron')"
+            v-if="form.EmailUrgentEnum !== 1 && IntervalShow"
+            prop="EmailCron"
+          >
+            <el-input-number
+              v-model="Interval"
+              @change="handleIntervalChange"
+              :min="1"
+              :max="365"
+            ></el-input-number>
             <!--            <el-input style="width: 300px" readonly v-model="form.EmailCron" />-->
             <!--            <el-button type="primary" @click="showDialog">生成 cron</el-button>-->
           </el-form-item>
         </el-col>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+          prop="IsReturnRequired"
+        >
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsReturnRequired${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsAutoSend')"
+          prop="IsAutoSend"
+        >
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsAutoSend${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          prop="IsEnable"
+        >
           <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsEnable${item.value}`"
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
-          v-if="form.CriterionTypeList && form.CriterionTypeList.length > 0" prop="CriterionTypeList">
-          <el-select disabled v-model="form.CriterionTypeList" clearable class="mr" multiple>
-            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
+          v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0"
+          prop="CriterionTypeEnum"
+        >
+          <el-select
+            disabled
+            v-model="form.CriterionTypeEnum"
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="`CriterionType${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :disabled="true"
-            :limit="1" :file-list="fileListCN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListCN')"
+          prop="IsEnable"
+        >
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadCN"
+            :http-request="handleUploadFileCN"
+            :on-preview="handlePreviewCN"
+            :on-remove="handleRemoveFileCN"
+            :show-file-list="true"
+            :disabled="true"
+            :limit="1"
+            :file-list="fileListCN"
+          >
           </el-upload>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :disabled="true"
-            :limit="1" :file-list="fileListEN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListEN')"
+          prop="IsEnable"
+        >
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadEN"
+            :http-request="handleUploadFileEN"
+            :on-preview="handlePreviewEN"
+            :on-remove="handleRemoveFileEN"
+            :show-file-list="true"
+            :disabled="true"
+            :limit="1"
+            :file-list="fileListEN"
+          >
           </el-upload>
         </el-form-item>
       </el-col>
@@ -132,14 +270,26 @@
     <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
     <!--      />-->
     <!--    </el-form-item>-->
-    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
       <el-form-item style="text-align: right">
         <el-button size="small" type="primary" @click="handleSave">
-          {{ $t('common:button:save') }}</el-button>
+          {{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </div>
-    <el-dialog append-to-body :title="$t('trials:emailManageCfg:button:generate')" :visible.sync="showCron">
-      <vcrontab @hide="showCron = false" @fill="crontabFill" :expression="expression"></vcrontab>
+    <el-dialog
+      append-to-body
+      :title="$t('trials:emailManageCfg:button:generate')"
+      :visible.sync="showCron"
+    >
+      <vcrontab
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></vcrontab>
     </el-dialog>
   </el-form>
 </template>
@@ -195,7 +345,6 @@ export default {
         IsEnable: true,
         IsAutoSend: true,
         CriterionTypeEnum: null,
-        CriterionTypeList: [],
         FromEmail: '',
         FromName: '',
         AuthorizationCode: '',

src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue

@@ -3,30 +3,63 @@
     <template slot="search-container">
       <el-form :inline="true" size="small">
         <!-- 业务场景 -->
-        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="item.value" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:businessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          :label="$t('trials:reviewTrack:table:criterionName')">
-          <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width: 120px">
-            <el-option v-for="item of trialCriterionList"
-              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId"
-              :label="item.TrialReadingCriterionName" />
+        <el-form-item
+          v-if="isDistinguishCriteria"
+          style="margin-bottom: 10px"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+        >
+          <el-select
+            v-model="searchData.TrialReadingCriterionId"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of trialCriterionList"
+              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId"
+              :value="item.TrialReadingCriterionId"
+              :label="item.TrialReadingCriterionName"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          prop="ToUserTypeList"
+        >
           <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          prop="IsEnable"
+        >
           <el-select v-model="searchData.IsEnable" clearable class="mr">
-            <el-option v-for="item of $d.YesOrNo" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -35,11 +68,21 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
-          <el-button v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" type="primary"
-            icon="el-icon-plus" size="small" :disabled="isEdit" @click="handleAddDefault">
+          <el-button
+            v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            :disabled="isEdit"
+            @click="handleAddDefault"
+          >
             {{ $t('trials:emailManageCfg:button:Default') }}
           </el-button>
         </el-form-item>
@@ -47,7 +90,13 @@
       <!-- 自定义标准允许添加 -->
     </template>
     <template slot="main-container">
-      <el-table ref="emailList" v-loading="loading" :data="list" stripe @sort-change="handleSortChange">
+      <el-table
+        ref="emailList"
+        v-loading="loading"
+        :data="list"
+        stripe
+        @sort-change="handleSortChange"
+      >
         <el-table-column type="index" width="40" />
         <!-- Code -->
         <!-- <el-table-column
@@ -57,34 +106,63 @@
           show-overflow-tooltip
           width="100"
         /> -->
-        <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
+        <el-table-column
+          v-if="isDistinguishCriteria"
+          prop="TrialReadingCriterionId"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="120"
+        >
           <template slot-scope="scope">
-            {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
-              scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
-              ).join(', ') : ''}}
+            {{ scope.row.TrialCriterionName }}
           </template>
         </el-table-column>
-        <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-          :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip
-          min-width="140" />
-        <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')"
-          sortable="custom" show-overflow-tooltip min-width="140" />
-        <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-          sortable="custom" show-overflow-tooltip min-width="100">
+        <el-table-column
+          v-if="$i18n.locale === 'zh'"
+          prop="EmailTopicCN"
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="140"
+        />
+        <el-table-column
+          v-else
+          prop="EmailTopic"
+          :label="$t('trials:emailManageCfg:table:EmailTopic')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="140"
+        />
+        <el-table-column
+          prop="BusinessModuleEnum"
+          :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="100"
+        >
           <template slot-scope="scope">
             {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
           </template>
         </el-table-column>
-        <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-          sortable="custom" show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="BusinessScenarioEnum"
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="100"
+        >
           <template slot-scope="scope">
             {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
           </template>
         </el-table-column>
         <!-- 收件人 -->
-        <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="ToUserTypeList"
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          show-overflow-tooltip
+          min-width="100"
+        >
           <template slot-scope="scope">
             {{
               scope.row.ToUserTypeNameList.length > 0
@@ -94,8 +172,12 @@
           </template>
         </el-table-column>
         <!-- 抄送人 -->
-        <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="CopyUserTypeList"
+          :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+          show-overflow-tooltip
+          min-width="100"
+        >
           <template slot-scope="scope">
             {{
               scope.row.CopyUserTypeNameList.length > 0
@@ -122,18 +204,36 @@
         <!--          width="160"-->
         <!--        />-->
         <!-- 附件 -->
-        <el-table-column v-if="$i18n.locale === 'zh' && isDistinguishCriteria" prop="AttachNameCN"
-          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
+        <el-table-column
+          v-if="$i18n.locale === 'zh' && isDistinguishCriteria"
+          prop="AttachNameCN"
+          :label="$t('trials:emailManageCfg:title:fileName')"
+          show-overflow-tooltip
+          min-width="140"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row.AttachCNPath)"
-              style="cursor: pointer; color: #428bca">{{ scope.row.AttachNameCN }}</span>
+            <span
+              v-if="scope.row.AttachCNPath"
+              @click="handlePreview(scope.row.AttachCNPath)"
+              style="cursor: pointer; color: #428bca"
+              >{{ scope.row.AttachNameCN }}</span
+            >
           </template>
         </el-table-column>
-        <el-table-column v-if="$i18n.locale === 'en' && isDistinguishCriteria" prop="AttachName"
-          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
+        <el-table-column
+          v-if="$i18n.locale === 'en' && isDistinguishCriteria"
+          prop="AttachName"
+          :label="$t('trials:emailManageCfg:title:fileName')"
+          show-overflow-tooltip
+          min-width="140"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.AttachPath" @click="handlePreview(scope.row.AttachPath)"
-              style="cursor: pointer; color: #428bca">{{ scope.row.AttachName }}</span>
+            <span
+              v-if="scope.row.AttachPath"
+              @click="handlePreview(scope.row.AttachPath)"
+              style="cursor: pointer; color: #428bca"
+              >{{ scope.row.AttachName }}</span
+            >
           </template>
         </el-table-column>
         <!-- 是否需要回执 -->
@@ -167,8 +267,13 @@
           </template>
         </el-table-column> -->
         <!-- 是否启用 -->
-        <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-          sortable="custom" min-width="90">
+        <el-table-column
+          prop="IsEnable"
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="90"
+        >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsEnable" type="danger">
               {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -179,37 +284,84 @@
           </template>
         </el-table-column>
         <!-- 更新时间 -->
-        <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-          sortable="custom" min-width="100" />
+        <el-table-column
+          prop="UpdateTime"
+          :label="$t('trials:emailManageCfg:title:updateTime')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        />
         <!-- 创建时间 -->
-        <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-          sortable="custom" min-width="100" />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('trials:emailManageCfg:title:createTime')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        />
 
-        <el-table-column v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" width="120"
-          :label="$t('common:action:action')" fixed="right">
+        <el-table-column
+          v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+          width="120"
+          :label="$t('common:action:action')"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button icon="el-icon-edit-outline" circle :disabled="isEdit" :title="$t('common:button:edit')"
-              @click="handleEdit(scope.row)" />
+            <el-button
+              icon="el-icon-edit-outline"
+              circle
+              :disabled="isEdit"
+              :title="$t('common:button:edit')"
+              @click="handleEdit(scope.row)"
+            />
             <!-- 编辑 -->
-            <el-button icon="el-icon-delete" circle :disabled="isEdit" :title="$t('common:button:delete')"
-              @click="deleteTrialEmailNoticeConfig(scope.row)" />
+            <el-button
+              icon="el-icon-delete"
+              circle
+              :disabled="isEdit"
+              :title="$t('common:button:delete')"
+              @click="deleteTrialEmailNoticeConfig(scope.row)"
+            />
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 新增/编辑 -->
-      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
-        :title="editDialog.title" fullscreen custom-class="base-dialog-wrapper">
-        <EmailForm :data="currentRow" :criterion-type="criterionType" :is-distinguish-criteria="isDistinguishCriteria"
-          :UserTypeList="UserTypeList" @closeDialog="closeDialog" @getList="getList" />
+      <el-dialog
+        v-if="editDialog.visible"
+        :visible.sync="editDialog.visible"
+        :close-on-click-modal="false"
+        :title="editDialog.title"
+        fullscreen
+        custom-class="base-dialog-wrapper"
+      >
+        <EmailForm
+          :data="currentRow"
+          :criterion-type="criterionType"
+          :is-distinguish-criteria="isDistinguishCriteria"
+          :UserTypeList="UserTypeList"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </el-dialog>
       <!-- 新增默认问题 -->
-      <el-dialog v-if="addVisible" :visible.sync="addVisible" width="1300px" :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper" :title="$t('trials:emailManageCfg:button:Default')">
+      <el-dialog
+        v-if="addVisible"
+        :visible.sync="addVisible"
+        width="1300px"
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+        :title="$t('trials:emailManageCfg:button:Default')"
+      >
         <div class="base-dialog-body">
-          <DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" :isShow="isBtnShow"
-            :UserTypeList="UserTypeList" @close="addVisible = false" />
+          <DefaultQS
+            @getList="getList"
+            :is-distinguish-criteria="isDistinguishCriteria"
+            :isShow="isBtnShow"
+            :UserTypeList="UserTypeList"
+            @close="addVisible = false"
+          />
         </div>
       </el-dialog>
     </template>

src/views/trials/trials-panel/setting/inspection/index.vue

@@ -1,191 +0,0 @@
-<template>
-    <BoxContent style="min-height: 100%; background: #fff">
-        <div class="inspection-content" v-loading="loading">
-            <!-- <div class="top">
-                <span class="title">{{ this.$t("trials:setting:inspection:module") }}</span>
-                <span>{{ this.$t("trials:setting:inspection:optName") }}</span>
-            </div> -->
-            <el-tree :data="tree" show-checkbox node-key="id" :expand-on-click-node="false" ref="tree">
-                <span class="custom-tree-node" slot-scope="{ node }">
-                    <span>{{ node.label }}</span>
-                    <!-- <span>
-                        {{ node.data.optName }}
-                    </span> -->
-                </span>
-            </el-tree>
-        </div>
-        <div class="btnBox">
-            <el-button @click.stop="getCheckedNodes" type="primary"
-                v-if="hasPermi(['trials:setting:inspection:update'])" class="btn">
-                {{ $t('common:button:save') }}
-            </el-button>
-        </div>
-    </BoxContent>
-</template>
-<script>
-import BoxContent from '@/components/BoxContent'
-import {
-    getTrialShowInspection,
-    setTrialShowInspection
-} from '@/api/trials'
-export default {
-    components: { BoxContent },
-    data() {
-        return {
-            loading: false,
-            tree: [
-                {
-                    id: 1,
-                    label: this.$t("trials:setting:inspection:module"),
-                    optName: this.$t("trials:setting:inspection:optName"),
-                }
-            ],
-            list: []
-        }
-    },
-    created() {
-        this.getTree()
-    },
-    computed: {
-        isEN() {
-            return this.$i18n.locale !== 'zh'
-        }
-    },
-    methods: {
-        async getCheckedNodes() {
-            try {
-                this.loading = true
-                let ids = this.$refs.tree.getCheckedKeys()
-                let list = []
-                this.list.forEach(item => {
-                    let obj = {
-                        FrontAuditConfigId: item.FrontAuditConfigId,
-                        isShow: false
-                    }
-                    if (ids.includes(item.FrontAuditConfigId)) {
-                        obj.isShow = true
-                    }
-                    list.push(obj)
-                })
-                let data = {
-                    TrialId: this.$route.query.trialId,
-                    TrialShowInspectionList: list
-                }
-                let res = await setTrialShowInspection(data)
-                if (res.IsSuccess) {
-                    this.getTree()
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        async getTree() {
-            try {
-                let data = {
-                    TrialId: this.$route.query.trialId
-                }
-                this.loading = true
-                let res = await getTrialShowInspection(data);
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = this.formatList(res.Result)
-                    let { tree, ids } = this.formatTree(res.Result);
-                    this.tree = tree
-                    this.$nextTick(() => {
-                        this.$refs.tree.setCheckedKeys(ids)
-                    })
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        formatTree(list) {
-            let tree = [], ids = []
-            list.forEach(item => {
-                let obj = {
-                    id: item.FrontAuditConfigId,
-                    label: this.isEN ? item.Description : item.DescriptionCN
-                }
-                if (item.IsShow) {
-                    ids.push(item.FrontAuditConfigId)
-                }
-                if (item.Children && item.Children.length > 0) {
-                    obj.children = []
-                    item.Children.forEach(it => {
-                        let o = {
-                            id: it.FrontAuditConfigId,
-                            label: this.isEN ? it.Description : it.DescriptionCN
-                        }
-                        if (it.IsShow) {
-                            ids.push(it.FrontAuditConfigId)
-                        }
-                        obj.children.push(o)
-                    })
-                }
-                tree.push(obj)
-            })
-            return { tree, ids }
-        },
-        formatList(list) {
-            let arr = []
-            list.forEach(item => {
-                let obj = {
-                    FrontAuditConfigId: item.FrontAuditConfigId,
-                    ParentId: item.ParentId
-                }
-                arr.push(obj)
-                if (item.Children && item.Children.length > 0) {
-                    item.Children.forEach(it => {
-                        let o = {
-                            FrontAuditConfigId: it.FrontAuditConfigId,
-                            ParentId: it.ParentId
-                        }
-                        arr.push(o)
-                    })
-                }
-            })
-            return arr;
-        }
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.inspection-content {
-    width: 40%;
-    min-height: 500px;
-
-    .top {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px;
-        padding-top: 20px;
-
-        .title {
-            width: 70%;
-        }
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    .custom-tree-node {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 20px 0 0;
-    }
-}
-
-.btnBox {
-    width: 40%;
-    padding: 0 20px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-</style>

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -738,7 +738,7 @@ export default {
     },
     handleIsDeletedChanged(val) {
       if (val) {
-        // this.statusForm.joinTime = ''
+        this.statusForm.joinTime = ''
       } else {
         this.statusForm.removeTime = ''
       }

src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue

@@ -1,139 +1,68 @@
 <template>
-  <el-form
-    ref="questionForm"
-    v-loading="loading"
-    :model="form"
-    label-width="120px"
-    size="small"
-    :rules="rules"
-  >
+  <el-form ref="questionForm" v-loading="loading" :model="form" label-width="120px" size="small" :rules="rules">
     <div class="base-dialog-body">
       <!-- 审核问题 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:questionName')"
-        prop="QuestionName"
-      >
-        <el-input
-          v-model="form.QuestionName"
-        />
+      <el-form-item :label="$t('trials:qcCfg:table:questionName')" prop="QuestionName">
+        <el-input v-model="form.QuestionName" :disabled="data.IsQuestionQCAuditPassed" />
       </el-form-item>
-<!--      <el-form-item-->
-<!--        :label="$t('common:title:languageType')"-->
-<!--        prop="LanguageType"-->
-<!--      >-->
-<!--        <el-select-->
-<!--          v-model="form.LanguageType"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item of $d.LanguageType"-->
-<!--            :key="item.value"-->
-<!--            :value="item.value"-->
-<!--            :label="item.label"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item-->
+      <!--        :label="$t('common:title:languageType')"-->
+      <!--        prop="LanguageType"-->
+      <!--      >-->
+      <!--        <el-select-->
+      <!--          v-model="form.LanguageType"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item of $d.LanguageType"-->
+      <!--            :key="item.value"-->
+      <!--            :value="item.value"-->
+      <!--            :label="item.label"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
       <!-- 类型 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:type')"
-      >
-        <el-select
-          v-model="form.Type"
-          @change="((val)=>{typeChange(val, form)})"
-        >
-          <el-option
-            v-for="item of $d.QcType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
+      <el-form-item :label="$t('trials:qcCfg:table:type')">
+        <el-select v-model="form.Type" @change="((val) => { typeChange(val, form) })"
+          :disabled="data.IsQuestionQCAuditPassed">
+          <el-option v-for="item of $d.QcType" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <!-- 选项 -->
-      <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio'"
-        :label="$t('trials:qcCfg:table:typeValue')"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          :placeholder="$t('trials:qcCfg:message:typeValue')"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:qcCfg:table:typeValue')"
+        prop="TypeValue">
+        <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')" type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="data.IsQuestionQCAuditPassed" />
       </el-form-item>
       <!-- 父问题 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:parentQs')"
-      >
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="item.Id"
-            :label="item.QuestionName"
-            :value="item.Id"
-          />
+      <el-form-item :label="$t('trials:qcCfg:table:parentQs')">
+        <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })"
+          :disabled="data.IsQuestionQCAuditPassed">
+          <el-option v-for="item of parentOptions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
         </el-select>
       </el-form-item>
       <!-- 父问题触发值 -->
-      <el-form-item
-        v-if="form.ParentId"
-        :label="$t('trials:qcCfg:table:parentTriggerValue')"
-        prop="ParentTriggerValue"
-      >
-        <el-select
-          v-model="form.ParentTriggerValue"
-        >
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
+      <el-form-item v-if="form.ParentId" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValue">
+        <el-select v-model="form.ParentTriggerValue" :disabled="data.IsQuestionQCAuditPassed">
+          <el-option v-for="item of parentTriggerValOptions" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
       <!-- 序号 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:order')"
-        prop="ShowOrder"
-      >
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-        />
+      <el-form-item :label="$t('trials:qcCfg:table:order')" prop="ShowOrder">
+        <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0"
+          :disabled="data.IsQuestionQCAuditPassed" />
       </el-form-item>
       <!-- 是否必填 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:isRequired')"
-      >
-        <el-radio-group
-          v-model="form.IsRequired"
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`IsRequired${item.value}`"
-            :label="item.value"
-          >
+      <el-form-item :label="$t('trials:qcCfg:table:isRequired')">
+        <el-radio-group v-model="form.IsRequired">
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsRequired${item.value}`" :label="item.value">
             {{ item.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 启用状态 -->
-      <el-form-item
-        :label="$t('trials:qcCfg:table:isEnable')"
-      >
-        <el-radio-group
-          v-model="form.IsEnable"
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="item.value"
-            :label="item.value"
-          >
+      <el-form-item :label="$t('trials:qcCfg:table:isEnable')">
+        <el-radio-group v-model="form.IsEnable">
+          <el-radio v-for="item of $d.YesOrNo" :key="item.value" :label="item.value">
             {{ item.label }}
           </el-radio>
         </el-radio-group>
@@ -143,19 +72,11 @@
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item style="text-align:right;">
         <!-- 取消 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleClose"
-        >
+        <el-button size="small" type="primary" @click="handleClose">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- Save -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="handleSave"
-        >
+        <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -202,7 +123,7 @@ export default {
       },
       rules: {
         QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
+        { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
         TypeValue: [
           { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
@@ -308,6 +229,4 @@ export default {
 }
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

src/views/trials/trials-panel/setting/qc-question/index.vue

@@ -8,23 +8,23 @@
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
-<!--        <el-form-item-->
-<!--          :label="$t('common:title:languageType')"-->
-<!--          style="margin-top: 10px"-->
-<!--        >-->
-<!--          <el-select-->
-<!--            v-model="searchData.LanguageType"-->
-<!--            clearable-->
-<!--            style="width:120px;"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="item of $d.LanguageType"-->
-<!--              :key="item.value"-->
-<!--              :value="item.value"-->
-<!--              :label="item.label"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item-->
+        <!--          :label="$t('common:title:languageType')"-->
+        <!--          style="margin-top: 10px"-->
+        <!--        >-->
+        <!--          <el-select-->
+        <!--            v-model="searchData.LanguageType"-->
+        <!--            clearable-->
+        <!--            style="width:120px;"-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item of $d.LanguageType"-->
+        <!--              :key="item.value"-->
+        <!--              :value="item.value"-->
+        <!--              :label="item.label"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
         <!-- 类型 -->
         <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -38,228 +38,138 @@
         </el-form-item>
         <el-form-item :label="$t('trials:qcCfg:table:isRequired')">
           <el-select v-model="searchData.IsRequired" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="`IsRequired${item.label}`" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :key="`IsRequired${item.label}`" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
-        <el-form-item >
+        <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
           <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
-          <el-button
-            v-if="isHaveQCQuestion"
-            type="primary"
-            icon="el-icon-view"
-            @click="preview.visible = true"
-          >
+          <el-button v-if="isHaveQCQuestion" type="primary" icon="el-icon-view" @click="preview.visible = true">
             {{ $t('trials:qcCfg:button:preview') }}
           </el-button>
-          <el-button
-            v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:default-question'])"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-          >
+          <el-button v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:default-question'])"
+            type="primary" icon="el-icon-plus" @click="handleAdd">
             {{ $t('trials:qcCfg:button:default') }}
           </el-button>
-          <el-button
-            v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:custom-question'])"
-            type="primary"
-            icon="el-icon-delete"
-            @click="handleBatchDelete"
-          >
+          <el-button v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:custom-question'])"
+            type="primary" icon="el-icon-delete" @click="handleBatchDelete">
             {{ $t('common:button:batchDelete') }}
           </el-button>
-          <el-button
-            v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:custom-question'])"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCustomQS"
-          >
+          <el-button v-if="!isConfirm && hasPermi(['trials:trials-panel:setting:qc-question:custom-question'])"
+            type="primary" icon="el-icon-plus" @click="handleCustomQS">
             {{ $t('trials:qcCfg:button:custom') }}
           </el-button>
-          <el-button
-            v-if="(!isConfirm && isHaveQCQuestion)"
-            v-hasPermi="['trials:trials-panel:setting:qc-question:confirm']"
-            type="danger"
-            icon="el-icon-circle-check"
-            @click="handleConfirm"
-          >
+          <el-button v-if="(!isConfirm && isHaveQCQuestion)"
+            v-hasPermi="['trials:trials-panel:setting:qc-question:confirm']" type="danger" icon="el-icon-circle-check"
+            @click="handleConfirm">
             {{ $t('trials:qcCfg:button:confirm') }}
           </el-button>
+          <el-button v-if="isConfirm" v-hasPermi="['trials:trials-panel:setting:qc-question:resetQuestion']"
+            type="primary" @click="resetQuestion">
+            {{ $t('trials:qcCfg:button:resetQuestion') }}
+          </el-button>
+          <el-button v-if="isConfirm" v-hasPermi="['trials:trials-panel:setting:qc-question:reviewTask']" type="primary"
+            @click="reviewTask">
+            {{ $t('trials:qcCfg:button:reviewTask') }}
+          </el-button>
         </el-form-item>
       </el-form>
-<!--      <span style="margin-left:auto">-->
-<!--      </span>-->
+      <!--      <span style="margin-left:auto">-->
+      <!--      </span>-->
     </div>
 
-    <el-table
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      height="100"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" :selectable="(row) => !row.IsQuestionQCAuditPassed" />
       <!-- 序号 -->
-      <el-table-column
-        prop="ShowOrder"
-        :label="$t('trials:qcCfg:table:order')"
-        width="60"
-      />
+      <el-table-column prop="ShowOrder" :label="$t('trials:qcCfg:table:order')" width="60" />
       <!-- 审核问题 -->
-      <el-table-column
-        prop="QuestionName"
-        :label="$t('trials:qcCfg:table:questionName')"
-        min-width="300"
-        show-overflow-tooltip
-      />
+      <el-table-column prop="QuestionName" :label="$t('trials:qcCfg:table:questionName')" min-width="300"
+        show-overflow-tooltip />
       <!-- 审核问题 -->
-<!--      <el-table-column-->
-<!--        prop="LanguageType"-->
-<!--        :label="$t('common:title:languageType')"-->
-<!--        show-overflow-tooltip-->
-<!--        width="100"-->
-<!--      >-->
-<!--        <template slot-scope="scope">-->
-<!--          {{ $fd('LanguageType', scope.row.LanguageType) }}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        prop="LanguageType"-->
+      <!--        :label="$t('common:title:languageType')"-->
+      <!--        show-overflow-tooltip-->
+      <!--        width="100"-->
+      <!--      >-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{ $fd('LanguageType', scope.row.LanguageType) }}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <!-- 类型 -->
-      <el-table-column
-        prop="Type"
-        :label="$t('trials:qcCfg:table:type')"
-        show-overflow-tooltip
-        width="120"
-      >
+      <el-table-column prop="Type" :label="$t('trials:qcCfg:table:type')" show-overflow-tooltip width="120">
         <template slot-scope="scope">
           {{ $fd('QcType', scope.row.Type) }}
         </template>
       </el-table-column>
       <!-- 选项 -->
-      <el-table-column
-        prop="TypeValue"
-        :label="$t('trials:qcCfg:table:typeValue')"
-        show-overflow-tooltip
-        width="180"
-      />
+      <el-table-column prop="TypeValue" :label="$t('trials:qcCfg:table:typeValue')" show-overflow-tooltip width="180" />
 
       <!-- 是否必填 -->
-      <el-table-column
-        prop="IsRequired"
-        :label="$t('trials:qcCfg:table:isRequired')"
-        width="160"
-      >
+      <el-table-column prop="IsRequired" :label="$t('trials:qcCfg:table:isRequired')" width="160">
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsRequired) }}
         </template>
       </el-table-column>
       <!-- 启用状态 -->
-      <el-table-column
-        prop="IsEnable"
-        :label="$t('trials:qcCfg:table:isEnable')"
-        width="120"
-      >
+      <el-table-column prop="IsEnable" :label="$t('trials:qcCfg:table:isEnable')" width="120">
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
       <!-- 父问题 -->
-      <el-table-column
-        prop="ParentShowOrder"
-        :label="$t('trials:qcCfg:table:parentQs')"
-        show-overflow-tooltip
-        width="160"
-      />
+      <el-table-column prop="ParentShowOrder" :label="$t('trials:qcCfg:table:parentQs')" show-overflow-tooltip
+        width="160" />
       <!-- 父问题触发值 -->
-      <el-table-column
-        prop="ParentTriggerValue"
-        :label="$t('trials:qcCfg:table:parentTriggerValue')"
-        show-overflow-tooltip
-        width="160"
-      />
+      <el-table-column prop="ParentTriggerValue" :label="$t('trials:qcCfg:table:parentTriggerValue')"
+        show-overflow-tooltip width="160" />
 
       <el-table-column
-        v-if="hasPermi(['trials:trials-panel:setting:qc-question:edit','trials:trials-panel:setting:qc-question:delete']) && !isConfirm"
-        :label="$t('common:action:action')"
-        min-width="150"
-      >
+        v-if="hasPermi(['trials:trials-panel:setting:qc-question:edit', 'trials:trials-panel:setting:qc-question:delete']) && !isConfirm"
+        :label="$t('common:action:action')" min-width="150">
         <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['trials:trials-panel:setting:qc-question:edit']"
-            circle
-            :title="$t('common:button:edit')"
-            icon="el-icon-edit-outline"
-            @click="handleEdit(scope.row)"
-          />
-          <el-button
-            v-hasPermi="['trials:trials-panel:setting:qc-question:delete']"
-            circle
-            :title="$t('common:button:delete')"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          />
+          <el-button v-hasPermi="['trials:trials-panel:setting:qc-question:edit']" circle
+            :title="$t('common:button:edit')" icon="el-icon-edit-outline" @click="handleEdit(scope.row)" />
+          <el-button v-hasPermi="['trials:trials-panel:setting:qc-question:delete']" circle
+            :title="$t('common:button:delete')" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            :disabled="scope.row.IsQuestionQCAuditPassed" />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 新增默认问题 -->
-    <el-dialog
-      v-if="addVisible"
-      :visible.sync="addVisible"
-      width="1200px"
-      :close-on-click-modal="false"
-      custom-class="base-dialog-wrapper"
-      :title="$t('trials:qcCfg:button:default')"
-    >
+    <el-dialog v-if="addVisible" :visible.sync="addVisible" width="1200px" :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper" :title="$t('trials:qcCfg:button:default')">
       <div class="base-modal-body">
         <DefaultQS @getList="getList" @close="addVisible = false" />
       </div>
     </el-dialog>
 
     <!-- 新增/编辑问题 -->
-    <el-dialog
-      v-if="qsForm.visible"
-      :visible.sync="qsForm.visible"
-      :close-on-click-modal="false"
-      custom-class="base-dialog-wrapper"
-      :title="qsForm.title"
-      width="600px"
-    >
+    <el-dialog v-if="qsForm.visible" :visible.sync="qsForm.visible" :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper" :title="qsForm.title" width="600px">
       <QsForm :data="currentRow" @getList="getList" @close="qsForm.visible = false" />
     </el-dialog>
 
     <!--签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+      custom-class="base-dialog-wrapper">
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
 
     <!-- 预览 -->
-    <el-dialog
-      v-if="preview.visible"
-      v-dialogDrag
-      :visible.sync="preview.visible"
-      :close-on-click-modal="false"
-      :title="preview.title"
-      width="500px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="preview.visible" v-dialogDrag :visible.sync="preview.visible" :close-on-click-modal="false"
+      :title="preview.title" width="500px" append-to-body custom-class="base-dialog-wrapper">
       <div class="base-dialog-body">
         <QcQuestionPreview :trial-id="trialId" />
       </div>
@@ -311,6 +221,18 @@ export default {
     this.getList()
   },
   methods: {
+    // 重置问题签名
+    resetQuestion() {
+      const { ResetImageQualityControlQuestion } = const_.processSignature
+      this.signCode = ResetImageQualityControlQuestion
+      this.signVisible = true
+    },
+    // 复核任务签名
+    reviewTask() {
+      const { CreateReviewTask } = const_.processSignature
+      this.signCode = CreateReviewTask
+      this.signVisible = true
+    },
     handleSelectionChange(value) {
       this.selectedList = value
     },

src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue

@@ -21,14 +21,7 @@
       </div>
       <el-table :data="question.TableQuestions.Answers">
         <el-table-column v-for="item of question.TableQuestions.Questions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="item.Unit">{{ scope.row[item.Id] }}{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit)
-              : item.ValueType === 2 ? '%' :
-                item.CustomUnit }}</span>
-            <span v-else>{{ scope.row[item.Id] }}</span>
-          </template>
-        </el-table-column>
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
       </el-table>
     </div>
     <template v-else>
@@ -149,22 +142,12 @@
         <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
           @change="(val) => { formItemNumberChange(val, question) }">
           <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
         </el-select>
         <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          v-model="questionForm[question.Id]" type="number" @change="(val) => { formItemNumberChange(val, question) }">
-          <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="append">%</template>
-        </el-input>
+          v-model="questionForm[question.Id]" type="number"
+          @change="(val) => { formItemNumberChange(val, question) }" />
         <el-input v-else-if="question.Type === 'number' && question.DataSource === 1"
-          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1">
-          <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="append">%</template>
-        </el-input>
+          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1" />
         <!-- 上传图像 -->
         <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
           :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100" :on-preview="handlePictureCardPreview"
@@ -406,9 +389,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   });
                   break;
                 case 6:
@@ -424,9 +404,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   });
                   break;
                 case 7:
@@ -442,9 +419,6 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                   });
                   num =
                     this.questionForm[o.QuestionId].length === 0
@@ -488,9 +462,6 @@ export default {
 
             }
           } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -604,6 +575,7 @@ export default {
             arr = [];
           let isNE = false
           CalculateQuestions.forEach((o, i) => {
+            console.log(this.QuestionsForm[o.TableQuestionId], 'this.QuestionsForm[o.TableQuestionId]')
             if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
               isNE = true
             }
@@ -921,16 +893,6 @@ export default {
   }
 }
 
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
 .criterion-form-item {
   .el-form-item {
     display: flex;

src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue

@@ -2,88 +2,167 @@
   <div class="criterion-form-item">
 
     <el-form-item
-      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :label="`${question.QuestionName}`" :prop="questionForm[question.Id]" :rules="[
-        {
-          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
-          message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-        },
-      ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
+      v-if="(question.ShowQuestion===1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion===0"
+      :label="`${question.QuestionName}`"
+      :prop="questionForm[question.Id]"
+      :rules="[
+        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
+          message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+      ]"
+      :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
+    >
       <!-- 输入框 -->
-      <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2" />
+      <el-input
+        v-if="question.Type==='input'"
+        v-model="questionForm[question.Id]"
+        :disabled="question.TableQuestionType === 2"
+      />
       <!-- 多行文本输入框 -->
-      <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4 }" />
+      <el-input
+        v-if="question.Type==='textarea'"
+        v-model="questionForm[question.Id]"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+      />
       <!-- 下拉框 -->
-      <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+      <el-select
+        v-if="question.Type==='select'"
+        v-model="questionForm[question.Id]"
+        clearable
         :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
-        @change="((val) => { formItemChange(val, question) })">
+        @change="((val)=>{formItemChange(val, question)})"
+      >
         <template v-if="question.TableQuestionType === 1">
-          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]" />
+          <el-option
+            v-for="item in organList"
+            :key="item.Id"
+            :label="item[question.DataTableColumn]"
+            :value="item[question.DataTableColumn]"
+          />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
+          <el-option
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
         </template>
-        <template
-          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-            :label="item.label" />
+        <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <el-option
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
         </template>
         <template v-else>
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+            :value="val"
+          />
         </template>
 
       </el-select>
       <!-- 单选 -->
-      <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-        @change="((val) => { formItemChange(val, question) })">
-        <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+      <el-radio-group
+        v-if="question.Type==='radio'"
+        v-model="questionForm[question.Id]"
+        @change="((val)=>{formItemChange(val, question)})"
+      >
+        <el-radio
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+        >
           {{ val }}
         </el-radio>
       </el-radio-group>
       <!-- 复选框 -->
-      <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]">
-        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+      <el-checkbox-group
+        v-if="question.Type==='checkbox'"
+        v-model="questionForm[question.Id]"
+      >
+        <el-checkbox
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+        >
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
 
       <!-- 自动计算 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled />
+      <el-input
+        v-if="question.Type==='calculation'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
       <!-- 自动计算 -->
-      <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" />
-      <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+      <el-input
+        v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+      />
+      <el-select
+        v-if="question.Type === 'class' && question.ClassifyShowType === 2"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+        @change="(val) => { formItemChange(val, question) }"
+      >
+        <el-option
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val.trim()"
+          :value="val.trim()"
+        />
       </el-select>
-      <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }">
-        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
+      <el-radio-group
+        v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+        @change="(val) => { formItemChange(val, question) }"
+      >
+        <el-radio
+          v-for="item of question.TypeValue.split('|')"
+          :key="item.trim()"
+          :label="item.trim()"
+        >
           {{ item.trim() }}
         </el-radio>
       </el-radio-group>
-
+      
       <!-- 自增 -->
-      <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
+      <el-input
+        v-if="question.Type==='increment'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
       <!-- 数值 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-        @change="((val) => { formItemChange(val, question) })">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+      <el-select
+        v-if="question.Type === 'number' && question.TypeValue"
+        v-model="questionForm[question.Id]"
+        clearable
+        @change="((val)=>{formItemNumberChange(val, question)})"
+      >
+        <el-option
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+          :value="val"
+        />
       </el-select>
-      <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1" v-model="questionForm[question.Id]"
-        type="number" @change="((val) => { formItemNumberChange(val, question) })">
-        <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
+      <el-input
+        v-else-if="question.Type === 'number' && question.DataSource !== 1"
+        v-model="questionForm[question.Id]"
+        type="number"
+        @change="((val)=>{formItemNumberChange(val, question)})"
+      >
+        <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}</template>
         <template v-else-if="question.ValueType === 2" slot="append">%</template>
       </el-input>
       <el-input
@@ -95,26 +174,51 @@
         <template v-else-if="question.ValueType === 2" slot="append">%</template>
       </el-input>
       <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
-        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100" :on-preview="handlePictureCardPreview"
-        :before-upload="handleBeforeUpload" :http-request="uploadScreenshot" list-type="picture-card"
-        :on-remove="handleRemove" :file-list="fileList" :class="{ disabled: fileList.length >= question.ImageCount }">
+      <el-upload
+        v-if="question.Type==='upload'"
+        action
+        :accept="question.FileType"
+        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
+        :on-preview="handlePictureCardPreview"
+        :before-upload="handleBeforeUpload"
+        :http-request="uploadScreenshot"
+        list-type="picture-card"
+        :on-remove="handleRemove"
+        :file-list="fileList"
+        :class="{disabled:fileList.length >= question.ImageCount}"
+      >
         <i slot="default" class="el-icon-plus" />
         <div slot="file" slot-scope="{file}">
-          <img class="el-upload-list__item-thumbnail" crossorigin="anonymous" :src="OSSclientConfig.basePath + file.url"
-            alt="">
+          <img
+            class="el-upload-list__item-thumbnail"
+            crossorigin="anonymous"
+            :src="OSSclientConfig.basePath + file.url"
+            alt=""
+          >
           <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
               <i class="el-icon-zoom-in" />
             </span>
 
-            <span v-if="readingTaskState < 2" class="el-upload-list__item-delete" @click="handleRemove(file)">
+            <span
+              v-if="readingTaskState < 2"
+              class="el-upload-list__item-delete"
+              @click="handleRemove(file)"
+            >
               <i class="el-icon-delete" />
             </span>
           </span>
         </div>
       </el-upload>
-      <el-dialog v-if="question.Type === 'upload'" append-to-body :visible.sync="imgVisible" width="600px">
+      <el-dialog
+        v-if="question.Type==='upload'"
+        append-to-body
+        :visible.sync="imgVisible"
+        width="600px"
+      >
         <el-image :src="imageUrl" crossorigin="anonymous" width="100%">
           <div slot="placeholder" class="image-slot">
             加载中<span class="dot">...</span>
@@ -192,7 +296,7 @@ export default {
         this.question.ClassifyAlgorithms
       );
     }
-
+    
     if (this.question.Type === 'upload') {
       if (this.questionForm[this.question.Id]) {
         this.urls = this.questionForm[this.question.Id].split('|')
@@ -248,9 +352,7 @@ export default {
       }
     },
     formItemNumberChange(v, question) {
-      // this.$emit('formItemTableNumberChange', v, question)
-      this.$emit('formItemTableNumberChange')
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
+      this.$emit('formItemTableNumberChange', v, question)
     },
     resetChild(obj) {
       obj.forEach(i => {
@@ -267,7 +369,7 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     uploadScreenshot(param) {
-
+      
     },
     handleBeforeUpload(file) {
       // 检测文件类型是否符合要求
@@ -304,50 +406,34 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
-    ::v-deep .el-form-item__content {
+.my_dialog{
+  .criterion-form-item{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
 }
-
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
-.criterion-form-item {
-  .el-form-item {
+.criterion-form-item{
+  .el-form-item{
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-
-  ::v-deep .el-form-item__content {
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
   }
-
-  .mb {
+  .mb{
     margin-bottom: 0px;
   }
-
-  .disabled {
+  .disabled{
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
-
-  .uploadWrapper {
+  .uploadWrapper{
     display: flex;
     flex-direction: column;
     align-items: flex-start;

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -28,7 +28,7 @@
             <template v-else>
               <el-option
                 v-for="item of $d.Criterion_Question_Type"
-                v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'fixedTable'"
+                v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table'"
                 :key="item.value"
                 :value="item.value"
                 :label="item.label"
@@ -727,63 +727,6 @@
           }}
         </div>
       </div>
-      <!-- 影像标记:disabled="form.IsRequired === 0" -->
-      <el-form-item
-        v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
-        :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-        prop="ImageMarkEnum"
-      >
-        <el-radio-group
-          v-model="form.ImageMarkEnum"
-          
-          @change="imageMarkEnumChange"
-        >
-          <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 测量工具 ImageTool -->
-      <el-form-item
-        v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
-        :label="$t('trials:readingUnit:qsList:title:ImageTool')"
-        prop="ImageTool"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ImageTool"
-          @change="imageToolChange"
-        >
-          <el-radio 
-            v-for="tool of readingTools" 
-            :key="tool.toolName" 
-            :label="tool.toolName" 
-          >
-            {{ $t(tool.i18nKey) }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 测量值 ImageToolAttribute -->
-      <el-form-item
-        v-if="form.ImageTool"
-        :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')"
-        prop="ImageToolAttribute"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ImageToolAttribute"
-        >
-          <el-radio 
-            v-for="i of imageToolAttributes" 
-            :key="i" 
-            :label="i" 
-          >
-            {{ i }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- 最大上传个数 -->
       <el-form-item 
         v-if="form.Type === 'upload'" 
@@ -1075,16 +1018,6 @@ export default {
     isLook: {
       type: Boolean,
       default: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
     }
   },
 
@@ -1138,14 +1071,9 @@ export default {
         ExportResult: [],
         ClassifyType: null,
         ClassifyEditType: null,
-        ClassifyShowType: null,
-        ImageMarkEnum: 0,
-        ImageTool: '',
-        ImageToolAttribute: '',
-        
+        ClassifyShowType: null
         // IsEnable: true
       },
-      imageToolAttributes: [],
       rules: {
         Type: [
           {required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change']}
@@ -1421,9 +1349,6 @@ export default {
             }
           }
         }
-        if (this.form.ImageTool) {
-          this.imageToolChange(this.form.ImageTool)
-        }
       }
       if (!this.data.ShowOrder && this.data.ShowOrder !== 0) {
         if (this.list.length > 0) {
@@ -1531,27 +1456,9 @@ export default {
         form.RelevanceId = ''
         form.RelevanceValueList = []
       }
-      // if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-      //   form.ImageMarkEnum = 1
-      // }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
-    },
-    imageMarkEnumChange(val) {
-      if (val === 0) {
-        this.form.ImageTool = ''
-        this.form.ImageToolAttribute = ''
-        this.imageToolAttributes = []
-      }
-    },
-    imageToolChange(v) {
-      let i = this.readingTools.findIndex(tool=>tool.toolName === v)
-      if (i > -1) {
-        this.imageToolAttributes = this.readingTools[i].props
-      }
     },
     parentQuestionChange(val, form) {
+      console.log(val)
       this.isParentExistGroup = false
       if (val) {
         var index = this.parentOptions.findIndex(item => {
@@ -1643,10 +1550,6 @@ export default {
       form.ExportResult = []
       form.ClassifyType = null
       form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
-      form.ImageTool = ''
-      form.ImageToolAttribute = ''
-      this.imageToolAttributes = []
     },
     getLesionType() {
       return new Promise((resolve, reject) => {

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue

@@ -210,14 +210,12 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <questions-form
+      <QuestionsForm
         ref="addOrEdit"
         :data="rowData"
         :trial-criterion-id="trialCriterionId"
         :is-from-system="isFromSystem"
         :digit-places="digitPlaces"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
         :list="tblList"
         :is-look="isLook"
         :is-system-criterion="isSystemCriterion"
@@ -233,7 +231,7 @@
       :title="preview.title"
       :fullscreen="true"
     >
-      <questions-preview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
+      <QuestionsPreview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
     </el-dialog>
 
     <el-dialog
@@ -243,14 +241,12 @@
       :title="config.title"
       :fullscreen="true"
     >
-      <table-qs-list
+      <TableQsList
         :digit-places="digitPlaces"
         :reading-question-id="rowData.Id"
         :is-from-system="isFromSystem"
         :is-confirm="isConfirm"
         :criterion-id="trialCriterionId"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
         @close="config.visible = false"
       />
     </el-dialog>
@@ -303,16 +299,6 @@ export default {
     isFromSystem: {
       type: Boolean,
       default: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
     }
 
   },
@@ -335,6 +321,7 @@ export default {
   },
   mounted() {
     this.tblList = this.list
+    console.log('ql', this.isSystemCriterion)
   },
   methods: {
     getList() {

src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue

@@ -10,7 +10,7 @@
     >
       <!-- '表单问题' -->
       <el-form-item :label="$t('trials:readingUnit:readingCriterion:title:formQs')">
-        <questions-list
+        <QuestionsList
           :ref="`questionList${trialReadingCriterionId}`"
           v-if="form.FormType===1"
           :trial-reading-criterion-id="trialReadingCriterionId"
@@ -20,8 +20,6 @@
           :is-system-criterion="isSystemCriterion"
           :is-from-system="readingInfo.IsFromSystem"
           :digit-places="digitPlaces"
-          :readingTools="readingTools"
-          :readingVersionEnum="readingVersionEnum"
           @reloadArbitrationRules="reloadArbitrationRules"
         />
       </el-form-item>
@@ -79,12 +77,6 @@ export default {
     isAdditionalAssessment: {
       type: Boolean,
       default: false
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
     }
   },
   data() {
@@ -107,8 +99,7 @@ export default {
       readingInfo: {},
       isConfirm: true,
       configBaseDataVisible: false,
-      additionalAssessmentOptionList: null,
-      readingVersionEnum: 0
+      additionalAssessmentOptionList: null
     }
   },
   mounted() {
@@ -127,7 +118,6 @@ export default {
         }
         getTrialReadingCriterionInfo({ trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
           this.loading = false
-          this.readingVersionEnum = res.OtherInfo.ReadingVersionEnum
           this.readingInfo = res.Result
           for (const k in this.form) {
             if (res.Result.hasOwnProperty(k)) {
@@ -136,6 +126,7 @@ export default {
           }
           this.isConfirm = res.Result.IsSign
           this.isSystemCriterion = res.Result.IsSystemCriterion
+          console.log(this.isSystemCriterion)
         }).catch(() => {
           this.loading = false
         })
@@ -146,6 +137,7 @@ export default {
     // 配置信息保存
     handleSave(isPrompt = true) {
       return new Promise((resolve, reject) => {
+        console.log(this.form)
         this.$refs['readingCriterionsForm'].validate((valid) => {
           if (!valid) {
             resolve(false)

src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue

@@ -917,8 +917,6 @@ export default {
           this.$emit('setGlobalReading', res.Result.IsGlobalReading)
           this.$emit('setOncologyReading', res.Result.IsOncologyReading)
           this.$emit('setDigitPlaces', res.Result.DigitPlaces)
-          this.$emit('setReadingTools', res.Result.ReadingToolList)
-          
           if (res.Result.ReadingType === 1) {
             this.$emit('setArbitrationReading', false)
           }
@@ -959,7 +957,6 @@ export default {
                 this.$emit('setGlobalReading', this.form.IsGlobalReading)
                 this.$emit('setOncologyReading', this.form.IsOncologyReading)
                 this.$emit('setDigitPlaces', this.form.DigitPlaces)
-                this.$emit('setReadingTools', this.form.ReadingToolList)
                 if (this.form.ReadingType === 1) {
                   this.$emit('setArbitrationReading', false)
                 }

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -19,7 +19,7 @@
           >
             <template v-for="item of $d.Criterion_Question_Type">
               <el-option
-                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group' && item.value !== 'fixedTable' && item.value !== 'calculation' "
+                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
                 :key="item.value"
                 :value="item.value"
                 :label="item.label"
@@ -429,64 +429,6 @@
             <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
-        <!-- 影像标记:disabled="form.IsRequired === 0" -->
-        <el-form-item
-          v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
-          :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-          prop="ImageMarkEnum"
-        >
-          <el-radio-group
-            v-model="form.ImageMarkEnum"
-            
-            @change="imageMarkEnumChange"
-          >
-            <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 测量工具 ImageTool -->
-        <el-form-item
-          v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
-          :label="$t('trials:readingUnit:qsList:title:ImageTool')"
-          prop="ImageTool"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageTool"
-            @change="imageToolChange"
-          >
-            <el-radio 
-              v-for="tool of readingTools" 
-              :key="tool.toolName" 
-              :label="tool.toolName" 
-            >
-              {{ $t(tool.i18nKey) }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 测量值 ImageToolAttribute -->
-        <el-form-item
-          v-if="form.ImageTool"
-          :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')"
-          prop="ImageToolAttribute"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageToolAttribute"
-          >
-            <el-radio 
-              v-for="i of imageToolAttributes" 
-              :key="i" 
-              :label="i" 
-            >
-              {{ i }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-
         <el-form-item
           v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
           :label="$t('trials:readingUnit:label:QuestionGenre')"
@@ -905,16 +847,6 @@ export default {
     type: {
       type: String,
       required: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
     }
   },
 
@@ -964,12 +896,8 @@ export default {
         ClassifyType: null,
         ClassifyEditType: null,
         ClassifyShowType: null,
-        ImageMarkEnum: 0,
-        ImageTool: '',
-        ImageToolAttribute: '',
         // IsEnable: true
       },
-      imageToolAttributes: [],
       rules: {
         Type: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -1243,9 +1171,6 @@ export default {
             }
           }
         }
-        if (this.form.ImageTool) {
-          this.imageToolChange(this.form.ImageTool)
-        }
       }
       if (this.form.ClassifyTableQuestionId) {
           this.classifyQuestionChange(this.form.ClassifyTableQuestionId)
@@ -1257,12 +1182,6 @@ export default {
         }
       }
     },
-    classifyQuestionChange (v){
-      let obj = this.selectQuestions.find(i=>i.Id === v)
-      let arr = obj && obj.TypeValue ? obj.TypeValue.split('|') : []
-      arr = arr.length > 0 ? arr.map(i=>i.trim()) : []
-      this.classifyQuestionOptions = arr
-    },
     getBasicConfigSelect() {
       getCriterionDictionaryList({
         CriterionId: this.criterionId,
@@ -1344,25 +1263,6 @@ export default {
         form.RelevanceId = ''
         form.RelevanceValueList = []
       }
-      // if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-      //   form.ImageMarkEnum = 1
-      // }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
-    },
-    imageMarkEnumChange(val) {
-      if (val === 0) {
-        this.form.ImageTool = ''
-        this.form.ImageToolAttribute = ''
-        this.imageToolAttributes = []
-      }
-    },
-    imageToolChange(v) {
-      let i = this.readingTools.findIndex(tool=>tool.toolName === v)
-      if (i > -1) {
-        this.imageToolAttributes = this.readingTools[i].props
-      }
     },
     async parentQuestionChange(val, form) {
       if (val) {
@@ -1472,10 +1372,6 @@ export default {
       form.ImageCount = 0
       form.ClassifyType = null
       form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
-      form.ImageTool = ''
-      form.ImageToolAttribute = ''
-      this.imageToolAttributes = []
     },
     close() {
       this.$emit('close')

src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue

@@ -202,8 +202,6 @@
         :digit-places="digitPlaces"
         :reading-question-id="readingQuestionId"
         :criterion-id="criterionId"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
         @close="addOrEdit.visible = false"
         @getList="getList"
       />
@@ -243,16 +241,6 @@ export default {
     criterionId: {
       type: String,
       required: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
     }
 
   },

src/views/trials/trials-panel/setting/reading-unit/index.vue

@@ -46,7 +46,6 @@
                   @setGlobalReading="setGlobalReading"
                   @setOncologyReading="setOncologyReading"
                   @setDigitPlaces="setDigitPlaces"
-                  @setReadingTools="setReadingTools"
                 />
               </el-collapse-item>
               <!-- 阅片标准 -->
@@ -58,7 +57,6 @@
                   :ref="`readingCriterions${item.TrialReadingCriterionId}`"
                   :trial-reading-criterion-id="TrialReadingCriterionId"
                   :digit-places="digitPlaces"
-                  :readingTools="readingTools"
                   :is-additional-assessment="isAdditionalAssessment"
                   @reloadArbitrationRules="reloadArbitrationRules"
                 />
@@ -176,7 +174,7 @@ import GlobalReading from "./components/GlobalReading";
 import OncologyForm from "./components/OncologyForm";
 import SignForm from "@/views/trials/components/newSignForm";
 import const_ from "@/const/sign-code";
-import { getCustomizeStandardsTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+
 export default {
   name: "ReadingUnit",
   components: {
@@ -210,7 +208,6 @@ export default {
       isGlobalReading: false,
       digitPlaces: 0,
       isAdditionalAssessment: false,
-      readingTools: []
     };
   },
   watch: {
@@ -298,9 +295,6 @@ export default {
     setDigitPlaces(digitPlaces) {
       this.digitPlaces = digitPlaces;
     },
-    setReadingTools(readingTools) {
-      this.readingTools = getCustomizeStandardsTools(readingTools)
-    },
     setIsClinicalReading(isClinicalReading) {
       this.isClinicalReading = isClinicalReading;
     },