This commit is contained in:
dongwug
2022-11-09 09:08:01 +08:00
12 changed files with 892 additions and 267 deletions

12
package-lock.json generated
View File

@@ -9526,7 +9526,7 @@
},
"node_modules/sortablejs": {
"version": "1.15.0",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
},
"node_modules/source-map": {
@@ -10456,7 +10456,7 @@
},
"node_modules/vuedraggable": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
"dependencies": {
"sortablejs": "1.14.0"
@@ -10467,7 +10467,7 @@
},
"node_modules/vuedraggable/node_modules/sortablejs": {
"version": "1.14.0",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
},
"node_modules/vuex": {
@@ -19032,7 +19032,7 @@
},
"sortablejs": {
"version": "1.15.0",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
},
"source-map": {
@@ -19805,7 +19805,7 @@
},
"vuedraggable": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
"requires": {
"sortablejs": "1.14.0"
@@ -19813,7 +19813,7 @@
"dependencies": {
"sortablejs": {
"version": "1.14.0",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
}
}

View File

@@ -12,6 +12,9 @@ export const deleteActivity = (obj) => http.post('/activity/deleteActivity', { p
//修改活动接口
export const updateActivity = (obj) => http.post('/activity/updateActivity', obj);
//修改阶段任务信息
export const updateTask=(obj)=>http.post('/admin/project/editTask',obj)
//修改活动是否为必修接口
export const updateActivityToCompulsory = (obj) => http.post('/activity/updateActivityToCompulsory', { params: obj });

View File

@@ -1,16 +1,17 @@
import http from "./config";
//import qs from 'qs';
//创建讨论
export const createDiscuss = (obj) => http.post("/discuss/createDiscuss", obj);
//获取讨论信息接口
export const getDiscussDetail = (obj) =>
http.post("/discuss/getDiscussDetail", { params: obj });
export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj);
//删除讨论接口
export const deleteDiscuss = (obj) =>
http.post("/discuss/deleteDiscuss", { params: obj });
//修改讨论接口
export const updateDiscuss = (obj) =>
http.post("/discuss/updateDiscuss", { params: obj });
export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', obj );
//修改阶段任务信息
export const updateTask=(obj)=>http.post('/admin/project/editTask',obj)

7
src/api/indexProjStu.js Normal file
View File

@@ -0,0 +1,7 @@
import http from "./config";
//获取项目学员列表
export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
//删除学员
export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)

View File

@@ -17,7 +17,7 @@
@click="closeDrawer"
/>
</div>
<div class="contentMain">
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
@@ -214,11 +214,11 @@
</div>
</div>
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="createActivity">确定</button>
</div>
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="createActivity">确定</button>
</div>
</div>
</a-drawer>
</template>
@@ -277,6 +277,14 @@ export default {
edit: {
type: Boolean,
default: false,
},
editActivityId: {
type: Boolean,
default: false,
},
projectTaskId: {
type: Boolean,
default: false,
}
},
setup(props, ctx) {
@@ -309,13 +317,44 @@ export default {
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
console.log("活动ID",props.editActivityId);
console.log("项目中任务ID",props.projectTaskId);
if(bool){
if(props.isStudiscuss == false){
if(props.edit){
//编辑讨论
console.log("props.editActivityId",props.editActivityId)
let obj = {
activityId: props.editActivityId,
}
api.getActivity(obj).then(res => {
console.log('获取讨论信息成功',res.data.data)
//更新讨论信息
state.inputV1 = res.data.data.activityName;
state.textV1 = res.data.data.activityNotice;
state.textV2 = res.data.data.activityExplain;
state.inputV2 = res.data.data.activityDuration;
state.inputV3 = res.data.data.activityAddress;
state.inputV5 = res.data.data.afterSignIn;
state.inputV4 = res.data.data.beforeSignIn;
state.radioV1 = res.data.data.standardSettings;
state.time[0] = res.data.data.activityStartTime;
state.time[1] = res.data.data.activityEndTime;
console.log(state.time[0])
}).catch(err=>{
console.log('获取讨论信息失败',err)
})
}
}
}
};
const cloradio1 = (value) => {
if (value != "") {
state.radioV1 = "";
}
};
//创建活动
const createActivity = () => {
if(!state.inputV1){
@@ -352,14 +391,16 @@ export default {
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到
createTime: "", //创建时间
createUser: 0, //创建人
signOutTime: state.inputV6, //签退开始时间
standardSettings: state.radioV1, //标准设置
updateTime: "", //更新时间
updateUser: 0, //更新人
};
api
if(props.edit){
//更新编辑活动信息
updateActivity();
}else{
//新建活动信息
api
.createActivity(obj)
.then((res) => {
console.log("创建成功", res);
@@ -396,7 +437,7 @@ export default {
}else{
apiTask
.addTask({
courseId: 0,
courseId: res.data.data.activityId,
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
@@ -421,8 +462,36 @@ export default {
.catch((err) => {
console.log("创建失败",err);
})
}
};
//更新编辑活动信息
const updateActivity = (obj) => {
console.log("编辑");
api.updateActivity(obj)
.then((res) => {
console.log("更新成功",res);
let taskObj = {
courseId: res.data.data.activityId,
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
projectId: props.projectId,
projectTaskId: props.projectTaskId,
stageId: 0,
type: 9,
}
api.updateTask(taskObj).then((res)=> {
console.log("更新任务列表成功",res);
})
.catch((err)=> {
console.log("更新任务列表失败",err);
})
})
.catch((err) => {
console.log("更新失败",err);
})
};
return {
...toRefs(state),
afterVisibleChange,

View File

@@ -130,6 +130,10 @@ export default {
editDiscussId: {
type: Number,
default: null,
},
projectTaskId: {
type: Number,
default: null,
}
},
setup(props, ctx) {
@@ -144,13 +148,36 @@ export default {
const closeDrawer = () => {
ctx.emit("update:adddiscussVisible", false);
ctx.emit("update:edit", false);
console.log("编辑状态",props.edit);
state.inputV1 = "";
state.textV1 = "";
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
console.log("项目任务ID",props.projectTaskId);
if(bool){
if(props.isStudiscuss == false){
if(props.edit){
//编辑讨论
console.log("props.editDiscussId",props.editDiscussId)
let formData = new FormData();
formData.append('discussId',props.editDiscussId);
console.log("formData",formData);
api.getDiscussDetail(formData).then(res => {
console.log('获取讨论信息成功',res.data.data)
//更新讨论信息
state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain;
state.checkedC1 = res.data.data.discussSettings;
}).catch(err=>{
console.log('获取讨论信息失败',err)
})
}
}
}
};
//console.log("编辑状态",props.edit);
//创建讨论(项目任务列表)
const createDiscuss = () => {
if (!state.inputV1) {
@@ -169,26 +196,9 @@ export default {
discussTag: "", //是否必修的标识
updateTime: "", //更新时间
updateUser: 0, //更新人
projectId: 0, //项目id
projectId: props.projectId, //项目id
};
if(props.edit){
//console.log("编辑");
console.log("props.editDiscussId",props.editDiscussId)
let obj = {
discussId: props.editDiscussId,
}
console.log(obj)
api
.getDiscussDetail(obj)
.then((res) => {
console.log("获取成功",res.data);
})
.catch((err) => {
console.log("获取失败",err.data);
})
}else{
if(props.edit == false){
api
.createDiscuss(obj)
.then((res) => {
@@ -213,8 +223,7 @@ export default {
console.log("新增关卡任务成功",res);
setTimeout(()=>{
message.success("创建成功");
ctx.emit("update:adddiscussVisible", false);
closeDrawer();
ctx.emit("update:adddiscussVisible", false);
state.addLoading=false
},1000)
}).catch(err => {
@@ -229,7 +238,7 @@ export default {
flag: true,
name: obj.discussName,
projectId: props.projectId,
projectTaskId: 0,
projectTaskId: "",
stageId: props.chooseStageId,
type: 8,
})
@@ -248,10 +257,36 @@ export default {
})
.catch((err) => {
console.log("创建失败", err);
});
});
}else{
api
.updateDiscuss(obj)
.then((res)=> {
console.log("更新成功",res);
console.log("项目任务ID",props.projectTaskId)
let taskObj={
courseId: res.data.data.discussId,
name: obj.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId,
stageId: props.stageId,
type: 8,
}
api.updateTask(taskObj).then(taskRes=>{
console.log('更新阶段任务成功',taskRes)
}).catch(taskErr=>{
console.log('更新阶段任务失败',taskErr)
})
})
.catch((err) => {
console.log("更新失败",err)
})
}
};
return {
...toRefs(state),
afterVisibleChange,

View File

@@ -3,7 +3,7 @@
@after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ EditWorkId ? '编辑' : '添加' }}作业</div>
<div class="headerTitle">{{ edit ? '编辑' : '添加' }}作业</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
</div>
@@ -62,16 +62,20 @@
<a-button class="btn2" html-type="submit">确定</a-button>
</div>
</a-form>
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
<a-spin :spinning="addLoading" tip="添加中..." />
</div>
</a-drawer>
</template>
<script>
import { reactive, ref } from "vue";
import { reactive, ref, toRefs } from "vue";
import { message } from "ant-design-vue";
import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import { storage } from "../../api/storage";
import dayjs from 'dayjs';
const rowSelection = ref({
@@ -127,6 +131,14 @@ export default {
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
isactive: {
type: Number,
default: null,
}
},
setup(props, ctx) {
const formState = reactive({
@@ -134,10 +146,10 @@ export default {
workRequirement: '',
choosedTime: '',
});
const formRef = ref();
const state = reactive({
routerId: storage.get("routerId") ? JSON.parse(storage.get("routerId")) : null,
addLoading: false,
})
const formRef = ref();
let checkWorkName = async (_rule, value) => {
if (!value) {
@@ -227,18 +239,14 @@ export default {
};
const updateWork = () => {
// 如果是关卡页面进入 ---------------------------------
if (props.isLevel) {
myRouterEditTask()
} else { // 任务页面进入------------------------------
state.addLoading = true;
if (props.edit) { // 编辑任务
myUpdateWorkTaskUsing()
} else { // 创建任务
console.log('创建任务***************');
myCreateWorkTask()
}
}
};
// 新增任务
@@ -258,7 +266,13 @@ export default {
"workTag": ""
}
createWorkTask(obj).then((res) => {
myProjectEditTask(res.data.data.workId);
if(props.isLevel) {
// 如果是关卡页面进入 ---------------------------------
myRouterEditTask(res.data.data.workId);
}else {
myProjectEditTask(res.data.data.workId);
}
}).catch((err) => {
message.error(`添加失败${err}`)
})
@@ -281,19 +295,26 @@ export default {
}
updateWorkTaskUsing(editObj).then((res) => {
console.log(res);
myProjectEditTask(res.data.data.workId)
if(props.isLevel) {
// 如果是关卡页面进入 ---------------------------------
myRouterEditTask(res.data.data.workId);
}else {
myProjectEditTask(res.data.data.workId);
}
}).catch((err) => {
message.error(`编辑失败${err}`)
})
}
// 查询任务
const queryWork = () => {
state.addLoading = true;
queryWorkDetailById({workId:props.EditWorkId}).then((res) => {
console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
formState.workName = res.data.data.workName;
formState.workRequirement = res.data.data.workRequirement;
formState.choosedTime = [dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"), dayjs(res.data.data.submitEndTime, "YYYY-MM-DD")]
console.log(res);
state.addLoading = false;
}).catch(() => {
message.error(`查询失败`)
})
@@ -306,7 +327,7 @@ export default {
"flag": true,
"name": formState.workName,
"projectId": props.projectId,
"projectTaskId": props.projectTaskId || null,
"projectTaskId": props.projectTaskId || 0,
"stageId": props.chooseStageId,
"type": 4
}
@@ -314,6 +335,7 @@ export default {
console.log(` 编辑项目成功的打印 ${res}`);
message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
}).catch(err => {
message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
@@ -322,24 +344,26 @@ export default {
}
// 新增编辑或新增关卡任务
const myRouterEditTask = () => {
const myRouterEditTask = (testId) => {
let editObj1 = {
"chapterId": 70,
"courseId": 0,
"duration": 0,
"chapterId": props.isactive,
"courseId": testId,
"duration": 30,
"flag": true,
"name": formState.workName,
"routerId": Number(storage.get('routerId')),
"routerTaskId": 0,
"routerId": props.routerId,
"routerTaskId": props.routerTaskId || 0,
"type": 4
}
RouterEditTask(editObj1).then(res => {
console.log(` 编辑关卡成功的打印 ${res}`);
message.success(`${props.workId ? '编辑' : '新增'}关卡任务成功`)
message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
}).catch(err => {
message.error(`${props.workId ? '编辑' : '新增'}关卡任务失败`)
message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
console.log(` 编辑关卡失败的打印 ${err}`);
})
}
@@ -359,7 +383,7 @@ export default {
// layout,
rules,
updateWork,
state,
...toRefs(state)
};
},
};

View File

@@ -130,6 +130,14 @@ export default {
type: Number,
default: null,
},
isactive: {
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
},
setup(props, ctx) {
const state = reactive({
@@ -174,7 +182,7 @@ export default {
};
const handleFinish = values => {
console.log(values);
updateRef(props.workId)
updateRef(props.EditRefId)
};
const handleFinishFailed = errors => {
console.log(errors);
@@ -287,12 +295,12 @@ export default {
//学习路径的创建
if (props.isStudy == 1) {
let objj = {
chapterId: 36,
courseId: 0,
chapterId: props.isactive,
courseId: res.data.data.linkId,
duration: 0,
flag: true,
name: obj.linkName,
routerId: 92,
routerId: props.routerId,
routerTaskId: 0,
type: 7,
};

View File

@@ -8,7 +8,7 @@
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{EditTestId ? "编辑" : "添加" }}考试</div>
<div class="headerTitle">{{edit ? "编辑" : "添加" }}考试</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@@ -194,13 +194,17 @@
</div>
</a-form>
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
<a-spin :spinning="addLoading" tip="添加中..." />
</div>
</a-drawer>
</template>
<script>
import { reactive, ref } from "vue";
import { reactive, ref, toRefs } from "vue";
import {message} from"ant-design-vue";
import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
import { ProjectEditTask } from "@/api/indexTask"
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"
import dayjs from 'dayjs';
const rowSelection = ref({
@@ -232,18 +236,26 @@ export default {
type: Number,
default: -1,
},
isactive: {
type: Number,
default: null,
},
routerId: {
type: Number,
default: null,
},
projectId: {
type: Number,
default: null,
},
routerTaskId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
routerTaskId: {
type: Number,
default: 0,
},
isLevel: { // 是否是关卡页面触发
type: Boolean,
default: null,
@@ -271,6 +283,9 @@ export default {
showAnswers:2,
choosedTime:'',
});
const state = reactive({
addLoading: false,
})
const formRef = ref();
let checkExaminationName = async (_rule, value) => {
if (!value) {
@@ -421,20 +436,22 @@ export default {
console.log("formState", bool);
};
const queryTest = () => {
state.addLoading = true;
console.log(props.EditTestId);
queryExaminationDetailById({examinationId:props.EditTestId}).then((res) => {
formState.examinationName = res.data.data.examinationName;
formState.workRequirement = res.data.data.workRequirement;
formState.examinationDuration = res.data.data.examinationDuration;
formState.examinationLimit = res.data.data.examinationLimit || -1;
formState.examinationLimit = Number(res.data.data.examinationLimit) || -1;
formState.passLine = res.data.data.passLine;
formState.examinationExplain = res.data.data.examinationExplain;
formState.questionArrangement = res.data.data.questionArrangement || 1;
formState.scoringModel = res.data.data.scoringModel || 1;
formState.showAnalysis = res.data.data.showAnalysis || 1;
formState.showAnswers = res.data.data.showAnswers || 1;
formState.questionArrangement = Number(res.data.data.questionArrangement) || 1;
formState.scoringModel = Number(res.data.data.scoringModel) || 1;
formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
formState.showAnswers = Number(res.data.data.showAnswers )|| 1;
if(res.data.data.examinationEndTime && res.data.data.examinationStartTime){
formState.choosedTime= [dayjs(res.data.data.examinationStartTime,"YYYY-MM-DD"),dayjs(res.data.data.examinationEndTime,"YYYY-MM-DD")]
state.addLoading = false;
} else { formState.choosedTime=[] }
console.log(res);
}).catch(() => {
@@ -442,19 +459,12 @@ export default {
})
}
const updateTest = () => {
// 如果是关卡页面进入 ---------------------------------
if (props.isLevel) {
//.
} else { // 从任务界面进入
state.addLoading = true;
if(props.edit) { // 编辑任务
myUpdateExamination()
}else { // 创建任务
myCreateExamination()
}
}
}
const myUpdateExamination = () => {
@@ -482,7 +492,12 @@ export default {
}
updateExamination(obj).then((res)=>{
console.log(res);
myProjectEditTask(res.data.data.examinationId)
// 如果是关卡页面进入 ---------------------------------
if(props.isLevel) {
myRouterEditTask(res.data.data.examinationId)
}else {
myProjectEditTask(res.data.data.examinationId)
}
}).catch(()=>{
message.error(`编辑失败`)
})
@@ -512,7 +527,11 @@ export default {
"updateUser": 0
}
createExamination(obj).then((res)=>{
myProjectEditTask(res.data.data.examinationId)
if(props.isLevel) {
myRouterEditTask(res.data.data.examinationId)
}else {
myProjectEditTask(res.data.data.examinationId)
}
}).catch((err)=>{
message.error(`添加失败${err}`)
})
@@ -533,6 +552,7 @@ export default {
console.log(` 编辑项目成功的打印 ${res}`);
message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
}).catch(err => {
message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
@@ -540,6 +560,30 @@ export default {
})
}
const myRouterEditTask = (testId) => {
let editObj1 = {
"chapterId": props.isactive,
"courseId": testId,
"duration": 30,
"flag": true,
"name": formState.examinationName,
"routerId": props.routerId,
"routerTaskId": props.routerTaskId || 0,
"type": 5
}
RouterEditTask(editObj1).then(res => {
console.log(` 编辑关卡成功的打印 ${res}`);
message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
}).catch(err => {
message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
console.log(` 编辑关卡失败的打印 ${err}`);
})
}
const cloradio1 = (value) => {
if (value != "") {
formState.showAnswers = "";
@@ -579,6 +623,7 @@ export default {
rules,
updateTest,
queryTest,
...toRefs(state)
};
},
};

View File

@@ -208,9 +208,15 @@
<!-- 添加作业侧弹窗 -->
<div>
<add-homework
flag="0"
:workId="editID"
v-model:addhomeworkVisible="addhomeworkvisible"
:isLevel="true"
@changeData="updateTableData"
v-model:isactive="isactive"
v-model:edit="edit"
v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId"
v-model:EditWorkId="EditWorkId"
v-model:routerTaskId="routerTaskId"
/>
</div>
<div class="lin"></div>
@@ -225,9 +231,15 @@
<!-- 添加考试侧弹窗 -->
<div>
<add-test
:workId="editID"
@clearEditData="clearEditData"
v-model:addtestVisible="addtestvisible"
:isLevel="true"
@changeData="updateTableData"
v-model:isactive="isactive"
v-model:edit="edit"
v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId"
v-model:EditTestId="EditTestId"
v-model:routerTaskId="routerTaskId"
/>
</div>
<div class="lin"></div>
@@ -501,7 +513,13 @@
margin-right: 25px;
cursor: pointer;
"
@click="decideType(element.lei, element.courseId)"
@click="
decideType(
element.lei,
element.courseId,
element.id
)
"
>
编辑
</span>
@@ -1058,6 +1076,10 @@ export default {
deleteModal: false, // 删除弹窗
deleteID: "", // 要删除的任务的id
editID: "", // 要编辑的任务id
EditWorkId: "", // 要编辑的 workid
EditTestId: "",
routerTaskId: "",
stageId: "",
isStudy: 1,
cC: false,
value1: "",
@@ -1138,13 +1160,15 @@ export default {
state.visible = true;
};
// 作业和考试的抽屉
const showDrawerAddHomework = () => {
const showDrawerAddHomework = (id, eleId) => {
state.addhomeworkvisible = true;
state.ListChoosedId = 0;
state.EditWorkId = id;
state.routerTaskId = eleId;
};
const showDrawerAddTest = () => {
const showDrawerAddTest = (id, eleId) => {
state.addtestvisible = true;
state.ListChoosedId = 0;
state.EditTestId = id;
state.routerTaskId = eleId;
};
//测试评估投票抽屉
const showDrawerAddEval = () => {
@@ -1183,12 +1207,16 @@ export default {
}
}
};
const getDetail = (index) => {
//数据变化
const updateTableData = (data) => {
console.log("添加数据", data);
getDetail();
};
const getDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
state.level = res.data.data.chapterList;
console.log(state.level);
if (index == 0 && state.level.length > 0) {
if (state.level.length > 0) {
dataAssignment(state.level[0].chapterId);
state.isactive = state.level[0].chapterId;
}
@@ -1535,7 +1563,7 @@ export default {
document.getElementsByTagName("main")[0].style.background =
"rgb(245, 247, 250,1)";
document.getElementsByTagName("main")[0].style.boxShadow = "none";
getDetail(0);
getDetail();
});
onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1569,17 +1597,17 @@ export default {
state.editID = "";
};
const deleteLevelTask = () => {
deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>
console.log("删除成功", res)
);
// RouterDeleteTask(state.listChoosedId)
// .then((res) => {
// console.log(`删除成功${res}`);
// message.success("删除成功");
// })
// .catch((err) => {
// console.log(`删除失败${err}`);
// });
deleteStudyTask({ routerTaskIds: state.deleteID })
.then((res) => {
state.deleteModal = false;
message.success("删除成功");
getDetail();
console.log("删除成功", res);
})
.catch((err) => {
message.error("删除失败");
console.log(err);
});
};
const showDrawerAddLive = () => {
@@ -1596,7 +1624,7 @@ export default {
// 子组件触发的清空 editid 事件
const clearEditData = () => {
state.editID = "";
getDetail(0);
getDetail();
};
//选择单个任务
@@ -1665,6 +1693,7 @@ export default {
console.log(res);
message.destroy();
message.success("批量删除成功");
getDetail();
})
.catch((err) => {
console.log(err);
@@ -1701,12 +1730,17 @@ export default {
state.EditLiveId = id;
};
//编辑的按钮
const decideType = (type, id) => {
const decideType = (type, id, eleId) => {
state.edit = true;
console.log(type, id);
if (type == "外链") {
showEditRefDrawer(id);
} else if (type == "直播") {
showEditLiveDrawer(id);
} else if (type == "作业") {
showDrawerAddHomework(id, eleId);
} else if (type == "考试") {
showDrawerAddTest(id, eleId);
}
};
return {
@@ -1750,6 +1784,7 @@ export default {
showEditRefDrawer,
showEditLiveDrawer,
decideType,
updateTableData,
};
},
};

View File

@@ -139,10 +139,10 @@
</div>
<!-- 添加作业侧弹窗 -->
<div>
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@changeData="updateTableData"
:isLevel=false
:isLevel="false"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
@@ -162,15 +162,15 @@
</div>
<!-- 添加考试侧弹窗 -->
<div>
<add-test
v-model:addtestVisible="addtestvisible"
@changeData="updateTableData"
:isLevel=false
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:EditTestId="EditTestId"
v-model:projectTaskId="projectTaskId"
<add-test
v-model:addtestVisible="addtestvisible"
@changeData="updateTableData"
:isLevel="false"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:EditTestId="EditTestId"
v-model:projectTaskId="projectTaskId"
/>
</div>
<!-- 添加考试侧弹窗 -->
@@ -209,7 +209,7 @@
<div>
<add-ref
v-model:addrefVisible="addrefvisible"
:isLevel=false
:isLevel="false"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
@@ -236,6 +236,7 @@
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:editDiscussId="editDiscussId"
v-model:projectTaskId="projectTaskId"
@changeData="updateTableData"
/>
</div>
@@ -254,6 +255,8 @@
<add-active
v-model:addactiveVisible="addactivevisible"
v-model:projectId="projectId"
v-model:editActivityId="editActivityId"
v-model:projectTaskId="projectTaskId"
v-model:edit="edit"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
@@ -328,7 +331,7 @@
<div class="boomcen">
<div class="onerow">
<div class="taskmain">任务列表</div>
<button class="btn" @click="moveTask">移动任务到阶段</button>
<button class="btn" @click="showChangeModal">移动任务到阶段</button>
<div class="edit" @click="deleteTaskAll">
<img
class="editimg"
@@ -522,7 +525,13 @@
margin-right: 25px;
cursor: pointer;
"
@click="decideType(element.lei, element.courseId,element.id)"
@click="
decideType(
element.lei,
element.courseId,
element.id
)
"
>
编辑
</span>
@@ -773,6 +782,44 @@
</div>
</div>
</a-modal>
<!-- 移动任务到阶段 -->
<a-modal
style="padding: 0"
:closable="sh"
v-model:visible="visiblene"
:footer="null"
centered="true"
wrapClassName="changeModal"
>
<div class="con">
<div class="header">
<div class="inhe">
<div class="mod"></div>
<div class="tz">选择任务移动到阶段</div>
</div>
</div>
<div class="mid">
<div class="inher">
<div class="cur">已选中{{ selectRow.length }}个任务</div>
<div class="select">
<a-select
v-model:value="curLevel"
style="width: 100%"
placeholder="请选择关卡"
:options="projectNameList4"
@change="selectProjectName4"
allowClear
showSearch
></a-select>
</div>
<div class="btn">
<button class="sameb btn1" @click="closeChangeModal">取消</button>
<button class="sameb btn2" @click="moveTask">确定</button>
</div>
</div>
</div>
</div></a-modal
>
</div>
</template>
@@ -870,11 +917,14 @@ export default {
: null,
chooseStageId: null,
edit: false,
// isRefEdit: 1, //外链编辑
// isLiveEdit: 1, //直播编辑
isRefEdit: false, //外链编辑
isLiveEdit:false, //直播编辑
isLiveEdit: false, //直播编辑
EditRefId: null, //要编辑的外链的id
EditLiveId: null, //要编辑的直播的id
editDiscussId:null,//要编辑的讨论的id
editActivityId:null,//要编辑的活动id
EditWorkId:null, // 要编辑的作业id
EditTestId: null,// 要编辑的考试id
EditEvalId:null,
@@ -1018,6 +1068,7 @@ export default {
selectedRowKeys: [],
valuesname: "",
valuesnotice: "",
visiblene: false, //移动任务弹窗
confirmModal: false, //确认添加阶段弹窗
cC: false,
cancelModal: false, //确认取消阶段弹窗
@@ -1029,9 +1080,10 @@ export default {
deleteInvistID: 4, //评估
deleteDiscussID: null, //删除讨论id
deleteActivityID: null, //删除活动id
voteId:"", //删除投票id
voteId: "", //删除投票id
deleteID: "",
selectRow: [], //选择行
curLevel: [], //阶段名称
selectAll: 0, //0未选择1全选2部分选择
});
console.log("projectId", state.projectId);
@@ -1276,13 +1328,19 @@ export default {
if (leng > 0) {
//获取任务列表
let arr = res.data.data.stageList[0].taskList;
console.log("任务列表", arr);
getTableData(arr);
}
let stagearr = res.data.data.stageList;
console.log(stagearr, 111111);
let arrlist = state.curLevel;
//console.log(stagearr, 111111);
if (stagearr.length > 0) {
getStageData(stagearr);
stagearr.map((value) => {
console.log(value);
arrlist.push();
});
}
//给阶段id赋初始值
state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
@@ -1306,7 +1364,7 @@ export default {
const changeVData = (data) => {
console.log("8989", data);
state.voteId = data.voteId;
}
};
//数据变化
const updateTableData = (data) => {
console.log("添加数据", data);
@@ -1493,7 +1551,6 @@ export default {
});
};
//删除评估测试
const deleteInvistText = () => {
let obj = {
@@ -1552,7 +1609,7 @@ export default {
api
.deleteTask(obj)
.then((res) => {
console.log(res,'gggggggggggggggg');
console.log(res, "gggggggggggggggg");
// deleteVoteText();
})
.catch((err) => {
@@ -1611,6 +1668,12 @@ export default {
getTask();
});
};
const showChangeModal = () => {
state.visiblene = true;
};
const closeChangeModal = () => {
state.visiblene = false;
};
//移动任务到阶段
const moveTask = () => {
let obj = {
@@ -1704,21 +1767,21 @@ export default {
const showDrawerAddCase = () => {
state.addcasevisible = true;
};
const showDrawerAddHomework = (id,eleId) => {
state.EditWorkId = id
const showDrawerAddHomework = (id, eleId) => {
state.EditWorkId = id;
state.projectTaskId = eleId;
state.addhomeworkvisible = true;
};
const showDrawerAddTest = (id,eleId) => {
state.EditTestId = id
const showDrawerAddTest = (id, eleId) => {
state.EditTestId = id;
state.projectTaskId = eleId;
state.addtestvisible = true;
};
const showDrawerAddLive = () => {
state.addlivevisible = true;
};
const showDrawerAddRef = (id,eleId) => {
state.EditRefId = id
const showDrawerAddRef = (id, eleId) => {
state.EditRefId = id;
state.projectTaskId = eleId;
state.addrefvisible = true;
};
@@ -1726,12 +1789,15 @@ export default {
state.adddiscussvisible = true;
};
//打开编辑讨论的弹窗
const showEditAddDiscuss = (id)=>{
state.editDiscussId = id
const showEditAddDiscuss = (id, eleId) => {
state.editDiscussId = id;
state.projectTaskId = eleId;
state.adddiscussvisible = true;
}
const showDrawerAddActive = () => {
};
const showDrawerAddActive = (id, eleId) => {
state.addactivevisible = true;
state.editActivityId = id;
state.projectTaskId = eleId;
};
const showDrawerAddEval = () => {
state.addevalvisible = true;
@@ -1827,10 +1893,11 @@ export default {
console.log("任务id", id);
};
//打开编辑外链的弹窗
const showEditRefDrawer = (id) => {
const showEditRefDrawer = (id, eleId) => {
state.addrefvisible = true;
state.isRefEdit = true;
state.EditRefId = id;
state.projectTaskId = eleId;
};
//打开编辑直播的弹窗
const showEditLiveDrawer = (id) => {
@@ -1839,37 +1906,37 @@ export default {
state.EditLiveId = id;
};
//打开测评的弹窗
const showEditEvalDrawer = (id) => {
console.log('222222222222222222222',id);
const showEditEvalDrawer = (id, eleId) => {
console.log("222222222222222222222", id);
state.addevalvisible = true;
state.projectTaskId = eleId;
state.EditRefId = id;
console.log(state.EditRefId);
};
//编辑的按钮
const decideType = (type, id,eleId) => {
const decideType = (type, id, eleId) => {
state.edit = true;
console.log(type, id);
if (type == "外链") {
showEditRefDrawer(id);
}
else if (type == "直播") {
showEditLiveDrawer(id);
showEditRefDrawer(id, eleId);
} else if (type == "直播") {
showEditLiveDrawer(id, eleId);
} else if (type == "测评") {
showEditEvalDrawer(id)
showEditEvalDrawer(id, eleId);
} else if (type == "评估") {
showDrawerAddInvist(id);
showDrawerAddInvist(id, eleId);
} else if (type == "投票") {
showDrawerAddVote(id);
showDrawerAddVote(id, eleId);
} else if (type == "讨论") {
showEditAddDiscuss(id);
showEditAddDiscuss(id, eleId);
} else if (type == "活动") {
showDrawerAddActive(id);
}else if (type == "作业") {
showDrawerAddHomework(id,eleId);
}else if (type == "考试") {
showDrawerAddTest(id,eleId);
showDrawerAddActive(id, eleId);
} else if (type == "作业") {
showDrawerAddHomework(id, eleId);
} else if (type == "考试") {
showDrawerAddTest(id, eleId);
}
}
};
return {
...toRefs(state),
selectProjectName,
@@ -1901,6 +1968,8 @@ export default {
closeCancel,
showDelete,
closeDelete,
showChangeModal,
closeChangeModal,
changebgc,
getTask,
deleteLiveBroadcast,
@@ -2078,6 +2147,107 @@ export default {
}
}
}
.changeModal {
.ant-modal {
width: 549px !important;
height: 245px !important;
.ant-modal-content {
width: 549px !important;
height: 245px !important;
.ant-modal-body {
padding: 0 !important;
width: 549px !important;
height: 245px !important;
.con {
// background-color: #bfa;
width: 100%;
height: 100%;
.header {
width: 100%;
display: flex;
height: 68px;
position: relative;
justify-content: center;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
.inhe {
width: 80%;
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.mod {
left: 30px;
top: 27px;
position: absolute;
width: 18px;
height: 17px;
background-image: url(../../assets/images/leveladd/mod.png);
}
.tz {
color: #000000;
font-weight: 400;
font-size: 16px;
}
.mg {
width: 20px;
height: 20px;
background-image: url(../../assets/images/basicinfo/close22.png);
background-size: 100% 100%;
cursor: pointer;
}
}
}
.mid {
width: 100%;
display: flex;
height: 100%;
justify-content: center;
.inher {
width: 80%;
height: 100%;
.cur {
color: #6f6f6f;
font-size: 14px;
}
.select {
margin-top: 10px;
}
.btn {
width: 100%;
display: flex;
justify-content: center;
margin-top: 30px;
.sameb {
width: 100px;
height: 40px;
font-size: 14px;
border-radius: 8px;
}
.btn1 {
color: #4ea6ff;
background: #ffffff;
border: 1px solid #4ea6ff;
}
.btn2 {
margin-left: 16px;
border: 0;
color: #ffffff;
background: #4ea6ff;
}
}
}
}
}
}
}
}
}
.info {
width: 78%;
// background-color: lightcoral;

View File

@@ -317,12 +317,11 @@
</div>
<div class="type">
<div
:class="
item.flag == true ? 'typename1' : 'typename'
"
:class="item.flag == true ? 'typename1' : 'typename'"
>
<!-- {{ item.classify }} -->
<span v-if="item.flag">必修</span> <span v-else>选修</span>
<span v-if="item.flag">必修</span>
<span v-else>选修</span>
</div>
</div>
<div class="time">
@@ -341,7 +340,9 @@
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{ (item.finishStuCnt/item.totalStuCnt)*100 }}%</span
>{{
(item.finishStuCnt / item.totalStuCnt) * 100
}}%</span
>
</div>
</div>
@@ -479,7 +480,7 @@
>
<div class="groupname">小组名称</div>
<a-input
v-model:value="valuestug"
v-model:value="valuestugroup"
placeholder="请输入小组名称"
/>
</div>
@@ -495,6 +496,8 @@
<a-select
v-model:value="valuestub"
placeholder="请选择部门"
:options="bum"
@change="handleChangeBum"
/>
</div>
<div
@@ -509,15 +512,16 @@
v-model:value="valuegood"
placeholder="是否为优秀学员"
:options="goodstuList"
@change="handleChangeGood"
/>
</div>
</div>
<div class="groupright">
<div class="btn1">
<div class="btn1" @click="searchStu">
<img src="../../assets/images/courseManage/search0.png" />
<span class="btn1text">搜索</span>
</div>
<div class="btn2">
<div class="btn2" @click="resetCancel">
<img src="../../assets/images/courseManage/reset1.png" />
<span class="btn2text">重置</span>
</div>
@@ -532,7 +536,7 @@
<img src="../../assets/images/courseManage/reset2.png" />
<span class="btn2text">导入学员</span>
</div>
<div class="btn2">
<div class="btn2" @click="showAllDelete">
<img src="../../assets/images/projectadd/delete.png" />
<span class="btn2text">批量删除</span>
</div>
@@ -542,14 +546,14 @@
<div class="xu">
<span class="yi">已选择</span>
<div style="width: 5px; display: inline-block"></div>
<span class="th">2</span>
<span class="th">{{ choosed }}</span>
<div style="width: 5px; display: inline-block"></div>
<span class="yi"></span>
<span class="zon">列表选项总计</span>
<span class="yi">4</span>
<span class="yi">{{ total }}</span>
<span class="yi"></span>
</div>
<div class="clear">清空</div>
<div class="clear" @click="clearChooseStu">清空</div>
</div>
<div class="tab" style="margin: 20px 32px 30px 32px">
<a-table
@@ -1272,7 +1276,7 @@
<!-- 删除学员弹窗 -->
<div>
<a-modal
v-model:visible="canclestu2"
v-model:visible="deleteOneStu"
:footer="null"
:closable="close"
wrapClassName="canclestu1"
@@ -1290,10 +1294,10 @@
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="closeModal4">取消</div>
<div class="btnText" @click="closeDeleteOne">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="closeModal4">确定</div>
<div class="btnText" @click="closeDeleteOneConfirm">确定</div>
</div>
</div>
</div>
@@ -1645,10 +1649,41 @@
</div>
</div>
</a-modal>
<!-- 批量删除弹窗 -->
<div>
<a-modal
v-model:visible="allDelete"
:footer="null"
:closable="close"
wrapClassName="canclestu1"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon1"></div>
<span>提示</span>
</div>
<div class="body">
<span>您确定批量删除吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="closeCancelDelete">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="closeAllDelete">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
</div>
</div>
</template>
<script>
import { reactive, toRefs,onMounted } from "vue";
import { reactive, toRefs, onMounted } from "vue";
import { useRoute } from "vue-router";
// import { CaretRightOutlined } from "@ant-design/icons-vue";
import TimeManage from "../../components/drawers/TimeManage";
@@ -1668,6 +1703,8 @@ import ProjectScore from "../../components/drawers/ProjectScore";
import TaskImpStu from "../../components/drawers/TaskFaceIn";
import { storage } from "../../api/storage";
import * as api from "../../api/index1";
import { getProjStu, deleteStu } from "../../api/indexProjStu";
import { message } from "ant-design-vue";
import * as apitl from "../../api/index";
export default {
name: "taskPage",
@@ -1691,7 +1728,9 @@ export default {
},
setup() {
const state = reactive({
projectId: storage.get("projectId") ? JSON.parse(storage.get("projectId")) : null,
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
: null,
goodstuList: [
{
id: 1,
@@ -1709,57 +1748,64 @@ export default {
label: "优秀学员",
},
],
bum: [
{
id: 1,
value: "",
label: "",
},
],
//学员信息列表
tabledata: [
{
key: 1,
name: "小李",
bum: "产研部",
gangw: "产品经理",
group: "好好学习",
progress: "5/20",
name: "sss",
bum: "c",
gangw: "ss",
group: "sss",
progress: "sss",
diploma: "0",
stutime: "2022-10-31 23:12:00",
putin: "手动加入",
excellent: true, //是否是优秀学员
stutime: "20202",
putin: "shs",
excellent: true,
studentId: 22,
},
{
key: 2,
name: "小刘",
bum: "产研部",
gangw: "产品经理",
group: "天天向上",
progress: "5/20",
name: "sss",
bum: "c",
gangw: "ss",
group: "sss",
progress: "sss",
diploma: "0",
stutime: "2022-10-21 23:12:00",
putin: "手动加入",
excellent: false, //是否是优秀学员
stutime: "20202",
putin: "shs",
excellent: true,
studentId: 23,
},
{
key: 3,
name: "小王",
bum: "产研部",
gangw: "后端",
group: "好好学习",
progress: "5/20",
name: "sss",
bum: "c",
gangw: "ss",
group: "sss",
progress: "sss",
diploma: "0",
stutime: "2022-10-11 23:12:00",
putin: "手动加入",
excellent: false, //是否是优秀学员
},
{
key: 4,
name: "小赵",
bum: "产研部",
gangw: "前端",
group: "天天向上",
progress: "5/20",
diploma: "0",
stutime: "2022-10-31 23:12:00",
putin: "手动加入",
excellent: true, //是否是优秀学员
stutime: "20202",
putin: "shs",
excellent: false,
studentId: 24,
},
],
// stuName: "", //搜索的学员姓名
// stuGroup: "", //搜索的学员小组名称
// stuBum: "", //搜索的学员小组部门
// stuGood: "", //搜索的学员是否优秀
total: null, //学员列表数据总条数
choosed: 0, //勾选的学员总数
selectedRowKeys: [], //选择的学员
selectedRows: [], //选择的学员的id值
chooseDeleteOne: [], //删除的单个学员id
//进度排行学员
rankjindu: [{ value: "学员", label: "学员" }],
valuestu1: "学员",
@@ -1791,12 +1837,12 @@ export default {
zhibModal: false, //直播二维码弹窗
huodModal: false, //活动二维码弹窗
allDelete: false, //批量删除弹窗
pubproject: false,
stugroup: false,
canclestu: false,
canclestu1: false,
canclestu2: false,
deleteOneStu: false, //删除单个学员弹窗
checked: false,
checked1: true,
checked2: false,
@@ -1815,8 +1861,8 @@ export default {
valuestun: "", //学员管理姓名
valuegood: "",
valuestub: "", //学员管理部门
valuestug: "", //学员管理小组名称
valuestug: "", //学员小组管理名称
valuestugroup: "", //学员管理小组名称
valueDate: "", //排行榜输入日期
noticeChecked: true,
noticeContent: "",
@@ -2266,7 +2312,6 @@ export default {
// },
],
taskSyllabusActive: 0,
//在线管理等页面传递参数
showTimeText: "",
@@ -2288,31 +2333,30 @@ export default {
// 输入接入 -- start --
//任务大纲渲染
const getTaskList = () => {
let objtl = {
projectId: 27,
}
let objtl = {
projectId: 27,
};
apitl
.getProjectDetail(objtl)
.then((res) => {
if (res.status == 200) {
console.log('res', res)
console.log('阶段列表',res.data.data.stageList);
console.log("res", res);
console.log("阶段列表", res.data.data.stageList);
let leng = res.data.data.stageList.length;
if (leng > 0) {
//获取任务列表 阶段
let taskarr = res.data.data.stageList
state.taskSyllabus = taskarr
console.log( res.data.data.stageList[0].taskList[0].type,'ggg');
let taskarr = res.data.data.stageList;
state.taskSyllabus = taskarr;
console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
}
}
})
.catch((err) => {
console.log('获取任务列表失败', err)
})
};
console.log("获取任务列表失败", err);
});
};
//学员学员管理渲染
const getTableDate = () => {
@@ -2412,12 +2456,7 @@ export default {
const closeModal3 = () => {
state.canclestu1 = false;
};
const showModal4 = () => {
state.canclestu2 = true;
};
const closeModal4 = () => {
state.canclestu2 = false;
};
const showModal2 = () => {
state.stugroup = true;
};
@@ -2574,8 +2613,8 @@ export default {
<a-select-option value="删除" label="删除">
<div
onClick={() => {
console.log("点击了111");
state.canclestu2 = true;
console.log("点击了111", value.studentId);
showDeleteOne(value.studentId);
}}
>
删除
@@ -2706,24 +2745,19 @@ export default {
//tabs切换
const tabsChange = (e) => {
//排行榜
if (e == 6) {
//获取进度榜
getbillboard(1, 1);
//获取学分榜
getbillboard(2, 1);
//获取学时榜
getbillboard(3, 1);
getbillboard(1, 1);
//获取学分榜
getbillboard(2, 1);
//获取学时榜
getbillboard(3, 1);
} else {
rankReset();
}
};
// start -------排行榜---------------排行榜------------排行榜------------------排行榜---------
//选择搜索时间
const rankTimeChange = (e, date) => {
@@ -2773,10 +2807,192 @@ export default {
// end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
onMounted(()=>{
getTaskList()
})
//start---------学员------
//删除单个学员
const showDeleteOne = (id) => {
state.deleteOneStu = true;
state.chooseDeleteOne.push(id);
};
//点击取消删除单个学员
const closeDeleteOne = () => {
state.deleteOneStu = false;
};
//点击确认删除单个学员
const closeDeleteOneConfirm = () => {
state.deleteOneStu = false;
deleteStu({
projectId: state.projectId,
studentIds: state.chooseDeleteOne,
})
.then((res) => {
console.log(res, "单个删除成功");
message.success("删除成功");
})
.catch((err) => {
console.log(err, "单个删除失败");
message.warning("删除失败");
});
state.chooseDeleteOne = [];
};
//批量删除学员弹窗
const showAllDelete = () => {
if (state.selectedRows.length == 0) {
message.destroy();
return message.warning("请选择要删除的学员");
} else {
state.allDelete = true;
}
};
//点击取消的批量删除弹窗
const closeCancelDelete = () => {
state.allDelete = false;
};
//点击确定的批量删除弹窗
const closeAllDelete = () => {
deleteStu({
projectId: state.projectId,
studentIds: state.selectedRows,
})
.then((res) => {
console.log(res, "删除成功");
message.success("删除成功");
})
.catch((err) => {
console.log(err, "删除失败");
message.warning("删除成功");
});
state.allDelete = false;
};
const handleChangeGood = (value) => {
console.log(value, state.valuegood, 11111);
};
const handleChangeBum = (value) => {
console.log(value, 22222);
};
//把数据放到state里
const getTableDataList = (tableData) => {
let data = tableData;
let array = [];
data.map((value) => {
let obj = {
projectId: value.projectId, //项目id
groupId: value.groupId, //小组id
group: value.groupName, //小组名
studentId: value.studentId, //学生id
currentStageId: value.currentStageId, //当前关卡id
name: value.userInfoBo.userName, //用户名
bum: value.userInfoBo.deptName, //部门
gangw: value.userInfoBo.jobName, //岗位
completeStageCnt: value.userInfoBo.completeStageCnt, //当前完成阶段数
totalStageCnt: value.userInfoBo.totalStageCnt, //总阶段数
excellent: value.topFlag == 1 ? "0" : "1", //是否优秀学员
progress:
value.userInfoBo.completeStageCnt +
"/" +
value.userInfoBo.totalStageCnt,
putin:
value.source == 0
? "报名加入"
: value.source == 1
? "指定添加"
: value.source == 2
? "组织添加"
: value.source == 3
? "受众添加"
: "-", //加入方式
beginStudyTime: value.beginStudyTime, //开始学习时间
};
array.push(obj);
});
state.tabledata = array;
};
//学员搜索
const searchStu = () => {
let obj = {
deptIds: [], //部门
groupName: state.valuestugroup,
name: state.valuestun,
pageNo: 0,
pageSize: 0,
projectId: state.projectId,
topFlag:
state.valuegood == "优秀学员"
? 1
: state.valuegood == "普通学员"
? 0
: null,
};
getProjStu(obj).then((res) => {
console.log("搜索成功", res);
//重新获取列表
let leng = res.data.data.rows;
if (leng > 0) {
let arr = res.data.data.rows;
getTableDataList(arr);
}
});
};
//勾选学员
const onSelectChange = (selectedRowKeys, selectedRows) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
state.choosed = state.selectedRowKeys.length;
console.log("ssss", selectedRows);
state.selectedRows = [];
console.log("before", state.selectedRows);
// let arr = [];
//遍历 插入到state.selectedRows里
selectedRows.map((item) => {
console.log(item.studentId);
state.selectedRows.push(item.studentId);
// arr.push(item.studentId);
// console.log("asdfasdf", arr);
});
// state.selectedRows = arr;
console.log("after", state.selectedRows);
// console.log(state.selectedRows[0]);
// console.log("dddd",selectedRows.)
//判断是否为数组
console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
};
//清空所选的学员
const clearChooseStu = () => {
state.selectedRowKeys = [];
state.choosed = 0;
};
//学员重置
const resetCancel = () => {
(state.valuestun = null),
(state.valuestugroup = null),
(state.valuestub = null),
(state.valuegood = null);
};
//获取学员列表
const getStu = () => {
let obj = {
deptIds: [], //部门
groupName: "",
name: "",
pageNo: 1,
pageSize: 1,
projectId: state.projectId,
topFlag: 0,
};
getProjStu(obj).then((res) => {
console.log(res.data.data.rows, "获取学员列表");
let leng = res.data.data.rows;
state.total = res.data.data.total;
if (leng > 0) {
let arr = res.data.data.rows;
getTableDataList(arr);
}
});
};
//end---------学员------
onMounted(() => {
getStu();
getTaskList();
});
return {
...toRefs(state),
totask,
@@ -2789,8 +3005,8 @@ export default {
closeModal2,
showModal3,
closeModal3,
showModal4,
closeModal4,
showDeleteOne,
closeDeleteOne,
showCopyModal,
closeCopyModal,
showTime,
@@ -2827,6 +3043,18 @@ export default {
getbillboard,
rankSearch,
rankReset,
handleChangeGood,
getStu,
getTableDataList,
searchStu,
handleChangeBum,
resetCancel,
showAllDelete,
closeAllDelete,
onSelectChange,
closeCancelDelete,
clearChooseStu,
closeDeleteOneConfirm,
};
},
};