diff --git a/src/api/config.js b/src/api/config.js index 94ca7d36..cb3897da 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-05 16:33:28 + * @LastEditTime: 2022-12-05 21:56:56 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -24,7 +24,7 @@ const http = axios.create({ http.interceptors.request.use( (config) => { - console.log("config", config); + // console.log("config", config); // const token = localStorage.getItem("token"); // // const token = getCookie('token') // // console.log('token', token) diff --git a/src/api/indexEval.js b/src/api/indexEval.js index 7f2da7ce..396d5b15 100644 --- a/src/api/indexEval.js +++ b/src/api/indexEval.js @@ -45,29 +45,39 @@ export const fileUp = (data) => headers: { "Content-Type": "multipart/form-data" }, }); -//删除测评信息 -export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvaluationById', { params: obj }, { - header: { - 'token': '123', - } -}) +//上传文件 +export const baseVoteupload = (data) => + http.post("/vote/baseVoteupload", data, { + headers: { "Content-Type": "multipart/form-data" }, + }); +//删除测评信息 +export const deleteEvaluationById = (obj) => + http.post( + "/evaluation/deleteEvaluationById", + { params: obj }, + { + header: { + token: "123", + }, + } + ); //根据ID获取测评信息详情 export const queryEvaluationDetailById = (obj) => - http.post("/evaluation/queryEvaluationDetailById", obj,{ + http.post("/evaluation/queryEvaluationDetailById", obj, { headers: { - 'token': '123', - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', - } -}); + token: "123", + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); //修改测评信息 export const updateEvaluation = (obj) => http.post("/evaluation/updateEvaluation", obj); //测评列表查询接口 - export const choiceEvaluation = (obj) => +export const choiceEvaluation = (obj) => http.post("/evaluation/choiceEvaluation", obj); // 测试方法 @@ -79,9 +89,9 @@ export const updateEvaluation = (obj) => // }) //根据name获取测评信息详情 export const getEvalListByName = (obj) => - http.post("/evaluation/queryEvaluationDetailById", obj,{ + http.post("/evaluation/queryEvaluationDetailById", obj, { headers: { - 'token': '123', - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', - } -}); \ No newline at end of file + token: "123", + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 9ac7873e..b0976927 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -216,6 +216,7 @@ export default { state.apiTaskList = selectedRows; }; const handelChangePage = (page, pageSize) => { + state.selectedRowKeys = [] state.currentPage = page; state.pageSize = pageSize; getAllCaseText(); @@ -250,7 +251,14 @@ export default { isTop: "", }) .then((res) => { + console.log('案例列表',res) if (res.status === 200) { + state.selectedRowKeys=[0] + for(let i=0;i
@@ -492,9 +494,11 @@ export default { console.log("获取的数据",res) state.inputV1 = res.data.data.liveName; state.time = [ - dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), - dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"), + dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"), ]; + console.log(state.time) + state.inputV2 = res.data.data.liveDuration; state.inputV3 = res.data.data.liveTeacherId; //state.fileList= res.data.data @@ -632,11 +636,11 @@ export default { } let startTime = toDate( new Date(state.time[0].$d).getTime() / 1000, - "Y-M-D" + "Y-M-D h:m" ); let endTime = toDate( new Date(state.time[1].$d).getTime() / 1000, - "Y-M-D" + "Y-M-D h:m" ); state.obj = { afterSignIn: state.inputV6, @@ -661,6 +665,7 @@ export default { isEvaluate: state.needEval ? "1" : "0", }; console.log('我是要更新的数据',state.obj ) + if (props.edit) { api .updateLiveBroadcastMessage(state.obj) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 57473288..0850304e 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -79,24 +79,7 @@
-
-
- 选择在线课 -
-
-
+
{ console.log('onMounted') - init() + // init() }) function getMember() { diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 311ca8e9..0c87fcd5 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -55,7 +55,7 @@
- 删除投票 + {{ ballot_name }}
@@ -64,6 +64,7 @@ v-model:createVoteVisible="createVoteVisible" v-model:ballotId="ballotId" v-model:editChild="editChild" + v-model:ballot_name="ballot_name" />
+
+ +
起止时间：
@@ -105,19 +112,31 @@
+
+ +
基础投票数：
- --> + - + +
@@ -142,6 +161,7 @@ v-model:value="textV1" placeholder="请输入投票说明" allow-clear + :rows="6" maxlength="150" />
@@ -164,6 +184,7 @@ import { RouterEditTask } from "@/api/indexTask"; import dayjs from "dayjs"; import * as apiTask from "../../api/indexTaskadd"; import { addTempTask } from "../../api/indexTaskadd"; +import { baseVoteupload } from "../../api/indexEval"; export default { name: "AddVote", @@ -231,7 +252,7 @@ export default { voteStemId: null, EditVoteId: "", voteStemName: "", - ballotName: "", + ballot_name: "", editStem: false, //编辑状态 ballotId: 0, //题干id optionId: "", //删除，修改选项id @@ -264,13 +285,9 @@ export default { }; // 限制文件格式上传 - const beforeUpload = (obj) => { - console.log(obj); - }; - - const handleChange = (info) => { - console.log(info.file.type, info.file.type.indexOf("sheet")); - if (info.file.type.indexOf("sheet") == -1) { + const beforeUpload = (file) => { + console.log(file); + if (file.type.indexOf("sheet") == -1) { message.destroy(); message.error("请上传正确的文件格式"); @@ -280,18 +297,25 @@ export default { return; } - let resFileList = [...info.fileList]; + // let resFileList = [...info.fileList]; - resFileList.map((file) => { - if (file.response) { - // Component will show file.url as link - file.url = file.response.url; - console.log("file========", file); - console.log("file========", file.response); - state.voteCount = file.response.data; + // resFileList.map((file) => { + // if (file.response) { + // // Component will show file.url as link + // file.url = file.response.url; + // console.log("file========", file); + // console.log("file========", file.response); + // state.voteCount = file.response.data; + // } + // }); + + const formData = new FormData(); + formData.append("uploadFile", file); + baseVoteupload(formData).then((res) => { + if (res.data.code === 200) { + console.log(res); } }); - //fileList.value = resFileList; }; //删除题干信息接口 @@ -386,8 +410,12 @@ export default { return message.info("请创建题干信息"); } - if (state.basevote == "") { - state.basevote = 1; + if (!state.time) { + message.destroy(); + return message.warning("请输入直播时间"); + } + if (!state.basevote) { + return message.info("请上传投票基数"); } if (state.time != undefined) { state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD"); @@ -452,7 +480,6 @@ export default { updateVoteInfo, queryStem, closeStem, - handleChange, beforeUpload, handlelog, }; @@ -672,6 +699,27 @@ export default { display: flex; align-items: flex-start; margin-bottom: 32px; + .textarea { + width: 423px; + + .ant-input { + width: 100%; + } + + .ant-input-textarea-show-count { + position: relative; + } + + .ant-input-textarea-show-count::after { + position: absolute; + right: 10px; + bottom: 0px; + } + + .ant-input { + border-radius: 8px; + } + } .signbox { width: 120px; diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index c15ab7b7..7105db41 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -118,6 +118,10 @@ export default { type: Number, default: null, }, + ballot_name: { + type: String, + default: null, + }, editChild: { type: Boolean, default: false, @@ -150,6 +154,7 @@ export default { handleAllCancel(); ctx.emit("update:createVoteVisible", false); ctx.emit("update:ballotId", state.ballotId); + ctx.emit("update:ballot_name", state.ballotName); }; // 详情 const getInfoDate = async () => { @@ -267,7 +272,7 @@ export default { } }); } else { - virtualDel(); + virtualDel(id); } }; const virtualDel = (id) => { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 46e7b971..24002989 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3101,7 +3101,8 @@ const columns1 = [ customRender: ({ text }) => { return text ? text : "-"; }, - },{ + }, + { title: " 所属路径", width: 250, dataIndex: "routerName", diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 0112720a..f82e7bc4 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -878,11 +878,16 @@ export default { api .handleLearnPath(obj) .then((res) => { - console.log("发布成功", res); - message.destroy(); - message.success("发布成功"); - state.pub = false; - getLearnPath(); + console.log("发布", res); + if (res.data.code === 200) { + message.destroy(); + message.success("发布成功"); + state.pub = false; + getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("发布失败", err); @@ -909,11 +914,16 @@ export default { api .handleLearnPath(obj) .then((res) => { - console.log("复制成功", res); - message.destroy(); - message.success("复制成功"); - state.copyModal = false; - getLearnPath(); + if (res.data.code === 200) { + console.log("复制成功", res); + message.destroy(); + message.success("复制成功"); + state.copyModal = false; + getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("复制失败", err); @@ -937,11 +947,16 @@ export default { api .handleLearnPath(obj) .then((res) => { - console.log("停用成功", res); - message.destroy(); - message.success("停用成功"); - state.stopModal = false; - getLearnPath(); + if (res.data.code === 200) { + console.log("停用成功", res); + message.destroy(); + message.success("停用成功"); + state.stopModal = false; + getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("停用失败", err); @@ -979,11 +994,16 @@ export default { api .handleLearnPath(obj) .then((res) => { - console.log("撤回成功", res); - message.destroy(); - message.success("撤回成功"); - state.backModal = false; - getLearnPath(); + if (res.data.code === 200) { + console.log("撤回成功", res); + message.destroy(); + message.success("撤回成功"); + state.backModal = false; + getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("撤回失败", err); @@ -1502,11 +1522,16 @@ export default { api .handleLearnPath(obj) .then((res) => { - console.log("删除成功", res); - message.destroy(); - message.success("删除成功"); - state.deleteModal = false; - getLearnPath(); + if (res.data.code === 200) { + console.log("删除成功", res); + message.destroy(); + message.success("删除成功"); + state.deleteModal = false; + getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("删除失败", err); @@ -1579,23 +1604,28 @@ export default { api .createLearnPath(obj) .then((res) => { - console.log("修改成功", res); - message.destroy(); - message.success("修改成功"); - // state.createLoading = false; - // state.currentPage = 1; - state.out1 = false; - // router.push("/leveladd"); - getLearnPath(); - // setTimeout(() => { - // console.log("修改成功", res); - // message.success("修改成功"); - // // state.createLoading = false; - // // state.currentPage = 1; - // state.out1 = false; - // // router.push("/leveladd"); - // getLearnPath(); - // }, 1000); + if (res.data.code === 200) { + console.log("修改成功", res); + message.destroy(); + message.success("修改成功"); + // state.createLoading = false; + // state.currentPage = 1; + state.out1 = false; + // router.push("/leveladd"); + getLearnPath(); + // setTimeout(() => { + // console.log("修改成功", res); + // message.success("修改成功"); + // // state.createLoading = false; + // // state.currentPage = 1; + // state.out1 = false; + // // router.push("/leveladd"); + // getLearnPath(); + // }, 1000); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } }) .catch((err) => { console.log("修改失败", err); diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index edf0de79..8bba71ef 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -138,10 +138,11 @@
快速添加学员
- +
@@ -1770,12 +1771,17 @@ export default { }; handleLearnPath(obj) .then((res) => { - console.log("发布成功", res); - message.destroy(); - message.success("发布成功"); - state.pub = false; - state.nodata = false; - // getLearnPath(); + if (res.data.code === 200) { + console.log("发布成功", res); + message.destroy(); + message.success("发布成功"); + state.pub = false; + state.nodata = false; + // getLearnPath(); + } + if (res.data.code === -1) { + message.warning(res.data.msg); + } reget(); }) @@ -2407,7 +2413,9 @@ export default { .ant-modal { width: 424px !important; height: 258px !important; - + .ant-modal-close-x { + display: none; + } .ant-modal-content { width: 424px !important; height: 258px !important; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 73c0975d..f2f5540f 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -905,9 +905,7 @@
- 请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }} + 请确认是否批量删除任务
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 10bcce5b..b99795cc 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3,7 +3,7 @@
- +
{{ name }}
@@ -11,29 +11,29 @@
起止时间：{{ startTime }}至{{ endTime }}
- +
{{ act }}
{{ act }}
@@ -43,9 +43,9 @@
-->
{{ item.stage }}
@@ -253,28 +253,28 @@
课程完成率
考试通过率
作业完成率
@@ -285,8 +285,8 @@
阶段任务总数
@@ -295,8 +295,8 @@
必修课
@@ -305,8 +305,8 @@
选修课
@@ -324,12 +324,12 @@ 批量面授报名 --> @@ -346,8 +346,8 @@
-->