aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_vite' into StableVersion

Browse Source
This commit is contained in:
zhangyh
2025-11-24 17:26:26 +08:00
parent 3d2fddbe7b 87e4038b55
commit 7bb8b227b4
6 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/HomeMain.vue
View File

@@ -561,7 +561,7 @@ export default defineComponent({
const getIdExistToHistory = async () => {
return await new Promise((resolve, reject) => {
let value = {
id: Number(route.query?.id || route.query?.history)
id: Number(route.params?.id || route.query?.history)
}
Https.axiosPost(Https.httpUrls.historyProject, value)
.then(rv => {
@@ -576,11 +576,15 @@ export default defineComponent({
() => route.query,
(query, oldQuery) => {
nextTick(async () => {
// if ((route.params?.id || query?.history) && !(await getIdExistToHistory())) {
// router.push('/home')
// return
// }
const key = Object.keys(query)?.[0]
if (key) {
if (query.id && !query.tools) {
if (route.params?.id && !query.tools) {
homeMainData.openType = 'history'
homeMainData.openTypeChild = query.id
homeMainData.openTypeChild = route.params?.id
} else {
homeMainData.openType = Object.keys(query)[0]
homeMainData.openTypeChild = query[Object.keys(query)[0]]
@@ -589,10 +593,6 @@ export default defineComponent({
homeMainData.openTypeChild = ''
homeMainData.openType = ''
}
if ((query?.id || query?.history) && !(await getIdExistToHistory())) {
router.push('/home')
return
}
} else {
homeMainData.openType = ''
homeMainData.openTypeChild = ''
@@ -912,12 +912,12 @@ export default defineComponent({
rv.content.forEach((item, index) => {
let str = categorizeDate(item.updateTime) + 'list'
homeMainData.navTypeList.history[str].push(item)
if (item.id == (route.query?.id || route.query?.history)) {
if (item.id == (route.params?.id || route.query?.history)) {
existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
}
})
homeMainData.historyData.isNull = false
if ((route.query?.id || route.query?.history) && isFound < 1) setScrollTop()
if ((route.params?.id || route.query?.history) && isFound < 1) setScrollTop()
} else {
homeMainData.historyData.isNoData = true
}