Merge pull request '排序问题处理' (#199) from zhuhao_dev into main
Reviewed-on: #199
This commit is contained in:
commit
e4e23e7508
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "aix-win",
|
"name": "aix-win",
|
||||||
"version": "1.2.0",
|
"version": "1.2.2",
|
||||||
"description": "An Electron application with Vue",
|
"description": "An Electron application with Vue",
|
||||||
"main": "./out/main/index.js",
|
"main": "./out/main/index.js",
|
||||||
"author": "example.com",
|
"author": "example.com",
|
||||||
|
|
|
@ -53,7 +53,7 @@ function createLoginWindow() {
|
||||||
updateInit(loginWindow)
|
updateInit(loginWindow)
|
||||||
}
|
}
|
||||||
|
|
||||||
// loginWindow.webContents.openDevTools()
|
loginWindow.webContents.openDevTools()
|
||||||
loginWindow.once('ready-to-show', () => {
|
loginWindow.once('ready-to-show', () => {
|
||||||
loginWindow.show()
|
loginWindow.show()
|
||||||
})
|
})
|
||||||
|
|
|
@ -264,7 +264,7 @@ const transData = (data) => {
|
||||||
//获取教材
|
//获取教材
|
||||||
const getSubject = async () => {
|
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.filter(item => item.edustage == edustage && item.edusubject == edusubject)
|
||||||
subjectList.value = rows
|
subjectList.value = rows
|
||||||
|
|
Loading…
Reference in New Issue