Commit 9d5b290e by 焦子成

1

parent e43635dc
File added
......@@ -430,22 +430,6 @@ let columnMapping = ref({
// 状态筛选
let statusFilter = ref('')
// 组件挂载时初始化
onMounted(() => {
// 先初始化下载store
downloadStore.initialize()
const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
userName.value = userInfo.username
customSubFolder.value = userInfo.settings?.fileNamePrefix || ''
// 从下载store中同步文件名前缀
// customSubFolder.value = downloadStore.customSubFolder || ''
detectBrowserDownloadPath()
loadUpTableData()
loadDetailTableData()
})
// 计算是否可以解析
const canParse = computed(() => {
......@@ -462,7 +446,6 @@ const paginatedDownloads = computed(() => {
// return filteredDownloads.value.slice(start, end)
return filteredDownloads.value.slice(0)
})
// 计算筛选后的下载列表
const filteredDownloads = computed(() => {
return downloadStore.downloads.filter(item => {
......@@ -556,11 +539,11 @@ const deleteExcelFile = async (fileId, uploadName) => {
await downloadStore.deleteExcelFile(excelFile.id)
uploadBatchDelete(fileId)
} catch (error) {
console.error('删除Excel文件失败:', error)
// console.error('删除Excel文件失败:', error)
ElMessage.error('删除Excel文件失败: ' + (error.message || '未知错误'))
}
} else {
ElMessage.error('将删除后端数据, 本地缓存未找到当前数据,无法清除本地缓存数据')
// ElMessage.error('将删除后端数据, 本地缓存未找到当前数据,无法清除本地缓存数据')
uploadBatchDelete(fileId)
}
}
......@@ -828,6 +811,7 @@ function loadDetailTableData() {
fileStatus: statusMap1[statusFilter.value]
}).then(res => {
if (res.code === 200) {
downloadStore.clearAll()
var list = []
for (const element of res.data.rows) {
list.push({
......@@ -910,7 +894,7 @@ function clearAll() {
}).then(res => {
if (res.code === 200) {
ElMessage.success(res.message)
deQuery.value.current = 1
// deQuery.value.current = 1
// loadUploadDetailList()
loadDetailTableData()
} else {
......@@ -1530,6 +1514,22 @@ const handleUserCommand = (command) => {
handleLogout()
}
}
// 组件挂载时初始化
onMounted(() => {
// 先初始化下载store
downloadStore.initialize()
const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
userName.value = userInfo.username
customSubFolder.value = userInfo.settings?.fileNamePrefix || ''
// 从下载store中同步文件名前缀
// customSubFolder.value = downloadStore.customSubFolder || ''
detectBrowserDownloadPath()
loadUpTableData()
loadDetailTableData()
})
</script>
<style scoped>
......
......@@ -122,12 +122,14 @@ import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Check, Close, Download } from '@element-plus/icons-vue'
import { useAuthStore } from '../stores/auth'
import { useDownloadStore } from '../stores/download'
import http from '@/utils/request.js';
import config from '@/api/api.js';
import { lo } from 'element-plus/es/locales.mjs'
const router = useRouter()
const authStore = useAuthStore()
const downloadStore = useDownloadStore()
// 表单引用
const loginFormRef = ref()
......@@ -284,26 +286,29 @@ function loadUserInfo() {
fileNamePrefix: res.data.filePrefix,
}
}
console.log('登录用户信息:', userObj)
console.log('登录用户信息1:', userObj.settings)
sessionStorage.setItem('userInfo', JSON.stringify(userObj))
// authStore.saveUserInfo(userObj)
// authStore.users.value.push(user)
// authStore.saveUsersToStorage()
// authStore.setCurrentUser(user)
// sessionStorage.setItem("userName", loginForm.userName)
setTimeout(() => {
router.push('/downloader')
}, 1000);
delLocalData()
} else {
errorMessage.value = res.message
ElMessage.error(res.message)
}
})
}
// 清除本地数据
async function delLocalData(){
const excelFiles = JSON.parse(localStorage.getItem('vue-downloader-excel-files') || '[]')
if (excelFiles) {
for (const element of excelFiles) {
await downloadStore.deleteExcelFile(element.id)
}
}
localStorage.removeItem('vue-downloader-excel-files')
localStorage.removeItem('vue-downloader-settings')
localStorage.removeItem('vue_downloader_downloads')
setTimeout(() => {
router.push('/downloader')
}, 1000);
}
const handleLogin1 = async () => {
try {
console.log('开始登录处理...')
......@@ -494,6 +499,7 @@ const handleRegister1 = async () => {
// 组件挂载时初始化
onMounted(() => {
authStore.initialize()
// downloadStore.initialize()
})
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment