Merge branch 'main' into lyc-dev
This commit is contained in:
commit
3cd8c51aae
|
@ -10,6 +10,7 @@ VITE_APP_BASE_API = '/dev-api'
|
||||||
VITE_APP_DOMAIN = 'file.ysaix.com'
|
VITE_APP_DOMAIN = 'file.ysaix.com'
|
||||||
|
|
||||||
VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
|
VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
|
||||||
|
#VITE_APP_UPLOAD_API = 'http://192.168.2.52:7863'
|
||||||
|
|
||||||
VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
|
VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "aix-win",
|
"name": "aix-win",
|
||||||
"version": "1.1.6",
|
"version": "1.1.8",
|
||||||
"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",
|
||||||
|
|
|
@ -100,7 +100,7 @@ const getSubjectContent = async () => {
|
||||||
edustage,
|
edustage,
|
||||||
// entpcourseedituserid: userId,
|
// entpcourseedituserid: userId,
|
||||||
itemgroup: 'textbook',
|
itemgroup: 'textbook',
|
||||||
pageSize: 500
|
pageSize: 10000
|
||||||
}
|
}
|
||||||
|
|
||||||
let data;
|
let data;
|
||||||
|
@ -263,7 +263,7 @@ const transData = (data) => {
|
||||||
//获取教材
|
//获取教材
|
||||||
const getSubject = async () => {
|
const getSubject = async () => {
|
||||||
|
|
||||||
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 500 })
|
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000 })
|
||||||
|
|
||||||
// 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