Merge remote-tracking branch '121/test20250220' into test20250220

# Conflicts:
#	src/views/report/Overvoewnew.vue
This commit is contained in:
joshen
2025-06-05 18:19:40 +08:00
5 changed files with 53375 additions and 12 deletions

View File

@@ -12,7 +12,7 @@ import Cookies from 'vue-cookies'
// export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore'
axios.defaults.withCredentials = true;
const http = axios.create({
baseURL: '/report',
baseURL: '/',
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: {"Content-Type": "application/json"},

View File

@@ -4040,8 +4040,11 @@ function onFocusEnd(){
score: state.scoreParams,
};
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;
console.log("编辑 gx postData.examInfo",postData.examInfo)
if(postData.examInfo && postData.examInfo.examinationName){
postData.examInfo.examinationTestId = null;
postData.examInfo.id = null;

View File

@@ -2185,6 +2185,7 @@ export default {
];
}
reset_();
if ([0, 1].includes(index)) {
state.statusList = statusArr[index];
}
state.tableSorts = [];

51158
src/views/report/org.json Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff