hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 04:46:46 +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

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

@@ -174,12 +174,12 @@
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<div class="qdqtbox">
<!-- <div class="qdqtbox">
<div class="qtbtn">
<div class="btntext">签退</div>
</div>
</div>
<div class="setbox">
</div> -->
<!-- <div class="setbox">
<div class="timerbox">
<span>结束前：</span>
<a-input-number
@@ -198,7 +198,7 @@
>分钟（提前签退则记为早退）</span
>
</div>
</div>
</div> -->
</div>
</div>
<div class="main_item">
@@ -209,12 +209,11 @@
<a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到
</a-radio
>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
</a-radio>
<!-- <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成
</a-radio
>
> -->
</a-radio-group>
</div>
</div>
@@ -319,7 +318,7 @@ export default {
state.textV1 = "";
state.textV2 = "";
state.time = "";
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
// message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
@@ -338,7 +337,7 @@ export default {
state.time = "";
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
}
};
const queryActive = () => {
api
.getActivity(props.EditActiveId)
@@ -359,8 +358,7 @@ export default {
dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
];
})
.catch(() => {
});
.catch(() => {});
};
const afterVisibleChange = (bool) => {
if (bool && props.edit) {
@@ -424,8 +422,6 @@ export default {
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
};
//创建活动

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

@@ -262,10 +262,10 @@
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<div class="qdqtbox">
<!-- <div class="qdqtbox">
<div class="qtbtn"><div class="btntext">签退</div></div>
</div>
<div class="setbox">
</div> -->
<!-- <div class="setbox">
<div class="timerbox">
<span>结束前：</span>
<a-input-number
@@ -275,14 +275,16 @@
style="
width: 88px;
height: 32px;
border-radius: 8px;overflow: hidden; "
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV8"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟（提前签退则记为早退）</span
>
</div>
</div>
</div> -->
</div>
</div>
<div class="main_item">
@@ -292,9 +294,9 @@
<div class="btnbox">
<a-radio-group v-model:value="radioV1">
<a-radio :value="1" @click="cloradio1">仅签到</a-radio>
<a-radio :value="2" @click="cloradio1"
<!-- <a-radio :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio
>
> -->
</a-radio-group>
</div>
</div>
@@ -305,7 +307,7 @@
<div class="btnbox">
<a-checkbox
v-model:checked="switchC2"
@onclick="(switchC2 = !switchC2)"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成</a-checkbox
>
</div>

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

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

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

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

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

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