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

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

Browse Source
This commit is contained in:
dongwug
2022-11-09 15:08:52 +08:00
parent 7a12224e28 6331698dc5
commit b1d798ad4b
2 changed files with 318 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

428
src/components/drawers/AddHomework.vue
View File

@@ -1,58 +1,95 @@
<template>
<a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
@after-visible-change="afterVisibleChange">
<a-drawer
:visible="addhomeworkVisible"
class="drawerStyle addhomeworkDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? '编辑' : '添加' }}作业</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
@finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
<a-form
ref="formRef"
name="custom-validation"
:model="formState"
:rules="rules"
v-bind="layout"
@finish="handleFinish"
@validate="handleValidate"
@finishFailed="handleFinishFailed"
>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="作业名称" name="workName">
<a-input v-model:value="formState.workName" style="width: 424px; height: 32px;margin-left: 35px;"
placeholder="请输入作业名称" autocomplete="off" />
<a-input
v-model:value="formState.workName"
style="width: 424px; height: 32px; margin-left: 35px"
placeholder="请输入作业名称"
autocomplete="off"
/>
</a-form-item>
</div>
</div>
<div class="main_item2">
<a-form-item has-feedback label="作业要求" name="workRequirement">
<a-textarea v-model:value="formState.workRequirement" placeholder="请输入作业要求" autocomplete="off"
allow-clear style="margin-left: 35px" maxlength="150" />
<a-textarea
v-model:value="formState.workRequirement"
placeholder="请输入作业要求"
autocomplete="off"
allow-clear
style="margin-left: 35px"
maxlength="150"
/>
</a-form-item>
</div>
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="提交时间" name="choosedTime">
<a-range-picker style="width: 424px;margin-left: 35px;" v-model:value="formState.choosedTime"
format="YYYY-MM-DD" :placeholder="[' 开始时间', ' 结束时间']" />
<a-range-picker
style="width: 424px; margin-left: 35px"
v-model:value="formState.choosedTime"
format="YYYY-MM-DD"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/enclosure.png" alt="" />
<img
src="@/assets/images/coursewareManage/enclosure.png"
alt=""
/>
</div>
<span style="margin-right: 3px">附件：</span>
</div>
<div class="btnbox">
<a-upload v-model:file-list="fileList" name="file" action="/api/file/upload" @change="handleChange">
<a-upload
v-model:file-list="fileList"
name="file"
action="/api/file/upload"
@change="handleChange"
>
<button class="xkbtn" type="button">上传附件</button>
</a-upload>
</div>
</div>
<div class="main_item" style="margin-top:-25px;">
<div class="signbox">
</div>
<div class="main_item" style="margin-top: -25px">
<div class="signbox"></div>
<div class="btnbox">
<span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
<span style="color: #999999"
>支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
>
</div>
</div>
</div>
@@ -62,21 +99,23 @@
<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>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="添加中..." />
</div>
</a-drawer>
</template>
<script>
import { reactive, ref, toRefs } from "vue";
import { message } from "ant-design-vue";
import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
import {
createWorkTask,
queryWorkDetailById,
updateWorkTaskUsing,
} from "@/api/indexWork";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import dayjs from 'dayjs';
import dayjs from "dayjs";
const rowSelection = ref({
checkStrictly: false,
@@ -103,7 +142,8 @@ export default {
type: Boolean,
default: false,
},
edit: { // 是否为编辑
edit: {
// 是否为编辑
type: Boolean,
default: null,
},
@@ -119,15 +159,18 @@ export default {
type: Number,
default: 0,
},
isLevel: { // 是否是关卡页面触发
isLevel: {
// 是否是关卡页面触发
type: Boolean,
default: null,
},
EditWorkId: { // 要编辑的workId
EditWorkId: {
// 要编辑的workId
type: Number,
default: null,
},
projectTaskId: { // 要编辑的projectId
projectTaskId: {
// 要编辑的projectId
type: Number,
default: null,
},
@@ -138,53 +181,59 @@ export default {
isactive: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
const formState = reactive({
workName: '',
workRequirement: '',
choosedTime: '',
workName: "",
workRequirement: "",
choosedTime: "",
});
const state = reactive({
addLoading: false,
})
});
const formRef = ref();
let checkWorkName = async (_rule, value) => {
if (!value) {
return Promise.reject('请输入作业名称');
return Promise.reject("请输入作业名称");
}
};
let checkWorkRequirement = async (_rule, value) => {
if (!value) {
return Promise.reject('请输入作业要求');
return Promise.reject("请输入作业要求");
}
};
let checkTime = async (_rule, value) => {
if (!value.length) {
return Promise.reject('请选择时间');
return Promise.reject("请选择时间");
}
};
const rules = {
workName: [{
required: true,
validator: checkWorkName,
trigger: 'change',
}],
workRequirement: [{
required: true,
validator: checkWorkRequirement,
trigger: 'change',
}],
choosedTime: [{
required: true,
validator: checkTime,
trigger: 'change',
}],
workName: [
{
required: true,
validator: checkWorkName,
trigger: "change",
},
],
workRequirement: [
{
required: true,
validator: checkWorkRequirement,
trigger: "change",
},
],
choosedTime: [
{
required: true,
validator: checkTime,
trigger: "change",
},
],
};
// const layout = {
// labelCol: {
@@ -194,12 +243,12 @@ export default {
// span: 14,
// },
// };
const handleFinish = values => {
const handleFinish = (values) => {
console.log(values);
updateWork(props.workId)
updateWork(props.workId);
};
const handleFinishFailed = errors => {
const handleFinishFailed = (errors) => {
console.log(errors);
// message.error("handleFinishFailed");
};
@@ -211,14 +260,14 @@ export default {
const handleValidate = (...args) => {
console.log(args);
};
const handleChange = info => {
if (info.file.status !== 'uploading') {
const handleChange = (info) => {
if (info.file.status !== "uploading") {
console.log(info.file, info.fileList);
}
if (info.file.status === 'done') {
if (info.file.status === "done") {
message.success(`${info.file.name} 文件上传成功`);
} else if (info.file.status === 'error') {
} else if (info.file.status === "error") {
message.error(`${info.file.name} 文件上传失败.`);
}
};
@@ -227,146 +276,161 @@ export default {
const closeDrawer = () => {
resetForm();
fileList.value = [];
formState.choosedTime = '';
formState.choosedTime = "";
ctx.emit("update:addhomeworkVisible", false);
ctx.emit("update:edit", false);
};
const afterVisibleChange = (bool) => {
if (props.addhomeworkVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求,
queryWork()
if (props.addhomeworkVisible && props.edit) {
// 该页面显示同时 edit为true 时，发送查询请求,
queryWork();
}
console.log("state", bool);
};
const updateWork = () => {
state.addLoading = true;
if (props.edit) { // 编辑任务
myUpdateWorkTaskUsing()
} else { // 创建任务
console.log('创建任务***************');
myCreateWorkTask()
}
if (props.edit) {
// 编辑任务
myUpdateWorkTaskUsing();
} else {
// 创建任务
console.log("创建任务***************");
myCreateWorkTask();
}
};
// 新增任务
const myCreateWorkTask = () => {
let obj = {
"createTime": "",
"createUser": 0,
"submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
"submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
"updateTime": "",
"updateUser": 0,
"workEnclosureAddress": "",
"workFlag": "",
"workId": 0,
"workName": formState.workName,
"workRequirement": formState.workRequirement,
"workTag": ""
}
createWorkTask(obj).then((res) => {
if(props.isLevel) {
// 新增任务
const myCreateWorkTask = () => {
let obj = {
createTime: "",
createUser: 0,
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
updateTime: "",
updateUser: 0,
workEnclosureAddress: "",
workFlag: "",
workId: 0,
workName: formState.workName,
workRequirement: formState.workRequirement,
workTag: "",
};
createWorkTask(obj)
.then((res) => {
if (props.isLevel) {
// 如果是关卡页面进入 ---------------------------------
myRouterEditTask(res.data.data.workId);
}else {
myProjectEditTask(res.data.data.workId);
}
}).catch((err) => {
message.error(`添加失败${err}`)
})
}
// 编辑任务
const myUpdateWorkTaskUsing = () => {
let editObj = {
"createTime": "",
"createUser": 0,
"submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
"submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
"updateTime": "",
"updateUser": 0,
"workEnclosureAddress": "",
"workFlag": "",
"workId": props.EditWorkId,
"workName": formState.workName,
"workRequirement": formState.workRequirement,
"workTag": ""
myRouterEditTask(res.data.data.workId);
} else {
myProjectEditTask(res.data.data.workId);
}
updateWorkTaskUsing(editObj).then((res) => {
console.log(res);
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(`查询失败`)
})
};
// 新增编辑或新增项目任务
const myProjectEditTask = (workId) => {
let editObj = {
"courseId": workId,
"duration": 60,
"flag": true,
"name": formState.workName,
"projectId": props.projectId,
"projectTaskId": props.projectTaskId || 0,
"stageId": props.chooseStageId,
"type": 4
}
ProjectEditTask(editObj).then(res => {
.catch((err) => {
message.error(`添加失败${err}`);
});
};
// 编辑任务
const myUpdateWorkTaskUsing = () => {
let editObj = {
createTime: "",
createUser: 0,
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
updateTime: "",
updateUser: 0,
workEnclosureAddress: "",
workFlag: "",
workId: props.EditWorkId,
workName: formState.workName,
workRequirement: formState.workRequirement,
workTag: "",
};
updateWorkTaskUsing(editObj)
.then((res) => {
console.log(res);
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(`查询失败`);
});
};
// 新增编辑或新增项目任务
const myProjectEditTask = (workId) => {
let editObj = {
courseId: workId,
duration: 60,
flag: true,
name: formState.workName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
};
ProjectEditTask(editObj)
.then((res) => {
console.log(` 编辑项目成功的打印 ${res}`);
message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
}).catch(err => {
message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
console.log(` 编辑项目失败的打印 ${err}`);
})
.catch((err) => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
console.log(` 编辑项目失败的打印 ${err}`);
});
};
// 新增编辑或新增关卡任务
const myRouterEditTask = (testId) => {
let editObj1 = {
chapterId: props.isactive,
courseId: testId,
duration: 30,
flag: true,
name: formState.workName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
type: 4,
};
}
// 新增编辑或新增关卡任务
const myRouterEditTask = (testId) => {
let editObj1 = {
"chapterId": props.isactive,
"courseId": testId,
"duration": 30,
"flag": true,
"name": formState.workName,
"routerId": props.routerId,
"routerTaskId": props.routerTaskId || 0,
"type": 4
}
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}`);
})
}
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}`);
});
};
return {
afterVisibleChange,
@@ -383,7 +447,7 @@ export default {
// layout,
rules,
updateWork,
...toRefs(state)
...toRefs(state),
};
},
};

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

@@ -961,45 +961,49 @@
<div class="set_content">
<div class="setc_name"><span>项目名称：</span></div>
<div class="setc_main">
<span style="color: #999999">管理者进阶 - 管理者腾飞班</span>
<span style="color: #999999">{{ name }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>封面图：</span></div>
<div class="setc_main">
<img src="@/assets/images/projectadd/picture.png" alt="" />
<img
style="width: 151px; height: 84px;"
:src="picUrl"
alt=""
/>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目时间：</span></div>
<div class="setc_main">
<span style="color: #999999"
>2022-7-16 12:30 ～ 2022-7-30 12:30</span
>{{ startTime }} ～ {{ endTime }}</span
>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目经理：</span></div>
<div class="setc_main">
<span style="color: #999999">张雪</span>
<span style="color: #999999">{{ manager }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main">
<span style="color: #999999">-</span>
<span style="color: #999999">{{ sourceBelong }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>项目说明：</span></div>
<div class="setc_main">
<span style="color: #999999">-</span>
<span style="color: #999999">{{ remark }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>同步学习记录：</span></div>
<div class="setc_main" @click="changecheck2">
<a-radio v-model:checked="checkedd"
<div class="setc_main">
<a-radio v-model:checked="checkedSty"
><span style="color: #333333"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-radio
@@ -1009,19 +1013,19 @@
<div class="set_content">
<div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main">
<span style="color: #999999">-</span>
<span style="color: #999999">{{ level }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main">
<span style="color: #999999">-</span>
<span style="color: #999999">{{ systemId }}</span>
</div>
</div>
<div class="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main" @click="changecheck3">
<a-radio v-model:checked="checkedd2"
<div class="setc_main">
<a-radio v-model:checked="checkedBOEU"
><span style="color: #333333">BOEU实施</span></a-radio
>
</div>
@@ -1706,6 +1710,8 @@ import * as api from "../../api/index1";
import { getProjStu, deleteStu } from "../../api/indexProjStu";
import { message } from "ant-design-vue";
import * as apitl from "../../api/index";
import { getTask } from "../../api/indexTaskadd";
import { toDate } from "../../api/method";
export default {
name: "taskPage",
components: {
@@ -1847,8 +1853,8 @@ export default {
checked: false,
checked1: true,
checked2: false,
checkedd: false, //设置按钮1
checkedd2: false, //设置按钮2
checkedSty: false, //同步学习记录
checkedBOEU: false, //是否BOEU实施
radioV1: "",
radioV2: "",
activeKey: "5", //1:概览 2.任务...
@@ -2325,6 +2331,18 @@ export default {
rankStartTime: null,
rankEndTime: null,
valueName: "", //排行榜输入姓名
//设置
name: null, //项目名称
startTime: null, //开始时间
endTime: null, //结束时间
manager: null, //项目经理
sourceBelong: null, //资源归属
remark: null, //项目说明
level: null, //项目级别
systemId: null, //培训体系
picUrl: null,
});
// 输入接入 -- start --
@@ -2528,12 +2546,7 @@ export default {
const showChangeGroup = () => {
state.Changevisible = true;
};
const changecheck2 = () => {
state.checkedd = !state.checkedd;
};
const changecheck3 = () => {
state.checkedd2 = !state.checkedd2;
};
const edit_hShow = () => {
state.edit_hs = true;
};
@@ -2996,6 +3009,45 @@ export default {
onMounted(() => {
getStu();
getTaskList();
getTask({
projectId: state.projectId,
}).then((res) => {
console.log("get task", res.data.data);
let info = res.data.data.projectInfo;
let start = toDate(info.beginTime / 1000, "Y-M-D");
let end = toDate(info.endTime / 1000, "Y-M-D");
state.name = info.name;
state.startTime = start;
state.endTime = end;
state.manager = info.manager;
state.sourceBelongId = info.sourceBelongId;
state.remark = info.remark;
state.level =
info.level == 1
? "集团级"
: info.level == 2
? "组织级"
: info.level == 3
? "现地级"
: info.level == 4
? "部门级"
: "-";
state.systemId =
info.systemId == 1
? "集团级"
: info.systemId == 2
? "组织级"
: info.systemId == 3
? "现地级"
: info.systemId == 4
? "部门级"
: "-";
state.checkedSty = info.courseSyncFlag == 1 ? true : false;
state.checkedBOEU = info.boeFlag == 1 ? true : false;
state.picUrl = info.picUrl;
state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
});
});
return {
...toRefs(state),
@@ -3021,8 +3073,6 @@ export default {
showAA,
showWork,
showTest,
changecheck2,
changecheck3,
showStuAdd,
showImportStu,
showSeeStu,