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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
wyx
2022-12-09 15:46:09 +08:00
parent e98d551090 ce0b939112
commit 44b2d23ff8
4 changed files with 904 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,8 +867,8 @@ export default {
console.log("获取关卡、任务、学员统计数据", res.data);
if (res.status === 200) {
// state.routeStudentsNum = res.data.students;
state.routeChapters = res.data.chapters;
state.routeTasks = res.data.tasks;
state.routeChapters = res.data.data.chapters;
state.routeTasks = res.data.data.tasks;
}
})
.catch((err) => {

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

@@ -854,7 +854,12 @@
<div
v-for="item in fileList"
:key="item.uid"
style="width:500px;display:flex;justify-content:space-between;align-items:center;"
style="
width: 500px;
display: flex;
justify-content: space-between;
align-items: center;
"
class="docListStyle"
>
<img
@@ -867,9 +872,17 @@
"
alt=""
/>
<span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
item.name
}}</span>
<span
style="
font: oblique bold 16px Sans-serif;
width: 300px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.name }}</span
>
<span
style="color: #4ea6ff; cursor: pointer"
@click="deFile(item.uid)"
@@ -1280,7 +1293,7 @@ import TestManage from "../../components/drawers/TestManage";
import FaceManage from "../../components/drawers/FaceManage";
import WorkManage from "../../components/drawers/WorkManage";
import SeeStu from "../../components/drawers/SeeStu";
// import { useRoute } from "vue-router";
import { useRouter } from "vue-router";
// import { useStore } from "vuex";
import { storage } from "../../api/storage";
import { getRouterOverview } from "@/api/indexLearningPath";
@@ -1308,7 +1321,7 @@ export default {
TwoDimensionalCode,
},
setup() {
// const routers = useRoute();
const router = useRouter();
// const store = useStore();
const state = reactive({
routerId: storage.get("routerId")
@@ -1844,8 +1857,8 @@ export default {
if (res.status === 200) {
// console.log("获取关卡、任务、学员统计数据", res.data);
// state.routeStudentsNum = res.data.students;
state.routeChapters = res.data.chapters;
state.routeTasks = res.data.tasks;
state.routeChapters = res.data.data.chapters;
state.routeTasks = res.data.data.tasks;
}
})
.catch((err) => {
@@ -2295,7 +2308,16 @@ export default {
);
const totask = () => {
state.activeKey = "2";
// console.log("state.taskSyllabus", state.taskSyllabus);
router.push({
path: "/leveladddetail",
});
// if (state.taskSyllabus.length===1) {
// if(state.taskSyllabus[0].taskList.length===0){
// // /leveladddetail
// }
// }
// state.activeKey = "2";
};
const tostudent = () => {
state.activeKey = "3";

4
src/views/projectcenter/ProjectManage.vue
View File

@@ -1022,8 +1022,8 @@ export default {
api.getProjectCount(object.projectId).then((res) => {
console.log("获取关卡、任务、学员统计数据", res.data);
// state.projectStudentsNum = res.data.students;
state.projectStages = res.data.stages;
state.projectTasks = res.data.tasks;
state.projectStages = res.data.data.stages;
state.projectTasks = res.data.data.tasks;
});
//获取学员总数
let obj = {

43
src/views/projectcenter/TaskPage.vue
View File

@@ -1236,7 +1236,12 @@
<div
v-for="item in fileList"
:key="item.uid"
style="width:500px;display:flex;justify-content:space-between;align-items:center;"
style="
width: 500px;
display: flex;
justify-content: space-between;
align-items: center;
"
class="docListStyle"
>
<img
@@ -1249,9 +1254,17 @@
"
alt=""
/>
<span style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
item.name
}}</span>
<span
style="
font: oblique bold 16px Sans-serif;
width: 300px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.name }}</span
>
<span
style="color: #4ea6ff; float: right; cursor: pointer"
@click="deFile(item.uid)"
@@ -2741,7 +2754,11 @@ export default {
// getTableDate();
const totask = () => {
state.activeKey = "2";
// state.activeKey = "2";
routered.push({
path: `/taskadd`,
query: { projectId: state.projectId },
});
};
const tostudent = () => {
state.activeKey = "3";
@@ -3499,10 +3516,12 @@ export default {
//清空所选的学员
const clearChooseStu = () => {
Modal.confirm({
title: '确定清空所有学员吗？', onOk: async () => {
state.tabledata = []
student.studentDelAll({id: state.projectId, type: 1})
}, bodyStyle: 'margin-top:70%'
title: "确定清空所有学员吗？",
onOk: async () => {
state.tabledata = [];
student.studentDelAll({ id: state.projectId, type: 1 });
},
bodyStyle: "margin-top:70%",
});
};
//学员重置
@@ -3917,8 +3936,10 @@ export default {
apiproj.getProjectCount(state.projectId).then((res) => {
console.log("获取关卡、任务、学员统计数据", res.data);
// state.projectStudentsNum = res.data.students;
state.projectStages = res.data.stages;
state.projectTasks = res.data.tasks;
// state.projectStages = res.data.stages;
// state.projectTasks = res.data.tasks;
state.projectStages = res.data.data.stages;
state.projectTasks = res.data.data.tasks;
});
//获取学员总数
let obj = {