diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index 806fb064b..addff65fc 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -11,3 +11,4 @@ window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/ window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas' // 预览文件地址 window._CONFIG['onlinePreviewDomainURL'] = localStorage.getItem('onlinePreviewDomainURL') ? localStorage.getItem('onlinePreviewDomainURL') : '' +window._CONFIG['httpsOnlinePreviewDomainURL'] = localStorage.getItem('httpsOnlinePreviewDomainURL') ? localStorage.getItem('httpsOnlinePreviewDomainURL') : '' diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 52be797eb..a4fc2fbbb 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -33,6 +33,7 @@ router.beforeEach((to, from, next) => { 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('onlinePreviewDomainURL', res.result.onlinePreviewDomainURL) + Vue.ls.set('httpsOnlinePreviewDomainURL', res.result.httpsOnlinePreviewDomainURL) Vue.ls.set('domianPreviewURL', res.result.domianPreviewURL) store.commit('SET_TOKEN', res.result.token) store.commit('SET_INFO', res.result.userInfo) diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 74125ad9d..51f28629b 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -86,6 +86,7 @@ const user = { Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL) Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL) + Vue.ls.set('httpsOnlinePreviewDomainURL', result.httpsOnlinePreviewDomainURL) Vue.ls.set('domianPreviewURL', result.domianPreviewURL) commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) @@ -135,6 +136,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['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview' //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) diff --git a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue index a1b5d4d06..f40f8e6fe 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue @@ -85,8 +85,14 @@ this.loadingRight = true // this.readExcelFromRemoteFileLeft(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) // this.readExcelFromRemoteFileRight(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) - this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) - this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) + let href = location.href.slice(0,5) + if (href.indexOf('s') == '-1'){ + this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) + this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) + }else{ + this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix) + this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix) + } }, readExcelFromRemoteFileLeft: function(url) { var vm = this diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 08715202a..1fa57f8f6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1380,10 +1380,10 @@ }) }, handleDel() { - if (this.selectedRowKeys.length > 0) { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let _this = this let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - let isTrue + let isTrue = false for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { @@ -1411,7 +1411,7 @@ _this.selectedRowKeys = [] _this.getList() } else { - _this.$message.warning(_this.$t('operationFailed')) + _this.$message.warning(res.message) } }) }