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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-02-14 01:37:54 +08:00
parent f9c0d266a8 d6f0d974ce
commit 4016fe6a64
22 changed files with 2897 additions and 1754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1218
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@@ -20,6 +20,7 @@
"dayjs": "^1.11.6", "dayjs": "^1.11.6",
"element-plus": "^2.2.17", "element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4", "element-resize-detector": "^1.2.4",
"exceljs": "^4.3.0",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"json-bigint": "^1.0.0", "json-bigint": "^1.0.0",

14
src/api/index1.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-04 22:45:31 * @Date: 2022-11-04 22:45:31
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-11 16:22:43 * @LastEditTime: 2023-02-13 23:09:53
* @FilePath: /fe-manage/src/api/index1.js * @FilePath: /fe-manage/src/api/index1.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -65,7 +65,7 @@ export const setConfig = (obj) => http.post("/admin/router/setConfig", obj);
//获取学员列表 //获取学员列表
export const getStudent = (obj) => http.post("/admin/router/studentList", obj); export const getStudent = (obj) => http.post("/admin/router/studentList", obj);
//获取路径图详情-包含关卡及任务列表 //获取路径图详情-包含关卡及任务列表
export const getRouterDetail = (routerId,useTask) => export const getRouterDetail = (routerId, useTask) =>
http.get("/admin/router/detail", { http.get("/admin/router/detail", {
params: { params: {
routerId: routerId, routerId: routerId,
@@ -224,4 +224,12 @@ export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/
//分组 //分组
export const changeGroupByStudentId = (obj) => http.post('/admin/student/changeGroupByStudentId', obj) export const changeGroupByStudentId = (obj) => http.post('/admin/student/changeGroupByStudentId', obj)
//导入小组 //导入小组
export const importGroup = (uuid) => http.post('/admin/studentGroup/importGroup/{pid}', { params: { uuid: uuid } }) export const importGroup = (uuid) => http.post('/admin/studentGroup/importGroup/{pid}', { params: { uuid: uuid } })
//添加小组学员
export const addGroupMember = (obj) => http.post('/admin/studentGroup/addGroupMember', obj)
//获取小组成员
export const groupMemberList = (obj) => http.post('/admin/studentGroup/groupMemberList', obj)
//删除小组成员
export const delGroupStudent = (obj) => http.post('/admin/studentGroup/delStudent', obj)
//随机分组
export const randomGroup = (obj, projectId) => http.post(`/admin/studentGroup/randomGroup/${projectId}`, obj)

7
src/api/indexExternalChain.js
View File

@@ -15,12 +15,7 @@ export const deleteLink = (obj) => http.post('/link/deleteLink', { params: obj }
}) })
//获取外链详细信息接口 //获取外链详细信息接口
export const getLink = (obj) => http.post('/link/getOne', obj,{ export const getLink = (obj) => http.get('/link/getOne', {params: obj})
headers: {
'token': '123',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}
})
// 更新外链数据 // 更新外链数据
export const updateLinks = (obj) => http.post('/link/updateLinks', obj, { export const updateLinks = (obj) => http.post('/link/updateLinks', obj, {

3
src/api/indexStu.js
View File

@@ -4,8 +4,7 @@ import http from "./config";
* 1 * 1
*/ */
//获取受众信息 //获取受众信息
export const getAudienceInfoApi = (obj) => // export const getAudienceInfoApi = (obj) => http.post("/admin/orgStruct/getAudienceInfo", obj);
http.post("/admin/orgStruct/getAudienceInfo", obj);
//获取员工信息 //获取员工信息
export const getMemberInfoApi = (obj) => export const getMemberInfoApi = (obj) =>
http.post("/admin/orgStruct/getMemberInfo", obj); http.post("/admin/orgStruct/getMemberInfo", obj);

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

@@ -710,8 +710,8 @@ export default {
offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
testId: state.EditTestId, testId: state.EditTestId,
duration: state.duration, duration: state.duration,
attach:state.attach, attach:state.attach,
id: props.taskIdDraft id: props.edit ? props.taskIdDraft : null
}; };
console.log("obj============", obj, "6" + "9"); console.log("obj============", obj, "6" + "9");
console.log("222222222"); console.log("222222222");
@@ -794,6 +794,7 @@ export default {
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 2, type: 2,
id: props.taskIdDraft
}) })
.then(() => { .then(() => {
//message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` ); //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );

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

@@ -119,6 +119,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
taskCourseID: {
type: Number,
default: null,
},
projectId: { projectId: {
type: Number, type: Number,
default: null, default: null,
@@ -271,6 +275,7 @@ export default {
workId: props.EditWorkId >0 ? props.EditWorkId:0 , workId: props.EditWorkId >0 ? props.EditWorkId:0 ,
workName: state.name, workName: state.name,
workRequirement: state.workRequirement, workRequirement: state.workRequirement,
id: props.edit ? props.taskCourseID : ""
}; };
if (props.EditWorkId > 0) { if (props.EditWorkId > 0) {

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

@@ -752,8 +752,7 @@ export default {
otherSettings: state.switchC2 ? "1" : "0", //1或0 otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8, signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2 standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0", isEvaluate: state.needEval ? "1" : "0"
id: props.edit? props.taskIdDraft : ""
}; };
console.log("我是要更新的数据", state.obj); console.log("我是要更新的数据", state.obj);

9
src/components/drawers/AddProject.vue
View File

@@ -274,7 +274,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
taskCourseID: {
type: Number,
default: null,
},
projectTaskId: { projectTaskId: {
// 要编辑的projectId // 要编辑的projectId
type: Number, type: Number,
@@ -506,9 +509,9 @@ export default {
data.map((value) => { data.map((value) => {
if (value.type == 3) { if (value.type == 3) {
let obj = { let obj = {
key: value.projectId, key: value.id,
parentId: value.parentId, parentId: value.parentId,
projectId: value.projectId, projectId: value.id,
name: value.name, name: value.name,
manager: value.manager, manager: value.manager,
time: dayjs(value.createTime).format("YYYY-MM-DD"), time: dayjs(value.createTime).format("YYYY-MM-DD"),

8
src/components/drawers/AddTest.vue
View File

@@ -427,6 +427,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
taskCourseID: {
type: Number,
default: null,
},
isactive: { isactive: {
type: Number, type: Number,
default: null, default: null,
@@ -667,7 +671,7 @@ export default {
state.test.targetId = 0; state.test.targetId = 0;
state.test.type = 0; state.test.type = 0;
state.test.chapterId=0; state.test.chapterId=0;
state.test.id = props.taskIdDraft; state.test.id = props.taskCourseID;
console.log("props.offCourseId",props.offCourseId); console.log("props.offCourseId",props.offCourseId);
if (props.faceLevel && props.offCourseId > 0) { if (props.faceLevel && props.offCourseId > 0) {
state.test.targetId = props.offCourseId; state.test.targetId = props.offCourseId;
@@ -755,7 +759,7 @@ export default {
examinationName:state.test1.externalName, examinationName:state.test1.externalName,
examinationExplain:state.test1.externalExplain, examinationExplain:state.test1.externalExplain,
source:state.test1.source, source:state.test1.source,
id: props.taskIdDraft id: props.EditTestId
} }
updateExternalExam(obj) updateExternalExam(obj)
.then(async (res) => { .then(async (res) => {

140
src/components/drawers/MemberList.vue
View File

@@ -38,10 +38,33 @@
</div> </div>
</div> </div>
<div class="btnss" style="margin-top: 20px"> <div class="btnss" style="margin-top: 20px">
<div class="btn btn1" @click="showStuAdd" style="margin-right: 20px"> <!-- <div
class="btn btn1"
@click="showStuAdd"
style="margin-right: 20px; color: #fff"
>
<div class="img1"></div> <div class="img1"></div>
<div class="wz">添加组员</div> <div class="wz">添加组员</div>
</div> </div> -->
<CommonStudent
:type="1"
title="添加组员"
@finash="submitCall"
:isGroup="true"
:id="projectId"
:groupId="chooseGroupId"
:groupName="chooseGroupName"
>
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/courseManage/add0.png"
/></template>
添加组员
</a-button></CommonStudent
>
<div class="btn btn2" @click="showModal"> <div class="btn btn2" @click="showModal">
<div class="img3"></div> <div class="img3"></div>
<div class="wz">批量删除</div> <div class="wz">批量删除</div>
@@ -148,32 +171,31 @@
</div> </div>
</a-modal> </a-modal>
<!-- <stu-add v-model:Stuvisible="Stuvisible" /> --> <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
<add-group-members <!-- <add-group-members
v-model:AGMembers="Stuvisible" v-model:AGMembers="Stuvisible"
:chooseGroupId="chooseGroupId" :chooseGroupId="chooseGroupId"
:projectId="projectId" :projectId="projectId"
@getStuPro="getStu" @getStuPro="getStu"
/> /> -->
</div> </div>
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import { toRefs, reactive, watch } from "vue";
// import StuAdd from "./StuAdd.vue"; // import StuAdd from "./StuAdd.vue";
import { // import { getProjStu } from "../../api/indexProjStu";
// getProjStu, import { groupMemberList, delGroupStudent } from "@/api/index1";
removeGroupStudent,
groupMemberList,
} from "../../api/indexProjStu";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import AddGroupMembers from "./AddGroupMembers.vue"; // import AddGroupMembers from "./AddGroupMembers.vue";
import CommonStudent from "@/components/student/CommonStudent";
export default { export default {
name: "MemberList", name: "MemberList",
components: { components: {
// StuAdd, // StuAdd,
AddGroupMembers, // AddGroupMembers,
CommonStudent,
}, },
props: { props: {
Lvisible: { Lvisible: {
@@ -184,6 +206,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
chooseGroupName: {
type: String,
default: null,
},
projectId: { projectId: {
type: Number, type: Number,
default: null, default: null,
@@ -224,7 +250,7 @@ export default {
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
width: 40, width: 40,
align: "left", align: "center",
className: "h head", className: "h head",
}, },
{ {
@@ -272,6 +298,8 @@ export default {
}, },
}, },
], ],
addAuthList: [], //学员
authClassify: 3,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:Lvisible", false); ctx.emit("update:Lvisible", false);
@@ -295,7 +323,7 @@ export default {
studentIds: state.selectedRows, studentIds: state.selectedRows,
}; };
removeGroupStudent(obj) delGroupStudent(obj)
.then((res) => { .then((res) => {
console.log(res, "删除成功"); console.log(res, "删除成功");
message.success("删除成功"); message.success("删除成功");
@@ -329,9 +357,9 @@ export default {
group: value.groupName, //小组名 group: value.groupName, //小组名
studentId: value.studentId, //学生id studentId: value.studentId, //学生id
currentStageId: value.currentStageId, //当前关卡id currentStageId: value.currentStageId, //当前关卡id
name: value.name, //用户名 name: value.studentName, //用户名
bum: value.userInfoBo.deptName, //部门 bum: value.studentDepartName, //部门
gangw: value.userInfoBo.jobName, //岗位 gangw: value.studentJobName, //岗位
completeStageCnt: value.completeStageCnt, //当前完成阶段数 completeStageCnt: value.completeStageCnt, //当前完成阶段数
totalStageCnt: value.totalStageCnt, //总阶段数 totalStageCnt: value.totalStageCnt, //总阶段数
progress: value.completeStageCnt + "/" + value.totalStageCnt, progress: value.completeStageCnt + "/" + value.totalStageCnt,
@@ -344,8 +372,9 @@ export default {
}; };
//获取组员列表 //获取组员列表
const getStu = (obj) => { const getStu = (obj) => {
console.log("获取学员");
let objf = obj || { let objf = obj || {
studentName: "", studentName: state.name,
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: 10, pageSize: 10,
pid: props.projectId, pid: props.projectId,
@@ -357,7 +386,8 @@ export default {
if (res.data.code === 200) { if (res.data.code === 200) {
state.total = res.data.data.total; state.total = res.data.data.total;
state.tableDataTotal = res.data.data.total; state.tableDataTotal = res.data.data.total;
let arr = res.data.data.rows; let arr = res.data.data.records;
console.log("获取小组学员", arr);
getTableDataList(arr); getTableDataList(arr);
} }
// let leng = res.data.data.rows.length; // let leng = res.data.data.rows.length;
@@ -410,33 +440,31 @@ export default {
}; };
//学员搜索 //学员搜索
const searchStu = () => { const searchStu = () => {
let obj = { // let obj = {
deptIds: [], //部门 // studentName: state.name,
groupName: "", // pageNo: state.currentPage,
name: state.name, // pageSize: 10,
pageNo: state.currentPage, // pid: props.projectId,
pageSize: 10, // groupId: props.chooseGroupId, //暂时写死
projectId: props.projectId, // };
topFlag: "",
};
//重新获取列表 //重新获取列表
getStu(obj); getStu();
}; };
//重置 //重置
const resetSearch = () => { const resetSearch = () => {
state.name = null; state.name = null;
let obj = { // let obj = {
deptIds: [], //部门 // deptIds: [], //部门
groupName: "", // groupName: "",
name: "", // name: "",
pageNo: 1, // pageNo: 1,
pageSize: 10, // pageSize: 10,
projectId: props.projectId, // projectId: props.projectId,
groupId: props.chooseGroupId, // groupId: props.chooseGroupId,
topFlag: "", // topFlag: "",
}; // };
//重新获取列表 //重新获取列表
getStu(obj); getStu();
}; };
const deleteOne = (id) => { const deleteOne = (id) => {
// console.log(id, "fewfew"); // console.log(id, "fewfew");
@@ -459,7 +487,7 @@ export default {
studentIds: state.selectedRows, studentIds: state.selectedRows,
}; };
console.log("删除小组学员obj", obj); console.log("删除小组学员obj", obj);
removeGroupStudent(obj) delGroupStudent(obj)
.then((res) => { .then((res) => {
state.deone = false; state.deone = false;
console.log(res, "单个删除成功"); console.log(res, "单个删除成功");
@@ -473,6 +501,35 @@ export default {
state.selectedRows = []; state.selectedRows = [];
}; };
//添加学员
watch(
() => state.addAuthList,
(res) => {
console.log("res", res, state.addAuthList);
// let obj = {
// deptList: res[1],
// groupList: res[2],
// projectId: state.projectId,
// studentList: res[0],
// projectGroupId: 0,
// };
// console.log("obj", obj);
// state.loading = true;
// api
// .addStudentProject(obj)
// .then((res) => {
// console.log("添加学员成功", res);
// message.success("添加学员成功");
// getStu();
// })
// .catch((err) => {
// console.log("添加学员失败", err);
// });
}
);
function submitCall(flag) {
flag && getStu();
}
return { return {
...toRefs(state), ...toRefs(state),
closeDrawer, closeDrawer,
@@ -491,6 +548,7 @@ export default {
deleteOne, deleteOne,
closedeleone, closedeleone,
yesdele, yesdele,
submitCall,
}; };
}, },
}; };

30
src/components/drawers/StuAdd.vue
View File

@@ -551,7 +551,7 @@ import { message } from "ant-design-vue";
// import { toDate } from "../../api/method"; // import { toDate } from "../../api/method";
// import * as api from '../../api/indexStu' // import * as api from '../../api/indexStu'
import { import {
getAudienceInfoApi, // getAudienceInfoApi,
getMemberInfoApi, getMemberInfoApi,
getOrgInfoApi, getOrgInfoApi,
} from "@/api/indexStu"; } from "@/api/indexStu";
@@ -1239,20 +1239,20 @@ export default {
if (!state.nameaddd) { if (!state.nameaddd) {
return false; return false;
} }
const item1 = await getAudienceInfoApi({ // const item1 = await getAudienceInfoApi({
pageNo: state.currentPage2, // pageNo: state.currentPage2,
pageSize: state.pageSize2, // pageSize: state.pageSize2,
keyWord: state.nameaddd, // keyWord: state.nameaddd,
}).then((res) => { // }).then((res) => {
if (res.data.code === 200) return res.data.data.rows; // if (res.data.code === 200) return res.data.data.rows;
}); // });
state.tabledata2 = traverseArr(item1, { // state.tabledata2 = traverseArr(item1, {
key: "id", // key: "id",
name: "audienceName", // name: "audienceName",
time: "createTime", // time: "createTime",
number: "countNum", // number: "countNum",
type: "typeName", // type: "typeName",
}); // });
}; };
getShouzong(); getShouzong();

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

@@ -39,14 +39,14 @@
<div> <div>
<div class="groupin" v-for="(value, index) in groupNum2" :key="index"> <div class="groupin" v-for="(value, index) in groupNum2" :key="index">
<a-input <a-input
v-model:value="value.name" v-model:value="value.groupName"
style="border-radius: 8px; height: 40px" style="border-radius: 8px; height: 40px"
/> />
<a-input-number <a-input-number
:min="1" :min="1"
:precision="0" :precision="0"
style="width: 64px; height: 40px; border-radius: 8px" style="width: 64px; height: 40px; border-radius: 8px"
v-model:value="peopleNum" v-model:value="value.capacity"
/> />
<span style="margin-left: 3px">人</span> <span style="margin-left: 3px">人</span>
<div class="delete" @click="deleteGroup(value)">删除</div> <div class="delete" @click="deleteGroup(value)">删除</div>
@@ -72,6 +72,7 @@
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import AddGroup from "./AddGroup.vue"; import AddGroup from "./AddGroup.vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { randomGroup } from "@/api/index1";
export default { export default {
name: "SubsetManage", name: "SubsetManage",
components: { AddGroup }, components: { AddGroup },
@@ -80,6 +81,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
projectId: {
type: Number,
default: null,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
@@ -116,8 +121,8 @@ export default {
for (let i = 0; i < state.groupNum; i++) { for (let i = 0; i < state.groupNum; i++) {
let obj = { let obj = {
key: i, key: i,
name: "", groupName: "",
number: state.peopleNum, capacity: state.peopleNum,
}; };
arr.push(obj); arr.push(obj);
} }
@@ -135,6 +140,17 @@ export default {
//添加小组 //添加小组
const addGroup = () => { const addGroup = () => {
console.log("state.groupNum2", state.groupNum2); console.log("state.groupNum2", state.groupNum2);
let obj = {
pid: props.projectId,
randomGroups: state.groupNum2,
};
randomGroup(obj, props.projectId)
.then((res) => {
console.log("随机分组结果", res);
})
.catch((err) => {
console.log("随机分组失败", err);
});
}; };
return { return {

516
src/components/student/CommonStudent.vue
View File

@@ -3,97 +3,136 @@
<template> <template>
<div class="CommonStudent"> <div class="CommonStudent">
<a-drawer <a-drawer
:visible="visiable" :visible="visiable"
class="drawerStyle ProjCheckship CommonStudent" class="drawerStyle ProjCheckship CommonStudent"
placement="right" placement="right"
width="60%" width="60%"
> >
<div class="drawerMain" id="ProjCheckship" style=""> <div class="drawerMain" id="ProjCheckship" style="">
<div class="header"> <div class="header">
<div class="headerTitle"> <div class="headerTitle">
{{ {1: "添加学员", 2: "添加学员", 3: "添加学员"}[type] || title }} {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || title }}
</div> </div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div style="display: flex; overflow-x: auto; overflow-y: auto"> <div style="display: flex; overflow-x: auto; overflow-y: auto">
<div class="tabs" style="min-width: 800px"> <div class="tabs" style="min-width: 800px">
<a-tabs v-model:activeKey="activeKey"> <a-tabs v-model:activeKey="activeKey">
<!-- <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
<a-form-item label="姓名：">
<a-input
v-model:value="proStudentName"
style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
<a-button
type="primary"
@click="searchAudi"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon>
<SearchOutlined />
</template>
搜索
</a-button>
<a-button
@click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px"
>重置
</a-button>
</a-form-item>
</div>
<div class="tableBox tabb">
<a-table
style="border: 1px solid #f2f6fe; width: 800px"
row-key="id"
:columns="stuColumns"
:data-source="projectList"
:loading="projectListTotal"
:pagination="projectPagination"
:row-selection="projectRowSelection"
/>
</div>
</div>
</a-tab-pane> -->
<a-tab-pane :key="1" tab="快速选人"> <a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }"> <div :style="{ height: screenHeight - 235 + 'px' }">
<div class="tab1"> <div class="tab1">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input <a-input
v-model:value="nameSearch.keyword" v-model:value="nameSearch.keyword"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
@change="peopleName" @change="peopleName"
/> />
<a-button <a-button
type="primary" type="primary"
@click="onSearchStu" @click="onSearchStu"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined/> <SearchOutlined />
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetStu" @click="resetStu"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置 >重置
</a-button> </a-button>
</a-form-item> </a-form-item>
</div> </div>
<div <div
class="chooseLeft" class="chooseLeft"
style="display: grid; grid-template-columns: 250px auto" style="display: grid; grid-template-columns: 250px auto"
> >
<div <div
:style="{ :style="{
height: screenHeight - 180 + 'px', height: screenHeight - 180 + 'px',
overflowY: 'auto', overflowY: 'auto',
}" }"
style="border: 1px solid #f0f0f0" style="border: 1px solid #f0f0f0"
> >
<div class="tree" style="margin: 10px 4px 220px 10px"> <div class="tree" style="margin: 10px 4px 220px 10px">
<a-tree <a-tree
allow-clear allow-clear
tree-default-expand-all tree-default-expand-all
:tree-data="treeData" :tree-data="treeData"
:loading="orgLoading" :loading="orgLoading"
:load-data="onLoadData" :load-data="onLoadData"
v-model:selectedKeys="stuTreeSelectKeys" v-model:selectedKeys="stuTreeSelectKeys"
v-model:expandedKeys="stuTreeExpandedKeys" v-model:expandedKeys="stuTreeExpandedKeys"
:fieldNames="{ :fieldNames="{
children: 'treeChildList', children: 'treeChildList',
key: 'id', key: 'id',
title: 'name', title: 'name',
value: 'name', value: 'name',
}" }"
@select="stuStuOrgSelect" @select="stuStuOrgSelect"
> >
</a-tree> </a-tree>
</div> </div>
</div> </div>
<div <div
class="tableBox tabb" class="tableBox tabb"
style=" style="
margin: 0px 4px 120px 10px; margin: 0px 4px 120px 10px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
" "
> >
<a-table <a-table
:columns="stuColumns" :columns="stuColumns"
:data-source="stuData" :data-source="stuData"
:pagination="stuPagination" :pagination="stuPagination"
:loading="stuLoading" :loading="stuLoading"
row-key="id" row-key="id"
:row-selection="stuRowSelection" :row-selection="stuRowSelection"
/> />
</div> </div>
</div> </div>
@@ -104,43 +143,42 @@
<div class="tab2"> <div class="tab2">
<a-form-item label="组织："> <a-form-item label="组织：">
<a-input <a-input
v-model:value="searchOrgName.keyword" v-model:value="searchOrgName.keyword"
style="width: 230px; height: 40px; border-radius: 8px" style="width: 230px; height: 40px; border-radius: 8px"
placeholder="请输入组织" placeholder="请输入组织"
/> />
<a-button <a-button
type="primary" type="primary"
@click="searchOrg" @click="searchOrg"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined/> <SearchOutlined />
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetOrg" @click="resetOrg"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置 >重置
</a-button </a-button>
>
</a-form-item> </a-form-item>
</div> </div>
<div class="boeTree"> <div class="boeTree">
<a-tree <a-tree
:tree-data="searchOrgName.keyword ? orgData : treeOrgData" :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
@select="onOrgSelectChange" @select="onOrgSelectChange"
:loading="orgOrgLoading" :loading="orgOrgLoading"
:load-data="onLoadOrgData" :load-data="onLoadOrgData"
:fieldNames="{ :fieldNames="{
children: 'treeChildList', children: 'treeChildList',
key: 'id', key: 'id',
title: 'name', title: 'name',
value: 'name', value: 'name',
}" }"
row-key="id" row-key="id"
:row-selection="orgRowSelection" :row-selection="orgRowSelection"
multiple multiple
> >
</a-tree> </a-tree>
</div> </div>
@@ -151,36 +189,36 @@
<div> <div>
<a-form-item label="受众名称："> <a-form-item label="受众名称：">
<a-input <a-input
v-model:value="audienceName.keyword" v-model:value="audienceName.keyword"
style="width: 260px; height: 40px; border-radius: 8px" style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称" placeholder="请输入受众名称"
/> />
<a-button <a-button
type="primary" type="primary"
@click="searchAudi" @click="searchAudi"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
> >
<template #icon> <template #icon>
<SearchOutlined/> <SearchOutlined />
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button <a-button
@click="resetAudienceInfo" @click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px" style="margin-left: 20px; border-radius: 4px"
>重置 >重置
</a-button> </a-button>
</a-form-item> </a-form-item>
</div> </div>
<div class="tableBox tabb"> <div class="tableBox tabb">
<a-table <a-table
style="border: 1px solid #f2f6fe;width:800px" style="border: 1px solid #f2f6fe; width: 800px"
row-key="id" row-key="id"
:columns="audiColums" :columns="audiColums"
:data-source="audiData" :data-source="audiData"
:loading="audiLoading" :loading="audiLoading"
:pagination="auditPagination" :pagination="auditPagination"
:row-selection="auditRowSelection" :row-selection="auditRowSelection"
/> />
</div> </div>
</div> </div>
@@ -193,7 +231,10 @@
<div class="already">已选</div> <div class="already">已选</div>
</div> </div>
</div> </div>
<div :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto"> <div
:style="{ 'max-height': screenHeight - 235 + 'px' }"
style="overflow-y: auto"
>
<div class="selecteds"> <div class="selecteds">
<div class="person">快速选人</div> <div class="person">快速选人</div>
<div v-for="(item, i) in selectsData.studentList"> <div v-for="(item, i) in selectsData.studentList">
@@ -213,72 +254,78 @@
</div> </div>
</div> </div>
<div <div
v-if="!person && selectsData.studentList.length > 10" v-if="!person && selectsData.studentList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="person = !person" class="“sw”">查看更多></div> <div @click="person = !person" class="“sw”">查看更多></div>
</div> </div>
<div <div
v-if="person && selectsData.studentList.length > 10" v-if="person && selectsData.studentList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="person = !person" class="sw">收起&lt;</div> <div @click="person = !person" class="sw">收起&lt;</div>
</div> </div>
</div> </div>
<div v-if="!selectStu" class="selecteds"> <div v-if="!selectStu" class="selecteds">
<div class="dept">添加组织</div> <div class="dept">添加组织</div>
<div v-for="(item,i) in selectsData.deptList"> <div v-for="(item, i) in selectsData.deptList">
<div v-if="i<11"> <div v-if="i < 11">
<div class="chose1"> <div class="chose1">
<div class="span"> {{ item.name }}</div> <div class="span">{{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div> <div class="ch1" @click="orgDel(i)"></div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="dept"> <div v-if="dept">
<div class="chose1"> <div class="chose1">
<div class="span"> {{ item.name }}</div> <div class="span">{{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div> <div class="ch1" @click="orgDel(i)"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="!dept && selectsData.deptList.length >10" class="ifsw"> <div
<div @click="dept = !dept" class=“sw”>查看更多></div> v-if="!dept && selectsData.deptList.length > 10"
class="ifsw"
>
<div @click="dept = !dept" class="“sw”">查看更多></div>
</div> </div>
<div v-if="dept && selectsData.deptList.length >10" class="ifsw"> <div
<div @click="dept = !dept" class="sw"> 收起&lt;</div> v-if="dept && selectsData.deptList.length > 10"
class="ifsw"
>
<div @click="dept = !dept" class="sw">收起&lt;</div>
</div> </div>
</div> </div>
<!--受众--> <!--受众-->
<div v-if="!selectStu" class="selecteds"> <div v-if="!selectStu" class="selecteds">
<div class="group">受众关联</div> <div class="group">受众关联</div>
<div v-for="(item, i) in selectsData.groupList"> <div v-for="(item, i) in selectsData.groupList">
<div v-if="i < 11"> <div v-if="i < 11">
<div class="chose2"> <div class="chose2">
<div class="span">{{ item.audienceName }}</div> <div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div> <div class="ch2" @click="AuditDel(i)"></div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="group"> <div v-if="group">
<div class="chose2"> <div class="chose2">
<div class="span">{{ item.audienceName }}</div> <div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div> <div class="ch2" @click="AuditDel(i)"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div <div
v-if="!group && selectsData.groupList.length > 10" v-if="!group && selectsData.groupList.length > 10"
class="ifsw" class="ifsw"
> >
<div @click="group = !group" class="“sw”">查看更多></div> <div @click="group = !group" class="“sw”">查看更多></div>
</div> </div>
<div v-if="group && selectsData.groupList > 10" class="ifsw"> <div v-if="group && selectsData.groupList > 10" class="ifsw">
<div @click="group = !group" class="sw">收起&lt;</div> <div @click="group = !group" class="sw">收起&lt;</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -291,13 +338,13 @@
<a-button @click="openDrawer" type="link"><slot></slot></a-button> <a-button @click="openDrawer" type="link"><slot></slot></a-button>
</div> </div>
<a-modal <a-modal
:style="{padding: 0,position: relative,right: '-20%'}" :style="{ padding: 0, position: relative, right: '-20%' }"
:closable="true" :closable="true"
:visible="stageVisible" :visible="stageVisible"
:footer="null" :footer="null"
centered="true" centered="true"
@ok="handleStageOk" @ok="handleStageOk"
wrapClassName="changeModal" wrapClassName="changeModal"
> >
<div class="con"> <div class="con">
<div class="header"> <div class="header">
@@ -311,34 +358,34 @@
<!-- <div class="cur">当前关卡：关卡2</div> --> <!-- <div class="cur">当前关卡：关卡2</div> -->
<div class="select"> <div class="select">
<a-select <a-select
style="width: 400px" style="width: 400px"
:placeholder="type === 1 ? '选择阶段' : '选择关卡'" :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
v-model:value="selectsData.stageId" v-model:value="selectsData.stageId"
className="cus-select" className="cus-select"
> >
<a-select-option <a-select-option
v-for="(item, i) in stageIds" v-for="(item, i) in stageIds"
:key="i" :key="i"
:value="item.id" :value="item.id"
>{{ item.name || "默认" }} >{{ item.name || "默认" }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<span style="color: #999999; margin-left: 10px" <span style="color: #999999; margin-left: 10px"
><minus-circle-outlined/>已在其他关卡的学员，不会被添加到该关卡</span ><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span
> >
<div class="btn" style="margin-top: 50px"> <div class="btn" style="margin-top: 50px">
<button <button
class="sameb btn1" class="sameb btn1"
@click="closeChangeModal" @click="closeChangeModal"
style="cursor: pointer" style="cursor: pointer"
> >
取消 取消
</button> </button>
<button <button
class="sameb btn2" class="sameb btn2"
@click="handleStageOk" @click="handleStageOk"
style="cursor: pointer" style="cursor: pointer"
> >
确定 确定
</button> </button>
@@ -349,23 +396,27 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue"; import { computed, defineEmits, defineProps, ref, watch } from "vue";
import {boeRequest, useBoeApi, useBoeApiPage} from "@/api/request"; import { boeRequest, useBoeApi, useBoeApiPage } from "@/api/request";
import { import {
AUDIENCE_LIST, AUDIENCE_LIST,
ORG_CHILD_LIST, ORG_CHILD_LIST,
ORG_LIST, ORG_LIST,
USER_LIST, USER_LIST,
} from "@/api/ThirdApi"; } from "@/api/ThirdApi";
import {saveStu} from "@/api/index1"; import {
saveStu,
// addGroupMember,
// getStuPage,
} from "@/api/index1";
// import { getProjStu } from "@/api/indexProjStu";
const emit = defineEmits({}); const emit = defineEmits({});
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
title: { title: {
type: String, type: String,
default: '', default: "",
}, },
clear: { clear: {
type: Boolean, type: Boolean,
@@ -383,12 +434,85 @@ const props = defineProps({
type: Array, type: Array,
default: () => [], default: () => [],
}, },
isGroup: {
type: Boolean,
default: false,
},
projectId: {
type: Number,
default: null,
},
groupId: {
type: Number,
default: null,
},
groupName: {
type: String,
default: null,
},
}); });
//获取项目学员
// const procurrentPage = ref(1);
// const projectList = ref([]);
// const proStudentName = ref("");
// const projectListTotal = ref(-1);
// const projectPageSize = ref(10);
// const projectSelectKeys = ref([]);
// const projectPagination = computed(() => ({
// total: projectListTotal.value,
// showSizeChanger: false,
// current: procurrentPage.value,
// pageSize: projectPageSize.value,
// onChange: projectChangePagination,
// }));
// const projectRowSelection = computed(() => ({
// columnWidth: 20,
// selectedRowKeys: projectSelectKeys.value,
// onChange: onProjectSelectChange,
// preserveSelectedRowKeys: true,
// }));
// const getStu = () => {
// let obj = {
// studentName: proStudentName.value,
// pageNo: procurrentPage.value,
// pageSize: 10,
// projectId: props.projectId,
// };
// projectListTotal.value = -1;
// console.log("获取项目学员", obj);
// getStuPage(obj).then((res) => {
// console.log("获取项目学员", res);
// if (res.data.code === 200) {
// let arr = res.data.data.records;
// let array = [];
// arr.map((value) => {
// let obj = {
// id: value.id,
// realName: value.studentName,
// userNo: value.studentId,
// orgName: value.studentOrgName ? value.studentOrgName : "-",
// departName: value.studentDepartName ? value.studentDepartName : "-",
// };
// array.push(obj);
// });
// projectList.value = array;
// projectListTotal.value = res.data.data.total;
// }
// });
// };
// getStu();
// const projectChangePagination = () => {};
// function onProjectSelectChange(e, l) {
// console.log("eeeee", e, l);
// projectSelectKeys.value = e;
// selectsData.value.projectMemberList = l;
// }
const person = ref(false); const person = ref(false);
// const dept =ref(false) // const dept =ref(false)
const group = ref(false); const group = ref(false);
const visiable = ref(false); const visiable = ref(false);
// const activeKey = ref(props.isGroup ? 4 : 1);
const activeKey = ref(1); const activeKey = ref(1);
const stageVisible = ref(false); const stageVisible = ref(false);
const selectsData = ref({ const selectsData = ref({
@@ -411,10 +535,10 @@ const audienceName = ref({
pageSize: 10, pageSize: 10,
}); });
const searchOrgName = ref({ const searchOrgName = ref({
keyword: '', keyword: "",
page: 1, page: 1,
pageSize: 10 pageSize: 10,
}) });
const stageIds = computed(() => props.stage); const stageIds = computed(() => props.stage);
const { const {
data: stuData, data: stuData,
@@ -430,25 +554,25 @@ const {
totalPage: (res) => res.result.totalPage, totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement, total: (res) => res.result.totalElement,
}); });
const { const { data: orgData, fetch: searchOrg } = useBoeApiPage(
data: orgData, ORG_LIST,
fetch: searchOrg, searchOrgName.value
} = useBoeApiPage(ORG_LIST, searchOrgName.value)
const {data: treeData, loading: orgLoading} = useBoeApi(
ORG_LIST,
{keyword: ""},
{
init: true,
result: (res) => res.result.map((e) => ({...e, isLeaf: false})),
}
); );
const {data: treeOrgData, loading: orgOrgLoading} = useBoeApi( const { data: treeData, loading: orgLoading } = useBoeApi(
ORG_LIST, ORG_LIST,
{keyword: ""}, { keyword: "" },
{ {
init: true, init: true,
result: (res) => res.result.map((e) => ({...e, isLeaf: false})), result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
} }
);
const { data: treeOrgData, loading: orgOrgLoading } = useBoeApi(
ORG_LIST,
{ keyword: "" },
{
init: true,
result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
}
); );
const { const {
@@ -462,7 +586,7 @@ const {
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true, init: true,
result: (res) => result: (res) =>
res.result.audienceList.map((e) => ({...e, id: e.id + ""})), res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
totalPage: (res) => res.result.totalPage, totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement, total: (res) => res.result.totalElement,
}); });
@@ -537,7 +661,7 @@ const auditSelectKeys = ref([]);
const screenHeight = ref(document.body.clientHeight); const screenHeight = ref(document.body.clientHeight);
//const screenWidth = ref(document.body.clientWidth); //const screenWidth = ref(document.body.clientWidth);
const stuRowSelection = computed(() => ({ const stuRowSelection = computed(() => ({
type:props.selectOne?'radio':'checkbox', type: props.selectOne ? "radio" : "checkbox",
columnWidth: 20, columnWidth: 20,
selectedRowKeys: stuSelectKeys.value, selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange, onChange: onStuSelectChange,
@@ -577,20 +701,20 @@ const closeDrawer = () => {
}; };
function onLoadData(treeNode) { function onLoadData(treeNode) {
return boeRequest(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then( return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => { (r) => {
treeNode.dataRef.treeChildList = r.result.directChildList; treeNode.dataRef.treeChildList = r.result.directChildList;
treeData.value = [...treeData.value]; treeData.value = [...treeData.value];
} }
); );
} }
function onLoadOrgData(treeNode) { function onLoadOrgData(treeNode) {
return boeRequest(ORG_CHILD_LIST, {keyword: "", orgId: treeNode.id}).then( return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => { (r) => {
treeNode.dataRef.treeChildList = r.result.directChildList; treeNode.dataRef.treeChildList = r.result.directChildList;
treeOrgData.value = [...treeOrgData.value]; treeOrgData.value = [...treeOrgData.value];
} }
); );
} }
@@ -617,7 +741,7 @@ function stuStuOrgSelect(e) {
function stuDel(i) { function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter( stuSelectKeys.value = stuSelectKeys.value.filter(
(e) => e !== selectsData.value.studentList[i].id (e) => e !== selectsData.value.studentList[i].id
); );
selectsData.value.studentList.splice(i, 1); selectsData.value.studentList.splice(i, 1);
} }
@@ -628,7 +752,7 @@ function stuDel(i) {
// } // }
function AuditDel(i) { function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter( auditSelectKeys.value = auditSelectKeys.value.filter(
(e) => e !== selectsData.value.groupList[i].id (e) => e !== selectsData.value.groupList[i].id
); );
selectsData.value.groupList.splice(i, 1); selectsData.value.groupList.splice(i, 1);
} }
@@ -690,7 +814,7 @@ const deleteDepSelect = () => {
}; };
//重置组织 //重置组织
const resetOrg = () => { const resetOrg = () => {
searchOrgName.value = {keyword: '', page: 1, pageSize: 10} searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
}; };
//重置受众 //重置受众
const resetAudienceInfo = () => { const resetAudienceInfo = () => {
@@ -725,15 +849,42 @@ function handleStageOk() {
saveStu({ saveStu({
targetId: props.id, targetId: props.id,
type: props.type, type: props.type,
clear:props.clear, clear: props.clear,
deptIds: selectsData.value.deptList?.map((e) => e.id), deptIds: selectsData.value.deptList?.map((e) => e.id),
stageId: selectsData.value.stageId, stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map((e) => e.id), groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList, studentList: selectsData.value.studentList,
groupName: props.groupName,
groupId: props.groupId,
}).then(() => { }).then(() => {
deleteDepSelect(); deleteDepSelect();
emit("finash", true); emit("finash", true);
}); });
// //添加小组学员
// if (props.isGroup) {
// console.log("添加组员传参", selectsData.value, {
// groupId: props.groupId,
// pid: props.projectId,
// groupName: props.groupName,
// ids: selectsData.value.studentList?.map((e) => e.id),
// });
// addGroupMember({
// groupId: props.groupId,
// pid: props.projectId,
// groupName: props.groupName,
// studentIds: selectsData.value.studentList?.map((e) => e.id),
// })
// .then((res) => {
// console.log("添加小组学员", res);
// deleteDepSelect();
// emit("finash", true);
// })
// .catch((err) => {
// console.log("添加小组学员失败", err);
// });
// } else {
// }
} }
watch(visiable, () => { watch(visiable, () => {
@@ -746,6 +897,7 @@ watch(visiable, () => {
nameSearch.value.departId = null; nameSearch.value.departId = null;
stuTreeExpandedKeys.value = []; stuTreeExpandedKeys.value = [];
stuTreeSelectKeys.value = []; stuTreeSelectKeys.value = [];
// activeKey.value = props.isGroup ? 4 : 1;
activeKey.value = 1; activeKey.value = 1;
selectsData.value = { selectsData.value = {
stageId: "", stageId: "",

42
src/utils/commonExcel.js Normal file
View File

@@ -0,0 +1,42 @@
import Exceljs from 'exceljs'
export const commonExport = (headers, datas, fileName) => {
const workbook = new Exceljs.Workbook()
workbook.created = new Date();
const sheet = workbook.addWorksheet("Sheet1", { views: [{ ySplit: 1, state: 'frozen' }] })
sheet.columns = headers
sheet.addRows(datas)
sheet.eachRow({ includeEmpty: true }, (row, rowNumber) => {
console.log('rowNumber', rowNumber)
row.eachCell({ includeEmpty: true }, (cell, colNumber) => {
console.log('colNumber', colNumber)
cell.alignment = { vertical: 'middle', horizontal: 'center' }
cell.border = {
top: { style: 'thin' },
left: { style: 'thin' },
bottom: { style: 'thin' },
right: { style: 'thin' }
}
})
})
downExcel(workbook, fileName)
}
export const downExcel = (wb, fileName) => {
wb.xlsx.writeBuffer().then(buffer => {
let blob = new Blob([buffer], {
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
})
let ele = document.createElement('a')
ele.style.display = 'none'
ele.href = URL.createObjectURL(blob)
ele.download = fileName
document.body.appendChild(ele)
ele.click()
document.body.removeChild(ele)
URL.revokeObjectURL(ele.href)
wb = null
})
}

370
src/views/courselibrary/CoursewareManage.vue
View File

@@ -305,90 +305,34 @@
<!-- 查看面授课弹框 end --> <!-- 查看面授课弹框 end -->
<!-- 确定新建面授课弹窗 --> <!-- 确定新建面授课弹窗 -->
<!-- 表格 --> <!-- 表格 -->
<div style="padding: 10px 35px"> <div style="padding:10px 35px">
<a-table <a-table
:header-cell-style="{ 'text-align': 'center' }" :header-cell-style="{'text-align':'center'}"
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="columns1" :columns="columns1"
:data-source="tableData1" :data-source="tableData1"
:loading="tableLoading" :loading="tableLoading"
:pagination="false" :pagination="false"
:scroll="{ x: 'max-content' }" :scroll="{x:'max-content'}"
> >
<template #bodyCell="{ record, column }"> <template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'"> <template v-if="column.key === 'operation'">
<a-space> <a-space>
<a-button <a-button v-if="(record.status===0 || record.status===-1 || !record.kkty) && checkPer(record.permissions)" @click="() => handleEdit(record, String(record.courseform))" type="link">编辑</a-button>
v-if=" <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleStart(record, String(record.courseform))" type="link">开课</a-button>
(record.status === 0 || <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleLook(record, String(record.courseform))" type="link">查看</a-button>
record.status === -1 || <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleGuan22(record, String(record.courseform))" type="link">管理</a-button>
!record.kkty) && <DropDown v-if="checkPer(record.permissions)" value="授权">
checkPer(record.permissions) <OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
" <CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
@click="() => handleEdit(record, String(record.courseform))" <CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
type="link"
>编辑</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleStart(record, String(record.courseform))"
type="link"
>开课</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleLook(record, String(record.courseform))"
type="link"
>查看</a-button
>
<a-button
v-if="record.status === 2 && checkPer(record.permissions)"
@click="() => handleGuan22(record, String(record.courseform))"
type="link"
>管理</a-button
>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<OwnerTableModelStudent :types="[10, 11, 12]" :id="record.id"
>权限名单</OwnerTableModelStudent
>
<CommonStudent :type="10" :id="record.id" title="查看权"
>查看权</CommonStudent
>
<CommonStudent :type="11" :id="record.id" title="管理权"
>管理权</CommonStudent
>
</DropDown> </DropDown>
<DropDown v-if="checkPer(record.permissions)" value="更多"> <DropDown v-if="checkPer(record.permissions)" value="更多">
<a-button <a-button @click="() => handleCopy(record, String(record.courseform))" type="link">复制</a-button>
@click="() => handleCopy(record, String(record.courseform))" <a-button @click="() => handleRejectExit(record, String(record.courseform))" type="link">撤回</a-button>
type="link" <a-button v-if="record.status===2 && record.kkty" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
>复制</a-button <a-button v-if="record.status===2 && !record.kkty" @click="() => handleOpen(record, String(record.courseform))" type="link">启用</a-button>
> <a-button @click="() => handleDelete(record, String(record.courseform))" type="link" danger>删除</a-button>
<a-button
@click="
() => handleRejectExit(record, String(record.courseform))
"
type="link"
>撤回</a-button
>
<a-button
v-if="record.status === 2 && record.kkty"
@click="() => handleStop(record, String(record.courseform))"
type="link"
>停用</a-button
>
<a-button
v-if="record.status === 2 && !record.kkty"
@click="() => handleOpen(record, String(record.courseform))"
type="link"
>启用</a-button
>
<a-button
@click="() => handleDelete(record, String(record.courseform))"
type="link"
danger
>删除</a-button
>
</DropDown> </DropDown>
</a-space> </a-space>
</template> </template>
@@ -1162,42 +1106,9 @@
:isgetStudent="isgetStudent" :isgetStudent="isgetStudent"
> >
<template #extension="{ data: { record } }"> <template #extension="{ data: { record } }">
<a-button <a-button v-if="record.source === 4 && record.status === 1" @click="() => {record.status = 0;auditStudent(record);}" type="link">审核通过</a-button>
v-if="record.source === 4 && record.status === 1" <a-button v-if="record.source === 4 && record.status === 1" @click="() => {record.status = 2;auditStudent(record);}" type="link">拒绝</a-button>
@click=" <a-button v-if="record.source === 4 && (record.status === 0 || record.status === 2)" @click="() => {record.status = 1;auditStudent(record);}" type="link">撤回</a-button>
() => {
record.status = 0;
auditStudent(record);
}
"
type="link"
>审核通过</a-button
>
<a-button
v-if="record.source === 4 && record.status === 1"
@click="
() => {
record.status = 2;
auditStudent(record);
}
"
type="link"
>拒绝</a-button
>
<a-button
v-if="
record.source === 4 &&
(record.status === 0 || record.status === 2)
"
@click="
() => {
record.status = 1;
auditStudent(record);
}
"
type="link"
>撤回</a-button
>
</template> </template>
</TableStudent> </TableStudent>
</div> </div>
@@ -1579,6 +1490,9 @@ import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router"; import { useRouter, useRoute } from "vue-router";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent"; import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
// import StuAdd from "../../components/drawers/StuAdd";
// import OwnPower from "../../components/drawers/OwnPower.vue";
// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue"; import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
import ProjOwnerShip from "../../components/drawers/ProjectOwn"; import ProjOwnerShip from "../../components/drawers/ProjectOwn";
@@ -1599,7 +1513,7 @@ import {
addStudent, addStudent,
studentExport, studentExport,
handleStudent, handleStudent,
getMemberInfoApi, getMemberInfoApi,
copyCoursePlan, copyCoursePlan,
} from "@/api/indexCourse"; } from "@/api/indexCourse";
import { import {
@@ -1630,6 +1544,7 @@ import { useStore } from "vuex";
import DropDown from "@/components/common/DropDown"; import DropDown from "@/components/common/DropDown";
import { checkPer } from "@/utils/utils"; import { checkPer } from "@/utils/utils";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { commonExport } from '@/utils/commonExcel'
//列表表格 //列表表格
const columns1 = [ const columns1 = [
@@ -1656,8 +1571,8 @@ const columns1 = [
width: 130, width: 130,
dataIndex: "contentTxt", dataIndex: "contentTxt",
ellipsis: true, ellipsis: true,
key: "1", key: "contentTxt",
align: "center", align: "center",
}, },
{ {
title: "课程形式", title: "课程形式",
@@ -2211,10 +2126,10 @@ export default defineComponent({
setup() { setup() {
const CourseModalRef = ref(null); const CourseModalRef = ref(null);
const store = useStore(); const store = useStore();
const state = reactive({ const state = reactive({
tableLoading: false, tableLoading: false,
//新加 //新加
stuColumns: [ stuColumns: [
{ {
title: "岗位", title: "岗位",
@@ -2636,7 +2551,7 @@ export default defineComponent({
assessment: {}, assessment: {},
assessmentId: null, assessmentId: null,
workName: null, workName: null,
EditTestId: null, EditTestId: 0,
testName: null, testName: null,
assessmentName: "", assessmentName: "",
assessmentVisible: false, assessmentVisible: false,
@@ -3018,7 +2933,7 @@ export default defineComponent({
console.log(res.data.data); console.log(res.data.data);
state.tableDataTotal1 = total; state.tableDataTotal1 = total;
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
rows[i].num = i + 1 + (state.currentPage1 - 1) * 10; rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
} }
const datas = traverseArr( const datas = traverseArr(
rows, rows,
@@ -3044,7 +2959,7 @@ export default defineComponent({
datas.forEach((itm) => { datas.forEach((itm) => {
itm.pageNo = pageNo; itm.pageNo = pageNo;
itm.contentTxt = itm.contentTxt =
findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-"; findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
}); });
state.tableData1 = datas; state.tableData1 = datas;
@@ -3055,17 +2970,16 @@ export default defineComponent({
function findClassFullName(list, classify, name = "") { function findClassFullName(list, classify, name = "") {
return ( return (
(list && (list &&
list.length && list.length > 0 &&
list list.map((e) =>
.map((e) => classify == e.code
classify == e.dictCode
? name ? name
? name + "-" + e.dictName ? name + "-" + e.name
: e.dictName : e.name
: findClassFullName( : findClassFullName(
e.children, e.children,
classify, classify,
name ? name + "-" + e.dictName : e.dictName name ? name + "-" + e.name : e.name
) )
) )
.filter((name) => name) .filter((name) => name)
@@ -3241,7 +3155,7 @@ export default defineComponent({
console.log(e); console.log(e);
}; };
const logT = (e) => { const logT = (e) => {
state.EditTestId = null; state.EditTestId = 0;
console.log(e); console.log(e);
}; };
const removePG = () => { const removePG = () => {
@@ -3419,14 +3333,16 @@ export default defineComponent({
if (state.selectTime) { if (state.selectTime) {
// beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000); // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
// endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000); // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
beginTime = toDate( beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss')
new Date(state.selectTime[0].$d).getTime() / 1000, // toDate(
"Y-M-D h:m:s" // new Date(state.selectTime[0].$d).getTime() / 1000,
); // "Y-M-D h:m:s"
endTime = toDate( // );
new Date(state.selectTime[1].$d).getTime() / 1000, endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss')
"Y-M-D h:m:s" // toDate(
); // new Date(state.selectTime[1].$d).getTime() / 1000,
// "Y-M-D h:m:s"
// );
} }
let obj = { let obj = {
pageNo: state.currentPage222, pageNo: state.currentPage222,
@@ -3695,7 +3611,7 @@ export default defineComponent({
state.xjkkinputV4 = null; state.xjkkinputV4 = null;
state.checked1 = false; state.checked1 = false;
state.checked4 = false; state.checked4 = false;
state.EditTestId = null; state.EditTestId = 0;
state.assessmentId = null; state.assessmentId = null;
state.assessmentName = ""; state.assessmentName = "";
state.EditWorkId = null; state.EditWorkId = null;
@@ -3705,18 +3621,24 @@ export default defineComponent({
//保存开课 //保存开课
const handleSureStu = () => { const handleSureStu = () => {
let startTime,
endTime = 0;
if (state.xjkkinputV3) {
startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm:ss') //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm:ss') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
}
let t = state.signCom ? "1," : "0,"; let t = state.signCom ? "1," : "0,";
let p = state.comLeave ? "1" : "0"; let p = state.comLeave ? "1" : "0";
let type = t.concat(p); let type = t.concat(p);
const postData = { const postData = {
offcourseId: state.offcourseId, offcourseId: state.offcourseId,
offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增 id: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2, address: state.xjkkinputV2,
applyFlag: state.checked1 ? 1 : 0, applyFlag: state.checked1 ? 1 : 0,
attach: state.attach, attach: state.attach,
beginTime: dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm:ss"), beginTime: startTime,
endTime: dayjs(state.xjkkinputV3[1]).format("YYYY-MM-DD HH:mm:ss"),
completeType: type, completeType: type,
endTime: endTime,
evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0, evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId), evaluateId: Number(state.assessmentId),
testId: state.EditTestId, testId: state.EditTestId,
@@ -3743,9 +3665,9 @@ export default defineComponent({
} }
state.addLoading = true; state.addLoading = true;
editPlan(postData).then(() => { editPlan(postData).then(() => {
getTableDate3(); getTableDate3();
handleCancelStu(); handleCancelStu();
rest(); rest();
state.addLoading = false; state.addLoading = false;
}); });
}; };
@@ -3753,7 +3675,7 @@ export default defineComponent({
//编辑开课 //编辑开课
const handelEditStu = async (item) => { const handelEditStu = async (item) => {
state.offcourseId = item.offcourseId; state.offcourseId = item.offcourseId;
state.offcoursePlanId = item.id; state.offcoursePlanId = item.id;
if (item.evaluateId) { if (item.evaluateId) {
api api
@@ -3802,7 +3724,7 @@ export default defineComponent({
item.completeType.split(",")[1] == "1" ? true : false), item.completeType.split(",")[1] == "1" ? true : false),
(state.checked4 = item.evalFlag === 1 ? true : false); (state.checked4 = item.evalFlag === 1 ? true : false);
state.assessmentId = String(item.evaluateId); state.assessmentId = String(item.evaluateId);
state.EditTestId = String(item.testId); state.EditTestId = Number(item.testId);
state.EditWorkId = String(item.homeWorkId); state.EditWorkId = String(item.homeWorkId);
state.xjkkinputV1 = item.name; state.xjkkinputV1 = item.name;
if (item.signFlag === 1) { if (item.signFlag === 1) {
@@ -3810,14 +3732,14 @@ export default defineComponent({
state.xjkkradioV1 = 0; state.xjkkradioV1 = 0;
} }
/* /*
if (item.signWordFlag === 1) { if (item.signWordFlag === 1) {
//签到是否需要口令:1是0否 //签到是否需要口令:1是0否
state.xjkkradioV1 = 1; state.xjkkradioV1 = 1;
} }
if (item.signFlag === 0 && item.signWordFlag === 0) { if (item.signFlag === 0 && item.signWordFlag === 0) {
state.xjkkradioV1 = ""; state.xjkkradioV1 = "";
} }
*/ */
state.member = { value: item.teacherId, name: item.teacher }; state.member = { value: item.teacherId, name: item.teacher };
state.cstm_hs = true; state.cstm_hs = true;
@@ -3910,7 +3832,7 @@ export default defineComponent({
handle({ handle({
offcourseId: state.offcourseId, offcourseId: state.offcourseId,
type: 0, type: 0,
}).then((res) => { }).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
getTableDate(); getTableDate();
} }
@@ -4002,12 +3924,9 @@ export default defineComponent({
//确认复制课程 操作 //确认复制课程 操作
const handleDeleteExit = async () => { const handleDeleteExit = async () => {
state.addLoading = true; state.addLoading = true;
console.log(
"开课的复制删除面授id及开课id",
state.offcourseId,
state.offcoursePlanId
);
if (state.del_hs) { if (state.del_hs) {
console.log(11111111);
if (state.offcourseId && state.offcoursePlanId && state.studentId) { if (state.offcourseId && state.offcoursePlanId && state.studentId) {
console.log(111111); console.log(111111);
handleStudent({ handleStudent({
@@ -4049,15 +3968,13 @@ export default defineComponent({
if (state.copy_hs) { if (state.copy_hs) {
console.log(2222222); console.log(2222222);
if (state.offcourseId && state.offcoursePlanId) { if (state.offcourseId && state.offcoursePlanId) {
copyCoursePlan({ offcoursePlanId: state.offcoursePlanId }).then( copyCoursePlan({offcoursePlanId:state.offcoursePlanId}).then(() => {
() => { message.destroy();
message.destroy(); message.success("复制成功");
message.success("复制成功"); getTableDate3();
getTableDate3(); delete_exit1();
delete_exit1(); rest();
rest(); });
}
);
} else if (state.offcourseId) { } else if (state.offcourseId) {
console.log(87887); console.log(87887);
// 拿数据 // 拿数据
@@ -4136,37 +4053,81 @@ export default defineComponent({
endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000); endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000);
} }
window.open(
`${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
state.currentPage1
}&pageSize=${state.pageSize1}&auditStatus=${
state.auditStatus ? state.auditStatus : ""
}&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
state.projectName ? state.projectName : ""
}&name=${state.name ? state.name : ""}&createName=${
state.createName ? state.createName : ""
}&endTime=${endTime ? endTime : ""}&beginTime=${
startTime ? startTime : ""
}&type=3`
);
{ list({
/* exportP({ pageNo: 1,
pageNo: state.currentPage1, pageSize: 100000,
pageSize: state.pageSize1,
auditStatus: state.auditStatus, auditStatus: state.auditStatus,
categoryId: state.categoryId, // categoryId: state.categoryId,
sysTypeId: state.sysTypeId,
projectName: state.projectName, projectName: state.projectName,
name: state.name, name: state.name,
createName: state.createName, createName: state.createName,
endTime: endTime, endTime: endTime,
beginTime: startTime, beginTime: startTime,
}).then((res) => { }).then(res=>{
if (res.data.code === 200) { let list = res.data.data.rows.map(s=>{
message.success("导出成功"); s.contentTxt = findClassFullName(sysTypeOptions.value, s.sysTypeId) || "-";
} s.typeName = '面授'
}); */ s.publishStatusText = s.publishStatus === 0?'未发布':'已发布'
} s.statusText = s.status === 0?'否':'是'
s.auditStatusText = s.auditStatus === 0?'未提交': s.auditStatus === 1?'待审核':s.auditStatus === 2?'已审核':s.auditStatus === -1?"审核未通过":''
return s
})
console.log(list)
let heads = [
{ header: '名称', key: 'name', width: 18 },
{ header: '类型', key: 'typeName', width: 10 },
{ header: '归属路径图', key: 'routerName', width: 13 },
{ header: '归属项目', key: 'projectName', width: 13 },
{ header: '内容分类', key: 'contentTxt', width: 20 },
// { header: '一级分类', key: 'firstLevelCategory', width: 10 },
// { header: '二级分类', key: 'secondLevelCategory', width: 10 },
// { header: '三级分类', key: 'thirdLevelCategory', width: 10 },
{ header: '开课次数', key: 'planCnt', width: 10 },
{ header: '学习人数', key: 'studentCnt', width: 10 },
{ header: '评分', key: 'score', width: 10 },
{ header: '状态', key: 'auditStatusText', width: 20 },
{ header: '是否发布', key: 'publishStatusText', width: 10 },
{ header: '创建人', key: 'createName', width: 10 },
{ header: '创建时间', key: 'createTime', width: 22 },
{ header: '上线时间', key: 'publishTime', width: 22 },
{ header: '是否停用', key: 'statusText', width: 10 },
]
commonExport(heads,list,"课程导出")
})
// window.open(
// `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
// state.currentPage1
// }&pageSize=${state.pageSize1}&auditStatus=${
// state.auditStatus ? state.auditStatus : ""
// }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
// state.projectName ? state.projectName : ""
// }&name=${state.name ? state.name : ""}&createName=${
// state.createName ? state.createName : ""
// }&endTime=${endTime ? endTime : ""}&beginTime=${
// startTime ? startTime : ""
// }&type=3`
// );
// {
// /* exportP({
// pageNo: state.currentPage1,
// pageSize: state.pageSize1,
// auditStatus: state.auditStatus,
// categoryId: state.categoryId,
// projectName: state.projectName,
// name: state.name,
// createName: state.createName,
// endTime: endTime,
// beginTime: startTime,
// }).then((res) => {
// if (res.data.code === 200) {
// message.success("导出成功");
// }
// }); */
// }
}; };
//获取教师 //获取教师
const getTea = async () => { const getTea = async () => {
@@ -4217,7 +4178,7 @@ export default defineComponent({
if (type === "1") { if (type === "1") {
return; return;
} }
console.log("编辑面授课信息", itm, type); // console.log(itm)
state.offcourseId = itm.id; state.offcourseId = itm.id;
const item = await detail({ const item = await detail({
@@ -4330,7 +4291,7 @@ export default defineComponent({
state.copy_hs = true; state.copy_hs = true;
}; };
const handleCopyP = async (itm) => { const handleCopyP = async (itm) => {
console.log("开课复制", itm); console.log(itm);
state.offcourseId = itm.offcourseId; state.offcourseId = itm.offcourseId;
state.offcoursePlanId = itm.id; state.offcoursePlanId = itm.id;
@@ -4366,8 +4327,7 @@ export default defineComponent({
}); });
}; };
const handleStart = (item, type) => { const handleStart = (item, type) => {
console.log("点击开课item", item); console.log(item);
// console.log(item);
if (type === "1") { if (type === "1") {
return; return;
} }
@@ -4465,7 +4425,6 @@ export default defineComponent({
// 管理开课 // 管理开课
const handleGuan22 = (item) => { const handleGuan22 = (item) => {
console.log("点击管理信息", item);
if (String(item.courseform) === "1") { if (String(item.courseform) === "1") {
return; return;
} }
@@ -4544,15 +4503,15 @@ export default defineComponent({
console.log("ft_eidt", state.ft_eidt); console.log("ft_eidt", state.ft_eidt);
// handlePush("review"); // handlePush("review");
/* /*
if (state.ft_eidt) { if (state.ft_eidt) {
//编辑面授课 //编辑面授课
submitReview(); submitReview();
} }
if (!state.ft_eidt) { if (!state.ft_eidt) {
//shouke //shouke
handlePush("review"); handlePush("review");
} }
*/ */
}; };
const submitReview = (id) => { const submitReview = (id) => {
state.addLoading = true; state.addLoading = true;
@@ -4702,16 +4661,13 @@ export default defineComponent({
//二维码 //二维码
const qrcodeVisible = (record, type) => { const qrcodeVisible = (record, type) => {
console.log("点击签到信息", record);
state.codevisible = true; state.codevisible = true;
state.codeInfo = { state.codeInfo = {
title: type == 1 ? "【课程】二维码" : "【签到】二维码", title: type == 1 ? "【课程】二维码" : "【签到】二维码",
name: record.name ? record.name : "", name: record.name ? record.name : "",
url: url:
type == 1 type == 1
? window.location.protocol + ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
process.env.VUE_APP_COURSE_STUDY +
record.offcourseId
: process.env.VUE_APP_BASE_API + : process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${ `/admin/student/studentSign?taskId=${
record.id record.id

3
src/views/courselibrary/CoursewareManage_Old.vue
View File

@@ -4803,8 +4803,7 @@ export default defineComponent({
let type = t.concat(p); let type = t.concat(p);
const postData = { const postData = {
offcourseId: state.offcourseId, offcourseId: state.offcourseId,
offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增 id: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2, address: state.xjkkinputV2,
applyFlag: state.checked1 ? 1 : 0, applyFlag: state.checked1 ? 1 : 0,
attach: state.filesList.length ? state.filesList.join(",") : "", attach: state.filesList.length ? state.filesList.join(",") : "",

2124
src/views/courselibrary/courseModal.vue
View File

File diff suppressed because it is too large Load Diff

17
src/views/examine/CourseReviewedN.vue
View File

@@ -20,6 +20,7 @@
label: 'name', label: 'name',
value: 'code', value: 'code',
}" }"
allow-clear
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body" :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
v-model:value="valueproj" v-model:value="valueproj"
show-search show-search
@@ -173,7 +174,7 @@ export default {
closeBack: false, closeBack: false,
valuepass: "1", valuepass: "1",
valueSugg: null, valueSugg: null,
chooseId: null, createId: null,
chooseCreater: null, chooseCreater: null,
chooseOffId: null, chooseOffId: null,
lookCourseModal: false, //预览 lookCourseModal: false, //预览
@@ -251,7 +252,7 @@ export default {
style="cursor:pointer;color:#387DF7" style="cursor:pointer;color:#387DF7"
onClick={() => { onClick={() => {
showAudit( showAudit(
value.record.createId, value.record.createrId,
value.record.creater, value.record.creater,
value.record.offId value.record.offId
); );
@@ -578,9 +579,10 @@ export default {
state.currentPage = pagina; state.currentPage = pagina;
getFaceList(); getFaceList();
}; };
const showAudit = (id, creater, offId) => { const showAudit = (createId, creater, offId) => {
console.log("参数",createId, creater, offId)
state.courAuditModal = true; state.courAuditModal = true;
state.chooseId = id; state.createId = createId;
state.chooseCreater = creater; state.chooseCreater = creater;
state.chooseOffId = offId; state.chooseOffId = offId;
getFaceList(); getFaceList();
@@ -589,7 +591,7 @@ export default {
state.courAuditModal = false; state.courAuditModal = false;
state.valueSugg = null; state.valueSugg = null;
state.valuepass = "1"; state.valuepass = "1";
state.chooseId = null; state.createId = null;
state.chooseCreater = null; state.chooseCreater = null;
state.chooseOffId = null; state.chooseOffId = null;
}; };
@@ -606,13 +608,12 @@ export default {
} }
courseAuditView({ courseAuditView({
createId: state.chooseId, createId: state.createId,
createName: state.chooseCreater, createName: state.chooseCreater,
description: state.valueSugg, description: state.valueSugg,
offcourseId: state.chooseOffId, offcourseId: state.chooseOffId,
pass: state.valuepass == "1" ? 1 : 0, pass: state.valuepass == "1" ? 1 : 0,
}) }).then((res) => {
.then((res) => {
console.log(res); console.log(res);
state.courAuditModal = false; state.courAuditModal = false;
message.destroy(); message.destroy();

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

@@ -204,7 +204,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加在线侧弹窗 --> <!-- 添加在线侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
@@ -219,7 +219,7 @@
<!-- 添加面授 --> <!-- 添加面授 -->
<add-faceteach @changeData="updateTableData" v-model:edit="edit" v-model:isactive="isactive" <add-faceteach @changeData="updateTableData" v-model:edit="edit" v-model:isactive="isactive"
v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
<!-- 添加面授 --> <!-- 添加面授 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -236,7 +236,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加案例侧弹窗 --> <!-- 添加案例侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
@@ -253,7 +253,7 @@
<add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="isLevel" <add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="isLevel"
@changeData="updateTableData" v-model:isactive="isactive" v-model:edit="edit" @changeData="updateTableData" v-model:isactive="isactive" v-model:edit="edit"
v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -269,7 +269,7 @@
<add-test v-model:addtestVisible="addtestvisible" :isLevel="isLevel" @changeData="updateTableData" <add-test v-model:addtestVisible="addtestvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId" v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -283,7 +283,7 @@
<div> <div>
<add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData" <add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -297,7 +297,7 @@
<div> <div>
<add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData" <add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -313,7 +313,7 @@
<add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData" <add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData"
:isLevel="isLevel" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" :isLevel="isLevel" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" /> v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -328,7 +328,7 @@
<add-active v-model:addactiveVisible="addactivevisible" :isLevel="isLevel" v-model:edit="edit" <add-active v-model:addactiveVisible="addactivevisible" :isLevel="isLevel" v-model:edit="edit"
v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId" v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" /> v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -344,7 +344,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加测评侧弹窗 --> <!-- 添加测评侧弹窗 -->
</div> </div>
@@ -361,7 +361,7 @@
<add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="isLevel" @changeData="updateTableData" <add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId" v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加评估侧弹窗 --> <!-- 添加评估侧弹窗 -->
</div> </div>
@@ -379,7 +379,7 @@
<add-vote v-model:addvoteVisible="addvotevisible" :isLevel="isLevel" @changeData="updateTableData" <add-vote v-model:addvoteVisible="addvotevisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId" v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
</div> </div>
@@ -396,7 +396,7 @@
<add-project v-model:addprojvisible="addprojvisible" :isLevel="isLevel" @changeData="updateTableData" <add-project v-model:addprojvisible="addprojvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditProjectId="EditProjectId" v-model:chooseStageId="chooseStageId" v-model:EditProjectId="EditProjectId"
v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
</div> </div>
</div> </div>
@@ -550,7 +550,8 @@
element.lei, element.lei,
element.courseId, element.courseId,
element.id, element.id,
element.routerTaskId element.routerTaskId,
element.courseId
)"> )">
编辑 编辑
</span> </span>
@@ -958,6 +959,7 @@ export default {
EditProjectId: "", EditProjectId: "",
routerTaskId: "", routerTaskId: "",
taskIdDraft: "", taskIdDraft: "",
taskCourseID: "",
chapterId: "", chapterId: "",
stageId: "", stageId: "",
cC: false, cC: false,
@@ -1180,95 +1182,108 @@ export default {
} }
//在线抽屉 //在线抽屉
const showDrawerAddOnline = (id, eleId, routerTaskId) => { const showDrawerAddOnline = (id, eleId, routerTaskId, courseId) => {
state.addonlinevisible = true; state.addonlinevisible = true;
state.EditOnlineId = id; state.EditOnlineId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//面授抽屉 //面授抽屉
const showAddface = (id, eleId, routerTaskId) => { const showAddface = (id, eleId, routerTaskId, courseId) => {
state.addfaceteachVisible = true; state.addfaceteachVisible = true;
state.EditFaceId = id; state.EditFaceId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//案例抽屉 //案例抽屉
const showDrawerAddCase = (id, eleId, routerTaskId) => { const showDrawerAddCase = (id, eleId, routerTaskId, courseId) => {
state.addcasevisible = true; state.addcasevisible = true;
state.EditCaseId = id; state.EditCaseId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
// 作业抽屉 // 作业抽屉
const showDrawerAddHomework = (id, eleId, routerTaskId) => { const showDrawerAddHomework = (id, eleId, routerTaskId, courseId) => {
state.addhomeworkvisible = true; state.addhomeworkvisible = true;
state.EditWorkId = id; state.EditWorkId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//考试抽屉 //考试抽屉
const showDrawerAddTest = (id, eleId, routerTaskId) => { const showDrawerAddTest = (id, eleId, routerTaskId, courseId) => {
state.addtestvisible = true; state.addtestvisible = true;
state.EditTestId = id; state.EditTestId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//测试抽屉 //测试抽屉
const showDrawerAddEval = (id, eleId, routerTaskId) => { const showDrawerAddEval = (id, eleId, routerTaskId, courseId) => {
state.addevalvisible = true; state.addevalvisible = true;
state.EditEvalId = id; state.EditEvalId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//评估抽屉 //评估抽屉
const showDrawerAddInvist = (id, eleId, routerTaskId) => { const showDrawerAddInvist = (id, eleId, routerTaskId, courseId) => {
state.addinvistvisible = true; state.addinvistvisible = true;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.EditInvistId = id; state.EditInvistId = id;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//投票抽屉 //投票抽屉
const showDrawerAddVote = (id, eleId, routerTaskId) => { const showDrawerAddVote = (id, eleId, routerTaskId, courseId) => {
state.addvotevisible = true; state.addvotevisible = true;
state.EditVoteId = id; state.EditVoteId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//直播抽屉 //直播抽屉
const showDrawerAddLive = (id, eleId, routerTaskId) => { const showDrawerAddLive = (id, eleId, routerTaskId, courseId) => {
state.addlivevisible = true; state.addlivevisible = true;
state.EditLiveId = id; state.EditLiveId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//外链抽屉 //外链抽屉
const showDrawerAddRef = (id, eleId, routerTaskId) => { const showDrawerAddRef = (id, eleId, routerTaskId, courseId) => {
state.addrefvisible = true; state.addrefvisible = true;
state.EditRefId = id; state.EditRefId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//讨论抽屉 //讨论抽屉
const showDrawerAddDiscuss = (id, eleId, routerTaskId) => { const showDrawerAddDiscuss = (id, eleId, routerTaskId, courseId) => {
state.adddiscussvisible = true; state.adddiscussvisible = true;
state.EditDiscussId = id; state.EditDiscussId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//活动抽屉 //活动抽屉
const showDrawerAddActive = (id, eleId, routerTaskId) => { const showDrawerAddActive = (id, eleId, routerTaskId, courseId) => {
state.addactivevisible = true; state.addactivevisible = true;
state.EditActiveId = id; state.EditActiveId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//打开项目抽屉 //打开项目抽屉
const showDrawerAddProj = (id, eleId, routerTaskId) => { const showDrawerAddProj = (id, eleId, routerTaskId, courseId) => {
state.addprojvisible = true; state.addprojvisible = true;
state.EditProjectId = id; state.EditProjectId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//tableData数据赋值方法 //tableData数据赋值方法
const dataAssignment = (id) => { const dataAssignment = (id) => {
@@ -1681,35 +1696,35 @@ export default {
} }
}; };
//编辑的按钮 //编辑的按钮
const decideType = (type, id, eleId, routerTaskId) => { const decideType = (type, id, eleId, routerTaskId, courseId) => {
state.edit = true; state.edit = true;
console.log(type, id); console.log(type, id);
if (type == "外链") { if (type == "外链") {
showDrawerAddRef(id, eleId, routerTaskId); showDrawerAddRef(id, eleId, routerTaskId, courseId);
} else if (type == "直播") { } else if (type == "直播") {
showDrawerAddLive(id, eleId, routerTaskId); showDrawerAddLive(id, eleId, routerTaskId, courseId);
} else if (type == "作业") { } else if (type == "作业") {
showDrawerAddHomework(id, eleId, routerTaskId); showDrawerAddHomework(id, eleId, routerTaskId, courseId);
} else if (type == "考试") { } else if (type == "考试") {
showDrawerAddTest(id, eleId, routerTaskId); showDrawerAddTest(id, eleId, routerTaskId, courseId);
} else if (type == "讨论") { } else if (type == "讨论") {
showDrawerAddDiscuss(id, eleId, routerTaskId); showDrawerAddDiscuss(id, eleId, routerTaskId, courseId);
} else if (type == "活动") { } else if (type == "活动") {
showDrawerAddActive(id, eleId, routerTaskId); showDrawerAddActive(id, eleId, routerTaskId, courseId);
} else if (type == "测评") { } else if (type == "测评") {
showDrawerAddEval(id, eleId, routerTaskId); showDrawerAddEval(id, eleId, routerTaskId, courseId);
} else if (type == "评估") { } else if (type == "评估") {
showDrawerAddInvist(id, eleId, routerTaskId); showDrawerAddInvist(id, eleId, routerTaskId, courseId);
} else if (type == "投票") { } else if (type == "投票") {
showDrawerAddVote(id, eleId, routerTaskId); showDrawerAddVote(id, eleId, routerTaskId, courseId);
} else if (type == "项目") { } else if (type == "项目") {
showDrawerAddProj(id, eleId, routerTaskId); showDrawerAddProj(id, eleId, routerTaskId, courseId);
} else if (type == "在线") { } else if (type == "在线") {
showDrawerAddOnline(id, eleId, routerTaskId); showDrawerAddOnline(id, eleId, routerTaskId, courseId);
} else if (type == "案例") { } else if (type == "案例") {
showDrawerAddCase(id, eleId, routerTaskId); showDrawerAddCase(id, eleId, routerTaskId, courseId);
} else if (type == "面授") { } else if (type == "面授") {
showAddface(id, eleId, routerTaskId); showAddface(id, eleId, routerTaskId, courseId);
} }
}; };

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

@@ -1672,7 +1672,7 @@ export default {
} }
function push(record) { function push(record) {
showProjectPub({ showProjectPub({
projectId: record.projectId, projectId: record.id,
name: record.name, name: record.name,
time: record.beginTime + "-" + record.endTime, time: record.beginTime + "-" + record.endTime,
}); });

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

@@ -803,7 +803,9 @@
</div> </div>
<div <div
class="grofooter" class="grofooter"
@click="showMemberList(item.projectGroupId)" @click="
showMemberList(item.projectGroupId, item.groupName)
"
> >
<div class="ftext">组员名单 ></div> <div class="ftext">组员名单 ></div>
<!-- <div class="peoples"> <!-- <div class="peoples">
@@ -1496,7 +1498,7 @@
</a-modal> </a-modal>
<!-- 学员（小组管理）创建小组抽屉 --> <!-- 学员（小组管理）创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle" /> <subset-manage v-model:Svisible="subsetVisivle" :projectId="projectId" />
<!-- 学员管理-添加学员抽屉 --> <!-- 学员管理-添加学员抽屉 -->
<!-- <stu-add v-model:Stuvisible="Stuvisible" /> --> <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
<!-- 添加学员抽屉 --> <!-- 添加学员抽屉 -->
@@ -1529,6 +1531,7 @@
<member-list <member-list
v-model:Lvisible="Lvisible" v-model:Lvisible="Lvisible"
v-model:chooseGroupId="chooseGroupId" v-model:chooseGroupId="chooseGroupId"
v-model:chooseGroupName="chooseGroupName"
v-model:projectId="projectId" v-model:projectId="projectId"
/> />
<!-- 面授学员抽屉 --> <!-- 面授学员抽屉 -->
@@ -2425,7 +2428,8 @@ export default {
TaskFaceImpStuvisible: false, //批量面授报名 TaskFaceImpStuvisible: false, //批量面授报名
valuestugn: "", //小组管理的输入的小组名称 valuestugn: "", //小组管理的输入的小组名称
checkStuId: null, //要查看的学员id checkStuId: null, //要查看的学员id
chooseGroupId: null, chooseGroupId: null, //选择的小组id
chooseGroupName: null, //选择的小组名称
morFaceT: false, //批量面授报名按钮 morFaceT: false, //批量面授报名按钮
faceArr: [], //任务大纲列表所有name faceArr: [], //任务大纲列表所有name
action: null, action: null,
@@ -3216,10 +3220,11 @@ export default {
console.log("facestudent", state.facestudent); console.log("facestudent", state.facestudent);
}; };
//面授学员的弹窗 //面授学员的弹窗
const showMemberList = (id) => { const showMemberList = (id, name) => {
state.Lvisible = true; state.Lvisible = true;
console.log("ssdsdsdsd", id); console.log("ssdsdsdsd", id);
state.chooseGroupId = id; state.chooseGroupId = id;
state.chooseGroupName = name;
}; };
//活动考勤的抽屉 //活动考勤的抽屉
{ {