Merge branch 'master_20250318-lyc' into master_1202

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue

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,
@@ -3474,7 +3474,9 @@ function onFocusEnd(){
     };
     const logT = () => {
       state.examInfo = {};
-      state.EditTestId = null;
+      state.EditTestId = null;  // 新增
+      state.assessmentId = null;  // 新增
+      state.assessmentName = "";  // 新增
     };
     const removePG = () => {
       console.log("11111");
@@ -3680,7 +3682,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",
@@ -4004,7 +4006,7 @@ function onFocusEnd(){
       let t = state.signCom ? "1," : "0,";
       let p = state.comLeave ? "1" : "0";
       let type = t.concat(p);
-      let postData = {
+      const postData = {
         offcourseId: state.offcourseId,
         id: state.offcoursePlanId, //开课ID,不传代表新增
         address: state.xjkkinputV2,
@@ -4114,7 +4116,7 @@ function onFocusEnd(){
         });
       state.cstm_hs = false;
     };
-
+    
     let editBeginClass = ref(false)
     //编辑开课
     const handelEditStu = async (item) => {
@@ -4357,7 +4359,7 @@ function onFocusEnd(){
           align: "center",
           customRender: ({ record }) =>
             record.examinationScore ? record.examinationScore : "-",
-
+          
         },
         {
           title: "结业状态",
@@ -5294,13 +5296,13 @@ function onFocusEnd(){
     };
 
     const disabledDateTime = () => {
-      // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]);
+      // const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]); 
-      // const dateOnlyEnd = new Date(state.xjkkinputV3[1].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()),
+      //       disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), 
-      //       disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
+      //       disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), 
       //     };
       // }
     };

src/views/lecturer/LecturerFee.vue

@@ -505,9 +505,10 @@
           <a-descriptions-item label="授课/课程开发时长  ">{{ formParam.teachingTime || '-' }}分 <span
               v-if="formParam.teachingTime">({{ (formParam.teachingTime / 60).toFixed(2) }}小时)</span></a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys + '人' : '-' }}</a-descriptions-item>
-          <a-descriptions-item
+<!--          <a-descriptions-item
             label="评分  ">{{ formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) + '分' : '-'
-            }}</a-descriptions-item>
+            }}</a-descriptions-item>-->
+          <a-descriptions-item label="评分  ">{{formParam.score }}</a-descriptions-item>
           <a-descriptions-item label="基准课酬  ">{{ formParam.levelPay || formParam.levelPay == 0 ? formParam.levelPay + '元' :
             '-'}}</a-descriptions-item>
           <a-descriptions-item label="计划费用  ">{{ formParam.expense ? formParam.expense + '元' : '-' }}</a-descriptions-item>