hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-14 05:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master_20250318-lyc' into master_1202

Browse Source 
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
joshen
2025-03-20 17:18:42 +08:00
parent 980d70c589 c1e56d56f8
commit fd5cace839
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3474,7 +3474,9 @@ function onFocusEnd(){
}; };
const logT = () => { const logT = () => {
state.examInfo = {}; state.examInfo = {};
state.EditTestId = null; state.EditTestId = null; // 新增
state.assessmentId = null; // 新增
state.assessmentName = ""; // 新增
}; };
const removePG = () => { const removePG = () => {
console.log("11111"); console.log("11111");
@@ -4004,7 +4006,7 @@ function onFocusEnd(){
let t = state.signCom ? "1," : "0,"; let t = state.signCom ? "1," : "0,";
let p = state.comLeave ? "1" : "0"; let p = state.comLeave ? "1" : "0";
let type = t.concat(p); let type = t.concat(p);
let postData = { const postData = {
offcourseId: state.offcourseId, offcourseId: state.offcourseId,
id: state.offcoursePlanId, //开课ID,不传代表新增 id: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2, address: state.xjkkinputV2,

5
src/views/lecturer/LecturerFee.vue
View File

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