排序改为升序

.svn/pristine/a5/a510475a0912f21efb3b36f41ecdfc3f783e4b6d.svn-base

@@ -10516,7 +10516,7 @@ class BaseViewer {
 
     const pageNumber = this._currentPageNumber,
           state = this.#scrollModePageState,
-          viewer = this.viewer;
+          viewmr = this.viewer;
     viewer.textContent = "";
     state.pages.length = 0;
 

src/api/trials.js

@@ -1081,6 +1081,13 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
   })
 }
 
+export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
+  return request({
+    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
+    method: 'put'
+  })
+}
+
 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
   return request({
     url: `/QCList/getVisitQCStudyAndSeriesList/${subjectVisitId}`,

src/main.js

@@ -174,7 +174,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {

src/router/index.js

@@ -139,6 +139,12 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt')
   },
+  {
+    path: '/fusion',
+    name: 'fusion',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/index')
+  },
 
   {
     path: '/historyScreenshot',

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

@@ -52,10 +52,14 @@
                             </div>
                             <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
                               <el-popover
-                                placement="right"
-                                trigger="hover"
+                                v-model="item.isShowPopper"
+                                placement="right-start"
+                                trigger="manual"
                                 popper-class="instance_frame_wrapper"
                               >
+                                <div style="text-align: right;">
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                </div>
                                 <div class="frame_list">
                                   <div
                                     v-for="(instance, idx) in item.instanceInfoList"
@@ -66,11 +70,27 @@
                                   >
                                     <div>
                                       <div>{{ instance.InstanceNumber }}</div>
-                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                      <div>
+                                        {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                      </div>
+                                      <div v-if="showDelete">
+                                        <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsDeleted"
+                                          size="mini"
+                                          @change="changeInstanceDeleteStatus($event, item, instance)"
+                                        />
+                                        <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsReading"
+                                          size="mini"
+                                          @change="changeInstanceReadingStatus($event, item, instance)"
+                                        />
+                                      </div>
                                     </div>
                                   </div>
                                 </div>
-                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
                               </el-popover>
                             </div>
                           </div>
@@ -138,13 +158,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,
@@ -296,7 +316,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -355,7 +376,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -384,8 +406,8 @@ export default {
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
         var sliceThickness = res.Result[0].SliceThickness
-        var isReading = res.Result[0].IsReading
-        var isDeleted = res.Result[0].IsDeleted
+        var isReading = res.OtherInfo.IsReading
+        var isDeleted = res.OtherInfo.IsDeleted
         var seriesList = []
         var imageIds = []
         let isExistMutiFrames = false
@@ -403,7 +425,7 @@ export default {
             imageIds.push(path)
             imageId = path
           }
-          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId, IsDeleted: instance.IsDeleted, IsReading: instance.IsReading })
         })
         seriesList.push({
           trialId,
@@ -424,7 +446,8 @@ export default {
           prefetchInstanceCount: 0,
           loadStatus: false,
           imageloadedArr: [],
-          isExistMutiFrames: isExistMutiFrames
+          isExistMutiFrames: isExistMutiFrames,
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -573,7 +596,8 @@ export default {
           hasLabel: seriesInfo.HasLabel,
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
-          imageloadedArr: []
+          imageloadedArr: [],
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -671,6 +695,81 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(seriesList, series) {
+      for (let i = 0; i < seriesList.length; i++) {
+        if (seriesList[i].isShowPopper) {
+          seriesList[i].isShowPopper = false
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     loadAllImages() {
       const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
       if (seriesIndex === -1) return
@@ -948,8 +1047,8 @@ export default {
   background: #d0d0d0;
 }
 .frame_content{
-  height: 50px;
-  padding: 5px;
+  /* height: 50px; */
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

@@ -59,34 +59,56 @@
                                 <div>#{{ series.seriesNumber }}</div>
                                 <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
-                                    trigger="hover"
+                                    v-model="series.isShowPopper"
+                                    placement="right-start"
+                                    trigger="manual"
                                     popper-class="instance_frame_wrapper"
                                   >
-                                    <div
-                                      v-for="(instance, idx) in series.instanceInfoList"
-                                      :key="instance.Id"
-                                      class="frame_content"
-                                      :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                                      @click="showMultiFrames(index,series, i, instance)"
-                                    >
-                                      <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                      <div>
-                                        <div>{{ instance.InstanceNumber }}</div>
-                                        <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                      </div>
-
+                                    <div style="text-align: right;">
+                                      <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="series.isShowPopper = false" />
                                     </div>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                    <div class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in series.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(index,series, i, instance)"
+                                      >
+                                        <!-- <div>
+                                          <img
+                                            class="image-preview"
+                                            :src="series.previewImageUrl"
+                                            crossorigin="anonymous"
+                                            alt=""
+                                            style="width: 40px;height:40px;"
+                                            fit="fill"
+                                          >
+                                        </div> -->
+                                        <div>
+                                          <div>{{ instance.InstanceNumber }}</div>
+                                          <div>
+                                            {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                          </div>
+                                          <div v-if="showDelete">
+                                            <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsDeleted"
+                                              size="mini"
+                                              @change="changeInstanceDeleteStatus($event, series, instance)"
+                                            />
+                                            <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsReading"
+                                              size="mini"
+                                              @change="changeInstanceReadingStatus($event, series, instance)"
+                                            />
+                                          </div>
+                                        </div>
+
+                                      </div>
+                                    </div>
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(studyList, series)" />
                                   </el-popover>
                                 </div>
 
@@ -143,7 +165,7 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper" v-if="!visitTaskId">
+              <el-tab-pane v-if="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
                     <el-collapse-item v-for="(study,studyIndex) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
@@ -196,8 +218,8 @@
                                 <div v-else>#{{ seriesItem.seriesNumber }}</div>
                                 <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
-                                    trigger="hover"
+                                    placement="right-start"
+                                    trigger="click"
                                     popper-class="instance_frame_wrapper"
                                   >
                                     <div class="frame_list">
@@ -260,13 +282,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
-import { setSeriesStatus } from '@/api/trials'
+import { setSeriesStatus, setInstanceStatus } from '@/api/trials'
 import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 // import * as cornerstoneTools from 'cornerstone-tools'
 var config = {
   maxWebWorkers: 4,
@@ -348,7 +370,7 @@ export default {
         let res = null
         if (this.page === 'upload') {
           res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
-        } else if (this.page === 'download'){
+        } else if (this.page === 'download') {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
         } else {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
@@ -399,7 +421,8 @@ export default {
                 prefetchInstanceCount: 0,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: series.IsExistMutiFrames
+                isExistMutiFrames: series.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             data.SeriesList = seriesList
@@ -595,6 +618,83 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(studyList, series) {
+      for (let i = 0; i < studyList.length; i++) {
+        for (let j = 0; j < studyList[i].SeriesList.length; j++) {
+          if (studyList[i].SeriesList[j].isShowPopper) {
+            studyList[i].SeriesList[j].isShowPopper = false
+          }
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     // 切换关联检查Tab时获取关联检查信息
     async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
@@ -671,7 +771,8 @@ export default {
                 keySeries: item.KeySeries,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: item.IsExistMutiFrames
+                isExistMutiFrames: item.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
@@ -978,9 +1079,21 @@ export default {
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
-  height: 50px;
-  padding: 5px;
+  /* height: 50px; */
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

src/views/none-dicom-show/components/image-viewer.vue

@@ -1,13 +1,19 @@
 /* eslint-disable no-unused-vars */
 <template>
-  <div style="width:100%;height:100%;">
+  <div style="width: 100%; height: 100%">
     <transition name="viewer-fade">
-      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index':5 }">
+      <div
+        v-show="urlList.length > 0"
+        ref="image-viewer__wrapper"
+        tabindex="-1"
+        class="image-viewer__wrapper"
+        :style="{ 'z-index': 5 }"
+      >
         <span class="image-viewer_desc">
           <!-- <span v-if="studyCode">NST00006</span>
           <span v-if="modality">CT</span>
           <span v-if="bodyPart">上/下腹部</span><br> -->
-          {{ `${index+1} / ${urlList.length}` }}
+          {{ `${index + 1} / ${urlList.length}` }}
         </span>
         <!-- 关闭 -->
         <span class="image-viewer__btn image-viewer__close" @click="hide">
@@ -38,37 +44,46 @@
             <i class="el-image-viewer__actions__divider" />
             <i class="el-icon-c-scale-to-original" @click="toggleMode" />
             <i class="el-image-viewer__actions__divider" />
-            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
-            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
+            <i
+              class="el-icon-refresh-left"
+              @click="handleActions('anticlocelise')"
+            />
+            <i
+              class="el-icon-refresh-right"
+              @click="handleActions('clocelise')"
+            />
           </div>
         </div>
         <!-- 图片 -->
         <div id="image-viewer__canvas" class="image-viewer__canvas">
-          <img
-            v-for="(item, i) in urlList"
-            v-show="i === index"
-            :ref="`img${i}`"
-            :key="item.Id"
-            crossorigin="anonymous"
-            :src="item.FileType&&item.FileType.indexOf('zip')>=0?zipImg:`${OSSclientConfig.basePath}${item.Path}`"
-            :style="imgStyle"
-            style="max-width:100%;max-height: 100%;"
-            @load="handleImgLoad"
-            @error="handleImgError"
-            @mousedown="handleMouseDown"
-          >
-
+          <template v-for="(item, i) in urlList">
+            <img
+              v-if="!~item.FileType.indexOf('pdf')"
+              v-show="i === index"
+              :ref="`img${i}`"
+              :key="item.Id"
+              crossorigin="anonymous"
+              :src="
+                item.FileType && item.FileType.indexOf('zip') >= 0
+                  ? zipImg
+                  : `${OSSclientConfig.basePath}${item.Path}`
+              "
+              :style="imgStyle"
+              style="max-width: 100%; max-height: 100%"
+              @load="handleImgLoad"
+              @error="handleImgError"
+              @mousedown="handleMouseDown"
+            />
+          </template>
         </div>
       </div>
     </transition>
-
   </div>
-
 </template>
 
 <script>
 import { on, off } from 'element-ui/src/utils/dom'
-import { rafThrottle, isFirefox } from 'element-ui/src/utils/util';
+import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
 
 const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
 
@@ -77,36 +92,36 @@ export default {
   props: {
     urlList: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     studyCode: {
       type: String,
-      default: ''
+      default: '',
     },
     bodyPart: {
       type: String,
-      default: ''
+      default: '',
     },
     modality: {
       type: String,
-      default: ''
+      default: '',
     },
     onSwitch: {
       type: Function,
-      default: () => {}
+      default: () => {},
     },
     onClose: {
       type: Function,
-      default: () => {}
+      default: () => {},
     },
     initialIndex: {
       type: Number,
-      default: 0
+      default: 0,
+    },
+    zipImg: {
+      required: true,
+      default: '',
     },
-    zipImg:{
-      required:true,
-      default:''
-    }
   },
 
   data() {
@@ -120,7 +135,7 @@ export default {
         deg: 0,
         offsetX: 0,
         offsetY: 0,
-        enableTransition: false
+        enableTransition: false,
       },
     }
   },
@@ -141,25 +156,25 @@ export default {
         transform: `scale(${scale}) rotate(${deg}deg)`,
         transition: enableTransition ? 'transform .3s' : '',
         'margin-left': `${offsetX}px`,
-        'margin-top': `${offsetY}px`
+        'margin-top': `${offsetY}px`,
       }
       return style
-    }
+    },
   },
   watch: {
     initialIndex: {
       immediate: true,
       handler(val) {
         this.index = val
-      }
+      },
     },
     index: {
       immediate: true,
       handler(val) {
         this.reset()
         this.onSwitch(val)
-      }
-    }
+      },
+    },
   },
   mounted() {
     document.getElementById('image-viewer__canvas').onmousewheel = (event) => {
@@ -167,13 +182,13 @@ export default {
         // 缩小
         this.handleActions('zoomOut', {
           zoomRate: 0.015,
-          enableTransition: false
+          enableTransition: false,
         })
       } else {
         // 放大
         this.handleActions('zoomIn', {
           zoomRate: 0.015,
-          enableTransition: false
+          enableTransition: false,
         })
       }
       return false
@@ -186,7 +201,7 @@ export default {
       this.onClose()
     },
     deviceSupportInstall() {
-      this._keyDownHandler = e => {
+      this._keyDownHandler = (e) => {
         e.stopPropagation()
         const keyCode = e.keyCode
         switch (keyCode) {
@@ -216,17 +231,17 @@ export default {
             break
         }
       }
-      this._mouseWheelHandler = rafThrottle(e => {
+      this._mouseWheelHandler = rafThrottle((e) => {
         const delta = e.wheelDelta ? e.wheelDelta : -e.detail
         if (delta > 0) {
           this.handleActions('zoomIn', {
             zoomRate: 0.015,
-            enableTransition: false
+            enableTransition: false,
           })
         } else {
           this.handleActions('zoomOut', {
             zoomRate: 0.015,
-            enableTransition: false
+            enableTransition: false,
           })
         }
       })
@@ -254,12 +269,12 @@ export default {
       const { offsetX, offsetY } = this.transform
       const startX = e.pageX
       const startY = e.pageY
-      this._dragHandler = rafThrottle(ev => {
+      this._dragHandler = rafThrottle((ev) => {
         this.transform.offsetX = offsetX + ev.pageX - startX
         this.transform.offsetY = offsetY + ev.pageY - startY
       })
       on(document, 'mousemove', this._dragHandler)
-      on(document, 'mouseup', ev => {
+      on(document, 'mouseup', (ev) => {
         off(document, 'mousemove', this._dragHandler)
       })
 
@@ -271,7 +286,7 @@ export default {
         deg: 0,
         offsetX: 0,
         offsetY: 0,
-        enableTransition: false
+        enableTransition: false,
       }
     },
     toggleMode() {
@@ -294,18 +309,22 @@ export default {
         zoomRate: 0.2,
         rotateDeg: 90,
         enableTransition: true,
-        ...options
+        ...options,
       }
       const { transform } = this
       switch (action) {
         case 'zoomOut':
           if (transform.scale > 0.2) {
-            transform.scale = parseFloat((transform.scale - zoomRate).toFixed(3))
+            transform.scale = parseFloat(
+              (transform.scale - zoomRate).toFixed(3)
+            )
           }
           break
         case 'zoomIn':
           if (transform.scale < 5) {
-            transform.scale = parseFloat((transform.scale + zoomRate).toFixed(3))
+            transform.scale = parseFloat(
+              (transform.scale + zoomRate).toFixed(3)
+            )
           }
           break
         case 'clocelise':
@@ -316,47 +335,46 @@ export default {
           break
       }
       transform.enableTransition = enableTransition
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-
-.image-viewer__wrapper{
-    position: relative;
-    top:0;
-    right:0;
-    bottom:0;
-    left:0;
-    width: 100%;
-    height: 100%;
+.image-viewer__wrapper {
+  position: relative;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
 }
-.image-viewer__btn{
-    position:absolute;
-    z-index:1;
-    display:flex;
-    align-items:center;
-    justify-content:center;
-    border-radius:50%;
-    opacity:.8;
-    cursor:pointer;
-    box-sizing:border-box;
-    user-select:none
+.image-viewer__btn {
+  position: absolute;
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  opacity: 0.8;
+  cursor: pointer;
+  box-sizing: border-box;
+  user-select: none;
 }
 
-.image-viewer__close{
+.image-viewer__close {
   display: none;
-    top:40px;
-    right:40px;
-    width:40px;
-    height:40px;
-    font-size:40px
+  top: 40px;
+  right: 40px;
+  width: 40px;
+  height: 40px;
+  font-size: 40px;
 }
-.image-viewer_desc{
-  position:absolute;
-  top:40px;
-  left:40px;
-  font-size:15px;
+.image-viewer_desc {
+  position: absolute;
+  top: 40px;
+  left: 40px;
+  font-size: 15px;
   padding: 5px;
   height: 30px;
   width: 70px;
@@ -369,92 +387,92 @@ export default {
   border-radius: 17px;
   // border-radius: 2%;
 }
-.image-viewer__canvas{
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content:center;
-    align-items:center
+.image-viewer__canvas {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-.image-viewer__actions{
-    left:50%;
-    bottom:30px;
-    transform:translateX(-50%);
-    width:282px;
-    height:44px;
-    padding:0 23px;
-    background-color:#606266;
-    border-color:#fff;
-    border-radius:22px
+.image-viewer__actions {
+  left: 50%;
+  bottom: 30px;
+  transform: translateX(-50%);
+  width: 282px;
+  height: 44px;
+  padding: 0 23px;
+  background-color: #606266;
+  border-color: #fff;
+  border-radius: 22px;
 }
-.image-viewer__actions__inner{
-    width:100%;
-    height:100%;
-    text-align:justify;
-    cursor:default;
-    font-size:23px;
-    color:#fff;
-    display:flex;
-    align-items:center;
-    justify-content:space-around
+.image-viewer__actions__inner {
+  width: 100%;
+  height: 100%;
+  text-align: justify;
+  cursor: default;
+  font-size: 23px;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
 }
-.image-viewer__next,.image-viewer__prev{
-    top:50%;
-    width:44px;
-    height:44px;
-    font-size:24px;
-    color:#fff;
-    background-color:#606266;
-    border-color:#fff
+.image-viewer__next,
+.image-viewer__prev {
+  top: 50%;
+  width: 44px;
+  height: 44px;
+  font-size: 24px;
+  color: #fff;
+  background-color: #606266;
+  border-color: #fff;
 }
-.image-viewer__prev{
-    transform:translateY(-50%);
-    left:40px
+.image-viewer__prev {
+  transform: translateY(-50%);
+  left: 40px;
 }
-.image-viewer__next{
-    transform:translateY(-50%);
-    right:40px;
-    text-indent:2px
+.image-viewer__next {
+  transform: translateY(-50%);
+  right: 40px;
+  text-indent: 2px;
 }
-.image-viewer__mask{
-    position:absolute;
-    width:100%;
-    height:100%;
-    top:0;
-    left:0;
-    opacity:.5;
-    // background:#000
-
+.image-viewer__mask {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  opacity: 0.5;
+  // background:#000
 }
-.viewer-fade-enter-active{
-    animation:viewer-fade-in .3s
+.viewer-fade-enter-active {
+  animation: viewer-fade-in 0.3s;
 }
-.viewer-fade-leave-active{
-    animation:viewer-fade-out .3s
+.viewer-fade-leave-active {
+  animation: viewer-fade-out 0.3s;
 }
 
-@keyframes viewer-fade-in{
-    0%{
-        transform:translate3d(0,-20px,0);
-        opacity:0
-    }
-    100%{
-        transform:translate3d(0,0,0);
-        opacity:1
-    }
+@keyframes viewer-fade-in {
+  0% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0;
+  }
+  100% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1;
+  }
 }
 
-@keyframes viewer-fade-out{
-    0%{
-        transform:translate3d(0,0,0);
-        opacity:1
-    }
-    100%{
-        transform:translate3d(0,-20px,0);
-        opacity:0
-    }
+@keyframes viewer-fade-out {
+  0% {
+    transform: translate3d(0, 0, 0);
+    opacity: 1;
+  }
+  100% {
+    transform: translate3d(0, -20px, 0);
+    opacity: 0;
+  }
 }
 </style>

src/views/none-dicom-show/components/preview.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="none-dicom_preview-wrapper">
-
     <div class="image-viewer-wrapper">
       <!-- 预览图像 -->
       <ImageViewer
@@ -15,10 +14,10 @@
         :study-code="previewImage.studyCode"
         :body-part="previewImage.bodyPart"
         :modality="previewImage.modality"
-        :zip-img='zipImg'
+        :zip-img="zipImg"
       />
     </div>
-    <div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
+    <div class="thumbnail-wrapper" style="z-index: 999; background-color: #fff">
       <div class="">
         <div class="img-wrapper">
           <el-button
@@ -33,21 +32,31 @@
               <slot name="empty">暂无数据</slot>
             </div>
             <div v-show="!noData" class="items" :style="itemsStyle">
-              <div
-                v-for="(item, index) in previewImage.imgList"
-                :key="index"
-                class="item-img"
-                :style="imgSize"
-                :class="{
-                  'is-active': index === currentIndex
-                }"
-                @click="selected(index)"
-              >
-                <img :title="item.FileName" crossorigin="anonymous" :src="item.FileType&&item.FileType.indexOf('zip')>=0?zipImg:`${OSSclientConfig.basePath}${item.Path}`">
-                <p v-if="item.FileName" class="item-date">
-                  {{ `${index+1}` }}
-                </p>
-              </div>
+              <template v-for="(item, index) in previewImage.imgList">
+                <div
+                  v-if="!~item.FileType.indexOf('pdf')"
+                  :key="index"
+                  class="item-img"
+                  :style="imgSize"
+                  :class="{
+                    'is-active': index === currentIndex,
+                  }"
+                  @click="selected(index)"
+                >
+                  <img
+                    :title="item.FileName"
+                    crossorigin="anonymous"
+                    :src="
+                      item.FileType && item.FileType.indexOf('zip') >= 0
+                        ? zipImg
+                        : `${OSSclientConfig.basePath}${item.Path}`
+                    "
+                  />
+                  <p v-if="item.FileName" class="item-date">
+                    {{ `${index + 1}` }}
+                  </p>
+                </div>
+              </template>
             </div>
           </div>
           <el-button
@@ -63,12 +72,12 @@
   </div>
 </template>
 <script>
-import ImageViewer from './image-viewer';
-import zipImg from "@/assets/zip.png";
+import ImageViewer from './image-viewer'
+import zipImg from '@/assets/zip.png'
 export default {
   name: 'Preview',
   components: {
-    ImageViewer
+    ImageViewer,
   },
   props: {
     imgSize: {
@@ -76,13 +85,13 @@ export default {
       default: () => {
         return {
           width: '120px',
-          height: '120px'
+          height: '120px',
         }
-      }
+      },
     },
     value: {
       type: Number,
-      default: null
+      default: null,
     },
     previewImage: {
       type: Object,
@@ -94,11 +103,10 @@ export default {
           infinite: true, // 是否可以循环切换
           studyCode: '',
           modality: '',
-          bodyPart: ''
+          bodyPart: '',
         }
-      }
-    }
-
+      },
+    },
   },
   data() {
     return {
@@ -107,14 +115,14 @@ export default {
       translateX: 0,
       pageSize: 0, // 一页展示的图片数
       urlList: [],
-      zipImg
+      zipImg,
     }
   },
   computed: {
     // 偏移度数
     itemsStyle() {
       return {
-        transform: `translateX(${-this.translateX}px)`
+        transform: `translateX(${-this.translateX}px)`,
       }
     },
     // 每一项宽度
@@ -128,7 +136,8 @@ export default {
     disabledNext() {
       // 禁用后一页按钮
       return (
-        this.translateX >= (this.previewImage.imgList.length - this.pageSize) * this.itemWidth
+        this.translateX >=
+        (this.previewImage.imgList.length - this.pageSize) * this.itemWidth
       )
     },
     noData() {
@@ -136,28 +145,27 @@ export default {
     },
     dataLength() {
       return this.previewImage.imgList.length
-    }
-
+    },
   },
   watch: {
     value: {
       immediate: true,
       handler(val) {
         this.currentIndex = val
-      }
+      },
     },
     'previewImage.index': {
       immediate: true,
       handler(val) {
         this.urlList.index = val
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.pageSize = this.wrapperWidth() / this.itemWidth
     this.urlList = this.previewImage
     const scope = this
-    window.onresize = function() {
+    window.onresize = function () {
       scope.pageSize = scope.wrapperWidth() / scope.itemWidth
       scope.selected(scope.currentIndex)
     }
@@ -201,148 +209,147 @@ export default {
         return this.$refs.imagesWrapper.offsetWidth
       }
       return 0
-    }
-
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
-.none-dicom_preview-wrapper{
+.none-dicom_preview-wrapper {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
 
-.image-viewer-wrapper{
-  flex: 1;
-}
-.thumbnail-wrapper{
-  height: 130px;
-}
-.img-content{
-  position: absolute;
-  left: 0;
-  bottom: 10px;
-  width: 100%;
-}
-.img-wrapper {
-  display: flex;
-  position: relative;
-  margin: 0 20px;
-  height: 120px;
-  .to {
-    width: 32px;
-    height: 100%;
-    padding: 0;
+  .image-viewer-wrapper {
+    flex: 1;
   }
-  .images::before {
+  .thumbnail-wrapper {
+    height: 130px;
+  }
+  .img-content {
     position: absolute;
-    z-index: 5;
-    top: 0;
-    height: 100%;
-    width: 84px;
-    content: '';
-    pointer-events: none;
-    background: -webkit-gradient(
-      linear,
-      left top,
-      right top,
-      from(#fff),
-      color-stop(50%, rgba(0, 0, 0, 0))
-    );
-    background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
-    background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
-  }
-  .images::after {
-    position: absolute;
-    z-index: 5;
-    top: 0;
-    height: 100%;
-    right: 0;
-    width: 84px;
-    content: '';
-    pointer-events: none;
-    background: -webkit-gradient(
-      linear,
-      right top,
-      left top,
-      from(#fff),
-      color-stop(50%, rgba(0, 0, 0, 0))
-    );
-    background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
-    background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
-  }
-  .images {
-    position: relative;
-    overflow: hidden;
+    left: 0;
+    bottom: 10px;
     width: 100%;
-    height: 100%;
-    margin: 0 2px;
-    .empty-text {
-      color: rgb(158, 158, 158);
+  }
+  .img-wrapper {
+    display: flex;
+    position: relative;
+    margin: 0 20px;
+    height: 120px;
+    .to {
+      width: 32px;
       height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      padding: 0;
     }
-    .items {
+    .images::before {
       position: absolute;
+      z-index: 5;
       top: 0;
-      left: 0;
-      display: flex;
-      // width: 6000px;
       height: 100%;
-      align-items: center;
-      transition: transform 0.25s ease;
-      .item-img {
-        display: inline-block;
-        box-sizing: border-box;
-        position: relative;
-        margin-right: 8px;
-        border: 2px solid rgba(0, 0, 0, 0);
-        cursor: pointer;
-        .item-date {
-          bottom: 0px;
-          position: absolute;
-          width: 100%;
-          height: 24px;
-          background: rgba(0, 0, 0, 0.2);
-          text-align: center;
-          line-height: 24px;
-          color: white;
-        }
-        img {
-          width: 100%;
-          height: 100%;
-        }
+      width: 84px;
+      content: '';
+      pointer-events: none;
+      background: -webkit-gradient(
+        linear,
+        left top,
+        right top,
+        from(#fff),
+        color-stop(50%, rgba(0, 0, 0, 0))
+      );
+      background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
+      background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
+    }
+    .images::after {
+      position: absolute;
+      z-index: 5;
+      top: 0;
+      height: 100%;
+      right: 0;
+      width: 84px;
+      content: '';
+      pointer-events: none;
+      background: -webkit-gradient(
+        linear,
+        right top,
+        left top,
+        from(#fff),
+        color-stop(50%, rgba(0, 0, 0, 0))
+      );
+      background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
+      background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
+    }
+    .images {
+      position: relative;
+      overflow: hidden;
+      width: 100%;
+      height: 100%;
+      margin: 0 2px;
+      .empty-text {
+        color: rgb(158, 158, 158);
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
-      .item-img:hover::after {
-        // border-color: #409EFF;
-        opacity: 0;
-      }
-      .item-img::after {
+      .items {
         position: absolute;
         top: 0;
         left: 0;
-        width: 100%;
+        display: flex;
+        // width: 6000px;
         height: 100%;
-        content: '';
-        opacity: 0.2;
-        pointer-events: none;
-        -webkit-transition: opacity 0.3s ease;
-        -o-transition: opacity 0.3s ease;
-        transition: opacity 0.3s ease;
-        background-color: #fff;
-      }
-      .is-active {
-        border-color: #409eff;
-      }
-      .is-active:after {
-        opacity: 0;
+        align-items: center;
+        transition: transform 0.25s ease;
+        .item-img {
+          display: inline-block;
+          box-sizing: border-box;
+          position: relative;
+          margin-right: 8px;
+          border: 2px solid rgba(0, 0, 0, 0);
+          cursor: pointer;
+          .item-date {
+            bottom: 0px;
+            position: absolute;
+            width: 100%;
+            height: 24px;
+            background: rgba(0, 0, 0, 0.2);
+            text-align: center;
+            line-height: 24px;
+            color: white;
+          }
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+        .item-img:hover::after {
+          // border-color: #409EFF;
+          opacity: 0;
+        }
+        .item-img::after {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          content: '';
+          opacity: 0.2;
+          pointer-events: none;
+          -webkit-transition: opacity 0.3s ease;
+          -o-transition: opacity 0.3s ease;
+          transition: opacity 0.3s ease;
+          background-color: #fff;
+        }
+        .is-active {
+          border-color: #409eff;
+        }
+        .is-active:after {
+          opacity: 0;
+        }
       }
     }
   }
 }
-}
 </style>

src/views/none-dicom-show/index.vue

@@ -9,6 +9,9 @@
         <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
+            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
+              {{ study.StudyName }}
+            </span>
             <span style="margin: 0 5px">{{ study.Modality }}</span>
             <span>{{ getBodyPart(study.BodyPart) }}</span>
           </div>
@@ -45,7 +48,7 @@
     </el-card>
     <!-- 预览图像 -->
     <el-card class="box-card right">
-      <div style="width: 100%; height: 100%">
+      <div style="width: 100%; height: 100%" v-if="!showPDF">
         <Preview
           v-if="previewImage.imgList.length > 0"
           ref="previewImage"
@@ -55,6 +58,9 @@
           @selectedImg="selectedImg"
         />
       </div>
+      <div style="width: 100%; height: 100%" v-else>
+        <PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
+      </div>
     </el-card>
 
     <!-- <el-card class="box-card" style="width:300px;height:100%;padding: 10px;margin-left:10px;">
@@ -68,11 +74,13 @@ import { getNoneDicomStudyList } from '@/api/trials'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import Preview from './components/preview'
+import PreviewFile from '@/components/PreviewFile'
 // import CheckForm from './components/form'
 export default {
   name: 'Notice',
   components: {
     Preview,
+    PreviewFile,
     // CheckForm
   },
   data() {
@@ -97,6 +105,12 @@ export default {
       sudyId: '',
       loading: false,
       bp: [],
+      OtherInfo: {},
+      showPDF: false,
+      pdfFile: {
+        path: null,
+        type: null,
+      },
     }
   },
   async created() {
@@ -148,6 +162,7 @@ export default {
       )
         .then((res) => {
           this.studyList = res.Result
+          this.OtherInfo = res.OtherInfo
           this.loading = false
           const studyIndex = this.studyList.findIndex((item) => {
             return item.NoneDicomStudyFileList.length > 0
@@ -163,6 +178,15 @@ export default {
     },
     selected(file, studyIndex, fileIndex, isChangeSub = false) {
       this.currentFileId = file.Id
+      if (!!~file.FileType.indexOf('pdf')) {
+        this.pdfFile.path = file.Path || file.FullFilePath
+        this.pdfFile.type = 'pdf'
+        this.showPDF = true
+        return true
+      } else {
+        this.showPDF = false
+      }
+
       this.currentStudyIndex = studyIndex
       this.previewImage.imgList =
         this.studyList[studyIndex].NoneDicomStudyFileList

src/views/system/login-log/detail.vue

@@ -69,6 +69,7 @@ export default {
         'LastName',
         'EMail',
         'Phone',
+        'Status',
         'OrganizationName',
         'PositionName',
         'DepartmentName',
@@ -92,6 +93,9 @@ export default {
             value: obj[key],
             prop: key,
           }
+          if (key === 'Status') {
+            o.value = this.$fd('IsUserEnable', obj[key])
+          }
           curData.push(o)
         }
       })

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

@@ -1780,7 +1780,18 @@ export default {
             if (seriesIdx > -1) {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
               const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+              let filterStr = ''
+              if (n > -1 && series.isExistMutiFrames) {
+                if (series.instanceInfoList[n].NumberOfFrames > 0) {
+                  filterStr = `frame=${frame}&instanceId=${instanceId}`
+                } else {
+                  filterStr = `instanceId=${instanceId}`
+                }
+              } else {
+                filterStr = `instanceId=${instanceId}`
+              }
               var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Assessment.vue

@@ -0,0 +1,106 @@
+<template>
+  <div v-loading="loading" class="ecrf-wrapper">
+     <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        评估说明
+      </h4>
+    <el-form
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <el-form-item
+        label="访视点备注" 
+        prop="note"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-input
+          v-model="questionForm.note"
+          :disabled="readingTaskState >= 2"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+        />
+      </el-form-item>
+      <el-form-item v-if="readingTaskState < 2">
+        <div style="text-align:right">
+          <el-button size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ECRF',
+  data() {
+    return {
+      loading: false,
+      questionForm: {
+        note: ''
+      },
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      visitTaskId: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.visitTaskId = this.$route.query.visitTaskId
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    handleSave() {
+      this.$refs['questions'].validate((valid) => {
+        if (!valid) return
+        
+      })
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .ecrf-wrapper{
+
+    /deep/ .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    /deep/ .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    /deep/ .el-form-item__content{
+      flex: 1;
+    }
+    /deep/ .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  </style>
+

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Questions.vue

@@ -0,0 +1,148 @@
+<template>
+  <div v-loading="loading" class="ecrf-wrapper">
+     <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        影像质量
+      </h4>
+    <el-form
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <el-form-item 
+        label="影像质量"
+        prop="imageQuality"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-radio-group v-model="questionForm.imageQuality">
+          <el-radio
+            v-for="item of $d.ImageQualityEvaluation"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item 
+        v-if="questionForm.imageQuality === 2"
+        label="影像质量问题" 
+        prop="imageQualityIssues"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-select
+          v-model="questionForm.imageQualityIssues"
+          :disabled="readingTaskState >= 2"
+          clearable
+        >
+          <el-option
+            v-for="item of $d.ImageQualityIssues"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="questionForm.imageQualityIssues === 5"
+        label="影像质量备注" 
+        prop="note"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-input
+          v-model="questionForm.note"
+          :disabled="readingTaskState >= 2"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+        />
+      </el-form-item>
+      <el-form-item v-if="readingTaskState < 2">
+        <div style="text-align:right">
+          <el-button size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ECRF',
+  data() {
+    return {
+      loading: false,
+      questionForm: {
+        imageQuality: null,
+        imageQualityIssues: null,
+        note: ''
+      },
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      visitTaskId: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    handleSave() {
+      this.$refs['questions'].validate((valid) => {
+        if (!valid) return
+        
+      })
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .ecrf-wrapper{
+
+    /deep/ .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    /deep/ .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    /deep/ .el-form-item__content{
+      flex: 1;
+    }
+    /deep/ .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  </style>
+

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/TableQuestions.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        核医学评估
+      </h4>
+      <div class="lesion_list">
+        <div class="flex-row" style="margin:3px 0;">
+          <div class="title">盆腔淋巴结</div>
+        </div>
+        <el-table
+          :data="questions"
+          style="width: 100%"
+          row-key="rowIndex"    
+          :expand-row-keys="expands"
+          @expand-change="expandSelect"
+          size="mini"
+        >
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form :ref="props.row.rowIndex" size="small" :model="props.row" label-width="80px" style="padding-right: 10px">
+                <el-form-item label="部位">
+                  <el-input
+                    v-model="props.row.part"
+                    disabled
+                  />
+                </el-form-item>
+                <el-form-item 
+                  label="转移灶"
+                  prop="distraction"
+                  :rules="[
+                    { required: true,
+                      message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+                  ]"
+                >
+                  <el-select v-model="props.row.distraction" style="width:100%;">
+                    <el-option label="阴性" :value="1"></el-option>
+                    <el-option label="阳性" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="SUVmax">
+                  <el-input
+                    v-model="props.row.suvMax"
+                    disabled
+                  />
+                </el-form-item>
+                <el-form-item >
+                  <div style="text-align:right">
+                    <el-button v-if="props.row.annotation" size="mini" @click="clearAnnotation(props.row)">{{ $t('trials:reading:button:removeMark') }}</el-button>
+                    <el-button size="mini" @click="handleSave(props.row)">{{ $t('common:button:save') }}</el-button>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="部位"
+            prop="part">
+          </el-table-column>
+          <el-table-column
+            label="转移灶"
+            prop="distraction">
+            <template slot-scope="scope">
+              {{scope.row.distraction === 1 ? '阴性' : scope.row.distraction === 2 ? '阳性' : ''}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="SUVmax"
+            prop="suvMax">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import FusionEvent from './../FusionEvent'
+export default {
+  name: 'TableQuestionList',
+  components: {
+  },
+  data() {
+    return {
+      height: window.innerHeight - 140,
+      questions: [
+        { 
+          rowIndex: '001',
+          part: '髂内',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '002',
+          part: '髂外',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '003',
+          part: '髂总',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '004',
+          part: '闭孔',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        }
+      ],
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      expands:[]
+    }
+  },
+  mounted() {
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    expandSelect(row, expandedRows) {
+      this.expands = []
+      if (expandedRows.length > 0) {
+        row ? this.expands.push(row.rowIndex) : ''
+      }
+      if (this.expands.length > 0 && row.annotation) {
+        FusionEvent.$emit('imageLocation', { annotation: row.annotation })
+      }
+    },
+    async clearAnnotation(row) {
+       // 是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      let i = this.questions.findIndex(i=>i.rowIndex === row.rowIndex)
+      FusionEvent.$emit('removeAnnotation', { annotation: this.questions[i].annotation })
+      this.questions[i].annotation = null
+      this.questions[i].suvMax = null
+    },
+    async handleSave(row) {
+      let loading = null
+      try {
+        let valid = await this.$refs[row.rowIndex].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
+        setTimeout(() => {
+          // 模拟保存成功
+          loading.close()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+
+          // 可以在这里添加更多的逻辑，比如更新页面上的某些元素
+        }, 2000); 
+      } catch(e) {
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    setActiveCollapse(annotationUID) {
+      for (let i = 0; i < this.questions.length; i++) {
+        let obj = this.questions[i]
+        if (obj.annotation && obj.annotation.data && obj.annotation.data.annotationUID === annotationUID) {
+          this.expands = [this.questions[i].rowIndex]
+          break
+        }
+      }
+    },
+    isCanActiveTool(toolName) {
+      if (this.expands.length > 0) {
+        let isExist = this.isExistMeasureData(this.expands[0])
+        return { isCanActiveTool: isExist, reason: '' }
+      } else {
+        return { isCanActiveTool: false, reason: '' }
+      }
+    },
+    isExistMeasureData(rowIndex) {
+      let i = this.questions.findIndex(i=>i.rowIndex === rowIndex)
+      if (this.questions[i].annotation) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // modifyMeasuredData(measureObj) {
+    //   if (measureObj.questionInfo) {
+    //     this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
+    //     this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
+    //     this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+    //     const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+    //     if (this.$refs[refName]) {
+    //       this.$refs[refName][0].setMeasureData(measureObj.measureData)
+    //     }
+    //   }
+    // },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+      if (measureData.data && measureData.data.data && measureData.data.data.remark ) {
+        // 编辑
+        // 展开并更新标记信息
+        let remark = measureData.data.data.remark
+        let i = this.questions.findIndex(i=>i.part === remark)
+        this.questions[i].suvMax = measureData.suvMax
+        this.questions[i].annotation = measureData
+        this.expands = [this.questions[i].rowIndex]
+      } else {
+        if (this.expands.length > 0) {
+        let i = this.questions.findIndex(i=>i.rowIndex === this.expands[0])
+        if (measureData.data && measureData.data.data) {
+          measureData.data.data.remark = this.questions[i].part
+        }
+        
+        this.questions[i].annotation = measureData
+      }
+      }
+      
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+
+  // .container{
+  //   padding: 10px;
+  // }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+    /deep/ .el-table, .el-table__expanded-cell {
+      background-color: #000;
+      color: #fff;
+      border-color:#444444;
+      .el-form-item__label {
+        color: #fff;
+      }
+      .el-input__inner {
+        background-color: rgba(0, 0, 0, .1);
+        border-color: #606266;
+        color: #fff;
+      }
+      .el-input.is-disabled .el-input__inner {
+        background-color: #303133;
+        border-color: #444444;
+        color: #c0c4cc;
+        cursor: not-allowed;
+      }
+    }
+    
+
+    /deep/ .el-table th, .el-table tr {
+      background-color: #000;
+      color: #fff;
+      border-color:#444444;
+    }
+    /deep/ .el-table__body tr > td{
+      background-color:#000 !important;
+      color: #fff;
+      border-color:#444444;
+    }
+    // /deep/ .el-table__body tr:hover > td{
+    //   background-color:#858282 !important;
+    //   color: #fff;
+    //   border-color:#444444;
+    // }
+    /deep/ .el-table--border th.gutter:last-of-type{
+      border: none;
+    }
+    /deep/ .el-card__header{
+      border: none;
+      padding: 10px;
+    }
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    /deep/ .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    /deep/ .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    /deep/ .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    /deep/ .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Viewport.vue

@@ -0,0 +1,687 @@
+<template>
+  <div
+    class="viewport_container"
+    :class="['item',activeIndex === index?'item_active':'']"
+    @mouseup="sliderMouseup"
+  >
+    <div :id="`viewport${index}`" ref="viewportCanvas" style="height: 100%;width:100%" />
+    <!-- 序列信息 -->
+    <div
+      v-if="seriesInfo.taskBlindName"
+      class="seriesInfo_wrapper"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <h2 v-if="isReadingShowSubjectInfo" class="taskInfo_container">
+        {{ subjectCode }} {{ seriesInfo.taskBlindName }}
+      </h2>
+      <div v-if="index === 1 || index === 2">
+        Series: #{{ seriesInfo.seriesNumber }}
+      </div>
+      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageMaxLength}` }}</div>
+      <div v-if="index === 1 || index === 2">{{ seriesInfo.modality }}</div>
+    </div>
+    <!-- 描述信息 -->
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2)"
+      class="descInfo_wrapper"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div>{{ seriesInfo.description }}</div>
+    </div>
+
+    <!-- 图像信息  -->
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2 || index === 3)"
+      class="imageInfo_wrapper_l"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div v-show="mousePosition.index.length > 0">
+        Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}, {{ mousePosition.index[2] }}
+      </div>
+      <div v-if="(seriesInfo.modality === 'CT' || seriesInfo.modality === 'DR' || seriesInfo.modality === 'CR') && mousePosition.value">
+        HU: {{ mousePosition.value }}
+      </div>
+      <div v-else-if="(seriesInfo.modality === 'PT' && mousePosition.value)">
+        SUVbw(g/ml): {{ digitPlaces === -1 ?mousePosition.value.toFixed(3) :mousePosition.value.toFixed(digitPlaces) }}
+      </div>
+      <div v-else-if="mousePosition.value">
+        Density: {{ mousePosition.value }}
+      </div>
+      <div v-if="index === 1 || index === 2">
+        W*H: {{ imageInfo.size }}
+      </div>
+
+      <!-- <div v-if="index === 1 || index === 2">Zoom: {{ imageInfo.zoom }}</div> -->
+    </div>
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2 || index === 3)"
+      class="imageInfo_wrapper_r"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div v-show="imageInfo.location && index !== 3 ">Location: {{ `${imageInfo.location} mm` }}</div>
+      <div v-show="seriesInfo.sliceThickness && index !== 3">Slice Thickness: {{ `${Number(seriesInfo.sliceThickness).toFixed(2)} mm` }}</div>
+      <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
+    </div>
+    <div v-if="index !== 4" ref="sliderBox" class="slider_box" :style="{background: index === 2?'#ddd':'#333'}" @click.stop="goViewer($event)">
+      <div :style="{top: sliderBoxHeight + '%'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+    </div>
+    <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
+      {{ markers.top }}
+    </div>
+    <div style="position: absolute;top: 50%;right: 15px;color: #f44336;transform: translateY(-50%);">
+      {{ markers.right }}
+    </div>
+
+    <div style="position: absolute;left: 50%;bottom: 30px;color: #f44336;transform: translateX(-50%);">
+      {{ markers.bottom }}
+    </div>
+    <div style="position: absolute;top: 50%;left: 15px;color: #f44336;transform: translateY(-50%);">
+      {{ markers.left }}
+    </div>
+    <div v-if="presetName" class="color_bar">
+      <canvas id="colorBar_Canvas" />
+    </div>
+    <div v-if="index === 4" id="rotateBar" ref="rotateBar" class="rotate_slider_box" @click.stop="clickRotate($event)">
+      <div id="rotateSlider" :style="{left: rotateBarLeft + 'px'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="rotateBarMousedown($event)" />
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getRenderingEngine,
+  metaData,
+  utilities,
+  // getOrCreateCanvas,
+  Enums } from '@cornerstonejs/core'
+
+import {
+  utilities as toolsUtilities,
+  annotation,
+  Enums as toolsEnums
+  // cursors
+} from '@cornerstonejs/tools'
+import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps'
+import { vec3, mat4 } from 'gl-matrix'
+import html2canvas from 'html2canvas'
+const { getColormap } = utilities.colormap
+const {
+  VOLUME_NEW_IMAGE
+  // VOLUME_LOADED,
+  // IMAGE_VOLUME_MODIFIED,
+  // VOLUME_VIEWPORT_NEW_VOLUME
+} = Enums.Events
+
+var renderingEngine
+var viewport
+export default {
+  name: 'Viewport',
+  props: {
+    activeIndex: {
+      type: Number,
+      default: 0
+    },
+    index: {
+      // 1:ct  2:pet  3:fusion  4:mip
+      type: Number,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      default: false
+    },
+    seriesInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    renderingEngineId: {
+      type: String,
+      required: true
+    },
+    viewportId: {
+      type: String,
+      required: true
+    },
+    volume: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    measureDatas: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      subjectCode: '',
+      mousePosition: { index: [], value: null, modalityUnit: '', world: [], ctVal: null, ptVal: null },
+      digitPlaces: -1,
+      imageInfo: {
+        zoom: null,
+        size: null,
+        location: null,
+        sliceThickness: null,
+        wwwc: null
+      },
+      sliderBoxHeight: 0,
+
+      sliderInfo: {
+        oldB: null,
+        oldM: null,
+        isMove: false
+      },
+      rotateAngle: 0,
+      rotateBarLeft: 0,
+      rotateBarInfo: {
+        initX: null,
+        initLeft: null,
+        isMove: false
+      },
+      isFirstRender: true,
+      defaultWindowLevel: {},
+      presetName: '',
+      orientationMarkers: [],
+      originalMarkers: [],
+      markers: { top: '', right: '', bottom: '', left: '' }
+    }
+  },
+  watch: {
+    activeIndex: {
+      handler(v) {
+        console.log('activeIndex ', v)
+      }
+    }
+  },
+  mounted() {
+    const digitPlaces = parseInt(this.$route.query.digitPlaces)
+    this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
+    // console.log(toolsUtilities)
+    this.subjectCode = this.$route.query.subjectCode
+    var element = document.getElementById(`viewport${this.index}`)
+
+    element.addEventListener(VOLUME_NEW_IMAGE, this.handleVolumeNewImage)
+    element.addEventListener(Enums.Events.CAMERA_MODIFIED, this.handleCameraModified)
+    element.addEventListener(Enums.Events.VOI_MODIFIED, this.handleVOIModified)
+    element.addEventListener(toolsEnums.Events.MOUSE_WHEEL, this.handletoolsMouseWheel)
+
+    element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.handleMouseMove)
+
+    element.addEventListener('mouseleave', this.handleMouseLeave)
+
+    document.addEventListener('mouseup', () => {
+      this.sliderMouseup()
+      if (this.index === 4) {
+        this.rotateBarMouseup()
+      }
+    })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+      if (this.index === 4) {
+        this.rotateBarMousemove(e)
+      }
+    })
+  },
+  methods: {
+    handleVolumeNewImage(e) {
+      const { imageIndex } = e.detail
+      if (this.viewportId === e.detail.viewportId && this.index !== 4) {
+        this.seriesInfo.imageIdIndex = imageIndex
+      }
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+
+      if (viewport) {
+        var zoom = viewport.getZoom()
+
+        if (zoom) {
+          this.imageInfo.zoom = zoom.toFixed(4)
+        }
+        var imageId = viewport.getCurrentImageId()
+        if (imageId) {
+          const imagePlaneModule = metaData.get('imagePlaneModule', imageId)
+          this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
+          this.imageInfo.location = imagePlaneModule.sliceLocation
+          this.getOrientationMarker()
+          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageMaxLength - 1)
+        }
+
+        var properties = viewport.getProperties()
+
+        if (properties && properties.voiRange) {
+          var { lower, upper } = properties.voiRange
+          const windowWidth = upper - lower
+          const windowCenter = (upper + lower) / 2
+          this.defaultWindowLevel.windowWidth = windowWidth
+          this.defaultWindowLevel.windowCenter = windowCenter
+          this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+        }
+        if (this.presetName) {
+          this.renderColorBar(this.presetName)
+        }
+      }
+    },
+    getOrientationMarker() {
+      // eslint-disable-next-line no-unused-vars
+      const { viewUp, viewPlaneNormal } = viewport.getCamera()
+
+      const viewRight = vec3.create()
+      vec3.cross(viewRight, viewUp, viewPlaneNormal)
+
+      const columnCosines = [-viewUp[0], -viewUp[1], -viewUp[2]]
+      const rowCosines = viewRight
+      const rowString = toolsUtilities.orientation.getOrientationStringLPS(rowCosines)
+      const columnString = toolsUtilities.orientation.getOrientationStringLPS(columnCosines)
+      const oppositeRowString = toolsUtilities.orientation.invertOrientationStringLPS(rowString)
+      const oppositeColumnString = toolsUtilities.orientation.invertOrientationStringLPS(columnString)
+      this.markers.top = oppositeColumnString
+      this.markers.right = rowString
+      this.markers.bottom = columnString
+      this.markers.left = oppositeRowString
+      this.orientationMarkers = [oppositeColumnString, rowString, columnString, oppositeRowString]
+      if (this.originalMarkers.length === 0) {
+        this.originalMarkers = [...this.orientationMarkers]
+      }
+    },
+    rotateMarkers(type) {
+      var markers = [...this.orientationMarkers]
+      if (type === 4) {
+        // 左转90度
+        this.orientationMarkers = markers.slice(1, 4).concat(markers[0])
+      } else if (type === 5) {
+        // 右转90度
+        this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
+      }
+      this.setMarkers()
+    },
+    resetMarks() {
+      this.orientationMarkers = [...this.originalMarkers]
+      this.setMarkers()
+    },
+    setMarkers() {
+      var markers = [...this.orientationMarkers]
+      for (const key in this.markers) {
+        var v = markers.shift(0)
+        this.markers[key] = v
+      }
+    },
+    handleCameraModified(e) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport) return
+
+      var zoom = viewport.getZoom()
+      if (!zoom) return
+      this.imageInfo.zoom = zoom.toFixed(4)
+      // console.log(e)
+    },
+    handleVOIModified(e) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport) return
+
+      var properties = viewport.getProperties()
+      if (properties && properties.voiRange) {
+        var { lower, upper } = properties.voiRange
+        const { windowWidth, windowCenter } = utilities.windowLevel.toWindowLevel(
+          lower,
+          upper
+        )
+        this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+      }
+    },
+    handleMouseMove(e) {
+      if (this.index !== 4) {
+        const { currentPoints } = e.detail
+        const worldPoint = currentPoints.world
+        const { imageData } = this.volume
+        const index = imageData.worldToIndex(worldPoint)
+
+        index[0] = Math.floor(index[0])
+        index[1] = Math.floor(index[1])
+        index[2] = Math.floor(index[2])
+        this.mousePosition.index = index
+
+        this.mousePosition.value = this.getValue(this.volume, worldPoint)
+      }
+    },
+    getValue(volume, worldPos) {
+      const { dimensions, scalarData, imageData } = volume
+
+      const index = imageData.worldToIndex(worldPos)
+
+      index[0] = Math.floor(index[0])
+      index[1] = Math.floor(index[1])
+      index[2] = Math.floor(index[2])
+
+      if (!utilities.indexWithinDimensions(index, dimensions)) {
+        return
+      }
+
+      const yMultiple = dimensions[0]
+      const zMultiple = dimensions[0] * dimensions[1]
+
+      const value = scalarData[index[2] * zMultiple + index[1] * yMultiple + index[0]]
+
+      return value
+    },
+    handleMouseLeave(e) {
+      this.mousePosition.index = []
+      this.mousePosition.value = null
+    },
+    goViewer(e) {
+      var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
+      this.sliderBoxHeight = height
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * this.sliderBoxHeight / 100)
+      if (this.seriesInfo.imageIdIndex !== index) {
+        this.scroll(index)
+      }
+    },
+
+    sliderMousedown(e) {
+      var boxHeight = this.$refs['sliderBox'].clientHeight
+      this.sliderInfo.oldB = parseInt(e.srcElement.style.top) * boxHeight / 100
+      this.sliderInfo.oldM = e.clientY
+      this.sliderInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    sliderMousemove(e) {
+      if (!this.sliderInfo.isMove) return
+      var PX = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
+      var boxHeight = this.$refs['sliderBox'].clientHeight
+      // 滚动翻页
+      if (PX < 0) return
+      if (PX > boxHeight) return
+      const height = PX * 100 / boxHeight
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * height / 100)
+      index = index > this.seriesInfo.imageMaxLength ? this.seriesInfo.imageMaxLength : index < 0 ? 0 : index
+      this.sliderBoxHeight = height
+      if (this.seriesInfo.imageIdIndex !== index) {
+        this.scroll(index)
+      }
+    },
+    handletoolsMouseWheel(e) {
+      const { viewportId, wheel } = e.detail
+      if (viewportId === 'PET_MIP_CORONAL') {
+        const container = document.getElementById('rotateBar')
+        const slider = document.getElementById('rotateSlider')
+        const containerWidth = container.offsetWidth
+        const sliderWidth = slider.offsetWidth
+        const maxX = containerWidth - sliderWidth
+        const { direction } = wheel
+
+        var x = Math.trunc(30 * ((containerWidth - sliderWidth) / 360))
+        if (direction > 0 && (this.rotateBarLeft + x) > maxX) {
+          this.rotateBarLeft = x - (containerWidth - sliderWidth - this.rotateBarLeft)
+        } else if (direction < 0 && (this.rotateBarLeft < x)) {
+          this.rotateBarLeft = containerWidth - (x - this.rotateBarLeft + sliderWidth)
+        } else {
+          this.rotateBarLeft = x * direction + this.rotateBarLeft
+        }
+      }
+    },
+    rotateBarMousemove(e) {
+      // 滚动旋转
+      if (!this.rotateBarInfo.isMove) return
+      const container = document.getElementById('rotateBar')
+      const slider = document.getElementById('rotateSlider')
+      const containerWidth = container.offsetWidth
+      const sliderWidth = slider.offsetWidth
+      let x = Math.trunc(e.clientX - this.rotateBarInfo.initX + this.rotateBarInfo.initLeft)
+      if (x < 0) x = 0
+      if (x > containerWidth - sliderWidth) x = containerWidth - sliderWidth
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
+    },
+    rotateBarMousedown(e) {
+      console.log('rotateBarMousedown')
+      this.rotateBarInfo.initLeft = e.srcElement.offsetLeft
+      this.rotateBarInfo.initX = e.clientX
+      this.rotateBarInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    rotate(angle) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      const camera = viewport.getCamera()
+      const { viewUp, position, focalPoint } = camera
+      const [cx, cy, cz] = focalPoint
+      const [ax, ay, az] = [0, 0, 1]
+      const newPosition = [0, 0, 0]
+      const newFocalPoint = [0, 0, 0]
+      const newViewUp = [0, 0, 0]
+
+      const transform = mat4.identity(new Float32Array(16))
+      mat4.translate(transform, transform, [cx, cy, cz])
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      mat4.translate(transform, transform, [-cx, -cy, -cz])
+      vec3.transformMat4(newPosition, position, transform)
+      vec3.transformMat4(newFocalPoint, focalPoint, transform)
+
+      mat4.identity(transform)
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      vec3.transformMat4(newViewUp, viewUp, transform)
+
+      viewport.setCamera({
+        position: newPosition,
+        viewUp: newViewUp,
+        focalPoint: newFocalPoint
+      })
+
+      viewport.render()
+    },
+    clickRotate(e) {
+      // console.log('clickRotate')
+      const container = document.getElementById('rotateBar')
+      const containerWidth = container.offsetWidth
+      const slider = document.getElementById('rotateSlider')
+      const sliderWidth = slider.offsetWidth
+      const x = Math.trunc(e.offsetX)
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
+    },
+    scroll(index) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      const actorEntries = viewport.getActors()
+
+      if (!actorEntries) {
+        return
+      }
+      const delta = index - this.seriesInfo.imageIdIndex
+      toolsUtilities.scroll(viewport, {
+        delta,
+        volumeId: actorEntries.uid
+      })
+      renderingEngine.render()
+    },
+    rotateBarMouseup(e) {
+      this.rotateBarInfo.isMove = false
+    },
+    sliderMouseup(e) {
+      this.sliderInfo.isMove = false
+    },
+    setAnnotation(imageId, element) {
+      this.measureDatas.forEach(item => {
+        if (item.OtherMeasureData) {
+          var { metadata, annotationUID } = item.OtherMeasureData
+          var { referencedImageId } = metadata
+          console.log(annotationUID, annotation.state.getAnnotation(annotationUID))
+          if (!annotation.state.getAnnotation(annotationUID) && referencedImageId === imageId) {
+            annotation.state.addAnnotation(item.OtherMeasureData, element)
+          }
+        }
+      })
+    },
+    setPreset(presetName) {
+      this.presetName = presetName
+    },
+    renderColorBar(presetName) {
+      var colorMap = null
+      if (presetName === 'hsv') {
+        colorMap = vtkColorMaps.getPresetByName(presetName)
+      } else {
+        colorMap = getColormap(presetName)
+      }
+      const rgbPoints = colorMap.RGBPoints
+      const canvas = document.getElementById('colorBar_Canvas')
+      const ctx = canvas.getContext('2d')
+      const canvasWidth = 160
+      const canvasHeight = 5
+      const rectWidth = 160
+      const rectHeight = canvasHeight
+      canvas.width = canvasWidth
+      canvas.height = canvasHeight
+      const gradient = ctx.createLinearGradient(0, 0, rectWidth, 0)
+      for (let i = 0; i < rgbPoints.length; i += 4) {
+        let position = 0
+        if (rgbPoints[0] === -1) {
+          position = (rgbPoints[i] + 1) / 2
+        } else {
+          position = rgbPoints[i]
+        }
+        const color = `rgb(${parseInt(rgbPoints[i + 1] * 255)}, ${parseInt(rgbPoints[i + 2] * 255)}, ${parseInt(rgbPoints[i + 3] * 255)})`
+        gradient.addColorStop(position, color)
+      }
+      ctx.fillStyle = gradient
+      ctx.fillRect(0, 0, rectWidth, rectHeight)
+    },
+    setWwWc() {
+      var properties = viewport.getProperties()
+      if (properties && properties.voiRange) {
+        var { lower, upper } = properties.voiRange
+        const windowWidth = upper - lower
+        const windowCenter = (upper + lower) / 2
+        this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+      }
+    },
+    async getScreenshots() {
+      const divForDownloadViewport = document.querySelector(
+        `div[data-viewport-uid="FUSION_AXIAL"]`
+      )
+      // const divForDownloadViewport = document.querySelector(
+      //   '.viewport_container'
+      // )
+
+      var canvas = await html2canvas(divForDownloadViewport)
+      var pictureBaseStr = canvas.toDataURL('image/png', 1)
+      return pictureBaseStr
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.viewport_container{
+  width:100%;
+  height: 100%;
+  .seriesInfo_wrapper {
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    text-align: left;
+    font-size: 12px;
+    z-index: 1;
+    .taskInfo_container{
+      color:#f44336;
+      padding: 5px 0px;
+      margin: 0;
+    }
+  }
+  .descInfo_wrapper{
+    position: absolute;
+    right: 20px;
+    top: 10px;
+    text-align: right;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .imageInfo_wrapper_l{
+    position: absolute;
+    left: 10px;
+    bottom: 5px;
+    text-align: left;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .imageInfo_wrapper_r{
+    position: absolute;
+    right: 40px;
+    bottom: 5px;
+    text-align: right;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .slider_box{
+    position: absolute;
+    right: 1px;
+    height: calc(100% - 120px);
+    transform: translateY(-50%);
+    top: calc(50% - 30px);
+    width: 10px;
+    background: #333;
+    cursor: pointer;
+    .box{
+      z-index:10;
+      background: #9e9e9e;
+      height: 20px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      cursor: move
+    }
+  }
+  .color_bar{
+
+    position: absolute;
+
+    // transform:translateY(-50%);
+    transform: rotate(-90deg);
+    transform-origin: right;
+    left: -150px;
+    top: 30%;
+    // transform-origin: top left;
+    z-index: 1;
+    // background: #f44336;
+  }
+  .rotate_slider_box{
+    position: absolute;
+    width: 380px;
+    height: 10px;
+    bottom: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #333;
+    cursor: pointer;
+    .box{
+      z-index:10;
+      background: #9e9e9e;
+      height: 100%;
+      width: 20px;
+      position: absolute;
+      top: 0;
+      cursor: move
+    }
+  }
+  // .my_slider_box:after{
+  //   content: '';
+  //   position: absolute;
+  //   bottom: -20px;
+  //   left: 0;
+  //   height: 20px;
+  //   width: 100%;
+  //   background: #333;
+  // }
+}
+</style>

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

@@ -496,7 +496,18 @@ export default {
                 var series = studyList[studyIdx].SeriesList[seriesIdx]
                 // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
                 const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-                const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+                let filterStr = ''
+                if (n > -1 && series.isExistMutiFrames) {
+                  if (series.instanceInfoList[n].NumberOfFrames > 0) {
+                    filterStr = `frame=${frame}&instanceId=${instanceId}`
+                  } else {
+                    filterStr = `instanceId=${instanceId}`
+                  }
+                } else {
+                  filterStr = `instanceId=${instanceId}`
+                }
                 var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx

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

@@ -477,7 +477,18 @@ export default {
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
           // 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}`
+          // 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 filterStr = ''
+          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
+            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
+              filterStr = `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}`
+            } else {
+              filterStr = `instanceId=${measureDatas[i].InstanceId}`
+            }
+          } else {
+            filterStr = `instanceId=${measureDatas[i].InstanceId}`
+          }
           const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
@@ -550,7 +561,18 @@ export default {
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
           // 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}`
+          // 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 filterStr = ''
+          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
+            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
+              filterStr = `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}`
+            } else {
+              filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
+            }
+          } else {
+            filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
+          }
           const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx

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

@@ -1736,9 +1736,20 @@ export default {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
               let frame =
                 this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              let filterStr = series.isExistMutiFrames
-                ? `frame=${frame}&instanceId=${instanceId}`
-                : `instanceId=${instanceId}`
+              // let filterStr = series.isExistMutiFrames
+              //   ? `frame=${frame}&instanceId=${instanceId}`
+              //   : `instanceId=${instanceId}`
+              let filterStr = ''
+              let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+              if (n > -1 && series.isExistMutiFrames) {
+                if (series.instanceInfoList[n].NumberOfFrames > 0) {
+                  filterStr = `frame=${frame}&instanceId=${instanceId}`
+                } else {
+                  filterStr = `instanceId=${instanceId}`
+                }
+              } else {
+                filterStr = `instanceId=${instanceId}`
+              }
               var instanceIdx = series.imageIds.findIndex((imageId) =>
                 imageId.includes(filterStr)
               )

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

@@ -635,7 +635,18 @@ export default {
                 //   (imageId) => !!~imageId.indexOf(instanceId)
                 // );
                 let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-                let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                // let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+                let filterStr = ''
+                if (n > -1 && series.isExistMutiFrames) {
+                  if (series.instanceInfoList[n].NumberOfFrames > 0) {
+                    filterStr = `frame=${frame}&instanceId=${instanceId}`
+                  } else {
+                    filterStr = `instanceId=${instanceId}`
+                  }
+                } else {
+                  filterStr = `instanceId=${instanceId}`
+                }
                 var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx;

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

@@ -451,7 +451,18 @@ export default {
           // const instanceList = seriesList[srIdx].instanceList
           // 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 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 filterStr = ''
+          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
+            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
+              filterStr = `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}`
+            } else {
+              filterStr = `instanceId=${measureDatas[i].InstanceId}`
+            }
+          } else {
+            filterStr = `instanceId=${measureDatas[i].InstanceId}`
+          }
           const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
@@ -523,9 +534,20 @@ export default {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
           // const instanceList = seriesList[srIdx].instanceList
-          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId)) 
           const imageIds = seriesList[srIdx].imageIds
-          let 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 filterStr = ''
+          if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
+            if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
+              filterStr = `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}`
+            } else {
+              filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
+            }
+          } else {
+            filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
+          }
+          // let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
           const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx

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

@@ -424,7 +424,11 @@ export default {
         var token = getToken()
         var path = ''
         if (this.readingTool === 0) {
-          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+          if (this.criterionType === 0 && this.trialId === '08dd28b3-6843-fc05-0242-ac1301000000') {
+             path = `/fusion?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&studyId=62b3dfc4-1e04-4180-910d-fe595f398361&ctseriesId=1bd24f53-d419-32e5-92d4-2b04640aaa65&ptseriesId=2b7b128d-8c3f-8357-ad14-e38f3acbbdff&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&TokenKey=${token}&lang=${this.$i18n.locale}`
+          } else {
+            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+          }
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
         }

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -49,6 +49,7 @@
       <el-form-item
         :label="$t('trials:logincCfg:form:subjectNum2')"
         prop="IsSubjectSecondCodeView"
+        v-if="showMore"
       >
         <el-radio-group
           v-model="form.IsSubjectSecondCodeView"
@@ -103,6 +104,7 @@
       <el-form-item
         :label="$t('trials:logincCfg:form:subjectAge')"
         prop="IsHaveSubjectAge"
+        v-if="showMore"
       >
         <el-radio-group
           v-model="form.IsHaveSubjectAge"
@@ -121,6 +123,7 @@
       <el-form-item
         :label="$t('trials:logincCfg:form:subjectGender')"
         prop="IsSubjectSexView"
+        v-if="showMore"
       >
         <el-radio-group
           v-model="form.IsSubjectSexView"
@@ -152,6 +155,7 @@
       <el-form-item
         :label="$t('trials:logincCfg:form:imageCopy')"
         prop="IsImageReplicationAcrossTrial"
+        v-if="showMore"
       >
         <el-radio-group
           v-model="form.IsImageReplicationAcrossTrial"
@@ -203,6 +207,45 @@
           @click="handleSetModality"
         />
       </el-form-item>
+      <!--展示检查名称-->
+      <el-form-item
+        :label="$t('trials:logincCfg:form:IsShowStudyName ')"
+        prop="IsShowStudyName"
+        v-if="showMore"
+      >
+        <el-radio-group
+          v-model="form.IsShowStudyName"
+          :disabled="form.IsTrialBasicLogicConfirmed && !isEdit"
+          @input="IsShowStudyNameChange"
+        >
+          <el-radio
+            :label="item.value"
+            v-for="item in $d.YesOrNo"
+            :key="item.id"
+            >{{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 检查名称 -->
+      <el-form-item
+        :label="$t('trials:logincCfg:form:StudyNameList')"
+        prop="StudyNameTypes"
+        v-if="form.IsShowStudyName && showMore"
+      >
+        <el-input
+          v-model="form.StudyNameTypes"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 8 }"
+          style="width: 80%"
+          disabled
+        />
+        <el-button
+          :disabled="form.IsTrialBasicLogicConfirmed && !isEdit"
+          icon="el-icon-plus"
+          circle
+          @click="handleSetStudyName"
+        />
+      </el-form-item>
       <!-- 影像质疑超限天数 -->
       <el-form-item
         :label="$t('trials:logincCfg:form:exceededDays')"
@@ -215,6 +258,19 @@
           :disabled="form.IsTrialBasicLogicConfirmed && !isEdit"
         />
       </el-form-item>
+      <el-form-item>
+        <div
+          :class="{ showMore: true, isCheck: showMore }"
+          @click.stop="showMore = !showMore"
+        >
+          <i class="el-icon-arrow-down"></i>
+          <span>{{
+            showMore
+              ? $t('trials:logincCfg:button:packUp')
+              : $t('trials:logincCfg:button:more')
+          }}</span>
+        </div>
+      </el-form-item>
       <el-form-item>
         <!-- 保存 -->
         <el-button
@@ -279,7 +335,8 @@
           v-if="
             (form.IsTrialBasicLogicConfirmed === false ||
               (form.IsTrialBasicLogicConfirmed === true && isEdit)) &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+            hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
+            showMore
           "
         >
           {{ $t('common:button:terminology') }}
@@ -748,6 +805,121 @@
       :visible.sync="terminologyVisible"
       :DATA.sync="form.TrialObjectNameList"
     />
+    <el-dialog
+      v-if="studyNameListVisible"
+      :visible.sync="studyNameListVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:logincCfg:form:studyName')"
+      custom-class="base-dialog-wrapper"
+      width="400px"
+    >
+      <div class="base-dialog-body" style="position: relative">
+        <el-button
+          size="small"
+          type="primary"
+          @click="addStudyName_model.visible = true"
+          style="position: absolute; top: 10px; right: 10px; z-index: 9"
+        >
+          {{ $t('common:button:add') }}
+        </el-button>
+        <el-table
+          ref="studyNameTable"
+          v-loading="listLoading"
+          :data="trialStudyNameList"
+          stripe
+          height="400"
+          row-key="Name"
+          @selection-change="handleStudyNameSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            align="left"
+            width="45"
+            :reserve-selection="true"
+          />
+          <el-table-column
+            prop="Name"
+            :label="$t('trials:logincCfg:form:studyName')"
+          >
+            <template slot-scope="scope">
+              <div class="bodyPartName">
+                <span :title="isEN ? scope.row.EnName : scope.row.Name">{{
+                  isEN ? scope.row.EnName : scope.row.Name
+                }}</span>
+                <el-button
+                  circle
+                  icon="el-icon-delete"
+                  :title="$t('trials:logincCfg:form:StudyName:del')"
+                  @click.stop="handleDelStudyName(scope.row)"
+                />
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="studyNameListVisible = false"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="handleConfirmStudyName"
+        >
+          {{ $t('common:button:confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+    <!--新增检查名称-->
+    <base-model v-if="addStudyName_model.visible" :config="addStudyName_model">
+      <template slot="dialog-body">
+        <el-form
+          ref="addStudyNameForm"
+          :inline="true"
+          :model="addStudyNameForm"
+          class="demo-form-inline"
+          :rules="addStudyNamerules"
+        >
+          <el-form-item
+            :label="$t('trials:setting:form:studyName')"
+            prop="Name"
+            label-width="150px"
+          >
+            <el-input
+              v-model.trim="addStudyNameForm.Name"
+              clearable
+              type="textarea"
+              :rows="2"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('trials:setting:form:bodyPart')"
+            style="display: none"
+            prop="bodyPartStr"
+            label-width="150px"
+          >
+            <el-input clearable :maxlength="50"></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button type="primary" @click="addOrUpdateTrialStudyName">
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <el-button @click="addStudyName_model.visible = false">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </template>
+    </base-model>
   </div>
 </template>
 <script>
@@ -772,6 +944,7 @@ export default {
   components: { SignForm, ClinicalDataForm, BaseModel, terminology },
   data() {
     return {
+      showMore: false,
       form: {
         TrialId: '',
         IsNoticeSubjectCodeRule: false,
@@ -785,6 +958,9 @@ export default {
         // ClinicalInformationTransmissionEnum: 1,
         IsImageReplicationAcrossTrial: false,
         BodyPartTypes: '',
+        StudyNameTypes: '',
+        IsShowStudyName: null,
+        StudyNameList: [],
         BodyPartTypeList: [],
         Modalitys: '',
         ModalityList: [],
@@ -855,6 +1031,13 @@ export default {
             trigger: 'blur',
           },
         ],
+        StudyNameTypes: [
+          {
+            required: true,
+            message: this.$t('trials:trialCfg:formRule:bodyPart'),
+            trigger: 'blur',
+          },
+        ],
         // Modalitys: [
         //   { required: true, message: this.$t('trials:trialCfg:formRule:modality'), trigger: 'blur' },
         //   { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }
@@ -894,19 +1077,32 @@ export default {
       listLoading: false,
       modalityListVisible: false,
       bodyPartListVisible: false,
+      studyNameListVisible: false,
       selectedList: [],
       selectedBodyParts: [],
       trialBodyPartList: [],
+      trialStudyNameList: [],
       addBodyPart_model: {
         visible: false,
         title: this.$t('trials:setting:button:add'),
         width: '500px',
         appendToBody: true,
       },
+      addStudyName_model: {
+        visible: false,
+        title: this.$t('trials:setting:button:add'),
+        width: '500px',
+        appendToBody: true,
+      },
       addBodyPartForm: {
         bodyPartStr: null,
         Id: null,
       },
+      addStudyNameForm: {
+        Name: null,
+        EnName: null,
+        IeChoose: false,
+      },
       addBodyPartrules: {
         bodyPartStr: [
           {
@@ -932,6 +1128,31 @@ export default {
           },
         ],
       },
+      addStudyNamerules: {
+        Name: [
+          {
+            required: true,
+            message: this.$t('trials:setting:format:notStudyName'),
+            trigger: ['blur', 'change'],
+          },
+          {
+            validator: (rule, value, callback) => {
+              let flag = this.trialStudyNameList.some(
+                (item) => item.Name === value
+              )
+              if (flag) {
+                callback(
+                  new Error(this.$t('trials:setting:format:hasStudyName'))
+                )
+              } else {
+                callback()
+              }
+            },
+            message: this.$t('trials:setting:format:hasStudyName'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
       errMessage: null,
 
       renderFunc(h, option) {
@@ -947,6 +1168,11 @@ export default {
   // created() {
   //   this.getTrialBodyPartList();
   // },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   methods: {
     openTerminology() {
       this.terminologyVisible = true
@@ -1003,6 +1229,30 @@ export default {
     handleBodyPartSelectionChange(val) {
       this.selectedBodyParts = val
     },
+    IsShowStudyNameChange(val) {
+      // if (!val) {
+      //   if (this.form.StudyNameList && this.form.StudyNameList.length > 0) {
+      //     this.form.StudyNameList.forEach((item) => {
+      //       item.IsChoose = false
+      //     })
+      //   } else {
+      //     this.form.StudyNameList = []
+      //   }
+      //   thiss.form.StudyNameTypes = null
+      // }
+    },
+    handleStudyNameSelectionChange(val) {
+      let data = []
+      if (val) {
+        data = val.map((item) => item.Name)
+      }
+      this.trialStudyNameList.forEach((item) => {
+        item.IsChoose = false
+        if (data.includes(item.Name)) {
+          item.IsChoose = true
+        }
+      })
+    },
     // 获取检查部位
     async getTrialBodyPartList(data) {
       try {
@@ -1073,6 +1323,19 @@ export default {
         }
       }
     },
+    async addOrUpdateTrialStudyName() {
+      let validate = await this.$refs.addStudyNameForm.validate()
+      if (!validate) return
+      this.addStudyNameForm.EnName = this.addStudyNameForm.Name
+      let data = { ...this.addStudyNameForm }
+      this.trialStudyNameList.push(data)
+      this.addStudyNameForm = {
+        EnName: null,
+        Name: null,
+        IsChoose: false,
+      }
+      this.addStudyName_model.visible = false
+    },
     // 编辑检查部位
     handleEditBodyPart(item) {
       this.addBodyPartForm.bodyPartStr = item.Name
@@ -1081,6 +1344,12 @@ export default {
       this.addBodyPart_model.title = this.$t('trials:setting:button:edit')
       this.addBodyPart_model.visible = true
     },
+    handleDelStudyName(item) {
+      let index = this.trialStudyNameList.findIndex(
+        (data) => item.Name === data.Name
+      )
+      this.trialStudyNameList.splice(index, 1)
+    },
     handleSetBodyPart() {
       this.bodyPartListVisible = true
       this.$nextTick(() => {
@@ -1092,6 +1361,19 @@ export default {
         this.toggleBodyPartSelection(a)
       })
     },
+    handleSetStudyName() {
+      this.studyNameListVisible = true
+      this.trialStudyNameList = []
+      this.form.StudyNameList.forEach((item) => {
+        this.trialStudyNameList.push({
+          ...item,
+        })
+      })
+      this.$nextTick(() => {
+        let select = this.trialStudyNameList.filter((item) => item.IsChoose)
+        this.toggleStudyNameSelection(select)
+      })
+    },
     toggleBodyPartSelection(rows) {
       if (rows) {
         rows.forEach((row) => {
@@ -1101,6 +1383,15 @@ export default {
         this.$refs.bodyPartTable.clearSelection()
       }
     },
+    toggleStudyNameSelection(rows) {
+      if (rows) {
+        rows.forEach((row) => {
+          this.$refs.studyNameTable.toggleRowSelection(row)
+        })
+      } else {
+        this.$refs.studyNameTable.clearSelection()
+      }
+    },
     handleConfirmBodyParts() {
       this.form.BodyPartTypeList = Object.assign(
         [],
@@ -1112,6 +1403,14 @@ export default {
       this.form.BodyPartTypes = bodyPartTypes.join(' | ')
       this.bodyPartListVisible = false
     },
+    handleConfirmStudyName() {
+      var studyNameTypes = this.trialStudyNameList.filter((i) => i.IsChoose)
+      this.form.StudyNameTypes = this.isEN
+        ? studyNameTypes.map((item) => item.EnName).join(', ')
+        : studyNameTypes.map((item) => item.Name).join(', ')
+      this.form.StudyNameList = this.trialStudyNameList
+      this.studyNameListVisible = false
+    },
     // 配置信息保存
     handleSave() {
       this.$refs['logicalConfigForm'].validate((valid) => {
@@ -1305,6 +1604,16 @@ export default {
           NewVal: this.form.ModalityListStr,
           OldVal: this.initialForm.ModalityListStr,
         },
+        {
+          Name: this.$t('trials:logincCfg:form:IsShowStudyName '),
+          NewVal: this.$fd('YesOrNo', this.form.IsShowStudyName),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsShowStudyName),
+        },
+        {
+          Name: this.$t('trials:logincCfg:form:StudyNameList'),
+          NewVal: this.form.StudyNameTypes,
+          OldVal: this.initialForm.StudyNameTypes,
+        },
         {
           Name: this.$t('trials:logincCfg:form:exceededDays'),
           NewVal: this.form.ChangeDefalutDays,
@@ -1355,6 +1664,16 @@ export default {
       let BodyPartTypes = res.BodyPartTypes
       this.form.BodyPartTypes = ''
       this.form.BodyPartTypeList = BodyPartTypes.split('|')
+      let StudyNameTypes = this.form.StudyNameList.filter(
+        (item) => item.IsChoose
+      )
+      this.form.StudyNameTypes = ''
+      if (StudyNameTypes && StudyNameTypes.length > 0) {
+        this.form.StudyNameTypes = this.isEN
+          ? StudyNameTypes.map((item) => item.EnName).join(', ')
+          : StudyNameTypes.map((item) => item.Name).join(', ')
+      }
+
       let r = await this.getTrialBodyPartList()
       if (r) {
         var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
@@ -1596,4 +1915,16 @@ export default {
     margin: 0;
   }
 }
+.showMore {
+  cursor: pointer;
+  color: #409eff;
+  i {
+    transition: 0.3s;
+  }
+}
+.showMore.isCheck {
+  i {
+    transform: rotate(180deg);
+  }
+}
 </style>

src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue

@@ -139,6 +139,25 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!--图像格式-->
+      <el-form-item
+        :label="$t('trials:processCfg:form:ImageFormatList')"
+        prop="ImageFormatList"
+        v-if="[0, 2].includes(form.CollectImagesEnum)"
+      >
+        <el-checkbox-group
+          v-model="form.ImageFormatList"
+          :disabled="form.IsTrialProcessConfirmed && !isEdit"
+        >
+          <el-checkbox
+            v-for="item in $d.ImageFormat"
+            :label="item.value"
+            :key="item.id"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
       <!-- 修约小数位数 -->
       <!-- <el-form-item
         :label="$t('trials:processCfg:form:digitPlaces')"
@@ -1179,6 +1198,7 @@ export default {
         ClinicalDataSetNamesStr: '',
         QCProcessEnum: null,
         CollectImagesEnum: null,
+        ImageFormatList: [],
         IsImageConsistencyVerification: null,
         ReadingMode: null,
         // ImagePlatform: null,
@@ -1218,6 +1238,14 @@ export default {
             trigger: ['blur', 'change'],
           },
         ],
+        ImageFormatList: [
+          {
+            type: 'array',
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         QCProcessEnum: [
           {
             required: true,
@@ -1492,6 +1520,11 @@ export default {
             this.initialForm.CollectImagesEnum
           ),
         },
+        {
+          Name: this.$t('trials:processCfg:form:ImageFormatList'), // 图像格式
+          NewVal: this.form.ImageFormatList.join(', '),
+          OldVal: this.initialForm.ImageFormatList.join(', '),
+        },
         // {
         //   Name: this.$t('trials:processCfg:form:criterion'), // 阅片标准
         //   NewVal: criterions.length > 0 ? criterions.join(', ') : '',

src/views/trials/trials-panel/trial-summary/login-log/index.vue

@@ -28,7 +28,7 @@
             style="width: 120px"
           />
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('trials:loginLog:table:incorrectUserName')"
           prop="LoginFaildName"
           v-if="!isMine"
@@ -39,17 +39,31 @@
             clearable
             style="width: 120px"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           :label="$t('trials:loginLog:table:userName')"
           prop="LoginUserName"
           v-if="!isMine"
         >
-          <el-select v-model="searchData.UserId" clearable style="width: 120px">
+          <el-select v-model="searchData.IdentityUserId" clearable style="width: 120px">
             <el-option
               v-for="item of trialUserList"
-              :key="item.UserId"
-              :value="item.UserId"
+              :key="item.IdentityUserId"
+              :value="item.IdentityUserId"
+              :label="item.UserName"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:loginLog:table:optUserName')"
+          prop="TargetIdentityUserId"
+          v-if="!isMine"
+        >
+          <el-select v-model="searchData.TargetIdentityUserId" clearable style="width: 120px">
+            <el-option
+              v-for="item of trialUserList"
+              :key="item.IdentityUserId"
+              :value="item.IdentityUserId"
               :label="item.UserName"
             />
           </el-select>
@@ -60,7 +74,7 @@
           v-if="!isMine"
         >
           <el-select
-            v-model="searchData.LoginUserTypeEnum"
+            v-model="searchData.LoginUserType"
             clearable
             style="width: 120px"
           >
@@ -68,7 +82,7 @@
               v-for="item of $d.UserType"
               v-show="item.value !== 7 && item.value !== 8"
               :key="'UserType' + item.label"
-              :value="item.value"
+              :value="item.label"
               :label="item.label"
             />
           </el-select>
@@ -236,7 +250,7 @@ const searchDataDefault = () => {
     Ip: '',
     LoginFaildName: '',
     LoginUserName: '',
-    LoginUserTypeEnum: null,
+    LoginUserType: null,
     BeginDate: '',
     EndDate: '',
     Asc: false,
@@ -244,6 +258,7 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     UserId: '',
+    TargetIdentityUserId: ''
   }
 }
 export default {

src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue

@@ -14,7 +14,7 @@
         icon="el-icon-delete"
         @click="handleBatchDelete"
       >
-        {{ $t("trials:uploadedDicoms:action:delete") }}
+        {{ $t('trials:uploadedDicoms:action:delete') }}
       </el-button>
       <!-- 预览 -->
       <el-button
@@ -24,7 +24,7 @@
         icon="el-icon-view"
         @click="handlePreviewAllFiles"
       >
-        {{ $t("trials:uploadedDicoms:action:preview") }}
+        {{ $t('trials:uploadedDicoms:action:preview') }}
       </el-button>
     </div>
     <el-table
@@ -34,6 +34,7 @@
       height="300"
       :row-class-name="tableRowClassName"
       @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
     >
       <el-table-column
         v-if="!(data.SubmitState * 1 === 2) || data.IsQCConfirmedReupload"
@@ -46,21 +47,32 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
+      />
+      <!-- 检查名称 -->
+      <el-table-column
+        v-if="relationInfo.IsShowStudyName"
+        prop="StudyName"
+        :label="$t('trials:audit:table:StudyName')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
         prop="BodyPartForEdit"
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       >
@@ -72,6 +84,7 @@
       <el-table-column
         prop="SeriesCount"
         :label="$t('trials:uploadedDicoms:table:seriesCount')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       />
@@ -79,6 +92,7 @@
       <el-table-column
         prop="InstanceCount"
         :label="$t('trials:uploadedDicoms:table:instanceCount')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       />
@@ -86,18 +100,28 @@
       <el-table-column
         prop="StudyTime"
         :label="$t('trials:uploadedDicoms:table:studyDate')"
+        sortable
         min-width="120"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ moment(scope.row.StudyTime).format("YYYY-MM-DD") }}
+          {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:uploadedDicoms:table:UpdateTime')"
+        min-width="120"
+        show-overflow-tooltip
+        sortable
+      />
       <!-- 上传时间 -->
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
+        sortable
+        min-width="120"
         show-overflow-tooltip
       />
       <el-table-column
@@ -223,7 +247,9 @@
                 v-for="bodyPart in trialBodyPartTypes"
                 :key="bodyPart"
                 :label="bodyPart"
-                >{{ $fd("Bodypart", bodyPart,'Code',BodyPart,'Name') }}</el-checkbox
+                >{{
+                  $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
+                }}</el-checkbox
               >
             </el-checkbox-group>
           </el-form-item>
@@ -258,7 +284,7 @@
           type="primary"
           @click="editStudyInfoVisible = false"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           :loading="btnLoading"
@@ -266,7 +292,7 @@
           type="primary"
           @click="handleUpdateStudyInfo"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </div>
     </el-dialog>
@@ -291,18 +317,18 @@ import {
   getSubjectVisitUploadedStudyList,
   deleteStudyList,
   updateModality,
-} from "@/api/trials";
-import moment from "moment";
-import { getToken } from "@/utils/auth";
-import uploadPetClinicalData from "./uploadPetClinicalData.vue";
+} from '@/api/trials'
+import moment from 'moment'
+import { getToken } from '@/utils/auth'
+import uploadPetClinicalData from './uploadPetClinicalData.vue'
 export default {
-  name: "StudyInfo",
+  name: 'StudyInfo',
   components: { uploadPetClinicalData },
   props: {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
   },
@@ -310,12 +336,12 @@ export default {
     return {
       editStudyInfoVisible: false,
       studyForm: {
-        StudyCode: "",
+        StudyCode: '',
         IsDicomData: true,
-        Modalities: "",
+        Modalities: '',
         BodyPartForEdit: [],
         SeriesCount: null,
-        StudyTime: "",
+        StudyTime: '',
       },
       deleteArr: [],
       studyLoading: false,
@@ -331,189 +357,187 @@ export default {
       petVisible: false,
       rowData: {},
 
-      BodyPart:{}
-    };
+      BodyPart: {},
+    }
   },
   async mounted() {
-    this.getStudyInfo();
+    this.getStudyInfo()
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
   },
   methods: {
     // 预览临床数据
     handlePreviewClinicalData(row) {
-      this.rowData = row;
-      this.petVisible = true;
+      this.rowData = row
+      this.petVisible = true
     },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true;
-      this.studyForm = { ...row };
-      var bodyPart = [];
-      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split("|");
-      } else if (this.studyForm.BodyPartForEdit !== "") {
-        bodyPart.push(this.studyForm.BodyPartForEdit);
+      this.editStudyInfoVisible = true
+      this.studyForm = { ...row }
+      var bodyPart = []
+      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split('|')
+      } else if (this.studyForm.BodyPartForEdit !== '') {
+        bodyPart.push(this.studyForm.BodyPartForEdit)
       }
-      this.studyForm.BodyPartForEdit = bodyPart;
+      this.studyForm.BodyPartForEdit = bodyPart
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs["studyForm"].validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
-        this.studyForm.Modality = this.studyForm.Modalities;
+      this.$refs['studyForm'].validate((valid) => {
+        if (!valid) return
+        this.btnLoading = true
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
+        this.studyForm.Modality = this.studyForm.Modalities
         var params = {
           id: this.studyForm.StudyId,
           subjectVisitId: this.data.Id,
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
-        };
+        }
         updateModality(this.data.TrialId, params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getStudyInfo();
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.editStudyInfoVisible = false;
+              this.getStudyInfo()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.editStudyInfoVisible = false
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     getStudyInfo() {
-      this.studyLoading = true;
+      this.studyLoading = true
       getSubjectVisitUploadedStudyList(this.data.Id)
         .then((res) => {
-          this.studyList = res.Result;
-          this.studyLoading = false;
-          this.relationInfo = res.OtherInfo;
-          console.log(this.relationInfo);
+          this.studyList = res.Result
+          this.studyLoading = false
+          this.relationInfo = res.OtherInfo
+          console.log(this.relationInfo)
           this.trialBodyPartTypes = this.relationInfo.BodyPartTypes
-            ? this.relationInfo.BodyPartTypes.split("|")
-            : [];
+            ? this.relationInfo.BodyPartTypes.split('|')
+            : []
           this.trialModalitys = this.relationInfo.Modalitys
-            ? this.relationInfo.Modalitys.split("|")
-            : [];
-          console.log(this.trialBodyPartTypes);
-          console.log(this.trialModalitys);
+            ? this.relationInfo.Modalitys.split('|')
+            : []
+          console.log(this.trialBodyPartTypes)
+          console.log(this.trialModalitys)
         })
         .catch(() => {
-          this.studyLoading = false;
-        });
+          this.studyLoading = false
+        })
     },
     // 批量删除
     handleBatchDelete() {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true;
+          this.studyLoading = true
           deleteStudyList(this.trialId, this.data.Id, this.deleteArr)
             .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo();
-                this.$emit("getList");
+                this.getStudyInfo()
+                this.$emit('getList')
                 this.$message.success(
-                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-                );
+                  this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+                )
               }
             })
             .catch(() => {
-              this.studyLoading = true;
-            });
+              this.studyLoading = true
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var tokenKey = getToken();
+      var tokenKey = getToken()
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isFromCRCUpload=1&TokenKey=${tokenKey}`,
-      });
-      var newWindow = window.open(routeData.href, "_blank");
-      this.$emit("setOpenWindow", newWindow);
+      })
+      var newWindow = window.open(routeData.href, '_blank')
+      this.$emit('setOpenWindow', newWindow)
     },
     // 预览影像
     handleViewStudy(row) {
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showdicom?studyId=${row.StudyId}&isFromCRCUpload=1&TokenKey=${token}&type=Study`,
-      });
-      var newWindow = window.open(routeData.href, "_blank");
-      this.$emit("setOpenWindow", newWindow);
+      })
+      var newWindow = window.open(routeData.href, '_blank')
+      this.$emit('setOpenWindow', newWindow)
     },
     // 删除某个检查
     handleDeleteStudy(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true;
+          this.studyLoading = true
           deleteStudyList(this.trialId, this.data.Id, [row.StudyId])
             .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo();
-                this.$emit("getList");
+                this.getStudyInfo()
+                this.$emit('getList')
                 this.$message.success(
-                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-                );
+                  this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+                )
               }
             })
             .catch(() => {
-              this.studyLoading = true;
-            });
+              this.studyLoading = true
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return "";
-      var separator = ",";
-      if (bodyPart.indexOf("|") > -1) {
-        separator = "|";
-      } else if (bodyPart.indexOf(",") > -1) {
-        separator = ",";
-      } else if (bodyPart.indexOf("，") > -1) {
-        separator = "，";
+      if (!bodyPart) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
       }
-      var arr = bodyPart.split(separator);
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(),'Code',this.BodyPart,'Name')
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
-      return newArr.join(" | ");
+      return newArr.join(' | ')
     },
     // 获取勾选项
     handleSelectionChange(val) {
-      this.deleteArr = [];
+      this.deleteArr = []
       val.forEach((item) => {
-        this.deleteArr.push(item.StudyId);
-      });
+        this.deleteArr.push(item.StudyId)
+      })
     },
     // 设置已删除行勾选状态
     hasDeleted(row) {
       if (row.IsDeleted) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return "delete-row";
+        return 'delete-row'
       } else {
-        return "";
+        return ''
       }
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .study-info {

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -36,6 +36,7 @@
       :row-class-name="tableRowClassName"
       max-height="250"
       @selection-change="handleUploadedSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
     >
       <el-table-column type="selection" width="55" />
       <!-- 检查编号 -->
@@ -44,6 +45,7 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           <el-tooltip
@@ -87,15 +89,24 @@
           {{ scope.row.StudyCode }}
         </template>
       </el-table-column>
+      <!-- 检查名称 -->
+      <el-table-column
+        v-if="relationInfo.IsShowStudyName"
+        prop="StudyName"
+        :label="$t('trials:audit:table:StudyName')"
+        sortable
+      />
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查设备 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
@@ -103,6 +114,7 @@
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPartForEdit) }}
@@ -114,6 +126,7 @@
         :label="$t('trials:uploadedDicoms:table:seriesCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 图像数量 -->
       <el-table-column
@@ -121,6 +134,7 @@
         :label="$t('trials:uploadedDicoms:table:instanceCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查日期 -->
       <el-table-column
@@ -128,6 +142,7 @@
         :label="$t('trials:uploadedDicoms:table:studyDate')"
         min-width="120"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{
@@ -137,12 +152,21 @@
           }}
         </template>
       </el-table-column>
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:uploadedDicoms:table:UpdateTime')"
+        min-width="120"
+        show-overflow-tooltip
+        sortable
+      />
       <!-- 上传时间 -->
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
+        sortable
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -694,6 +718,30 @@
           <el-form-item :label="$t('trials:audit:table:studyId')">
             <el-input v-model="studyForm.StudyCode" disabled />
           </el-form-item>
+          <!-- 检查名称 -->
+          <el-form-item
+            v-if="relationInfo.IsShowStudyName"
+            :label="$t('trials:audit:table:StudyName')"
+            prop="StudyName"
+            :rules="[
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
+          >
+            <el-radio-group v-model="studyForm.StudyName">
+              <template v-for="m in relationInfo.StudyNameList">
+                <el-radio
+                  v-if="m.IsChoose"
+                  :key="m.Name"
+                  :label="isEN ? m.EnName : m.Name"
+                  style="margin-bottom: 15px"
+                />
+              </template>
+            </el-radio-group>
+          </el-form-item>
           <!-- 检查类型 -->
           <el-form-item
             v-if="studyForm.IsDicomData"
@@ -899,6 +947,11 @@ export default {
       isClose: false,
     }
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   watch: {
     btnLoading() {
       store.dispatch('trials/setUnLock', this.btnLoading)
@@ -959,6 +1012,7 @@ export default {
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
+          StudyName: this.studyForm.StudyName,
         }
         updateModality(this.trialId, params)
           .then((res) => {
@@ -1135,8 +1189,12 @@ export default {
                 patientNameElement ? patientNameElement.dataOffset : 0,
                 patientNameElement ? patientNameElement.length : 0
               )
+              // 解析dicom中字符集字段与解析库不一致 2025.03.04
+              let SpecificCharacterSet = data.string('x00080005')
+                ? data.string('x00080005').replace('ISO IR', 'ISO_IR')
+                : ''
               const patientNameStr = convertBytes(
-                data.string('x00080005'),
+                SpecificCharacterSet,
                 patientNameBytes
               )
               scope.uploadQueues.push({
@@ -1244,8 +1302,11 @@ export default {
                   : 0,
                 seriesDescriptionElement ? seriesDescriptionElement.length : 0
               )
+              let SpecificCharacterSet = data.string('x00080005')
+                ? data.string('x00080005').replace('ISO IR', 'ISO_IR')
+                : ''
               const seriesDescriptionStr = convertBytes(
-                data.string('x00080005'),
+                SpecificCharacterSet,
                 seriesDescriptionBytes
               )
               seriesItem = {
@@ -1457,17 +1518,13 @@ export default {
                         ${li.join('')}
                         </ol>
                         </div>`
-            this.$alert(
-              content,
-              this.$t('trials:uploadDicomList:label:prompt'),
-              {
-                confirmButtonText: this.$t(
-                  'trials:uploadDicomList:label:confirm'
-                ),
-                dangerouslyUseHTMLString: true,
-                callback: (action) => {},
-              }
-            )
+            this.$alert(content, '', {
+              confirmButtonText: this.$t(
+                'trials:uploadDicomList:label:confirm'
+              ),
+              dangerouslyUseHTMLString: true,
+              callback: (action) => {},
+            })
             this.btnLoading = false
           }
           var results = []
@@ -1724,7 +1781,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,

src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue

@@ -23,21 +23,35 @@
       </el-button>
     </div>
 
-    <el-table :data="nonDicomStudyList" style="width: 100%">
+    <el-table
+      :data="nonDicomStudyList"
+      style="width: 100%"
+      :default-sort="{ prop: 'CreateTime', order: 'ascending' }"
+    >
       <!-- 检查编号 -->
       <el-table-column
         prop="CodeView"
         :label="$t('trials:uploadNonDicoms:table:studyId')"
+        sortable
+      />
+      <!-- 检查名称 -->
+      <el-table-column
+        v-if="relationInfo.IsShowStudyName"
+        prop="StudyName"
+        :label="$t('trials:uploadNonDicoms:table:StudyName')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modality"
         :label="$t('trials:uploadNonDicoms:table:modality')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
         prop="BodyPart"
         :label="$t('trials:uploadNonDicoms:table:bodyPart')"
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPart) }}
@@ -47,6 +61,7 @@
       <el-table-column
         prop="FileCount"
         :label="$t('trials:uploadNonDicoms:table:files')"
+        sortable
       >
         <template slot-scope="scope">
           <el-popover
@@ -159,6 +174,7 @@
       <el-table-column
         prop="ImageDate"
         :label="$t('trials:uploadNonDicoms:table:studyDate')"
+        sortable
       >
         <template slot-scope="scope">
           {{ moment(scope.row.ImageDate).format('YYYY-MM-DD') }}
@@ -168,6 +184,13 @@
       <el-table-column
         prop="UpdateTime"
         :label="$t('trials:uploadNonDicoms:table:updateTime')"
+        sortable
+      />
+      <!-- 创建时间 -->
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:uploadNonDicoms:table:CreateTime')"
+        sortable
       />
       <el-table-column :label="$t('common:action:action')" min-width="200">
         <template slot-scope="scope">
@@ -235,6 +258,30 @@
           >
             <el-input v-model="form.CodeView" disabled />
           </el-form-item>
+          <!-- 检查名称 -->
+          <el-form-item
+            v-if="relationInfo.IsShowStudyName"
+            :label="$t('trials:uploadNonDicoms:table:StudyName')"
+            prop="StudyName"
+            :rules="[
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
+          >
+            <el-radio-group v-model="form.StudyName">
+              <template v-for="m in relationInfo.StudyNameList">
+                <el-radio
+                  v-if="m.IsChoose"
+                  :key="m.Name"
+                  :label="isEN ? m.EnName : m.Name"
+                  style="line-height: 40px"
+                />
+              </template>
+            </el-radio-group>
+          </el-form-item>
           <!-- 检查类型 -->
           <el-form-item
             :label="$t('trials:uploadNonDicoms:table:modality')"
@@ -343,7 +390,10 @@
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{
-          $t('trials:uploadNonDicoms:label:fileType')
+          $t('trials:uploadNonDicoms:label:fileType').replace(
+            'xxx',
+            relationInfo.ImageFormatList.join('/')
+          )
         }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
@@ -602,6 +652,7 @@ export default {
         BodyParts: [],
         Modality: '',
         ImageDate: '',
+        StudyName: '',
       },
       pickerOption: {
         disabledDate: (time) => {
@@ -627,6 +678,7 @@ export default {
       moment,
       BodyPart: {},
       studyMonitorId: null,
+      relationInfo: {},
     }
   },
   async mounted() {
@@ -666,12 +718,22 @@ export default {
     store.dispatch('trials/setUnLock', false)
     this.OSSclient.close()
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   methods: {
     // 初始化非Dicom列表数据
     getNoneDicomList() {
       this.loading = true
       getNoneDicomStudyList(this.subjectVisitId)
         .then((res) => {
+          this.relationInfo = res.OtherInfo
+          this.faccept = []
+          this.relationInfo.ImageFormatList.forEach((item) => {
+            this.faccept.push(`.${item}`)
+          })
           this.nonDicomStudyList = res.Result.map((v) => {
             if (v.VideoObjectName) {
               v.FileCount += 1
@@ -691,6 +753,7 @@ export default {
       this.form.CodeView = ''
       this.form.BodyPart = ''
       this.form.Modality = ''
+      this.form.StudyName = ''
       this.form.ImageDate = ''
       this.form.BodyParts = []
       this.dialogVisible = true
@@ -698,11 +761,14 @@ export default {
     // 打开比编辑弹框，并初始化数据
     handleEdit(row) {
       this.title = this.$t('trials:uploadNonDicoms:dialogTitle:edit')
-      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row }
+      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+        ...row,
+      }
       this.form.CodeView = CodeView
       this.form.Id = Id
       this.form.BodyPart = BodyPart
       this.form.Modality = Modality
+      this.form.StudyName = StudyName
       this.form.ImageDate = ImageDate
       this.form.BodyParts = this.form.BodyPart.split(', ')
       this.dialogVisible = true
@@ -838,7 +904,6 @@ export default {
     // 扫描待上传文件
     beginScanFiles(e) {
       var files = [...e.target.files]
-      console.log(files)
       var sameFiles = []
       files.forEach((file) => {
         var extendName = file.name
@@ -909,6 +974,13 @@ export default {
       })
     },
     handlePreviewImg(row) {
+      if (!!~row.FileType.indexOf('pdf')) {
+        return this.$preview({
+          path: row.Path || row.fullPath,
+          type: 'pdf',
+          title: row.FileName,
+        })
+      }
       // this.imgUrl = row.FullFilePath
       // this.previewImgVisible = true
       // this.imageLoading = true

src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue

@@ -9,7 +9,7 @@
         icon="el-icon-view"
         @click="handlePreviewAllFiles"
       >
-        {{ $t("trials:audit:action:preview") }}
+        {{ $t('trials:audit:action:preview') }}
       </el-button>
     </div>
     <el-table
@@ -19,6 +19,7 @@
       height="300"
       :row-class-name="tableRowClassName"
       @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
     >
       <!-- 检查编号 -->
       <el-table-column
@@ -26,6 +27,7 @@
         :label="$t('trials:audit:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
       <!--      <el-table-column-->
@@ -46,14 +48,23 @@
       <!--        </template>-->
       <!--      </el-table-column>-->
       <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
+      <!-- 检查名称 -->
+      <el-table-column
+        v-if="relationInfo.IsShowStudyName"
+        prop="StudyName"
+        :label="$t('trials:audit:table:StudyName')"
+        sortable
+      />
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
@@ -61,6 +72,7 @@
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPartForEdit) }}
@@ -72,6 +84,7 @@
         :label="$t('trials:audit:table:seriesCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 图像数量 -->
       <el-table-column
@@ -79,6 +92,7 @@
         :label="$t('trials:audit:table:instanceCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查日期 -->
       <el-table-column
@@ -86,17 +100,27 @@
         :label="$t('trials:audit:table:studyDate')"
         min-width="120"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
-          {{ moment(scope.row.StudyTime).format("YYYY-MM-DD") }}
+          {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:audit:table:studyUpdateTime')"
+        min-width="80"
+        show-overflow-tooltip
+        sortable
+      />
       <!-- 上传时间 -->
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:audit:table:studyUploadTime')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -144,27 +168,24 @@
   </div>
 </template>
 <script>
-import {
-  getSubjectVisitUploadedStudyList,
-  deleteStudyList,
-} from "@/api/trials";
-import { getToken } from "@/utils/auth";
-import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
-import moment from "moment";
+import { getSubjectVisitUploadedStudyList, deleteStudyList } from '@/api/trials'
+import { getToken } from '@/utils/auth'
+import uploadPetClinicalData from '@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue'
+import moment from 'moment'
 export default {
-  name: "StudyInfo",
+  name: 'StudyInfo',
   components: { uploadPetClinicalData },
   props: {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
   },
   data() {
     return {
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       deleteArr: [],
       studyLoading: false,
       studyList: [],
@@ -175,117 +196,117 @@ export default {
       rowData: {},
       relationInfo: {},
       bp: [],
-    };
+    }
   },
   async mounted() {
-    this.getStudyInfo();
-    this.bp = await this.$getBodyPart(this.$route.query.trialId);
+    this.getStudyInfo()
+    this.bp = await this.$getBodyPart(this.$route.query.trialId)
   },
   methods: {
     // 预览临床数据
     handlePreviewClinicalData(row) {
-      this.rowData = row;
-      this.petVisible = true;
+      this.rowData = row
+      this.petVisible = true
     },
     getStudyInfo() {
-      this.studyLoading = true;
+      this.studyLoading = true
       getSubjectVisitUploadedStudyList(this.data.Id)
         .then((res) => {
-          this.studyList = res.Result;
-          this.relationInfo = res.OtherInfo;
-          this.studyLoading = false;
+          this.studyList = res.Result
+          this.relationInfo = res.OtherInfo
+          this.studyLoading = false
         })
         .catch(() => {
-          this.studyLoading = false;
-        });
+          this.studyLoading = false
+        })
     },
     // 批量删除
     handleBatchDelete() {
-      this.$confirm(this.$t("trials:qcCheck:message:delete"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:qcCheck:message:delete'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true;
+          this.studyLoading = true
           deleteStudyList(this.trialId, this.data.Id, this.deleteArr)
             .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo();
-                this.$emit("getList");
+                this.getStudyInfo()
+                this.$emit('getList')
                 this.$message.success(
-                  this.$t("trials:qcCheck:message:deletedSuccessfully")
-                );
+                  this.$t('trials:qcCheck:message:deletedSuccessfully')
+                )
               }
             })
             .catch(() => {
-              this.studyLoading = true;
-            });
+              this.studyLoading = true
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
-      });
-      window.open(routeData.href, "_blank");
+      })
+      window.open(routeData.href, '_blank')
     },
     // 预览影像
     handleViewStudy(row) {
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
-      });
-      window.open(routeData.href, "_blank");
+      })
+      window.open(routeData.href, '_blank')
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return "";
-      var separator = ",";
-      if (bodyPart.indexOf("|") > -1) {
-        separator = "|";
-      } else if (bodyPart.indexOf(",") > -1) {
-        separator = ",";
-      } else if (bodyPart.indexOf("，") > -1) {
-        separator = "，";
+      if (!bodyPart) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
       }
-      var arr = bodyPart.split(separator);
+      var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
         return this.$fd(
-          "Bodypart",
+          'Bodypart',
           i.trim(),
-          "Code",
+          'Code',
           { Bodypart: this.bp },
-          "Name"
-        );
-      });
-      return newArr.join(" | ");
+          'Name'
+        )
+      })
+      return newArr.join(' | ')
     },
     // 获取勾选项
     handleSelectionChange(val) {
-      this.deleteArr = [];
+      this.deleteArr = []
       val.forEach((item) => {
-        this.deleteArr.push(item.StudyId);
-      });
+        this.deleteArr.push(item.StudyId)
+      })
     },
     // 设置已删除行勾选状态
     hasDeleted(row) {
       if (row.IsDeleted) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return "delete-row";
+        return 'delete-row'
       } else {
-        return "";
+        return ''
       }
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .study-info {

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -98,27 +98,55 @@
               :data="studyList"
               :row-class-name="tableRowClassName"
               @selection-change="handleSelectionChangeDicom"
+              :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
             >
               <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
               <el-table-column
                 prop="StudyCode"
                 :label="$t('trials:audit:table:studyId')"
+                sortable
               />
+              <!-- 检查名称 -->
+              <el-table-column
+                prop="StudyName"
+                v-if="relationInfo.IsShowStudyName"
+                :label="$t('trials:audit:table:StudyName')"
+                sortable
+              >
+                <template slot-scope="scope">
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="$t('trials:audit:message:noStudyName')"
+                    placement="bottom"
+                    v-if="!scope.row.StudyName"
+                  >
+                    <i
+                      class="el-icon-warning"
+                      style="color: #f44336; font-size: 16px"
+                    />
+                  </el-tooltip>
+                  <span v-else>{{ scope.row.StudyName }}</span>
+                </template>
+              </el-table-column>
               <!-- 检查类型 -->
               <el-table-column
                 prop="ModalityForEdit"
                 :label="$t('trials:audit:table:modality')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modalities"
                 :label="$t('trials:audit:table:modality1')"
+                sortable
               />
               <!-- 检查部位 -->
               <el-table-column
                 prop="BodyPartForEdit"
                 :label="$t('trials:audit:table:bodyPart')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-tooltip
@@ -133,23 +161,28 @@
                       style="color: #f44336; font-size: 16px"
                     />
                   </el-tooltip>
-                  <span v-else>{{ getBodyPart(scope.row.BodyPartForEdit) }}</span>
+                  <span v-else>{{
+                    getBodyPart(scope.row.BodyPartForEdit)
+                  }}</span>
                 </template>
               </el-table-column>
               <!-- 序列数量 -->
               <el-table-column
                 prop="SeriesCount"
                 :label="$t('trials:audit:table:seriesCount')"
+                sortable
               />
               <!-- 图像数量 -->
               <el-table-column
                 prop="InstanceCount"
                 :label="$t('trials:audit:table:instanceCount')"
+                sortable
               />
               <!-- 检查日期 -->
               <el-table-column
                 prop="StudyTime"
                 :label="$t('trials:audit:table:studyDate')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-tooltip
@@ -180,6 +213,22 @@
                   }}</span>
                 </template>
               </el-table-column>
+              <!-- 更新时间 -->
+              <el-table-column
+                prop="UpdateTime"
+                :label="$t('trials:audit:table:seriesOfUpdateTime')"
+                min-width="120"
+                sortable
+                show-overflow-tooltip
+              />
+              <!-- 上传时间 -->
+              <el-table-column
+                prop="UploadedTime"
+                :label="$t('trials:audit:table:seriesOfUploadedDate')"
+                min-width="120"
+                sortable
+                show-overflow-tooltip
+              />
               <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
                   <!-- 预览 -->
@@ -217,32 +266,41 @@
             </el-table>
             <!-- 序列信息 -->
             <h3>{{ $t('trials:audit:title:series') }}</h3>
-            <el-table :data="seriesList" :row-class-name="tableRowClassName">
+            <el-table
+              :data="seriesList"
+              :row-class-name="tableRowClassName"
+              :default-sort="{ prop: 'CreateTime', order: 'ascending' }"
+            >
               <!-- 序列号 -->
               <el-table-column
                 prop="SeriesNumber"
                 :label="$t('trials:audit:table:seriesId')"
+                sortable
               />
               <!-- 检查编号 -->
               <el-table-column
                 prop="StudyCode"
                 :label="$t('trials:audit:table:seriesOfStudyId')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modality"
                 :label="$t('trials:audit:table:seriesModality')"
+                sortable
                 show-overflow-tooltip
               />
               <!-- 图像数量 -->
               <el-table-column
                 prop="InstanceCount"
                 :label="$t('trials:audit:table:seriesOfInstanceCount')"
+                sortable
               />
               <!-- 检查日期 -->
               <el-table-column
                 prop="SeriesTime"
                 :label="$t('trials:audit:table:seriesOfStudyDate')"
+                sortable
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
@@ -253,16 +311,25 @@
                   }}
                 </template>
               </el-table-column>
+                            <!-- 更新时间 -->
+                            <el-table-column
+                prop="UpdateTime"
+                :label="$t('trials:audit:table:seriesOfUpdateTime')"
+                sortable
+                show-overflow-tooltip
+              />
               <!-- 上传时间 -->
               <el-table-column
                 prop="CreateTime"
                 :label="$t('trials:audit:table:seriesOfUploadedDate')"
+                sortable
                 show-overflow-tooltip
               />
               <!-- 是否阅片 -->
               <el-table-column
                 prop="IsReading"
                 :label="$t('trials:audit:table:isReading')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-switch
@@ -278,6 +345,7 @@
               <el-table-column
                 prop="IsDeleted"
                 :label="$t('trials:audit:table:isDelete')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-switch
@@ -380,22 +448,33 @@
             <el-table
               :data="noneDicomStudyList"
               @selection-change="handleSelectionChangeNonedicom"
+              :default-sort="{ prop: 'CreateTime', order: 'ascending' }"
             >
               <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
               <el-table-column
                 prop="CodeView"
                 :label="$t('trials:audit:table:nonDicomsStudyId')"
+                sortable
+              />
+              <!-- 检查名称 -->
+              <el-table-column
+                prop="StudyName"
+                v-if="relationInfo.IsShowStudyName"
+                :label="$t('trials:audit:table:StudyName')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modality"
                 :label="$t('trials:audit:table:nonDicomsModality')"
+                sortable
               />
               <!-- 检查部位 -->
               <el-table-column
                 prop="BodyPart"
                 :label="$t('trials:audit:table:nonDicomsBodypart')"
+                sortable
               >
                 <template slot-scope="scope">
                   {{ getBodyPart(scope.row.BodyPart) }}
@@ -405,6 +484,7 @@
               <el-table-column
                 prop="FileCount"
                 :label="$t('trials:audit:table:nonDicomsFileCount')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-popover
@@ -484,6 +564,7 @@
               <el-table-column
                 prop="ImageDate"
                 :label="$t('trials:audit:table:nonDicomsStudyDate')"
+                sortable
               >
                 <template slot-scope="scope">
                   <i
@@ -508,6 +589,13 @@
               <el-table-column
                 prop="UpdateTime"
                 :label="$t('trials:audit:table:nonDicomsUpdateTime')"
+                sortable
+              />
+              <!-- 创建时间 -->
+              <el-table-column
+                prop="CreateTime"
+                :label="$t('trials:audit:table:nonDicomsCreateTime')"
+                sortable
               />
               <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
@@ -886,6 +974,30 @@
             <el-form-item :label="$t('trials:audit:table:studyId')">
               <el-input v-model="studyForm.StudyCode" disabled />
             </el-form-item>
+            <!-- 检查名称 -->
+            <el-form-item
+              v-if="relationInfo.IsShowStudyName"
+              :label="$t('trials:audit:table:StudyName')"
+              prop="StudyName"
+              :rules="[
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <el-radio-group v-model="studyForm.StudyName">
+                <template v-for="m in relationInfo.StudyNameList">
+                  <el-radio
+                    v-if="m.IsChoose"
+                    :key="m.Name"
+                    :label="isEN ? m.EnName : m.Name"
+                    style="line-height: 40px"
+                  />
+                </template>
+              </el-radio-group>
+            </el-form-item>
             <!-- 检查类型 -->
             <el-form-item
               v-if="studyForm.IsDicomData"
@@ -1034,6 +1146,30 @@
             <el-form-item :label="$t('trials:audit:table:nonDicomsStudyId')">
               <el-input v-model="noneDicomForm.CodeView" disabled />
             </el-form-item>
+            <!-- 检查名称 -->
+            <el-form-item
+              v-if="relationInfo.IsShowStudyName"
+              :label="$t('trials:audit:table:StudyName')"
+              prop="StudyName"
+              :rules="[
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <el-radio-group v-model="noneDicomForm.StudyName">
+                <template v-for="m in relationInfo.StudyNameList">
+                  <el-radio
+                    v-if="m.IsChoose"
+                    :key="m.Name"
+                    :label="isEN ? m.EnName : m.Name"
+                    style="line-height: 40px"
+                  />
+                </template>
+              </el-radio-group>
+            </el-form-item>
             <!-- 检查类型 -->
             <el-form-item
               :label="$t('trials:audit:table:nonDicomsModality')"
@@ -1343,6 +1479,11 @@ export default {
       default: 1,
     },
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   data() {
     return {
       activeName: this.data.DicomStudyCount > 0 ? 'dicom' : 'none-dicom',
@@ -1392,6 +1533,7 @@ export default {
         BodyParts: [],
         Modality: '',
         ImageDate: '',
+        StudyName: '',
       },
       subjectClinicalData: {},
       moment,
@@ -2091,13 +2233,33 @@ export default {
       }
       if (auditState === 8) {
         var isgo = true
+        var hasStudyName = true,
+          hasStudyNameList = []
         var isgoList = []
         this.studyList.forEach((v) => {
           if (!v.BodyPartForEdit) {
             isgo = false
             isgoList.push(v.StudyCode)
           }
+          if (this.relationInfo.IsShowStudyName && !v.StudyName) {
+            hasStudyName = false
+            hasStudyNameList.push(v.StudyCode)
+          }
         })
+        if (!hasStudyName) {
+          // `请补充检查${isgoList.toString()}的检查名称！`
+          this.$confirm(
+            this.$t('trials:qcQuality:title:noStudyName').replace(
+              'xxx',
+              hasStudyNameList.join('、 ')
+            ),
+            '',
+            {
+              showCancelButton: false,
+            }
+          )
+          return
+        }
         if (!isgo) {
           // `请补充检查${isgoList.toString()}的检查部位！`
           this.$confirm(
@@ -2297,6 +2459,7 @@ export default {
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
+          StudyName: this.studyForm.StudyName,
         }
         updateModality(this.data.TrialId, params)
           .then((res) => {
@@ -2328,7 +2491,10 @@ export default {
 
     // 打开非Dicom信息编辑框
     handleEditNoneDicomInfo(row) {
-      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row }
+      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+        ...row,
+      }
+      this.noneDicomForm.StudyName = StudyName
       this.noneDicomForm.CodeView = CodeView
       this.noneDicomForm.Id = Id
       this.noneDicomForm.BodyPart = BodyPart
@@ -2375,6 +2541,13 @@ export default {
     },
     // 预览文件
     previewFile(row) {
+      if (!!~row.FileType.indexOf('pdf')) {
+        return this.$preview({
+          path: row.Path || row.fullPath,
+          type: 'pdf',
+          title: row.FileName,
+        })
+      }
       // window.open(row.FullFilePath, '_blank')
       // this.imgObj.url = row.FullFilePath
       // this.imgObj.loading = true
@@ -2513,11 +2686,11 @@ export default {
     margin-top: 10px;
     overflow-y: auto;
   }
-  /deep/ .delete-row {
+  ::v-deep .delete-row {
     text-decoration-line: line-through;
     color: #c0c4cc;
   }
-  /deep/ .el-card {
+  ::v-deep .el-card {
     padding: 10px;
   }
 }

static/pdfjs/web/viewer.js

@@ -11758,7 +11758,7 @@ const DEFAULT_L10N_STRINGS = {
   rendering_error: "An error occurred while rendering the page.",
   page_scale_width: "Page Width",
   page_scale_fit: "Page Fit",
-  page_scale_auto: "Automatic Zoom",
+  page_scale_auto: "100%", //Automatic Zoom
   page_scale_actual: "Actual Size",
   page_scale_percent: "{{scale}}%",
   loading: "Loading…",