diff --git a/package.json b/package.json index f231c096..e0c600e3 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "ant-design-vue": "^3.2.12", "axios": "^1.1.3", "core-js": "^3.8.3", + "dayjs": "^1.11.6", "element-plus": "^2.2.17", "element-resize-detector": "^1.2.4", "html2canvas": "^1.4.1", diff --git a/src/api/config.js b/src/api/config.js index e0c19a8e..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 17:39:23 + * @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 */ @@ -55,10 +55,10 @@ http.interceptors.response.use( if (code === 0 || code === 200) { return response; } else { - if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", '_self'); - // window.open("http://111.231.196.214:12013/manage/login", '_self'); - } + // if (code === 1000) { + // window.open("https://u-pre.boe.com/web/", '_self'); + // // window.open("http://111.231.196.214:12013/manage/login", '_self'); + // } console.log("api %o", msg); } return response; diff --git a/src/api/indexFace.js b/src/api/indexFace.js index 51ff5214..abe38794 100644 --- a/src/api/indexFace.js +++ b/src/api/indexFace.js @@ -1,7 +1,7 @@ import http from "./config"; //获取面授课开课详情 -export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/manageApi/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``) +export const queryFaceDetailById = (offcoursePlanId) => http.post(`/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``) //新建或编辑面授课开课 export const editPlan = (obj) => http.post('/admin/offcourse/editPlan', obj) \ No newline at end of file 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
- +
编辑面授
添加面授
+ :maxlength="50"/>
@@ -32,7 +32,7 @@
@@ -43,7 +43,8 @@
- +
@@ -52,7 +53,8 @@ 面授说明：
- +
@@ -63,8 +65,8 @@ 授课教师：
- - + +
@@ -105,7 +107,7 @@
+ :maxlength="100"/>
@@ -350,7 +352,7 @@ export default { setup(props, ctx) { const options = ref([]); const state = reactive({ - loading:false, + loading: false, selfacetvisible: false, addhomeworkvisible: false, addtestvisible: false, @@ -408,6 +410,7 @@ export default { }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); + ctx.emit("update:edit", false); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); state.fileList = [] @@ -533,22 +536,22 @@ export default { offcourseId: state.chooseCourse, offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, testId: state.EditTestId, - duration:state.duration, + duration: state.duration, }; console.log("obj============", obj, "6" + "9"); console.log("222222222"); editPlan(obj).then(async (res) => { - message.destroy(); - message.success(`添加成功`); - await updateTask(res); - ctx.emit("changeData", false); - closeDrawer(); - }).catch((e) => { - console.log(e) - message.destroy(); - message.error(`添加失败`); - }); + message.destroy(); + message.success(`添加成功`); + await updateTask(res); + ctx.emit("changeData", false); + closeDrawer(); + }).catch((e) => { + console.log(e) + message.destroy(); + message.error(`添加失败`); + }); } }; @@ -796,6 +799,7 @@ export default { display: flex; align-items: flex-start; margin-bottom: 32px; + .textarea { width: 423px; @@ -817,6 +821,7 @@ export default { border-radius: 8px; } } + .signbox { width: 120px; display: flex; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index eaabbe00..1dedcb9a 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -66,8 +66,10 @@
@@ -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 @@
-
-
- 选择在线课 -
-
-
+
{{ edit ? "编辑" : "添加" }}考试
@@ -34,60 +34,62 @@ -->
-
+ has-feedback + label="考试说明" + name="examinationExplain" + > +
+ +
选择考试 @@ -115,28 +117,25 @@ --> - - - 删除考试 - - - + + + 删除考试 + + +
- - -
@@ -144,14 +143,14 @@
分钟 @@ -161,16 +160,16 @@
考试限制 次 -1表示无限制-1表示无限制
@@ -188,20 +187,22 @@
允许查看允许查看 + 不允许查看不允许查看 + @@ -211,20 +212,22 @@
允许查看允许查看 + 不允许查看不允许查看 + @@ -234,20 +237,22 @@
最高一次最高一次 + 最后一次最后一次 + @@ -257,9 +262,9 @@
分 @@ -268,31 +273,34 @@
试题乱序试题乱序 + 试题排序试题排序 + 全部乱序全部乱序 + @@ -306,31 +314,31 @@
@@ -338,16 +346,16 @@
@@ -355,19 +363,20 @@
-
-
+
+ +
@@ -380,24 +389,25 @@
- +
- +