Merge remote-tracking branch 'origin/StableVersion' into dev_vite

This commit is contained in:
X1627315083
2025-12-18 11:01:04 +08:00
9 changed files with 79 additions and 29 deletions

View File

@@ -583,7 +583,7 @@ export default defineComponent({
const getIdExistToHistory = async () => {
return await new Promise((resolve, reject) => {
let value = {
id: Number(route.params?.id || route.query?.history)
id: Number(route.query?.id || route.query?.history)
}
Https.axiosPost(Https.httpUrls.historyProject, value)
.then(rv => {
@@ -604,9 +604,9 @@ export default defineComponent({
}
const key = Object.keys(query)?.[0]
if (key) {
if (route.params?.id && !query.tools) {
if (query.id && !query.tools) {
homeMainData.openType = 'history'
homeMainData.openTypeChild = route.params?.id
homeMainData.openTypeChild = query.id
} else {
homeMainData.openType = Object.keys(query)[0]
homeMainData.openTypeChild = query[Object.keys(query)[0]]
@@ -615,6 +615,10 @@ export default defineComponent({
homeMainData.openTypeChild = ''
homeMainData.openType = ''
}
if ((query?.id || query?.history) && !(await getIdExistToHistory())) {
router.push('/home')
return
}
} else {
homeMainData.openType = ''
homeMainData.openTypeChild = ''
@@ -934,12 +938,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.params?.id || route.query?.history)) {
if (item.id == (route.query?.id || route.query?.history)) {
existToHistoryIndex = rv.page * rv.size + index + 1 - rv.size
}
})
homeMainData.historyData.isNull = false
if ((route.params?.id || route.query?.history) && isFound < 1) setScrollTop()
if ((route.query?.id || route.query?.history) && isFound < 1) setScrollTop()
} else {
homeMainData.historyData.isNoData = true
}

View File

@@ -857,7 +857,7 @@ export default defineComponent({
padding: 0 1rem;
.operate_item {
// font-size: 1.4rem;
font-size: 1.6rem;
font-family: Roboto;
font-weight: 400;
color: #007ee5;