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
@@ -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) {