diff --git a/src/App.vue b/src/App.vue index bce15edf..4ba1c1e5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.0.5------------"); + console.log("版本2.0.6------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/assets/images/leveladd/reset.png b/src/assets/images/leveladd/reset.png new file mode 100644 index 00000000..6dc4a01a Binary files /dev/null and b/src/assets/images/leveladd/reset.png differ diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index 4bf83780..8098f4a3 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -56,18 +56,17 @@ export default { const closePage = (value) => { console.log("点击关闭页面", value, state.openList); - + state.openList.map((item, key) => { if (item.href === value.href) { if (state.openList.length === 1) { if (state.openList[0].href !== "/learningpath") { state.openList.splice(key, 1); $router.push({ path: "/learningpath" }); - }else{ + } else { message.destroy(); return message.warning("至少保留一个页面"); } - } else { if (value.active) { if (key === state.openList.length - 1) { @@ -117,7 +116,6 @@ export default { .close { width: 50px; height: 50px; - position: absolute; display: flex; diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index fc0bcc0c..976c579b 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -31,14 +31,13 @@
- - +
@@ -51,10 +50,11 @@
@@ -74,7 +74,7 @@ 分钟 @@ -93,7 +93,7 @@
@@ -109,13 +109,14 @@
活动公告：
-
+
@@ -129,7 +130,8 @@ placeholder="请输入活动说明" allow-clear :rows="6" - show-count :maxlength="200" + show-count + :maxlength="200" />
@@ -158,7 +160,9 @@ " v-model:value="inputV4" /> - 分钟允许签到 + 分钟允许签到
活动开始后： @@ -174,7 +178,9 @@ " v-model:value="inputV5" /> - 分钟允许签到 + 分钟允许签到
- -
+
-
- -
+
-
@@ -318,7 +321,7 @@ export default { textV2: "", radioV1: "", time: "", - isClick: false + isClick: false, }); const closeDrawer = () => { ctx.emit("update:addactiveVisible", false); @@ -357,7 +360,8 @@ export default { api .getActivity(props.EditActiveId) .then((res) => { - //更新讨论信息 + console.log("获取活动信息", res); + //获取活动信息 state.inputV1 = res.data.data.activityName; state.textV1 = res.data.data.activityNotice; state.textV2 = res.data.data.activityExplain; @@ -387,7 +391,7 @@ export default { }; const updateTask = async (res) => { if (props.isLevel == 1) { - if(!props.isactive){ + if (!props.isactive) { message.destroy(); return message.warning("请先选中关卡"); } @@ -466,11 +470,11 @@ export default { return message.warning("请输入活动地址"); } - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } state.isClick = true; let obj = { @@ -483,11 +487,12 @@ export default { activityNotice: state.textV1, //活动公告 activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"), //活动开始时间 activityTag: "", //活动逻辑删除标识 - afterSignIn: state.inputV5, //活动开始后多少分钟签到 - beforeSignIn: state.inputV4, //活动开始前多少分钟签到 + afterSignIn: state.inputV5 ? state.inputV5 : 0, //活动开始后多少分钟签到 + beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到 signOutTime: state.inputV6, //签退开始时间 standardSettings: state.radioV1, //标准设置 }; + console.log("obj", obj); if (props.edit) { //更新编辑活动信息 api @@ -526,28 +531,28 @@ export default { }; const range = (start, end) => { - const result = []; + const result = []; - for (let i = start; i < end; i++) { - result.push(i); - } + for (let i = start; i < end; i++) { + result.push(i); + } - return result; - }; - const disabledDate = (current) => { - // Can not select days before today and today - console.log('1111', dayjs().endOf('day')) - return current && current < dayjs().startOf('day'); - }; + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log("1111", dayjs().endOf("day")); + return current && current < dayjs().startOf("day"); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; - const disabledDateTime = () => { - return { - disabledHours: () => range(0, 24).splice(4, 20), - disabledMinutes: () => range(30, 60), - disabledSeconds: () => [55, 56], - }; - }; - return { ...toRefs(state), afterVisibleChange, @@ -556,9 +561,7 @@ export default { cloradio1, updateActivityInfo, disabledDateTime, - disabledDate - - + disabledDate, }; }, }; @@ -701,7 +704,6 @@ export default { } .setbox { - flex-wrap: wrap; margin-top: 10px; margin-bottom: 24px; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 7f66403e..bd04ce35 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -71,7 +71,8 @@
{ ctx.emit("update:addliveVisible", false); @@ -701,11 +702,11 @@ export default { message.destroy(); return message.warning("请输入直播公告"); } - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } state.isClick = true; const regular = /^[+]{0,1}(\d+)$/; @@ -722,8 +723,8 @@ export default { "Y-M-D h:m" ); state.obj = { - afterSignIn: state.inputV6, - beforeSignIn: state.inputV7, + afterSignIn: state.inputV6 ? state.inputV6 : 0, + beforeSignIn: state.inputV7 ? state.inputV7 : 0, assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 @@ -888,27 +889,27 @@ export default { state.isEvaluate = "0"; }; const range = (start, end) => { - const result = []; + const result = []; - for (let i = start; i < end; i++) { - result.push(i); - } + for (let i = start; i < end; i++) { + result.push(i); + } - return result; - }; - const disabledDate = (current) => { - // Can not select days before today and today - console.log('1111', dayjs().endOf('day')) - return current && current < dayjs().startOf('day'); - }; + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log("1111", dayjs().endOf("day")); + return current && current < dayjs().startOf("day"); + }; - const disabledDateTime = () => { - return { - disabledHours: () => range(0, 24).splice(4, 20), - disabledMinutes: () => range(30, 60), - disabledSeconds: () => [55, 56], - }; - }; + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; return { ...toRefs(state), afterVisibleChange, @@ -927,7 +928,7 @@ export default { showAssessment, removePG, disabledDateTime, - disabledDate + disabledDate, }; }, }; diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index ff141ab1..7b847b60 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -64,8 +64,13 @@ - 重置 + + + 重置 diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 11841d29..0b8be830 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -536,9 +536,8 @@
- - - + +
@@ -668,7 +666,13 @@ > @@ -694,7 +698,6 @@ " class="docListStyle" > - - +
- +
- +
- +
- +
- - + +
@@ -742,7 +793,11 @@ :title="item.name" >{{ item.name }} - 下载 + 下载 - { console.log("router-list", res); state.fileList = JSON.parse(res.data.data.routerInfo.attach); - console.log('asdasdasd-------->',state.fileList) + console.log("asdasdasd-------->", state.fileList); state.docChecked = res.data.data.routerInfo.attachSwitch == 1 ? true : false; if (res.data.data.routerInfo.status == 1) { diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index c754afae..c47725c3 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -6,41 +6,41 @@
@@ -55,8 +55,13 @@ :placeholder="[' 开始时间', ' 结束时间']" />--> - +
@@ -80,26 +85,26 @@
@@ -108,18 +113,18 @@