From cbbf3914d2fea8e874164eaf748cab2f770621bd Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 14:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 4 - jero-web/src/permission.js | 1 + jero-web/src/store/modules/user.js | 2 + .../components/problemKnowledgeBaseAdd.vue | 4 +- .../regulationsKanban/components/addModel.vue | 708 ++++++++++-------- 5 files changed, 418 insertions(+), 301 deletions(-) diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index e9785a1fb..74ad7cb93 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -44,10 +44,6 @@ export default { name: 'index', props: { - url: { - type: Object, - default: {} - }, title: { type: String, default: '' diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index a4fc2fbbb..e040aff0b 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -32,6 +32,7 @@ router.beforeEach((to, from, next) => { Vue.ls.set(USER_INFO, res.result.userInfo, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) Vue.ls.set('domianWebSocketURL', res.result.domianWebSocketURL) + Vue.ls.set('domianWebImgURL', res.result.domianWebImgURL) Vue.ls.set('onlinePreviewDomainURL', res.result.onlinePreviewDomainURL) Vue.ls.set('httpsOnlinePreviewDomainURL', res.result.httpsOnlinePreviewDomainURL) Vue.ls.set('domianPreviewURL', res.result.domianPreviewURL) diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 51f28629b..81b44fd6b 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -85,6 +85,7 @@ const user = { Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL) + Vue.ls.set('domianWebImgURL', result.domianWebImgURL) Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL) Vue.ls.set('httpsOnlinePreviewDomainURL', result.httpsOnlinePreviewDomainURL) Vue.ls.set('domianPreviewURL', result.domianPreviewURL) @@ -136,6 +137,7 @@ const user = { window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot' window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot' window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview' + window._CONFIG['domianWebImgURL'] = Vue.ls.get('domianWebImgURL') + '/jero-boot' window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview' //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 425278f73..62a54c369 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -379,7 +379,7 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix) + quill.insertEmbed(length, 'image', window._CONFIG['domianWebImgURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix) quill.setSelection(length + 1) } }) @@ -511,7 +511,7 @@ let index1 = fileName.lastIndexOf('.') let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) - quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix) + quill.insertEmbed(length, 'image', window._CONFIG['domianWebImgURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix) quill.setSelection(length + 1) this.quillUpdateImg = false } else if (status === 'uploading') { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 0392e7492..5e959a562 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -17,18 +17,18 @@ - - - {{element.text}} - - - - - - - + + + {{element.text}} + + + + + + + @@ -60,7 +60,7 @@
{{ $t('export') }}
- + - - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ $t('toBeConfirmed') }} - {{ $t('taskTermination') }} + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} - - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ $t('toBeConfirmed') }} - {{ $t('taskTermination') }} + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} - - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ $t('toBeConfirmed') }} - {{ $t('taskTermination') }} + + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} - - - + + + - - - - - - - - - - - - -
- {{ $t('CommentsCollectionResultsForReference') }} - {{ $t('TechnicalEvaluationResultsForReference') }} + + + + + + + + + + + + +
+ {{ + $t('CommentsCollectionResultsForReference') }} + + {{ + $t('TechnicalEvaluationResultsForReference') }} +
@@ -125,282 +155,370 @@ \ No newline at end of file