hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-12 12:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-02 10:01:48 +08:00
parent 8ae00ef4ce
commit c1842cd0e1
6 changed files with 262 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
src/components/drawers/AddActive.vue
View File

@@ -1,19 +1,19 @@
<template> <template>
<a-drawer <a-drawer
:visible="addactiveVisible" :visible="addactiveVisible"
class="drawerStyle addactiveDrawer" class="drawerStyle addactiveDrawer"
width="80%" width="80%"
title="添加活动" title="添加活动"
placement="right" placement="right"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}活动</div> <div class="headerTitle">{{ edit ? "编辑" : "添加" }}活动</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="contentMain"> <div class="contentMain">
@@ -22,18 +22,18 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">活动名称：</span> <span style="margin-right: 3px">活动名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width: 424px; height: 32px" style="width: 424px; height: 32px"
placeholder="请输入活动名称" placeholder="请输入活动名称"
maxlength="20" maxlength="20"
/> />
</div> </div>
</div> </div>
@@ -41,18 +41,18 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">活动公告：</span> <span style="margin-right: 3px">活动公告：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea
v-model:value="textV1" v-model:value="textV1"
placeholder="请输入活动公告" placeholder="请输入活动公告"
allow-clear allow-clear
maxlength="150" maxlength="150"
/> />
</div> </div>
</div> </div>
@@ -62,10 +62,10 @@
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea
v-model:value="textV2" v-model:value="textV2"
placeholder="请输入活动说明" placeholder="请输入活动说明"
allow-clear allow-clear
maxlength="150" maxlength="150"
/> />
</div> </div>
</div> </div>
@@ -73,17 +73,17 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">活动时间：</span> <span style="margin-right: 3px">活动时间：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
style="width: 424px" style="width: 424px"
v-model:value="time" v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
</div> </div>
</div> </div>
@@ -91,23 +91,23 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">活动时长：</span> <span style="margin-right: 3px">活动时长：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input-number <a-input-number
:min="0" :min="0"
:precision="0" :precision="0"
style=" style="
width: 388px; width: 388px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
" "
v-model:value="inputV2" v-model:value="inputV2"
/> />
<span style="margin-left: 5px">分钟</span> <span style="margin-left: 5px">分钟</span>
</div> </div>
@@ -116,17 +116,17 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">活动地址：</span> <span style="margin-right: 3px">活动地址：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="inputV3" v-model:value="inputV3"
style="width: 424px; height: 32px" style="width: 424px; height: 32px"
placeholder="请输入活动地址" placeholder="请输入活动地址"
/> />
</div> </div>
</div> </div>
@@ -144,42 +144,42 @@
<div class="timerbox"> <div class="timerbox">
<span>开始前：</span> <span>开始前：</span>
<a-input-number <a-input-number
:min="0" :min="0"
:max="30" :max="30"
:precision="0" :precision="0"
style=" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
" "
v-model:value="inputV4" v-model:value="inputV4"
/> />
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>开始后：</span> <span>开始后：</span>
<a-input-number <a-input-number
:min="0" :min="0"
:max="30" :max="30"
:precision="0" :precision="0"
style=" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
" "
v-model:value="inputV5" v-model:value="inputV5"
/> />
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
<div class="qdqtbox"> <!-- <div class="qdqtbox">
<div class="qtbtn"> <div class="qtbtn">
<div class="btntext">签退</div> <div class="btntext">签退</div>
</div> </div>
</div> </div> -->
<div class="setbox"> <!-- <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>结束前：</span> <span>结束前：</span>
<a-input-number <a-input-number
@@ -198,7 +198,7 @@
>分钟（提前签退则记为早退）</span >分钟（提前签退则记为早退）</span
> >
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -208,13 +208,12 @@
<div class="btnbox"> <div class="btnbox">
<a-radio-group v-model:value="radioV1"> <a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1" <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到 >仅签到
</a-radio </a-radio>
> <!-- <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成 >签到、签退全部完成
</a-radio </a-radio
> > -->
</a-radio-group> </a-radio-group>
</div> </div>
</div> </div>
@@ -228,11 +227,11 @@
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import {reactive, toRefs} from "vue"; import { reactive, toRefs } from "vue";
import * as api from "../../api/indexActivity"; import * as api from "../../api/indexActivity";
import * as apiTask from "../../api/indexTaskadd"; import * as apiTask from "../../api/indexTaskadd";
import {RouterEditTask} from "@/api/indexTask"; import { RouterEditTask } from "@/api/indexTask";
import {message} from "ant-design-vue"; import { message } from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
export default { export default {
@@ -319,7 +318,7 @@ export default {
state.textV1 = ""; state.textV1 = "";
state.textV2 = ""; state.textV2 = "";
state.time = ""; state.time = "";
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); // message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
}; };
@@ -338,29 +337,28 @@ export default {
state.time = ""; state.time = "";
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
} };
const queryActive = () => { const queryActive = () => {
api api
.getActivity(props.EditActiveId) .getActivity(props.EditActiveId)
.then((res) => { .then((res) => {
//更新讨论信息 //更新讨论信息
state.inputV1 = res.data.data.activityName; state.inputV1 = res.data.data.activityName;
state.textV1 = res.data.data.activityNotice; state.textV1 = res.data.data.activityNotice;
state.textV2 = res.data.data.activityExplain; state.textV2 = res.data.data.activityExplain;
state.inputV2 = res.data.data.activityDuration; state.inputV2 = res.data.data.activityDuration;
state.inputV3 = res.data.data.activityAddress; state.inputV3 = res.data.data.activityAddress;
state.inputV5 = res.data.data.afterSignIn; 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.inputV4 = res.data.data.beforeSignIn;
state.radioV1 = Number(res.data.data.standardSettings); state.radioV1 = Number(res.data.data.standardSettings);
state.time = [ state.time = [
dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
]; ];
}) })
.catch(() => { .catch(() => {});
});
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (bool && props.edit) { if (bool && props.edit) {
@@ -383,49 +381,47 @@ export default {
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 9, type: 9,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
await apiTask await apiTask
.addTask({ .addTask({
courseId: res.data.data.activityId, courseId: res.data.data.activityId,
duration: res.data.data.activityDuration, duration: res.data.data.activityDuration,
name: res.data.data.activityName, name: res.data.data.activityName,
projectId: props.projectId, projectId: props.projectId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 9, type: 9,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
//////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
await apiTask await apiTask
.addTempTask({ .addTempTask({
courseId: res.data.data.activityId, courseId: res.data.data.activityId,
duration: res.data.data.activityDuration, duration: res.data.data.activityDuration,
name: res.data.data.activityName, name: res.data.data.activityName,
projectTemplateId: props.projectTemplateId, projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 9, type: 9,
}) })
.then(() => { .then(() => {
ctx.emit("changeData", false); ctx.emit("changeData", false);
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} }
}; };
//创建活动 //创建活动
@@ -469,33 +465,33 @@ export default {
if (props.edit) { if (props.edit) {
//更新编辑活动信息 //更新编辑活动信息
api api
.updateActivity(obj) .updateActivity(obj)
.then(async (res) => { .then(async (res) => {
closeDrawer(); closeDrawer();
await updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
message.success("更新成功"); message.success("更新成功");
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error("更新失败"); message.error("更新失败");
}); });
} else { } else {
//新建活动信息 //新建活动信息
api api
.createActivity(obj) .createActivity(obj)
.then(async (res) => { .then(async (res) => {
message.destroy(); message.destroy();
message.success("创建成功"); message.success("创建成功");
closeDrawer(); closeDrawer();
await updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error("创建失败"); message.error("创建失败");
}); });
} }
}; };

160
src/components/drawers/AddDiscuss.vue
View File

@@ -1,18 +1,18 @@
<template> <template>
<a-drawer <a-drawer
:visible="adddiscussVisible" :visible="adddiscussVisible"
class="drawerStyle addrefDrawer" class="drawerStyle addrefDrawer"
width="80%" width="80%"
placement="right" placement="right"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div> <div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="contentMain"> <div class="contentMain">
@@ -21,19 +21,19 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">讨论名称：</span> <span style="margin-right: 3px">讨论名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width: 424px; height: 32px" style="width: 424px; height: 32px"
placeholder="请输入讨论名称" placeholder="请输入讨论名称"
show-count show-count
:maxlength="20" :maxlength="20"
/> />
</div> </div>
</div> </div>
@@ -43,11 +43,11 @@
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea
v-model:value="textV1" v-model:value="textV1"
placeholder="请输入讨论说明" placeholder="请输入讨论说明"
allow-clear allow-clear
show-count show-count
:maxlength="200" :maxlength="200"
/> />
</div> </div>
</div> </div>
@@ -57,7 +57,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="checkedC1" @change="checkRadio" <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
>允许评论</a-checkbox >允许评论</a-checkbox
> >
</div> </div>
</div> </div>
@@ -170,15 +170,15 @@ export default {
if (props.edit) { if (props.edit) {
//编辑讨 //编辑讨
api api
.getDiscussDetail({ discussId: props.EditDiscussId }) .getDiscussDetail({ discussId: props.EditDiscussId })
.then((res) => { .then((res) => {
//更新讨论信息 //更新讨论信息
state.inputV1 = res.data.data.discussName; state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain; state.textV1 = res.data.data.discussExplain;
state.checkedC1 = state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false; res.data.data.discussSettings == "true" ? true : false;
}) })
.catch(() => {}); .catch(() => {});
} }
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
@@ -196,28 +196,28 @@ export default {
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
apiTask apiTask
.addTask({ .addTask({
courseId: res.data.data.discussId, courseId: res.data.data.discussId,
name: res.data.data.discussName, name: res.data.data.discussName,
projectId: props.projectId, projectId: props.projectId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log(""); console.log("");
addTempTask({ addTempTask({
@@ -228,12 +228,12 @@ export default {
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} }
}; };
const updateDiscussInfo = () => { const updateDiscussInfo = () => {
@@ -250,32 +250,32 @@ export default {
}; };
if (props.edit) { if (props.edit) {
api api
.updateDiscuss(obj) .updateDiscuss(obj)
.then((res) => { .then((res) => {
updateTask(res); updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
message.success("创建讨论成功"); message.success("创建讨论成功");
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error("创建讨论失败"); message.error("创建讨论失败");
}); });
} else { } else {
api api
.createDiscuss(obj) .createDiscuss(obj)
.then((res) => { .then((res) => {
updateTask(res); updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy(); message.destroy();
message.success("创建讨论成功"); message.success("创建讨论成功");
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error("创建讨论失败"); message.error("创建讨论失败");
}); });
} }
}; };
return { return {

28
src/components/drawers/AddLive.vue
View File

@@ -262,10 +262,10 @@
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
<div class="qdqtbox"> <!-- <div class="qdqtbox">
<div class="qtbtn"><div class="btntext">签退</div></div> <div class="qtbtn"><div class="btntext">签退</div></div>
</div> </div> -->
<div class="setbox"> <!-- <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>结束前：</span> <span>结束前：</span>
<a-input-number <a-input-number
@@ -275,14 +275,16 @@
style=" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px;overflow: hidden; " border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV8" v-model:value="inputV8"
></a-input-number> ></a-input-number>
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px"
>分钟（提前签退则记为早退）</span >分钟（提前签退则记为早退）</span
> >
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -292,9 +294,9 @@
<div class="btnbox"> <div class="btnbox">
<a-radio-group v-model:value="radioV1"> <a-radio-group v-model:value="radioV1">
<a-radio :value="1" @click="cloradio1">仅签到</a-radio> <a-radio :value="1" @click="cloradio1">仅签到</a-radio>
<a-radio :value="2" @click="cloradio1" <!-- <a-radio :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio >签到、签退全部完成</a-radio
> > -->
</a-radio-group> </a-radio-group>
</div> </div>
</div> </div>
@@ -305,7 +307,7 @@
<div class="btnbox"> <div class="btnbox">
<a-checkbox <a-checkbox
v-model:checked="switchC2" v-model:checked="switchC2"
@onclick="(switchC2 = !switchC2)" @onclick="switchC2 = !switchC2"
>学员请假后记为任务完成</a-checkbox >学员请假后记为任务完成</a-checkbox
> >
</div> </div>
@@ -448,7 +450,7 @@ export default {
state.switchC1 = ""; state.switchC1 = "";
state.imageUrl = ""; state.imageUrl = "";
state.needEval = false; state.needEval = false;
state.switchC2=false; state.switchC2 = false;
ctx.emit("changeData", false); ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
@@ -498,7 +500,7 @@ export default {
//state.= res.data.data //state.= res.data.data
state.assessmentId = res.data.data.assessmentId; state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover; state.imageUrl = res.data.data.liveCover;
state.switchC2 = res.data.data.otherSettings==1?true:false; state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
}) })
.catch(() => { .catch(() => {
//message.error(`查询失败`); //message.error(`查询失败`);
@@ -629,10 +631,10 @@ export default {
liveId: props.edit ? props.EditLiveId : 0, liveId: props.edit ? props.EditLiveId : 0,
liveLink: state.inputV4, liveLink: state.inputV4,
liveName: state.inputV1, liveName: state.inputV1,
livePlayback: state.switchC1? "1" : "0", livePlayback: state.switchC1 ? "1" : "0",
livePlaybackLink: state.switchC1 ? state.inputV5 : "", livePlaybackLink: state.switchC1 ? state.inputV5 : "",
liveTeacherId: state.inputV3, liveTeacherId: state.inputV3,
otherSettings: state.switchC2?"1":"0", //1或0 otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8, signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2 standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0", isEvaluate: state.needEval ? "1" : "0",
@@ -745,7 +747,7 @@ export default {
queryMember(); queryMember();
state.fetching = false; state.fetching = false;
}, 300); }, 300);
const handleChange2 = (value,label) => { const handleChange2 = (value, label) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.inputV3 = value; state.inputV3 = value;
state.memberValue = label; state.memberValue = label;

1
src/views/learningpath/LearningPath.vue
View File

@@ -1526,6 +1526,7 @@ export default {
//获取路径图详细信息 //获取路径图详细信息
const getLearnPathInfo = (item) => { const getLearnPathInfo = (item) => {
console.log("item", item);
state.out1 = true; state.out1 = true;
state.pathName = item.manager; state.pathName = item.manager;
state.pathBg = ""; state.pathBg = "";

14
src/views/learningpath/LevelAdd.vue
View File

@@ -564,7 +564,7 @@
<a-input <a-input
v-model:value="gatenamee" v-model:value="gatenamee"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="关卡名称" placeholder="请输入姓名"
/> />
<div class="btns" @click="searchLevel"> <div class="btns" @click="searchLevel">
<div class="btn btn1"> <div class="btn btn1">
@@ -1649,7 +1649,7 @@ export default {
//获取学员列表 //获取学员列表
const getStudent = () => { const getStudent = () => {
let obj = { let obj = {
name: "", name: state.gatenamee,
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: 10, pageSize: 10,
routerId: state.routerId, routerId: state.routerId,
@@ -1985,10 +1985,12 @@ export default {
}); });
}; };
const searchLevel = () => { const searchLevel = () => {
const result = state.tableData.filter( // const result = state.tableData.filter(
(item) => item.cur == state.gatenamee // (item) => item.cur == state.gatenamee
); // );
state.tableData = result; // state.tableData = result;
state.currentPage = 1;
getStudent();
}; };
const resetLevel = () => { const resetLevel = () => {
state.gatenamee = ""; state.gatenamee = "";

17
src/views/learningpath/LevelAddDetail.vue
View File

@@ -640,7 +640,16 @@
</div> </div>
</div> </div>
</div> </div>
<div style="width: 120px; text-align: center"> <div
style="
width: 120px;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
:title="element.creater"
>
{{ element.creater }} {{ element.creater }}
</div> </div>
<div style="width: 120px; text-align: center"> <div style="width: 120px; text-align: center">
@@ -1415,9 +1424,11 @@ export default {
item["value"] = item.chapterId; item["value"] = item.chapterId;
item["label"] = item.name; item["label"] = item.name;
}); });
console.log("路径图详情", res);
if (state.level.length > 0) { if (state.level.length > 0) {
let chapter = localStorage.getItem("chapterId"); let chapter = localStorage.getItem("chapterId");
if (chapter !== "null") { // console.log("chapter", chapter, chapter !== "null");
if (chapter) {
dataAssignment(chapter); //用哪个的任务表 dataAssignment(chapter); //用哪个的任务表
state.isactive = chapter; //哪个亮 state.isactive = chapter; //哪个亮
} else { } else {
@@ -1593,6 +1604,7 @@ export default {
document.getElementsByTagName("main")[0].style.background = "#ffffff"; document.getElementsByTagName("main")[0].style.background = "#ffffff";
document.getElementsByTagName("main")[0].style.boxShadow = document.getElementsByTagName("main")[0].style.boxShadow =
"0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
localStorage.removeItem("chapterId");
}); });
const changebgc = (chapterId) => { const changebgc = (chapterId) => {
state.isactive = chapterId; state.isactive = chapterId;
@@ -1729,6 +1741,7 @@ export default {
chapterId: state.removeStageId, chapterId: state.removeStageId,
routerTaskIdList: state.selectRow, routerTaskIdList: state.selectRow,
}; };
console.log("移动关卡obj", obj);
api api
.moveTask(obj) .moveTask(obj)
.then((res) => { .then((res) => {