添加面授任务

This commit is contained in:
zhangyc
2022-11-27 16:39:22 +08:00
parent 339d77fd1d
commit a586bf108e
11 changed files with 562 additions and 324 deletions

View File

@@ -49,29 +49,20 @@
</div>
<div class="btnbox" @click="showDrawerSelFacet">
<button class="xkbtn">
{{ chooseCourse == null ? "授课" : "修改" }}
{{ chooseCourse == null ? "选择" : "修改" }}面授
</button>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
"
color="#ECF3FC"
v-if="chooseCourse !== null"
closable
@close="closeTag"
>{{ chooseCourseName }}</a-tag
>
<div v-if = "chooseCourse > 0">
<a-tag closable color="processing" @close="logC">
<span style="font-size:14px;line-height: 33px;" >删除课程</span>
</a-tag></div>
</div>
<!-- 选择面授侧弹窗 -->
<div>
<sel-facet
v-model:selfacetVisible="selfacetvisible"
@getData="upDateTable"
v-model:chooseCourse="chooseCourse"
/>
</div>
<!-- 选择面授侧弹窗 -->
@@ -211,9 +202,11 @@
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<div class="qdqtbox">
<div class="qtbtn"><div class="btntext">签退</div></div>
</div>
</div>
<div class="setbox">
<div class="timerbox">
<span>结束前:</span>
@@ -225,8 +218,7 @@
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
overflow: hidden; "
:v-model:value="inputV7"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
@@ -245,9 +237,10 @@
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio
>
<!--
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio
>
>-->
</a-radio-group>
</div>
</div>
@@ -276,6 +269,9 @@
</a-radio-group>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">评估:</span>
@@ -284,24 +280,30 @@
<a-checkbox v-model:checked="checkedAssessment"
>需要评估</a-checkbox
>
<button class="xkbtn" @click="showAssessment">选择评估</button>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
"
color="#ECF3FC"
v-if="chooseMent !== null"
closable
@close="closeTag"
>{{ chooseMentName }}</a-tag
>
</div>
</div>
<div class="main_item">
<div class="signbox">
</div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if = "assessmentId >0 ">
<a-tag closable color="processing" @close="logA">
<span style="font-size:14px;line-height: 33px;" >删除评估</span>
</a-tag></div>
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
/>
</div>
</div>
</div>
<div class="main_right">
<div class="main_item">
@@ -310,6 +312,11 @@
</div>
<div class="btnbox" @click="showDrawerAddHomework">
<button class="xkbtn">配置</button>
<div v-if = "EditWorkId >0">
<a-tag closable color="processing" @close="logW">
<span style="font-size:14px;line-height: 33px;" >删除作业</span>
</a-tag></div>
</div>
<!-- 添加作业侧弹窗 -->
@@ -317,28 +324,14 @@
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@getWork="getWork"
v-model:face="face"
:faceLevel="true"
v-model:EditWorkId="EditWorkId"
/>
</div>
<!-- 添加作业侧弹窗 -->
</div>
<div>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
margin-left: 120px;
"
color="#ECF3FC"
v-if="chooseWork !== null"
closable
@close="closeTagWork"
>{{ chooseWorkName }}</a-tag
>
</div>
<div class="main_item">
<div class="signbox">
@@ -346,10 +339,16 @@
</div>
<div class="btnbox" @click="showDrawerAddTest">
<button class="xkbtn">配置</button>
<div v-if = "EditTestId >0">
<a-tag closable color="processing" @close="logT">
<span style="font-size:14px;line-height: 33px;" >删除考试</span>
</a-tag></div>
</div>
<!-- 添加考试侧弹窗 -->
<div>
<add-test v-model:addtestVisible="addtestvisible" />
<add-test v-model:addtestVisible="addtestvisible"
v-model:EditTestId ="EditTestId"/>
</div>
<!-- 添加考试侧弹窗 -->
</div>
@@ -373,11 +372,7 @@
<button class="btn1">取消</button>
<button class="btn2" @click="updateFaceTeach">确定</button>
</div>
<assessment-list
v-model:assessmentVisible="assessmentVisible"
v-model:isface="isface"
@faceAssess="faceAssess"
/>
</div>
</a-drawer>
</template>
@@ -394,8 +389,7 @@ import { debounce } from "lodash-es";
import { queryFaceDetailById, editPlan } from "../../api/indexFace";
import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";
import { queryWorkDetailById } from "../../api/indexWork";
// import { toDate } from "../../api/method";
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddFaceteach",
@@ -481,15 +475,13 @@ export default {
chooseTime: [],
fileList: [],
chooseCourse: null, //选择的在线课程
chooseCourseName: null, //选择的课程的名字
face: true, //面授传给配置作业的标识
chooseWork: null, //配置的work
chooseWorkName: null, //配置的work名字
chooseWorkId: null, //配置的work ID
chooseMent: null,
chooseMentName: null,
assessmentId:null,
EditTestId:null,
EditWorkId:null,
assessmentVisible: false,
isface: 1,
checkedAssessmentId:null,
isface: 1
});
const clear = () => {
state.inputV1 = null;
@@ -505,12 +497,11 @@ export default {
state.radioV2 = "";
state.checkedHolidy = false;
state.checkedAssessment = false;
state.chooseMent = null;
state.chooseWork = null;
state.chooseWorkId = null;
state.chooseWorkName = null;
state.chooseCourse = null;
state.chooseCourseName = null;
state.EditTestId =null;
state.assessmentId=null;
state.EditWorkId=null;
};
const closeDrawer = () => {
ctx.emit("update:addfaceteachVisible", false);
@@ -524,13 +515,33 @@ export default {
if (bool && props.edit) {
// 该页面显示同时 edit为true 时,发送查询请求,
queryFaceTeach();
}
};
const logC= e => {
state.chooseCourse=null;
console.log(e);
};
const logW = e => {
state.EditWorkId=null;
console.log(e);
};
const logT= e => {
state.EditTestId=null;
console.log(e);
};
const logA= e => {
state.EditEvalId=null;
console.log(e);
};
const showDrawerSelFacet = () => {
state.selfacetvisible = true;
};
const showDrawerAddHomework = () => {
state.addhomeworkvisible = true;
};
const showDrawerAddTest = () => {
state.addtestvisible = true;
@@ -545,6 +556,11 @@ export default {
state.radioV2 = "";
}
};
/*
const getCheckedAss = (ass) => {
state.assessment = ass;
state.assessmentId = ass.assessmentId
};*/
//查询面授
const queryFaceTeach = () => {
//暂时写一个假的offcoursePlanId
@@ -569,7 +585,7 @@ export default {
state.inputV6 = result.afterStart;
state.inputV7 = result.beforeEnd;
state.fileList = JSON.parse(result.attach);
state.chooseWorkId = result.homeWorkId;
state.EditWorkId = result.homeWorkId;
// state.radioV1 = result.
state.checkedHolidy =
result.completeType == 1
@@ -592,18 +608,24 @@ export default {
state.radioV1 = "2";
}
state.checkedAssessment = result.evalFlag == 1 ? true : false;
/*
if (state.chooseWorkId) {
queryWorkDetailById({ workId: state.chooseWorkId }).then((res) => {
state.chooseWork = res.data.data;
state.chooseWorkName = res.data.data.workName;
});
}
}*/
state.chooseCourse =result.offcourseId;
state.EditTestId = result.testId;
state.EditWorkId=result.homeWorkId;
state.assessmentId =result.evaluateId;
});
};
//新建或编辑面授
// 新增任务
const updateFaceTeach = () => {
console.log("==========",state.chooseCourse,"hha");
if (
state.inputV1 == "" ||
state.chooseCourse == null ||
@@ -633,47 +655,35 @@ export default {
endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
// endTime: "",
evalFlag: state.checkedAssessment == true ? 1 : 0,
evaluateId:
state.chooseMent == null ? 0 : state.chooseMent.assessmentId,
homeWorkId: state.chooseWorkId || 0,
evaluateId:state.assessmentId,
homeWorkId: state.EditWorkId,
name: state.inputV1,
noProjectMember: state.radioV2 == "1" ? 0 : 1,
offcourseId: 0,
offcoursePlanId: props.edit ? props.EditFaceId : 0,
projectMember: state.radioV2 == "1" ? 1 : 0,
offcourseId:state.chooseCourse,
offcoursePlanId:props.edit ? props.EditFaceId : 0,
projectMember:state.radioV2 == "1" ? 1 : 0,
signFlag: 0,
signWordFlag: 0,
teacherId: state.memberId,
testId: 0,
testId: state.EditTestId,
// teacher: state.inputV2,
};
if (props.edit) {
editPlan(obj)
editPlan(obj)
.then((res) => {
updateTask(res);
closeDrawer();
})
.catch((err) => {
}).catch((err) => {
message.error(`添加失败${err}`);
});
} else {
editPlan(obj)
.then((res) => {
updateTask(res);
closeDrawer();
})
.catch((err) => {
message.error(`添加失败${err}`);
});
}
}
};
const upDateTable = (value) => {
console.log("gg", value);
console.log("gg", value[0].name);
state.chooseCourse = value[0];
state.chooseCourseName = value[0].name;
// state.chooseCourse = value[0];
//state.chooseCourseName = value[0].name;
};
//更新任务列表
@@ -724,8 +734,8 @@ export default {
courseId: res.data.data.offcoursePlanId,
duration: 0,
name: res.data.data.name,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
projectTemplateId: props.projectTemplateId,
projectTemplateTaskId: props.projectTemplateTaskId || 0,
stageId: props.chooseStageId,
type: 2,
})
@@ -740,23 +750,7 @@ export default {
});
}
};
const closeTag = () => {
state.chooseCourse = null;
state.chooseCourseName = null;
};
const closeTagWork = () => {
state.chooseWork = null;
state.chooseWorkName = null;
state.chooseWorkId = null;
};
const getWork = (value) => {
console.log("getWork", value);
state.chooseWork = value;
state.chooseWorkName = value.workName;
state.chooseWorkId = value.workId;
// console.log("getWorkName", value.workName);
};
const handleChange = ({ file, fileList }) => {
if (file.status !== "uploading") {
console.log(file, fileList);
@@ -764,6 +758,7 @@ export default {
};
const showAssessment = () => {
state.assessmentVisible = true;
};
const faceAssess = (value) => {
console.log(value);
@@ -842,9 +837,6 @@ export default {
updateFaceTeach,
updateTask,
upDateTable,
closeTag,
getWork,
closeTagWork,
clear,
handleChange,
showAssessment,
@@ -855,6 +847,11 @@ export default {
handleSearch,
handleChange2,
templateScroll,
logC,
logT,
logW,
logA,
};
},
};
@@ -980,15 +977,14 @@ export default {
.xkbtn {
cursor: pointer;
width: 130px;
width: 130px;
height: 40px;
background: #388be1;
border-radius: 8px;
border: 0;
margin-right: 16px 8px 32px 0;
color: #fff;
margin-top: 16px;
margin-bottom: 60px;
}
}
}