Merge pull request '排序问题处理' (#199) from zhuhao_dev into main

Reviewed-on: #199
This commit is contained in:
朱浩 2024-09-12 09:48:14 +08:00
commit e4e23e7508
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "1.2.0",
"version": "1.2.2",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",

View File

@ -53,7 +53,7 @@ function createLoginWindow() {
updateInit(loginWindow)
}
// loginWindow.webContents.openDevTools()
loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})
@ -297,4 +297,4 @@ function appWatchError() {
app.on('child-process-gone', async (event, details) => {
console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
})
}
}

View File

@ -264,7 +264,7 @@ const transData = (data) => {
//
const getSubject = async () => {
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000 })
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', })
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
subjectList.value = rows