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 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

Browse Source
This commit is contained in:
dongruihua
2023-02-26 18:45:02 +08:00
parent ce9dab06fb 9ec18c6487
commit 48713a1abb
25 changed files with 1023 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/apis.js
View File

@@ -1,7 +1,7 @@
export const STUDENT_LIST = '/admin/student/getStudent';
export const ONLINE_COURSE_PAGE = '/onlineClasses/queryOnlineList';
export const ASSESSMENT_PAGE = '/assessment/queryAssessmentDetailList post';
export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlist post';
export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlistV2 post';
export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post';
export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post';
export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post';

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

@@ -826,7 +826,7 @@ export default {
name: props.datasource?.name,
url:
process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${props.datasource.routerTaskId
`/admin/student/studentSign?taskId=${props.datasource.id
}&taskType=${props.datasource.type}&type=${2}`,
};
console.log("codeInfo", state.codeInfo);
@@ -855,7 +855,6 @@ export default {
// 导出数据
function exportTaskStu() {
debugger
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);

2
src/components/drawers/CheckWork.vue
View File

@@ -183,7 +183,7 @@ export default {
};
//获取作业详情
const getWorkDetail = () => {
debugger
// debugger
console.log("props.workId, props.stuId", props.workId, props.stuId);
getWorkSubmitInfo(props.workId, props.stuId)
.then((res) => {

2
src/components/drawers/ExportScore.vue
View File

@@ -24,7 +24,7 @@
@change="handleChange" :showUploadList="false" :data="{
type: type,
taskId: Number(id),
workId: datesource.info.id,
workId: datesource.info?datesource.info.id:id,
targetId: Number(id),
}">
<p class="ant-upload-drag-icon">

4
src/components/drawers/ProjCheckPower.vue
View File

@@ -118,7 +118,7 @@
preserveSelectedRowKeys: true,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -2243,4 +2243,4 @@ export default {
}
}
}
</style>
</style>

236
src/components/drawers/ProjPowerList.vue
View File

@@ -1,18 +1,18 @@
<template>
<a-drawer
:visible="ProjPvisible"
class="drawerStyle ProjPowerList"
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
:visible="ProjPvisible"
class="drawerStyle ProjPowerList"
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">授权名单</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
@@ -21,18 +21,18 @@
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchAuth"
class="btn btn1"
style="margin-right: 20px"
@click="searchAuth"
>
<div class="img1"></div>
<div class="wz">搜索</div>
@@ -46,28 +46,28 @@
<div class="tableBox" style="margin-top: 10px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 900 }"
:pagination="false"
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 900 }"
:pagination="false"
/>
</div>
<div class="tableBox">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
v-if="tableDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePagination"
/>
</div>
</div>
@@ -93,11 +93,11 @@
</div>
<!-- 取消授权弹窗 -->
<a-modal
v-model:visible="cancelModal"
:footer="null"
:closable="closeCancel"
wrapClassName="DelModal"
centered="true"
v-model:visible="cancelModal"
:footer="null"
:closable="closeCancel"
wrapClassName="DelModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
@@ -131,9 +131,9 @@
</template>
<script>
import {toRefs, reactive} from "vue";
import { toRefs, reactive } from "vue";
import * as api from "../../api/index1";
import {message} from "ant-design-vue";
import { message } from "ant-design-vue";
export default {
name: "ProjPowerList",
@@ -218,13 +218,13 @@ export default {
width: 70,
// align: "left",
className: "classify",
scopedSlots: {customRender: "action"}, //引入的插槽
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text.record.checked1);
return (
<div class="racona">
<span> {text.record.name}</span>
</div>
<div class="racona">
<span> {text.record.name}</span>
</div>
);
},
},
@@ -270,17 +270,20 @@ export default {
key: "opacation",
width: 100,
align: "center",
scopedSlots: {customRender: "action"}, //引入的插槽
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
return (text.record.state === '归属权' ? '' : <div
className="opa"
onClick={() => {
console.log("text.record.id", text.record.id);
showCancelModal(text.record);
}}
>
取消授权
</div>
return text.record.state === "归属权" ? (
""
) : (
<div
className="opa"
onClick={() => {
console.log("text.record.id", text.record.id);
showCancelModal(text.record);
}}
>
取消授权
</div>
);
},
},
@@ -293,13 +296,13 @@ export default {
let obj = {
keyWord: state.name ? state.name : "",
type:
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
tag: 1,
opt: 1,
refId: props.selectProjectId,
@@ -308,34 +311,34 @@ export default {
};
console.log("获取权限名单obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
// console.log("获取权限名单成功", res);
if (res.data.code === 200) {
console.log("获取权限名单成功", res.data.data.records);
let arr = res.data.data.records;
let array = [];
arr.map((value) => {
let obj = {
key: value.memberId,
id: value.memberId,
.optionAuthPerm(obj)
.then((res) => {
// console.log("获取权限名单成功", res);
if (res.data.code === 200) {
console.log("获取权限名单成功", res.data.data.records);
let arr = res.data.data.records;
let array = [];
arr.map((value) => {
let obj = {
key: value.memberId,
id: value.memberId,
name: value.memberName ? value.memberName : "-",
name: value.memberName ? value.memberName : "-",
com: value.orgName ? value.orgName : "-",
gang: value.positionMgrLevel ? value.positionMgrLevel : "-",
number: value.memberNo ? value.memberNo : "-",
state: value.tagName ? value.tagName : "-",
};
array.push(obj);
});
state.tableData = array;
state.tableDataTotal = res.data.data.total;
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
com: value.orgName ? value.orgName : "-",
gang: value.positionMgrLevel ? value.positionMgrLevel : "-",
number: value.memberNo ? value.memberNo : "-",
state: value.tagName ? value.tagName : "-",
};
array.push(obj);
});
state.tableData = array;
state.tableDataTotal = res.data.data.total;
}
})
.catch((err) => {
console.log("获取权限名单失败", err);
});
};
//分页
@@ -360,21 +363,21 @@ export default {
let obj = {
keyWord: "",
type:
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
props.classify === "learnPath"
? 1
: props.classify === "project"
? 2
: props.classify === "course"
? 3
: null,
tag:
state.cancelAuthState === "归属权"
? 2
: state.cancelAuthState === "查看权"
? 3
: state.cancelAuthState === "管理权"
? 4
: null,
state.cancelAuthState === "归属权"
? 2
: state.cancelAuthState === "查看权"
? 3
: state.cancelAuthState === "管理权"
? 4
: null,
opt: 4,
refId: props.selectProjectId,
pageNo: 1,
@@ -385,19 +388,19 @@ export default {
};
console.log("取消权限名单obj", obj, state.cancelAuthState);
api
.optionAuthPerm(obj)
.then((res) => {
console.log("取消权限名单", res);
if (res.data.code === 200) {
// console.log("取消授权成功", res.data.data);
optionAuthPerm();
message.success("取消授权成功");
closeCancelModal();
}
})
.catch((err) => {
console.log("取消授权失败", err);
});
.optionAuthPerm(obj)
.then((res) => {
console.log("取消权限名单", res);
if (res.data.code === 200) {
// console.log("取消授权成功", res.data.data);
optionAuthPerm();
message.success("取消授权成功");
closeCancelModal();
}
})
.catch((err) => {
console.log("取消授权失败", err);
});
};
return {
...toRefs(state),
@@ -443,8 +446,8 @@ export default {
width: calc(100%);
height: 40px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
@@ -535,7 +538,6 @@ export default {
}
}
.ProjPowerList {
// width: 80%;
.ant-drawer-content-wrapper {
@@ -684,8 +686,8 @@ export default {
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}

314
src/components/drawers/project/AddCertificate.vue
View File

@@ -1,26 +1,42 @@
<template>
<a-drawer :visible="ACertificate" class="drawerStyle AddCertificate" width="80%" title="添加证书" placement="right"
@after-visible-change="afterVisibleChange">
<a-drawer
:visible="ACertificate"
class="drawerStyle AddCertificate"
width="80%"
title="添加证书"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">
{{ ACertificateEditId ? "编辑" : "添加" }}证书
</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../../assets/images/basicinfo/close.png"
@click="closeDrawer" />
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
<div class="main_left">
<div class="main_item">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">证书名称：</span>
</div>
<div class="btnbox">
<a-input v-model:value="certificateName" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入证书名称" maxlength="20" />
<a-input
v-model:value="certificateName"
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入证书名称"
maxlength="20"
/>
</div>
</div>
@@ -47,14 +63,32 @@
<div class="main_item" style="align-items: flex-start">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">证书封面：</span>
</div>
<div class="btnbox" style="flex-direction: column; align-items: flex-start">
<a-upload v-model:file-list="fileList" name="file" style="width: 200px" list-type="picture-card"
class="avatar-uploader" :show-upload-list="false" :before-upload="beforeUpload">
<img v-if="imageUrl" :src="imageUrl" alt="avatar" />
<div
class="btnbox"
style="flex-direction: column; align-items: flex-start"
>
<a-upload
v-model:file-list="fileList"
name="file"
style="width: 200px"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<img
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
style="width: 170px; height: 200px"
/>
<div v-else>
<loading-outlined v-if="loading"></loading-outlined>
<plus-outlined v-else></plus-outlined>
@@ -71,58 +105,90 @@
<span style="margin-right: 3px">证书说明：</span>
</div>
<div class="textarea" style="width: 400px">
<a-textarea v-model:value="certificateRemark" placeholder="请输入证书说明" allow-clear :rows="8" show-count
:maxlength="200" />
<a-textarea
v-model:value="certificateRemark"
placeholder="请输入证书说明"
allow-clear
:rows="8"
show-count
:maxlength="200"
/>
</div>
</div>
<div class="main_item" style="margin-bottom: 16px">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="
margin-right: 3px;
font-size: 16px;
color: #333;
font-size: 14px;
">设置获得条件</span>
<span
style="
margin-right: 3px;
font-size: 16px;
color: #333;
font-size: 14px;
"
>设置获得条件</span
>
</div>
<div class="btnbox"></div>
</div>
<div class="main_item" style="
border: 1px solid rgba(0, 0, 0, 0.1);
width: ;
margin-left: 35px;
padding-top: 30px;
margin-top: 0px;
">
<div
class="main_item"
style="
border: 1px solid rgba(0, 0, 0, 0.1);
width: ;
margin-left: 35px;
padding-top: 30px;
margin-top: 0px;
"
>
<div class="signbox" style="width: 30px">
<span style="margin-right: 3px; font-size: 16px; color: #333"></span>
<span
style="margin-right: 3px; font-size: 16px; color: #333"
></span>
</div>
<div class="btnbox">
<a-radio-group v-model:value="condition" @change="selectCondition">
<a-radio-group
v-model:value="condition"
@change="selectCondition"
>
<a-radio v-model:checked="checked" :value="1">
完成项目
<a-popover>
<template #content>
<div style="font-size: 12px; color: rgba(153, 153, 153, 1)">
<div
style="font-size: 12px; color: rgba(153, 153, 153, 1)"
>
后续新增自动包括
</div>
</template>
<img style="width: 16px; height: 16px" src="../../../assets/images/project/tishi.png" />
<img
style="width: 16px; height: 16px"
src="../../../assets/images/project/tishi.png"
/>
</a-popover>
</a-radio>
<br />
<div style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
">
<a-radio-group v-model:value="large" size="small" @change="selectlarge" :disabled="condition !== 1">
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-radio-group
v-model:value="large"
size="small"
@change="selectlarge"
:disabled="condition !== 1"
>
<a-radio-button value="1">全部任务</a-radio-button>
<a-radio-button value="2">完成必修任务</a-radio-button>
</a-radio-group>
@@ -131,84 +197,132 @@
完成阶段
</a-radio>
<br />
<div style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
">
<a-select ref="select" size="small" placeholder="请选择阶段" v-model:value="selectStageName"
style="width: 120px" @focus="focus" @change="selectStage" :options="stageList" :fieldNames="{
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择阶段"
v-model:value="selectStageName"
style="width: 120px"
@focus="focus"
@change="selectStage"
:options="stageList"
:fieldNames="{
key: 'id',
title: 'name',
value: 'name',
}" :disabled="condition !== 2">
}"
:disabled="condition !== 2"
>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="3">
完成任务
</a-radio>
<br />
<div style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
">
<a-select ref="select" size="small" placeholder="请选择任务" v-model:value="selectTaskName"
style="width: 120px" @focus="focus" @change="selectTask" :options="taskList" :fieldNames="{
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择任务"
v-model:value="selectTaskName"
style="width: 120px"
@focus="focus"
@change="selectTask"
:options="taskList"
:fieldNames="{
key: 'id',
title: 'name',
value: 'name',
}" :disabled="condition !== 3">
}"
:disabled="condition !== 3"
>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="4">
考试合格
</a-radio>
<br />
<div style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
">
<a-select ref="select" size="small" placeholder="请选择考试" v-model:value="selectExamName"
style="width: 120px" @focus="focus" @change="selectExam" :options="examList" :fieldNames="{
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<a-select
ref="select"
size="small"
placeholder="请选择考试"
v-model:value="selectExamName"
style="width: 120px"
@focus="focus"
@change="selectExam"
:options="examList"
:fieldNames="{
key: 'id',
title: 'name',
value: 'name',
}" :disabled="condition !== 4">
}"
:disabled="condition !== 4"
>
</a-select>
</div>
<a-radio v-model:checked="checked" :value="5">
获得积分
</a-radio>
<br />
<div style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
">
<div style="
font-size: 14px;
font-weight: 400;
color: #333333;
line-height: 20px;
margin-right: 5px;
">
<div
style="
height: 60px;
margin-left: 24px;
display: flex;
align-items: center;
"
>
<div
style="
font-size: 14px;
font-weight: 400;
color: #333333;
line-height: 20px;
margin-right: 5px;
"
>
高于
</div>
<a-input-number id="inputNumber" v-model:value="score" :min="1" :max="projectPoints" style="width: 70px"
:disabled="condition !== 5" />
<div style="
font-size: 14px;
font-weight: 400;
color: #333333;
line-height: 20px;
margin-left: 5px;
">
<a-input-number
id="inputNumber"
v-model:value="score"
:min="1"
:max="projectPoints"
style="width: 70px"
:disabled="condition !== 5"
/>
<div
style="
font-size: 14px;
font-weight: 400;
color: #333333;
line-height: 20px;
margin-left: 5px;
"
>
分可获得，当前项目积分为 {{ projectPoints }} 分
</div>
</div>
@@ -486,16 +600,14 @@ export default {
formDatas.append("file", file);
fileUp(formDatas).then((res) => {
if (res.data.code === 200) {
console.log(file)
state.imageUrl = process.env.VUE_APP_FILE_PATH + res.data.data;
state.imageName = process.env.VUE_APP_FILE_PATH + res.data.data;
console.log(file);
state.imageUrl = process.env.VUE_APP_FILE_PATH + res.data.data;
state.imageName = process.env.VUE_APP_FILE_PATH + res.data.data;
}
});
return false;
};
//查看证书
const getcertificate = () => {
let obj = {
@@ -578,14 +690,14 @@ export default {
state.condition == 1
? state.large
: state.condition == 2
? state.selectStageId
: state.condition == 3
? state.selectTaskId
: state.condition == 4
? state.selectExamId
: state.condition == 5
? state.score
: "",
? state.selectStageId
: state.condition == 3
? state.selectTaskId
: state.condition == 4
? state.selectExamId
: state.condition == 5
? state.score
: "",
type: 1,
};
if (props.ACertificateEdit) {

3
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -496,6 +496,9 @@ export default {
if(props.datasource.type==1){
{/* 在线课导出 */}
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
}else if(props.datasource.type==11){
{/* 评估导出 */}
window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}else{
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}

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

@@ -352,7 +352,12 @@ const props = defineProps({
type: Number,
default: null,
},
activeKey1: {
type: String,
default: null,
},
});
console.log("props.activeKey1" + props.activeKey1)
// 获取项目学员;
const procurrentPage = ref(1);
const projectList = ref([]);
@@ -775,30 +780,33 @@ const submitAuth = () => {
};
function handleStageOk() {
// debugger
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
if (props.type === 1) {
let selectMember = 0;
if (activeKey.value === 4) { // 项目内选人
selectMember = selectsData.value.projectMemberList.length
} else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length
} else if (activeKey.value === 2) {
selectMember = selectsData.value.groupList.length
} else if (activeKey.value === 3) {
selectMember = selectsData.value.deptList.length
}
if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值");
}
// 判断是否是组长，组长不能添加
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
if (leaderArray.length > 0) {
return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
}
// 对选中的人员进行判断是否已经分组了
let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
if (haveGroupNum.length > 0) {
message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
if (props.groupMemberCount !== null) { // 只有添加组员的时候判断
let selectMember = 0;
if (activeKey.value === 4) { // 项目内选人
selectMember = selectsData.value.projectMemberList.length
} else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length
} else if (activeKey.value === 2) {
selectMember = selectsData.value.groupList.length
} else if (activeKey.value === 3) {
selectMember = selectsData.value.deptList.length
}
if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值");
}
// 判断是否是组长，组长不能添加
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
if (leaderArray.length > 0) {
return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
}
// 对选中的人员进行判断是否已经分组了
let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
if (haveGroupNum.length > 0) {
message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
}
}
}
stageVisible.value = false;

169
src/components/student/TableModelStudent.vue
View File

@@ -1,51 +1,61 @@
<template>
<div class="CommonStudent">
<a-drawer
:visible="visiable"
class="drawerStyle ProjCheckship"
placement="right"
width="40%"
:visible="visiable"
class="drawerStyle ProjCheckship"
placement="right"
width="40%"
>
<div class="drawerMain" id="ProjCheckship" style="">
<div class="header">
<div class="headerTitle">
权限名单
</div>
<div class="headerTitle">权限名单</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="TableStudent">
<a-row
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
>
<a-col>
<a-form-item title="姓名：">
<a-input
class="cus-input"
v-model:value="searchName"
placeholder="请输入姓名"
class="cus-input"
v-model:value="searchName"
placeholder="请输入姓名"
/>
</a-form-item>
</a-col>
<a-col>
<a-button
class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px"
@click="search"
class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px"
@click="search"
>
<template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/>
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/courseManage/search0.png"
/>
</template>
搜索
</a-button>
</a-col>
<a-col :span="2">
<a-button class="cus-btn white" style="width: 100px" @click="reset">
<template #icon><img style="margin-right: 10px" src="../../assets/images/leveladd/reset.png"/>
<a-button
class="cus-btn white"
style="width: 100px"
@click="reset"
>
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/leveladd/reset.png"
/>
</template>
重置
</a-button>
@@ -53,16 +63,26 @@
</a-row>
<div style="margin-top: 20px">
<a-table
:columns="columns"
:data-source="studentList"
:pagination="stuPagination"
:loading="loading"
row-key="id"
:columns="columns"
:data-source="studentList"
:pagination="stuPagination"
:loading="loading"
row-key="id"
>
<template #action="{ record }">
<a-space :size="2">
<slot name="extension" v-bind:data="{ record }"></slot>
<a-button v-if="record.type!==6 && record.type!==9 && record.type!==12" @click="del(record.id)" type="link" danger>删除</a-button>
<a-button
v-if="
record.type !== 6 &&
record.type !== 9 &&
record.type !== 12
"
@click="del(record.id)"
type="link"
danger
>删除</a-button
>
</a-space>
</template>
</a-table>
@@ -78,12 +98,19 @@
</div>
</template>
<script setup>
import {computed, createVNode, defineProps, defineExpose, ref, watch} from "vue";
import {usePage} from "@/api/request";
import {STUDENT_LIST} from "@/api/apis";
import {delStudentList} from "@/api/index1";
import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
import {Modal} from "ant-design-vue";
import {
computed,
createVNode,
defineProps,
defineExpose,
ref,
watch,
} from "vue";
import { usePage } from "@/api/request";
import { STUDENT_LIST } from "@/api/apis";
import { delStudentList } from "@/api/index1";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import { Modal } from "ant-design-vue";
const props = defineProps({
type: Number,
@@ -104,13 +131,13 @@ const initParams = {
studentName: "",
pageNo: 1,
pageSize: 10,
type: props.type || '',
type: props.type || "",
types: props.types,
pid: props.id || '',
}
pid: props.id || "",
};
const searchParams = ref(initParams)
const searchName = ref('')
const searchParams = ref(initParams);
const searchName = ref("");
const columns = ref([
{
@@ -143,7 +170,18 @@ const columns = ref([
key: "type",
width: 30,
align: "center",
customRender: ({record: {type}}) => ({4: "查看权", 5: "管理权", 6: "归属权",7: "查看权", 8: "管理权", 9: "归属权",10: "查看权", 11: "管理权", 12: "归属权"}[type])
customRender: ({ record: { type } }) =>
({
4: "查看权",
5: "管理权",
6: "归属权",
7: "查看权",
8: "管理权",
9: "归属权",
10: "查看权",
11: "管理权",
12: "归属权",
}[type]),
},
{
title: "操作",
@@ -151,18 +189,23 @@ const columns = ref([
key: "operation",
width: 50,
align: "center",
slots: {customRender: "action"},
slots: { customRender: "action" },
},
])
]);
const {data: studentList, fetch: searchStu, total, loading} = usePage(STUDENT_LIST, searchParams)
const {
data: studentList,
fetch: searchStu,
total,
loading,
} = usePage(STUDENT_LIST, searchParams);
const stuPagination = computed(() => ({
total:total.value,
total: total.value,
showSizeChanger: false,
current: searchParams.value.pageNo,
pageSize: searchParams.value.pageSize,
onChange: changePagination
onChange: changePagination,
}));
const openDrawer = () => {
@@ -173,22 +216,22 @@ const changePagination = (page) => {
searchParams.value.pageNo = page;
};
function search(){
searchParams.value.studentName = searchName.value
searchParams.value.pageNo = 1
function search() {
searchParams.value.studentName = searchName.value;
searchParams.value.pageNo = 1;
}
function del(id) {
Modal.confirm({
title: () => '确定删除?',
title: () => "确定删除?",
icon: () => createVNode(ExclamationCircleOutlined),
content: () => '数据删除后不可恢复！',
okText: () => '确定',
okType: 'danger',
cancelText: () => '取消',
content: () => "数据删除后不可恢复！",
okText: () => "确定",
okType: "danger",
cancelText: () => "取消",
onOk() {
if(id){
loading.value = true
delStudentList({ids: [id]}).then(() => searchStu())
if (id) {
loading.value = true;
delStudentList({ ids: [id] }).then(() => searchStu());
}
},
});
@@ -198,20 +241,20 @@ const closeDrawer = () => {
visiable.value = false;
};
function reset(){
searchParams.value = initParams
searchName.value=''
function reset() {
searchParams.value = initParams;
searchName.value = "";
}
watch(visiable, () => {
visiable.value && searchStu()
searchParams.value = initParams
visiable.value && searchStu();
searchParams.value = initParams;
});
defineExpose({
searchStu,
loading
})
loading,
});
</script>
<style lang="scss">
.cus-btn {

263
src/components/student/TableStudent.vue
View File

@@ -1,9 +1,17 @@
<template>
<div class="TableStudent">
<a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px">
<a-row
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
>
<a-col>
<a-form-item title="姓名：">
<a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名" />
<a-input
class="cus-input"
v-model:value="tableParam.studentName"
placeholder="请输入姓名"
/>
</a-form-item>
</a-col>
<!-- <a-col v-if="type === 1">
@@ -19,39 +27,73 @@
<a-col v-if="type === 1">
<a-form-item title="部门：">
<div class="select in" style="width: 270px">
<OrgClass v-model:value="tableParam.studentDepartId" v-model:name="tableParam.studentDepartName"></OrgClass>
<OrgClass
v-model:value="tableParam.studentDepartId"
v-model:name="tableParam.studentDepartName"
></OrgClass>
</div>
</a-form-item>
</a-col>
<a-col v-if="type === 1">
<a-form-item title="优秀学员：">
<div class="select">
<a-select v-model:value="tableParam.topFlag" style="width: 260px; height: 40px" placeholder="是否为优秀学员"
:options="topFlagList" @change="selectProjectName" allowClear showSearch></a-select>
<a-select
v-model:value="tableParam.topFlag"
style="width: 260px; height: 40px"
placeholder="是否为优秀学员"
:options="topFlagList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
</div>
</a-form-item>
</a-col>
<a-col>
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 100px" @click="getStuList">
<a-button
class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px"
@click="getStuList"
>
<template #icon>
<img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png" /></template>
<img
style="margin-right: 10px"
src="../../assets/images/courseManage/search0.png"
/></template>
搜索
</a-button>
</a-col>
<a-col :span="2">
<a-button class="cus-btn white" style="width: 100px" @click="reset">
<template #icon>
<img style="margin-right: 10px" src="../../assets/images/leveladd/reset.png" /></template>
<img
style="margin-right: 10px"
src="../../assets/images/leveladd/reset.png"
/></template>
重置
</a-button>
</a-col>
</a-row>
<a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px" v-if="checkPer(permissions)">
<a-row
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
v-if="checkPer(permissions)"
>
<a-col :span="1.5">
<CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage">
<CommonStudent
:type="type"
:id="id"
@finash="submitCall"
:stage="stage"
>
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
<template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png" /></template>
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/courseManage/add0.png"
/></template>
添加学员
</a-button>
</CommonStudent>
@@ -59,7 +101,11 @@
<!-- 新加导入学员 批量换组 导出学习信息 -->
<a-col :span="1.5" v-if="type === 1 || type === 2">
<a-button class="cus-btn white" @click="showImpStu">
<template #icon><img style="margin-right: 10px" src="../../assets/images/basicinfo/in2.png" /></template>
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/basicinfo/in2.png"
/></template>
导入学员
</a-button>
</a-col>
@@ -82,7 +128,11 @@
</a-col>
<a-col :span="1.5">
<a-button class="cus-btn white" @click="bathDel">
<template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png" /></template>
<template #icon
><img
style="margin-right: 10px"
src="../../assets/images/projectadd/delete.png"
/></template>
批量删除
</a-button>
</a-col>
@@ -97,10 +147,19 @@
<div class="stmm_btn btn4" @click="hideShow">
<div class="btn4_sub">
<span style="color: #4ea6ff; margin-right: 4px"> 批量操作 </span>
<div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }"></div>
<div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }"></div>
<div
class="b_zk"
:style="{ display: hideshow ? 'block' : 'none' }"
></div>
<div
class="b_sq"
:style="{ display: hideshow ? 'none' : 'block' }"
></div>
</div>
<div class="btn4_sup" :style="{ display: hideshow ? 'none' : 'block' }">
<div
class="btn4_sup"
:style="{ display: hideshow ? 'none' : 'block' }"
>
<div class="btnsbox">
<div class="btn4_tit" @click="showEScoreModal">
<span>批量录入成绩</span>
@@ -121,14 +180,25 @@
<div class="export"></div>
<div class="btnText">导出</div>
</div>
<div class="stmm_btn btn5" style="margin-left: 15px" @click="exportHomeWorkShow">
<div
class="stmm_btn btn5"
style="margin-left: 15px"
@click="exportHomeWorkShow"
>
<div class="btnText">导出作业</div>
</div>
</a-col>
</a-row>
<div style="margin-top: 20px">
<a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination"
:loading="tableData.loading" :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection">
<a-table
:columns="tablecolumns"
:data-source="tableData.list"
:pagination="stuPagination"
:loading="tableData.loading"
:scroll="{ x: 1500 }"
row-key="id"
:row-selection="stuRowSelection"
>
<template #action="{ record }">
<!-- <div style="display:flex;justify-content: center;align-items: center;">-->
<!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -149,28 +219,57 @@
<a-space :size="2">
<slot name="extension" v-bind:data="{ record }"></slot>
<a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(0, record.id)" type="link">通过</a-button>
<a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(2, record.id)" type="link">拒绝</a-button>
<a-button v-if="checkPer(permissions)" :disabled="record.isLeader === '1'" @click="del(record.id, record)"
type="link" danger>删除</a-button>
<a-button
v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(0, record.id)"
type="link"
>通过</a-button
>
<a-button
v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(2, record.id)"
type="link"
>拒绝</a-button
>
<a-button
v-if="checkPer(permissions)"
:disabled="record.isLeader === '1'"
@click="del(record.id, record)"
type="link"
danger
>删除</a-button
>
</a-space>
</template>
</a-table>
</div>
</div>
<!-- 批量调整关卡弹窗 -->
<ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
<ChangeLevelModal
v-model:visiblene="visiblene"
:stage="stage"
:ids="stuSelectKeys"
@finash="submitCall"
/>
<!-- 换组弹窗 -->
<ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList" :checkBatch="checkgroupParam.checkBatch"
:checkgroupStuId="stuSelectKeys" />
<ChangeGroupModal
v-model:changegroupV="checkgroupParam.changegroupV"
:groupList="groupList"
:checkBatch="checkgroupParam.checkBatch"
:checkgroupStuId="stuSelectKeys"
/>
<!-- 批量调整关卡弹窗 -->
<!-- 取消学员弹窗 -->
<div>
<a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
@cancel="closeModal1">
<a-modal
v-model:visible="canclestu"
:footer="null"
:closable="close"
wrapClassName="canclestu"
centered="true"
@cancel="closeModal1"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -196,7 +295,13 @@
<!-- 取消学员弹窗 -->
<!-- 优秀学员弹窗 -->
<div>
<a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
<a-modal
v-model:visible="canclestu1"
:footer="null"
:closable="close"
wrapClassName="canclestu1"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
@@ -220,18 +325,35 @@
</a-modal>
</div>
<!-- 查看学员 传入查看学员的id-->
<see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" />
<see-stu
v-model:Seevisible="Seevisible"
v-model:checkStuId="checkStuId"
v-model:projectId="projectId"
/>
<!-- 导入作业成绩抽屉 -->
<EScore v-model:eScorevisible="eScorevisible" :type="3" :id="id" :pid="id" v-model:searchTaskList="getStuList" />
<EScore
v-model:eScorevisible="eScorevisible"
:type="3"
:id="id"
:pid="id"
v-model:searchTaskList="getStuList"
/>
<!-- 导出作业提示框 -->
<ExportHomeWork v-model:exportHomeWorkV="exportHomeWorkV" :downloadUrl="downloadUrl" />
<ExportHomeWork
v-model:exportHomeWorkV="exportHomeWorkV"
:downloadUrl="downloadUrl"
/>
<!-- 导入学员抽屉 -->
<!-- :courseId="projectTaskInfo.courseId"
:courseType="2" -->
<imp-stu v-model:AddImpStuvisible="AddImpStuvisible" @AddImpStuvisibleClose="AddImpStuvisibleClose" :courseId="id"
:courseType="type" />
<imp-stu
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id"
:courseType="type"
/>
</template>
<script setup>
import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
@@ -256,6 +378,10 @@ const props = defineProps({
type: String,
default: "",
},
activeKey:{
type: String,
default: "",
},
id: String,
columns: {
type: Array,
@@ -276,7 +402,7 @@ const props = defineProps({
groupList: {
type: Array,
default: () => [],
}
},
});
const topFlagList = ref([
{
@@ -357,16 +483,16 @@ const tablecolumns = ref([
width: "10%",
align: "center",
customRender: ({ record: { source } }) =>
// ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
({
0: "导入",
1: "手动加入",
2: "手动加入",
3: "手动加入",
4: "导入",
5: "报名",
6: "导入",
}[source]),
// ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
({
0: "导入",
1: "手动加入",
2: "手动加入",
3: "手动加入",
4: "导入",
5: "报名",
6: "导入",
}[source]),
},
...props.columns,
{
@@ -384,8 +510,8 @@ function allDepartShow(a, b) {
a == "" || a == null || a == undefined
? (a = "")
: a.slice(0, 1) == "/"
? a.slice(1, a.length)
: a;
? a.slice(1, a.length)
: a;
let depart = b == "" || b == null || b == undefined ? (b = "") : b;
let allname = org == "" && depart == "" ? "-" : org + depart;
return allname;
@@ -407,7 +533,7 @@ const checkgroupParam = ref({
changegroupV: false, //学员名称
checkgroupList: "", //学员小组
checkgroupStuId: null,
checkBatch: true
checkBatch: true,
});
const stuSelectKeys = ref([]);
@@ -417,7 +543,6 @@ const tableData = ref({
loading: false,
});
const stuRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
@@ -427,9 +552,9 @@ const stuRowSelection = computed(() => ({
//显示学员换组弹窗
function showChangeGroupModal() {
console.log("批量")
const d = props.groupList
console.log("d" + d)
console.log("批量");
const d = props.groupList;
console.log("d" + d);
// debugger
checkgroupParam.value.changegroupV = true;
checkgroupParam.value.checkBatch = true;
@@ -439,7 +564,8 @@ function showChangeGroupModal() {
function exportTaskStu() {
console.log("props.datasource", props);
window.open(
`${process.env.VUE_APP_BASE_API
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
);
}
@@ -447,12 +573,15 @@ function exportTaskStu() {
function exportTaskStuRouter() {
console.log("props.datasource", props, props.id);
window.open(
`${process.env.VUE_APP_BASE_API
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${2}&pid=${props.id}`
);
}
onMounted(() => {
// debugger
console.log("props.activeKey1" + props.activeKey1)
getStuList();
});
watch(props.isgetStudent, () => {
@@ -496,8 +625,6 @@ function getStuList() {
});
}
function reset() {
tableParam.value.studentName = "";
tableParam.value.groupName = ""; //学员小组
@@ -513,16 +640,20 @@ function bathDel() {
return message.warning("请先选中学员");
}
// 判断选择的人员中是否有小组长
let arr = [...tableData.value.list].filter(x => [...stuSelectKeys.value].some(id => id === x.id)).filter(item => item.isLeader === '1');
let arr = [...tableData.value.list]
.filter((x) => [...stuSelectKeys.value].some((id) => id === x.id))
.filter((item) => item.isLeader === "1");
if (arr.length > 0) {
return message.warning("选择人员中：" + arr[0].studentName + "是小组长，请勿删除!");
return message.warning(
"选择人员中：" + arr[0].studentName + "是小组长，请勿删除!"
);
}
tableData.value.loading = true;
delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
}
function del(id, row) {
if (row.isLeader === '1') {
if (row.isLeader === "1") {
return message.warning("" + row.name + "是小组长，请勿删除!");
}
@@ -659,7 +790,8 @@ const exportStu = () => {
console.log("props.datasource", props);
if (props.id != undefined) {
window.open(
`${process.env.VUE_APP_BASE_API
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
);
}
@@ -712,7 +844,6 @@ defineExpose({ getStuList, startLoading });
</script>
<style lang="scss">
.TableStudent {
table tr th.ant-table-selection-column,
table tr td.ant-table-selection-column {
padding-left: 3px;
@@ -787,8 +918,10 @@ defineExpose({ getStuList, startLoading });
position: absolute;
width: calc(100%);
height: 40px;
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.batchOpera {

7
src/utils/utils.js
View File

@@ -29,7 +29,7 @@ export function traverseArr(arr, traverseObj, saveOld = false) {
}
const admin = [5, 6, 8, 9, 11, 12]
//检查 管理权和归属权
export function checkPer(per) {
if (store?.state?.userInfo?.roleList.some(t => t.code === 'learning-admin')) {
return true
@@ -39,6 +39,11 @@ export function checkPer(per) {
}
return (per + "").split(',').some(t => admin.some(s => s == t))
}
const adminOwner = [6,9,12]
//单独检查是否有归属权
export function checkOwner(per) {
return (per + "").split(',').some(t => adminOwner.some(s => s == t))
}
export function checkMenu(path='') {
return store?.state?.menus.some(t => path.split(',').some(s=>'/'+s===t));
}

4
src/views/DownLoad.vue
View File

@@ -211,6 +211,8 @@ export default {
// 搜索
function searchDownloadList() {
getData()
// 获取当前用户容量
getDownLoadTotalSize()
}
// 重置
@@ -218,6 +220,8 @@ export default {
state.name = "";
state.currentPage = 1;
getData()
// 获取当前用户容量
getDownLoadTotalSize()
}
// 分页

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

@@ -70,12 +70,12 @@
/>
</div>
</div>
<div style="display: flex; margin-bottom: 20px">
<div style="display: flex; margin-bottom: 20px" class="courseBtn">
<div class="btn btn1" @click="handleSearch1">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnn btn2" @click="handleRest1">
<div class="btnn btn2" @click="handleRest1" style="width: 103px">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
@@ -366,16 +366,14 @@
type="link"
>管理
</a-button>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<OwnerTableModelStudent
:types="[10, 11, 12]"
:id="record.offcourseId"
<DropDown v-if="checkPer(record.permissions) && checkOwner(record.permissions)" value="授权">
<OwnerTableModelStudent :types="[10, 11, 12]" :id="record.id"
>权限名单</OwnerTableModelStudent
>
<CommonStudent :type="10" :id="record.offcourseId" title="查看权"
<CommonStudent :type="10" :id="record.id" title="查看权"
>查看权</CommonStudent
>
<CommonStudent :type="11" :id="record.offcourseId" title="管理权"
<CommonStudent :type="11" :id="record.id" title="管理权"
>管理权</CommonStudent
>
</DropDown>
@@ -749,7 +747,11 @@
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnn btn2" @click="handleRestTable">
<div
class="btnn btn2"
@click="handleRestTable"
style="width: 103px"
>
<div class="search"></div>
<div class="btnText">重置</div>
</div>
@@ -1686,6 +1688,7 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
import AssessmentList from "../../components/drawers/AssessmentList.vue";
import dialog from "@/utils/dialog";
// import { queryAssessmentDetailList } from "@/api/indexResearch";
import {
list,
detail,
@@ -1728,7 +1731,7 @@ import FJUpload from "@/components/common/FJUpload";
import { updateStudent } from "@/api/indexProjStu";
import { useStore } from "vuex";
import DropDown from "@/components/common/DropDown";
import { checkPer } from "@/utils/utils";
import { checkPer,checkOwner } from "@/utils/utils";
import dayjs from "dayjs";
//列表表格
@@ -3651,8 +3654,8 @@ export default defineComponent({
completeType: type,
endTime: endTime,
evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId),
testId: state.EditTestId,
assessmentId: Number(state.assessmentId),
testId: state.examInfo.examinationName ? state.EditTestId : 0,
homeWorkId: state.EditWorkId,
name: state.xjkkinputV1,
signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
@@ -3708,7 +3711,11 @@ export default defineComponent({
(res) => (state.examInfo = res.data.data)
);
}
// if(item.evalFlag){
// queryAssessmentDetailList({assessmentId:item.assessmentId }).then(
// (res) => (state.examInfo = res.data.data)
// );
// }
console.log("获取面授课开课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
@@ -4462,12 +4469,13 @@ export default defineComponent({
});
};
const handleCopy = async (id) => {
console.log("复制Id", id);
dialog({
content: "确定复制该课程吗？",
ok: async () => {
message.success("复制成功");
state.tableLoading = true;
await copyCourse({ offcourseId: id });
await copyCourse({ courseId: id });
getTableDate();
},
});
@@ -4620,16 +4628,19 @@ export default defineComponent({
// 管理开课
const handleGuan22 = (item) => {
if (String(item.courseform) === "1") {
return;
}
if (String(item.courseform) === ("1" || "线上")) {
state.om_1 = true;
state.ft_1 = false;
} else if (String(item.courseform) === ("2" || "面授")) {
state.om_1 = true;
state.ft_1 = true;
}
console.log("点击面授课管理", item);
// if (String(item.courseform) === "1") {
// return;
// }
// if (String(item.courseform) === ("1" || "线上")) {
// state.om_1 = true;
// state.ft_1 = false;
// } else if (String(item.courseform) === ("2" || "面授")) {
// state.om_1 = true;
// state.ft_1 = true;
// }
state.om_1 = true;
state.ft_1 = true;
state.manageStuLoading = true;
console.log(787666, item);
state.faceClassification = item.contentTxt;
@@ -4733,28 +4744,26 @@ export default defineComponent({
//授权
//权限名单
const showPrower = (record) => {
// console.log("record", record);
console.log("权限名单", record);
state.selectCourseId = record.offcourseId;
state.corpowerlistvisible = true;
};
//归属权
const showOwnPrower = (record) => {
// console.log("record", record);
console.log("归属权", record);
state.selectCourseId = record.offcourseId;
state.ownpowervisible = true;
};
//查看权
const showViewPrower = (record) => {
// console.log("record", record);
console.log("查看权", record);
state.selectCourseId = record.offcourseId;
state.authClassify = 1;
state.viewpowervisible = true;
};
//管理权
const showManagePrower = (record) => {
// console.log("record", record);
console.log(22222222);
console.log(record);
console.log("管理权", record);
state.selectCourseId = record.offcourseId;
state.shipType = 1;
state.authClassify = 2;
@@ -4981,6 +4990,7 @@ export default defineComponent({
beforeUpload2,
handleDel,
checkPer,
checkOwner,
handleSucessStu,
handleRejectStu,
handleDeleteStu,

32
src/views/courselibrary/components/seeModal.vue
View File

@@ -64,8 +64,8 @@
style="width: 100px; height: 100px"
/>
</div>
<div class="mbl_items">
<div class="item_nam" style="margin-bottom: 102px">
<div class="mbl_items" style="align-items: flex-start">
<div class="item_nam">
<div class="asterisk_icon">
<img
style="width: 10px; height: 10px"
@@ -73,7 +73,9 @@
alt=""
/>
</div>
<span style="margin-right: 14px">目标人群</span>
<span style="margin-right: 14px; margin-top: 3px"
>目标人群</span
>
</div>
<div class="item_inp">
<div class="i1_input">
@@ -883,5 +885,29 @@ export default defineComponent({
}
}
}
.ant-select-disabled.ant-select:not(.ant-select-customize-input)
.ant-select-selector {
color: #000000;
}
.ant-select-disabled.ant-select:not(.ant-select-customize-input)
.ant-select-selector {
background-color: rgba(255, 255, 255, 0);
}
.ant-select:not(.ant-select-customize-input) .ant-select-selector {
border: 0px !important;
}
.select .ant-select-selector {
border: 0px !important;
}
.ant-select-arrow {
display: none;
}
.ant-select-disabled.ant-select-multiple .ant-select-selection-item {
color: #000000;
border: 0px !important;
}
.ant-select-multiple .ant-select-selection-item {
background: rgba(255, 255, 255, 0);
}
}
</style>

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

@@ -593,9 +593,9 @@ export default defineComponent({
selectBandName: [],
selectBandId: [],
//资源归属
sourceBelongId: [],
sourceBelongName: [],
sourceBelongFullName: [],
sourceBelongId: null,
sourceBelongName: null,
sourceBelongFullName: null,
});
const store = useStore();
console.log(store, 666);
@@ -606,7 +606,12 @@ export default defineComponent({
const jobType = computed(() => store.state.job_type);
//获取band
const bandList = computed(() => store.state.band);
const userInfo = computed(() => store.state.userInfo);
console.log("jobTypebandList", jobType, bandList);
if (userInfo.value.departId && userInfo.value.departName) {
state.sourceBelongName = userInfo.value.departName;
state.sourceBelongId = userInfo.value.departId;
}
watch(
() => state.fen_lei,
() => {
@@ -718,9 +723,9 @@ export default defineComponent({
state.selectBandName = [];
state.selectBandId = [];
//资源归属
state.sourceBelongId = [];
state.sourceBelongName = [];
state.sourceBelongFullName = [];
state.sourceBelongId = null;
state.sourceBelongName = null;
state.sourceBelongFullName = null;
// valueHtml.value = "";
console.log("清空");
};
@@ -754,7 +759,15 @@ export default defineComponent({
fileUp(formData).then((res) => {
if (res.data.code === 200) {
// 最后插入图片 url alt href
insertFn(res.data.data, file.name, res.data.data);
console.log(
"上传图片结果",
process.env.VUE_APP_FILE_PATH + res.data.data
);
insertFn(
process.env.VUE_APP_FILE_PATH + res.data.data,
file.name,
res.data.data
);
}
});
},

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

@@ -10,13 +10,13 @@
<div class="fort">创建时间：{{ cretime }}</div>
</div>
<div class="right">
<!--
<img
class="img1"
src="../../assets/images/leveladd/ma.png"
@click="showCodeModel2()"
/>
<div v-if="action == 1 || action == 0" class="line"></div>-->
<div v-if="action == 1 || action == 0" class="line"></div>
<div
class="pubIcon"
v-if="(action == 1 || action == 0) && checkPer(permissions)"
@@ -325,9 +325,9 @@
<div style="flex: 1">
<div class="onerow">
<div class="taskmain">任务大纲</div>
<ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
<!-- <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
<button class="btn">批量面授报名</button>
</ImpoterGroupLeader>
</ImpoterGroupLeader> -->
<router-link
:to="{ path: '/leveladddetail', query: { routerId: routerId } }"
class="editright"
@@ -692,7 +692,7 @@
</div>
</a-tab-pane>
<a-tab-pane key="2" tab="共享文档">
<a-tab-pane key="2" tab="共享文档" v-if="checkPer(permissions)">
<div class="sametab">
<div class="Gcon">
<div class="pad"></div>
@@ -1387,7 +1387,7 @@ import RouterHomeworkManage from "../../components/drawers/router/RouterHomework
import RouterCommonManage from "../../components/drawers/router/RouterCommonManage";
import RouterVoteManage from "../../components/drawers/router/RouterVoteManage";
import RouterProjectManage from "../../components/drawers/router/RouterProjectManage";
import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue";
// import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue";
import TaskImpStu from "../../components/drawers/TaskFaceIn";
import { checkPer } from "@/utils/utils";
@@ -1395,7 +1395,7 @@ import { checkPer } from "@/utils/utils";
export default {
name: "LevelAdd",
components: {
ImpoterGroupLeader,
// ImpoterGroupLeader,
ProjCheckShip,
ImpStu,
CheckStu,
@@ -2759,7 +2759,10 @@ export default {
let obj = {
title: "[学习路径]二维码",
name: state.styTitle,
// url: codeUrl,
url: window.location.protocol +
process.env.VUE_APP_H5 +
"/pathdetails?routerId=" +
state.routerId,
};
state.codeInfo = obj;
};

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

@@ -261,7 +261,7 @@
size="small" active-color="red"/>
<div class="showt clearfix">
<div class="bi" :style="{
'z-index': element.checked1 ? 999 : 998,
'z-index': element.flag ? 999 : 998,
}">
必修
</div>

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

@@ -160,13 +160,8 @@
type="link"
>撤回发布</a-button
>
<a-button
v-if="record.type === 3"
@click="baseInfo(record)"
type="link"
>管理</a-button
>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<a-button v-if="record.type === 3" @click="baseInfo(record)" type="link">管理</a-button>
<DropDown v-if="checkPer(record.permissions) && checkOwner(record.permissions)" value="授权">
<OwnerTableModelStudent
:types="[4, 5, 6]"
:id="record.id"
@@ -959,7 +954,7 @@ import { validateName } from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent";
import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
import DropDown from "@/components/common/DropDown";
import { checkPer } from "@/utils/utils";
import { checkPer,checkOwner } from "@/utils/utils";
export default {
name: "projectManage",
@@ -1707,6 +1702,7 @@ export default {
return {
...toRefs(state),
checkOwner,
dayjs,
handleEdit,
baseInfo,

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

@@ -442,6 +442,7 @@ function changeStageIndex(index) {
const getTask = async () => {
await api.getDraftTask({projectId: route.query.projectId}).then((res) => {
projectInfo.value = res.data.data
console.log("获取任务列表:" + JSON.stringify(projectInfo.value) )
});
};

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

@@ -14,7 +14,7 @@
</div>
<div class="right">
<!-- 2022-12-10注释 后面放开 -->
<!-- <img
<img
class="img1"
src="../../assets/images/leveladd/ma.png"
@click="showCodeModel2()"
@@ -26,9 +26,9 @@
action == 2 ||
action == 0 ||
action == 3 ||
action == -2
"
></div>-->
action == -2
"
></div>
<!-- 显示发布图标 -->
<img
v-if="action == 2 && checkPer(permissions)"
@@ -382,7 +382,7 @@
</div>
<div class="stagesecond">
<div class="staname">阶段名称：</div>
<div class="stamess">管理者进阶-腾飞班1第一阶段</div>
<div class="stamess">{{ choosedStageName }}</div>
</div>
<div class="stagelast">
<div class="stagepro">
@@ -459,14 +459,14 @@
<div class="split"></div>
<div class="onerow">
<div class="taskmain">任务大纲</div>
<ImpoterGroupLeader
<!-- <ImpoterGroupLeader
title="批量面授报名"
:data="{ targetId: projectId, type: 1 }"
:url="`/admin/offcourse/importCourse`"
:template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`"
>
<button class="btn">批量面授报名</button>
</ImpoterGroupLeader>
</ImpoterGroupLeader> -->
<router-link
v-if="checkPer(permissions)"
:to="{ path: `/taskadd`, query: { projectId: projectId } }"
@@ -757,6 +757,7 @@
:permissions="permissions"
:type="1"
:id="projectId"
:activeKey1="activeKey1"
:columns="stuColumns"
:stage="stage"
:visable="tabFlag"
@@ -766,10 +767,14 @@
<a-button @click="showStudent(record)" type="link"
>查看
</a-button>
<a-button @click="settingTopFlag(record)" type="link"
<a-button @click="settingTopFlag(record)" v-if="checkPer(permissions)" type="link"
>{{ record.topFlag ? "取消优秀" : "优秀学员" }}
</a-button>
<a-button type="link" :disabled="record.isLeader === '1'" @click="showChangeGroupModal(record)"
<a-button
type="link"
v-if="checkPer(permissions)"
:disabled="record.isLeader === '1'"
@click="showChangeGroupModal(record)"
>换组
</a-button>
</template>
@@ -909,7 +914,7 @@
</a-tab-pane>
<a-tab-pane key="5" tab="项目积分">
<ProjectScore
v-if="activeKey=='5'"
v-if="activeKey == '5'"
:permissions="permissions"
:projectId="projectId"
></ProjectScore>
@@ -1069,7 +1074,7 @@
</div>
<!-- 有证书显示的页面 -->
<div v-else class="certificate1">
<div class="addcertificate1" @click="addCertificate">
<div class="addcertificate1" @click="addCertificate" v-if="checkPer(permissions)">
<div class="addcertext">+添加证书</div>
</div>
<div
@@ -2351,6 +2356,7 @@ export default {
],
changeGoods: [], //更改是否优秀的id数组
choosedStageId: 1, // 选择的阶段id
choosedStageName:"",//阶段名称
activeSetKey: "12", //12-基础信息 13-共享文档
docChecked: true,
//学员信息列表
@@ -2940,6 +2946,7 @@ export default {
}
state.rankjieduan = arrStage;
state.valuestu2 = arrStage[0].value;
state.choosedStageName = levelList.stageList[0].name;
}
console.log(
"----------------------------------->",
@@ -3101,6 +3108,7 @@ export default {
state.stugroup = false;
state.groupInfo = {};
state.groupMemberCountContrast = null;
getGroup();
};
//点击确定创建小组
const createG = () => {
@@ -3934,9 +3942,9 @@ export default {
const createGroup = async () => {
console.log("state.groupPageList" + state.groupPageList);
const id = state.groupInfo.id;
const d = state.groupPageList.filter(item => item.id !== id).filter(
(item) => item.leaderId === state.groupInfo.leaderId
);
const d = state.groupPageList
.filter((item) => item.id !== id)
.filter((item) => item.leaderId === state.groupInfo.leaderId);
if (state.isEdit) {
if (d.length > 0 && d[0].id !== id) {
return message.warn(d[0].leaderName + "已是小组长，请重新选择");
@@ -3947,11 +3955,10 @@ export default {
}
} else {
if (d.length > 0) {
return message.warn(d[0].leaderName + "已是小组长，请重新选择");
return message.warn(d[0].leaderName + "已是小组长，请重新选择");
}
}
state.isEdit = false;
await editGroup({ ...state.groupInfo, projectId: state.projectId });
message.success(id ? "小组编辑成功" : "小组创建成功");
@@ -4662,7 +4669,11 @@ export default {
let obj = {
title: "[项目]二维码",
name: state.name,
// url: codeUrl,
url:
window.location.protocol +
process.env.VUE_APP_H5 +
"/projectdetails?projectId=" +
state.projectId,
};
state.codeInfo = obj;
};
@@ -4679,6 +4690,7 @@ export default {
url && window.open(url);
};
function stageChange(item, index) {
state.choosedStageName = item.name;
state.choosedStageId = item.stageId;
state.choosedStageIndex = index;
}

22
src/views/projectcenter/temTask.vue
View File

@@ -281,7 +281,7 @@
<div class="footbtn">
<div class="btnbox">
<a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定</a-button>
<a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定11</a-button>
<a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
</div>
</div>
@@ -541,7 +541,16 @@ const cancelModal = ref(false);
const deleteStageModal = ref(false);
const templateLoading = ref(false);
const cancleLoading = ref(false);
const projectInfo = ref({stageList: [{taskTemplateList: [{}]}], projectTemplateInfo: {}});
const projectInfo = ref({
stageList: [{
"id":"0",
taskTemplateList: [{
}]
}],
projectTemplateInfo: {
}
});
const activeIndex = ref(0);
const moveChapterIndex = ref(0);
const deleteIndex = ref(0);
@@ -576,6 +585,13 @@ function changeStageIndex(index) {
const getTask = async () => {
await api.templateEditDetail(route.query.projectId).then((res) => {
projectInfo.value = res.data.data
if(projectInfo.value.stageList.length == 0){
projectInfo.value.stageList = [{
"id":"0",
taskTemplateList: []
}]
}
console.log("获取任务列表信息：" + JSON.stringify(projectInfo.value));
});
};
@@ -721,7 +737,7 @@ const closeDeAll = () => {
const submitStorage = async () => {
templateLoading.value = true
await request(PROJECT_TEMPLATE_DETAIL_MODIFY, projectInfo.value)
await getTask()
// await getTask()
message.success("保存成功");
templateLoading.value = false
};

236
src/views/projectcenter/templateAdd.vue
View File

@@ -17,17 +17,17 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">模板名称</div>
</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
placeholder="请输入模板名称"
show-count
:maxlength="30"
v-model:value="projectInfo.name"
placeholder="请输入模板名称"
show-count
:maxlength="30"
/>
</div>
</div>
@@ -95,68 +95,68 @@
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目时间</div>
</div>
<div class="in">
<a-range-picker
:show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate" :disabled-time="disabledRangeTime"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate"
:disabled-time="disabledRangeTime"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
/>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple"
></ProjectManager>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">资源归属</div>
</div>
<div class="in select">
<OrgClass
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass>
</div>
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">项目级别</div>
</div>
@@ -167,8 +167,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">培训体系</div>
</div>
@@ -179,8 +179,8 @@
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<div class="inname">是否BOEU实施</div>
</div>
@@ -195,34 +195,30 @@
<div class="namebox">
<div class="inname">同步学习记录</div>
</div>
<div class="in ggysxz" v-if="courseSyncFlag">
<div class="in ggysxz" v-if="courseSyncFlag">
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox
disabled
v-model:checked="courseSyncFlag"
><span
<a-checkbox disabled v-model:checked="courseSyncFlag"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>
</div>
<div class="in" v-else>
<div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox
disabled
v-model:checked="courseSyncFlag"
><span
<a-checkbox disabled v-model:checked="courseSyncFlag"
><span
style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox
>
</div>
</div>
@@ -232,11 +228,11 @@
</div>
<div class="in">
<a-textarea
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
v-model:value="projectInfo.remark"
style="height: 80px"
placeholder="请输入说明"
show-count
:maxlength="200"
/>
</div>
</div>
@@ -245,18 +241,48 @@
<div class="footer">
<div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1"
>确定
>确定
</a-button>
<a-button @click="backPage" class="btn2">取消</a-button>
</div>
</div>
<!-- 更多背景图 v-model:visible="learnBgMore" -->
<a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
wrapClassName="learnBgMoreModal" :z-index="9999">
<div class="main">
<div class="top">
<div class="topc">封面图</div>
</div>
<div class="imagesBox">
<!-- <div
@click="() => (projectInfo.picUrl = src.value)"
v-for="item in projectPic"
:key="item.code"
class="learnBgItem"
> -->
<div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
border:
projectInfo.picUrl === item.value
? '3px solid rgba(78, 166, 255, 1)'
: '1px solid #ccc',
'background-image': 'url(' + item.value.split(',')[0] + ')',
}">
<!-- <img class="im" :src="item.source" /> -->
</div>
</div>
<div class="btn">
<button class="samtn btn1" @click="closeLearnBgMore">取消</button>
<button class="samtn btn2" @click="closeLearnBgMore">确定</button>
</div>
</div>
</a-modal>
</div>
</template>
<script setup>
import {useStore} from "vuex";
import {ref, onMounted, watch} from "vue";
import {message} from "ant-design-vue";
import {useRouter, useRoute} from "vue-router";
import { useStore } from "vuex";
import { ref, onMounted, watch } from "vue";
import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
import * as api from "../../api/indexTemplate";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
@@ -267,33 +293,37 @@ const route = useRoute();
const router = useRouter();
const store = useStore();
const projectInfo = ref({});
const learnBgMore = ref(false);
const projectPic = ref([]);
const courseSyncFlag = ref(true)
const courseSyncFlag = ref(true);
onMounted(() => {
getDetail();
console.log(JSON.stringify(store.state.project_pic));
projectPic.value = store.state.project_pic.map((e) => ({
value: e.dictValue,
label: e.dictName,
code: e.id,
value: e.value,
label: e.name
}));
});
watch(
() => route.query.projectTemplateId,
() => {
getDetail();
}
() => route.query.projectTemplateId,
() => {
getDetail();
}
);
const getDetail = () =>
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
console.log("查询到的模板库数据：" + JSON.stringify(projectInfo.value));
});
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
projectInfo.value.rangeTime = [
dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
console.log("查询到的模板库数据：" + JSON.stringify(projectInfo.value));
});
const backPage = () => {
router.push({
@@ -304,8 +334,8 @@ const backPage = () => {
function timeChange(e) {
if (e && e.length === 2) {
projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm"),
projectInfo.value.endTime =dayjs(e[1]).format("YYYY-MM-DD HH:mm")
(projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm")),
(projectInfo.value.endTime = dayjs(e[1]).format("YYYY-MM-DD HH:mm"));
}
}
@@ -323,6 +353,24 @@ const errorMsgs = {
boeFlag: "请选择是否BOE实施",
};
//显示更多路径背景弹窗s
const showLearnBgMore = () => {
learnBgMore.value = true;
};
//关闭更多路径背景弹窗
const closeLearnBgMore = () => {
learnBgMore.value = false;
};
const chooseImg2 = (item) => {
// console.log(item);
projectInfo.value.picUrl = item.value;
projectInfo.value.pathBgId = item.code;
projectInfo.value.pathBg = item.value.split(",")[0];
projectInfo.value.mobilePicUrl = item.value.split(",")[1];
};
const createProject = () => {
for (let i in errorMsgs) {
if (projectInfo.value[i] === "" || projectInfo.value[i] === undefined) {
@@ -332,34 +380,38 @@ const createProject = () => {
}
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
projectInfo.value.endTime =dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm")
(projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format(
"YYYY-MM-DD HH:mm"
)),
(projectInfo.value.endTime = dayjs(projectInfo.value.endTime).format(
"YYYY-MM-DD HH:mm"
));
api
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
.templateEdit({
...projectInfo.value,
courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
})
.then(() => {
message.destroy();
message.success("编辑成功");
router.back();
});
};
function managerChange(e, l, d, t,orgName) {
console.log(e, l)
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
projectInfo.value.sourceBelongId = d;
projectInfo.value.sourceBelongName = t;
projectInfo.value.sourceBelongFullName = orgName
projectInfo.value.sourceBelongFullName = orgName;
}
</script>
<style lang="scss">
.ggysxz {
.ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
border-color: #FFF !important;
border-color: #fff !important;
}
.ant-checkbox-disabled .ant-checkbox-inner {
background-color: #1890ff !important;
background-color: #1890ff !important;
}
}

67
src/views/research/ResearchManage.vue
View File

@@ -23,23 +23,23 @@
></a-select>
</div>
<div class="select">
<div class="select addTimeBox">
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
<div class="select addTimeBox">
<div class="addTime">创建时间：</div>
<a-range-picker
v-model:value="projectTime"
style="width: 420px"
format="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
<div style="display: flex; margin-bottom: 20px">
<div class="btn btn1" @click="handleSearch">
<div class="search"></div>
<div class="btnText">搜索</div>
</div>
<div class="btnn btn2" @click="handleRest">
<div class="btnn btn2" @click="handleRest" style="width: 103px">
<div class="search"></div>
<div class="btnText">重置</div>
</div>
@@ -114,7 +114,6 @@
placeholder="请输入评估名称"
v-model:value="assessmentName"
v-model:validate="validate"
:maxlength="15"
show-count
:type="4"
@@ -170,8 +169,10 @@
<div class="btnText" @click="handleCancelModal">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" v-if="!addLoading" @click="handleSure">确定</div>
<div class="btnText" v-else>确定</div>
<div class="btnText" v-if="!addLoading" @click="handleSure">
确定
</div>
<div class="btnText" v-else>确定</div>
</div>
</div>
</div>
@@ -204,7 +205,7 @@ import { toDate } from "../../api/method.js";
import store from "@/store";
import { message } from "ant-design-vue";
import NameInput from "@/components/project/NameInput";
import {validateName} from "@/api/index1";
import { validateName } from "@/api/index1";
export default {
name: "learningPath",
components: {
@@ -318,7 +319,7 @@ export default {
copy_hs: false,
back_hs: false,
pub_hs: false,
validate: true,
});
const tableDataFunc = () => {
@@ -458,14 +459,15 @@ export default {
<div class="operation">
{value.state === "2" ? (
<div class="fb">
<div class="jc"
<div
class="jc"
onClick={() => {
handleToManagepage(value, "/managepage");
}}
>
管理
</div>
<div
class="jc"
onClick={() => {
@@ -595,27 +597,29 @@ export default {
state.assessmentName = item.assessmentName;
state.newNext = true;
};
const handleNext = async() => {
const handleNext = async () => {
if (!state.id) {
if (!state.assessmentName) {
message.destroy();
message.error("请输入评估名称");
return false;
}
if (!state.validate ) {
message.destroy();
return message.warning("该评估名称已存在");
if (!state.validate) {
message.destroy();
return message.warning("该评估名称已存在");
}
const offName = await validateName({name: state.assessmentName, type:4, id:state.id}).then(res => {
const offName = await validateName({
name: state.assessmentName,
type: 4,
id: state.id,
}).then((res) => {
return res.data.data == 1;
});
if(offName){
message.destroy();
return message.warning("课程名称重复，请重新填写");
}
});
if (offName) {
message.destroy();
return message.warning("课程名称重复，请重新填写");
}
store.commit("SET_assessmentName", state.assessmentName);
router.push("/researchadd");
handleCancel();
@@ -675,7 +679,6 @@ export default {
state.copy_hs = true;
};
const handleSure = () => {
// 发布
if (state.pub_hs) {
editReleaseStatus({
@@ -727,7 +730,7 @@ export default {
console.log("resultPost");
console.log(resultPost);
createResearch(resultPost).then((res) => {
state.addLoading =false;
state.addLoading = false;
console.log(res);
handleCancelModal();
getTableDate();

6
src/views/research/components/ResearchAddItem.vue
View File

@@ -64,7 +64,11 @@ export default {
setup(props, { emit }) {
const curItem = ref(props.item);
console.log("选项信息", curItem.value, process.env.VUE_APP_FILE_PATH);
curItem.value.imgVal = process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
if (curItem.value.imgVal) {
curItem.value.imgVal =
process.env.VUE_APP_FILE_PATH + curItem.value.imgVal;
}
const state = reactive({
hasImgName: "",
});