diff --git a/src/App.vue b/src/App.vue index a2c77061..73dde7df 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,7 +43,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.3------------"); + console.log("版本0.9.4------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 0fc645fe..586d71da 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-07 08:54:55 + * @LastEditTime: 2022-12-07 13:40:40 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index a0e3b418..56c0271a 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -21,24 +21,24 @@
-
课程编号：
+
课程信息：
-
内容分类：
+
课程分类：
{ message.destroy(); - message.success( - `${props.edit ? "编辑" : "新增"}任务成功` - ); + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); }) .catch(() => { message.destroy(); - message.error( - `${props.edit ? "编辑" : "新增"}任务失败` - ); + message.error(`${props.edit ? "编辑" : "新增"}任务失败`); }); }); } @@ -583,7 +581,7 @@ export default { }; //搜索在线列表 const searchList = () => { - if (state.inputV1 !== "" || state.selectV !== "") { + if (state.inputV1 || state.selectV) { getAllOnlineText(); } else { resetOnline(); @@ -591,8 +589,8 @@ export default { }; //重置在线信息 const resetOnline = () => { - state.inputV1 = ""; - state.selectV = ""; + state.inputV1 = null; + state.selectV = null; state.selectedRowKeys = []; state.addOnlineList = []; state.currentPage = 1; @@ -763,6 +761,7 @@ export default { } .ant-table-selection-column { padding: 0px !important; + padding-left: 5px !important; } .ant-table-thead > tr > th { background-color: rgba(239, 244, 252, 1); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 84c11bf1..cce4e1b8 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -580,6 +580,7 @@ export default { // state.addLoading = true; queryExaminationDetailById({ examinationId: props.EditTestId }) .then((res) => { + console.log("获取编辑考试信息", res); formState.examinationName = res.data.data.examinationName; formState.workRequirement = res.data.data.workRequirement; formState.examinationDuration = res.data.data.examinationDuration; @@ -594,6 +595,9 @@ export default { formState.showAnswers = Number(res.data.data.showAnswers) || 1; formState.papaerName = res.data.data.examinationTestName; state.paperName = res.data.data.examinationTestName; + // state.paperId= + state.paperId = res.data.data.examinationTestId; + state.paperName = res.data.data.examinationTestName; if ( res.data.data.examinationEndTime && res.data.data.examinationStartTime @@ -658,7 +662,7 @@ export default { updateExamination(obj) .then(async (res) => { await updateTask(res); - closeDrawer(); + // closeDrawer(); }) .catch(() => { message.destroy(); @@ -669,7 +673,7 @@ export default { createExamination(obj) .then(async (res) => { await updateTask(res); - closeDrawer(); + // closeDrawer(); }) .catch(() => { message.destroy(); @@ -694,7 +698,8 @@ export default { }; RouterEditTask(editObj1) .then(() => { - //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + console.log("props.edit", props.edit); + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); state.addLoading = false; closeDrawer(); @@ -715,8 +720,9 @@ export default { // 新增编辑或新增项目 ProjectEditTask(editObj) .then(() => { - //message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); + closeDrawer(); }) .catch(() => { //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); @@ -732,8 +738,9 @@ export default { type: 5, }) .then(() => { - //message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); + closeDrawer(); }) .catch(() => { //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index e93ff052..14e6bd4b 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -1,54 +1,57 @@ \ No newline at end of file +} + \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 7dc0e9c0..133e2f9d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -455,7 +455,9 @@
「{{ checkType(item.type) }}」
-
{{ item.name }}
+
+ {{ item.name }} +
@@ -466,7 +468,7 @@
开始时间
- {{ item.startTime !== null ? item.startTime : "" }} + {{ item.startTime !== null ? item.startTime : "-" }}
@@ -3751,7 +3753,10 @@ export default { color: #999ba3; font-size: 14px; margin-left: 12px; - width: 83px; + width: 120px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } }