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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-01 01:57:10 +08:00
parent 32983caf86 99ea3719f0
commit dbaae36e99
7 changed files with 171 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/components/drawers/AddFaceteach.vue
View File

@@ -61,8 +61,8 @@
<span style="margin-right: 3px">授课教师：</span> <span style="margin-right: 3px">授课教师：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px" <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
:options="options" @search="handleSearch"></a-auto-complete> :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -157,7 +157,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="completeLeave" <a-checkbox v-model:checked="completeLeave"
@click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox> @click="completeLeave = !completeLeave">学员请假后记为任务完成
</a-checkbox>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -166,8 +167,10 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-checkbox v-model:checked="innerPersion" <a-checkbox v-model:checked="innerPersion"
@click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox> @click="innerPersion = !innerPersion">允许项目内人员临时到场参加
<a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox> </a-checkbox>
<a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加
</a-checkbox>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -246,7 +249,8 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList"> <a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList">
<button class="xkbtn">上传附件</button></a-upload> <button class="xkbtn">上传附件</button>
</a-upload>
</div> </div>
</div> </div>
</div> </div>
@@ -274,6 +278,7 @@ import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue"; import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、 // import { toDate } from "../../api/method";、
import {addTempTask} from "../../api/indexTaskadd"; import {addTempTask} from "../../api/indexTaskadd";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
components: { components: {
@@ -515,18 +520,20 @@ export default {
projectMember: p.concat(p1), projectMember: p.concat(p1),
offcourseId: state.chooseCourse, offcourseId: state.chooseCourse,
offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
testId: state.EditTestId testId: state.EditTestId,
duration:state.duration,
}; };
console.log("obj============", obj, "6" + "9"); console.log("obj============", obj, "6" + "9");
console.log("222222222");
editPlan(obj) editPlan(obj).then(async (res) => {
.then((res) => {
message.destroy(); message.destroy();
message.sucsess(`添加成功`); message.success(`添加成功`);
updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}).catch(() => { }).catch((e) => {
console.log(e)
message.destroy(); message.destroy();
message.error(`添加失败`); message.error(`添加失败`);
}); });
@@ -537,7 +544,7 @@ export default {
//更新任务列表 //更新任务列表
// 新增编辑或新增项目任务 // 新增编辑或新增项目任务
const updateTask = (res) => { const updateTask = async (res) => {
console.log("props.isLevel=====", props.isLevel); console.log("props.isLevel=====", props.isLevel);
if (props.isLevel == 1) { if (props.isLevel == 1) {
let editObj1 = { let editObj1 = {
@@ -548,7 +555,7 @@ export default {
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 2, type: 2,
}; };
RouterEditTask(editObj1) await RouterEditTask(editObj1)
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
@@ -569,7 +576,7 @@ export default {
type: 2, type: 2,
}; };
// 新增编辑或新增项目 // 新增编辑或新增项目
ProjectEditTask(editObj) await ProjectEditTask(editObj)
.then(() => { .then(() => {
message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
@@ -579,7 +586,7 @@ export default {
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log("dddddddddddd33333333"); console.log("dddddddddddd33333333");
addTempTask({ await addTempTask({
courseId: res.data.data.offcoursePlanId, courseId: res.data.data.offcoursePlanId,
name: res.data.data.name, name: res.data.data.name,
duration: res.data.data.duration, duration: res.data.data.duration,
@@ -668,6 +675,7 @@ export default {
const handleChange2 = (value, label) => { const handleChange2 = (value, label) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.memberId = value; state.memberId = value;
// console.log(label)
state.memberValue = label; state.memberValue = label;
}; };
const handleFocus = () => { const handleFocus = () => {

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

@@ -107,7 +107,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-auto-complete <a-auto-complete
v-model:value="memberValue.label" :value="memberValue.label"
show-search show-search
:not-found-content="fetching ? undefined : null" :not-found-content="fetching ? undefined : null"
placeholder="Select a teacher" placeholder="Select a teacher"
@@ -747,9 +747,10 @@ export default {
queryMember(); queryMember();
state.fetching = false; state.fetching = false;
}, 300); }, 300);
const handleChange2 = (value) => { const handleChange2 = (value,label) => {
console.log(`selected ${value}`); console.log(`selected ${value}`);
state.inputV3 = value; state.inputV3 = value;
state.memberValue = label;
}; };
const handleFocus = () => { const handleFocus = () => {
queryMember(); queryMember();

62
src/components/drawers/SeeStu.vue
View File

@@ -187,37 +187,37 @@ export default {
showDown: true, showDown: true,
showDown1: false, showDown1: false,
stageList: [ stageList: [
{ // {
stageName: "阶段1腾飞班阶段1", // stageName: "阶段1腾飞班阶段1",
stageId: 1, // stageId: 1,
taskProcessList: [ // taskProcessList: [
{ // {
course: "在线", // course: "在线",
name: "如何成为一个产品经理", // name: "如何成为一个产品经理",
complete: "已完成", // complete: "已完成",
}, // },
{ // {
course: "直播", // course: "直播",
name: "管理直播课", // name: "管理直播课",
complete: "已完成", // complete: "已完成",
}, // },
{ // {
course: "面授", // course: "面授",
name: "管理面授课", // name: "管理面授课",
complete: "未完成", // complete: "未完成",
}, // },
{ // {
course: "活动", // course: "活动",
name: "管理活动", // name: "管理活动",
complete: "未完成", // complete: "未完成",
}, // },
{ // {
course: "作业", // course: "作业",
name: "管理者作业", // name: "管理者作业",
complete: "未完成", // complete: "未完成",
}, // },
], // ],
}, // },
], ],
stageListActive: 0, stageListActive: 0,
}); });

16
src/views/examine/ProjectReviewedN.vue
View File

@@ -116,14 +116,14 @@ export default {
key: "name", key: "name",
align: "center", align: "center",
}, },
// todo 根项目保存
{ // {
title: "所属项目", // title: "所属项目",
dataIndex: "sourceBelongName", // dataIndex: "sourceBelongName",
key: "sourceBelongName", // key: "sourceBelongName",
align: "center", // align: "center",
width: "11%", // width: "11%",
}, // },
{ {
title: "项目经理", title: "项目经理",
dataIndex: "manager", dataIndex: "manager",

154
src/views/projectcenter/LibraryAdd.vue
View File

@@ -700,83 +700,83 @@ export default defineComponent({
const state = reactive({ const state = reactive({
//任务大纲列表 //任务大纲列表
taskSyllabus: [ taskSyllabus: [
{ // {
text: "阶段1腾飞班阶段1", // text: "阶段1腾飞班阶段1",
children: [ // children: [
{ // {
course: "在线", // course: "在线",
name: "时间管理", // name: "时间管理",
classify: "选修", // classify: "选修",
beginTime: "2022-09-10 14:03", // beginTime: "2022-09-10 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 20, //完成人数 // complete: 20, //完成人数
percent: 40, // percent: 40,
}, // },
{ // {
course: "直播", // course: "直播",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-12 14:03", // beginTime: "2022-09-12 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
{ // {
course: "面授", // course: "面授",
name: "管理面授课", // name: "管理面授课",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 80, //总人数 // total: 80, //总人数
complete: 0, //完成人数 // complete: 0, //完成人数
percent: 0, // percent: 0,
}, // },
{ // {
course: "活动", // course: "活动",
name: "管理活动", // name: "管理活动",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 40, //完成人数 // complete: 40, //完成人数
percent: 80, // percent: 80,
}, // },
{ // {
course: "作业", // course: "作业",
name: "管理者作业", // name: "管理者作业",
classify: "选修", // classify: "选修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 30, //完成人数 // complete: 30, //完成人数
percent: 60, // percent: 60,
}, // },
{ // {
course: "考试", // course: "考试",
name: "管理者考试", // name: "管理者考试",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 50, //完成人数 // complete: 50, //完成人数
percent: 100, // percent: 100,
}, // },
{ // {
course: "案例", // course: "案例",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
{ // {
course: "外链", // course: "外链",
name: "管理直播间", // name: "管理直播间",
classify: "必修", // classify: "必修",
beginTime: "2022-09-16 14:03", // beginTime: "2022-09-16 14:03",
total: 50, //总人数 // total: 50, //总人数
complete: 10, //完成人数 // complete: 10, //完成人数
percent: 20, // percent: 20,
}, // },
], // ],
}, // },
], ],
// 模板编辑列表 // 模板编辑列表
managerOptions: [ managerOptions: [

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

@@ -59,7 +59,7 @@
<div class="items2"> <div class="items2">
<a-popover <a-popover
placement="topLeft" placement="topLeft"
v-if="element.tit.length > 10" v-if="element.tit?.length > 10"
> >
<template #content> <template #content>
<div style="width: 130px"> <div style="width: 130px">
@@ -73,7 +73,7 @@
{{ element.tit }} {{ element.tit }}
</div> </div>
</a-popover> </a-popover>
<div class="nname" v-if="element.tit.length <= 10"> <div class="nname" v-if="element.tit?.length <= 10">
{{ element.tit }} {{ element.tit }}
</div> </div>
</div> </div>

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

@@ -2392,7 +2392,7 @@ export default {
//任务大纲渲染 //任务大纲渲染
const getTaskList = () => { const getTaskList = () => {
let objtl = { let objtl = {
projectId: 27, projectId: storage.get("projectId"),
}; };
apitl apitl
.getProjectDetail(objtl) .getProjectDetail(objtl)