1

src/api/reading.js

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

src/components/Dicom/DicomCanvas.vue

@@ -123,7 +123,7 @@ export default {
   components: { DicomTags },
   computed: {
     NSTip() {
-      return `${this.$store.state.trials.uploadSize},NS: ${this.$store.state.trials.uploadTip}`
+      return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
     }
   },
   data() {

src/store/modules/reading.js

@@ -1076,7 +1076,7 @@ const actions = {
       let file = series.instanceInfoList.find(item => item.ImageId === obj.imageId)
       if (file) {
         getNetWorkSpeed()
-        setNetWorkSpeedSizeAll(obj.percentComplete, file.FileSize, obj.imageId)
+        setNetWorkSpeedSizeAll(obj.percentComplete, obj.FileTotal, obj.imageId)
       }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100

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

@@ -861,7 +861,7 @@ export default {
         let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
         if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) {
           getNetWorkSpeed()
-          setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+          setNetWorkSpeedSize(percentComplete,  e.detail.total, imageId)
         }
         if (prefetchInstanceCount >= instanceCount * 100) {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100

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

@@ -704,7 +704,10 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const res = await getAllRelationStudyList(this.subjectVisitId)
+          let params = {
+            IsReading: !!this.isReading
+          }
+          const res = await getAllRelationStudyList(this.subjectVisitId, params)
           loading.close()
           this.relationStudyList = res.Result
           this.relationStudyListByVisitName = []
@@ -749,7 +752,8 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const data = await getSeriesList(`/series/list/${studyId}`)
+          let isReading = !!this.isReading ? `?IsReading=true` : ''
+          const data = await getSeriesList(`/series/list/${studyId}${isReading}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
@@ -917,7 +921,7 @@ export default {
       let file = series.instanceInfoList.find(item => item.ImageId === imageId)
       if (file && this.activeSeriesId === series.seriesId) {
         getNetWorkSpeed()
-        setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+        setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
       }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100

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

@@ -8,7 +8,8 @@
 
               <div v-if="(visitTaskList.length > 0)" style="display: flex;flex-direction: row;">
                 <div v-for="s in visitTaskList" :key="s.VisitTaskId" class="visit-item"
-                  :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">{{
+                  :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">
+                  {{
                     s.TaskBlindName }}</div>
 
               </div>
@@ -510,13 +511,13 @@ export default {
     },
     cornerstoneimageloadprogress(e) {
       const imageId = e.detail.imageId
-      console.log(imageId,'imageId')
       const params = {}
       const searchParams = new URLSearchParams(imageId.split('?')[1])
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
       params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }

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

@@ -663,6 +663,7 @@ export default {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
       params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }

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

@@ -85,7 +85,7 @@
                       </template>
                     </el-select>
                     <span
-                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select' || scope.row.Type === 'radio'">
+                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
                       {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                     </span>
                     <el-select

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

@@ -1326,7 +1326,7 @@ export default {
       let file = series.find(item => item.ImageId === imageId)
       if (file) {
         getNetWorkSpeed()
-        setNetWorkSpeedSizeAll(percentComplete, file.FileSize, imageId)
+        setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId)
       }
       if (percentComplete === 100) {
         workSpeedclose()

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -344,8 +344,9 @@
               <!--复核 -->
               <el-button v-if="scope.row.SecondReviewState === 1 && scope.row.AuditState * 1 === 8"
                 v-hasPermi="['trials:trials-panel:visit:qc-check:reviewTask']"
-                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit-outline"
-                :disabled="scope.row.IsImageBackApplying" @click="reviewTask(scope.row)" />
+                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit"
+                :disabled="(scope.row.CurrentActionUserId && scope.row.CurrentActionUserId !== userId) || scope.row.IsImageBackApplying"
+                @click="reviewTask(scope.row)" />
               <!-- 领取 -->
               <!-- ((scope.row.AuditState*1 === 3 || scope.row.AuditState*1 === 5)) ||(!scope.row.IsTake && (scope.row.AuditState*1 === 4 || scope.row.AuditState*1 === 6)) -->
               <el-button v-hasPermi="['trials:trials-panel:visit:qc-check:receive']"