diff --git a/src/api/indexExam.js b/src/api/indexExam.js index 727dd42c..dbf1e0ab 100644 --- a/src/api/indexExam.js +++ b/src/api/indexExam.js @@ -1,17 +1,14 @@ import http from "./config"; // 创建考试信息接口 -export const createExamination = (obj) => http.post('/examination/createExamination',obj,{ - headers: { - 'token': '123' - } -}); +export const createExamination = (obj) => http.post('/examination/createExamination', obj); // 根据Id删除考试信息 -export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj); +export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById', obj); // 根据ID获取考试信息详情 -export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' -} +export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 创建考试信息接口 -export const updateExamination = (obj) => http.post('/examination/updateExamination',obj); +export const updateExamination = (obj) => http.post('/examination/updateExamination', obj); diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js index f855dcc0..0418e99c 100644 --- a/src/api/indexLiveBroadcast.js +++ b/src/api/indexLiveBroadcast.js @@ -4,25 +4,13 @@ import http from "./config"; export const getLiveBroadcastInfor = (obj) => http.get('/liveBroadcast', { params: obj }) //创建直播接口 -export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj) //直播信息删除接口 -export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj) //直播信息修改接口 -export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj, { - headers: { - 'token': '123' - } -}) +export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj) //获取全部评估信息接口 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) \ No newline at end of file diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index b8dfc793..7d41cb19 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -25,4 +25,7 @@ export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) //设置项目积分规则 -export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) \ No newline at end of file +export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) + +//获取学员积分明细列表 +export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj) \ No newline at end of file diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 6b01be18..b88140e7 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -1,10 +1,6 @@ import http from "./config"; //获取任务列表 -export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, { - headers: { - 'token': '123' - } -}) +export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }) //项目里的新建或编辑阶段任务 export const addTask = (obj) => http.post('/admin/project/editTask', obj) diff --git a/src/api/indexWork.js b/src/api/indexWork.js index af189946..827bec68 100644 --- a/src/api/indexWork.js +++ b/src/api/indexWork.js @@ -1,18 +1,14 @@ import http from "./config"; // 创建作业信息接口 export const createWorkTask = (obj) => - http.post("/work/createWorkTask", obj, { - headers: { - token: "123", - }, - }); + http.post("/work/createWorkTask", obj); // 删除作业信息接口 export const deleteWorkTask = (obj) => http.post("/work/deleteWorkTask", obj); // 根据ID获取作业信息详情 -export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{ - headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' - } +export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 修改作业信息接口 export const updateWorkTaskUsing = (obj) => diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 3669d29c..ab7d1fff 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -97,7 +97,6 @@ export default { }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); - }; const afterVisibleChange = (bool) => { console.log("state getAllInvistText", bool); diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 30b44ff3..7b0db77d 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -9,15 +9,14 @@ >
- -
{{edit?'编辑':'添加'}}活动
+
{{ edit ? "编辑" : "添加" }}活动
-
+
@@ -72,7 +71,7 @@
-
+
-
+
- - -
+ + +
@@ -226,9 +225,9 @@ import { reactive, toRefs, ref } from "vue"; import * as api from "../../api/indexActivity"; import * as apiTask from "../../api/indexTaskadd"; -import { RouterEditTask } from "@/api/indexTask" +import { RouterEditTask } from "@/api/indexTask"; import { message } from "ant-design-vue"; -import dayjs from 'dayjs'; +import dayjs from "dayjs"; const rowSelection = ref({ checkStrictly: false, onChange: (selectedRowKeys, selectedRows) => { @@ -258,7 +257,8 @@ export default { type: Number, default: null, }, - edit: { // 是否为编辑 + edit: { + // 是否为编辑 type: Boolean, default: null, }, @@ -274,15 +274,18 @@ export default { type: Number, default: 0, }, - isLevel: { // 是否是关卡页面触发 + isLevel: { + // 是否是关卡页面触发 type: Number, default: null, }, - EditWorkId: { // 要编辑的workId + EditWorkId: { + // 要编辑的workId type: Number, default: null, }, - projectTaskId: { // 要编辑的projectId + projectTaskId: { + // 要编辑的projectId type: Number, default: null, }, @@ -293,7 +296,7 @@ export default { isactive: { type: Number, default: null, - } + }, }, setup(props, ctx) { //console.log("学习路径",props.isStudiscuss); @@ -322,35 +325,46 @@ export default { state.textV1 = ""; state.textV2 = ""; state.time = ""; - message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`) - + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const queryActive = () => { - console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId); - api.getActivity(props.EditActiveId).then(res => { - console.log('获取讨论信息成功',res.data.data.standardSettings) - + console.log( + "props.EditActiveId======", + props.EditActiveId, + props.chooseStageId, + props.routerTaskId + ); + api + .getActivity(props.EditActiveId) + .then((res) => { + console.log("获取讨论信息成功", res.data.data.standardSettings); + //更新讨论信息 - state.inputV1 = res.data.data.activityName; + state.inputV1 = res.data.data.activityName; state.textV1 = res.data.data.activityNotice; state.textV2 = res.data.data.activityExplain; state.inputV2 = res.data.data.activityDuration; state.inputV3 = res.data.data.activityAddress; state.inputV5 = res.data.data.afterSignIn; - state.inputV6 =res.data.data.signOutTime; + state.inputV6 = res.data.data.signOutTime; state.inputV4 = res.data.data.beforeSignIn; state.radioV1 = Number(res.data.data.standardSettings); - - state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")] - }).catch(err=>{ - console.log('获取讨论信息失败',err) + + state.time = [ + dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), + dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"), + ]; }) - } + .catch((err) => { + console.log("获取讨论信息失败", err); + }); + }; const afterVisibleChange = (bool) => { - if(bool && props.edit){ + if (bool && props.edit) { queryActive(); } - }; const cloradio1 = (value) => { if (value != "") { @@ -358,109 +372,109 @@ export default { } }; const updateTask = (res) => { - if(props.isLevel == 1 ){ + if (props.isLevel == 1) { RouterEditTask({ - chapterId:props.isactive, - courseId: res.data.data.activityId, - duration: res.data.data.activityDuration, - name: res.data.data.activityName, - routerId: props.routerId, - routerTaskId: props.routerTaskId ||0, - type: 9, - }).then(res => { - console.log("新增关卡任务成功",res); - - }).catch(err => { - console.log("新增关卡任务失败",err); + chapterId: props.isactive, + courseId: res.data.data.activityId, + duration: res.data.data.activityDuration, + name: res.data.data.activityName, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 9, + }) + .then((res) => { + console.log("新增关卡任务成功", res); }) - }else if(props.isLevel==2){ - apiTask.addTask({ + .catch((err) => { + console.log("新增关卡任务失败", err); + }); + } else if (props.isLevel == 2) { + apiTask + .addTask({ courseId: res.data.data.activityId, duration: res.data.data.activityDuration, name: res.data.data.activityName, projectId: props.projectId, - projectTaskId: props.projectTaskId ||0, - stageId:props.chooseStageId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, type: 9, - }).then((res)=> { - console.log("更新任务列表成功",res); - }) - .catch((err)=> { - console.log("更新任务列表失败",err); + .then((res) => { + console.log("更新任务列表成功", res); }) - }else if(props.isLevel == 3){ + .catch((err) => { + console.log("更新任务列表失败", err); + }); + } else if (props.isLevel == 3) { console.log("模板库更新更新任务列表"); } - } + }; //创建活动 const updateActivityInfo = () => { - if(!state.inputV1){ + if (!state.inputV1) { message.destroy(); return message.warning("请输入活动名称"); - } - if(!state.textV1){ + } + if (!state.textV1) { message.destroy(); return message.warning("请输入活动公告"); - } - if(!state.time){ + } + if (!state.time) { message.destroy(); return message.warning("请输入活动时间"); - } - if(!state.inputV2){ + } + if (!state.inputV2) { message.destroy(); return message.warning("请输入活动时长"); - } - if(!state.inputV3){ + } + if (!state.inputV3) { message.destroy(); return message.warning("请输入活动地址"); - } - + } + let obj = { - activityAddress: state.inputV3, //活动地址 - activityDuration: state.inputV2, //活动时长 - activityExplain: state.textV2, //活动说明 - activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间 - activityId: props.edit?props.EditActiveId:0, //活动ID - activityName: state.inputV1, //活动名称 - activityNotice: state.textV1, //活动公告 - activityStartTime:dayjs(state.time[0]).format("YYYY-MM-DD"),//活动开始时间 - activityTag: "", //活动逻辑删除标识 - afterSignIn: state.inputV5, //活动开始后多少分钟签到 - beforeSignIn: state.inputV4, //活动开始前多少分钟签到 - signOutTime: state.inputV6, //签退开始时间 - standardSettings: state.radioV1, //标准设置 - + activityAddress: state.inputV3, //活动地址 + activityDuration: state.inputV2, //活动时长 + activityExplain: state.textV2, //活动说明 + activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间 + activityId: props.edit ? props.EditActiveId : 0, //活动ID + activityName: state.inputV1, //活动名称 + activityNotice: state.textV1, //活动公告 + activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), //活动开始时间 + activityTag: "", //活动逻辑删除标识 + afterSignIn: state.inputV5, //活动开始后多少分钟签到 + beforeSignIn: state.inputV4, //活动开始前多少分钟签到 + signOutTime: state.inputV6, //签退开始时间 + standardSettings: state.radioV1, //标准设置 }; - if(props.edit){ + if (props.edit) { //更新编辑活动信息 api - .updateActivity(obj) - .then((res) => { - closeDrawer(); - updateTask(res); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log("更新失败",err); - }) - }else{ + .updateActivity(obj) + .then((res) => { + closeDrawer(); + updateTask(res); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log("更新失败", err); + }); + } else { //新建活动信息 api - .createActivity(obj) - .then((res) => { + .createActivity(obj) + .then((res) => { message.success("创建成功"); closeDrawer(); updateTask(res); ctx.emit("changeData", false); - }) - .catch((err) => { - console.log("创建失败",err); - }) + }) + .catch((err) => { + console.log("创建失败", err); + }); } - }; - + return { ...toRefs(state), afterVisibleChange, @@ -505,7 +519,7 @@ export default { border-radius: 8px; } .main_left { - margin-top:32px; + margin-top: 32px; padding-right: 30px; flex: 1; border-right: 1px solid #e8e8e8; diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index de4d8c9d..ba1475b3 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -8,7 +8,7 @@ @after-visible-change="afterVisibleChange" >
-
+
编辑案例
添加案例
重置
-
-
- -
- +
+ +
+
- -
+ +
@@ -90,7 +99,8 @@ export default { type: Number, default: null, }, - edit: { // 是否为编辑 + edit: { + // 是否为编辑 type: Boolean, default: null, }, @@ -106,11 +116,13 @@ export default { type: Number, default: 0, }, - isLevel: { // 是否是关卡页面触发 + isLevel: { + // 是否是关卡页面触发 type: Number, default: null, }, - projectTaskId: { // 要编辑的projectId + projectTaskId: { + // 要编辑的projectId type: Number, default: null, }, @@ -121,14 +133,15 @@ export default { isactive: { type: Number, default: null, - } + }, }, setup(props, ctx) { const state = reactive({ tableData: [ { key: "1", - title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555", + title: + "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555", name: "李玉冰", time: "2022-10-31 23:12:00", }, @@ -136,7 +149,7 @@ export default { currentPage: 1, tableDataTotal: 0, pageSize: 10, - inputV1: '', + inputV1: "", time: undefined, assessmentId: null, assessmentName: "", @@ -144,6 +157,8 @@ export default { const closeDrawer = () => { ctx.emit("update:addcaseVisible", false); ctx.emit("update:edit", false); + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bool) => { console.log("state", bool); @@ -179,7 +194,13 @@ export default { const rowSelection = { onSelect: (selectedRows, selected, selectedRowKeys) => { console.log( - "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected); + "selectedRowKeys", + selectedRowKeys, + "selectedRows", + selectedRows, + "selected", + selected + ); console.log(selectedRows.assessmentId); state.assessmentId = selectedRows.assessmentId; state.assessmentName = selectedRows.name; @@ -228,8 +249,8 @@ export default { }); }; const updateTask = () => { - console.log("jinlaile=================", state.assessmentName) - if (props.isLevel==1) { + console.log("jinlaile=================", state.assessmentName); + if (props.isLevel == 1) { RouterEditTask({ chapterId: props.isactive, courseId: state.assessmentId, @@ -240,7 +261,7 @@ export default { }) .then((res) => { console.log(res, 11111); - message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`) + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; @@ -248,7 +269,7 @@ export default { .catch((err) => { console.log(err, 1111); }); - } else if(props.isLevel==2){ + } else if (props.isLevel == 2) { console.log("=========projectTaskId", props.projectTaskId); apiTask .addTask({ @@ -267,10 +288,10 @@ export default { .catch((err) => { console.log(err, 111111); }); - }else if(props.isLevel==3){ + } else if (props.isLevel == 3) { console.log("模板库"); } - } + }; //重置案例信息 const resetCase = () => { state.inputV1 = ""; @@ -297,181 +318,181 @@ export default { \ No newline at end of file diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 70aa3844..7cd9a3c9 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -174,7 +174,9 @@ export default { state.inputV1 = ""; state.textV1 = ""; message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + // ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const queryDiscuss = () => { if (props.edit) { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index daf6e24b..b934924f 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -9,7 +9,7 @@ >
-
{{edit?'编辑':'添加'}}测评
+
{{ edit ? "编辑" : "添加" }}测评
选择测评：
- +
-
-
- +
+ +
@@ -78,8 +80,12 @@ 测评说明：
- - +
@@ -102,11 +108,11 @@ import * as api from "../../api/indexEval"; import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; -import dayjs from 'dayjs'; +import dayjs from "dayjs"; // const router = useRouter(); export default { name: "AddEval", - components: { + components: { EvList, }, props: { @@ -118,7 +124,8 @@ export default { type: Number, default: null, }, - edit: { // 是否为编辑 + edit: { + // 是否为编辑 type: Boolean, default: null, }, @@ -134,11 +141,13 @@ export default { type: Number, default: 0, }, - isLevel: { // 是否是关卡页面触发 + isLevel: { + // 是否是关卡页面触发 type: Number, default: null, }, - projectTaskId: { // 要编辑的projectId + projectTaskId: { + // 要编辑的projectId type: Number, default: null, }, @@ -157,10 +166,10 @@ export default { inputV2: "", time: undefined, EvalId: null, - evaluationTypeId:null, - evaluationTypeName:"", - description:"", - EvalListVisible:false, + evaluationTypeId: null, + evaluationTypeName: "", + description: "", + EvalListVisible: false, // addLoading:false, }); @@ -169,67 +178,72 @@ export default { ctx.emit("update:edit", false); state.inputV1 = ""; state.inputV2 = ""; + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bool) => { - if(props.edit && bool){ + if (props.edit && bool) { queryEval(); } }; - const showEvalDrawer = () =>{ + const showEvalDrawer = () => { state.EvalListVisible = true; console.log("进来了吗"); }; - const queryEval = () =>{ + const queryEval = () => { api - .queryEvaluationDetailById({evaluationId:props.evaluationId}) - .then((res) => { - console.log("调用项目添加接口后", res.data.data); - state.inputV1 = res.data.data.evaluationName; - state.time = [dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD")]; - state.evaluationTypeId = res.data.data.evaluationTypeId; - state.evaluationTypeName =res.data.data.evaluationTypeName; - //state.description = + .queryEvaluationDetailById({ evaluationId: props.evaluationId }) + .then((res) => { + console.log("调用项目添加接口后", res.data.data); + state.inputV1 = res.data.data.evaluationName; + state.time = [ + dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), + dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), + ]; + state.evaluationTypeId = res.data.data.evaluationTypeId; + state.evaluationTypeName = res.data.data.evaluationTypeName; + //state.description = }) .catch((err) => { console.log(err); }); - } - const updateTask = (res)=>{ - if(props.isLevel ==1){ + }; + const updateTask = (res) => { + if (props.isLevel == 1) { apitaskadd - .addTask({ - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, - type: 10, - }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - - }) - .catch((err) => { - console.log(err); - }); - }else if(props.isLevel ==2){ + .addTask({ + courseId: res.data.data.evaluationId, + name: res.data.data.evaluationName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + }) + .catch((err) => { + console.log(err); + }); + } else if (props.isLevel == 2) { RouterEditTask({ - chapterId: props.isactive, - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - type: 10, - }).then((res) => { - console.log("调用项目添加接口后", res.data); - - }).catch((err) => { - console.log(err); - }); - }else if(props.isLevel ==3){ - console.log("模板库任务") + chapterId: props.isactive, + courseId: res.data.data.evaluationId, + name: res.data.data.evaluationName, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + }) + .catch((err) => { + console.log(err); + }); + } else if (props.isLevel == 3) { + console.log("模板库任务"); } - } + }; //创建或编辑测评信息 const createEvalText = () => { if (!state.inputV1) { @@ -248,36 +262,36 @@ export default { let obj = { evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), - evaluationId: props.edit?props.evaluationId:0, + evaluationId: props.edit ? props.evaluationId : 0, evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), - evaluationTypeId:state.evaluationTypeId, - evaluationTypeName:state.evaluationTypeName, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, //state.description }; - if(props.edit){ + if (props.edit) { api - .createEvaluation(obj) - .then((res) => { - updateTask(res); - message.success("创建成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log(err); - }); - }else{ + .createEvaluation(obj) + .then((res) => { + updateTask(res); + message.success("创建成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); + } else { api - .updateEvaluation(obj) - .then((res) => { - updateTask(res); - message.success("创建成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log(err); - }); + .updateEvaluation(obj) + .then((res) => { + updateTask(res); + message.success("创建成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); } }; @@ -318,7 +332,7 @@ export default { display: flex; justify-content: space-between; .main_left { - margin-top:32px; + margin-top: 32px; padding-right: 30px; flex: 1; border-right: 1px solid #e8e8e8; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 63c19be7..a6b099c3 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -48,11 +48,14 @@ 选择课程：
- +
- +
@@ -152,8 +155,15 @@
开始前： 分钟 @@ -161,29 +171,43 @@
开始后： 分钟
-
+ +
@@ -192,7 +216,9 @@
- 仅签到 + 仅签到 签到、签退全部完成 @@ -215,7 +241,9 @@
- 允许项目内人员临时到场参加 + 允许项目内人员临时到场参加 允许项目外人员临时到场参加 @@ -228,7 +256,7 @@
需要评估 - +
@@ -271,13 +299,13 @@
- +
\ No newline at end of file diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 812d5f18..ed6c398f 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -79,7 +79,7 @@
-