Merge branch 'main' into secondStage

# 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
18 changed files with 18 additions and 18 deletions
+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)