mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-22 17:26:46 +08:00
feat:合并
This commit is contained in:
lixg
@@ -80,6 +80,7 @@ export const delStudent = (obj) =>
|
||||
|
||||
// 获取学员路径图进度明细
|
||||
export const stuProgress = (params) => http.get('/admin/router/detail', { params });
|
||||
export const stuRouterProgress = (params) => http.get('/admin/router/stuDetail', { params });
|
||||
// export const stuProgress = (obj) =>http.post("/admin/router/studentProcess", obj);
|
||||
|
||||
//编辑学习路径基本信息
|
||||
@@ -219,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 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" } })
|
||||
//分组
|
||||
|
||||
@@ -27,7 +27,9 @@ export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroup
|
||||
//查看学员
|
||||
// export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
|
||||
export const studentProcess = (obj) => http.get('/admin/project/detail', { params: obj })
|
||||
export const studentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
|
||||
export const projectStudentProcess = (obj) => http.get('/admin/project/stuDetail', { params: obj })
|
||||
export const projectStudentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
|
||||
export const routerStudentRank = (obj) => http.get('/admin/router/studentRank', { params: obj })
|
||||
|
||||
//是否优秀学员
|
||||
export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
|
||||
|
||||
@@ -386,6 +386,7 @@ function openDrawer(i, row) {
|
||||
console.log(i, row)
|
||||
row && (formData.value = { ...row.info });
|
||||
row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
|
||||
row && (imageUrl.value = row.info.liveCover);
|
||||
i >= 0 && (taskIndex.value = i);
|
||||
visible.value = true;
|
||||
}
|
||||
|
||||
@@ -2,46 +2,21 @@
|
||||
<div @click="openDrawer">
|
||||
<slot></slot>
|
||||
</div>
|
||||
<a-drawer
|
||||
:visible="visible"
|
||||
class="drawerStyle addtestDrawer"
|
||||
width="800"
|
||||
placement="right"
|
||||
>
|
||||
<a-drawer :visible="visible" class="drawerStyle addtestDrawer" width="800" placement="right">
|
||||
<div class="drawerMain">
|
||||
<div class="header">
|
||||
<div class="headerTitle">
|
||||
{{ taskIndex >= 0 ? "编辑" : "添加" }}考试
|
||||
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}考试</div>
|
||||
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
|
||||
@click="closeDrawer" />
|
||||
</div>
|
||||
<img
|
||||
style="width: 29px; height: 29px; cursor: pointer"
|
||||
src="../../assets/images/basicinfo/close.png"
|
||||
@click="closeDrawer"
|
||||
/>
|
||||
</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>
|
||||
<button
|
||||
style="width: 100px; cursor: pointer"
|
||||
@click="changeOuter(1)"
|
||||
:class="formData.examType === 1 ? 'outer' : 'notOuter'"
|
||||
>
|
||||
<button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
|
||||
:class="formData.examType === 1 ? 'outer' : 'notOuter'">
|
||||
系统考试
|
||||
</button>
|
||||
<button
|
||||
:disabled="taskIndex >= 0"
|
||||
style="width: 100px; cursor: pointer"
|
||||
@click="changeOuter(2)"
|
||||
:class="formData.examType === 2 ? 'outer' : 'notOuter'"
|
||||
>
|
||||
<button :disabled="taskIndex >= 0" style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
|
||||
:class="formData.examType === 2 ? 'outer' : 'notOuter'">
|
||||
外部考试
|
||||
</button>
|
||||
</div>
|
||||
@@ -52,58 +27,33 @@
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">考试名称：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-input
|
||||
v-model:value="formData.examinationName"
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入考试名称"
|
||||
:maxlength="20"
|
||||
:disabled="taskIndex >= 0"
|
||||
/>
|
||||
<a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入考试名称" :maxlength="20" :disabled="taskIndex >= 0" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">选择试卷：</span>
|
||||
</div>
|
||||
<s-test
|
||||
v-model:id="formData.examinationPaperId"
|
||||
v-model:name="formData.examinationTestName"
|
||||
>
|
||||
<s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
|
||||
<div class="btnbox">
|
||||
<button
|
||||
class="xkbtn"
|
||||
style="margin: 0"
|
||||
:disabled="taskIndex >= 0"
|
||||
>
|
||||
<button class="xkbtn" style="margin:0" :disabled="taskIndex >= 0">
|
||||
{{ formData.examinationPaperId ? "重选" : "选择" }}试卷
|
||||
</button>
|
||||
</div>
|
||||
</s-test>
|
||||
<div v-if="formData.examinationPaperId">
|
||||
<a-tag
|
||||
closable
|
||||
color="processing"
|
||||
@close="delTag"
|
||||
:closeIcon="true"
|
||||
>
|
||||
<span style="font-size: 14px; line-height: 33px">{{
|
||||
formData.examinationTestName
|
||||
}}</span>
|
||||
<a-tag closable color="processing" @close="delTag" :closeIcon="true">
|
||||
<span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
|
||||
</a-tag>
|
||||
</div>
|
||||
</div>
|
||||
@@ -111,65 +61,40 @@
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">考试时间：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-range-picker
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
:show-time="{ format: 'hh:mm' }"
|
||||
:disabled-date="disabledDate"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
valueFormat="YYYY-MM-DD HH:mm"
|
||||
v-model:value="dateTime"
|
||||
@change="timeChange"
|
||||
:placeholder="[' 开始时间', ' 结束时间']"
|
||||
/>
|
||||
<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'hh:mm' }"
|
||||
: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 class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">考试时长：</span>
|
||||
</div>
|
||||
<div class="select">
|
||||
<a-input-number
|
||||
:disabled="taskIndex >= 0"
|
||||
:min="0"
|
||||
:max="300"
|
||||
:precision="0"
|
||||
<a-input-number :disabled="taskIndex >= 0" :min="0" :max="300" :precision="0"
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
v-model:value="formData.examinationDuration"
|
||||
></a-input-number>
|
||||
v-model:value="formData.examinationDuration"></a-input-number>
|
||||
<span style="color: #999999; margin-left: 8px">分钟</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">及格线：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-input
|
||||
:disabled="taskIndex >= 0"
|
||||
v-model:value="formData.passLine"
|
||||
type="number"
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
/>
|
||||
<a-input :disabled="taskIndex >= 0" v-model:value="formData.passLine" type="number"
|
||||
style="width: 400px; height: 40px; border-radius: 8px" />
|
||||
|
||||
<span style="color: #999999; margin-left: 8px">分</span>
|
||||
</div>
|
||||
@@ -179,43 +104,24 @@
|
||||
<span style="margin-right: 3px">考试说明：</span>
|
||||
</div>
|
||||
<div class="textarea">
|
||||
<a-textarea
|
||||
:disabled="taskIndex >= 0"
|
||||
v-model:value="formData.examinationExplain"
|
||||
placeholder="请输入考试说明"
|
||||
allow-clear
|
||||
show-count
|
||||
:maxlength="200"
|
||||
:rows="6"
|
||||
/>
|
||||
<a-textarea :disabled="taskIndex >= 0" v-model:value="formData.examinationExplain" placeholder="请输入考试说明"
|
||||
allow-clear show-count :maxlength="200" :rows="6" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="main_item2">
|
||||
<div class="signbox">
|
||||
<span style="margin-right: 3px; margin-top: 10px"
|
||||
>考试限制：</span
|
||||
>
|
||||
<span style="margin-right: 3px;margin-top: 10px;">考试限制：</span>
|
||||
</div>
|
||||
<div class="kqszbox">
|
||||
<div class="setbox">
|
||||
<div class="timerbox">
|
||||
<span>允许重复考试：</span>
|
||||
<a-input-number
|
||||
:disabled="taskIndex >= 0"
|
||||
:min="-1"
|
||||
:max="300"
|
||||
:precision="0"
|
||||
style="
|
||||
<a-input-number :disabled="taskIndex >= 0" :min="-1" :max="300" :precision="0" style="
|
||||
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
|
||||
>
|
||||
overflow: hidden;" v-model:value="formData.examinationLimit"></a-input-number>
|
||||
<span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -226,11 +132,7 @@
|
||||
<span style="margin-right: 3px">显示答案：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-radio-group
|
||||
:disabled="taskIndex >= 0"
|
||||
style="margin-right: 12px"
|
||||
v-model:value="formData.showAnswers"
|
||||
>
|
||||
<a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnswers">
|
||||
<a-radio :value="1">允许查看</a-radio>
|
||||
<a-radio :value="2">不允许查看</a-radio>
|
||||
</a-radio-group>
|
||||
@@ -241,11 +143,7 @@
|
||||
<span style="margin-right: 3px">显示解析：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-radio-group
|
||||
:disabled="taskIndex >= 0"
|
||||
style="margin-right: 12px"
|
||||
v-model:value="formData.showAnalysis"
|
||||
>
|
||||
<a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnalysis">
|
||||
<a-radio :value="1">允许查看</a-radio>
|
||||
<a-radio :value="2">不允许查看</a-radio>
|
||||
</a-radio-group>
|
||||
@@ -256,27 +154,21 @@
|
||||
<span style="margin-right: 3px">评分模式：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-radio-group
|
||||
:disabled="taskIndex >= 0"
|
||||
style="margin-right: 12px"
|
||||
v-model:value="formData.scoringModel"
|
||||
>
|
||||
<a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.scoringModel">
|
||||
<a-radio :value="1">最高一次</a-radio>
|
||||
<a-radio :value="2">最后一次</a-radio>
|
||||
</a-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<span style="margin-right: 3px">试题排列：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-radio-group
|
||||
:disabled="taskIndex >= 0"
|
||||
style="margin-right: 12px"
|
||||
v-model:value="formData.questionArrangement"
|
||||
>
|
||||
<a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px"
|
||||
v-model:value="formData.questionArrangement">
|
||||
<a-radio :value="1">试题乱序</a-radio>
|
||||
<a-radio :value="2">选项乱序</a-radio>
|
||||
<a-radio :value="3">全部乱序</a-radio>
|
||||
@@ -284,7 +176,7 @@
|
||||
</a-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main_item" style="height: 20px"></div>
|
||||
<div class="main_item" style="height: 20px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="contentMain">
|
||||
@@ -292,39 +184,25 @@
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">考试名称：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-input
|
||||
v-model:value="formData.examinationName"
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入考试名称"
|
||||
:maxlength="20"
|
||||
/>
|
||||
<a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入考试名称" :maxlength="20" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="main_item">
|
||||
<div class="signbox">
|
||||
<div class="sign">
|
||||
<img
|
||||
src="@/assets/images/coursewareManage/asterisk.png"
|
||||
alt=""
|
||||
/>
|
||||
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
|
||||
</div>
|
||||
<span style="margin-right: 3px">数据来源：</span>
|
||||
</div>
|
||||
<div class="btnbox">
|
||||
<a-input
|
||||
v-model:value="formData.source"
|
||||
style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入数据来源"
|
||||
:maxlength="20"
|
||||
/>
|
||||
<a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px"
|
||||
placeholder="请输入数据来源" :maxlength="20" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="main_item2">
|
||||
@@ -332,14 +210,8 @@
|
||||
<span style="margin-right: 3px">考试说明：</span>
|
||||
</div>
|
||||
<div class="textarea">
|
||||
<a-textarea
|
||||
v-model:value="formData.externalExplain"
|
||||
placeholder="请输入考试说明"
|
||||
allow-clear
|
||||
show-count
|
||||
:maxlength="200"
|
||||
:rows="6"
|
||||
/>
|
||||
<a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count
|
||||
:maxlength="200" :rows="6" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -354,161 +226,160 @@
|
||||
<script setup>
|
||||
import { defineEmits, defineProps, ref, watch } from "vue";
|
||||
import STest from "./SelectTest.vue";
|
||||
import { createExamination } from "@/api/index1";
|
||||
import dayjs from "dayjs";
|
||||
import { Form, message } from "ant-design-vue";
|
||||
|
||||
const props = defineProps({
|
||||
type: Number,
|
||||
taskList: [],
|
||||
});
|
||||
const visible = ref(false);
|
||||
taskList: []
|
||||
})
|
||||
const visible = ref(false)
|
||||
const initValue = {
|
||||
examinationName: "",
|
||||
examinationPaperId: "",
|
||||
examinationStartTime: "",
|
||||
examinationEndTime: "",
|
||||
examinationDuration: "",
|
||||
passLine: "",
|
||||
examinationName: '',
|
||||
examinationPaperId: '',
|
||||
examinationStartTime: '',
|
||||
examinationEndTime: '',
|
||||
examinationDuration: '',
|
||||
passLine: '',
|
||||
examType: 1,
|
||||
source: "",
|
||||
showAnswers: 2,
|
||||
showAnalysis: 2,
|
||||
scoringModel: 2,
|
||||
questionArrangement: 4,
|
||||
externalExplain: "",
|
||||
};
|
||||
const formData = ref(initValue);
|
||||
externalExplain: ""
|
||||
}
|
||||
const formData = ref(initValue)
|
||||
const innerRule = {
|
||||
examinationName: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入考试名称",
|
||||
message: '请输入考试名称',
|
||||
},
|
||||
],
|
||||
examinationPaperId: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入选择试卷",
|
||||
message: '请输入选择试卷',
|
||||
},
|
||||
],
|
||||
examinationStartTime: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入开始开始时间",
|
||||
message: '请输入开始开始时间',
|
||||
},
|
||||
],
|
||||
examinationEndTime: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入开始结束时间",
|
||||
message: '请输入开始结束时间',
|
||||
},
|
||||
],
|
||||
examinationDuration: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入考试时长",
|
||||
message: '请输入考试时长',
|
||||
},
|
||||
],
|
||||
passLine: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入及格线",
|
||||
message: '请输入及格线',
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
const outerRule = {
|
||||
examinationName: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入考试名称",
|
||||
message: '请输入考试名称',
|
||||
},
|
||||
],
|
||||
source: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入数据来源",
|
||||
message: '请输入数据来源',
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
const rulesRef = ref(innerRule);
|
||||
|
||||
const emit = defineEmits({});
|
||||
const emit = defineEmits({})
|
||||
const taskIndex = ref(-1);
|
||||
const dateTime = ref([]);
|
||||
|
||||
const { resetFields, validate } = Form.useForm(formData, rulesRef);
|
||||
|
||||
watch(
|
||||
() => formData.value.examType,
|
||||
() => {
|
||||
formData.value.examType === 1
|
||||
? (rulesRef.value = innerRule)
|
||||
: (rulesRef.value = outerRule);
|
||||
}
|
||||
);
|
||||
watch(() => formData.value.examType, () => {
|
||||
formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule
|
||||
})
|
||||
|
||||
const closeDrawer = () => {
|
||||
visible.value = false;
|
||||
taskIndex.value = -1;
|
||||
resetFields();
|
||||
dateTime.value = [];
|
||||
visible.value = false
|
||||
taskIndex.value = -1
|
||||
resetFields()
|
||||
dateTime.value = []
|
||||
};
|
||||
|
||||
|
||||
function timeChange(time, timeStr) {
|
||||
formData.value.examinationStartTime = timeStr[0];
|
||||
formData.value.examinationEndTime = timeStr[1];
|
||||
formData.value.examinationStartTime = timeStr[0]
|
||||
formData.value.examinationEndTime = timeStr[1]
|
||||
}
|
||||
|
||||
const disabledDate = (current) => {
|
||||
return current && current < dayjs().startOf("day");
|
||||
return current && current < dayjs().startOf('day');
|
||||
};
|
||||
|
||||
|
||||
// 系统考试
|
||||
async function confirm() {
|
||||
// debugger
|
||||
await validate().catch(({ errorFields }) => {
|
||||
message.warning(errorFields[0].errors.join());
|
||||
throw Error("数据校验不通过");
|
||||
throw Error("数据校验不通过")
|
||||
});
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList;
|
||||
list.push({
|
||||
name: formData.value.examinationName,
|
||||
type: props.type,
|
||||
info: { ...formData.value },
|
||||
});
|
||||
const list = props.taskList
|
||||
list.push({ name: formData.value.examinationName, type: props.type, info: { ...formData.value } })
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value];
|
||||
data.name = formData.value.examinationName;
|
||||
data.info = { ...formData.value };
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formData.value.examinationName
|
||||
data.info = { ...formData.value }
|
||||
}
|
||||
emit("update:taskList", [...props.taskList]);
|
||||
closeDrawer();
|
||||
let obj = formData.value;
|
||||
createExamination(obj).then(res => {
|
||||
console.log(res)
|
||||
message.success("成功");
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
})
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
}
|
||||
|
||||
|
||||
function openDrawer(i, row) {
|
||||
row && resetFields(row.info);
|
||||
row &&
|
||||
(dateTime.value = [
|
||||
row.info.examinationStartTime,
|
||||
row.info.examinationEndTime,
|
||||
]);
|
||||
i >= 0 && (taskIndex.value = i);
|
||||
visible.value = true;
|
||||
row && (dateTime.value = [row.info.examinationStartTime, row.info.examinationEndTime]);
|
||||
(i >= 0) && (taskIndex.value = i);
|
||||
visible.value = true
|
||||
}
|
||||
|
||||
const delTag = () => {
|
||||
formData.value.examinationPaperId = "";
|
||||
formData.value.examinationTestName = "";
|
||||
};
|
||||
formData.value.examinationPaperId = '';
|
||||
formData.value.examinationTestName = '';
|
||||
}
|
||||
|
||||
function changeOuter(v) {
|
||||
if (taskIndex.value >= 0) {
|
||||
return message.warn("编辑状态不允许切换。");
|
||||
return message.warn("编辑状态不允许切换。")
|
||||
}
|
||||
formData.value.examType = v;
|
||||
}
|
||||
|
||||
defineExpose({ openDrawer });
|
||||
defineExpose({ openDrawer })
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.ant-table-striped :deep(.table-striped) td {
|
||||
@@ -648,6 +519,7 @@ defineExpose({ openDrawer });
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
|
||||
.timerbox {
|
||||
margin-top: 6px;
|
||||
margin-right: 32px;
|
||||
@@ -694,7 +566,7 @@ defineExpose({ openDrawer });
|
||||
padding-left: 5px !important;
|
||||
}
|
||||
|
||||
.ant-table-thead > tr > th {
|
||||
.ant-table-thead>tr>th {
|
||||
background-color: rgba(239, 244, 252, 1);
|
||||
}
|
||||
|
||||
@@ -702,9 +574,7 @@ defineExpose({ openDrawer });
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
class="drawerStyle CheckStu"
|
||||
placement="right"
|
||||
width="70%"
|
||||
@after-visible-change="afterVisibleChange"
|
||||
>
|
||||
<div class="drawerMain">
|
||||
<div class="header">
|
||||
@@ -19,17 +18,19 @@
|
||||
<div v-if="!loading" class="main">
|
||||
<div class="stuinfor">
|
||||
<div class="portrait">
|
||||
<img src="../../assets/images/studentimg/character.png" />
|
||||
<img src="../../assets/images/studentimg/character.png"/>
|
||||
</div>
|
||||
<div class="stumation">
|
||||
<div class="stuname">{{pro==null?"":pro.routerInfo.name}}</div>
|
||||
<div class="stugangw">{{pro==null?"":pro.routerInfo.organizationName?pro.routerInfo.organizationName:"" + '-' + pro==null?"":pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
|
||||
<div class="stuname">{{ pro.userInfo?.realName }}</div>
|
||||
<div class="stugangw">
|
||||
{{pro.routerInfo?.departName || '' }} - {{ pro.userInfo?.jobName || ''}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="sortbox">
|
||||
<div class="sortname">进度排名</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{rank.current}}</span>
|
||||
<span class="total">/{{rank.total}}</span>
|
||||
<span class="nub1">{{ rank.current || 0 }}</span>
|
||||
<span class="total">/{{ rank.total || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a-divider
|
||||
@@ -43,8 +44,8 @@
|
||||
<div class="sortbox" style="margin-left: 34px">
|
||||
<div class="sortname">完成必修</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{pro==null?"":pro.currentReqCnt}}</span>
|
||||
<span class="total">/{{pro==null?"":pro.totalReqCnt}}</span>
|
||||
<span class="nub1">{{ rank.finishCompulsoryNum || 0 }}</span>
|
||||
<span class="total">/{{ rank.totalCompulsoryNum || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a-divider
|
||||
@@ -57,50 +58,10 @@
|
||||
<div class="sortbox" style="margin-left: 34px">
|
||||
<div class="sortname">已修证书</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{pro==null?"":pro.routerInfo.certCnt?pro.routerInfo.certCnt:0}}</span>
|
||||
<span class="nub1">{{ rank.certNum || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="secondrow">
|
||||
<div class="rowleft">{{ pro.name }}</div> -->
|
||||
<!-- <div class="rowbox" @click="showProMess">
|
||||
<div class="shuom">说明</div>
|
||||
<div><img src="../../assets/images/studentimg/chak.png" /></div>
|
||||
</div> -->
|
||||
<!-- </div> -->
|
||||
<!-- <div v-for="(item) in pro.chapterList" class="mainbox"
|
||||
style="margin-top: 15px; height: 56px"
|
||||
:key="item.chapterId">
|
||||
<div class="rowtitle" @click="changeDown">
|
||||
<div class="titleimg">
|
||||
<img
|
||||
:src="
|
||||
showDown
|
||||
? require('../../assets/images/studentimg/open.png')
|
||||
: require('../../assets/images/studentimg/close.png')
|
||||
"
|
||||
/>
|
||||
</div>
|
||||
<div class="titletext">{{item.chapterName}}</div>
|
||||
</div>
|
||||
|
||||
<div :style="{ display: showDown ? 'block' : 'none' }">
|
||||
<div v-for="_item in item.taskList" :key="_item.routerTaskId" class="rowclass">
|
||||
<div class="leftclass">
|
||||
<div><img src="../../assets/images/leveladd/zai.png" /></div>
|
||||
<div class="text1">{{checkType(_item.type)}}</div>
|
||||
<div class="text2">{{_item.name}}</div>
|
||||
</div>
|
||||
<div class="alreadyclass">
|
||||
<div class="alimg">
|
||||
<img src="../../assets/images/studentimg/complete.png" />
|
||||
</div>
|
||||
<div class="altext">{{checkStatus(_item.status)}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="mainbox">
|
||||
<a-collapse v-model:activeKey="stageListActive">
|
||||
<template #expandIcon="{ isActive }">
|
||||
@@ -114,32 +75,25 @@
|
||||
/>
|
||||
<div></div>
|
||||
</template>
|
||||
<a-collapse-panel
|
||||
v-for="value in pro==null?[]:pro.chapterList"
|
||||
:key="value.chapterId"
|
||||
:header="value.chapterName"
|
||||
|
||||
>
|
||||
<template #extra >
|
||||
<a-collapse-panel v-for="value in pro.chapterList || []" :key="value.id" :header="value.name">
|
||||
<template #extra>
|
||||
<div @click.stop="">
|
||||
<div class="rowbox">
|
||||
<a-popover title="关卡说明">
|
||||
<template #content>
|
||||
<p>{{value.remark}}</p>
|
||||
<p>{{ value.remark }}</p>
|
||||
</template>
|
||||
<div class="shuom">说明</div>
|
||||
</a-popover>
|
||||
<div><img src="../../assets/images/studentimg/chak.png" /></div>
|
||||
<div><img src="../../assets/images/studentimg/chak.png"/></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<div
|
||||
class="rowclass"
|
||||
v-for="(item, key) in value.taskList"
|
||||
:key="key"
|
||||
>
|
||||
|
||||
<div class="leftclass">
|
||||
<div>
|
||||
<img
|
||||
@@ -187,7 +141,7 @@
|
||||
"
|
||||
/>
|
||||
</div>
|
||||
<div class="altext">{{ item.status ==0?"进行中":item.status ==1?"已完成":"未开始" }}</div>
|
||||
<div class="altext">{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -201,18 +155,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</a-drawer>
|
||||
<check-stu-mess v-model:StuMessvisible="StuMessvisible" />
|
||||
<check-stu-mess v-model:StuMessvisible="StuMessvisible"/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { reactive, toRefs } from "vue";
|
||||
import CheckStuMess from "./CheckStuMess.vue";
|
||||
import {stuProgress} from "@/api/index1";
|
||||
import {studentRank} from "@/api/indexProjStu";
|
||||
// import {message} from "ant-design-vue";
|
||||
import {reactive, toRefs, watch} from "vue";
|
||||
import {stuRouterProgress} from "@/api/index1";
|
||||
import {routerStudentRank} from "@/api/indexProjStu";
|
||||
|
||||
export default {
|
||||
name: "CheckStu",
|
||||
components: { CheckStuMess },
|
||||
props: {
|
||||
CheckStuvisible: {
|
||||
type: Boolean,
|
||||
@@ -231,53 +183,38 @@ export default {
|
||||
const state = reactive({
|
||||
StuMessvisible: false,
|
||||
showDown: false,
|
||||
pro:null,
|
||||
loading:true,
|
||||
pro: null,
|
||||
loading: false,
|
||||
stageListActive: 0,
|
||||
rank:{total:1,current:1},
|
||||
rank: {total: 0, current: 0, finishCompulsoryNum: 0, totalCompulsoryNum: 0, certNum: 0},
|
||||
});
|
||||
|
||||
watch([()=>props.studentId, ()=>props.routerId], () => {
|
||||
console.log(111111)
|
||||
console.log(props)
|
||||
getStuProgress()
|
||||
getStuRank()
|
||||
})
|
||||
|
||||
const closeDrawer = () => {
|
||||
ctx.emit("update:CheckStuvisible", false);
|
||||
};
|
||||
|
||||
const getStuRank = () => {
|
||||
studentRank({
|
||||
projectId: props.routerId,
|
||||
studentId: props.studentId,
|
||||
type:2
|
||||
}).then(res=>{
|
||||
state.rank = res.data.data
|
||||
})
|
||||
routerStudentRank({routerId: props.routerId, studentId: props.studentId}).then(res => state.rank = res.data.data)
|
||||
}
|
||||
|
||||
const showProMess = () => {
|
||||
state.StuMessvisible = true;
|
||||
};
|
||||
const afterVisibleChange = (bool) => {
|
||||
if(props.CheckStuvisible) {
|
||||
getStuProgress()
|
||||
getStuRank()
|
||||
}
|
||||
console.log("state", bool);
|
||||
};
|
||||
const changeDown = () => {
|
||||
state.showDown = !state.showDown;
|
||||
};
|
||||
const getStuProgress = () => {
|
||||
state.loading = true
|
||||
let obj = {
|
||||
routerId:props.routerId==null?props.studentId:props.routerId
|
||||
// routerId:props.studentId
|
||||
}
|
||||
stuProgress(obj).then(res => {
|
||||
console.log("查询当前学员进度信息success",res)
|
||||
stuRouterProgress({routerId: props.routerId, userId: props.studentId}).then(res => {
|
||||
state.pro = res.data.data
|
||||
state.loading = false
|
||||
console.log(res)
|
||||
}).catch(err => {
|
||||
console.log("查询当前学员进度信息err",err)
|
||||
state.loading = false
|
||||
console.log(err)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -301,47 +238,37 @@ export default {
|
||||
return typeRules[type];
|
||||
}
|
||||
|
||||
const checkStatus = (status) => {
|
||||
if(status < 0) return "未开始"
|
||||
let statusRules = [
|
||||
"进行中","已完成"
|
||||
]
|
||||
return statusRules[status]
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
...toRefs(state),
|
||||
afterVisibleChange,
|
||||
closeDrawer,
|
||||
showProMess,
|
||||
changeDown,
|
||||
checkType,
|
||||
checkStatus,
|
||||
// change,
|
||||
|
||||
};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" >
|
||||
<style lang="scss">
|
||||
.CheckStu {
|
||||
.ant-drawer-content-wrapper {
|
||||
// max-width: 1000px;
|
||||
.ant-drawer-header {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.ant-drawer-body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.drawerMain {
|
||||
min-width: 600px;
|
||||
margin: 0px 32px 0px 32px;
|
||||
overflow-x: auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.header {
|
||||
height: 73px;
|
||||
border-bottom: 1px solid #e8e8e8;
|
||||
@@ -351,6 +278,7 @@ export default {
|
||||
// background-color: red;
|
||||
margin-bottom: 20px;
|
||||
flex-shrink: 0;
|
||||
|
||||
.headerTitle {
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
@@ -359,11 +287,13 @@ export default {
|
||||
// margin-left: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
.main {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 80px;
|
||||
|
||||
.stuinfor {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -373,35 +303,43 @@ export default {
|
||||
background-image: url("../../assets/images/studentimg/bgimg.png");
|
||||
background-repeat: no-repeat;
|
||||
background-position: right;
|
||||
|
||||
.stumation {
|
||||
margin-left: 24px;
|
||||
|
||||
.stuname {
|
||||
color: #333333;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.stugangw {
|
||||
color: #999999;
|
||||
font-size: 16px;
|
||||
margin-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.sortbox {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
margin-left: 114px;
|
||||
|
||||
.sortname {
|
||||
color: #666660;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.sortnub {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-top: 7px;
|
||||
|
||||
.nub1 {
|
||||
color: #0060ff;
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.total {
|
||||
color: #999999;
|
||||
font-size: 22px;
|
||||
@@ -409,13 +347,16 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.secondrow {
|
||||
margin-top: 32px;
|
||||
display: flex;
|
||||
|
||||
.rowleft {
|
||||
color: rgba(51, 51, 51, 1);
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.rowbox {
|
||||
width: 64px;
|
||||
height: 24px;
|
||||
@@ -426,6 +367,7 @@ export default {
|
||||
border: 1px solid rgba(64, 158, 255, 1);
|
||||
background: rgba(64, 158, 255, 0.1);
|
||||
cursor: pointer;
|
||||
|
||||
.shuom {
|
||||
color: rgba(64, 158, 255, 1);
|
||||
font-size: 14px;
|
||||
@@ -434,6 +376,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// .mainbox {
|
||||
// // height: 463px;
|
||||
// margin-right: 37px;
|
||||
@@ -511,6 +454,7 @@ export default {
|
||||
background: rgba(64, 158, 255, 0.1);
|
||||
margin-right: 480px;
|
||||
cursor: pointer;
|
||||
|
||||
.shuom {
|
||||
color: rgba(64, 158, 255, 1);
|
||||
font-size: 14px;
|
||||
@@ -518,23 +462,28 @@ export default {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.ant-collapse {
|
||||
background-color: #ffffff;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.ant-collapse-content > .ant-collapse-content-box {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.ant-collapse > .ant-collapse-item {
|
||||
border: 1px solid rgba(221, 238, 255, 1);
|
||||
border-radius: 6px;
|
||||
margin-bottom: 15px;
|
||||
border-bottom: 0px;
|
||||
}
|
||||
|
||||
.ant-collapse-content {
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
.ant-collapse-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -544,52 +493,60 @@ export default {
|
||||
color: rgba(51, 51, 51, 1);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.rowclass {
|
||||
height: 81px;
|
||||
border-bottom: 1px solid rgba(221, 238, 255, 1);
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.leftclass {
|
||||
display: flex;
|
||||
margin-left: 25px;
|
||||
align-items: center;
|
||||
|
||||
.text1 {
|
||||
color: #000000;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
margin-left: 25px;
|
||||
word-break:keep-all;
|
||||
white-space:nowrap;
|
||||
word-break: keep-all;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.text2 {
|
||||
color: rgba(51, 51, 51, 0.8);
|
||||
font-size: 14px;
|
||||
margin-left: 65px;
|
||||
word-break:keep-all;
|
||||
white-space:nowrap;
|
||||
overflow:hidden;
|
||||
text-overflow:ellipsis;
|
||||
word-break: keep-all;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.alreadyclass {
|
||||
display: flex;
|
||||
margin-right: 57px;
|
||||
|
||||
.alimg {
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
.altext {
|
||||
color: rgba(56, 125, 247, 1);
|
||||
font-size: 14px;
|
||||
margin-left: 16px;
|
||||
word-break:keep-all;
|
||||
white-space:nowrap;
|
||||
word-break: keep-all;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btnn {
|
||||
height: 72px;
|
||||
width: 100%;
|
||||
@@ -601,6 +558,7 @@ export default {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
|
||||
|
||||
.btn2 {
|
||||
cursor: pointer;
|
||||
width: 100px;
|
||||
|
||||
@@ -645,7 +645,7 @@ export default {
|
||||
bum: item.userInfoBo.deptName,
|
||||
gangw: item.userInfoBo.jobName,
|
||||
group: item.groupName,
|
||||
diploma: "0",
|
||||
diploma: item.allPointsCount,
|
||||
// operation: "查看",
|
||||
};
|
||||
array.push(obj);
|
||||
|
||||
@@ -1,58 +1,56 @@
|
||||
<!-- eslint-disable vue/no-use-v-if-with-v-for -->
|
||||
<template>
|
||||
<a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%"
|
||||
@after-visible-change="afterVisibleChange">
|
||||
<a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%">
|
||||
<div class="drawerMain">
|
||||
<div class="header">
|
||||
<div class="headerTitle">查看</div>
|
||||
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
|
||||
@click="closeDrawer" />
|
||||
@click="closeDrawer"/>
|
||||
</div>
|
||||
<a-spin v-if="loading" :spinning="loading" />
|
||||
<a-spin v-if="loading" :spinning="loading"/>
|
||||
<div v-if="!loading" class="main">
|
||||
<div class="stuinfor">
|
||||
<div class="portrait">
|
||||
<img src="../../assets/images/studentimg/character.png" />
|
||||
<img src="../../assets/images/studentimg/character.png"/>
|
||||
</div>
|
||||
<div class="stumation">
|
||||
<div class="stuname">{{ userName }}</div>
|
||||
<div class="stugangw">{{ deptName }} - {{ jobName }}</div>
|
||||
<div class="stuname">{{ info.userInfo?.realName }}</div>
|
||||
<div class="stugangw">{{ info.userInfo?.departName }} - {{ info.userInfo?.jobName }}</div>
|
||||
</div>
|
||||
<div class="sortbox">
|
||||
<div class="sortname">进度排名</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{ rank.current }}</span>
|
||||
<span class="total">/{{ rank.total }}</span>
|
||||
<span class="nub1">{{ rank.current || 0 }}</span>
|
||||
<span class="total">/{{ rank.total || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a-divider type="vertical" style="
|
||||
height: 49px;
|
||||
margin-left: 34px;
|
||||
background-color: rgba(170, 166, 166, 0.3);
|
||||
" />
|
||||
"/>
|
||||
<div class="sortbox" style="margin-left: 34px">
|
||||
<div class="sortname">完成必修</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{ currentReqCnt }}</span>
|
||||
<span class="total">/{{ totalReqCnt }}</span>
|
||||
<span class="nub1">{{ rank.finishCompulsoryNum || 0 }}</span>
|
||||
<span class="total">/{{ rank.totalCompulsoryNum || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a-divider type="vertical" style="
|
||||
height: 49px;
|
||||
margin-left: 34px;
|
||||
background-color: rgba(170, 166, 166, 0.3);" />
|
||||
background-color: rgba(170, 166, 166, 0.3);"/>
|
||||
<div class="sortbox" style="margin-left: 34px">
|
||||
<div class="sortname">已修证书</div>
|
||||
<div class="sortnub">
|
||||
<span class="nub1">{{ 0 }}</span>
|
||||
<span class="nub1">{{ rank.certNum || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="secondrow">
|
||||
<div class="rowleft">{{ name }} </div>
|
||||
<div class="rowRight"> 排序号：{{ sort }}</div>
|
||||
<div class="rowleft">{{ info.projectInfo.name }}</div>
|
||||
</div>
|
||||
<div class="mainbox">
|
||||
<a-collapse v-model:activeKey="stageListActive">
|
||||
@@ -61,10 +59,10 @@
|
||||
isActive
|
||||
? require('../../assets/images/studentimg/open.png')
|
||||
: require('../../assets/images/studentimg/close.png')
|
||||
" />
|
||||
"/>
|
||||
<div></div>
|
||||
</template>
|
||||
<a-collapse-panel v-for="value in stageList" :key="value.stageId" :header="value.stageName">
|
||||
<a-collapse-panel v-for="value in info.stageList" :key="value.id" :header="value.name || '无阶段任务'">
|
||||
<template #extra>
|
||||
<div @click.stop="">
|
||||
<div class="rowbox">
|
||||
@@ -74,7 +72,7 @@
|
||||
</template>
|
||||
<div class="shuom">说明</div>
|
||||
</a-popover>
|
||||
<div><img src="../../assets/images/studentimg/chak.png" /></div>
|
||||
<div><img src="../../assets/images/studentimg/chak.png"/></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -83,37 +81,36 @@
|
||||
|
||||
<div class="leftclass">
|
||||
<div>
|
||||
<img :src="
|
||||
item.course === '在线'
|
||||
<img
|
||||
:src="
|
||||
item.type === 1
|
||||
? require('../../assets/images/leveladd/zai.png')
|
||||
: item.course === '面授'
|
||||
: item.type === 2
|
||||
? require('../../assets/images/leveladd/mian.png')
|
||||
: item.course === '案例'
|
||||
: item.type === 3
|
||||
? require('../../assets/images/leveladd/an.png')
|
||||
: item.course === '作业'
|
||||
: item.type === 4
|
||||
? require('../../assets/images/leveladd/zuo.png')
|
||||
: item.course === '考试'
|
||||
: item.type === 5
|
||||
? require('../../assets/images/leveladd/kao.png')
|
||||
: item.course === '直播'
|
||||
: item.type === 6
|
||||
? require('../../assets/images/leveladd/zhi.png')
|
||||
: item.course === '外链'
|
||||
: item.type === 7
|
||||
? require('../../assets/images/leveladd/wai.png')
|
||||
: item.course === '讨论'
|
||||
: item.type === 8
|
||||
? require('../../assets/images/leveladd/tao.png')
|
||||
: item.course === '活动'
|
||||
: item.type === 9
|
||||
? require('../../assets/images/leveladd/huo.png')
|
||||
: item.course === '测评'
|
||||
: item.type === 10
|
||||
? require('../../assets/images/leveladd/ce.png')
|
||||
: item.course === '调研'
|
||||
: item.type === 11
|
||||
? require('../../assets/images/leveladd/diao.png')
|
||||
: item.course === '投票'
|
||||
: item.type === 12
|
||||
? require('../../assets/images/leveladd/tou.png')
|
||||
: item.course === '评估'
|
||||
? require('../../assets/images/leveladd/diao.png')
|
||||
: item.course === '项目'
|
||||
: item.type === 13
|
||||
? require('../../assets/images/leveladd/xiangmu.png')
|
||||
: null
|
||||
" />
|
||||
: null"
|
||||
/>
|
||||
</div>
|
||||
<div class="text1">{{ item.course }}</div>
|
||||
<div class="text2">{{ item.name }}</div>
|
||||
@@ -124,11 +121,10 @@
|
||||
item.complete === '已完成'
|
||||
? require('../../assets/images/studentimg/complete.png')
|
||||
: require('../../assets/images/studentimg/notice.png')
|
||||
" />
|
||||
"/>
|
||||
</div>
|
||||
<div class="altext">{{ item.complete }}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</a-collapse-panel>
|
||||
</a-collapse>
|
||||
@@ -138,17 +134,18 @@
|
||||
<button class="btn2" @click="closeDrawer">关闭</button>
|
||||
</div>
|
||||
</div>
|
||||
<pro-mess v-model:Provisible="Provisible" />
|
||||
<pro-mess v-model:Provisible="Provisible"/>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { reactive, toRefs } from "vue";
|
||||
import {reactive, toRefs, watch} from "vue";
|
||||
import ProMess from "./ProMess.vue";
|
||||
import { studentProcess, studentRank } from "../../api/indexProjStu";
|
||||
import {projectStudentRank, projectStudentProcess} from "@/api/indexProjStu";
|
||||
|
||||
export default {
|
||||
name: "SeeStu",
|
||||
components: { ProMess },
|
||||
components: {ProMess},
|
||||
props: {
|
||||
Seevisible: {
|
||||
type: Boolean,
|
||||
@@ -166,213 +163,40 @@ export default {
|
||||
setup(props, ctx) {
|
||||
const state = reactive({
|
||||
loading: false,
|
||||
userName: null, //用户名
|
||||
deptName: null, //部门
|
||||
jobName: null, //岗位
|
||||
certCnt: null, //已修证书
|
||||
name: null, //路径图名称
|
||||
totalReqCnt: null, //累计必修数
|
||||
currentReqCnt: null, //完成必修数
|
||||
info: {},
|
||||
Provisible: false,
|
||||
showDown: true,
|
||||
showDown1: false,
|
||||
rank: { total: 1, current: 1 },
|
||||
sort: null,
|
||||
stageList: [
|
||||
// {
|
||||
// stageName: "阶段1腾飞班阶段1",
|
||||
// stageId: 1,
|
||||
// taskList: [
|
||||
// {
|
||||
// course: "在线",
|
||||
// name: "如何成为一个产品经理",
|
||||
// complete: "已完成",
|
||||
// },
|
||||
// {
|
||||
// course: "直播",
|
||||
// name: "管理直播课",
|
||||
// complete: "已完成",
|
||||
// },
|
||||
// {
|
||||
// course: "面授",
|
||||
// name: "管理面授课",
|
||||
// complete: "未完成",
|
||||
// },
|
||||
// {
|
||||
// course: "活动",
|
||||
// name: "管理活动",
|
||||
// complete: "未完成",
|
||||
// },
|
||||
// {
|
||||
// course: "作业",
|
||||
// name: "管理者作业",
|
||||
// complete: "未完成",
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
],
|
||||
stageListActive: 0,
|
||||
rank: {total: 0, current: 0, finishCompulsoryNum: 0, totalCompulsoryNum: 0, certNum: 0},
|
||||
});
|
||||
|
||||
watch([() => props.checkStuId, () => props.projectId], () => {
|
||||
getStuRank()
|
||||
check()
|
||||
})
|
||||
|
||||
|
||||
const closeDrawer = () => {
|
||||
ctx.emit("update:Seevisible", false);
|
||||
};
|
||||
|
||||
const getStuRank = () => {
|
||||
studentRank({
|
||||
projectId: props.projectId,
|
||||
studentId: props.checkStuId,
|
||||
type: 1
|
||||
}).then(res => {
|
||||
state.rank = res.data.data
|
||||
})
|
||||
projectStudentRank({projectId: props.projectId, studentId: props.checkStuId}).then(res => state.rank = res.data.data)
|
||||
}
|
||||
|
||||
const showProMess = () => {
|
||||
state.Provisible = true;
|
||||
};
|
||||
const afterVisibleChange = (bool) => {
|
||||
console.log("state", bool);
|
||||
if (bool == true) {
|
||||
check();
|
||||
getStuRank()
|
||||
}
|
||||
};
|
||||
const changeDown = () => {
|
||||
state.showDown = !state.showDown;
|
||||
};
|
||||
const changeDown1 = () => {
|
||||
state.showDown1 = !state.showDown1;
|
||||
};
|
||||
const taskList = (tableData) => {
|
||||
let data = tableData;
|
||||
console.log('我排序了吗--------------------------》', data)
|
||||
let array = [];
|
||||
if (data != undefined) {
|
||||
data.map((value) => {
|
||||
console.log('我排序了吗---------value-----------------》', value)
|
||||
let obj = {
|
||||
course:
|
||||
value.type == 1
|
||||
? "在线"
|
||||
: value.type == 2
|
||||
? "面授"
|
||||
: value.type == 3
|
||||
? "案例"
|
||||
: value.type == 4
|
||||
? "作业"
|
||||
: value.type == 5
|
||||
? "考试"
|
||||
: value.type == 6
|
||||
? "直播"
|
||||
: value.type == 7
|
||||
? "外链"
|
||||
: value.type == 8
|
||||
? "讨论"
|
||||
: value.type == 9
|
||||
? "活动"
|
||||
: value.type == 10
|
||||
? "测评"
|
||||
: value.type == 11
|
||||
? "评估"
|
||||
: value.type == 12
|
||||
? "投票"
|
||||
: "-",
|
||||
name: value.name,
|
||||
projectId: value.projectId,
|
||||
complete:
|
||||
value.status == -1
|
||||
? "未开始"
|
||||
: value.status == 1
|
||||
? "已完成"
|
||||
: value.status == 0
|
||||
? "未完成"
|
||||
: "-",
|
||||
flag: value.flag == 0 ? "选修" : "必修",
|
||||
currentRatio: value.currentRatio,
|
||||
routerTaskId: value.routerTaskId,
|
||||
};
|
||||
console.log('我排序了吗---------obj-----------------》', obj)
|
||||
array.push(obj);
|
||||
});
|
||||
array.sort((a, b) => { return a.projectId - b.projectId })
|
||||
}
|
||||
|
||||
console.log('我排序了吗-----------1---------------》', array)
|
||||
return array;
|
||||
};
|
||||
const setStageList = (tableData) => {
|
||||
let data = tableData;
|
||||
console.log("查看了学员1", data);
|
||||
let array = [];
|
||||
//无阶段任务
|
||||
if (data?.length == 1 && data[0].id == 0) {
|
||||
console.log("无阶段任务", data);
|
||||
data.map((value) => {
|
||||
let obj = {
|
||||
stageName: "无阶段任务",
|
||||
stageId: 0,
|
||||
remark: value.remark,
|
||||
taskList: taskList(value.taskList),
|
||||
};
|
||||
array.push(obj);
|
||||
});
|
||||
} else { //有阶段
|
||||
console.log("有阶段", data);
|
||||
data.map((value) => {
|
||||
console.log("有阶段value", value);
|
||||
let obj = {
|
||||
stageName: value.name,
|
||||
stageId: value.id,
|
||||
remark: value.remark,
|
||||
taskList: taskList(value.taskList),
|
||||
};
|
||||
if (value.id > 0) {
|
||||
array.push(obj);
|
||||
}
|
||||
console.log("有阶段array", array);
|
||||
});
|
||||
}
|
||||
|
||||
state.stageList = array;
|
||||
};
|
||||
const check = () => {
|
||||
state.loading = true
|
||||
let obj = {
|
||||
projectId: props.projectId,
|
||||
studentId: props.checkStuId,
|
||||
};
|
||||
studentProcess(obj).then((res) => {
|
||||
projectStudentProcess({projectId: props.projectId, userId: props.checkStuId}).then((res) => {
|
||||
state.loading = false
|
||||
console.log("查看了学员", res.data);
|
||||
let result = res.data.data;
|
||||
console.log("查看了学员result:", result);
|
||||
state.userName = result.projectInfo.name;
|
||||
state.deptName = result.projectInfo.deptName;
|
||||
state.jobName = result.projectInfo.jobName;
|
||||
state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
|
||||
state.name = result.projectInfo.name;
|
||||
state.currentReqCnt = result.projectInfo.currentReqCnt;
|
||||
state.totalReqCnt = result.projectInfo.totalReqCnt;
|
||||
|
||||
if (result.stageList.length > 0) {
|
||||
state.sort = result.stageList[0].sort;
|
||||
|
||||
state.info = res.data.data;
|
||||
})
|
||||
}
|
||||
setStageList(result.stageList);
|
||||
});
|
||||
};
|
||||
|
||||
return {
|
||||
...toRefs(state),
|
||||
afterVisibleChange,
|
||||
closeDrawer,
|
||||
showProMess,
|
||||
changeDown,
|
||||
changeDown1,
|
||||
check,
|
||||
setStageList,
|
||||
taskList,
|
||||
// change,
|
||||
};
|
||||
},
|
||||
};
|
||||
@@ -521,12 +345,12 @@ export default {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.ant-collapse-content>.ant-collapse-content-box {
|
||||
.ant-collapse-content > .ant-collapse-content-box {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.ant-collapse>.ant-collapse-item {
|
||||
.ant-collapse > .ant-collapse-item {
|
||||
border: 1px solid rgba(221, 238, 255, 1);
|
||||
border-radius: 6px;
|
||||
margin-bottom: 15px;
|
||||
|
||||
@@ -195,7 +195,7 @@ export default {
|
||||
console.log('我是传递过来的参数2', props.basicdata)
|
||||
api.QueryAssessmentDetail({
|
||||
"assessmentSubmitId": props.datasource.assessmentSubmitId,
|
||||
"courseId": props.basicdata.assessmentId,
|
||||
"courseId": props.basicdata.id,
|
||||
"studentId": props.datasource.studentId
|
||||
}).then(res=>{
|
||||
console.log(res)
|
||||
|
||||
@@ -128,6 +128,8 @@
|
||||
</div>-->
|
||||
</div>
|
||||
</a-drawer>
|
||||
<view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info.assessmentName"
|
||||
:basicdata="datasource.info" />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -135,9 +137,11 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
|
||||
import { message } from "ant-design-vue";
|
||||
// import * as api from "../../../api/index";
|
||||
import * as api from "../../../api/indexTaskManage";
|
||||
import ViewAssess from "../ViewAssess";
|
||||
|
||||
export default {
|
||||
name: "ProjectOnlineManage",
|
||||
|
||||
components: { ViewAssess },
|
||||
props: {
|
||||
Tvisible: {
|
||||
type: Boolean,
|
||||
@@ -195,6 +199,8 @@ export default {
|
||||
],
|
||||
tabledata: [],
|
||||
tableDataTotalLoading: true, // 表格loading加载配置
|
||||
evalDataSource: "",
|
||||
Assessvisible: false
|
||||
});
|
||||
const tableDataFunc = () => {
|
||||
const columns = [
|
||||
@@ -309,9 +315,42 @@ export default {
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
let obj = {
|
||||
title: "操作",
|
||||
dataIndex: "finishStatus",
|
||||
key: "finishStatus",
|
||||
width: 60,
|
||||
align: "center",
|
||||
ellipsis: true,
|
||||
className: "h",
|
||||
customRender: (text) => {
|
||||
return (
|
||||
<div class="racona">
|
||||
<a
|
||||
onClick={()=>{
|
||||
console.log('iyiy', text.record)
|
||||
showassess(text.record);
|
||||
}}>查看</a>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
}
|
||||
|
||||
{/* 评估查看操作 */}
|
||||
if(props.datasource.type==11){
|
||||
columns.push(obj)
|
||||
}
|
||||
|
||||
return columns;
|
||||
};
|
||||
|
||||
{/* 查看评估弹框 */}
|
||||
const showassess = (data) => {
|
||||
state.evalDataSource = data;
|
||||
state.Assessvisible = true;
|
||||
};
|
||||
|
||||
const closeDrawer = () => {
|
||||
ctx.emit("update:Tvisible", false);
|
||||
state.currentPage = 1;
|
||||
@@ -461,6 +500,7 @@ export default {
|
||||
return {
|
||||
...toRefs(state),
|
||||
selectProjectName,
|
||||
showassess,
|
||||
closeDrawer,
|
||||
afterVisibleChange,
|
||||
tableDataFunc,
|
||||
|
||||
@@ -377,7 +377,7 @@
|
||||
onClick={
|
||||
() => {
|
||||
{/* 当前学员 用来查看学员详情 */}
|
||||
state.routerId = value.record.routerId;
|
||||
state.routerId = value.record.pid;
|
||||
state.studentId = value.record.studentId;
|
||||
state.CheckStuvisible = true;
|
||||
console.log(value);
|
||||
|
||||
@@ -59,6 +59,7 @@ const props = defineProps({
|
||||
});
|
||||
|
||||
const option = computed(() => {
|
||||
debugger
|
||||
console.log("props.groupList", props.groupList);
|
||||
return props.groupList.map((e) => ({
|
||||
label: e.groupName,
|
||||
|
||||
@@ -374,7 +374,6 @@ const projectRowSelection = computed(() => ({
|
||||
preserveSelectedRowKeys: true,
|
||||
}));
|
||||
const getStu = () => {
|
||||
debugger
|
||||
let obj = {
|
||||
studentName: proStudentName.value,
|
||||
pageNo: procurrentPage.value,
|
||||
@@ -394,6 +393,7 @@ const getStu = () => {
|
||||
id: value.id,
|
||||
realName: value.studentName,
|
||||
userNo: value.studentId,
|
||||
isLeader: value.isLeader,
|
||||
orgName: value.studentOrgName ? value.studentOrgName : "-",
|
||||
departName: value.studentDepartName ? value.studentDepartName : "-",
|
||||
};
|
||||
@@ -760,9 +760,14 @@ const submitAuth = () => {
|
||||
function handleStageOk() {
|
||||
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
|
||||
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("添加小组学员超过最大值");
|
||||
}
|
||||
// 判断是否是组长，组长不能添加
|
||||
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
|
||||
if (leaderArray.length > 0) {
|
||||
return message.warning("当前选学员"+leaderArray[0].realName+"已在其他小组为小组长，请勿重复选择。");
|
||||
}
|
||||
// 对选中的人员进行判断是否已经分组了
|
||||
let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
|
||||
if (haveGroupNum.length > 0) {
|
||||
|
||||
@@ -858,7 +858,7 @@
|
||||
</div>
|
||||
</a-modal>
|
||||
<!--开课页面 -->
|
||||
<!--新建开课页面 cstm_hs -->
|
||||
<!--新建开课页面 -->
|
||||
<a-modal
|
||||
v-model:visible="cstm_hs"
|
||||
style="margin-top: 400px"
|
||||
@@ -965,48 +965,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cstm_items">
|
||||
<div class="signbox">
|
||||
<span style="margin-right: 3px">考勤设置：</span>
|
||||
</div>
|
||||
<div style="display: flex; align-items: center">
|
||||
<div style="margin-right: 10px">签到</div>
|
||||
<div
|
||||
style="display: flex; align-items: center; margin-right: 20px"
|
||||
>
|
||||
<span>开始前：</span>
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:max="300"
|
||||
:precision="0"
|
||||
style="
|
||||
width: 100px;
|
||||
height: 32px;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
"
|
||||
v-model:value="beforeValue"
|
||||
></a-input-number>
|
||||
<span style="color: #999999; margin-left: 8px">分钟</span>
|
||||
</div>
|
||||
<div style="display: flex; align-items: center">
|
||||
<span>开始后：</span>
|
||||
<a-input-number
|
||||
:min="0"
|
||||
:max="300"
|
||||
:precision="0"
|
||||
style="
|
||||
width: 100px;
|
||||
height: 32px;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
"
|
||||
v-model:value="afterStartValue"
|
||||
></a-input-number>
|
||||
<span style="color: #999999; margin-left: 8px">分钟</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cstm_items">
|
||||
<div class="signbox">
|
||||
<span style="margin-right: 3px">报名设置</span>
|
||||
@@ -1684,13 +1642,6 @@ import dayjs from "dayjs";
|
||||
|
||||
//列表表格
|
||||
const columns1 = [
|
||||
{
|
||||
title: "课程编号",
|
||||
width: 130,
|
||||
dataIndex: "offcourseNumber",
|
||||
key: "offcourseNumber",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: "名称",
|
||||
width: 400,
|
||||
@@ -1702,7 +1653,13 @@ const columns1 = [
|
||||
return text ? text : "-";
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
title: "课程编号",
|
||||
width: 130,
|
||||
dataIndex: "offcourseNumber",
|
||||
key: "offcourseNumber",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
title: "内容分类",
|
||||
width: 130,
|
||||
@@ -1781,16 +1738,16 @@ const columns1 = [
|
||||
return text ? text : "0";
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "评分",
|
||||
width: 130,
|
||||
dataIndex: "score",
|
||||
key: "5",
|
||||
align: "center",
|
||||
customRender: ({ text }) => {
|
||||
return text ? text : "0";
|
||||
},
|
||||
},
|
||||
// {
|
||||
// title: "评分",
|
||||
// width: 130,
|
||||
// dataIndex: "grade",
|
||||
// key: "5",
|
||||
// align: "center",
|
||||
// customRender: ({ text }) => {
|
||||
// return text ? text : "0";
|
||||
// },
|
||||
// },
|
||||
{
|
||||
title: "状态",
|
||||
width: 130,
|
||||
@@ -2660,8 +2617,6 @@ export default defineComponent({
|
||||
xjkkinputV2: "",
|
||||
xjkkinputV3: "",
|
||||
xjkkinputV4: null,
|
||||
beforeValue: null,
|
||||
afterStartValue: null,
|
||||
//开课学员管理
|
||||
xygl_inputV1: "",
|
||||
//录入成绩
|
||||
@@ -3119,7 +3074,6 @@ export default defineComponent({
|
||||
pubtime: "publishTime",
|
||||
kkty: "status",
|
||||
offcourseId: "offcourseId",
|
||||
score: "score",
|
||||
},
|
||||
true
|
||||
);
|
||||
@@ -3685,6 +3639,7 @@ export default defineComponent({
|
||||
state.of_hs = false;
|
||||
// state.ft_hs = true;
|
||||
CourseModalRef.value.visibleOpen(null, state.xzinputV1);
|
||||
|
||||
state.valueE1 = "";
|
||||
state.teacher = "";
|
||||
state.teacherName = "";
|
||||
@@ -3780,8 +3735,7 @@ export default defineComponent({
|
||||
state.assessmentId = null;
|
||||
state.assessmentName = "";
|
||||
state.EditWorkId = null;
|
||||
state.beforeValue = null;
|
||||
state.afterStartValue = null;
|
||||
|
||||
removePG();
|
||||
};
|
||||
//保存开课
|
||||
@@ -3847,12 +3801,18 @@ export default defineComponent({
|
||||
console.log("state.addLoading ", state.addLoading);
|
||||
}
|
||||
state.addLoading = true;
|
||||
editPlan(postData).then(() => {
|
||||
editPlan(postData)
|
||||
.then(() => {
|
||||
getTableDate3();
|
||||
handleCancelStu();
|
||||
rest();
|
||||
state.addLoading = false;
|
||||
})
|
||||
.catch((err) => {
|
||||
state.loading = false;
|
||||
console.log(err);
|
||||
});
|
||||
state.cstm_hs = false;
|
||||
};
|
||||
|
||||
//编辑开课
|
||||
|
||||
@@ -2105,7 +2105,6 @@ export default {
|
||||
pid: state.routerId,
|
||||
type: 2,
|
||||
};
|
||||
debugger
|
||||
getStuPage(stuobj)
|
||||
.then((res) => {
|
||||
console.log("获取学员列表", res.data.data.total);
|
||||
|
||||
@@ -217,6 +217,23 @@
|
||||
<div v-if="hasTask">
|
||||
<div class="onerow">
|
||||
<div class="taskmain">项目概览</div>
|
||||
<a-popover title="项目信息">
|
||||
<template #content>
|
||||
<div class="setc_name"><span>项目名称：</span></div>
|
||||
<div class="setc_main">
|
||||
<span style="color: #999999">{{ name }}</span>
|
||||
</div>
|
||||
<div class="setc_name"><span>项目说明：</span></div>
|
||||
<div class="setc_main">
|
||||
<span style="color: #999999">{{ remark }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<div style="display:flex;justify-content: flex-start;margin-left: 10px;padding: 6px;">
|
||||
<div class="script" style="border: 1px solid #40a9ff;padding: 2px;">
|
||||
<span style="font-size: 16px; color: #40a9ff">项目说明</span>
|
||||
</div>
|
||||
</div>
|
||||
</a-popover>
|
||||
</div>
|
||||
<div class="second" style="margin-top: 0">
|
||||
<div class="nubbox">
|
||||
@@ -3212,6 +3229,7 @@ export default {
|
||||
state.total = res.data.data.total;
|
||||
let arr = res.data.data.rows;
|
||||
getTableDataList(arr);
|
||||
//
|
||||
state.loading = false;
|
||||
})
|
||||
.catch((err) => {
|
||||
@@ -3285,7 +3303,10 @@ export default {
|
||||
pageSize: 10,
|
||||
projectId: state.projectId,
|
||||
};
|
||||
getGroupList(objf).then((res) => { state.groupPageList = res.data.data.rows })
|
||||
getGroupList(objf).then((res) => {
|
||||
state.groupPageList = res.data.data.rows;
|
||||
setGroupList(res.data.data.rows)
|
||||
})
|
||||
};
|
||||
//删除小组
|
||||
const deleteGroupBtn = (projectGroupId) => {
|
||||
@@ -3298,13 +3319,17 @@ export default {
|
||||
const createGroup = async () => {
|
||||
console.log("state.groupPageList" + state.groupPageList)
|
||||
const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId);
|
||||
if (d.length > 0) {
|
||||
const id = state.groupInfo.id;
|
||||
// 过滤掉编辑时候，只修改了组员最大值时候
|
||||
if(id !== d[0].id) {
|
||||
if (d.length > 0 ) {
|
||||
return message.warn(d[0].leaderName + "已是小组长，请重新选择");
|
||||
}
|
||||
const id = state.groupInfo.id
|
||||
}
|
||||
await editGroup({ ...state.groupInfo, projectId: state.projectId })
|
||||
message.success(id ? '小组编辑成功' : "小组创建成功");
|
||||
getGroup();
|
||||
console.log("state.groupPageList:")
|
||||
getStu();
|
||||
};
|
||||
//搜索小组重置
|
||||
|
||||
Reference in New Issue
Block a user