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

案例、作业、直播bugMerge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-11-30 23:31:34 +08:00
parent 8c05c89bd0 44de52c2af
commit e93d7bea99
11 changed files with 392 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
src/components/drawers/AddFaceteach.vue
View File

@@ -1,49 +1,30 @@
<template>
<a-drawer
:visible="addfaceteachVisible"
class="drawerStyle addfaceteachDrawer"
width="90%"
title="添加面授"
placement="right"
@after-visible-change="afterVisibleChange"
>
<a-drawer :visible="addfaceteachVisible" class="drawerStyle addfaceteachDrawer" width="90%" title="添加面授"
placement="right" @after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">添加面授</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
</div>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">课程名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="courseName"
style="width: 384px; height: 32px"
placeholder="请输入名称"
maxlength="20"
/>
<a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
maxlength="20" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">选择课程：</span>
</div>
@@ -51,19 +32,16 @@
<button class="xkbtn">
{{ chooseCourse == null ? "选择" : "修改" }}面授课
</button>
<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 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"
v-model:chooseCourse="chooseCourse"
/>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" />
</div>
<!-- 选择面授侧弹窗 -->
</div>
@@ -72,100 +50,59 @@
<span style="margin-right: 3px">面授说明：</span>
</div>
<div class="textarea">
<a-textarea
v-model:value="description"
placeholder="请输入说明"
allow-clear
maxlength="100"
/>
<a-textarea v-model:value="description" placeholder="请输入说明" allow-clear maxlength="100" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">授课教师：</span>
</div>
<div class="btnbox">
<a-auto-complete
v-model:value="memberValue.label"
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
@focus="handleFocus"
@blur="handleBlur"
@change="handleChange2"
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
<a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px"
:options="options" @search="handleSearch"></a-auto-complete>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">面授时间：</span>
</div>
<div class="btnbox">
<a-range-picker
v-model:value="chooseTime"
:placeholder="[' 开始时间', ' 结束时间']"
/>
<a-range-picker v-model:value="chooseTime" :placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">面授时长：</span>
</div>
<div class="btnbox">
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
<a-input-number :min="0" :max="300" :precision="0" style="
width: 364px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="duration"
></a-input-number>
" v-model:value="duration"></a-input-number>
<span style="margin-left: 5px; width: 30px">分钟</span>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">上课地址：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="address"
style="width: 384px; height: 32px"
placeholder="请输入上课地址"
maxlength="100"
/>
<a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
maxlength="100" />
</div>
</div>
<div class="main_item2">
@@ -174,42 +111,32 @@
</div>
<div class="kqszbox">
<div class="qdqtbox">
<div class="qdbtn"><div class="btntext">签到</div></div>
<div class="qdbtn">
<div class="btntext">签到</div>
</div>
</div>
<div class="setbox">
<div class="timerbox">
<span>开始前：</span>
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
<a-input-number :min="0" :max="300" :precision="0" style="
width: 100px;
height: 32px;
border-radius: 8px;
overflow: hidden; "
v-model:value="before"
></a-input-number>
overflow: hidden; " v-model:value="before"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后：</span>
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
<a-input-number :min="0" :max="300" :precision="0" style="
width: 100px;
height: 32px;
border-radius: 8px;
overflow: hidden;"
v-model:value="afterStartValue"
></a-input-number>
overflow: hidden;" v-model:value="afterStartValue"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
</div>
</div>
<div class="main_item">
@@ -217,11 +144,11 @@
<span style="margin-right: 3px">完成标准设置：</span>
</div>
<div class="btnbox">
<a-checkbox v-model:checked="onlySign" @click="onlySign=!onlySign">仅签到</a-checkbox>
<a-checkbox v-model:checked="onlySign" @click="onlySign = !onlySign">仅签到</a-checkbox>
</div>
</div>
<div class="main_item">
@@ -229,9 +156,8 @@
<span style="margin-right: 3px">其他设置：</span>
</div>
<div class="btnbox">
<a-checkbox v-model:checked="completeLeave" @click="completeLeave=!completeLeave"
>学员请假后记为任务完成</a-checkbox
>
<a-checkbox v-model:checked="completeLeave"
@click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox>
</div>
</div>
<div class="main_item">
@@ -239,8 +165,9 @@
<span style="margin-right: 3px">现场参与：</span>
</div>
<div class="btnbox">
<a-checkbox v-model:checked="innerPersion" @click="innerPersion=!innerPersion">允许项目内人员临时到场参加</a-checkbox>
<a-checkbox v-model:checked="outPersion" @click="outPersion=!outPersion">允许项目外人员临时到场参加</a-checkbox>
<a-checkbox v-model:checked="innerPersion"
@click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox>
<a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox>
</div>
</div>
<div class="main_item2">
@@ -248,24 +175,21 @@
<span style="margin-right: 3px">评估：</span>
</div>
<div class="btnbox2">
<a-checkbox v-model:checked="needEval" @click="needEval=!needEval"
>需要评估</a-checkbox >
<a-checkbox v-model:checked="needEval" @click="needEval = !needEval">需要评估</a-checkbox>
</div>
</div>
<div v-if="needEval" class="main_item">
<div class="signbox">
<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 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>
@@ -279,26 +203,23 @@
</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 v-if="EditWorkId > 0">
<a-tag closable color="processing" @close="logW">
<span style="font-size:14px;line-height: 33px;">删除作业</span>
</a-tag>
</div>
</div>
<!-- 添加作业侧弹窗 -->
<div>
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@getWork="getWork"
:faceLevel="true"
v-model:EditWorkId="EditWorkId"
/>
<add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
v-model:EditWorkId="EditWorkId" />
</div>
<!-- 添加作业侧弹窗 -->
</div>
<div>
</div>
<div class="main_item">
<div class="signbox">
@@ -306,18 +227,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 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"
v-model:EditTestId ="EditTestId"
:faceLevel="true"
/>
<add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" :faceLevel="true" />
</div>
<!-- 添加考试侧弹窗 -->
</div>
@@ -326,13 +245,8 @@
<span style="margin-right: 3px">附件：</span>
</div>
<div class="btnbox">
<a-upload
@change="handleChange"
action="/manageApi/file/upload"
v-model:file-list="fileList"
>
<button class="xkbtn">上传附件</button></a-upload
>
<a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList">
<button class="xkbtn">上传附件</button></a-upload>
</div>
</div>
</div>
@@ -341,7 +255,7 @@
<button class="btn1" @click="exitAdd">取消</button>
<button class="btn2" @click="updateFaceTeach">确定</button>
</div>
</div>
</a-drawer>
</template>
@@ -355,7 +269,7 @@ import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import { getMemberInfo } from "@/api/index1";
import { debounce } from "lodash-es";
import { queryFaceDetailById,editPlan } from "../../api/indexFace";
import { queryFaceDetailById, editPlan } from "../../api/indexFace";
import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、
@@ -414,11 +328,11 @@ export default {
type: Number,
default: null,
},
projectTemplateId:{
projectTemplateId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const options = ref([]);
@@ -427,8 +341,8 @@ export default {
addhomeworkvisible: false,
addtestvisible: false,
memberValue: {
value:"",
label:""
value: "",
label: ""
},
fetching: false,
totalPages: 0,
@@ -437,45 +351,45 @@ export default {
memberId: 0,
pageSize: 10,
courseName: "",
duration:null,
duration: null,
address: null,
before:null,
afterStartValue:null,
before: null,
afterStartValue: null,
description: "",
chooseTime: [],
fileList: [],
chooseCourse: null, //选择的在线课程
assessmentId:null,
EditTestId:null,
EditWorkId:null,
assessmentVisible:false,
needEval:false,
onlySign:false,
completeLeave:false,
innerPersion:false,
outPersion:false,
assessmentId: null,
EditTestId: null,
EditWorkId: null,
assessmentVisible: false,
needEval: false,
onlySign: false,
completeLeave: false,
innerPersion: false,
outPersion: false,
});
const clear = () => {
state.courseName = "";
state.memberValue = {};
state.duration = null;
state.address = null;
state.before=null;
state.afterStartValue=null;
state.before = null;
state.afterStartValue = null;
state.chooseTime = [];
state.description ="";
state.onlySign =false;
state.completeLeave =false;
state.innerPersion =false;
state.outPersion =false;
state.description = "";
state.onlySign = false;
state.completeLeave = false;
state.innerPersion = false;
state.outPersion = false;
state.chooseCourse = null;
state.EditTestId =null;
state.assessmentId=null;
state.EditWorkId=null;
state.EditEvalId=null;
state.applyFlag="";
state.needEval=false;
state.EditTestId = null;
state.assessmentId = null;
state.EditWorkId = null;
state.EditEvalId = null;
state.applyFlag = "";
state.needEval = false;
};
const closeDrawer = () => {
ctx.emit("update:addfaceteachVisible", false);
@@ -487,24 +401,24 @@ export default {
if (bool && props.edit) {
// 该页面显示同时 edit为true 时，发送查询请求,
queryFaceTeach();
}
};
const logC= e => {
state.chooseCourse=null;
const logC = e => {
state.chooseCourse = null;
console.log(e);
};
const logW = e => {
state.EditWorkId=null;
state.EditWorkId = null;
console.log(e);
};
const logT= e => {
state.EditTestId=null;
const logT = e => {
state.EditTestId = null;
console.log(e);
};
const logA= e => {
state.EditEvalId=null;
const logA = e => {
state.EditEvalId = null;
console.log(e);
};
@@ -513,7 +427,7 @@ export default {
};
const showDrawerAddHomework = () => {
state.addhomeworkvisible = true;
};
const showDrawerAddTest = () => {
state.addtestvisible = true;
@@ -522,14 +436,14 @@ export default {
//查询面授
const queryFaceTeach = () => {
queryFaceDetailById(props.EditFaceId).then((res) => {
console.log("获取到了面授课开课详情", res.data.data);
let result = res.data.data;
state.courseName = result.name;
state.description = result.description;
state.memberValue= {value:result.teacherId,label:result.teacher}
state.duration =result.duration;
state.memberValue = { value: result.teacherId, label: result.teacher }
state.duration = result.duration;
if (result.beginTime && result.endTime) {
state.chooseTime = [
dayjs(result.beginTime, "YYYY-MM-DD"),
@@ -539,21 +453,21 @@ export default {
state.chooseTime = [];
}
state.address = result.address;
state.before =result.beforeStart;
state.before = result.beforeStart;
state.afterStartValue = result.afterStart;
state.fileList = JSON.parse(result.attach);
state.EditWorkId = result.homeWorkId;
state.onlySign = result.completeType.split(",")[0]=="1"?true:false;
state.completeLeave =result.completeType.split(",")[1]=="1"?true:false;
state.chooseCourse =result.offcourseId;
state.innerPersion = result.projectMember.split(",")[0]=="1"?true:false;
state.outPersion = result.projectMember.split(",")[1]=="1"?true:false;
state.onlySign = result.completeType.split(",")[0] == "1" ? true : false;
state.completeLeave = result.completeType.split(",")[1] == "1" ? true : false;
state.chooseCourse = result.offcourseId;
state.innerPersion = result.projectMember.split(",")[0] == "1" ? true : false;
state.outPersion = result.projectMember.split(",")[1] == "1" ? true : false;
state.EditTestId = result.testId;
state.EditWorkId=result.homeWorkId;
state.assessmentId =result.evaluateId;
state.EditWorkId = result.homeWorkId;
state.assessmentId = result.evaluateId;
state.needEval = result.evaluateId;
console.log("state=======",state);
console.log("state=======", state);
});
};
@@ -565,7 +479,7 @@ export default {
//新建或编辑面授
// 新增任务
const updateFaceTeach = () => {
if (
state.courseName == "" ||
state.chooseCourse == null ||
@@ -573,38 +487,38 @@ export default {
state.chooseTime == [] ||
state.duration == "" ||
state.address == ""
) {
message.destroy();
return message.warning("请输入必填字段");
} else {
let type =state.onlySign ? "1,":"0,";
let t = state.completeLeave?"1":"0";
let p=state.innerPersion?"1,":"0,";
let p1=state.outPersion?"1":"0";
let type = state.onlySign ? "1," : "0,";
let t = state.completeLeave ? "1" : "0";
let p = state.innerPersion ? "1," : "0,";
let p1 = state.outPersion ? "1" : "0";
let obj = {
teacherId:state.memberValue.value,
teacher:state.memberValue.label,
address:state.address,
teacherId: state.memberValue.value,
teacher: state.memberValue.label,
address: state.address,
applyFlag: state.applyFlag,
attach: JSON.stringify(state.fileList),
afterStart:state.afterStartValue || 0,
beforeStart:state.before || 0,
beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000),
completeType:type.concat(t),
afterStart: state.afterStartValue || 0,
beforeStart: state.before || 0,
beginTime: parseInt(new Date(state.chooseTime[0].$d).getTime() / 1000),
completeType: type.concat(t),
description: state.description,
endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
evalFlag:state.needEval?1:0,
evaluateId:state.assessmentId,
evalFlag: state.needEval ? 1 : 0,
evaluateId: state.assessmentId,
homeWorkId: state.EditWorkId,
name: state.courseName,
projectMember:p.concat(p1),
offcourseId:state.chooseCourse,
offcoursePlanId:props.EditFaceId >0 ? props.EditFaceId : 0,
projectMember: p.concat(p1),
offcourseId: state.chooseCourse,
offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
testId: state.EditTestId
};
console.log("obj============",obj,"6"+"9");
console.log("obj============", obj, "6" + "9");
editPlan(obj)
.then((res) => {
message.destroy();
@@ -624,7 +538,7 @@ export default {
//更新任务列表
// 新增编辑或新增项目任务
const updateTask = (res) => {
console.log("props.isLevel=====",props.isLevel);
console.log("props.isLevel=====", props.isLevel);
if (props.isLevel == 1) {
let editObj1 = {
chapterId: props.isactive,
@@ -637,7 +551,7 @@ export default {
RouterEditTask(editObj1)
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
// state.addLoading = false;
closeDrawer();
})
@@ -657,8 +571,8 @@ export default {
// 新增编辑或新增项目
ProjectEditTask(editObj)
.then(() => {
message.success( `${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
})
.catch(() => {
//message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
@@ -669,14 +583,14 @@ export default {
courseId: res.data.data.offcoursePlanId,
name: res.data.data.name,
duration: res.data.data.duration,
projectTemplateId:props.projectTemplateId,
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 2,
})
.then(() => {
//message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
})
.catch(() => {
//message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
@@ -792,6 +706,7 @@ export default {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addfaceteachDrawer {
.drawerMain {
.header {
@@ -801,6 +716,7 @@ export default {
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -809,14 +725,17 @@ export default {
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
height: 1080px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
.main_item {
display: flex;
align-items: center;
@@ -909,14 +828,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;
}
}
}
@@ -930,16 +849,19 @@ export default {
align-items: center;
margin-top: 32px;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
}
.btnbox {
display: flex;
flex: 1;
align-items: center;
.xkbtn {
cursor: pointer;
width: 130px;
@@ -954,6 +876,7 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -963,6 +886,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -972,6 +896,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;