mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-10 19:36:46 +08:00
Merge remote-tracking branch '121/test20250220' into test20250220
# Conflicts: # src/views/report/Overvoewnew.vue
This commit is contained in:
@@ -12,7 +12,7 @@ import Cookies from 'vue-cookies'
|
|||||||
// export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore'
|
// export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore'
|
||||||
axios.defaults.withCredentials = true;
|
axios.defaults.withCredentials = true;
|
||||||
const http = axios.create({
|
const http = axios.create({
|
||||||
baseURL: '/report',
|
baseURL: '/',
|
||||||
timeout: 1000 * 15,
|
timeout: 1000 * 15,
|
||||||
// headers: { "Content-Type": "multipart/form-data" },
|
// headers: { "Content-Type": "multipart/form-data" },
|
||||||
headers: {"Content-Type": "application/json"},
|
headers: {"Content-Type": "application/json"},
|
||||||
|
|||||||
@@ -4040,8 +4040,11 @@ function onFocusEnd(){
|
|||||||
score: state.scoreParams,
|
score: state.scoreParams,
|
||||||
};
|
};
|
||||||
if(state.kk_eidt){
|
if(state.kk_eidt){
|
||||||
|
console.log("编辑 gx state.kk_eidt",state.kk_eidt)
|
||||||
|
console.log("编辑 gx state.kk_eidt",state.examInfo)
|
||||||
//编辑
|
//编辑
|
||||||
postData.examInfo = state.examInfo;
|
postData.examInfo = state.examInfo;
|
||||||
|
console.log("编辑 gx postData.examInfo",postData.examInfo)
|
||||||
if(postData.examInfo && postData.examInfo.examinationName){
|
if(postData.examInfo && postData.examInfo.examinationName){
|
||||||
postData.examInfo.examinationTestId = null;
|
postData.examInfo.examinationTestId = null;
|
||||||
postData.examInfo.id = null;
|
postData.examInfo.id = null;
|
||||||
|
|||||||
@@ -2185,6 +2185,7 @@ export default {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
reset_();
|
reset_();
|
||||||
|
if ([0, 1].includes(index)) {
|
||||||
state.statusList = statusArr[index];
|
state.statusList = statusArr[index];
|
||||||
}
|
}
|
||||||
state.tableSorts = [];
|
state.tableSorts = [];
|
||||||
|
|||||||
51158
src/views/report/org.json
Normal file
51158
src/views/report/org.json
Normal file
File diff suppressed because it is too large
Load Diff
2201
src/views/reportcenter/Overvoewnewcopy.vue
Normal file
2201
src/views/reportcenter/Overvoewnewcopy.vue
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user