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/components/FileEcho.vue
+1 -1
View File
@@ -96,7 +96,7 @@ export default {
})
return
}
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}`
// 图片预览，使用自己添加的组件
if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
this.imageUrl = getFileAccessHttpUrl(file.id)
src/components/ProcessDetailList.vue
+1 -1
View File
@@ -286,7 +286,7 @@ export default {
})
return
}
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}`
// 图片预览，使用自己添加的组件
if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix.toLowerCase())) {
this.imageUrl = getFileAccessHttpUrl(file.id)
src/components/UploadFile.vue
+1 -1
View File
@@ -308,7 +308,7 @@ export default {
})
return
}
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
console.log(fileSuffix)
// 图片预览，使用自己添加的组件
if (FILE_TYPE_IMGS.includes(fileSuffix)) {
src/components/jero/JUpload.vue
+1 -1
View File
@@ -440,7 +440,7 @@ export default {
})
return
}
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
console.log(fileSuffix)
// 图片预览，使用自己添加的组件
if (FILE_TYPE_IMGS.includes(fileSuffix)) {