diff --git a/.env.development b/.env.development
index 1cd11a20..72dca223 100644
--- a/.env.development
+++ b/.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'
diff --git a/.env.prod b/.env.prod
index 2f8d7ea6..9e55b50c 100644
--- a/.env.prod
+++ b/.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
diff --git a/.env.uat b/.env.uat
index b4586518..0d2a97e5 100644
--- a/.env.uat
+++ b/.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 = '/'
diff --git a/src/components/Preview_onlyoffice/index.vue b/src/components/Preview_onlyoffice/index.vue
index ae94ac95..afebb1af 100644
--- a/src/components/Preview_onlyoffice/index.vue
+++ b/src/components/Preview_onlyoffice/index.vue
@@ -3,7 +3,7 @@
custom-class="base-dialog-wrapper" @close="handleClose">
@@ -20,6 +20,7 @@ export default {
title: null,
documentType: null,
currentUser: zzSessionStorage.getItem('userName'),
+ onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
};
},
methods: {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 802cb3cb..d95173e6 100644
--- a/src/styles/index.scss
+++ b/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);
}
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue
index 8aaaaac1..ef5ed7cb 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue
@@ -2,6 +2,11 @@
+
+
+ {{ rowData.Name }}
+
+
{{ $t('common:button:add') }}
{
+ 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 {
}
}
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 7182ef98..c7f9702c 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -81,7 +81,12 @@
sortable="custom" min-width="120px" />
-
+
+
+ {{ scope.row.AttachmentCount }}
+
+
-
-
- {{ scope.row.AttachmentCount }}
-
-
-
+
-
+
-
+
-
+
-
+
@@ -157,7 +161,8 @@
-
+
@@ -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
},
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 67177f1d..035917eb 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/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=${
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 4dafa89a..f82e1462 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue b/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue
index 34ad98b5..916038da 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
index 42c3b6e2..8fd3f16b 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index 3810ff6c..d72d689c 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
index 38de054a..24c3babb 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
index d0312c6f..810b7a55 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
index 38de054a..24c3babb 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index 8a9d127b..473bb5b0 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index faec9331..b524b547 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/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=${
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 38cb03f7..01ee9a75 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/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()}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
index 62dd583c..fc9c4af4 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
+++ b/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()}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
index 5b07d688..b1c0359e 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
+++ b/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()}`
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index d5fb4f39..621824f6 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/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()}`
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 262634e5..68c7d7a9 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
index 17c85efc..87628c1d 100644
--- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index d1dfa6ab..77c36598 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/reading-page/index.vue b/src/views/trials/trials-panel/reading/reading-page/index.vue
index dc46ae43..1e3b2f88 100644
--- a/src/views/trials/trials-panel/reading/reading-page/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 39aa3c8e..a9cbff5b 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
index b2ae4170..dbfd9903 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index ad963419..a9c15716 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/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}`
diff --git a/src/views/trials/trials-panel/setting/qc-question/components/DefaultQS.vue b/src/views/trials/trials-panel/setting/qc-question/components/DefaultQS.vue
index 93343be5..305f7345 100644
--- a/src/views/trials/trials-panel/setting/qc-question/components/DefaultQS.vue
+++ b/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)
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index cdedeb41..85063181 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/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
diff --git a/static/onlyOffice/viewer.html b/static/onlyOffice/viewer.html
index f0d2c0a8..9d470273 100644
--- a/static/onlyOffice/viewer.html
+++ b/static/onlyOffice/viewer.html
@@ -12,8 +12,8 @@
-
+
@@ -28,22 +28,34 @@
var arr = item.split('=')
obj[arr[0]] = window.decodeURIComponent(arr[1])
})
- 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'
+ function loadScript() {
+ return new Promise((resolve, reject) => {
+ const script = document.createElement('script')
+ script.src = `${obj.onlyOffice_url}/web-apps/apps/api/documents/api.js`
+ script.onload = resolve
+ script.onerror = reject
+ document.head.appendChild(script)
+ })
+ }
+ 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,
- "height": "100%",
+ // },
+ "documentType": obj.documentType,
+ "height": "100%",
- });
+ });
+ })