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

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

Browse Source 
# Conflicts:
#	src/components/drawers/CheckStu.vue
This commit is contained in:
yuping
2023-02-24 04:36:07 +08:00
parent 9e4ce50e77 33411ed1e1
commit c41c8c74a4
17 changed files with 3367 additions and 2920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/index1.js
View File

@@ -220,6 +220,8 @@ export const cancelOrAuth = (obj) => http.post('/admin/certificate/cancelOrAuth'
export const allPoints = (obj) => http.get('/points/project/allPoints', { params: obj }) export const allPoints = (obj) => http.get('/points/project/allPoints', { params: obj })
export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCert', obj) export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCert', obj)
//添加外部考试
export const createExamination = (obj) => http.post('/examination/createExamination', obj)
// 外部考试导入成绩 // 外部考试导入成绩
export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } }) export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } })
//分组 //分组

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

@@ -3,151 +3,91 @@
<div @click="openDrawer"> <div @click="openDrawer">
<slot></slot> <slot></slot>
</div> </div>
<a-drawer <a-drawer :visible="visible" class="drawerStyle addliveDrawer" width="1000" title="添加直播" placement="right">
:visible="visible"
class="drawerStyle addliveDrawer"
width="1000"
title="添加直播"
placement="right"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle"> <div class="headerTitle">
{{ taskIndex >= 0 ? "编辑" : "添加" }}直播 {{ taskIndex >= 0 ? "编辑" : "添加" }}直播
</div> </div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div class="contentMain"> <div class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">直播名称：</span> <span style="margin-right: 3px">直播名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.liveName" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.liveName" placeholder="请输入直播名称" :maxlength="20" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入直播名称"
:maxlength="20"
/>
</div> </div>
</div> </div>
<div class="main_item" style="margin-top: -10px"> <div class="main_item" style="margin-top: -10px">
<div class="signbox"> <div class="signbox">
<div class="asterisk_icon"> <div class="asterisk_icon">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">直播链接：</span> <span style="margin-right: 3px">直播链接：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.liveLink" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.liveLink" placeholder="请输入直播链接" :maxlength="100" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入直播链接"
:maxlength="100"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">直播时间：</span> <span style="margin-right: 3px">直播时间：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
:show-time="{ format: 'HH:mm' }" style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" format="YYYY-MM-DD HH:mm"
:disabled-date="disabledDate" valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="dateTime"
format="YYYY-MM-DD HH:mm"
valueFormat="YYYY-MM-DD HH:mm"
@change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">直播时长：</span> <span style="margin-right: 3px">直播时长：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input-number <a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
:min="0" v-model:value="formData.liveDuration"></a-input-number>
:max="300"
:precision="0"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.liveDuration"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">授课老师：</span> <span style="margin-right: 3px">授课老师：</span>
</div> </div>
<div class="select" style="width: 400px"> <div class="select" style="width: 400px">
<ProjectManager <ProjectManager v-model:value="formData.liveTeacherId" v-model:name="formData.liveTeacherName">
v-model:value="formData.liveTeacherId" </ProjectManager>
v-model:name="formData.liveTeacherName"
></ProjectManager>
</div> </div>
</div> </div>
<div class="mbl_items2"> <div class="mbl_items2">
<div class="item_nam"> <div class="item_nam">
<div class="asterisk_icon"> <div class="asterisk_icon">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 2px">直播封面：</span> <span style="margin-right: 2px">直播封面：</span>
</div> </div>
<div class="item_inp"> <div class="item_inp">
<a-upload <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
name="avatar" :before-upload="beforeUpload">
list-type="picture-card" <img class="i_upload_img" v-if="imageUrl" :src="imageUrl" alt="avatar" />
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<img
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
/>
<div class="i_upload" v-else> <div class="i_upload" v-else>
<div class="addimg"> <div class="addimg">
<div class="heng"></div> <div class="heng"></div>
@@ -157,9 +97,7 @@
</a-upload> </a-upload>
<div class="i_bottom"> <div class="i_bottom">
<div class="tip"> <div class="tip">
<span style="color: #999999; margin-left: 8px" <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png 图片最大为2MB</span>
>支持图片格式为jpg/jpeg/png 图片最大为2MB</span
>
</div> </div>
</div> </div>
</div> </div>
@@ -167,22 +105,13 @@
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<div class="asterisk_icon"> <div class="asterisk_icon">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">直播公告：</span> <span style="margin-right: 3px">直播公告：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="formData.liveNotice" placeholder="请输入直播公告" allow-clear show-count
v-model:value="formData.liveNotice" :maxlength="200" :rows="6" />
placeholder="请输入直播公告"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div> </div>
</div> </div>
@@ -191,10 +120,7 @@
<span style="margin-right: 3px">回放设置：</span> <span style="margin-right: 3px">回放设置：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-switch <a-switch v-model:checked="formData.livePlayback" @change="getchange(formData.livePlayback)" />
v-model:checked="formData.livePlayback"
@change="getchange(formData.livePlayback)"
/>
</div> </div>
</div> </div>
<div v-if="formData.livePlayback"> <div v-if="formData.livePlayback">
@@ -203,12 +129,8 @@
<span style="margin-right: 3px">回放链接：</span> <span style="margin-right: 3px">回放链接：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.livePlaybackLink" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.livePlaybackLink" placeholder="请输入回放链接" :maxlength="100" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入回放链接"
:maxlength="100"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -218,14 +140,8 @@
<span style="margin-right: 3px">直播说明：</span> <span style="margin-right: 3px">直播说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="formData.liveExplain" placeholder="请输入直播说明" allow-clear show-count
v-model:value="formData.liveExplain" :maxlength="200" :rows="6" />
placeholder="请输入直播说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div> </div>
</div> </div>
@@ -242,39 +158,23 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>直播开始前：</span> <span>直播开始前：</span>
<a-input-number <a-input-number :min="0" :max="30" :precision="0" style="
:min="0" width: 88px;
:max="30" height: 32px;
:precision="0" border-radius: 8px;
style=" overflow: hidden;
width: 88px; " v-model:value="formData.beforeSignIn"></a-input-number>
height: 32px; <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.beforeSignIn"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
</div> </div>
<div class="timerbox"> <div class="timerbox">
<span>直播开始后：</span> <span>直播开始后：</span>
<a-input-number <a-input-number :min="0" :max="30" :precision="0" style="
:min="0" width: 88px;
:max="30" height: 32px;
:precision="0" border-radius: 8px;
style=" overflow: hidden;
width: 88px; " v-model:value="formData.afterSignIn"></a-input-number>
height: 32px; <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
border-radius: 8px;
overflow: hidden;
"
v-model:value="formData.afterSignIn"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟允许签到</span
>
</div> </div>
</div> </div>
</div> </div>
@@ -284,18 +184,14 @@
<span style="margin-right: 3px">评估：</span> <span style="margin-right: 3px">评估：</span>
</div> </div>
<div class="btnbox2"> <div class="btnbox2">
<a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)" <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)">需要评估
>需要评估
</a-checkbox> </a-checkbox>
</div> </div>
</div> </div>
<div v-if="formData.isEvaluate" class="main_item"> <div v-if="formData.isEvaluate" class="main_item">
<div class="signbox"></div> <div class="signbox"></div>
<div class="btnbox"> <div class="btnbox">
<AddInvistRoot <AddInvistRoot v-model:id="formData.assessmentId" v-model:name="formData.assessmentName">
v-model:id="formData.assessmentId"
v-model:name="formData.assessmentName"
>
<button class="xkbtn">选择评估</button> <button class="xkbtn">选择评估</button>
</AddInvistRoot> </AddInvistRoot>
@@ -428,6 +324,8 @@ const rulesRef = ref({
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
formData.value.liveCover = "";
imageUrl.value = "";
visible.value = false; visible.value = false;
taskIndex.value = -1; taskIndex.value = -1;
dateTime.value = []; dateTime.value = [];
@@ -467,16 +365,17 @@ async function confirm() {
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
let list = props.taskList let list = props.taskList
list.push( list.push(
{name: formData.value.liveName, {
type: props.type, name: formData.value.liveName,
info: {...formData.value}, type: props.type,
duration:dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime,'minutes') info: { ...formData.value },
}) duration: dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
})
} else { } else {
const data = props.taskList[taskIndex.value]; const data = props.taskList[taskIndex.value];
data.name = formData.value.liveName; data.name = formData.value.liveName;
data.info = formData.value; data.info = formData.value;
data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime,'minutes') data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
} }
emit("update:taskList", [...props.taskList]); emit("update:taskList", [...props.taskList]);
@@ -484,8 +383,10 @@ async function confirm() {
} }
function openDrawer(i, row) { function openDrawer(i, row) {
console.log(i, row)
row && (formData.value = { ...row.info }); row && (formData.value = { ...row.info });
row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]); row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
row && (imageUrl.value = row.info.liveCover);
i >= 0 && (taskIndex.value = i); i >= 0 && (taskIndex.value = i);
visible.value = true; visible.value = true;
} }
@@ -506,9 +407,10 @@ const beforeUpload = (file) => {
return false; return false;
} }
let isLt1M = file.size / 10240 / 10240 <= 1; let isLt1M = file.size < 2097152;
console.log(file.size, isLt1M)
if (!isLt1M) { if (!isLt1M) {
this.$message.error("图片大小超过10MB!"); message.error("图片大小超过2MB!");
return false; return false;
} }

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

@@ -2,71 +2,45 @@
<div @click="openDrawer"> <div @click="openDrawer">
<slot></slot> <slot></slot>
</div> </div>
<a-drawer <a-drawer :visible="visible" class="drawerStyle addtestDrawer" width="800" placement="right">
:visible="visible"
class="drawerStyle addtestDrawer"
width="800"
placement="right"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}考试</div> <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}考试</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;"> <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
<div> <div>
<button <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
style="width: 100px; cursor: pointer;" :class="formData.examType === 1 ? 'outer' : 'notOuter'">
@click="changeOuter(1)"
:class="formData.examType === 1 ? 'outer' : 'notOuter'"
>
系统考试 系统考试
</button> </button>
<button <button :disabled="taskIndex >= 0" style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
:disabled="taskIndex >= 0" :class="formData.examType === 2 ? 'outer' : 'notOuter'">
style="width: 100px; cursor: pointer;"
@click="changeOuter(2)"
:class="formData.examType === 2 ? 'outer' : 'notOuter'"
>
外部考试 外部考试
</button> </button>
</div> </div>
</div> </div>
<div v-if="formData.examType===1" class="contentMain"> <div v-if="formData.examType === 1" class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">考试名称：</span> <span style="margin-right: 3px">考试名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.examinationName" placeholder="请输入考试名称" :maxlength="20" :disabled="taskIndex >= 0" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入考试名称"
:maxlength="20"
:disabled="taskIndex >= 0"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">选择试卷：</span> <span style="margin-right: 3px">选择试卷：</span>
</div> </div>
@@ -87,65 +61,40 @@
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">考试时间：</span> <span style="margin-right: 3px">考试时间：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'hh:mm' }"
style="width: 400px; height: 40px; border-radius: 8px" :disabled-date="disabledDate" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
:show-time="{format:'hh:mm'}" v-model:value="dateTime" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
:disabled-date="disabledDate"
format="YYYY-MM-DD HH:mm"
valueFormat="YYYY-MM-DD HH:mm"
v-model:value="dateTime"
@change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">考试时长：</span> <span style="margin-right: 3px">考试时长：</span>
</div> </div>
<div class="select"> <div class="select">
<a-input-number <a-input-number :disabled="taskIndex >= 0" :min="0" :max="300" :precision="0"
:disabled="taskIndex >= 0" style="width: 400px; height: 40px; border-radius: 8px"
:min="0" v-model:value="formData.examinationDuration"></a-input-number>
:max="300"
:precision="0"
style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.examinationDuration"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span> <span style="color: #999999; margin-left: 8px">分钟</span>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">及格线：</span> <span style="margin-right: 3px">及格线：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input :disabled="taskIndex >= 0" v-model:value="formData.passLine" type="number"
:disabled="taskIndex >= 0" style="width: 400px; height: 40px; border-radius: 8px" />
v-model:value="formData.passLine"
type="number"
style="width: 400px; height: 40px; border-radius: 8px"
/>
<span style="color: #999999; margin-left: 8px">分</span> <span style="color: #999999; margin-left: 8px">分</span>
</div> </div>
@@ -155,15 +104,8 @@
<span style="margin-right: 3px">考试说明：</span> <span style="margin-right: 3px">考试说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea :disabled="taskIndex >= 0" v-model:value="formData.examinationExplain" placeholder="请输入考试说明"
:disabled="taskIndex >= 0" allow-clear show-count :maxlength="200" :rows="6" />
v-model:value="formData.examinationExplain"
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -174,21 +116,12 @@
<div class="setbox"> <div class="setbox">
<div class="timerbox"> <div class="timerbox">
<span>允许重复考试：</span> <span>允许重复考试：</span>
<a-input-number <a-input-number :disabled="taskIndex >= 0" :min="-1" :max="300" :precision="0" style="
:disabled="taskIndex >= 0" width: 100px;
:min="-1" height: 32px;
:max="300" border-radius: 8px;
:precision="0" overflow: hidden;" v-model:value="formData.examinationLimit"></a-input-number>
style=" <span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
width: 100px;
height: 32px;
border-radius: 8px;
overflow: hidden;"
v-model:value="formData.examinationLimit"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>次,-1表示无限制</span
>
</div> </div>
</div> </div>
</div> </div>
@@ -199,11 +132,7 @@
<span style="margin-right: 3px">显示答案：</span> <span style="margin-right: 3px">显示答案：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnswers">
:disabled="taskIndex >= 0"
style="margin-right: 12px"
v-model:value="formData.showAnswers"
>
<a-radio :value="1">允许查看</a-radio> <a-radio :value="1">允许查看</a-radio>
<a-radio :value="2">不允许查看</a-radio> <a-radio :value="2">不允许查看</a-radio>
</a-radio-group> </a-radio-group>
@@ -214,11 +143,7 @@
<span style="margin-right: 3px">显示解析：</span> <span style="margin-right: 3px">显示解析：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnalysis">
:disabled="taskIndex >= 0"
style="margin-right: 12px"
v-model:value="formData.showAnalysis"
>
<a-radio :value="1">允许查看</a-radio> <a-radio :value="1">允许查看</a-radio>
<a-radio :value="2">不允许查看</a-radio> <a-radio :value="2">不允许查看</a-radio>
</a-radio-group> </a-radio-group>
@@ -229,11 +154,7 @@
<span style="margin-right: 3px">评分模式：</span> <span style="margin-right: 3px">评分模式：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.scoringModel">
:disabled="taskIndex >= 0"
style="margin-right: 12px"
v-model:value="formData.scoringModel"
>
<a-radio :value="1">最高一次</a-radio> <a-radio :value="1">最高一次</a-radio>
<a-radio :value="2">最后一次</a-radio> <a-radio :value="2">最后一次</a-radio>
</a-radio-group> </a-radio-group>
@@ -246,11 +167,8 @@
<span style="margin-right: 3px">试题排列：</span> <span style="margin-right: 3px">试题排列：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-radio-group <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px"
:disabled="taskIndex >= 0" v-model:value="formData.questionArrangement">
style="margin-right: 12px"
v-model:value="formData.questionArrangement"
>
<a-radio :value="1">试题乱序</a-radio> <a-radio :value="1">试题乱序</a-radio>
<a-radio :value="2">选项乱序</a-radio> <a-radio :value="2">选项乱序</a-radio>
<a-radio :value="3">全部乱序</a-radio> <a-radio :value="3">全部乱序</a-radio>
@@ -266,39 +184,25 @@
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">考试名称：</span> <span style="margin-right: 3px">考试名称：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.examinationName" placeholder="请输入考试名称" :maxlength="20" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入考试名称"
:maxlength="20"
/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div> </div>
<span style="margin-right: 3px">数据来源：</span> <span style="margin-right: 3px">数据来源：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.source" placeholder="请输入数据来源" :maxlength="20" />
style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入数据来源"
:maxlength="20"
/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -306,14 +210,8 @@
<span style="margin-right: 3px">考试说明：</span> <span style="margin-right: 3px">考试说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count
v-model:value="formData.externalExplain" :maxlength="200" :rows="6" />
placeholder="请输入考试说明"
allow-clear
show-count
:maxlength="200"
:rows="6"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -326,10 +224,11 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup> <script setup>
import {defineEmits, defineProps, ref, watch} from "vue"; import { defineEmits, defineProps, ref, watch } from "vue";
import STest from "./SelectTest.vue"; import STest from "./SelectTest.vue";
import { createExamination } from "@/api/index1";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {Form, message} from "ant-design-vue"; import { Form, message } from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
@@ -410,7 +309,7 @@ const emit = defineEmits({})
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
const {resetFields, validate} = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
watch(() => formData.value.examType, () => { watch(() => formData.value.examType, () => {
formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule
@@ -436,19 +335,26 @@ const disabledDate = (current) => {
// 系统考试 // 系统考试
async function confirm() { async function confirm() {
debugger // debugger
await validate().catch(({errorFields}) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过") throw Error("数据校验不通过")
}); });
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
const list = props.taskList const list = props.taskList
list.push({name: formData.value.examinationName, type: props.type, info: {...formData.value}}) list.push({ name: formData.value.examinationName, type: props.type, info: { ...formData.value } })
} else { } else {
const data = props.taskList[taskIndex.value] const data = props.taskList[taskIndex.value]
data.name = formData.value.examinationName data.name = formData.value.examinationName
data.info = {...formData.value} data.info = { ...formData.value }
} }
let obj = formData.value;
createExamination(obj).then(res => {
console.log(res)
message.success("成功");
}).catch(err => {
console.log(err)
})
emit('update:taskList', [...props.taskList]) emit('update:taskList', [...props.taskList])
closeDrawer() closeDrawer()
} }
@@ -473,7 +379,7 @@ function changeOuter(v) {
formData.value.examType = v; formData.value.examType = v;
} }
defineExpose({openDrawer}) defineExpose({ openDrawer })
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
@@ -660,7 +566,7 @@ defineExpose({openDrawer})
padding-left: 5px !important; padding-left: 5px !important;
} }
.ant-table-thead > tr > th { .ant-table-thead>tr>th {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
} }
@@ -668,9 +574,7 @@ defineExpose({openDrawer})
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody .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; background: #f6f9fd;
} }

367
src/components/drawers/EvList.vue
View File

@@ -2,22 +2,33 @@
<div @click="openDrawer"> <div @click="openDrawer">
<slot></slot> <slot></slot>
</div> </div>
<a-drawer :visible="visible" class="drawerStyle addonlineDrawer" width="800" title="选择测评" <a-drawer
placement="right"> :visible="visible"
class="drawerStyle addonlineDrawer"
width="800"
title="选择测评"
placement="right"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <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" <img
@click="closeDrawer"/> style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div class="contentMain"> <div class="contentMain" v-if="data.length > 0">
<div class="main_items"> <div class="main_items">
<div class="mi_ipts"> <div class="mi_ipts">
<div class="mii_ipt"> <div class="mii_ipt">
<div class="ipt_name"></div> <div class="ipt_name"></div>
<div class="fi_input"> <div class="fi_input">
<a-input v-model:value="params.keyword" style="width: 424px; height: 40px; border-radius: 8px" <a-input
placeholder="请输入测评名称"/> v-model:value="params.keyword"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入测评名称"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -34,18 +45,97 @@
</div> </div>
<div class="main_table"> <div class="main_table">
<a-table <a-table
:customRow="customRow" :customRow="customRow"
class="ant-table-striped" class="ant-table-striped"
:row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)" :row-class-name="
row-key="id" (_, index) => (index % 2 === 1 ? 'table-striped' : null)
:columns="columns" "
:data-source="data" row-key="id"
:loading="loading" :columns="columns"
:pagination="pagination" :data-source="data"
:row-selection="rowSelection" :loading="loading"
:pagination="pagination"
:row-selection="rowSelection"
/> />
</div> </div>
</div> </div>
<div class="contentMain nolimits" v-else>
<div class="limitstext1">
抱歉，您没有关联测评的权限，您可以联系下方管理员开启权限
</div>
<div class="limitstext2">测评工具介绍</div>
<div class="limitsRow">
<div class="limitsRowDrop"></div>
<div class="limitsRowText">
人才发展项目中恰当运用测评手段可以更为精准地定位培训需求，更有针对性地设计培养项目和课程；同时，也能够帮助学员精准认知自身问题，提高在项目中的参与度。
</div>
</div>
<div class="limitsRow" style="margin-top: 10px">
<div class="limitsRowDrop"></div>
<div class="limitsRowText">
BOEU测评部经过多年的额实践，积累了一套覆盖“能力、性格和动力”三大方面的测评工具，可在人才发展项目中选择使用。
</div>
</div>
<div class="tool" v-for="(item, key) in toolList" :key="key">
<div
class="toolName"
:style="{
backgroundColor:
key === 0
? 'rgba(0, 77, 126)'
: key === 1
? 'rgba(184, 0, 0)'
: 'rgba(46, 129, 83)',
}"
>
<div>{{ item.name[0] }}</div>
<div>{{ item.name[1] }}</div>
</div>
<div class="toolEvery1" v-for="(i, k) in item.children" :key="k">
<div
class="toolEveryText1"
:style="{
color:
key === 0
? 'rgba(5,75,120)'
: key === 1
? 'rgba(169,3,3)'
: 'rgba(44,120,79)',
}"
>
{{ i.text1 }}
</div>
<div class="toolEveryText2">{{ i.text2 }}</div>
<div
class="toolEveryText3"
v-if="i.text3"
:style="{
color:
key === 0
? 'rgba(5,75,120)'
: key === 1
? 'rgba(169,3,3)'
: 'rgba(44,120,79)',
}"
>
{{ i.text3 }}
</div>
<div class="toolEveryText4" v-if="i.text4">{{ i.text4 }}</div>
</div>
</div>
<div class="limitsRow">
<div class="limitsRowDrop"></div>
<div class="limitsRowText">
如项目中有测评需求，请您联系BOEU测评部
</div>
</div>
<div class="limitsRow">
<div class="limitsRowDrop"></div>
<div class="limitsRowText">
联系人：王逸（10167304） 联系电话：010-60965646
</div>
</div>
</div>
<div class="main_btns"> <div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="confirm">确定</button> <button class="btn2" @click="confirm">确定</button>
@@ -54,19 +144,83 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue"; import { computed, defineEmits, defineProps, ref, watch } from "vue";
import {useBoeApiPage} from "@/api/request"; import { useBoeApiPage } from "@/api/request";
import {TEST_PAGE} from "@/api/ThirdApi"; import { TEST_PAGE } from "@/api/ThirdApi";
import {message} from "ant-design-vue"; import { message } from "ant-design-vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
const toolList = ref([
{
name: ["能力类", "测验工具"],
children: [
{
text1: "职场准备度测评",
text2: "无工作经验学生",
text3: "职业能力成熟度测评",
text4: "五年以内工龄员工",
},
{
text1: "职业认知能力测评",
text2: "五年内工龄员工",
text3: "商业推荐测评",
text4: "五年内工龄员工",
},
{
text1: "沟通能力测评",
text2: "五年内工龄员工",
text3: "情商测评",
text4: "各层级人员",
},
{
text1: "管理行为自检问卷",
text2: "基/中/高层管理者",
text3: "管理者情境判断测评",
text4: "基/中高层管理者",
},
],
},
{
name: ["性格/风格", "测验工具"],
children: [
{
text1: "PDP性格类型测验",
text2: "各层级人员",
},
{
text1: "RTC综合评估",
text2: "各层级人员",
},
{
text1: "大五职业性格测评",
text2: "各层级人员",
},
{
text1: "领导风格测验",
text2: "各层级人员",
},
],
},
{
name: ["动机/价值观", "测验工具"],
children: [
{
text1: "动机测验（内隐&外显）",
text2: "各层级人员",
},
{
text1: "职业兴趣测验",
text2: "各层级人员",
},
],
},
]);
const props = defineProps({ const props = defineProps({
taskList: [], taskList: [],
evaluationTypeId: String, evaluationTypeId: String,
evaluationTypeName: Number evaluationTypeName: Number,
}) });
const visible = ref(false) const visible = ref(false);
const emit = defineEmits({}) const emit = defineEmits({});
const columns = ref([ const columns = ref([
{ {
@@ -100,50 +254,54 @@ const columns = ref([
align: "center", align: "center",
ellipsis: true, ellipsis: true,
}, },
]) ]);
const store = useStore(); const store = useStore();
const initParams = { const initParams = {
keyword: '', keyword: "",
page: 1, page: 1,
size: 10, size: 10,
user_id: store.state.userInfo.id user_id: store.state.userInfo.id,
// orderAsc: true // orderAsc: true
} };
const params = ref(initParams) const params = ref(initParams);
const rowSelectKeys = ref([]); const rowSelectKeys = ref([]);
const selectsData = ref([]); const selectsData = ref([]);
const taskIndex = ref(-1); const taskIndex = ref(-1);
const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, { const { data, loading, total, fetch } = useBoeApiPage(TEST_PAGE, params.value, {
init: false, init: false,
result: res => { result: (res) => {
let newArr = [] console.log("获取测评", res);
let newArr = [];
for (let i = 0; i < res.result.data.length; i++) { for (let i = 0; i < res.result.data.length; i++) {
res.result.data[i].id = res.result.data[i].quiz_kid; res.result.data[i].id = res.result.data[i].quiz_kid;
newArr.push(res.result.data[i]) newArr.push(res.result.data[i]);
} }
return newArr return newArr;
}, },
totalPage: res => res.result.total_page_num, totalPage: (res) => res.result.total_page_num,
total: res => res.result.count total: (res) => res.result.count,
}) });
console.log(data, 222)
watch(taskIndex, () => { watch(taskIndex, () => {
if (taskIndex.value >= 0) { if (taskIndex.value >= 0) {
rowSelectKeys.value = [props.taskList[taskIndex.value].courseId] rowSelectKeys.value = [props.taskList[taskIndex.value].courseId];
selectsData.value = data.value.find(t => t.id === props.taskList[taskIndex.value].courseId) || {} selectsData.value =
data.value.find(
(t) => t.id === props.taskList[taskIndex.value].courseId
) || {};
} }
}) });
const customRow = (record) => ({ const customRow = (record) => ({
onClick: () => { onClick: () => {
rowSelectKeys.value = [record.id] rowSelectKeys.value = [record.id];
selectsData.value = [record] selectsData.value = [record];
} },
}) });
const pagination = computed(() => ({ const pagination = computed(() => ({
total: total.value, total: total.value,
@@ -155,20 +313,20 @@ const pagination = computed(() => ({
const changePagination = (e) => { const changePagination = (e) => {
params.value.pageIndex = e; params.value.pageIndex = e;
fetch() fetch();
}; };
const rowSelection = computed(() => ({ const rowSelection = computed(() => ({
type: 'radio', type: "radio",
columnWidth: 20, columnWidth: 20,
selectedRowKeys: rowSelectKeys.value, selectedRowKeys: rowSelectKeys.value,
onChange: onSelectChange, onChange: onSelectChange,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
getCheckboxProps: getCheckboxProps getCheckboxProps: getCheckboxProps,
})); }));
const getCheckboxProps = () => ({ const getCheckboxProps = () => ({
// 某几项默认禁止选中(R: 当state等于1时) // 某几项默认禁止选中(R: 当state等于1时)
disabled: false disabled: false,
}) });
function onSelectChange(e, l) { function onSelectChange(e, l) {
rowSelectKeys.value = e; rowSelectKeys.value = e;
@@ -176,28 +334,28 @@ function onSelectChange(e, l) {
} }
function search() { function search() {
params.value.pageIndex = 1 params.value.pageIndex = 1;
fetch() fetch();
} }
function reset() { function reset() {
rowSelectKeys.value = []; rowSelectKeys.value = [];
selectsData.value = []; selectsData.value = [];
params.value.pageIndex = 1 params.value.pageIndex = 1;
params.value.keyWord = '' params.value.keyWord = "";
fetch() fetch();
} }
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false;
taskIndex.value = -1 taskIndex.value = -1;
reset() reset();
}; };
function confirm() { function confirm() {
if (!selectsData.value.length || !rowSelectKeys.value.length) { if (!selectsData.value.length || !rowSelectKeys.value.length) {
message.warning("请选择测评！"); message.warning("请选择测评！");
return return;
} }
// if (taskIndex.value === -1) { // if (taskIndex.value === -1) {
// let list = props.taskList // let list = props.taskList
@@ -220,18 +378,17 @@ function confirm() {
// if(props.taskList!=undefined){ // if(props.taskList!=undefined){
// emit('update:taskList', [...props.taskList]) // emit('update:taskList', [...props.taskList])
// } // }
emit('update:evaluationTypeId', selectsData.value[0].id) emit("update:evaluationTypeId", selectsData.value[0].id);
emit('update:evaluationTypeName', selectsData.value[0].title) emit("update:evaluationTypeName", selectsData.value[0].title);
closeDrawer() closeDrawer();
} }
function openDrawer(i) { function openDrawer(i) {
(i >= 0) && (taskIndex.value = i) i >= 0 && (taskIndex.value = i);
visible.value = true visible.value = true;
} }
defineExpose({openDrawer}) defineExpose({ openDrawer });
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
@@ -417,7 +574,9 @@ defineExpose({openDrawer})
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td { .ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd; background: #f6f9fd;
} }
@@ -431,6 +590,76 @@ defineExpose({openDrawer})
} }
} }
} }
.nolimits {
display: flex;
flex-direction: column;
align-items: center;
.limitstext1 {
margin-top: 30px;
font-size: 23px;
color: #333333;
font-weight: 600;
}
.limitstext2 {
margin-top: 30px;
font-size: 18px;
color: #333333;
font-weight: 800;
}
.limitsRow {
display: flex;
align-items: center;
margin-top: 20px;
width: 100%;
.limitsRowDrop {
width: 8px;
height: 8px;
background-color: #333333;
border-radius: 4px;
margin-left: 20px;
margin-right: 20px;
flex-shrink: 0;
}
.limitsRowText {
display: flex;
flex-wrap: wrap;
font-size: 16px;
color: #333333;
font-weight: 400;
line-height: 28px;
}
}
.tool {
width: 100%;
border-bottom: 1px dashed rgba(0, 78, 126);
display: flex;
margin-top: 30px;
align-items: center;
padding-bottom: 30px;
.toolName {
width: 100px;
height: 100px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #fff;
font-size: 16px;
font-weight: 600;
border-radius: 5px;
margin-left: 20px;
margin-right: 20px;
}
.toolEvery1 {
text-align: center;
font-size: 16px;
color: rgba(71, 74, 76);
margin-right: 12px;
line-height: 26px;
}
}
}
.main_btns { .main_btns {
height: 72px; height: 72px;

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

@@ -645,7 +645,7 @@ export default {
bum: item.userInfoBo.deptName, bum: item.userInfoBo.deptName,
gangw: item.userInfoBo.jobName, gangw: item.userInfoBo.jobName,
group: item.groupName, group: item.groupName,
diploma: "0", diploma: item.allPointsCount,
// operation: "查看", // operation: "查看",
}; };
array.push(obj); array.push(obj);

2
src/components/drawers/router/RouterProjectManage.vue
View File

@@ -377,7 +377,7 @@
onClick={ onClick={
() => { () => {
{/* 当前学员 用来查看学员详情 */} {/* 当前学员 用来查看学员详情 */}
state.routerId = value.record.routerId; state.routerId = value.record.pid;
state.studentId = value.record.studentId; state.studentId = value.record.studentId;
state.CheckStuvisible = true; state.CheckStuvisible = true;
console.log(value); console.log(value);

13
src/components/project/OrgClass.vue
View File

@@ -1,3 +1,11 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-02-23 10:53:15
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-23 21:31:59
* @FilePath: /fe-manage/src/components/project/OrgClass.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template> <template>
<a-tree-select <a-tree-select
:getPopupContainer=" :getPopupContainer="
@@ -27,8 +35,8 @@
</a-tree-select> </a-tree-select>
</template> </template>
<script setup> <script setup>
import {defineEmits, defineProps, ref, watch} from "vue"; import { defineEmits, defineProps, ref, watch } from "vue";
import {boeRequest, useBoeApi} from "@/api/request"; import { boeRequest, useBoeApi } from "@/api/request";
import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi"; import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
const props = defineProps({ const props = defineProps({
@@ -79,6 +87,7 @@ function change(
}, },
} }
) { ) {
console.log("label2222", label, namePath, value);
emit("update:name", label); emit("update:name", label);
emit("update:fullName", namePath); emit("update:fullName", namePath);
emit("update:value", value); emit("update:value", value);

101
src/components/project/OrgClassCheck.vue Normal file
View File

@@ -0,0 +1,101 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-02-23 14:57:21
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-23 20:42:25
* @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="labelValue"
style="width: 440px; min-height: 40px"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择归属组织"
:labelInValue="true"
allow-clear
v-model:treeExpandedKeys="stuTreeExpandedKeys"
:loading="orgLoading"
:load-data="onLoadData"
:tree-data="options"
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
:disabled="disabled"
@change="change"
dropdownClassName="treeDropdown"
multiple
>
</a-tree-select>
</template>
<script setup>
import { defineEmits, defineProps, ref, watch } from "vue";
import { boeRequest, useBoeApi } from "@/api/request";
import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
const props = defineProps({
value: {
type: Array,
default: () => [],
},
name: {
type: Array,
default: () => [],
},
disabled: {
type: Boolean,
default: false,
},
});
const emit = defineEmits({});
const stuTreeExpandedKeys = ref([]);
const labelValue = ref([]);
const { data: options, loading: orgLoading } = useBoeApi(
ORG_LIST,
{ keyword: "" },
{
init: true,
result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
}
);
watch(props, () => {
stuTreeExpandedKeys.value = [];
console.log("labelValue.value", labelValue.value, props.value);
labelValue.value = props.value;
// if (labelValue.value.value !== props.value) {
// labelValue.value = { value: props.value, label: props.name };
// }
// if (labelValue.value.label !== props.name) {
// labelValue.value = { value: props.value, label: props.name };
// }
});
function onLoadData(treeNode) {
return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => {
treeNode.dataRef.treeChildList = r.result.directChildList;
options.value = [...options.value];
}
);
}
function change(e) {
// console.log("label", e, emit);
// let label = [];
// let value = [];
// for (let i = 0; i < e.length; i++) {
// label.push(e[i].label);
// value.push(e[i].value);
// }
// emit("update:name", label);
emit("update:value", e);
}
</script>

1
src/components/student/ChangeGroupModal.vue
View File

@@ -59,6 +59,7 @@ const props = defineProps({
}); });
const option = computed(() => { const option = computed(() => {
debugger
console.log("props.groupList", props.groupList); console.log("props.groupList", props.groupList);
return props.groupList.map((e) => ({ return props.groupList.map((e) => ({
label: e.groupName, label: e.groupName,

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

@@ -378,7 +378,8 @@ const getStu = () => {
studentName: proStudentName.value, studentName: proStudentName.value,
pageNo: procurrentPage.value, pageNo: procurrentPage.value,
pageSize: 10, pageSize: 10,
projectId: props.id, pid: props.id,
type: props.type
}; };
projectListTotal.value = -1; projectListTotal.value = -1;
console.log("获取项目学员", obj); console.log("获取项目学员", obj);
@@ -392,6 +393,7 @@ const getStu = () => {
id: value.id, id: value.id,
realName: value.studentName, realName: value.studentName,
userNo: value.studentId, userNo: value.studentId,
isLeader: value.isLeader,
orgName: value.studentOrgName ? value.studentOrgName : "-", orgName: value.studentOrgName ? value.studentOrgName : "-",
departName: value.studentDepartName ? value.studentDepartName : "-", departName: value.studentDepartName ? value.studentDepartName : "-",
}; };
@@ -758,9 +760,14 @@ const submitAuth = () => {
function handleStageOk() { function handleStageOk() {
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人 // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
if (props.type === 1) { if (props.type === 1) {
if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) { if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值"); 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); let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
if (haveGroupNum.length > 0) { if (haveGroupNum.length > 0) {

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

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

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

@@ -3706,7 +3706,11 @@ export default defineComponent({
handleCancelStu(); handleCancelStu();
rest(); rest();
state.addLoading = false; state.addLoading = false;
}); }).catch(err => {
state.loading = false
console.log(err)
})
state.cstm_hs = false;
}; };
//编辑开课 //编辑开课

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

File diff suppressed because it is too large Load Diff

274
src/views/learningpath/LearningPath.vue
View File

@@ -87,39 +87,77 @@
</div> </div>
<!-- 无数据 --> <!-- 无数据 -->
<!-- 表格 --> <!-- 表格 -->
<div v-if="tableDataTotal" style="padding:10px 35px"> <div v-if="tableDataTotal" 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="tableDataFunc()" :columns="tableDataFunc()"
:data-source="tableData" :data-source="tableData"
:loading="tableLoading" :loading="tableLoading"
@expand="expandTable" @expand="expandTable"
:scroll="{x:'max-content'}" :scroll="{ x: 'max-content' }"
:pagination="false" :pagination="false"
> >
<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 v-if="record.state==='草稿' && checkPer(record.permissions)" @click="showPub(record)" type="link">发布</a-button> <a-button
<a-button v-if="record.state==='草稿' && checkPer(record.permissions)" @click="getLearnPathInfo(record.id)" type="link">编辑</a-button> v-if="record.state === '草稿' && checkPer(record.permissions)"
<a-button v-if="record.state==='已发布' && checkPer(record.permissions)" @click="getLearnPathInfo(record.id)" type="link">编辑</a-button> @click="showPub(record)"
<a-button @click="manage(record.id)" type="link">管理</a-button> type="link"
<DropDown v-if="checkPer(record.permissions)" value="授权"> >发布</a-button
<OwnerTableModelStudent :types="[7,8,9]" :id="record.id" :type="9">权限名单</OwnerTableModelStudent> >
<CommonStudent :type="7" :id="record.id" title="查看权">查看权</CommonStudent> <a-button
<CommonStudent :type="8" :id="record.id" title="管理权">管理权</CommonStudent> v-if="record.state === '草稿' && checkPer(record.permissions)"
</DropDown> @click="getLearnPathInfo(record.id)"
<DropDown v-if="checkPer(record.permissions)" value="更多"> type="link"
<a-button @click="showCopyModal(record.id)" type="link">复制</a-button> >编辑</a-button
<a-button @click="showDeleteModal(record.id)" type="link" danger>删除</a-button> >
<a-button v-if="record.state==='已发布'" @click="showBackModal(record.id)" type="link">撤回</a-button> <a-button
<a-button v-if="record.state==='已发布'" @click="showStopModal(record.id)" type="link">结束</a-button> v-if="record.state === '已发布' && checkPer(record.permissions)"
</DropDown> @click="getLearnPathInfo(record.id)"
<!-- <a-button v-if="record.state==='已结束'" @click="showStartModal(record.id)" type="link">启用</a-button> --> type="link"
</a-space> >编辑</a-button
>
<a-button @click="manage(record.id)" type="link">管理</a-button>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<OwnerTableModelStudent
:types="[7, 8, 9]"
:id="record.id"
:type="9"
>权限名单</OwnerTableModelStudent
>
<CommonStudent :type="7" :id="record.id" title="查看权"
>查看权</CommonStudent
>
<CommonStudent :type="8" :id="record.id" title="管理权"
>管理权</CommonStudent
>
</DropDown>
<DropDown v-if="checkPer(record.permissions)" value="更多">
<a-button @click="showCopyModal(record.id)" type="link"
>复制</a-button
>
<a-button @click="showDeleteModal(record.id)" type="link" danger
>删除</a-button
>
<a-button
v-if="record.state === '已发布'"
@click="showBackModal(record.id)"
type="link"
>撤回</a-button
>
<a-button
v-if="record.state === '已发布'"
@click="showStopModal(record.id)"
type="link"
>结束</a-button
>
</DropDown>
<!-- <a-button v-if="record.state==='已结束'" @click="showStartModal(record.id)" type="link">启用</a-button> -->
</a-space>
</template>
</template> </template>
</template>
</a-table> </a-table>
</div> </div>
<div class="tableBox"> <div class="tableBox">
@@ -244,7 +282,12 @@
</div> </div>
<div class="btn"> <div class="btn">
<button class="samtn btn1" @click="handleOut">取消</button> <button class="samtn btn1" @click="handleOut">取消</button>
<a-button class="samtn btn2" @click="createLearnPath" :loading="confirmLoading">确定</a-button> <a-button
class="samtn btn2"
@click="createLearnPath"
:loading="confirmLoading"
>确定</a-button
>
</div> </div>
<div <div
@@ -344,7 +387,7 @@
? '2px solid rgba(78, 166, 255, 1)' ? '2px solid rgba(78, 166, 255, 1)'
: '1px solid #ccc', : '1px solid #ccc',
'background-image': 'url(' + item.value.split(',')[0] + ')', 'background-image': 'url(' + item.value.split(',')[0] + ')',
display: index >= 5 ? 'none' : 'flex', display: index >= 3 ? 'none' : 'flex',
}" }"
style="background-size: 100% 100%" style="background-size: 100% 100%"
> >
@@ -368,7 +411,12 @@
</div> </div>
<div class="btn"> <div class="btn">
<button class="samtn btn1" @click="handleOut1">取消</button> <button class="samtn btn1" @click="handleOut1">取消</button>
<a-button class="samtn btn2" @click="editLearnPath" :loading="confirmLoading">确定</a-button> <a-button
class="samtn btn2"
@click="editLearnPath"
:loading="confirmLoading"
>确定</a-button
>
</div> </div>
</div> </div>
</div> </div>
@@ -390,7 +438,9 @@
height: 68px; height: 68px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;"> justify-content: space-between;
"
>
<div class="headerLeft" style="margin-left: 32px"> <div class="headerLeft" style="margin-left: 32px">
<span style="width: 15px; height: 15px" <span style="width: 15px; height: 15px"
><img src="../../assets/images/taskpage/pub.png" ><img src="../../assets/images/taskpage/pub.png"
@@ -702,7 +752,7 @@ import OrgClass from "@/components/project/OrgClass";
import NameInput from "@/components/project/NameInput"; import NameInput from "@/components/project/NameInput";
import { validateName } from "@/api/index1"; import { validateName } from "@/api/index1";
import DropDown from "@/components/common/DropDown"; import DropDown from "@/components/common/DropDown";
import {checkPer} from "@/utils/utils"; import { checkPer } from "@/utils/utils";
export default { export default {
name: "learningPath", name: "learningPath",
@@ -720,9 +770,9 @@ export default {
setup() { setup() {
const store = useStore(); const store = useStore();
const router = useRouter(); const router = useRouter();
const userInfo = computed(()=>store.state.userInfo) const userInfo = computed(() => store.state.userInfo);
const state = reactive({ const state = reactive({
confirmLoading:false, confirmLoading: false,
tableLoading: false, tableLoading: false,
out: false, out: false,
out1: false, out1: false,
@@ -857,7 +907,7 @@ export default {
state.pathIntro = ""; state.pathIntro = "";
state.out = !state.out; state.out = !state.out;
if (userInfo.value.departId && userInfo.value.departName) { if (userInfo.value.departId && userInfo.value.departName) {
state.organizationSelectName =userInfo.value.departName; state.organizationSelectName = userInfo.value.departName;
state.organizationSelectId = userInfo.value.departId; state.organizationSelectId = userInfo.value.departId;
} }
}; };
@@ -874,14 +924,14 @@ export default {
const chooseImg = (item) => { const chooseImg = (item) => {
console.log(item); console.log(item);
state.pathBgId = item.code; state.pathBgId = item.code;
state.pathBg = item.value.split(',')[0]; state.pathBg = item.value.split(",")[0];
state.mobilePicUrl = item.value.split(',')[1]; state.mobilePicUrl = item.value.split(",")[1];
}; };
const chooseImg2 = (item) => { const chooseImg2 = (item) => {
// console.log(item); // console.log(item);
state.pathBgId = item.code; state.pathBgId = item.code;
state.pathBg = item.value.split(',')[0]; state.pathBg = item.value.split(",")[0];
state.mobilePicUrl = item.value.split(',')[1]; state.mobilePicUrl = item.value.split(",")[1];
}; };
//发布弹窗 //发布弹窗
const showPub = (router) => { const showPub = (router) => {
@@ -961,10 +1011,14 @@ export default {
const copyLearnPath = () => { const copyLearnPath = () => {
state.copyModal = false; state.copyModal = false;
state.tableLoading = true; state.tableLoading = true;
api.handleLearnPath({ api
routerId: state.copyPathId, .handleLearnPath({
type: 2, routerId: state.copyPathId,
}).then(() => {getLearnPath();}) type: 2,
})
.then(() => {
getLearnPath();
});
message.success("复制成功"); message.success("复制成功");
}; };
@@ -1158,30 +1212,30 @@ export default {
}; };
//创建学习路径图 //创建学习路径图
const createLearnPath = async () => { const createLearnPath = async () => {
state.confirmLoading = true state.confirmLoading = true;
if (!state.pathName) { if (!state.pathName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请输入路径图名称"); return message.warning("请输入路径图名称");
} }
if (!state.organizationSelectName) { if (!state.organizationSelectName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请选择归属组织"); return message.warning("请选择归属组织");
} }
if (!state.pathBg) { if (!state.pathBg) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请选择背景图"); return message.warning("请选择背景图");
} }
if (!state.mobilePicUrl) { if (!state.mobilePicUrl) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("未配置H5背景图，请联系管理员！"); return message.warning("未配置H5背景图，请联系管理员！");
} }
if (!state.validate) { if (!state.validate) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
message.warning("路径图名称重复"); message.warning("路径图名称重复");
return; return;
} }
@@ -1194,23 +1248,25 @@ export default {
}); });
if (offName) { if (offName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("项目名称重复，请重新填写"); return message.warning("项目名称重复，请重新填写");
} }
api.createLearnPath({ api
name: state.pathName, .createLearnPath({
remark: state.pathIntro, name: state.pathName,
status: 0, remark: state.pathIntro,
organizationId: state.organizationSelectId, status: 0,
organizationName: state.organizationSelectName, organizationId: state.organizationSelectId,
picUrl: state.pathBg, organizationName: state.organizationSelectName,
mobilePicUrl: state.mobilePicUrl, picUrl: state.pathBg,
}).then(id => { mobilePicUrl: state.mobilePicUrl,
message.destroy();
state.confirmLoading = false
message.success("创建成功");
router.push( {path: "/leveladd",query:{routerId: id.data.data }})
}) })
.then((id) => {
message.destroy();
state.confirmLoading = false;
message.success("创建成功");
router.push({ path: "/leveladd", query: { routerId: id.data.data } });
});
}; };
//获取学习路径列表 //获取学习路径列表
@@ -1260,35 +1316,39 @@ export default {
state.deleteModal = false; state.deleteModal = false;
state.tableLoading = true; state.tableLoading = true;
message.success("删除成功"); message.success("删除成功");
api.handleLearnPath({routerId: state.deletePathId, type: -2}).then(() => {getLearnPath()}) api
.handleLearnPath({ routerId: state.deletePathId, type: -2 })
.then(() => {
getLearnPath();
});
}; };
//编辑学习路径图 //编辑学习路径图
const editLearnPath = async () => { const editLearnPath = async () => {
state.confirmLoading = true state.confirmLoading = true;
if (!state.pathName) { if (!state.pathName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请输入路径图名称"); return message.warning("请输入路径图名称");
} }
if (!state.organizationSelectName) { if (!state.organizationSelectName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请选择归属组织"); return message.warning("请选择归属组织");
} }
if (!state.pathBgId) { if (!state.pathBgId) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("请选择背景图"); return message.warning("请选择背景图");
} }
if (!state.mobilePicUrl) { if (!state.mobilePicUrl) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("未配置H5背景图，请联系管理员！"); return message.warning("未配置H5背景图，请联系管理员！");
} }
if (!state.validate) { if (!state.validate) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("路径图名称重复"); return message.warning("路径图名称重复");
} }
// state.pathName = detail.name; // state.pathName = detail.name;
@@ -1308,11 +1368,11 @@ export default {
}); });
if (offName) { if (offName) {
message.destroy(); message.destroy();
state.confirmLoading = false state.confirmLoading = false;
return message.warning("项目名称重复，请重新填写"); return message.warning("项目名称重复，请重新填写");
} }
state.out1 = false; state.out1 = false;
state.confirmLoading = false state.confirmLoading = false;
message.success("修改成功"); message.success("修改成功");
state.tableLoading = true; state.tableLoading = true;
let obj = { let obj = {
@@ -1325,7 +1385,9 @@ export default {
organizationId: state.organizationSelectId, organizationId: state.organizationSelectId,
status: 0, status: 0,
}; };
api.createLearnPath(obj).then(() => {getLearnPath()}) api.createLearnPath(obj).then(() => {
getLearnPath();
});
}; };
//选择状态 //选择状态
const selectStatusClassify = (e, v) => { const selectStatusClassify = (e, v) => {
@@ -1452,10 +1514,10 @@ export default {
); );
function manage(id) { function manage(id) {
// TODO 为了点击顶部面包屑导航返回而存储 // TODO 为了点击顶部面包屑导航返回而存储
localStorage.setItem('routerId',id) localStorage.setItem("routerId", id);
router.push({ router.push({
path: "/leveladd", path: "/leveladd",
query:{routerId:id} query: { routerId: id },
}); });
} }
@@ -1463,38 +1525,40 @@ export default {
// console.log("编辑学习路径图id", id); // console.log("编辑学习路径图id", id);
//获取学习路径详情 //获取学习路径详情
api api
.getRouterDetail(id,"draft") .getRouterDetail(id, "draft")
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
console.log("获取学习路径详情成功", res.data.data); console.log("获取学习路径详情成功", res.data.data);
let detail = res.data.data.routerInfo; let detail = res.data.data.routerInfo;
state.pathName = detail.name; state.pathName = detail.name;
state.pathBg = detail.picUrl; state.pathBg = detail.picUrl;
state.mobilePicUrl = detail.mobilePicUrl; state.mobilePicUrl = detail.mobilePicUrl;
state.pathBgId = ""; state.pathBgId = "";
state.organizationSelectName = detail.organizationName; state.organizationSelectName = detail.organizationName;
state.organizationSelectId = detail.organizationId; state.organizationSelectId = detail.organizationId;
state.pathIntro = detail.remark; state.pathIntro = detail.remark;
state.editPathId = id; state.editPathId = id;
const imgDict = imgData.value.find((img)=>img.value.split(',')[0] === state.pathBg) const imgDict = imgData.value.find(
if(imgDict){ (img) => img.value.split(",")[0] === state.pathBg
state.pathBgId = imgDict.code; );
state.pathBg = imgDict.value.split(',')[0]; if (imgDict) {
state.mobilePicUrl = imgDict.value.split(',')[1]; state.pathBgId = imgDict.code;
} state.pathBg = imgDict.value.split(",")[0];
state.mobilePicUrl = imgDict.value.split(",")[1];
//for (let i = 0; i < arr.length; i++) {
// console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
// if (arr[i].dictValue === state.pathBg) {
// state.pathBgId = arr[i].dictCode;
// }
// }
} }
})
.catch((err) => { //for (let i = 0; i < arr.length; i++) {
console.log("获取详情失败", err); // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
}); // if (arr[i].dictValue === state.pathBg) {
// state.pathBgId = arr[i].dictCode;
// }
// }
}
})
.catch((err) => {
console.log("获取详情失败", err);
});
state.out1 = true; state.out1 = true;
}; };
@@ -1541,7 +1605,7 @@ export default {
showLearnBgMore, showLearnBgMore,
closeLearnBgMore, closeLearnBgMore,
checkPer, checkPer,
getLearnPathInfo getLearnPathInfo,
}; };
}, },
}; };

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

File diff suppressed because it is too large Load Diff

123
src/views/research/ManagePage.vue
View File

@@ -6,12 +6,12 @@
<!-- 2022-11-30注释 后面放开 新增display: flex; justify-content: space-between 评估管理的div更改位置--> <!-- 2022-11-30注释 后面放开 新增display: flex; justify-content: space-between 评估管理的div更改位置-->
<div style="width: 100%; display: flex; justify-content: space-between"> <div style="width: 100%; display: flex; justify-content: space-between">
<!-- 2022-11-30注释 后面放开 --> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="export"> <!-- <div class="export">
<img src="../../assets/images/research/export.png" /> <img src="../../assets/images/research/export.png" />
<span style="color: #4ea6ff; font-size: 14px; margin-left: 3px"> <span style="color: #4ea6ff; font-size: 14px; margin-left: 3px">
导出信息 导出信息
</span> </span>
</div> --> </div> -->
<div class="text">评估管理</div> <div class="text">评估管理</div>
<router-link to="/researchmanage" class="goback"> <router-link to="/researchmanage" class="goback">
<span class="return"></span> <span class="return"></span>
@@ -27,23 +27,24 @@
<div class="messagebox"> <div class="messagebox">
<div style="width: 186px; margin-right: 126px; float: left"> <div style="width: 186px; margin-right: 126px; float: left">
<span class="name">评估名称:</span> <span class="name">评估名称:</span>
<span class="descript">{{basicInfo.assessmentName}}</span> <span class="descript">{{ basicInfo.assessmentName }}</span>
</div> </div>
<div style="width: 103px; margin-right: 126px; float: left"> <div style="width: 103px; margin-right: 126px; float: left">
<span class="name">创建人:</span> <span class="name">创建人:</span>
<span class="descript">{{basicInfo.createName}}</span> <span class="descript">{{ basicInfo.createName }}</span>
</div> </div>
<div style="width: 88px; margin-right: 126px; float: left"> <div style="width: 88px; margin-right: 126px; float: left">
<span class="name">状态:</span> <span class="name">状态:</span>
<span class="descript">{{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}}</span> <span
class="descript">{{ basicInfo.releaseStatus ? basicInfo.releaseStatus == 1 ? "待发布" : basicInfo.releaseStatus == 2 ? "已发布" : "已结束" : '' }}</span>
</div> </div>
<div style="width: 192px; margin-right: 126px; float: left"> <div style="width: 192px; margin-right: 126px; float: left">
<span class="name">创建时间:</span> <span class="name">创建时间:</span>
<span class="descript">{{basicInfo.createTime}}</span> <span class="descript">{{ basicInfo.createTime }}</span>
</div> </div>
<div style="width: 192px; margin-right: 126px; float: left"> <div style="width: 192px; margin-right: 126px; float: left">
<span class="name">发布时间:</span> <span class="name">发布时间:</span>
<span class="descript">{{basicInfo.releaseTime}}</span> <span class="descript">{{ basicInfo.releaseTime }}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -59,36 +60,22 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="tableBox"> <div class="tableBox">
<a-table <a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="evalStuListData"
style="border: 1px solid #f2f6fe" :loading="evalStuListLoading" expandRowByClick="true" :scroll="{ x: 1500 }" @expand="expandTable"
:columns="columns" :pagination="false" />
:data-source="evalStuListData"
:loading="evalStuListLoading"
expandRowByClick="true"
:scroll="{ x: 1500 }"
@expand="expandTable"
:pagination="false"
/>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<!-- 分页 --> <!-- 分页 -->
<div style="width:100%;display:flex;justify-content:center;align-items:center;"> <div style="width:100%;display:flex;justify-content:center;align-items:center;">
<a-pagination <a-pagination v-if="evalStuListDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
v-if="evalStuListDataTotal > 10" hideOnSinglePage="true" :pageSize="pageSize" :current="evalCurrentPage" :total="evalStuListDataTotal"
:showSizeChanger="false" class="pagination" @change="changePaginationStu" />
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="evalCurrentPage"
:total="evalStuListDataTotal"
class="pagination"
@change="changePaginationStu"
/>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
</div> </div>
</div> </div>
<view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName" :basicdata="basicInfo"/> <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName"
:basicdata="basicInfo" />
</template> </template>
<script> <script>
@@ -105,7 +92,7 @@ export default {
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
Assessvisible: false, Assessvisible: false,
basicInfo: "" , basicInfo: "",
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
tableDataTotalLoading: true, tableDataTotalLoading: true,
@@ -113,21 +100,21 @@ export default {
tableDataTotal: 0, tableDataTotal: 0,
evalDataSource: "", evalDataSource: "",
evalStuListData: [], evalStuListData: [],
evalStuListLoading:true, evalStuListLoading: true,
evalStuListDataTotal:0, evalStuListDataTotal: 0,
evalCurrentPage:1 evalCurrentPage: 1
}); });
const getInfoDate = async () => { const getInfoDate = async () => {
state.tableDataTotalLoading = true; state.tableDataTotalLoading = true;
await queryAssessmentDetailList({ await queryAssessmentDetailList({
assessmentId: router.currentRoute.value.params.id, assessmentId: router.currentRoute.value.params.id,
}).then(res=>{ }).then(res => {
console.log('获取评估信息', res); console.log('获取评估信息', res);
if(res.data.code==200){ if (res.data.code == 200) {
state.basicInfo = res.data.data; state.basicInfo = res.data.data;
} }
}).catch(err=>{ }).catch(err => {
console.log(err) console.log(err)
}); });
@@ -137,16 +124,16 @@ export default {
"assessmentId": router.currentRoute.value.params.id, "assessmentId": router.currentRoute.value.params.id,
"pageNo": state.evalCurrentPage, "pageNo": state.evalCurrentPage,
"pageSize": state.pageSize "pageSize": state.pageSize
}).then(res=>{ }).then(res => {
console.log('获取学员信息',res) console.log('获取学员信息', res)
// evalStuListDataTotal evalCurrentPage // evalStuListDataTotal evalCurrentPage
state.evalStuListLoading = false; state.evalStuListLoading = false;
if(res.data.code==200){ if (res.data.code == 200) {
state.evalStuListDataTotal = res.data.data.total; state.evalStuListDataTotal = res.data.data.total;
state.evalStuListData = res.data.data.rows; state.evalStuListData = res.data.data.rows;
state.evalStuListLoading = false; state.evalStuListLoading = false;
} }
}).catch(err=>{ }).catch(err => {
console.log(err) console.log(err)
state.evalStuListLoading = false; state.evalStuListLoading = false;
}) })
@@ -156,7 +143,7 @@ export default {
// 导出学员信息 // 导出学员信息
function exportStudentInfo() { function exportStudentInfo() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${router.currentRoute.value.params.id}`)
} }
//分页 //分页
@@ -228,7 +215,7 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.studentCode?text.record.studentCode:"-"}</span> <span> {text.record.studentCode ? text.record.studentCode : "-"}</span>
</div> </div>
); );
}, },
@@ -241,7 +228,7 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span> <span> {text.record.studentName ? text.record.studentName : "-"}</span>
</div> </div>
); );
}, },
@@ -254,25 +241,25 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span> <span> {text.record.studentDepartName ? text.record.studentDepartName : "-"}</span>
</div> </div>
); );
}, },
}, },
{ {
width: 50, width: 50,
title: "岗位", title: "岗位",
dataIndex: "studentJobName", dataIndex: "studentJobName",
key: "studentJobName", key: "studentJobName",
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span> <span> {text.record.studentJobName ? text.record.studentJobName : "-"}</span>
</div> </div>
); );
}, },
}, },
{ {
title: "数据来源", title: "数据来源",
width: 50, width: 50,
dataIndex: "source", dataIndex: "source",
@@ -280,7 +267,7 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.source?text.record.source:"-"}</span> <span> {text.record.source ? text.record.source : "-"}</span>
</div> </div>
); );
}, },
@@ -305,7 +292,7 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.submitTime?text.record.submitTime:"-"}</span> <span> {text.record.submitTime ? text.record.submitTime : "-"}</span>
</div> </div>
); );
}, },
@@ -347,10 +334,12 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.up { .up {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -359,6 +348,7 @@ export default {
align-items: center; align-items: center;
padding-right: 38px; padding-right: 38px;
border-bottom: 1px solid #f2f6fc; border-bottom: 1px solid #f2f6fc;
.text { .text {
font-size: 16px; font-size: 16px;
color: #363636; color: #363636;
@@ -366,6 +356,7 @@ export default {
margin-left: 38px; margin-left: 38px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.export { .export {
float: left; float: left;
width: 130px; width: 130px;
@@ -377,11 +368,13 @@ export default {
text-align: center; text-align: center;
padding-top: 7px; padding-top: 7px;
} }
.goback { .goback {
float: right; float: right;
padding-right: 70px; padding-right: 70px;
//padding-top: 37px; //padding-top: 37px;
position: relative; position: relative;
.return { .return {
display: inline-block; display: inline-block;
width: 42px; width: 42px;
@@ -390,6 +383,7 @@ export default {
margin-right: 10px; margin-right: 10px;
background-image: url("../../assets/images/projectadd/return.png"); background-image: url("../../assets/images/projectadd/return.png");
} }
.returntext { .returntext {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@@ -399,10 +393,12 @@ export default {
} }
} }
} }
.message { .message {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.title { .title {
color: #4f5156; color: #4f5156;
font-size: 14px; font-size: 14px;
@@ -410,16 +406,19 @@ export default {
margin-top: 20px; margin-top: 20px;
font-weight: 500; font-weight: 500;
} }
.messagebox { .messagebox {
//width: 100%; //width: 100%;
//display: flex; //display: flex;
margin-top: 20px; margin-top: 20px;
margin-left: 38px; margin-left: 38px;
margin-bottom: 20px; margin-bottom: 20px;
.name { .name {
color: #999ba3; color: #999ba3;
font-size: 14px; font-size: 14px;
} }
.descript { .descript {
color: #4f5156; color: #4f5156;
font-size: 14px; font-size: 14px;
@@ -427,32 +426,37 @@ export default {
} }
} }
} }
.split { .split {
width: 100%; width: 100%;
height: 20px; height: 20px;
background-color: #edf0f5; background-color: #edf0f5;
} }
.down { .down {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.tableBox { .tableBox {
margin: 20px 38px 30px; margin: 20px 38px 30px;
.opacationn { .opacationn {
color: #4ea6ff; color: #4ea6ff;
cursor: pointer; cursor: pointer;
} }
th.ant-table-cell { th.ant-table-cell {
background-color: #eff4fc !important; background-color: #eff4fc !important;
text-align: center; text-align: center;
color: #999ba3; color: #999ba3;
} }
td.ant-table-cell { td.ant-table-cell {
text-align: center; text-align: center;
} }
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
> td {
background: #f6f9fd; background: #f6f9fd;
} }
} }
@@ -496,5 +500,4 @@ export default {
color: #4ea6ff; color: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
} }
} }</style>
</style>

1
vue.config.js
View File

@@ -16,6 +16,7 @@ module.exports = defineConfig({
proxy: { proxy: {
"/manageApi": { "/manageApi": {
target: 'http:' + process.env.VUE_APP_PROXY_URL, target: 'http:' + process.env.VUE_APP_PROXY_URL,
// target: 'http://localhost:30001',
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
pathRewrite: { pathRewrite: {
"^/manageApi": "", "^/manageApi": "",