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

.env.development

@@ -5,7 +5,8 @@ NODE_ENV = 'development'
 VUE_APP_BASE_PATH = '/'
 
 VUE_APP_IS_TEST = false
-
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
 # base api
 VUE_APP_BASE_API = 'http://123.56.94.154:7000'
 

.env.prod

@@ -5,6 +5,9 @@ NODE_ENV = 'prod'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.env.uat

@@ -4,6 +4,9 @@ NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+
 # base public path
 VUE_APP_BASE_PATH = '/'
 

src/components/Preview_onlyoffice/index.vue

@@ -3,7 +3,7 @@
     custom-class="base-dialog-wrapper" @close="handleClose">
     <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
       <iframe v-if="visible"
-        :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${path}?type=${type}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+        :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${path}?onlyOffice_url=${onlyOffice_url}&type=${type}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
         width="100%" height="99%" frameborder="0" crossorigin="anonymous" />
     </div>
   </el-dialog>
@@ -20,6 +20,7 @@ export default {
       title: null,
       documentType: null,
       currentUser: zzSessionStorage.getItem('userName'),
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
     };
   },
   methods: {

src/styles/index.scss

@@ -68,6 +68,12 @@ body .el-table th.gutter {
   }
 }
 
+.text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 .el-loading-mask {
   background-color: rgba(255, 255, 255, 0.5);
 }

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

@@ -2,6 +2,11 @@
     <div v-if="config.visible">
         <base-model :config="config">
             <template slot="dialog-body">
+                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
+                    <el-form-item :label="`${$t('dictionary:signature:table:Name')}: `">
+                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
+                    </el-form-item>
+                </el-form>
                 <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})">
                     {{ $t('common:button:add') }}</el-button>
                 <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
@@ -86,6 +91,12 @@ export default {
                 }
             }
         },
+        rowData: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
         SystemDocumentId: {
             type: String,
             default: ''
@@ -147,6 +158,10 @@ export default {
             }
         },
         edit(row) {
+            this.title = this.$t('dictionary:signature:attachmentForm:title:update')
+            if (!row.Id) {
+                this.title = this.$t('dictionary:signature:attachmentForm:title:add')
+            }
             this.rowData = Object.assign({}, row)
             this.visible = true
         },
@@ -226,4 +241,10 @@ export default {
     }
 
 }
-</script>
+</script>
+<style lang="scss" scoped>
+.name {
+    display: block;
+    width: 90%;
+}
+</style>

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

@@ -81,7 +81,12 @@
           sortable="custom" min-width="120px" />
         <el-table-column prop="Name" :label="$t('dictionary:signature:table:Name')" show-overflow-tooltip
           sortable="custom" min-width="120px" />
-
+        <el-table-column prop="AttachmentCount" :label="$t('dictionary:signature:table:AttachmentCount')"
+          show-overflow-tooltip sortable="custom" min-width="150px">
+          <template slot-scope="scope">
+            <el-button type="text" @click.stop="openAttachment(scope.row)">{{ scope.row.AttachmentCount }}</el-button>
+          </template>
+        </el-table-column>
         <el-table-column prop="SignViewMinimumMinutes" :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip sortable="custom" min-width="200px" />
         <el-table-column prop="CurrentStaffTrainDays" :label="$t('dictionary:signature:table:CurrentStaffTrainDays')"
@@ -123,26 +128,25 @@
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
-        <el-table-column prop="AttachmentCount" :label="$t('dictionary:signature:table:AttachmentCount')"
-          show-overflow-tooltip sortable="custom" min-width="150px">
-          <template slot-scope="scope">
-            <el-button type="text" @click.stop="openAttachment(scope.row)">{{ scope.row.AttachmentCount }}</el-button>
-          </template>
-        </el-table-column>
         <el-table-column prop="CreateTime" :label="$t('dictionary:signature:table:CreateTime')" show-overflow-tooltip
           sortable="custom" min-width="180px" />
 
         <el-table-column :label="$t('common:action:action')" min-width="240px" fixed="right">
           <template slot-scope="scope">
-            <el-button circle icon="el-icon-view" @click="handlePreview(scope.row)" :title="$t('common:button:preview')">
+            <el-button circle icon="el-icon-view" @click="handlePreview(scope.row)"
+              :title="$t('common:button:preview')">
             </el-button>
-            <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')" @click="handleEdit(scope.row)">
+            <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
+              @click="handleEdit(scope.row)">
             </el-button>
-            <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position" :title="$t('dictionary:signature:button:publish')" @click="publishSystemDocument([scope.row])">
+            <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
+              :title="$t('dictionary:signature:button:publish')" @click="publishSystemDocument([scope.row])">
             </el-button>
-            <el-button :disabled="scope.row.IsDeleted" circle icon="el-icon-close" :title="$t('common:button:revoke')" @click="handleRepeal([scope.row])">
+            <el-button :disabled="scope.row.IsDeleted" circle icon="el-icon-close" :title="$t('common:button:revoke')"
+              @click="handleRepeal([scope.row])">
             </el-button>
-            <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')" @click="handleDelete(scope.row)">
+            <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')"
+              @click="handleDelete(scope.row)">
             </el-button>
           </template>
         </el-table-column>
@@ -157,7 +161,8 @@
         <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
       </el-dialog>
       <!--附件列表-->
-      <attachmentList v-if="config.visible" :config="config" :SystemDocumentId="SystemDocumentId" @getList="getList" />
+      <attachmentList v-if="config.visible" :config="config" :rowData="rowData" :SystemDocumentId="SystemDocumentId"
+        @getList="getList" />
       <!-- 预览文件 -->
       <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
         :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
@@ -225,7 +230,8 @@ export default {
         title: this.$t('dictionary:signature:attachmentList:title'),
         width: '800px',
       },
-      multipleSelection: []
+      multipleSelection: [],
+      rowData: {}
     }
   },
   mounted() {
@@ -264,6 +270,7 @@ export default {
       }
     },
     openAttachment(row) {
+      this.rowData = row
       this.SystemDocumentId = row.Id
       this.config.visible = true
     },

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -729,7 +729,7 @@ export default {
         this.$router.currentRoute.query.TrialReadingCriterionId
 
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
         }&subjectCode=${this.subjectCode}&subjectId=${
@@ -766,7 +766,7 @@ export default {
         this.$router.currentRoute.query.TrialReadingCriterionId
 
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
         }&subjectCode=${this.subjectCode}&subjectId=${
@@ -801,7 +801,7 @@ export default {
         this.$router.currentRoute.query.TrialReadingCriterionId
 
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
         }&subjectCode=${this.subjectCode}&subjectId=${

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -1406,7 +1406,7 @@ export default {
       )
       var token = getToken()
       var path = ''
-      if (row.ReadingTool === 0) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${row.TrialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${row.TrialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue

@@ -302,7 +302,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue

@@ -358,7 +358,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue

@@ -362,7 +362,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue

@@ -349,7 +349,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue

@@ -355,7 +355,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue

@@ -349,7 +349,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/global-review/index.vue

@@ -471,7 +471,7 @@ export default {
         readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
         var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
         var path = ''
-        if (readingTool === 0) {
+        if (readingTool === 0 || readingTool === 2 ) {
           path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue

@@ -328,7 +328,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId;
 
       var path = "";
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
           this.rowData.SubjectCode
         }&subjectId=${
@@ -355,7 +355,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId;
 
       var path = "";
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
           this.rowData.SubjectCode
         }&subjectId=${this.rowData.SubjectId}&visitTaskId=${

src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue

@@ -320,7 +320,7 @@ export default {
       var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`

src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue

@@ -201,7 +201,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
 
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`

src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue

@@ -178,7 +178,7 @@ export default {
       var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
       var path = ''
 
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`

src/views/trials/trials-panel/reading/mim-medical-audit/index.vue

@@ -787,7 +787,7 @@ export default {
       var trialReadingCriterionId = row.TrialReadingCriterionId
       var path = ''
 
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -550,7 +550,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var path = ''
-      if (readingTool === 0) {
+      if (readingTool === 0 || readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`

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

@@ -1112,7 +1112,7 @@ export default {
     lookReadingResults(row) {
       var token = getToken()
       var path
-      if (row.ReadingTool === 0) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2) {
         path = `/readingDicoms?trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`

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

@@ -521,7 +521,7 @@ export default {
       window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
       var token = getToken()
       var path = ''
-      if (row.ReadingTool === 0) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`

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

@@ -32,7 +32,7 @@ export default {
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var criterionType = this.$router.currentRoute.query.criterionType
       var path = ''
-      if (this.readingTool === 0) {
+      if (this.readingTool === 0 || this.readingTool === 2 ) {
         path = `/readingDicoms?TrialReadingCriterionId=${TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${this.readingTool}&TokenKey=${this.token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${this.readingTool}&TokenKey=${this.token}`

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

@@ -468,7 +468,7 @@ export default {
         )
         var token = getToken()
         var path = ''
-        if (this.readingTool === 0) {
+        if (this.readingTool === 0 || this.readingTool === 2 ) {
           path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
         } else {
           path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`

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

@@ -614,7 +614,7 @@ export default {
       }
       var token = getToken()
       var path
-      if (row.ReadingTool === 0) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`

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

@@ -1113,7 +1113,7 @@ export default {
       }
       var token = getToken()
       var path
-      if (row.ReadingTool === 0) {
+      if (row.ReadingTool === 0 || row.ReadingTool === 2) {
         path = `/readingDicoms?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`

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

@@ -145,14 +145,16 @@ export default {
       arr.map(item => {
         this.$refs.qsList.toggleRowSelection(item, selected)
       })
+      let list = [...selection, ...arr]
       if (selected) {
-        arr.forEach(item => {
+        list.forEach(item => {
           if (!this.selectArr.find(d => d.Id === item.Id)) {
-            this.selectArr.push(arr)
+            this.selectArr.push(item)
           }
         })
       } else {
-        arr.forEach(item => {
+        list = [row, ...arr]
+        list.forEach(item => {
           let index = this.selectArr.indexOf(d => d.Id === item.Id)
           if (!~index) {
             this.selectArr.splice(index, 1)

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -1248,7 +1248,7 @@ export default {
       })
       // 查看关联操作
 
-      this.model_cfg2.title = `${this.$t('trials:auditRecord:title:viewRelationOperations')}--${this.$i18n.locale === 'en' ? this.currentRow.Description : this.currentRow.DescriptionCN}`
+      this.model_cfg2.title = `${n ? this.$t('trials:auditRecord:title:viewRelationOperations2') : this.$t('trials:auditRecord:title:viewRelationOperations')}--${this.$i18n.locale === 'en' ? this.currentRow.Description : this.currentRow.DescriptionCN}`
       this.loading = true
       getInspectionList(searchData).then((res) => {
         this.list2 = res.CurrentPageData

static/onlyOffice/viewer.html

@@ -12,8 +12,8 @@
     </style>
     <title></title>
     <!-- 引入外部JavaScript文件 -->
-    <script type="text/javascript"
+    <!-- <script type="text/javascript"
-        src="https://onlyoffice.test.extimaging.com/web-apps/apps/api/documents/api.js"></script>
+        src="https://onlyoffice.test.extimaging.com/web-apps/apps/api/documents/api.js"></script> -->
 </head>
 
 <body>
@@ -28,22 +28,34 @@
             var arr = item.split('=')
             obj[arr[0]] = window.decodeURIComponent(arr[1])
         })
-        var docEditor = new window.DocsAPI.DocEditor("placeholder", {
+        function loadScript() {
-            type: "embedded",
+            return new Promise((resolve, reject) => {
-            "document": {
+                const script = document.createElement('script')
-                "fileType": obj.type,
+                script.src = `${obj.onlyOffice_url}/web-apps/apps/api/documents/api.js`
-                "key": "Khirz6zTPdfd7" + Date.now(),
+                script.onload = resolve
-                "title": obj.title,
+                script.onerror = reject
-                "url": url,
+                document.head.appendChild(script)
-            },
+            })
-            // editorConfig: {
+        }
-            //     lang:'zh'
+        loadScript().then(() => {
+            console.log('JS 加载完成')
+            var docEditor = new window.DocsAPI.DocEditor("placeholder", {
+                type: "embedded",
+                "document": {
+                    "fileType": obj.type,
+                    "key": "Khirz6zTPdfd7" + Date.now(),
+                    "title": obj.title,
+                    "url": url,
+                },
+                // editorConfig: {
+                //     lang:'zh'
 
-            // },
+                // },
-            "documentType": obj.documentType,
+                "documentType": obj.documentType,
-            "height": "100%",
+                "height": "100%",
 
-        });
+            });
+        })
     </script>
 </body>