ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into secondStage

Browse Source 
# Conflicts:
#	src/views/dashboard/Analysis.vue
#	src/views/dashboard/modules/FriendLinkCard.vue
#	src/views/dashboard/modules/QuickEnterCard.vue
#	src/views/dashboard/modules/SearchAndWarningCard.vue
#	src/views/dashboard/modules/ToDoTaskCard.vue
This commit is contained in:
赵霄
2023-11-28 09:54:08 +08:00
parent c9afbd8797 61bc574b89
commit 913feb1c4e
18 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/enterpriseStandardRevision/modules/CommentModal.vue
+1 -1
View File
@@ -151,7 +151,7 @@ export default {
const url = previewPdf(file.id)
this.iframeSrc = url
} else if (fileSuffix === 'docx') {
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
// word文件仍使用KKFile进行预览
const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
this.iframeSrc = url
src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+1 -1
View File
@@ -349,7 +349,7 @@ export default {
})
return
}
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${record.standardFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.standardFile_dictText}`
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.standardFile}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.standardFile_dictText}`
// 图片预览，使用自己添加的组件
if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix)) {
this.imageUrl = getFileAccessHttpUrl(record.standardFile)
src/views/workCenter/standardConsultationProcess/modules/ConsultationModal.vue
+1 -1
View File
@@ -158,7 +158,7 @@ export default {
getFileInfo({ id: fileId }).then(res => {
if (res.success) {
const fileInfo = res.result || {}
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${fileInfo.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${fileInfo.fileName}`
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${fileInfo.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${fileInfo.fileName}`
// 截取文件后缀名
const fileSuffix = (fileInfo.fileName ? fileInfo.fileName.split('.')[fileInfo.fileName.split('.').length - 1] : '').toLowerCase()
switch (fileSuffix) {