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

# Conflicts:
#	src/views/report/Overvoewnew.vue

src/api/configz.js

@@ -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"},

src/views/courselibrary/CoursewareManage.vue

@@ -781,7 +781,7 @@
                   </div>
                 </div>
               </div>
-              
+
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -975,7 +975,7 @@
                 :placeholder="['        开始时间', '        结束时间']"
                 :disabled="editBeginClass"
               /> -->
-              <a-date-picker 
+              <a-date-picker
                 style="width: 45%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
                 :format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
@@ -1172,7 +1172,7 @@
               <span v-if="xjkkradioVEnd" style="color: #6d7584">天</span>
             </div>
           </div>
-          
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
@@ -2317,7 +2317,7 @@ export default defineComponent({
     const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
     const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间');
-    
+
     const state = reactive({
       tableStudentChange: null,
       isAssessmentId: null,
@@ -3684,7 +3684,7 @@ function onFocusEnd(){
       }).catch(err=>{
         message.error(err.message=='timeout of 15000ms exceeded'?'系统超时，请稍后再试':err.data.msg)
         state.tableCoursePlanLoading = false
-        res ={ 
+        res ={
           data:{data:{
           "pageNo": "1",
           "pageSize": "10",
@@ -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;
@@ -4119,7 +4122,7 @@ function onFocusEnd(){
         });
       state.cstm_hs = false;
     };
-    
+
     let editBeginClass = ref(false)
     //编辑开课
     const handelEditStu = async (item) => {
@@ -4362,7 +4365,7 @@ function onFocusEnd(){
           align: "center",
           customRender: ({ record }) =>
             record.examinationScore ? record.examinationScore : "-",
-          
+
         },
         {
           title: "结业状态",
@@ -5299,13 +5302,13 @@ function onFocusEnd(){
     };
 
     const disabledDateTime = () => {
-      // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]); 
-      // const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]); 
+      // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]);
+      // const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]);
       // if(dateOnlyStart.getTime()==dateOnlyEnd.getTime()){
       //   const currentMinute = dayjs(state.xjkkinputV3[0]).minute();
       //     return {
-      //       disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), 
-      //       disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), 
+      //       disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()),
+      //       disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
       //     };
       // }
     };

src/views/report/Overvoewnew.vue

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