1

影像替换与补充
1
2026-08-24 09:45:13 +08:00 · 2026-08-21 11:34:52 +08:00 · 2026-08-17 14:29:26 +08:00 · 2026-07-31 17:20:20 +08:00 · 2026-07-31 16:40:37 +08:00 · 2026-07-29 16:06:05 +08:00
53 changed files with 2458 additions and 2052 deletions
@@ -6,7 +6,7 @@ NODE_ENV = 'prod'
 VUE_APP_BASE_PATH = '/'
 # onlyoffice地址
-VUE_APP_ONLYOFFICE_URL = "https://office.rayplus.net"
+VUE_APP_ONLYOFFICE_URL = "https://office.extimaging.com"
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
@@ -10,7 +10,7 @@
    <meta http-equiv="Pragma" content="no-cache">
    <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
    <meta http-equiv="Cache" content="no-cache">
-    <title>RPC lmaging Trial Management System</title>
+    <title>EIC lmaging Trial Management System</title>
 </head>
 <body>
@@ -31,7 +31,7 @@
            <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
              <!-- IRC Management System -->
 <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-<!--              <div class="title" v-show="false">RPC lmaging Trial Management System</div>-->
+<!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
              <div style="color: #0a84ff;text-align: left;font-size: 28px">
                {{message}}
              </div>
@@ -63,7 +63,7 @@
          <div style="margin: 0 auto;width: 600px;line-height: 28px;text-align: center" >
            <h1 style="text-align: center;margin-bottom: 20px">关于</h1>
            <p style="margin-bottom: 20px">
-              RPC lmaging Trial Management System
+              EIC lmaging Trial Management System
            </p>
            <p style="margin-bottom: 20px">
              V1.3.0.001
@@ -31,7 +31,7 @@
        <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
          <!-- IRC Management System -->
          <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-          <!--              <div class="title" v-show="false">RPC lmaging Trial Management System</div>-->
+          <!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
          <div style="color: #0a84ff;text-align: left;font-size: 28px">
            {{message}}
          </div>
@@ -98,6 +98,7 @@ import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import WHITELIST from "./utils/whiteList"
 export default {
  name: 'App',
  components: {
@@ -156,7 +157,7 @@ export default {
  // },
  methods: {
    getIsLock() {
-      if (zzSessionStorage.getItem('isLock') === 'true') {
+      if (zzSessionStorage.getItem('isLock') === 'true' && !WHITELIST.includes(this.$route.path)) {
        this.isLock = true
      } else {
        this.isLock = false
@@ -480,3 +480,32 @@ export function getNoneDicomMarkList(data) {
    data
  })
 }
 export function getFilterTableQuestion(data) {
  return request({
    url: `/ReadingImageTask/getFilterTableQuestion`,
    method: 'post',
    data
  })
 }
 export function deleteImageCache(params) {
  return request({
    url: `/Study/deleteImageCache`,
    method: 'delete',
    params
  })
 }
 export function getAnonymizeInfo(params) {
  return request({
    url: `/Study/getAnonymizeInfo`,
    method: 'get',
    params
  })
 }
 export function updateModality(params) {
  return request({
    url: `/Study/updateModality`,
    method: 'put',
    params
  })
 }
@@ -4523,3 +4523,23 @@ export function addOrUpdateCommonUploadRecord(data) {
    data,
  })
 }
 export function getInspectionById(data) {
  return request({
    url: `/Inspection/getInspectionById`,
    method: 'post',
    data,
  })
 }
 export function setJsonDetail(data) {
  return request({
    url: `/Inspection/setJsonDetail`,
    method: 'post',
    data,
  })
 }
@@ -213,6 +213,10 @@ export default {
  },
  methods: {
    getInfo() {
      var image = cornerstone.getImage(this.canvas)
      return image
    },
    loadImageStack(dicomSeries, text = '') {
      this.tip = text
      this.$nextTick(() => {
@@ -296,6 +296,13 @@
            <option v-for="(item, index) in colormapsList" :key="index" :value="item.id">{{ item.name }}</option>
          </select>
        </div>
        <div class="sideTool-wrapper">
          <label for="Replacement" style="display: inline-block;color: #fff;line-height: 20px;cursor: pointer;">
            替换
          </label>
          <input type="file" id="Replacement" @change="beginScanFiles($event, 'replace')" style="display: none;">
        </div>
      </div>
      <!-- 患者信息 -->
@@ -382,6 +389,7 @@ import {
  editPatientInfo
 } from '@/api/trials'
 import { setPTClinicalDataForInstance, clearPTClinicalDataCache } from '@/utils/ptClinicalDataCache'
 import { changeFile } from "@/views/trials/trials-panel/reading/dicoms/components/upload.js"
 export default {
  name: 'DicomsViewer',
  components: {
@@ -400,6 +408,14 @@ export default {
    modality: {
      type: String,
      default: ''
    },
    SeriesList: {
      type: Array,
      default: () => []
    },
    currentSeriesIndex: {
      type: Number,
      default: -1
    }
  },
  watch: {
@@ -483,7 +499,9 @@ export default {
      },
      formLoading: false,
      type: '',
-      isEdit: 0
+      isEdit: 0,
      fileKey: null,
      file: null,
    }
  },
  computed: {
@@ -511,6 +529,19 @@ export default {
  },
  methods: {
    beginScanFiles(e, key) {
      this.fileKey = key
      this.file = e.target.files[0]
      let image = this.$refs[this.activeItem].getInfo()
      let study = {
        seriesList: this.SeriesList,
        currentSeriesIndex: this.currentSeriesIndex
      }
      this.$emit("update:loading", true)
      changeFile('CRC', this.file, study, image)
      // DicomEvent.$emit('getStudyFile')
    },
    setToolsPassive() {
      const elements = document.querySelectorAll('.dicom-item')
      const scope = this
@@ -141,6 +141,10 @@ export default {
      type: Number,
      default: 2,
    },
    isReading: {
      type: Boolean,
      default: false,
    }
  },
  data() {
    return {
@@ -442,6 +446,9 @@ export default {
        let params = {
          TrialImageDownloadId: this.downloadId,
        }
        if (this.isReading) {
          params.VisitTaskId = this.TaskId
        }
        await downloadImageSuccess(params)
      } catch (err) {
        console.log(err)
@@ -43,7 +43,8 @@
        <template slot-scope="scope">
          <div class="btnBox">
            <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data" v-if="!forbid">
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data"
              v-if="!forbid && (!isReading || isDownloaded)">
              <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"
@@ -60,17 +61,15 @@
              scope.row.UploadStudyList.length <= 0
              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
            <!--删除--->
-            <el-button circle :disabled="!scope.row.UploadStudyList ||
+            <el-button circle icon="el-icon-delete" :title="$t('upload:dicom:button:delete')"
-              scope.row.UploadStudyList.length <= 0 ||
+              @click.stop="remove(scope.row)" />
              scope.row.ReadingTaskState === 2
              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
          </div>
        </template>
      </el-table-column>
    </el-table>
    <div style="margin: 10px 0" class="top">
      <span>{{ $t('upload:dicom:uploadTitle') }}</span>
-      <div class="btnBox" v-if="!forbid">
+      <div class="btnBox" v-if="!forbid && (!isReading || isDownloaded)">
        <span style="margin-right: 10px">{{ $store.state.trials.uploadTip }}</span>
        <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
          <div class="form-group">
@@ -379,6 +378,14 @@ export default {
      type: Boolean,
      default: false,
    },
    isReading: {
      type: Boolean,
      default: false,
    },
    StudyInstanceUID: {
      type: String,
      default: '',
    }
  },
  components: {
    'study-view': studyView,
@@ -428,7 +435,8 @@ export default {
      openSubjectVisitId: null,
      openVisitTaskId: null,
      TrialModality: [],
-      IsReadingTaskViewInOrder: 2
+      IsReadingTaskViewInOrder: 2,
      isDownloaded: false
    }
  },
  async mounted() {
@@ -471,6 +479,7 @@ export default {
        let res = await getSubjectImageUploadList(params)
        this.loading = false
        if (res.IsSuccess) {
          this.isDownloaded = res.OtherInfo.IsIRImageDownloaded
          this.TrialModality = res.OtherInfo.TrialModality.split('|')
          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || res.OtherInfo.IsReadingTaskViewInOrder === 0 ? res.OtherInfo.IsReadingTaskViewInOrder : 2
          this.StudyInstanceUidList = []
@@ -948,7 +957,7 @@ export default {
            var instanceItem = instanceList.find(function (item) {
              return item.instanceUid === instanceUid
            })
-            if (!instanceItem) {
+            if (!false) {
              var date = data.string('x00080023')
              var time = data.string('x00080033')
              var instanceTime = ''
@@ -1077,11 +1086,12 @@ export default {
    async verifyStudy() {
      this.btnLoading = true
      var studyList = []
      let scope = this
      this.selectArr.forEach((item) => {
        item.dicomInfo.uploadFileSize = 0
        if (!item.uploadState.selected) {
          studyList.push({
-            studyInstanceUid: item.dicomInfo.studyUid,
+            studyInstanceUid: scope.isReading && scope.StudyInstanceUID ? scope.StudyInstanceUID : item.dicomInfo.studyUid,
            studyDate: item.dicomInfo.studyTime,
          })
        }
@@ -1176,7 +1186,7 @@ export default {
              let t = setInterval(() => {
                dicomUploadInProgress({
                  trialId: scope.trialId,
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.isReading && scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                  VisitTaskId: dicomInfo.visitTaskId,
                }).then((res) => {
                  console.log(dicomInfo.visitTaskId)
@@ -1203,7 +1213,7 @@ export default {
                    dicomInfo.RadiopharmaceuticalStartTime,
                  studyId: dicomInfo.studyId,
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.isReading && scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                  studyTime: dicomInfo.studyTime,
                  description: dicomInfo.description,
                  seriesCount: dicomInfo.seriesNum,
@@ -1244,22 +1254,171 @@ export default {
                        try {
                          let o = v.instanceList[ii]
                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
-                          if (o.isReUpload) {
+                          // if (o.isReUpload) {
-                            dicomInfo.failedFileCount++
+                          //   dicomInfo.failedFileCount++
-                            dicomInfo.uploadFileSize += o.file.size
+                          //   dicomInfo.uploadFileSize += o.file.size
-                            Record.Existed.push(name)
+                          //   Record.Existed.push(name)
-                            Record.FileCount++
+                          //   Record.FileCount++
-                          } else if (o.myPath) {
+                          // }
                          //  else if (o.myPath) {
                          //   instanceList.push({
                          //     studyInstanceUid: dicomInfo.studyUid,
                          //     seriesInstanceUid: v.seriesUid,
                          //     SOPClassUID: o.SOPClassUID,
                          //     TransferSytaxUID: o.TransferSytaxUID,
                          //     MediaStorageSOPInstanceUID:
                          //       o.MediaStorageSOPInstanceUID,
                          //     MediaStorageSOPClassUID:
                          //       o.MediaStorageSOPClassUID,
                          //     sopInstanceUid: o.instanceUid,
                          //     instanceNumber: o.instanceNumber,
                          //     instanceTime: o.instanceTime,
                          //     imageRows: o.imageRows,
                          //     imageColumns: o.imageColumns,
                          //     sliceLocation: o.sliceLocation,
                          //     sliceThickness: o.sliceThickness,
                          //     numberOfFrames: o.numberOfFrames,
                          //     pixelSpacing: o.pixelSpacing,
                          //     imagerPixelSpacing: o.imagerPixelSpacing,
                          //     frameOfReferenceUID: o.frameOfReferenceUID,
                          //     windowCenter: o.windowCenter,
                          //     windowWidth: o.windowWidth,
                          //     path: o.myPath,
                          //     FileSize: o.FileSize,
                          //     PhotometricInterpretation:
                          //       o.PhotometricInterpretation,
                          //     BitsAllocated: o.BitsAllocated,
                          //     PixelRepresentation: o.PixelRepresentation,
                          //     RescaleIntercept: o.RescaleIntercept,
                          //     RescaleSlope: o.RescaleSlope,
                          //     ImagePositionPatient: o.ImagePositionPatient,
                          //     ImageOrientationPatient:
                          //       o.ImageOrientationPatient,
                          //     SequenceOfUltrasoundRegions:
                          //       o.SequenceOfUltrasoundRegions,
                          //     FrameTime: o.FrameTime,
                          //     CorrectedImage: o.CorrectedImage,
                          //     Units: o.Units,
                          //     DecayCorrection: o.DecayCorrection,
                          //     EncapsulatedDocument: o.EncapsulatedDocument,
                          //   })
                          //   Record.Uploaded.push(name)
                          //   dicomInfo.failedFileCount++
                          //   Record.FileCount++
                          // }
                          //  else {
                          let path = `/${params.trialId}/Image/${params.subjectId
                            }/${params.subjectVisitId}/${dicomInfo.visitTaskId
                            }/${scope.getGuid(
                              dicomInfo.studyUid +
                              v.seriesUid +
                              o.instanceUid +
                              params.trialId
                            )}`
                          if (scope.IsImageSegment) {
                            path = `/${params.trialId}/Image/${params.subjectId
                              }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
                              }/${scope.getGuid(
                                dicomInfo.studyUid +
                                v.seriesUid +
                                o.instanceUid +
                                params.trialId
                              )}`
                          }
                          if (scope.isClose) return
                          let res = await dcmUpload(
                            {
                              path: path,
                              file: o.file,
                              speed: true,
                            },
                            scope.isReading && scope.StudyInstanceUID ? {
                              AnonymizeFixedList: [
                                {
                                  Element: '000D',
                                  Group: '0020',
                                  ReplaceValue: scope.StudyInstanceUID,
                                  Id: 'StudyInstanceUID'
                                }
                              ],
                              AnonymizeNotFixedList: [],
                              DicomStoreInfo: {}
                            } : null,
                            (percentage, checkpoint, lastPer) => {
                              dicomInfo.uploadFileSize +=
                                checkpoint.size * (percentage - lastPer)
                              if (
                                dicomInfo.uploadFileSize > dicomInfo.fileSize
                              ) {
                                dicomInfo.uploadFileSize = dicomInfo.fileSize
                              }
                            },
                            {
                              fileName: o.file.name,
                              fileSize: o.file.size,
                              fileType: 'application/dicom',
                              uploadBatchId: uploadBatchId,
                              batchDataType: 5,
                              trialId: params.trialId,
                              subjectId: params.subjectId,
                              subjectVisitId: params.subjectVisitId,
                            }
                          )
                          if (!res || !res.url) {
                            params.failedFileCount++
                          } else {
                            if (ii === 0 && o.modality !== 'SR') {
                              try {
                                let fileId =
                                  cornerstoneWADOImageLoader.wadouri.fileManager.add(
                                    o.file
                                  )
                                let blob = await scope.dicomToPng(
                                  fileId,
                                  o.imageColumns,
                                  o.imageRows
                                )
                                let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                if (scope.IsImageSegment) {
                                  thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                }
                                let OSSclient = scope.OSSclient
                                let seriesRes = await OSSclient.put(
                                  thumbnailPath,
                                  blob,
                                  {
                                    fileName: `${v.seriesUid}.jpg`,
                                    fileSize: blob.size,
                                    fileType: 'image/jpeg',
                                    uploadBatchId: uploadBatchId,
                                    batchDataType: 6,
                                    trialId: params.trialId,
                                    subjectId: params.subjectId,
                                    subjectVisitId: params.subjectVisitId,
                                  }
                                )
                                if (seriesRes && seriesRes.url) {
                                  ImageResizePath = scope.$getObjectName(
                                    seriesRes.url
                                  )
                                }
                              } catch (e) {
                                console.log(e)
                              }
                            }
                          }
                          if (res && res.url) {
                            instanceList.push({
-                              studyInstanceUid: dicomInfo.studyUid,
+                              studyInstanceUid: scope.isReading && scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                              seriesInstanceUid: v.seriesUid,
                              sopInstanceUid: o.instanceUid,
                              SOPClassUID: o.SOPClassUID,
                              TransferSytaxUID: o.TransferSytaxUID,
                              MediaStorageSOPInstanceUID:
                                o.MediaStorageSOPInstanceUID,
                              MediaStorageSOPClassUID:
                                o.MediaStorageSOPClassUID,
                              sopInstanceUid: o.instanceUid,
                              instanceNumber: o.instanceNumber,
                              instanceTime: o.instanceTime,
                              imageRows: o.imageRows,
@@ -1272,7 +1431,7 @@ export default {
                              frameOfReferenceUID: o.frameOfReferenceUID,
                              windowCenter: o.windowCenter,
                              windowWidth: o.windowWidth,
-                              path: o.myPath,
+                              path: scope.$getObjectName(res.url),
                              FileSize: o.FileSize,
                              PhotometricInterpretation:
@@ -1292,151 +1451,15 @@ export default {
                              DecayCorrection: o.DecayCorrection,
                              EncapsulatedDocument: o.EncapsulatedDocument,
                            })
                            o.myPath = scope.$getObjectName(res.url)
                            Record.Uploaded.push(name)
                            dicomInfo.failedFileCount++
                            Record.FileCount++
                          } else {
-                            let path = `/${params.trialId}/Image/${params.subjectId
+                            Record.Failed.push(name)
-                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
+                            Record.FileCount++
                              }/${scope.getGuid(
                                dicomInfo.studyUid +
                                v.seriesUid +
                                o.instanceUid +
                                params.trialId
                              )}`
                            if (scope.IsImageSegment) {
                              path = `/${params.trialId}/Image/${params.subjectId
                                }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
                                }/${scope.getGuid(
                                  dicomInfo.studyUid +
                                  v.seriesUid +
                                  o.instanceUid +
                                  params.trialId
                                )}`
                            }
                            if (scope.isClose) return
                            let res = await dcmUpload(
                              {
                                path: path,
                                file: o.file,
                                speed: true,
                              },
                              null,
                              (percentage, checkpoint, lastPer) => {
                                dicomInfo.uploadFileSize +=
                                  checkpoint.size * (percentage - lastPer)
                                if (
                                  dicomInfo.uploadFileSize > dicomInfo.fileSize
                                ) {
                                  dicomInfo.uploadFileSize = dicomInfo.fileSize
                                }
                              },
                              {
                                fileName: o.file.name,
                                fileSize: o.file.size,
                                fileType: 'application/dicom',
                                uploadBatchId: uploadBatchId,
                                batchDataType: 5,
                                trialId: params.trialId,
                                subjectId: params.subjectId,
                                subjectVisitId: params.subjectVisitId,
                              }
                            )
                            if (!res || !res.url) {
                              params.failedFileCount++
                            } else {
                              if (ii === 0 && o.modality !== 'SR') {
                                try {
                                  let fileId =
                                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
                                      o.file
                                    )
                                  let blob = await scope.dicomToPng(
                                    fileId,
                                    o.imageColumns,
                                    o.imageRows
                                  )
                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                  if (scope.IsImageSegment) {
                                    thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                  }
                                  let OSSclient = scope.OSSclient
                                  let seriesRes = await OSSclient.put(
                                    thumbnailPath,
                                    blob,
                                    {
                                      fileName: `${v.seriesUid}.jpg`,
                                      fileSize: blob.size,
                                      fileType: 'image/jpeg',
                                      uploadBatchId: uploadBatchId,
                                      batchDataType: 6,
                                      trialId: params.trialId,
                                      subjectId: params.subjectId,
                                      subjectVisitId: params.subjectVisitId,
                                    }
                                  )
                                  if (seriesRes && seriesRes.url) {
                                    ImageResizePath = scope.$getObjectName(
                                      seriesRes.url
                                    )
                                  }
                                } catch (e) {
                                  console.log(e)
                                }
                              }
                            }
                            if (res && res.url) {
                              instanceList.push({
                                studyInstanceUid: dicomInfo.studyUid,
                                seriesInstanceUid: v.seriesUid,
                                sopInstanceUid: o.instanceUid,
                                SOPClassUID: o.SOPClassUID,
                                TransferSytaxUID: o.TransferSytaxUID,
                                MediaStorageSOPInstanceUID:
                                  o.MediaStorageSOPInstanceUID,
                                MediaStorageSOPClassUID:
                                  o.MediaStorageSOPClassUID,
                                instanceNumber: o.instanceNumber,
                                instanceTime: o.instanceTime,
                                imageRows: o.imageRows,
                                imageColumns: o.imageColumns,
                                sliceLocation: o.sliceLocation,
                                sliceThickness: o.sliceThickness,
                                numberOfFrames: o.numberOfFrames,
                                pixelSpacing: o.pixelSpacing,
                                imagerPixelSpacing: o.imagerPixelSpacing,
                                frameOfReferenceUID: o.frameOfReferenceUID,
                                windowCenter: o.windowCenter,
                                windowWidth: o.windowWidth,
                                path: scope.$getObjectName(res.url),
                                FileSize: o.FileSize,
                                PhotometricInterpretation:
                                  o.PhotometricInterpretation,
                                BitsAllocated: o.BitsAllocated,
                                PixelRepresentation: o.PixelRepresentation,
                                RescaleIntercept: o.RescaleIntercept,
                                RescaleSlope: o.RescaleSlope,
                                ImagePositionPatient: o.ImagePositionPatient,
                                ImageOrientationPatient:
                                  o.ImageOrientationPatient,
                                SequenceOfUltrasoundRegions:
                                  o.SequenceOfUltrasoundRegions,
                                FrameTime: o.FrameTime,
                                CorrectedImage: o.CorrectedImage,
                                Units: o.Units,
                                DecayCorrection: o.DecayCorrection,
                                EncapsulatedDocument: o.EncapsulatedDocument,
                              })
                              o.myPath = scope.$getObjectName(res.url)
                              Record.Uploaded.push(name)
                              dicomInfo.failedFileCount++
                              Record.FileCount++
                            } else {
                              Record.Failed.push(name)
                              Record.FileCount++
                            }
                          }
                          // }
                          resolve1()
                        } catch (e) {
                          console.log(e)
@@ -1454,7 +1477,7 @@ export default {
                  }
                }
                params.study.seriesList.push({
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.isReading && scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                  seriesInstanceUid: v.seriesUid,
                  seriesNumber: v.seriesNumber,
                  seriesTime: v.seriesTime,
@@ -6,12 +6,13 @@
      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
        <dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
          :Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid"
          :isReading="isReading" :StudyInstanceUID="StudyInstanceUID" />
      </el-tab-pane>
      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
        <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
          :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload" :IsImageSegment="IsImageSegment"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :forbid="forbid" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :forbid="forbid" :isReading="isReading" />
      </el-tab-pane>
    </el-tabs>
  </el-dialog>
@@ -58,6 +59,14 @@ export default {
    IsImageSegment: {
      type: Boolean,
      default: false,
    },
    isReading: {
      type: Boolean,
      default: false,
    },
    StudyInstanceUID: {
      type: String,
      default: '',
    }
  },
  data() {
@@ -111,11 +111,9 @@
            :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
          <!--上传--->
          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')" v-if="!forbid"
-            @click.native.prevent="handleUpload(scope.row)" />
+            @click.native.prevent="handleUpload(scope.row)" :disabled="isReading && !isDownloaded" />
          <!--删除--->
-          <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
+          <el-button circle icon="el-icon-delete" :title="$t('upload:nonedicom:button:delete')"
            scope.row.ReadingTaskState === 2
            " circle icon="el-icon-delete" :title="$t('upload:nonedicom:button:delete')"
            @click.stop="remove(scope.row)" />
        </template>
      </el-table-column>
@@ -270,6 +268,10 @@ export default {
      type: Number,
      default: 0,
    },
    isReading: {
      type: Boolean,
      default: false,
    }
  },
  data() {
    return {
@@ -291,7 +293,8 @@ export default {
      BodyPart: {},
      relationInfo: {
        ImageFormatList: []
-      }
+      },
      isDownloaded: false
    }
  },
  watch: {
@@ -348,6 +351,7 @@ export default {
        if (res.IsSuccess) {
          this.list = res.Result
          this.relationInfo = res.OtherInfo
          this.isDownloaded = res.OtherInfo.IsIRImageDownloaded
          this.faccept = []
          this.relationInfo.ImageFormatList.forEach((item) => {
            this.faccept.push(`.${item}`)
@@ -1608,7 +1608,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:notice:table:appendix': `Attachment`,
 		'trials:notice:table:isRead': `Readed`,
 		'trials:notice:action:detail': `Details`,
-		'login:title:system': `RPC lmaging Trial Management System`,
+		'login:title:system': `EIC lmaging Trial Management System`,
 		'login:form:userName': `User ID`,
 		'login:form:password': `Password`,
 		'login:button:login': `Login`,
@@ -1672,7 +1672,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:tab:trials': `My Trials`,
 		'trials:trials:title:back': `Return`,
 		'trials:trials:title:backTrialList': `Return to trial list`,
-		'trials:trials:title:eics': `RPC lmaging Trial Management System`,
+		'trials:trials:title:eics': `EIC lmaging Trial Management System`,
 		'trials:tab:reading': `Reads`,
 		'trials:tab:pendingReadingTasks': `Pending`,
 		'trials:pendingReadingTasks:table:subjectCode': `Subject ID`,
@@ -149,6 +149,11 @@ export const constantRoutes = [
    hidden: true,
    component: () => import('@/views/trials/trials-panel/reading/dicoms/none-dicoms')
  },
  {
    path: '/ecrfList',
    hidden: true,
    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/TableList')
  },
  {
    path: '/readingPage',
    name: 'readingPage',
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-undef
 module.exports = {
-  title: 'RPC lmaging Trial Management System',
+  title: 'EIC lmaging Trial Management System',
  /**
 * @type {boolean} true | false
@@ -6,6 +6,7 @@ export const anonymization = function (file, config) {
    try {
      const reader = new FileReader()
      let AnonymizeFixedList = config.AnonymizeFixedList
      console.log(AnonymizeFixedList, 'AnonymizeFixedList')
      let AnonymizeNotFixedList = config.AnonymizeNotFixedList
      let DicomStoreInfo = config.DicomStoreInfo
      reader.onload = async (event) => {
@@ -15,9 +16,11 @@ export const anonymization = function (file, config) {
        let dataset = dcmjs.data.DicomMessage.readFile(buffer)
        for (var i = 0; i < AnonymizeFixedList.length; i++) {
          let AnonymizeFixed = AnonymizeFixedList[i]
-          if (!dataset.dict.hasOwnProperty(`${AnonymizeFixed.Group + AnonymizeFixed.Element}`)) continue
+          if (!dataset.dict.hasOwnProperty(`${AnonymizeFixed.Group + AnonymizeFixed.Element}`) && !dataset.meta.hasOwnProperty(`${AnonymizeFixed.Group + AnonymizeFixed.Element}`)) continue
          if (dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element]) {
            dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element].Value[0] = AnonymizeFixed.ReplaceValue
          } else if (dataset.meta[AnonymizeFixed.Group + AnonymizeFixed.Element]) {
            dataset.meta[AnonymizeFixed.Group + AnonymizeFixed.Element].Value[0] = AnonymizeFixed.ReplaceValue
          } else {
            dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element] = {
              vr: AnonymizeFixed.ValueRepresentation,
@@ -60,7 +63,7 @@ export const anonymization = function (file, config) {
          let newDicomFile = dataset.write() // fragmentMultiframe 原始数据是否进行分割
          const bufferArray = new Uint8Array(newDicomFile)
          const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
-          resolve({ blob, pixelDataElement })
+          resolve({ blob, pixelDataElement, Modality: dataset.dict['00080060'].Value[0] })
        } catch (err) {
          console.log(file, 'warning')
          console.log(err)
@@ -12,7 +12,8 @@ export const dcmUpload = async function (data, config, progressFn, fileInfo) {
      let res = await Vue.prototype.OSSclient.multipartUpload(Object.assign(data, { file: blob.blob }), progressFn, fileInfo)
      resolve({
        ...res,
-        image: blob.pixelDataElement
+        image: blob.pixelDataElement,
        Modality: blob.Modality
      })
      // let OSSclientA = await OSSclient
      // let blob = await encoder(file)
@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
-const title = defaultSettings.title || 'RPC lmaging Trial Management System'
+const title = defaultSettings.title || 'EIC lmaging Trial Management System'
 export default function getPageTitle(pageTitle) {
  if (pageTitle) {
@@ -40,7 +40,7 @@ async function ossGenerateSTS() {
          return new Promise(async (resolve, reject) => {
            try {
              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload' && _vm._route.path !== '/readingDicoms' && _vm._route.path !== '/showdicom') {
                var objectItem = objectName.split('/')
                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
@@ -57,13 +57,13 @@ async function ossGenerateSTS() {
                const trialId = urlParams.get('trialId')
                if (Object.keys(fileInfo).length !== 0) {
                  fileInfo.fileType = mimeTypeToExt(fileInfo.fileType)
-                  let params = Object.assign({path: objectName}, fileInfo)
+                  let params = Object.assign({ path: objectName }, fileInfo)
                  addOrUpdateFileUploadRecord(params)
                } else if (trialId) {
                  const fileName = objectName.split('/').pop()
                  const fileType = fileName.includes('.')
-                  ? fileName.split('.').pop().toLowerCase() 
+                    ? fileName.split('.').pop().toLowerCase()
-                  : ''
+                    : ''
                  let params = { trialId, path: objectName, fileName, fileType }
                  addOrUpdateFileUploadRecord(params)
                }
@@ -97,7 +97,7 @@ async function ossGenerateSTS() {
                OSSclient = new OSS(Vue.prototype.OSSclientConfig);
              }
              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload' && _vm._route.path !== '/readingDicoms' && _vm._route.path !== '/showdicom') {
                var objectItem = data.path.split('/')
                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
@@ -114,13 +114,13 @@ async function ossGenerateSTS() {
                const trialId = urlParams.get('trialId')
                if (Object.keys(fileInfo).length !== 0) {
                  fileInfo.fileType = mimeTypeToExt(fileInfo.fileType)
-                  let params = Object.assign({path: data.path}, fileInfo)
+                  let params = Object.assign({ path: data.path }, fileInfo)
                  addOrUpdateFileUploadRecord(params)
                } else if (trialId) {
                  const fileName = data.path.split('/').pop()
                  const fileType = fileName.includes('.')
-                  ? fileName.split('.').pop().toLowerCase() 
+                    ? fileName.split('.').pop().toLowerCase()
-                  : ''
+                    : ''
                  let params = { trialId, path: data.path, fileName, fileType }
                  addOrUpdateFileUploadRecord(params)
                }
@@ -151,7 +151,7 @@ async function ossGenerateSTS() {
            try {
              var name = objectName.split('/')[objectName.split('/').length - 1]
              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload' && _vm._route.path !== '/readingDicoms' && _vm._route.path !== '/showdicom') {
                var objectItem = objectName.split('/')
                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
                objectName = objectItem.join('/')
@@ -225,7 +225,7 @@ function uploadAWS(aws, data, progress, fileInfo) {
      const { file, path } = data;
      if (!file || !path) return reject('file and path be required');
      let _vm = router.default.app
-      if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+      if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload' && _vm._route.path !== '/readingDicoms' && _vm._route.path !== '/showdicom') {
        var objectItem = data.path.split('/')
        // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
        objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
@@ -246,13 +246,13 @@ function uploadAWS(aws, data, progress, fileInfo) {
          const trialId = urlParams.get('trialId')
          if (Object.keys(fileInfo).length !== 0) {
            fileInfo.fileType = mimeTypeToExt(fileInfo.fileType)
-            let params = Object.assign({path: decodeUtf8(curPath)}, fileInfo)
+            let params = Object.assign({ path: decodeUtf8(curPath) }, fileInfo)
            addOrUpdateFileUploadRecord(params)
          } else if (trialId) {
            const fileName = decodeUtf8(curPath).split('/').pop()
            const fileType = fileName.includes('.')
-            ? fileName.split('.').pop().toLowerCase() 
+              ? fileName.split('.').pop().toLowerCase()
-            : ''
+              : ''
            let params = { trialId, path: decodeUtf8(curPath), fileName, fileType }
            addOrUpdateFileUploadRecord(params)
          }
@@ -1,2 +1,2 @@
-const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/link_expired', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/link_expired', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms', '/ecrfList']
 export default WHITELIST
@@ -1,7 +1,7 @@
 <template>
  <div class="dashboard">
    <div class="dashboard-header">
-      <!-- <h1>Extimaging Real-Time IRC Information</h1> -->
+      <h1>Extimaging Real-Time IRC Information</h1>
      <div>
        <span>{{ currentTime }}</span>
      </div>
@@ -125,7 +125,8 @@
      </div>
      <div class="viewerContent">
        <dicom-viewer id="dicomViewer" ref="dicomViewer" style="height:100%" :loading.sync="loading"
-          :modality="modality" :Comparison.sync="isComparison" @loadStudy="loadStudy" />
+          :modality="modality" :Comparison.sync="isComparison" :SeriesList="seriesList"
          :currentSeriesIndex="currentSeriesIndex" @loadStudy="loadStudy" />
      </div>
      <!-- <div class="viewerRightSidePanel">
        <dicom-tools />
@@ -179,7 +180,7 @@ export default {
      description: '',
      seriesCount: 0,
      seriesList: [],
-      currentSeriesIndex: -1,
+      currentSeriesIndex: 0,
      arr: [],
      activeName: 'first',
      tpList: [],
@@ -253,6 +254,11 @@ export default {
    })
    workSpeedclose(true)
  },
  watch: {
    currentSeriesIndex() {
      console.log(this.currentSeriesIndex, 'currentSeriesIndex')
    }
  },
  methods: {
    async updateImageResizePath(data) {
      try {
@@ -353,13 +359,14 @@ export default {
                i.ImageId = imageId
              }
            })
-            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId ? this.$router.currentRoute.query.subjectVisitId : item.SubjectVisitId
            var studyId = this.$router.currentRoute.query.studyId
            var trialId = this.$router.currentRoute.query.trialId
            seriesList.push({
              trialId,
              subjectVisitId,
              studyId,
              subjectId: item.SubjectId,
              imageIds: imageIds,
              instanceInfoList: item.InstanceInfoList,
              seriesId: item.Id,
@@ -415,12 +422,13 @@ export default {
                i.ImageId = imageId
              }
            })
-            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId ? this.$router.currentRoute.query.subjectVisitId : item.SubjectVisitId
            var studyId = this.$router.currentRoute.query.studyId
            var trialId = this.$router.currentRoute.query.trialId
            seriesList.push({
              trialId,
              subjectVisitId,
              subjectId: item.SubjectId,
              studyId,
              imageIds: imageIds,
              instanceInfoList: item.InstanceInfoList,
@@ -1197,6 +1205,7 @@ export default {
  border-color: #213a54 !important;
  background-color: #213a54;
 }
 .frame_content_active {
  border-color: #213a54 !important;
  background-color: #213a54;
@@ -8,7 +8,7 @@
        <div class="login-logo">
          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
          <img v-else-if="NODE_ENV === 'usa'" src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
-          <img v-else src="@/assets/zzlogo2.png" alt="" />
+          <img v-else src="@/assets/zzlogo4.png" alt="" />
        </div>
        <div :class="{
          'login-image': true,
@@ -111,17 +111,17 @@
      </div>
    </div>
    <div v-if="language === 'zh'" class="login-footer">
-      <span>Copyright © {{ new Date().getFullYear() }} 睿佳（武汉）软件科技有限公司
+      <span>Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
        版权所有</span>
      <span> | </span>
      <a target="_blank" href="https://beian.miit.gov.cn/">
-        <span> 鄂ICP备16002609号 </span>
+        <span> 沪ICP备2021037850-2 </span>
      </a>
-      <!-- <span> | </span> -->
+      <span> | </span>
-      <!-- <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
+      <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
        <img src="@/assets/filing.png" />
        <span>沪公网安备 31011002005859号</span>
-      </a> -->
+      </a>
      <a @click="openAbout">
        <span style="color: #428bca">关于</span>
      </a>
@@ -162,7 +162,7 @@
          V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
        </p>
        <p style="margin-bottom: 20px" v-if="language === 'zh'">
-          Copyright © {{ new Date().getFullYear() }} 睿佳（武汉）软件科技有限公司
+          Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
          版权所有
        </p>
        <p style="margin-bottom: 20px" v-else-if="NODE_ENV === 'usa'">
@@ -682,7 +682,7 @@ $light_gray: #606266;
        left: 50px;
        img {
-          height: 70px;
+          height: 40px;
        }
        .usa-logo {
@@ -50,6 +50,9 @@
          </div>
          <div v-if="v.fileType.includes('zip')" class="content flex_col">
            <img :title="v.FileName" crossorigin="anonymous" :src="zipImg" height="100%"/>
          </div>
        </div>
      </div>
      <div class="Anonymous" v-if="isAnonymous">
@@ -158,6 +161,7 @@ import hardcodedMetaDataProvider from '@/views/trials/trials-panel/reading/visit
 import registerWebImageLoader from '@/views/trials/trials-panel/reading/visit-review/js/registerWebImageLoader'
 import Note_RectangleRoiTool from '@/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool'
 import { noneDicomStudyMaskImage, noneDicomStudyUndoMaskImage } from "@/api/reading"
 import zipImg from '@/assets/zip.png'
 const { ViewportType } = Enums
 const renderingEngineId = 'myRenderingEngine'
 const {
@@ -221,7 +225,7 @@ export default {
      activeTool: '',
      imageType: ['image/jpeg', 'image/jpg', 'image/bmp', 'image/png'],
      loading: false,
-      isFitToWindowMode: false,
+      isFitToWindowMode: true,
      trialId: null,
      activeName: '1',
      tools: [],
@@ -231,7 +235,8 @@ export default {
      tip: [
        this.$t('DicomViewer:anonymous:after'),
        this.$t('DicomViewer:anonymous:before')
-      ]
+      ],
      zipImg
    }
  },
  computed: {
@@ -42,6 +42,9 @@
                    <el-image v-else-if="
                      !!~k.FileType.indexOf('mp4')
                    " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
                    <el-image v-else-if="
                      !!~k.FileType.indexOf('zip')
                    " style="width: 100%; height: 100%" :src="zipImg" fit="contain" crossorigin="anonymous" />
                  </div>
                  <div class="file-text" :title="k.FileName">
                    {{ k.FileName }}
@@ -73,6 +76,7 @@ import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials'
 import FileNameSorter from "@/utils/customSort"
 import pdf from '@/assets/pdf.png'
 import mp4 from '@/assets/mp4.png'
 import zipImg from '@/assets/zip.jpg'
 export default {
  name: 'StudyList',
  props: {
@@ -98,6 +102,7 @@ export default {
      studyList: [],
      pdf,
      mp4,
      zipImg,
      BodyPart: {},
      subjectVisitId: '',
      studyId: '',
@@ -1222,7 +1222,7 @@ export default {
                  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 } })
-                } else if (toolName === 'Probe' &&  parseInt(localStorage.getItem('CriterionType')) === 22) {
+                } else if (toolName === 'Probe' && parseInt(localStorage.getItem('CriterionType')) === 22) {
                  cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 12, unit: 'mm', handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces } })
                } else {
                  cornerstoneTools.addToolForElement(element, apiTool)
@@ -1675,7 +1675,10 @@ export default {
        cornerstone.getDefaultViewportForImage(this.canvas, image)
      )
    },
-
+    getInfo() {
      var image = cornerstone.getImage(this.canvas)
      return image
    },
    toggleDicomInfo() {
      this.toolState.dicomInfoVisible = !this.toolState.dicomInfoVisible
      if (this.toolState.dicomInfoVisible) {
@@ -219,8 +219,8 @@
          </div>
        </el-tooltip>
-        <el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click" popper-class="key-series-popper"
+        <el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click"
-          @show="showKeySeriesPanel">
+          popper-class="key-series-popper" @show="showKeySeriesPanel">
          <ul class="key-series-list">
            <li v-if="keyStack && keyStack.taskBlindName" class="key-series-header">
              <div class="key-series-header-top">
@@ -422,7 +422,7 @@
            </div>
          </div>
        </div>
-        <el-tooltip v-if="trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2" v-hasPermi="['role:ir']"
+        <el-tooltip v-if="trialCriterion.ImageUploadEnum > 0" 
          class="item" effect="dark" :content="$t('trials:reading:button:upload')" placement="bottom">
          <div class="tool-wrapper">
            <div class="icon" @click.prevent="openUploadImage('upload')">
@@ -431,15 +431,7 @@
            <div class="text">{{ $t('trials:reading:button:upload') }}</div>
          </div>
        </el-tooltip>
-        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
          'role:ir',
          'role:mim',
          'role:mc',
          'role:pm',
          'role:apm',
          'role:ea',
          'role:qa',
        ]" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
          <div class="tool-wrapper">
            <div class="icon" @click.prevent="openUploadImage('download')">
              <i class="el-icon-download svg-icon" />
@@ -447,6 +439,10 @@
            <div class="text">{{ $t('trials:reading:button:download') }}</div>
          </div>
        </el-tooltip>
        <label for="Replacement" style="color: #fff;cursor: pointer;">
          替换
        </label>
        <input type="file" id="Replacement" @change="beginScanFiles($event, 'replace')" style="display: none;">
        <div style="margin-left:auto;">
          <div style="padding:5px;display: flex;">
            <!-- 手册 -->
@@ -596,7 +592,7 @@
        </el-tab-pane>
        <!-- 其他 -->
        <el-tab-pane :label="$t('trials:reading:tab:others')" name="3">
-          <Others v-if="activeName === '3'" :imageToolType="1"/>
+          <Others v-if="activeName === '3'" :imageToolType="1" />
        </el-tab-pane>
      </el-tabs>
@@ -708,10 +704,11 @@
    </el-dialog>
    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :subject-id="uploadSubjectId"
      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
-      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isReading="true"
      :StudyInstanceUID="StudyInstanceUID" />
    <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :isReading="true" />
    <!-- 签名框 -->
    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
      custom-class="base-dialog-wrapper">
@@ -767,6 +764,8 @@ import const_ from '@/const/sign-code'
 import { changeURLStatic } from '@/utils/history.js'
 import SystemInfo from "@/utils/systemInfo";
 import md5 from 'js-md5'
 import { changeFile } from "./upload.js"
 import dcmjs from '@/utils/dcmUpload/dcmjs'
 export default {
  name: 'DicomViewer',
  components: {
@@ -845,6 +844,10 @@ export default {
      default() {
        return true
      }
    },
    Loading: {
      type: Boolean,
      default: false
    }
  },
  data() {
@@ -978,7 +981,10 @@ export default {
      fullScreenWidth: window.innerWidth - 570 + 'px',
      fullScreenHeight: window.innerHeight - 130 + 'px',
-      ManualsClose: false
+      ManualsClose: false,
      fileKey: null,
      file: null,
      StudyInstanceUID: null
    }
  },
@@ -1213,6 +1219,12 @@ export default {
      this.AspectRatio = windowWidth / windowHeight
    };
    this.getSystemInfoReading()
    DicomEvent.$on('sendStudyFile', (study) => {
      let image = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getInfo()
      study.visitTaskList = this.visitTaskList
      this.$emit("update:Loading", true)
      changeFile('IR', this.file, study, image)
    })
  },
  beforeDestroy() {
    DicomEvent.$off('updateImage')
@@ -1236,6 +1248,11 @@ export default {
    })
  },
  methods: {
    beginScanFiles(e, key) {
      this.fileKey = key
      this.file = e.target.files[0]
      DicomEvent.$emit('getStudyFile')
    },
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
@@ -1283,6 +1300,10 @@ export default {
      if (idx > -1) {
        this.taskId = this.visitTaskList[idx].VisitTaskId
      }
      let image = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getInfo()
      let dataset = dcmjs.data.DicomMessage.readFile(image.data.byteArray.buffer)
      this.StudyInstanceUID = dataset.dict['0020000D'].Value[0]
      dataset = null
      this.uploadSubjectCode = localStorage.getItem("subjectCode")
      this.uploadSubjectId = localStorage.getItem("subjectId")
      this.uploadTrialCriterion = this.trialCriterion
@@ -1451,7 +1472,7 @@ export default {
      // } catch (err) {
      //   console.error(err)
      // }
-      const series = this.getSeriesInfoByMark(visitTaskId, {lesionName: kf.MarkName})
+      const series = this.getSeriesInfoByMark(visitTaskId, { lesionName: kf.MarkName })
      if (!series) return
      this.loadImageStack(series)
    },
@@ -2496,7 +2517,7 @@ export default {
          this.readingTaskState = 2
          await store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
          await store.dispatch('reading/setCurrentReadingTaskState', 2)
-          const res = await getAutoCutNextTask({imageToolType: 1})
+          const res = await getAutoCutNextTask({ imageToolType: 1 })
          var isAutoTask = res.Result.AutoCutNextTask
          if (isAutoTask) {
            window.location.reload()
@@ -2609,7 +2630,7 @@ export default {
          await this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
            showCancelButton: false,
            type: 'warning'
-          }).catch(() => {})
+          }).catch(() => { })
          return
        }
        if (this.ctSeriesInfo.instanceCount > 400) {
@@ -33,17 +33,21 @@
                <div v-for="item in qs.Childrens" :key="item.Id">
                  <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                    <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="item.LesionType === 104 && readingTaskState < 2">
+                    <div v-if="item.LesionType === 104">
-                      <div class="add-icon" @click.prevent="downloadTpl">
+                      <div 
                        class="add-icon" @click.prevent="downloadTpl" v-if="readingTaskState < 2">
                        <i class="el-icon-download" />
                      </div>
                      <div class="add-icon" style="margin: 0 5px;"
-                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)" v-if="readingTaskState < 2">
                        <i class="el-icon-upload2" />
                      </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)" v-if="readingTaskState < 2">
                        <i class="el-icon-plus" />
                      </div>
                      <div class="add-icon" @click.prevent="handleView(item)">
                        <i class="el-icon-view" />
                      </div>
                    </div>
                  </div>
@@ -222,6 +226,7 @@
 <script>
 import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
 import { resetReadingTask, getIVUSTemplate } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -284,7 +289,8 @@ export default {
      sRoiEndDistanceId: '',
      sRoiDistanceId: '',
      rowSaveLoadingMap: {},
-      dialogSaveLoading: false
+      dialogSaveLoading: false,
      childWindows: []
    }
  },
  computed: {
@@ -324,11 +330,13 @@ export default {
    DicomEvent.$on('refreshQuestions', _ => {
      this.refreshQuestions()
    })
    window.addEventListener('beforeunload', this.closeAllChildWindows)
  },
  beforeDestroy() {
    DicomEvent.$off('setCollapseActive')
    DicomEvent.$off('getUnSaveTarget')
    DicomEvent.$off('refreshQuestions')
    window.removeEventListener('beforeunload', this.closeAllChildWindows)
  },
  methods: {
    handleReadingChart(e) {
@@ -739,6 +747,24 @@ export default {
      this.addOrEdit.visible = true
      this.addOrEdit.lesionType = row.LesionType
    },
    handleView(item) {
      localStorage.setItem('taskBlindName', this.taskBlindName)
      localStorage.setItem('isReadingShowSubjectInfo', this.isReadingShowSubjectInfo)
      let token = getToken()
      let routeData = this.$router.resolve({ path: `/ecrfList?trialId=${this.$route.query.trialId}&visitTaskId=${this.visitTaskId}&questionId=${item.Id}&TokenKey=${token}` })
      const win = window.open(routeData.href, '_blank')
      if (win) {
        this.childWindows.push(win)
      }
    },
    closeAllChildWindows() {
      this.childWindows.forEach(win => {
        if (win && !win.closed) {
          win.close()
        }
      })
      this.childWindows = []
    },
    async saveFormData() {
      if (this.dialogSaveLoading) return
      this.dialogSaveLoading = true
@@ -33,17 +33,20 @@
                <div v-for="item in qs.Childrens" :key="item.Id">
                  <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                    <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="(item.LesionType === 104) && readingTaskState < 2">
+                    <div v-if="(item.LesionType === 104)">
-                      <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
+                      <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)" v-if="readingTaskState < 2">
                        <i class="el-icon-download" />
                      </div>
                      <div class="add-icon" style="margin: 0 5px;"
-                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)" v-if="readingTaskState < 2">
                        <i class="el-icon-upload2" />
                      </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)" v-if="readingTaskState < 2">
                        <i class="el-icon-plus" />
                      </div>
                      <div class="add-icon" @click.prevent="handleView(item)">
                        <i class="el-icon-view" />
                      </div>
                    </div>
                  </div>
@@ -224,6 +227,7 @@ import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@
 import { resetReadingTask, getOCTFCTTemplate, getOCTLipidAngleTemplate } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import Questions from './../Questions'
 import QuestionTableFormItem from './QuestionTableFormItem'
@@ -285,7 +289,8 @@ export default {
      sRoiEndDistanceId: '',
      sRoiDistanceId: '',
      rowSaveLoadingMap: {},
-      dialogSaveLoading: false
+      dialogSaveLoading: false,
      childWindows: []
    }
  },
  computed: {
@@ -325,11 +330,13 @@ export default {
    DicomEvent.$on('refreshQuestions', _ => {
      this.refreshQuestions()
    })
    window.addEventListener('beforeunload', this.closeAllChildWindows)
  },
  beforeDestroy() {
    DicomEvent.$off('setCollapseActive')
    DicomEvent.$off('getUnSaveTarget')
    DicomEvent.$off('refreshQuestions')
    window.removeEventListener('beforeunload', this.closeAllChildWindows)
  },
  methods: {
    handleReadingChart(e) {
@@ -755,6 +762,27 @@ export default {
      this.addOrEdit.visible = true
      this.addOrEdit.lesionType = row.LesionType
    },
    handleView(item) {
      if (this.openWindow) {
        this.openWindow.close()
      }
      localStorage.setItem('taskBlindName', this.taskBlindName)
      localStorage.setItem('isReadingShowSubjectInfo', this.isReadingShowSubjectInfo)
      let token = getToken()
      let routeData = this.$router.resolve({ path: `/ecrfList?trialId=${this.$route.query.trialId}&visitTaskId=${this.visitTaskId}&questionId=${item.Id}&TokenKey=${token}` })
      const win = window.open(routeData.href, '_blank')
      if (win) {
        this.childWindows.push(win)
      }
    },
    closeAllChildWindows() {
      this.childWindows.forEach(win => {
        if (win && !win.closed) {
          win.close()
        }
      })
      this.childWindows = []
    },
    async saveFormData() {
      if (this.dialogSaveLoading) return
      this.dialogSaveLoading = true
@@ -1,5 +1,5 @@
 <template>
-  <div class="dicom-container">
+  <div class="dicom-container" v-loading="loading">
    <div :class="{ 'dicom-list': true, studyHide: !studyShow }">
      <div class="container">
        <div class="related-study-wrapper">
@@ -27,7 +27,8 @@
                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" :is-reading-task-view-in-order="isReadingTaskViewInOrder" @loadImageStack="loadImageStack"
+                  :is-reading-show-subject-info="isReadingShowSubjectInfo"
                  :is-reading-task-view-in-order="isReadingTaskViewInOrder" @loadImageStack="loadImageStack"
                  @previewNoneDicoms="previewNoneDicoms" />
              </div>
            </div>
@@ -38,7 +39,7 @@
    </div>
    <div class="dicom-viewer">
      <div class="container">
-        <DicomViewer v-if="activeTaskVisitId" ref="dicomViewer" :is-show="isShow"
+        <DicomViewer v-if="activeTaskVisitId" ref="dicomViewer" :is-show="isShow" :Loading.sync="loading"
          :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" :studyShow="studyShow"
@@ -1,9 +1,11 @@
 <template>
  <div v-loading="loading" class="study-wrapper">
-    <h4 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;">
+    <h4 v-if="isReadingShowSubjectInfo"
      style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;">
      {{ subjectCode }}
    </h4>
-    <h4 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;margin-bottom: 5px;">
+    <h4 v-if="isReadingShowSubjectInfo"
      style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;margin-bottom: 5px;">
      {{ taskBlindName }}
    </h4>
    <div class="ps">
@@ -14,116 +16,103 @@
              <!-- 关键序列 -->
              {{ $t('trials:reading:title:keySeries') }}
            </div>
-            <div
+            <div v-else class="dicom-desc" style="white-space: normal;">
-              v-else
+              <div>
-              class="dicom-desc"
+                <div style="text-overflow: ellipsis;overflow: hidden;">
              style="white-space: normal;"
            >
                <div>
                  <div style="text-overflow: ellipsis;overflow: hidden;">
-                    <span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName">
+                  <span v-if="taskInfo && taskInfo.IsShowStudyName && study.StudyName" :title="study.StudyName">
-                      {{study.StudyName}}
+                    {{ study.StudyName }}
-                    </span>
+                  </span>
                  </div>
                  <div>
                    <span class="study-meta-line" :title="study.Modalities">
                      <span v-if="isReadingTaskViewInOrder !== 0" class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span>
                      <span class="study-modality">{{ study.Modalities }}({{ study.SeriesCount }})</span>
                      <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
                        <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
                          <h4>{{ $t('trials:ptData:title') }}</h4>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:patientSex') }}</label>
                            <span>{{ study.PatientSex }}</span>
                          </div>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
                            <span>{{ study.PatientWeight }}</span>
                          </div>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:totalDose') }}</label>
                            <span>{{ study.RadionuclideTotalDose }}</span>
                          </div>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:halfLife') }}</label>
                            <span>{{ study.RadionuclideHalfLife }}</span>
                          </div>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:injectTime') }}</label>
                            <span>{{ study.RadiopharmaceuticalStartTime }}</span>
                          </div>
                          <div class="patient-info-row">
                            <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
                            <span>{{ study.AcquisitionTime }}</span>
                          </div>
                          <i slot="reference" class="el-icon-document"
                            style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
                        </el-popover>
                      </span>
                    </span>
                  </div>
                  <div v-if="study.Description" class="study-desc-text" :title="study.Description">{{ study.Description }}</div>
                </div>
                <div>
                  <span class="study-meta-line" :title="study.Modalities">
                    <span v-if="isReadingTaskViewInOrder !== 0" class="study-code" :title="study.StudyCode">{{
                      study.StudyCode }}</span>
                    <span class="study-modality">{{ study.Modalities }}({{ study.SeriesCount }})</span>
                    <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
                      <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
                        <h4>{{ $t('trials:ptData:title') }}</h4>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:patientSex') }}</label>
                          <span>{{ study.PatientSex }}</span>
                        </div>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
                          <span>{{ study.PatientWeight }}</span>
                        </div>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:totalDose') }}</label>
                          <span>{{ study.RadionuclideTotalDose }}</span>
                        </div>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:halfLife') }}</label>
                          <span>{{ study.RadionuclideHalfLife }}</span>
                        </div>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:injectTime') }}</label>
                          <span>{{ study.RadiopharmaceuticalStartTime }}</span>
                        </div>
                        <div class="patient-info-row">
                          <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
                          <span>{{ study.AcquisitionTime }}</span>
                        </div>
                        <i slot="reference" class="el-icon-document"
                          style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
                      </el-popover>
                    </span>
                  </span>
                </div>
                <div v-if="study.Description" class="study-desc-text" :title="study.Description">{{ study.Description }}
                </div>
              </div>
            </div>
          </template>
          <div class="series">
-            <div
+            <div v-for="(series, i) in study.SeriesList" :key="i" style="position:relative;margin-top:5px;"
-              v-for="(series, i) in study.SeriesList"
+              series-type="current" @click="showSeriesImage(index, i, series)">
              :key="i"
              style="position:relative;margin-top:5px;"
              series-type="current"
              @click="showSeriesImage(index,i,series)"
            >
-              <div
+              <div :class="{ 'series-active': i == seriesIndex && index === studyIndex }" class="series-wrapper">
-                :class="{'series-active': i==seriesIndex && index === studyIndex}"
+                <el-image class="image-preview" :src="series.previewImageUrl" fit="fill" crossorigin="anonymous" />
                class="series-wrapper"
              >
                <el-image
                  class="image-preview"
                  :src="series.previewImageUrl"
                  fit="fill"
                  crossorigin="anonymous"
                />
                <div class="image-desc">
                  <div class="flex-div">
                    <div style="width: 40px;display: flex;flex-direction: row;justify-content: space-between;">
                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }}</div>
-                      <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount * 100 && series.modality!== 'SR'">
+                      <div
                        v-if="series.isDicom && series.prefetchInstanceCount < series.instanceCount * 100 && series.modality !== 'SR'">
                        <!-- 下载 -->
-                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark"
-                          <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                          :content="$t('trials:reading:button:download')" placement="bottom">
                          <i class="el-icon-video-play"
                            style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;"
                            @click.stop="loadSeries(series, index, i)" />
                        </el-tooltip>
                      </div>
-                      <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                      <el-tooltip
-                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                        v-else-if="series.isDicom && series.prefetchInstanceCount === 0 && series.modality !== 'SR'"
                        class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
                        <i class="el-icon-video-play"
                          style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;"
                          @click.stop="loadSeries(series, index, i)" />
                      </el-tooltip>
                    </div>
                    <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
-                      <el-popover
+                      <el-popover placement="right" trigger="hover" popper-class="instance_frame_wrapper">
                        placement="right"
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
                        <div class="frame_list">
-                          <div
+                          <div v-for="(instance, idx) in series.instanceInfoList" :key="instance.Id"
-                            v-for="(instance, idx) in series.instanceInfoList"
+                            class="frame_content" :class="{ 'frame_content_active': activeInstanceId === instance.Id }"
-                            :key="instance.Id"
+                            :style="{ 'margin-bottom': idx < series.instanceInfoList.length - 1 ? '5px' : '0px' }"
-                            class="frame_content"
+                            @click.stop="showMultiFrames(index, series, i, instance)">
                            :class="{ 'frame_content_active': activeInstanceId === instance.Id }"
                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
                            @click.stop="showMultiFrames(index,series, i, instance)"
                          >
                            <div>
                              <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ?
                                instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
                            </div>
                          </div>
                        </div>
-                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
+                        <i slot="reference" class="el-icon-connection"
                          style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                      </el-popover>
                    </div>
                  </div>
@@ -145,9 +134,11 @@
                  </p>
                  <div class="flex-div">
-                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div
                      v-if="measureData && measureData.findIndex(v => v.SeriesId === series.seriesId && v.MeasureData) > -1">
                      <!-- 有标注 -->
-                      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
+                      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')"
                        placement="right">
                        <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />
                      </el-tooltip>
@@ -155,10 +146,10 @@
                  </div>
                </div>
              </div>
-              <div v-if="series.isDicom && series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount * 100" style="width: 100%;">
+              <div
-                <el-progress
+                v-if="series.isDicom && series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100"
-                  :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))"
+                style="width: 100%;">
-                />
+                <el-progress :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
              </div>
            </div>
@@ -168,24 +159,19 @@
    </div>
    <div class="sr-wrapper">
-      <el-dialog
+      <el-dialog :visible.sync="srDialogVisible"
-        :visible.sync="srDialogVisible"
+        :custom-class="isSrFullscreen ? 'sr-full-dialog-container' : 'sr-dialog-container'" :show-close="false"
-        :custom-class="isSrFullscreen?'sr-full-dialog-container':'sr-dialog-container'"
+        :close-on-click-modal="false" :fullscreen="isSrFullscreen">
        :show-close="false"
        :close-on-click-modal="false"
        :fullscreen="isSrFullscreen"
      >
        <span slot="title" class="dialog-footer">
          <div style="position: absolute;right: 20px;top: 10px;">
-            <svg-icon :icon-class="isSrFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;color:#000;" @click="isSrFullscreen=!isSrFullscreen" />
+            <svg-icon :icon-class="isSrFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="srDialogVisible = false" />
+              style="cursor: pointer;font-size: 20px;color:#000;" @click="isSrFullscreen = !isSrFullscreen" />
            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
              @click="srDialogVisible = false" />
          </div>
        </span>
        <div style="height: 100%;margin:0;">
-          <SrList
+          <SrList v-if="srDialogVisible" :sr-info="srInfo" />
            v-if="srDialogVisible"
            :sr-info="srInfo"
          />
        </div>
      </el-dialog>
    </div>
@@ -296,6 +282,9 @@ export default {
      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
      this.measureData = this.visitTaskList[idx].MeasureData
    })
    DicomEvent.$on("getStudyFile", () => {
      DicomEvent.$emit('sendStudyFile', { studyList: this.studyList, studyIndex: this.studyIndex, seriesIndex: this.seriesIndex, visitTaskId: this.visitTaskId })
    })
    // DicomEvent.$on('setReadingState', readingTaskState => {
    //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
@@ -320,7 +309,7 @@ export default {
  methods: {
    debounce(fn, delay) {
      let timer = null
-      return function() {
+      return function () {
        const context = this
        const args = arguments
        clearTimeout(timer)
@@ -334,7 +323,7 @@ export default {
      // 初始化待渲染序列
      this.getInitSeries().then((res) => {
        requestPoolManager.startTaskTimer()
-        res.map(async(item) => {
+        res.map(async (item) => {
          // this.loadInitialImage(item)
          const imageId = item.imageIds[item.imageIdIndex]
          const p = parseInt(new Date().getTime())
@@ -456,8 +445,8 @@ export default {
          this.studyIndex = obj.studyIndex
          this.seriesIndex = obj.seriesIndex
          seriesList.push(obj.series)
-          this.activeNames = [`${this.studyList[ this.studyIndex].StudyId}`]
+          this.activeNames = [`${this.studyList[this.studyIndex].StudyId}`]
-          this.studyList[ obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true
+          this.studyList[obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true
        } else {
          if (this.studyList.length > 0) {
            // 初始化问题表单
@@ -494,7 +483,7 @@ export default {
          this.studyIndex = secondObj.studyIndex
          this.seriesIndex = secondObj.seriesIndex
          seriesList.push(secondObj.series)
-          this.studyList[ secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true
+          this.studyList[secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true
          this.studyIndex = secondObj.studyIndex
          this.seriesIndex = secondObj.seriesIndex
@@ -527,7 +516,7 @@ export default {
          // const instanceList = seriesList[srIdx].instanceList
          const imageIds = seriesList[srIdx].imageIds
          // const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
-          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k=>k.Id === measureDatas[i].InstanceId)
+          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k => k.Id === measureDatas[i].InstanceId)
          let filterStr = ''
          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
@@ -611,7 +600,7 @@ export default {
          // const instanceList = seriesList[srIdx].imageIds
          const imageIds = seriesList[srIdx].imageIds
          // const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
-          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i=>i.Id === measureDatas[mIdx].InstanceId)
+          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i => i.Id === measureDatas[mIdx].InstanceId)
          let filterStr = ''
          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
@@ -968,15 +957,17 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.study-wrapper{
+.study-wrapper {
-  ::v-deep .el-progress-bar__inner{
+  ::v-deep .el-progress-bar__inner {
    transition: width 0s ease;
  }
  width:100%;
  height: 100%;
  overflow-y: auto;
  overflow-x: hidden;
-  .dicom-desc{
+
  .dicom-desc {
    font-weight: bold;
    font-size: 13px;
    text-align: left;
@@ -985,6 +976,7 @@ export default {
    white-space: normal;
    overflow: visible;
  }
  .study-meta-line {
    // display: grid;
    // grid-template-columns: minmax(0, 1fr) auto;
@@ -994,6 +986,7 @@ export default {
    width: 100%;
    min-width: 0;
  }
  .study-meta-main {
    display: block;
    min-width: 0;
@@ -1001,11 +994,13 @@ export default {
    overflow-wrap: anywhere;
    flex: 1;
  }
  .study-code,
  .study-modality {
    white-space: normal;
    margin: 0 2px;
  }
  .study-desc-text {
    min-width: 0;
    overflow: hidden;
@@ -1017,19 +1012,23 @@ export default {
    overflow-anchor: none;
    touch-action: auto;
  }
  .series-active {
-    background-color: #607d8b!important;
+    background-color: #607d8b !important;
-    border: 1px solid #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;
@@ -1042,11 +1041,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 {
@@ -1055,9 +1056,11 @@ export default {
        border: 2px solid #252525;
        cursor: pointer;
      }
      .image-desc {
        vertical-align: top;
-        p{
+
        p {
          width: 95px;
          white-space: nowrap;
          overflow: hidden;
@@ -1066,7 +1069,8 @@ export default {
          color: #ddd;
          margin: 0px;
          line-height: 1.5;
-          div{
+
          div {
            width: 95px;
            white-space: nowrap;
            overflow: hidden;
@@ -1074,7 +1078,8 @@ export default {
          }
        }
      }
-      .flex-div{
+
      .flex-div {
        display: flex;
        flex-direction: row;
        justify-content: space-between;
@@ -1091,21 +1096,25 @@ export default {
    }
  }
-  ::v-deep .el-collapse{
+
  ::v-deep .el-collapse {
    border: none;
-    .el-collapse-item{
+
-      background-color: #000!important;
+    .el-collapse-item {
      background-color: #000 !important;
      color: #ddd;
    }
-    .el-collapse-item__content{
+
-      padding-bottom:5px;
+    .el-collapse-item__content {
-      background-color: #000!important;
+      padding-bottom: 5px;
      background-color: #000 !important;
    }
-    .el-collapse-item__header{
+
-      background-color: #000!important;
+    .el-collapse-item__header {
      background-color: #000 !important;
      color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
      padding-left: 1px;
      min-height: 40px;
      height: auto;
@@ -1114,35 +1123,42 @@ export default {
      padding-top: 6px;
      padding-bottom: 6px;
    }
-    .el-collapse-item__arrow{
+
    .el-collapse-item__arrow {
      align-self: flex-start;
      margin-top: 2px;
      line-height: 20px;
    }
  }
-  .sr-wrapper{
+
-    ::v-deep .el-dialog{
+  .sr-wrapper {
    ::v-deep .el-dialog {
      background: #fff !important;
      border: 1px solid #ddd;
      // color: #ddd;
-      .el-dialog__title{
+      .el-dialog__title {
-        color:#fff;
+        color: #fff;
      }
    }
-    ::v-deep .sr-dialog-container{
+
    ::v-deep .sr-dialog-container {
      margin-top: 50px !important;
-      width:75%;
+      width: 75%;
-      height:80%;
+      height: 80%;
    }
-    ::v-deep .el-dialog__body{
+
-        padding: 10px;
+    ::v-deep .el-dialog__body {
-        height: calc(100% - 50px);
+      padding: 10px;
      height: calc(100% - 50px);
    }
-    .el-dialog__header{
+
    .el-dialog__header {
      position: relative;
    }
-    .sr-full-dialog-container{
+
-      ::v-deep .is-fullscreen .el-dialog__body{
+    .sr-full-dialog-container {
      ::v-deep .is-fullscreen .el-dialog__body {
        height: calc(100% - 50px);
      }
    }
@@ -1150,25 +1166,29 @@ export default {
 }
 </style>
 <style>
-.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: 5px;
  display: flex;
@@ -1177,6 +1197,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); */
@@ -1185,6 +1206,7 @@ export default {
  border-color: #213a54 !important;
  background-color: #213a54;
 }
 .frame_content_active {
  border-color: #213a54 !important;
  background-color: #213a54;
@@ -1197,6 +1219,7 @@ export default {
  line-height: 1;
  flex: 0 0 auto;
 }
 .patient-info-popper {
  font-size: 12px;
  color: #ddd;
@@ -1221,7 +1244,7 @@ export default {
  line-height: 18px;
 }
-.patient-info-popper .patient-info-row + .patient-info-row {
+.patient-info-popper .patient-info-row+.patient-info-row {
  margin-top: 4px;
 }
@@ -0,0 +1,115 @@
 <template>
  <div class="table-list-container" v-loading="loading">
    <h3 v-if="isReadingShowSubjectInfo">
      <span v-if="subjectCode">{{ subjectCode }} </span>
      <span style="margin-left:5px;">{{ taskBlindName }}</span>
    </h3>
    <h3 v-if="tableQuestion && tableQuestion.GroupName">
      {{ language === 'en' ? tableQuestion.GroupEnName : tableQuestion.GroupName }}
    </h3>
    <h4 v-if="tableQuestion && tableQuestion.QuestionName">
      {{ tableQuestion.QuestionName }}
    </h4>
    <el-table 
      v-if="tableQuestion && tableQuestion.Type === 'basicTable' && tableQuestion.TableQuestions" 
      :ref="tableQuestion.Id"
      :data="tableQuestion.TableQuestions.Answers"
      height="100%"
    >
      <el-table-column 
        v-for="q of tableQuestion.TableQuestions.Questions" 
        :key="q.Id" 
        :prop="q.Id"
        :label="q.QuestionName" 
        show-overflow-tooltip>
        <template slot-scope="scope">
          <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
            {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
          </span>
          <span v-else-if="q.DictionaryCode">
            {{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
              parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
          </span>
          <span v-else-if="q.OptionTypeEnum === 1">
            {{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
          </span>
          <span v-else>
            {{ `${scope.row[q.Id]}` }}
          </span>
        </template>
      </el-table-column>
    </el-table>
  </div>
 </template>
 <script>
 import { getFilterTableQuestion } from '@/api/reading'
 import store from '@/store'
 import { mapGetters } from 'vuex'
 import { changeURLStatic } from '@/utils/history.js'
 export default {
  name: 'DicomTableList',
  data() {
    return {
      isReadingShowSubjectInfo: false,
      subjectCode: null,
      taskBlindName: null,
      questionId: null,
      tableQuestion: null,
      loading: false
    }
  },
  computed: {
    ...mapGetters(['language'])
  },
  created() {
    if (this.$route.query.TokenKey) {
      store.dispatch('user/setToken', this.$route.query.TokenKey)
      changeURLStatic('TokenKey', '')
    }
    this.subjectCode = localStorage.getItem('subjectCode')
    this.taskBlindName = localStorage.getItem('taskBlindName')
    this.isReadingShowSubjectInfo = localStorage.getItem('isReadingShowSubjectInfo')
    this.getList()
  },
  methods: {
    async getList() {
      try {
        this.loading = true
        let params = {
          trialId: this.$route.query.trialId,
          visitTaskId: this.$route.query.visitTaskId,
          questionId: this.$route.query.questionId
        }
        let res = await getFilterTableQuestion(params)
        if (res.IsSuccess) {
          this.tableQuestion = res.Result
        }
      } catch (e) {
        console.log(e)
      } finally {
        this.loading = false
      }
    },
    resetList() {
    }
  }
 }
 </script>
 <style lang="scss" scoped>
 .table-list-container {
  height: 100%;
  padding: 0 10px;
  box-sizing: border-box;
  display: flex;
  flex-direction: column;
  overflow: hidden;
 }
 h3, h4 {
  flex-shrink: 0;
  margin: 10px 0 10px;
 }
 </style>
@@ -0,0 +1,205 @@
 import { dcmUpload } from '@/utils/dcmUpload/dcmUpload'
 import dcmjs from '@/utils/dcmUpload/dcmjs'
 import { deleteImageCache, getAnonymizeInfo, updateModality } from '@/api/reading'
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 var config = {
  maxWebWorkers: 4,
  startWebWorkersOnDemand: true,
  taskConfiguration: {
    decodeTask: {
      initializeCodecsOnStartup: false,
    },
  },
 }
 cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
 import Vue from 'vue'
 function dicomToPng(imageId, width, height) {
  return new Promise((resolve) => {
    cornerstone.loadImage(imageId).then(async (image) => {
      let canvas = document.createElement('canvas')
      canvas.width = (width * 60) / height
      canvas.height = 60
      if (image) {
        cornerstone.renderToCanvas(canvas, image)
        // 将 Canvas 图像对象转换为 PNG 格式
        let blob = await canvasToBlob(canvas)
        resolve(blob)
      } else {
        resolve()
      }
    })
  }).catch((reason) => {
    reason()
  })
 }
 function canvasToBlob(canvas) {
  return new Promise((resolve) => {
    canvas.toBlob((blob) => {
      resolve(blob)
    })
  })
 }
 async function UpdateModality(params) {
  try {
    let res = await updateModality(params)
    if (res.IsSuccess) {
      return true
    }
    return false
  } catch (err) {
    console.log(err)
    return false
  }
 }
 async function getAnonymize(VisitTaskId, SubjectVisitId) {
  try {
    let params = {}
    if (VisitTaskId) {
      params.VisitTaskId = VisitTaskId
    } else {
      params.SubjectVisitId = SubjectVisitId
    }
    let res = await getAnonymizeInfo(params)
    if (res.IsSuccess) {
      return res.Result
    }
    return false
  } catch (err) {
    console.log(err)
    return false
  }
 }
 async function deleteCache(path) {
  try {
    let params = {
      path
    }
    let res = await deleteImageCache(params)
    if (res.IsSuccess) {
      return true
    }
    return false
  } catch (err) {
    console.log(err)
    return false
  }
 }
 /**
 * 0002,0003 MediaStorageSOPInstanceUID
 * 0008,0018 SOPInstanceUID
 * 0020,000D StudyInstanceUID
 * 0020,000E SeriesInstanceUID
 * 
 */
 export async function changeFile(key, file, study, image) {
  // console.log(image, 'image')
  // return console.log(study, 'study')
  let dataset = dcmjs.data.DicomMessage.readFile(image.data.byteArray.buffer)
  // console.log(dataset, 'dataset')
  let MediaStorageSOPInstanceUID = dataset.meta['00020003'].Value[0]
  let SOPInstanceUID = dataset.dict['00080018'].Value[0]
  let StudyInstanceUID = dataset.dict['0020000D'].Value[0]
  let SeriesInstanceUID = dataset.dict['0020000E'].Value[0]
  // let Modality = dataset.dict['00080060'].Value[0]
  let { visitTaskId, visitTaskList = [], studyList, studyIndex, seriesIndex, seriesList, currentSeriesIndex } = study
  let series = key === 'IR' ? studyList[studyIndex].SeriesList[seriesIndex] : seriesList[currentSeriesIndex]
  console.log(series, 'seriesId')
  let index = visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
  let config = null
  if (key === 'IR') {
    config = await getAnonymize(visitTaskId)
  } else {
    config = await getAnonymize(null, series.subjectVisitId)
  }
  if (!config) return false
  config.AnonymizeFixedList.push({
    Element: '0003',
    Group: '0002',
    ReplaceValue: MediaStorageSOPInstanceUID,
    Id: 'MediaStorageSOPInstanceUID'
  })
  config.AnonymizeFixedList.push({
    Element: '0018',
    Group: '0008',
    ReplaceValue: SOPInstanceUID,
    Id: 'SOPInstanceUID'
  })
  config.AnonymizeFixedList.push({
    Element: '000D',
    Group: '0020',
    ReplaceValue: StudyInstanceUID,
    Id: 'StudyInstanceUID'
  })
  config.AnonymizeFixedList.push({
    Element: '000E',
    Group: '0020',
    ReplaceValue: SeriesInstanceUID,
    Id: 'SeriesInstanceUID'
  })
  let uploadBatchId = Vue.prototype.$guid()
  let path = image.imageId.split(`wadouri:${Vue.prototype.OSSclientConfig.basePath}`)[1].split("?")[0]
  let res = await dcmUpload(
    {
      path: path,
      file: file,
      speed: true,
    },
    config,
    (percentage, checkpoint, lastPer) => {
    },
    {
      fileName: file.name,
      fileSize: file.size,
      fileType: 'application/dicom',
      uploadBatchId: uploadBatchId,
      batchDataType: 1,
      // trialId: params.trialId,
      subjectId: key === 'IR' ? localStorage.getItem("subjectId") : series.subjectId,
      subjectVisitId: key === 'IR' ? visitTaskList[index].VisitId : series.subjectVisitId,
    }
  )
  if (!res || !res.url) return false
  let Modality = res.Modality
  let fileId =
    cornerstoneWADOImageLoader.wadouri.fileManager.add(
      file
    )
  let blob = await dicomToPng(
    fileId,
    image.columns,
    image.rows
  )
  let thumbnailPath = series.previewImageUrl.split(Vue.prototype.OSSclientConfig.basePath)[1]
  let OSSclient = Vue.prototype.OSSclient
  try {
    let seriesRes = await OSSclient.put(thumbnailPath, blob, {
      fileName: thumbnailPath.split('/')[thumbnailPath.split('/').length - 1],
      fileSize: blob.size,
      fileType: 'image/jpeg',
      uploadBatchId: uploadBatchId,
      batchDataType: 2,
      // trialId: params.trialId,
      subjectId: key === 'IR' ? localStorage.getItem("subjectId") : series.subjectId,
      subjectVisitId: key === 'IR' ? visitTaskList[index].VisitId : series.subjectVisitId,
    })
    console.log(seriesRes, 'seriesRes')
    if (!seriesRes || !seriesRes.url) return false
    res = await Promise.all([deleteCache(path), deleteCache(thumbnailPath)])
    if (!res) return false
    let params = {
      Modality,
      SeriesId: series.seriesId,
      IsCRCReplace: key === 'IR' ? false : true
    }
    res = await UpdateModality(params)
    if (!res) return false
    window.location.reload(true)
  } catch (e) {
    console.log(e)
  }
 }
@@ -36,7 +36,7 @@
    <div class="info-image">
      <div v-show="mousePosition.mo">
        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">
@@ -477,6 +477,10 @@ export default {
    DicomEvent.$off('updateImage')
  },
  methods: {
    getInfo() {
      var image = cornerstone.getImage(this.canvas)
      return image
    },
    goViewer(e) {
      console.log(this.$refs['sliderBox'].clientHeight)
      var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
@@ -309,10 +309,8 @@
            <div class="text">{{ $t('trials:reading:button:reset') }}</div>
          </div>
        </el-tooltip>
-        <el-tooltip v-if="
+        <el-tooltip v-if="trialCriterion.ImageUploadEnum > 0" class="item" effect="dark"
-          trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2
+          :content="$t('trials:reading:button:upload')" placement="bottom">
        " v-hasPermi="['role:ir']" class="item" effect="dark" :content="$t('trials:reading:button:upload')"
          placement="bottom">
          <div class="tool-wrapper">
            <div class="icon" @click.prevent="openUploadImage('upload')">
              <i class="el-icon-upload2 svg-icon" />
@@ -320,15 +318,8 @@
            <div class="text">{{ $t('trials:reading:button:upload') }}</div>
          </div>
        </el-tooltip>
-        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+        <el-tooltip v-if="trialCriterion.ImageDownloadEnum > 0" class="item" effect="dark"
-          'role:ir',
+          :content="$t('trials:reading:button:download')" placement="bottom">
          'role:mim',
          'role:mc',
          'role:pm',
          'role:apm',
          'role:ea',
          'role:qa',
        ]" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
          <div class="tool-wrapper">
            <div class="icon" @click.prevent="openUploadImage('download')">
              <i class="el-icon-download svg-icon" />
@@ -336,7 +327,10 @@
            <div class="text">{{ $t('trials:reading:button:download') }}</div>
          </div>
        </el-tooltip>
-
+        <label for="Replacement" style="color: #fff;cursor: pointer;">
          替换
        </label>
        <input type="file" id="Replacement" @change="beginScanFiles($event, 'replace')" style="display: none;">
        <div style="margin-left: auto">
          <div style="display: flex;">
            <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
@@ -411,7 +405,7 @@
          <WL v-if="activeName === '2'" @getWwcTpl="getWwcTpl" />
        </el-tab-pane>
        <el-tab-pane :label="$t('trials:reading:tab:others')" name="3">
-          <Others v-if="activeName === '3'" :imageToolType="1"/>
+          <Others v-if="activeName === '3'" :imageToolType="1" />
        </el-tab-pane>
      </el-tabs>
    </el-dialog>
@@ -448,10 +442,10 @@
    /> -->
    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId" :SubjectCode="uploadSubjectCode"
      :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible" :VisitTaskId="taskId"
-      :isReadingTaskViewInOrder="isReadingTaskViewInOrder" />
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :StudyInstanceUID="StudyInstanceUID" :isReading="true" />
    <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
      :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :TaskId="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :isReading="true" />
  </div>
 </template>
 <script>
@@ -478,6 +472,8 @@ import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
 import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import { changeFile } from "@/views/trials/trials-panel/reading/dicoms/components/upload.js"
 import dcmjs from '@/utils/dcmUpload/dcmjs'
 export default {
  name: 'DicomViewer',
  components: {
@@ -683,7 +679,10 @@ export default {
      fullScreenWidth: window.innerWidth - 570 + 'px',
      fullScreenHeight: window.innerHeight - 128 + 'px',
-      ManualsClose: false
+      ManualsClose: false,
      fileKey: null,
      file: null,
      StudyInstanceUID: null
    }
  },
@@ -856,6 +855,12 @@ export default {
      this.loadLinkedImageStack(seriesInfo)
      console.log('loadLinkedImageStack')
    })
    DicomEvent.$on('sendStudyFile', (study) => {
      let image = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getInfo()
      study.visitTaskList = this.visitTaskList
      this.$emit("update:Loading", true)
      changeFile('IR', this.file, study, image)
    })
  },
  beforeDestroy() {
    DicomEvent.$off('updateImage')
@@ -866,6 +871,11 @@ export default {
    DicomEvent.$off('loadLinkedImageStack')
  },
  methods: {
    beginScanFiles(e, key) {
      this.fileKey = key
      this.file = e.target.files[0]
      DicomEvent.$emit('getStudyFile')
    },
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
@@ -898,6 +908,11 @@ export default {
      if (idx > -1) {
        this.taskId = this.visitTaskList[idx].VisitTaskId
      }
      let image = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getInfo()
      let dataset = dcmjs.data.DicomMessage.readFile(image.data.byteArray.buffer)
      this.StudyInstanceUID = dataset.dict['0020000D'].Value[0]
      dataset = null
      console.log(this.StudyInstanceUID, 'StudyInstanceUID')
      this.uploadSubjectCode = localStorage.getItem("subjectCode")
      this.uploadSubjectId = localStorage.getItem("subjectId")
      this.uploadTrialCriterion = this.trialCriterion
@@ -128,7 +128,7 @@ export default {
      immediate: true,
      handler(val) {
        if (val) {
-          this.readingTaskState = val
+          this.readingTaskState = 1
        }
      }
    }
@@ -169,7 +169,7 @@ export default {
        if (i > -1) {
          this.visitTaskId = this.visitTaskList[i].VisitTaskId
          this.taskBlindName = this.visitTaskList[i].TaskBlindName
-          this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+          this.readingTaskState = 1
          console.log(this.visitTaskList[i].IsInit)
          if (!this.visitTaskList[i].IsInit) {
            var loading = this.$loading({ fullscreen: true })
@@ -306,9 +306,9 @@ export default {
            }
            this.signVisible = false
            // 设置当前任务阅片状态为已读
-            this.readingTaskState = 2
+            this.readingTaskState = 1
-            store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
+            store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 1 })
-            DicomEvent.$emit('setReadingState', 2)
+            DicomEvent.$emit('setReadingState', 1)
            window.opener.postMessage('refreshTaskList', window.location)
            this.$confirm(this.$t('trials:oncologyReview:title:msg2'), {
              type: 'warning',
@@ -1,6 +1,6 @@
 <template>
  <div v-loading="loading" style="min-height: 500px;">
-    <el-form v-if="isRender" ref="questions" size="small" :model="questionForm" :disabled="readingTaskState >= 2">
+    <el-form v-if="isRender" ref="questions" size="small" :model="questionForm">
      <template>
        <QuestionFormItem v-for="question of questions" :key="question.Id" :visitTaskId="visitTaskId"
          :question="question" :question-form="questionForm" :reading-task-state="readingTaskState"
@@ -112,8 +112,8 @@ export default {
        VisitTaskId: visitTaskId ? visitTaskId : this.visitTaskId
      }).then(res => {
        this.IsBaseline = res.OtherInfo.IsBaseline
-        this.readingTaskState = res.OtherInfo.ReadingTaskState
+        this.readingTaskState = 1
-        DicomEvent.$emit('setReadingState', res.OtherInfo.ReadingTaskState)
+        DicomEvent.$emit('setReadingState', 1)
        res.Result.SinglePage.map((v) => {
          if (v.Type === 'group' && v.Childrens.length === 0) return
          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
@@ -1,9 +1,11 @@
 <template>
  <div v-loading="loading" class="study-wrapper">
-    <h4 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;">
+    <h4 v-if="isReadingShowSubjectInfo"
      style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;">
      {{ subjectCode }}
    </h4>
-    <h4 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;margin-bottom: 5px;">
+    <h4 v-if="isReadingShowSubjectInfo"
      style="color: #ddd;padding: 5px 0px;margin: 0;text-align: center;background-color: #4c4c4c;margin-bottom: 5px;">
      {{ taskBlindName }}
    </h4>
    <div class="ps">
@@ -14,11 +16,8 @@
              <!-- 关键序列 -->
              {{ $t('trials:reading:title:keySeries') }}
            </div>
-            <div
+            <div v-else class="dicom-desc"
-              v-else
+              style="width: 150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
              class="dicom-desc"
              style="width: 150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
            >
              <div>
                <div style="text-overflow: ellipsis;overflow: hidden;" v-if="!study.StudyName">
                  <span :title="study.StudyCode">{{ study.StudyCode }}</span>
@@ -27,63 +26,51 @@
                <div style="text-overflow: ellipsis;overflow: hidden;" v-else>
                  <span :title="study.StudyCode">{{ study.StudyCode }}</span>
                  <span v-if="taskInfo && taskInfo.IsShowStudyName" :title="study.StudyName">
-                    {{study.StudyName}}
+                    {{ study.StudyName }}
                  </span>
                  <div>{{ study.Modalities }} ({{ study.SeriesCount }})</div>
                </div>
-                <div style="text-overflow: ellipsis;overflow: hidden;" :title="study.Description">{{ study.Description }}</div>
+                <div style="text-overflow: ellipsis;overflow: hidden;" :title="study.Description">{{ study.Description
                  }}</div>
              </div>
            </div>
          </template>
          <div class="series">
-            <div
+            <div v-for="(series, i) in study.SeriesList" :key="i" style="position:relative;margin-top:5px;"
-              v-for="(series, i) in study.SeriesList"
+              series-type="current" @click="showSeriesImage(index, i, series)">
              :key="i"
              style="position:relative;margin-top:5px;"
              series-type="current"
              @click="showSeriesImage(index,i,series)"
            >
-              <div
+              <div :class="{ 'series-active': i == seriesIndex && index === studyIndex }" class="series-wrapper">
-                :class="{'series-active': i==seriesIndex && index === studyIndex}"
+                <el-image class="image-preview" :src="series.previewImageUrl" fit="fill" crossorigin="anonymous" />
                class="series-wrapper"
              >
                <el-image
                  class="image-preview"
                  :src="series.previewImageUrl"
                  fit="fill"
                  crossorigin="anonymous"
                />
                <div class="image-desc">
                  <div class="flex-div">
                    <div style="width: 40px;display: flex;flex-direction: row;justify-content: space-between;">
                      <div v-if="!study.IsCriticalSequence">#{{ series.seriesNumber }}</div>
-                      <div v-if="series.isDicom && series.prefetchInstanceCount<series.instanceCount * 100 && series.modality!== 'SR'">
+                      <div
                        v-if="series.isDicom && series.prefetchInstanceCount < series.instanceCount * 100 && series.modality !== 'SR'">
                        <!-- 下载 -->
-                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                        <el-tooltip v-if="!series.isLoading" class="item" effect="dark"
-                          <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                          :content="$t('trials:reading:button:download')" placement="bottom">
                          <i class="el-icon-video-play"
                            style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;"
                            @click.stop="loadSeries(series, index, i)" />
                        </el-tooltip>
                      </div>
-                      <el-tooltip v-else-if="series.isDicom && series.prefetchInstanceCount === 0 &&series.modality!== 'SR'" class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
+                      <el-tooltip
-                        <i class="el-icon-video-play" style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;" @click.stop="loadSeries(series,index,i)" />
+                        v-else-if="series.isDicom && series.prefetchInstanceCount === 0 && series.modality !== 'SR'"
                        class="item" effect="dark" :content="$t('trials:reading:button:download')" placement="bottom">
                        <i class="el-icon-video-play"
                          style="font-size: 18px;margin-right: 5px;color: #ffeb3b;cursor: pointer;"
                          @click.stop="loadSeries(series, index, i)" />
                      </el-tooltip>
                    </div>
                    <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
-                      <el-popover
+                      <el-popover placement="right" trigger="hover" popper-class="instance_frame_wrapper">
                        placement="right"
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
                        <div class="frame_list">
-                          <div
+                          <div v-for="(instance, idx) in series.instanceInfoList" :key="instance.Id"
-                            v-for="(instance, idx) in series.instanceInfoList"
+                            class="frame_content" :class="{ 'frame_content_active': activeInstanceId === instance.Id }"
-                            :key="instance.Id"
+                            :style="{ 'margin-bottom': idx < series.instanceInfoList.length - 1 ? '5px' : '0px' }"
-                            class="frame_content"
+                            @click.stop="showMultiFrames(index, series, i, instance)">
                            :class="{ 'frame_content_active': activeInstanceId === instance.Id }"
                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
                            @click.stop="showMultiFrames(index,series, i, instance)"
                          >
                            <!-- <div>
                                          <img
                                            class="image-preview"
@@ -96,12 +83,14 @@
                                        </div> -->
                            <div>
                              <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ?
                                instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
                            </div>
                          </div>
                        </div>
-                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
+                        <i slot="reference" class="el-icon-connection"
                          style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                      </el-popover>
                    </div>
                  </div>
@@ -121,9 +110,11 @@
                    {{ series.modality }}: {{ series.instanceCount }} image
                  </p>
                  <div class="flex-div">
-                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div
                      v-if="measureData && measureData.findIndex(v => v.SeriesId === series.seriesId && v.MeasureData) > -1">
                      <!-- 有标注 -->
-                      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
+                      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')"
                        placement="right">
                        <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />
                      </el-tooltip>
@@ -131,10 +122,10 @@
                  </div>
                </div>
              </div>
-              <div v-if="series.isDicom && series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount * 100" style="width: 100%;">
+              <div
-                <el-progress
+                v-if="series.isDicom && series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100"
-                  :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))"
+                style="width: 100%;">
-                />
+                <el-progress :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
              </div>
            </div>
@@ -144,24 +135,19 @@
    </div>
    <div class="sr-wrapper">
-      <el-dialog
+      <el-dialog :visible.sync="srDialogVisible"
-        :visible.sync="srDialogVisible"
+        :custom-class="isSrFullscreen ? 'sr-full-dialog-container' : 'sr-dialog-container'" :show-close="false"
-        :custom-class="isSrFullscreen?'sr-full-dialog-container':'sr-dialog-container'"
+        :close-on-click-modal="false" :fullscreen="isSrFullscreen">
        :show-close="false"
        :close-on-click-modal="false"
        :fullscreen="isSrFullscreen"
      >
        <span slot="title" class="dialog-footer">
          <div style="position: absolute;right: 20px;top: 10px;">
-            <svg-icon :icon-class="isSrFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;color:#000;" @click="isSrFullscreen=!isSrFullscreen" />
+            <svg-icon :icon-class="isSrFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="srDialogVisible = false" />
+              style="cursor: pointer;font-size: 20px;color:#000;" @click="isSrFullscreen = !isSrFullscreen" />
            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
              @click="srDialogVisible = false" />
          </div>
        </span>
        <div style="height: 100%;margin:0;">
-          <SrList
+          <SrList v-if="srDialogVisible" :sr-info="srInfo" />
            v-if="srDialogVisible"
            :sr-info="srInfo"
          />
        </div>
      </el-dialog>
    </div>
@@ -266,6 +252,9 @@ export default {
      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
      this.measureData = this.visitTaskList[idx].MeasureData
    })
    DicomEvent.$on("getStudyFile", () => {
      DicomEvent.$emit('sendStudyFile', { studyList: this.studyList, studyIndex: this.studyIndex, seriesIndex: this.seriesIndex, visitTaskId: this.visitTaskId })
    })
    // DicomEvent.$on('setReadingState', readingTaskState => {
    //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
    //   if (idx > -1) {
@@ -282,7 +271,7 @@ export default {
      // 初始化待渲染序列
      this.getInitSeries().then((res) => {
        requestPoolManager.startTaskTimer()
-        res.map(async(item) => {
+        res.map(async (item) => {
          let imageId = item.imageIds[item.imageIdIndex]
          const p = parseInt(new Date().getTime())
          // requestPoolManager.loadAndCacheImagePlus(imageId, item.seriesId, p * 100)
@@ -390,15 +379,15 @@ export default {
          this.seriesIndex = seriesArr[1].seriesIndex
          this.activeNames = [`${seriesArr[1].studyId}`]
        }
-      } else if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder === 0){
+      } else if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder === 0) {
        // 基线
        const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
        if (Object.keys(obj).length !== 0) {
          this.studyIndex = obj.studyIndex
          this.seriesIndex = obj.seriesIndex
          seriesList.push(obj.series)
-          this.activeNames = [`${this.studyList[ this.studyIndex].StudyId}`]
+          this.activeNames = [`${this.studyList[this.studyIndex].StudyId}`]
-          this.studyList[ obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true
+          this.studyList[obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true
        } else {
          // 初始化问题表单
          if (this.studyList.length > 0) {
@@ -430,7 +419,7 @@ export default {
          this.studyIndex = secondObj.studyIndex
          this.seriesIndex = secondObj.seriesIndex
          seriesList.push(secondObj.series)
-          this.studyList[ secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true
+          this.studyList[secondObj.studyIndex].SeriesList[secondObj.seriesIndex].isFirstRender = true
          this.studyIndex = secondObj.studyIndex
          this.seriesIndex = secondObj.seriesIndex
@@ -464,7 +453,7 @@ export default {
          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
          const imageIds = seriesList[srIdx].imageIds
          // let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
-          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k=>k.Id === measureDatas[i].InstanceId)
+          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k => k.Id === measureDatas[i].InstanceId)
          let filterStr = ''
          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
@@ -548,7 +537,7 @@ export default {
          // const instanceList = seriesList[srIdx].instanceList
          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId)) 
          const imageIds = seriesList[srIdx].imageIds
-          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i=>i.Id === measureDatas[mIdx].InstanceId)
+          let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i => i.Id === measureDatas[mIdx].InstanceId)
          let filterStr = ''
          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
@@ -658,7 +647,7 @@ export default {
          this.studyIndex = studyIndex
          this.seriesIndex = seriesIndex
          this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-          var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+          var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex])
          dicomStatck.imageIdIndex = 0
          this.$emit('loadImageStack', dicomStatck)
@@ -707,7 +696,7 @@ export default {
      this.studyIndex = studyIndex
      this.seriesIndex = seriesIndex
      this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-      var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+      var dicomStatck = Object.assign({}, this.studyList[studyIndex].SeriesList[seriesIndex])
      const imageIds = []
      if (instanceInfo.KeyFramesList.length > 0) {
        instanceInfo.KeyFramesList.map(i => {
@@ -867,15 +856,17 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.study-wrapper{
+.study-wrapper {
-  ::v-deep .el-progress-bar__inner{
+  ::v-deep .el-progress-bar__inner {
    transition: width 0s ease;
  }
  width:100%;
  height: 100%;
  overflow-y: auto;
  overflow-x: hidden;
-  .dicom-desc{
+
  .dicom-desc {
    font-weight: bold;
    font-size: 13px;
    text-align: left;
@@ -887,19 +878,23 @@ export default {
    overflow-anchor: none;
    touch-action: auto;
  }
  .series-active {
-    background-color: #607d8b!important;
+    background-color: #607d8b !important;
-    border: 1px solid #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;
@@ -912,11 +907,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 {
@@ -925,9 +922,11 @@ export default {
        border: 2px solid #252525;
        cursor: pointer;
      }
      .image-desc {
        vertical-align: top;
-        p{
+
        p {
          width: 95px;
          white-space: nowrap;
          overflow: hidden;
@@ -936,7 +935,8 @@ export default {
          color: #ddd;
          margin: 0px;
          line-height: 1.5;
-          div{
+
          div {
            width: 95px;
            white-space: nowrap;
            overflow: hidden;
@@ -944,7 +944,8 @@ export default {
          }
        }
      }
-      .flex-div{
+
      .flex-div {
        display: flex;
        flex-direction: row;
        justify-content: space-between;
@@ -960,76 +961,89 @@ export default {
      }
    }
  }
-  ::v-deep .el-collapse{
+
  ::v-deep .el-collapse {
    border: none;
-    .el-collapse-item{
+
-      background-color: #000!important;
+    .el-collapse-item {
      background-color: #000 !important;
      color: #ddd;
    }
-    .el-collapse-item__content{
+
-      padding-bottom:5px;
+    .el-collapse-item__content {
-      background-color: #000!important;
+      padding-bottom: 5px;
      background-color: #000 !important;
    }
-    .el-collapse-item__header{
+
-      background-color: #000!important;
+    .el-collapse-item__header {
      background-color: #000 !important;
      color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
      padding-left: 5px;
      height: 40px;
      line-height: 20px;
    }
  }
-  .sr-wrapper{
+
-    ::v-deep .el-dialog{
+  .sr-wrapper {
    ::v-deep .el-dialog {
      background: #fff !important;
      border: 1px solid #ddd;
      // color: #ddd;
-      .el-dialog__title{
+      .el-dialog__title {
-        color:#fff;
+        color: #fff;
      }
    }
-    ::v-deep .sr-dialog-container{
+
    ::v-deep .sr-dialog-container {
      margin-top: 50px !important;
-      width:75%;
+      width: 75%;
-      height:80%;
+      height: 80%;
    }
-    ::v-deep .el-dialog__body{
+
-        padding: 10px;
+    ::v-deep .el-dialog__body {
-        height: calc(100% - 50px);
+      padding: 10px;
      height: calc(100% - 50px);
    }
-    .el-dialog__header{
+
    .el-dialog__header {
      position: relative;
    }
-    .sr-full-dialog-container{
+
-      ::v-deep .is-fullscreen .el-dialog__body{
+    .sr-full-dialog-container {
      ::v-deep .is-fullscreen .el-dialog__body {
        height: calc(100% - 50px);
      }
    }
  }
 }
 </style>
 <style>
-.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: 5px;
  display: flex;
@@ -1038,6 +1052,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); */
@@ -1046,6 +1061,7 @@ export default {
  border-color: #213a54 !important;
  background-color: #213a54;
 }
 .frame_content_active {
  border-color: #213a54 !important;
  background-color: #213a54;
@@ -320,7 +320,7 @@
              </div>
            </div>
            <div class="tool-item" :title="$t('trials:reading:button:upload')"
-              v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2" v-hasPermi="['role:ir']">
+              v-if="trialCriterion.ImageUploadEnum > 0" v-hasPermi="['role:ir']">
              <div class="tool-wrapper">
                <div class="icon" @click.prevent="openUploadImage('upload')">
                  <i class="el-icon-upload2 svg-icon" />
@@ -582,10 +582,11 @@
      :renderingEngineId="renderingEngineId" :visitInfo="taskInfo" /> -->
    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :subject-id="uploadSubjectId"
      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
-      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isReading="true" />
    <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
-      :visible.sync="downloadImageVisible" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+      :visible.sync="downloadImageVisible" :is-reading-task-view-in-order="isReadingTaskViewInOrder"
      :isReading="true" />
    <readingChart ref="readingChart" />
  </div>
 </template>
@@ -24,7 +24,7 @@
        <template v-if="rerender">
          <QuestionFormItem v-for="question of questions" :key="question.Id" :visit-task-id="visitTaskId"
            :isNoneDicom="isNoneDicom" :question="question" :question-form="questionForm"
-            :reading-task-state="readingTaskState" :criterion-id="criterionId" :calculation-list="calculationList"
+            :reading-task-state="1" :criterion-id="criterionId" :calculation-list="calculationList"
            :question-mark-info-list="questionMarkInfoList" :questions-mark-status="questionsMarkStatus"
            :questionsSegmentMarkStatus="questionsSegmentMarkStatus" :is-baseline="isBaseLineTask"
            @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" @getQuestions="getQuestions"
@@ -32,7 +32,7 @@
            @handleReadingChart="handleReadingChart" @saveSegmentBindingAndAnswer="saveSegmentBindingAndAnswer" />
        </template>
-        <el-form-item v-if="readingTaskState < 2">
+        <el-form-item>
          <div class="action-bar">
            <!-- <i class="el-icon-warning feedback-icon" @click="openFeedBackTable"
              :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" /> -->
@@ -120,7 +120,7 @@ export default {
    //     if (this.VUE_APP_OSS_PATH === '/uat/dist') {
    //         this.form = {
    //             EmailFromEmail: 'uat@extimaging.com',
-    //             EmailFromName: 'Uat RPC lmaging Trial Management System',
+    //             EmailFromName: 'Uat EIC lmaging Trial Management System',
    //             EmailAuthorizationCode: 'SHzyyl2021',
    //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
    //             EmailSMTPServerPort: 465,
@@ -130,7 +130,7 @@ export default {
    //     if (this.VUE_APP_OSS_PATH === '/test/dist') {
    //         this.form = {
    //             EmailFromEmail: 'test@extimaging.com',
-    //             EmailFromName: 'Test RPC lmaging Trial Management System',
+    //             EmailFromName: 'Test EIC lmaging Trial Management System',
    //             EmailAuthorizationCode: 'SHzyyl2021',
    //             EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
    //             EmailSMTPServerPort: 465,
@@ -0,0 +1,142 @@
 <template>
  <div class="json-editor" v-loading="loading">
    <div class="header">
      <!-- <span class="title">JSON 编辑</span> -->
      <el-button type="primary" size="mini" icon="el-icon-check" @click="save">
        {{ $t('common:button:save') }}
      </el-button>
    </div>
    <div class="json">
      <json-node
      :node-key="'root'"
      :node-value="jsonData"
      :is-root="true"
      @update="handleUpdate"
    />
    </div>
  </div>
 </template>
 <script>
 import { getInspectionById, setJsonDetail } from '@/api/trials'
 import JsonNode from './JsonNode.vue'
 export default {
  name: 'JsonEditor',
  components: { JsonNode },
  props: { 
    id: {
      type: String,
      required: true
    }
  },
  data() {
    return {
      loading: false,
      jsonData: {}
    }
  },
  mounted() {
    this.getJsonData()
  },
  methods: {
    handleUpdate({ path, value }) {
      const target = this.getTarget(path.slice(0, -1))
      this.$set(target, path[path.length - 1], value)
    },
    getTarget(path) {
      let t = this.jsonData
      path.forEach(k => { t = t[k] })
      return t
    },
    parseValue(val) {
      if (typeof val === 'string') {
        try {
          const parsed = JSON.parse(val)
          if (parsed && typeof parsed === 'object') {
            return JSON.parse(JSON.stringify(parsed))
          }
        } catch (e) {
          console.warn(e.message)
        }
        return {}
      }
      return val ? JSON.parse(JSON.stringify(val)) : {}
    },
    async getJsonData() {
      try {
        this.loading = true
        const res = await getInspectionById({ id: this.id })
        if (res.IsSuccess) {
          this.jsonData = this.parseValue(res.Result.JsonDetail)
        }
      } catch (err) {
        console.log(err)
      } finally {
        this.loading = false
      }
    },
    isValidJsonObject(obj) {
      if (obj === null || typeof obj !== 'object') return false
      try {
        JSON.stringify(obj)
        return true
      } catch (e) {
        console.warn(e.message)
        return false
      }
    },
    safeClone(obj) {
      if (this.isValidJsonObject(obj)) {
        return JSON.parse(JSON.stringify(obj))
      }
      return {}
    },
    async save() {
      try {
        this.loading = true
        const result = this.safeClone(this.jsonData)
        const res = await setJsonDetail({ id: this.id, jsonDetail: JSON.stringify(result) })
        if (res.IsSuccess) {
          this.$emit('getList')
          this.$emit('close')
          this.$message.success(this.$t('common:message:savedSuccessfully'))
        }
      } catch (err) {
        console.log(err)
      } finally {
        this.loading = false
      }
    }
  }
 }
 </script>
 <style scoped>
 .json-editor {
  font-family: Consolas, Monaco, monospace;
  font-size: 13px;
  line-height: 2;
  padding: 12px;
  background: #fafafa;
  border-radius: 4px;
 }
 .header {
  display: flex;
  justify-content: flex-end;
  align-items: center;
  margin-bottom: 10px;
  padding-bottom: 8px;
  border-bottom: 1px solid #ebeef5;
 }
 .title {
  font-weight: 600;
  font-size: 14px;
  color: #303133;
 }
 .json {
  max-height: 50vh;
  overflow: auto;
 }
 </style>
@@ -0,0 +1,136 @@
 <template>
  <div class="node" :style="{ paddingLeft: depth * 20 + 'px' }">
    <span v-if="!isRoot" class="key">
      {{ isArray ? `[${nodeKey}]` : `"${nodeKey}"` }}:
    </span>
    <!-- 对象 -->
    <template v-if="isObject">
      <span class="bracket">{</span>
      <div class="children">
        <json-node
          v-for="(v, k) in nodeValue"
          :key="k"
          :node-key="k"
          :node-value="v"
          :depth="depth + 1"
          :parent-path="currentPath"
          @update="$emit('update', $event)"
        />
      </div>
      <span class="bracket">}</span>
    </template>
    <!-- 数组 -->
    <template v-else-if="isArray">
      <span class="bracket">[</span>
      <div class="children">
        <json-node
          v-for="(item, i) in nodeValue"
          :key="i"
          :node-key="i"
          :node-value="item"
          :depth="depth + 1"
          :parent-path="currentPath"
          @update="$emit('update', $event)"
        />
      </div>
      <span class="bracket">]</span>
    </template>
    <!-- 文本 -->
    <el-input
      v-else-if="valueType === 'string'"
      v-model="editVal"
      size="mini"
      style="width: 300px"
      @blur="emitUpdate"
      @keyup.enter.native="emitUpdate"
    />
    <!-- 数字 -->
    <el-input-number
      v-else-if="valueType === 'number'"
      v-model="editVal"
      size="mini"
      style="width: 140px"
      @blur="emitUpdate"
    />
    <!-- 布尔值 -->
    <el-switch
      v-else-if="valueType === 'boolean'"
      v-model="editVal"
      size="small"
      @change="emitUpdate"
    />
    <!-- null -->
    <el-tag v-else size="mini" type="info">null</el-tag>
  </div>
 </template>
 <script>
 export default {
  name: 'JsonNode',
  props: {
    nodeKey: [String, Number],
    nodeValue: [Object, Array, String, Number, Boolean],
    depth: { 
      type: Number, 
      default: 0 
    },
    isRoot: { 
      type: Boolean, 
      default: false 
    },
    parentPath: { 
      type: Array, 
      default: () => [] 
    }
  },
  data() {
    return { editVal: this.nodeValue }
  },
  computed: {
    isObject() {
      return this.nodeValue && typeof this.nodeValue === 'object' && !Array.isArray(this.nodeValue)
    },
    isArray() {
      return Array.isArray(this.nodeValue)
    },
    valueType() {
      if (this.nodeValue === null) return 'null'
      return typeof this.nodeValue
    },
    currentPath() {
      return this.isRoot ? [] : [...this.parentPath, this.nodeKey]
    }
  },
  watch: {
    nodeValue(v) { this.editVal = v }
  },
  methods: {
    emitUpdate() {
      this.$emit('update', { path: this.currentPath, value: this.editVal })
    }
  }
 }
 </script>
 <style scoped>
 .node {
  padding-bottom: 5px;
 }
 .key { 
  color: #c7254e;
  margin-right: 4px; 
 }
 .bracket { 
  color: #e6a23c; 
  font-weight: bold; 
 }
 .children { 
  padding-left: 4px; 
 }
 </style>
@@ -194,6 +194,9 @@
            <el-button type="text" @click="lookDetails(scope.row)">
              {{ $t('trials:auditRecord:action:detail') }}
            </el-button>
            <el-button type="text" @click="edit(scope.row)">
              {{ $t('common:button:edit') }}
            </el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -622,6 +625,20 @@
      <!--            :src="openImageUrl"-->
      <!--            style="width: 50px;height: 50px; cursor:pointer">-->
      <!--      </div>-->
      <!-- <json-editor v-model="data" /> -->
      <el-dialog 
        v-if="editDialogVisible" 
        :visible.sync="editDialogVisible" 
        :close-on-click-modal="false"
        :title="$t('common:button:edit') + `${$i18n.locale === 'zh' ? '（' + editRow.DescriptionCN + '）' : '( ' + editRow.Description + ' )'}`" 
        width="720px"
        custom-class="base-dialog-wrapper">
        <json-editor 
          :id="editRow.Id" 
          @close="editDialogVisible = false" 
          @getList="getList"
        />
      </el-dialog>
    </template>
  </BaseContainer>
 </template>
@@ -630,11 +647,12 @@
 import {
  getTrialSiteSelect,
  getTrialVisitStageSelect,
-  getTrialCriterionList
+  getTrialCriterionList,
 } from '@/api/trials'
 import { getInspectionList, getInspectionJsonDataList } from '@/api/trials/inspection'
 import { getFrontAuditConfigList, getAuditConfigChildList, getModuleTypeDescriptionList, setInspectionEnumValue, getModuleTypeList } from '@/api/dictionary/checkConfig'
 import Pagination from '@/components/Pagination'
 import JsonEditor from './components/JsonEditor'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import { getToken } from '@/utils/auth'
@@ -670,7 +688,7 @@ const searchDataDefault = () => {
  }
 }
 export default {
-  components: { BaseContainer, Pagination, BaseModel },
+  components: { BaseContainer, Pagination, JsonEditor, BaseModel },
  dicts: ['OptType', 'ModuleType', 'ChildrenType'],
  data() {
@@ -708,7 +726,10 @@ export default {
      imagesList: [],
      moduleTypeList: [],
      list2_total: 0,
-      list2_searchData: {}
+      list2_searchData: {},
      editDialogVisible: false,
      jsonData: null,
      editRow: null
    }
  },
  mounted() {
@@ -1346,7 +1367,12 @@ export default {
      }).catch(() => {
        this.loading = false
      })
-    }
+    },
    edit(row) {
      this.editRow = Object.assign({}, row)
      this.editDialogVisible = true
    },
  }
 }
 </script>
@@ -105,6 +105,7 @@
          <el-button icon="el-icon-delete" :title="$t('trials:uploadedDicoms:action:delete')" circle
            :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
            @click="handleDeleteStudy(scope.row)" />
          <el-button icon="el-icon-upload2" title="上传" circle @click="upload(scope.row)" />
          <!--          <el-button-->
          <!--            icon="el-icon-toilet-paper"-->
          <!--            circle-->
@@ -423,7 +424,8 @@
      <DicomPreview :uid="uid" :studyList="uploadQueues" />
    </el-dialog>
    <!--pet-ct临床数据上传-->
-    <el-dialog v-if="petVisible" :show-close="true" :close-on-click-modal="false" :visible.sync="petVisible" append-to-body>
+    <el-dialog v-if="petVisible" :show-close="true" :close-on-click-modal="false" :visible.sync="petVisible"
      append-to-body>
      <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="studyData" :allow-add-or-edit="true"
        @getStudyInfo="getStudyInfo" />
    </el-dialog>
@@ -650,6 +652,7 @@ export default {
      BodyPart: {},
      isClose: false,
      StudyInstanceUID: null
    }
  },
  computed: {
@@ -682,6 +685,10 @@ export default {
    this.OSSclient.close()
  },
  methods: {
    upload(row) {
      this.StudyInstanceUID = row.StudyInstanceUid
      this.$refs.pathClear.click()
    },
    handleDragover(e) {
      e.stopPropagation()
      e.preventDefault()
@@ -1144,7 +1151,7 @@ export default {
            var instanceItem = instanceList.find(function (item) {
              return item.instanceUid === instanceUid
            })
-            if (!instanceItem) {
+            if (!false) {
              var date = data.string('x00080023')
              var time = data.string('x00080033')
              var instanceTime = ''
@@ -1274,11 +1281,12 @@ export default {
    verifyStudy() {
      this.btnLoading = true
      var studyList = []
      let scope = this
      this.selectArr.forEach((item) => {
        item.dicomInfo.uploadFileSize = 0
        if (!item.uploadState.selected) {
          studyList.push({
-            studyInstanceUid: item.dicomInfo.studyUid,
+            studyInstanceUid: scope.StudyInstanceUID ? scope.StudyInstanceUID : item.dicomInfo.studyUid,
            studyDate: item.dicomInfo.studyTime,
          })
        }
@@ -1293,6 +1301,8 @@ export default {
      batchVerifyStudyAllowUpload(param)
        .then(async (res) => {
          var messageArr = []
          res.Result = []
          console.log(res)
          res.Result.forEach((item) => {
            const i = this.uploadQueues.findIndex(
              (value) => value.dicomInfo.studyUid === item.StudyInstanceUid
@@ -1475,8 +1485,21 @@ export default {
      })
    },
    // 上传影像并归档
-    archiveStudy(index, config) {
+    archiveStudy(index, config = {}) {
      var scope = this
      try {
        if (!config.AnonymizeFixedList) config.AnonymizeFixedList = []
        config.AnonymizeFixedList.push(
          {
            Element: '000D',
            Group: '0020',
            ReplaceValue: scope.StudyInstanceUID,
            Id: 'StudyInstanceUID'
          }
        )
      } catch (err) {
        console.log(err)
      }
      return new Promise(function (resolve, reject) {
        try {
          preArchiveDicomStudy({
@@ -1506,7 +1529,7 @@ export default {
              let t = setInterval(() => {
                dicomUploadInProgress({
                  trialId: scope.trialId,
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                }).then((res) => { })
              }, 5000)
              scope.myInterval.push(t)
@@ -1531,7 +1554,7 @@ export default {
                    dicomInfo.RadiopharmaceuticalStartTime,
                  studyId: dicomInfo.studyId,
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                  studyTime: dicomInfo.studyTime,
                  description: dicomInfo.description,
                  seriesCount: dicomInfo.seriesNum,
@@ -1572,14 +1595,149 @@ export default {
                        try {
                          let o = v.instanceList[ii]
                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
-                          if (o.isReUpload) {
+                          // if (o.isReUpload) {
-                            dicomInfo.failedFileCount++
+                          //   dicomInfo.failedFileCount++
-                            dicomInfo.uploadFileSize += o.file.size
+                          //   dicomInfo.uploadFileSize += o.file.size
-                            Record.Existed.push(name)
+                          //   Record.Existed.push(name)
-                            Record.FileCount++
+                          //   Record.FileCount++
-                          } else if (o.myPath) {
+                          // }
                          //  else if (o.myPath) {
                          //   instanceList.push({
                          //     studyInstanceUid: dicomInfo.studyUid,
                          //     seriesInstanceUid: v.seriesUid,
                          //     SOPClassUID: o.SOPClassUID,
                          //     TransferSytaxUID: o.TransferSytaxUID,
                          //     MediaStorageSOPInstanceUID:
                          //       o.MediaStorageSOPInstanceUID,
                          //     MediaStorageSOPClassUID:
                          //       o.MediaStorageSOPClassUID,
                          //     sopInstanceUid: o.instanceUid,
                          //     instanceNumber: o.instanceNumber,
                          //     instanceTime: o.instanceTime,
                          //     imageRows: o.imageRows,
                          //     imageColumns: o.imageColumns,
                          //     sliceLocation: o.sliceLocation,
                          //     sliceThickness: o.sliceThickness,
                          //     numberOfFrames: o.numberOfFrames,
                          //     pixelSpacing: o.pixelSpacing,
                          //     imagerPixelSpacing: o.imagerPixelSpacing,
                          //     frameOfReferenceUID: o.frameOfReferenceUID,
                          //     windowCenter: o.windowCenter,
                          //     windowWidth: o.windowWidth,
                          //     path: o.myPath,
                          //     FileSize: o.FileSize,
                          //     PhotometricInterpretation:
                          //       o.PhotometricInterpretation,
                          //     BitsAllocated: o.BitsAllocated,
                          //     PixelRepresentation: o.PixelRepresentation,
                          //     RescaleIntercept: o.RescaleIntercept,
                          //     RescaleSlope: o.RescaleSlope,
                          //     ImagePositionPatient: o.ImagePositionPatient,
                          //     ImageOrientationPatient:
                          //       o.ImageOrientationPatient,
                          //     SequenceOfUltrasoundRegions:
                          //       o.SequenceOfUltrasoundRegions,
                          //     FrameTime: o.FrameTime,
                          //     CorrectedImage: o.CorrectedImage,
                          //     Units: o.Units,
                          //     DecayCorrection: o.DecayCorrection,
                          //     EncapsulatedDocument: o.EncapsulatedDocument,
                          //   })
                          //   Record.Uploaded.push(name)
                          //   dicomInfo.failedFileCount++
                          //   Record.FileCount++
                          // }
                          //  else {
                          let path = `/${params.trialId}/Image/${params.subjectId
                            }/${params.subjectVisitId}/${dicomInfo.studyUid
                            }/${scope.getGuid(
                              dicomInfo.studyUid +
                              v.seriesUid +
                              o.instanceUid +
                              params.trialId
                            )}`
                          if (scope.isClose) return
                          console.log(o.file)
                          let res = await dcmUpload(
                            {
                              path: path,
                              file: o.file,
                              speed: true,
                            },
                            config,
                            (percentage, checkpoint, lastPer) => {
                              dicomInfo.uploadFileSize +=
                                checkpoint.size * (percentage - lastPer)
                              if (
                                dicomInfo.uploadFileSize > dicomInfo.fileSize
                              ) {
                                dicomInfo.uploadFileSize = dicomInfo.fileSize
                              }
                              if (
                                Math.abs(
                                  dicomInfo.uploadFileSize -
                                  dicomInfo.fileSize
                                ) < 5000
                              ) {
                                dicomInfo.uploadFileSize = dicomInfo.fileSize
                              }
                            },
                            {
                              fileName: o.file.name,
                              fileSize: o.file.size,
                              fileType: 'application/dicom',
                              uploadBatchId: uploadBatchId,
                              batchDataType: 1,
                              trialId: params.trialId,
                              subjectId: params.subjectId,
                              subjectVisitId: params.subjectVisitId,
                            }
                          )
                          if (!res || !res.url) {
                            params.failedFileCount++
                          } else {
                            if (ii === 0 && o.modality !== 'SR') {
                              try {
                                let fileId =
                                  cornerstoneWADOImageLoader.wadouri.fileManager.add(
                                    o.file
                                  )
                                let blob = await scope.dicomToPng(
                                  fileId,
                                  o.imageColumns,
                                  o.imageRows
                                )
                                let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                let OSSclient = scope.OSSclient
                                let seriesRes = await OSSclient.put(
                                  thumbnailPath,
                                  blob,
                                  {
                                    fileName: `${v.seriesUid}.jpg`,
                                    fileSize: blob.size,
                                    fileType: 'image/jpeg',
                                    uploadBatchId: uploadBatchId,
                                    batchDataType: 2,
                                    trialId: params.trialId,
                                    subjectId: params.subjectId,
                                    subjectVisitId: params.subjectVisitId,
                                  }
                                )
                                if (seriesRes && seriesRes.url) {
                                  ImageResizePath = scope.$getObjectName(
                                    seriesRes.url
                                  )
                                }
                              } catch (e) {
                                console.log(e)
                              }
                            }
                          }
                          if (res && res.url) {
                            instanceList.push({
-                              studyInstanceUid: dicomInfo.studyUid,
+                              studyInstanceUid: scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                              seriesInstanceUid: v.seriesUid,
                              SOPClassUID: o.SOPClassUID,
                              TransferSytaxUID: o.TransferSytaxUID,
@@ -1600,7 +1758,7 @@ export default {
                              frameOfReferenceUID: o.frameOfReferenceUID,
                              windowCenter: o.windowCenter,
                              windowWidth: o.windowWidth,
-                              path: o.myPath,
+                              path: scope.$getObjectName(res.url),
                              FileSize: o.FileSize,
                              PhotometricInterpretation:
@@ -1620,148 +1778,15 @@ export default {
                              DecayCorrection: o.DecayCorrection,
                              EncapsulatedDocument: o.EncapsulatedDocument,
                            })
                            o.myPath = scope.$getObjectName(res.url)
                            Record.Uploaded.push(name)
                            dicomInfo.failedFileCount++
                            Record.FileCount++
                          } else {
-                            let path = `/${params.trialId}/Image/${params.subjectId
+                            Record.Failed.push(name)
-                              }/${params.subjectVisitId}/${dicomInfo.studyUid
+                            Record.FileCount++
                              }/${scope.getGuid(
                                dicomInfo.studyUid +
                                v.seriesUid +
                                o.instanceUid +
                                params.trialId
                              )}`
                            if (scope.isClose) return
                            console.log(o.file)
                            let res = await dcmUpload(
                              {
                                path: path,
                                file: o.file,
                                speed: true,
                              },
                              config,
                              (percentage, checkpoint, lastPer) => {
                                dicomInfo.uploadFileSize +=
                                  checkpoint.size * (percentage - lastPer)
                                if (
                                  dicomInfo.uploadFileSize > dicomInfo.fileSize
                                ) {
                                  dicomInfo.uploadFileSize = dicomInfo.fileSize
                                }
                                if (
                                  Math.abs(
                                    dicomInfo.uploadFileSize -
                                    dicomInfo.fileSize
                                  ) < 5000
                                ) {
                                  dicomInfo.uploadFileSize = dicomInfo.fileSize
                                }
                              },
                              {
                                fileName: o.file.name,
                                fileSize: o.file.size,
                                fileType: 'application/dicom',
                                uploadBatchId: uploadBatchId,
                                batchDataType: 1,
                                trialId: params.trialId,
                                subjectId: params.subjectId,
                                subjectVisitId: params.subjectVisitId,
                              }
                            )
                            if (!res || !res.url) {
                              params.failedFileCount++
                            } else {
                              if (ii === 0 && o.modality !== 'SR') {
                                try {
                                  let fileId =
                                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
                                      o.file
                                    )
                                  let blob = await scope.dicomToPng(
                                    fileId,
                                    o.imageColumns,
                                    o.imageRows
                                  )
                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                  let OSSclient = scope.OSSclient
                                  let seriesRes = await OSSclient.put(
                                    thumbnailPath,
                                    blob,
                                    {
                                      fileName: `${v.seriesUid}.jpg`,
                                      fileSize: blob.size,
                                      fileType: 'image/jpeg',
                                      uploadBatchId: uploadBatchId,
                                      batchDataType: 2,
                                      trialId: params.trialId,
                                      subjectId: params.subjectId,
                                      subjectVisitId: params.subjectVisitId,
                                    }
                                  )
                                  if (seriesRes && seriesRes.url) {
                                    ImageResizePath = scope.$getObjectName(
                                      seriesRes.url
                                    )
                                  }
                                } catch (e) {
                                  console.log(e)
                                }
                              }
                            }
                            if (res && res.url) {
                              instanceList.push({
                                studyInstanceUid: dicomInfo.studyUid,
                                seriesInstanceUid: v.seriesUid,
                                SOPClassUID: o.SOPClassUID,
                                TransferSytaxUID: o.TransferSytaxUID,
                                MediaStorageSOPInstanceUID:
                                  o.MediaStorageSOPInstanceUID,
                                MediaStorageSOPClassUID:
                                  o.MediaStorageSOPClassUID,
                                sopInstanceUid: o.instanceUid,
                                instanceNumber: o.instanceNumber,
                                instanceTime: o.instanceTime,
                                imageRows: o.imageRows,
                                imageColumns: o.imageColumns,
                                sliceLocation: o.sliceLocation,
                                sliceThickness: o.sliceThickness,
                                numberOfFrames: o.numberOfFrames,
                                pixelSpacing: o.pixelSpacing,
                                imagerPixelSpacing: o.imagerPixelSpacing,
                                frameOfReferenceUID: o.frameOfReferenceUID,
                                windowCenter: o.windowCenter,
                                windowWidth: o.windowWidth,
                                path: scope.$getObjectName(res.url),
                                FileSize: o.FileSize,
                                PhotometricInterpretation:
                                  o.PhotometricInterpretation,
                                BitsAllocated: o.BitsAllocated,
                                PixelRepresentation: o.PixelRepresentation,
                                RescaleIntercept: o.RescaleIntercept,
                                RescaleSlope: o.RescaleSlope,
                                ImagePositionPatient: o.ImagePositionPatient,
                                ImageOrientationPatient:
                                  o.ImageOrientationPatient,
                                SequenceOfUltrasoundRegions:
                                  o.SequenceOfUltrasoundRegions,
                                FrameTime: o.FrameTime,
                                CorrectedImage: o.CorrectedImage,
                                Units: o.Units,
                                DecayCorrection: o.DecayCorrection,
                                EncapsulatedDocument: o.EncapsulatedDocument,
                              })
                              o.myPath = scope.$getObjectName(res.url)
                              Record.Uploaded.push(name)
                              dicomInfo.failedFileCount++
                              Record.FileCount++
                            } else {
                              Record.Failed.push(name)
                              Record.FileCount++
                            }
                          }
                          // }
                          resolve1()
                        } catch (e) {
                          console.log(e)
@@ -1779,7 +1804,7 @@ export default {
                  }
                }
                params.study.seriesList.push({
-                  studyInstanceUid: dicomInfo.studyUid,
+                  studyInstanceUid: scope.StudyInstanceUID ? scope.StudyInstanceUID : dicomInfo.studyUid,
                  seriesInstanceUid: v.seriesUid,
                  seriesNumber: v.seriesNumber,
                  seriesTime: v.seriesTime,
@@ -300,19 +300,7 @@
        <!-- 审核完成时间 -->
        <el-table-column prop="AuditTime" :label="$t('trials:crcUpload:table:auditTime')" show-overflow-tooltip
          width="170" />
-        <el-table-column v-if="
+        <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
          hasPermi(
            [
              'trials:trials-panel:visit:crc-upload:upload',
              'trials:trials-panel:visit:crc-upload:submit',
              'trials:trials-panel:visit:crc-upload:edit',
              'trials:trials-panel:visit:crc-upload:delete',
              'trials:trials-panel:visit:crc-upload:back',
              'trials:trials-panel:visit:crc-upload:authBack'
            ],
            '||'
          )
        " :label="$t('common:action:action')" width="250" fixed="right">
          <template slot-scope="scope">
            <!-- 上传 -->
            <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']" icon="el-icon-upload2" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
@@ -320,10 +308,8 @@
              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
              " circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload(scope.row)" />
            <!-- 上传2 -->
-            <el-button icon="el-icon-upload2" v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
+            <el-button icon="el-icon-upload2"
-              scope.row.VisitExecuted === 2 ||
+              circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload2(scope.row)" />
              scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
              " circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload2(scope.row)" />
            <!-- 提交 -->
            <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:submit']" icon="el-icon-check" :disabled="scope.row.AuditState * 1 > 0 ||
              scope.row.SubmitState * 1 !== 1 ||
@@ -11,7 +11,7 @@ const webpack = require('webpack')
 const defaultSettings = require('./src/settings.js')
 const moment = require('moment')
 var distDate = moment(new Date()).format('YYYY-MM-DD')
-const name = process.env.NODE_ENV === 'usa' ? 'Imaging Trial Management System' : defaultSettings.title || 'RPC lmaging Trial Management System' // page title
+const name = process.env.NODE_ENV === 'usa' ? 'Imaging Trial Management System' : defaultSettings.title || 'EIC lmaging Trial Management System' // page title
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 // eslint-disable-next-line no-undef
 module.exports = defineConfig({
@@ -52,7 +52,7 @@ module.exports = defineConfig({
      },
      '/api': {
-        target: 'http://106.14.89.110:30000',
+        target: 'http://192.168.3.99:6100',
        // target: 'http://101.132.253.119:7010', // uat
        changeOrigin: true,
        secure: false,
Author	SHA1	Message	Date
wangxiaoshuang	9ecaf5e267	1	2026-08-24 09:45:13 +08:00
wangxiaoshuang	1ca4fb7dd4	影像替换与补充	2026-08-21 11:34:52 +08:00
caiyiling	cb2fed1ad2	1	2026-08-17 14:29:26 +08:00
caiyiling	4c642cd814	上传更改	2026-07-31 17:20:20 +08:00
caiyiling	9dcbad7616	数据处理更改	2026-07-31 16:40:37 +08:00
caiyiling	197b3213e7	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main	2026-07-29 16:06:05 +08:00
caiyiling	3bfda749d8	质控预览非DICOM文件处理zip类型的数据	2026-07-29 16:05:06 +08:00
wangxiaoshuang	6f911d0d74	锁定蒙版添加白名单 continuous-integration/drone/push Build is passing Details	2026-07-29 15:53:17 +08:00
caiyiling	78f4a78994	测量数据预览按钮控制更改 continuous-integration/drone/push Build is passing Details	2026-07-29 09:53:43 +08:00
caiyiling	4e1911223d	1 continuous-integration/drone/push Build is passing Details	2026-07-28 09:17:40 +08:00
caiyiling	7dd02e84aa	样式调整 continuous-integration/drone/push Build is passing Details	2026-07-27 15:38:03 +08:00
caiyiling	7f260799d8	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2026-07-27 15:22:13 +08:00
caiyiling	06c7a8126b	IVUS & OCT测量表格添加新开页签预览功能	2026-07-27 15:21:30 +08:00
wangxiaoshuang	78624d9cce	阅片中上传影像需要在下载影像后才能上传 continuous-integration/drone/push Build is passing Details	2026-07-27 14:28:55 +08:00
`@@ -1,2 +1,2 @@`
	const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/link_expired', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']	const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/link_expired', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms', '/ecrfList']
	`export default WHITELIST`	`export default WHITELIST`