Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/components/Dicom/DicomCanvas.vue

@@ -446,9 +446,7 @@ export default {
         })
       }
       this.stack.currentImageIdIndex = e.detail.newImageIdIndex
-      this.height =
-        (this.stack.currentImageIdIndex * 100) /
-        (this.stack.imageIds.length - 1)
+      this.height = this.getStackHeightPercent()
       // var priority = new Date(new Date().setHours(23, 59, 59, 999)).getTime()
 
       // requestPoolManager.loadAndCacheImagePlus(this.stack.imageIds[this.stack.currentImageIdIndex], this.stack.seriesId, priority)

src/components/TrialsTab/index.vue

@@ -83,6 +83,7 @@ export default {
       // document.cookie = 'TrialId=' + this.$route.query.trialId + ';path=/'
     },
     trialId(v) {
+      if (!this.$route.query.trialId) return
       getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
         var total = res.OtherInfo.NeedSignCount
         var TrialStatusStr = res.OtherInfo.TrialStatusStr
@@ -100,15 +101,17 @@ export default {
     if (~url.indexOf('?')) {
       query = url.split('?')[1]
     }
-    getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
-      var total = res.OtherInfo.NeedSignCount
-      var TrialStatusStr = res.OtherInfo.TrialStatusStr
-      this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
-      this.TrialStatusStr = TrialStatusStr
-      await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
-      await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
-      this.TrialConfig = res.OtherInfo.TrialConfig
-    })
+    if (this.$route.query.trialId) {
+      getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
+        var total = res.OtherInfo.NeedSignCount
+        var TrialStatusStr = res.OtherInfo.TrialStatusStr
+        this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
+        this.TrialStatusStr = TrialStatusStr
+        await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
+        await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
+        this.TrialConfig = res.OtherInfo.TrialConfig
+      })
+    }
     this.selectedTab()
     this.getTrialList()
     var firstGoIn = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children[0]

src/views/trials/trials-panel/trial-summary/data-sync/components/TaskList.vue

@@ -64,16 +64,13 @@
         <el-table-column :label="$t('trials:data-sync:table:filePath')" prop="Path" min-width="90" show-overflow-tooltip/>
         <el-table-column :label="$t('trials:data-sync:table:jobState')" prop="JobState" min-width="90" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.JobState === 1" type="infoinf0">
-              {{ $fd('JobState', scope.row.JobState) }}
-            </el-tag>
-            <el-tag v-else-if="scope.row.JobState === 1" type="warning">
+            <el-tag v-if="scope.row.JobState === 1" type="info">
               {{ $fd('JobState', scope.row.JobState) }}
             </el-tag>
             <el-tag v-else-if="scope.row.JobState === 2" type="success">
               {{ $fd('JobState', scope.row.JobState) }}
             </el-tag>
-            <el-tag v-else-if="scope.row.JobState === 3" type="danger">
+            <el-tag v-else-if="scope.row.JobState === 3" type="danger" :title="scope.row.Msg">
               {{ $fd('JobState', scope.row.JobState) }}
             </el-tag>
             <el-tag v-else>{{ $fd('JobState', scope.row.JobState) }}</el-tag>
@@ -136,7 +133,9 @@ export default {
     },
     rowInfo: {
       type: Object,
-      required: true,
+      default() {
+        return {}
+      }
     },
   },
   data() {
@@ -198,7 +197,7 @@ export default {
       try {
         this.loading = true
         let params = {
-          fileUploadRecordIdList: [row.Id]
+          fileUploadRecordIdList: [row.FileUploadRecordId]
         }
         let res = await batchAddSyncFileTask(params)
         if (res.IsSuccess) {

src/views/trials/trials-panel/trial-summary/data-sync/index.vue

@@ -44,7 +44,7 @@ export default {
       activeTab: 'study',
       tabInfo: {
         activeTab: 'file',
-        currentRow: null
+        currentRow: {}
       },
       fileUploadRecordId: '',
       path: ''
@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     openTaskTable(obj) {
-      this.tabInfo.currentRow = obj || null
+      this.tabInfo.currentRow = obj || {}
       this.fileUploadRecordId = obj.Id
       this.path = obj.Path
       this.tabInfo.activeTab = 'task'