-->
+
@@ -169,7 +169,7 @@
: item.type === 12
? require('../../assets/images/leveladd/tou.png')
: item.type === 13
- ? require('../../assets/images/leveladd/diao.png')
+ ? require('../../assets/images/leveladd/xiangmu.png')
: null
"
/>
@@ -296,6 +296,7 @@ export default {
"测评",
"评估",
"投票",
+ "项目",
];
return typeRules[type];
}
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 89221cfd..fc44574f 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -110,6 +110,8 @@
? require('../../assets/images/leveladd/tou.png')
: item.course === '评估'
? require('../../assets/images/leveladd/diao.png')
+ : item.course === '项目'
+ ? require('../../assets/images/leveladd/xiangmu.png')
: null
" />
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index e28e9ae9..7b0cfbde 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -186,7 +186,7 @@ const disabledDate = (current) => {
};
const disabledRangeTime = () => ({
- disabledHours: () => range(0, 24).splice(4, 20),
+ // disabledHours: () => range(0, 24).splice(4, 20),
disabledMinutes: () => range(30, 60),
disabledSeconds: () => [55, 56],
});
From 99850c2776c2da1e1001bf8992e5f3a3aad89790 Mon Sep 17 00:00:00 2001
From: lixg
Date: Wed, 22 Feb 2023 16:34:31 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/student/TableStudent.vue | 51 +++++++++++++------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index df9bb71c..99c10a30 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -231,7 +231,13 @@
type="link"
>拒绝
- 删除
+ 删除
@@ -247,9 +253,9 @@
@@ -362,13 +368,13 @@ import ExportHomeWork from "../Modals/ExportHomeWork.vue";
import * as api from "../../api/index1";
import ImpStu from "../drawers/AddLevelImportStu";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import {checkPer} from "@/utils/utils";
+import { checkPer } from "@/utils/utils";
const props = defineProps({
type: Number,
- permissions:{
+ permissions: {
type: String,
- default: ''
+ default: "",
},
id: String,
columns: {
@@ -455,7 +461,7 @@ const tablecolumns = ref([
title: "所属小组",
dataIndex: "groupName",
key: "groupName",
- width: props.type===1?100:0,
+ width: props.type === 1 ? 100 : 0,
align: "center",
className: "h",
ellipsis: true,
@@ -533,10 +539,8 @@ const stuRowSelection = computed(() => ({
preserveSelectedRowKeys: true,
}));
-
-
//显示学员换组弹窗
-function showChangeGroupModal () {
+function showChangeGroupModal() {
// debugger
checkgroupParam.value.changegroupV = true;
}
@@ -547,12 +551,12 @@ function exportTaskStu() {
window.open(
`${
process.env.VUE_APP_BASE_API
- }/admin/student/exportTaskStudent?type=${1}&pid=${props.targetId}`
+ }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
);
}
function exportTaskStuRouter() {
- console.log("props.datasource", props);
+ console.log("props.datasource", props, props.id);
window.open(
`${
process.env.VUE_APP_BASE_API
@@ -619,7 +623,7 @@ function bathDel() {
return message.warning("请先选中学员");
}
tableData.value.loading = true;
- delStudentList({ids: stuSelectKeys.value,}).then(() => getStuList());
+ delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
}
function del(id) {
@@ -631,7 +635,7 @@ function del(id) {
okType: "danger",
cancelText: () => "取消",
onOk() {
- if(id){
+ if (id) {
tableData.value.loading = true;
delStudentList({ ids: [id] }).then(() => getStuList());
}
@@ -754,14 +758,13 @@ const exportHomeWorkShow = () => {
//导出
const exportStu = () => {
console.log("props.datasource", props);
- if (props.id!=undefined) {
+ if (props.id != undefined) {
window.open(
- `${
- process.env.VUE_APP_BASE_API
- }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
- );
+ `${
+ process.env.VUE_APP_BASE_API
+ }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
+ );
}
-
};
//批量操作 结业、通过、拒绝等
@@ -803,11 +806,11 @@ const AddImpStuvisibleClose = (isget) => {
if (isget) {
getStuList();
}
-}
-function startLoading(){
+};
+function startLoading() {
tableData.value.loading = true;
}
-defineExpose({getStuList,startLoading})
+defineExpose({ getStuList, startLoading });
\ No newline at end of file
+
From 5cdafdcbdfebdd7b5a2e94024b89e45e6ab819b7 Mon Sep 17 00:00:00 2001
From: lpq
Date: Wed, 22 Feb 2023 22:31:26 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=95=BF=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/student/TableStudent.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 1f41522c..779e9448 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -630,7 +630,7 @@ function bathDel() {
return message.warning("选择人员中："+arr[0].studentName + "是小组长，请勿删除!");
}
tableData.value.loading = true;
-// delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
+ delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
}
function del(id,row) {
From f1e85d27a56ee6a8b77f9d7a62f2f7bf49f1df16 Mon Sep 17 00:00:00 2001
From: lpq
Date: Wed, 22 Feb 2023 22:42:40 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E7=BB=84=E5=91=98=E4=BA=BA=E6=95=B0?=
=?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/student/CommonStudent.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 47fc06d2..960b0dc7 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -897,8 +897,9 @@ const submitAuth = () => {
};
function handleStageOk() {
- // 判断添加人数是否已超过限制人数
- if (props.groupMemberCount < selectsData.value.projectMemberList.length + props.groupMemberNumber) {
+ debugger
+ // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
+ if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) {
return message.warning("添加小组学员超过最大值");
}
// 对选中的人员进行判断是否已经分组了
From a3618b8bd975ba3e5a495aa60bc20d1fe0adb568 Mon Sep 17 00:00:00 2001
From: lpq
Date: Wed, 22 Feb 2023 23:49:53 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=A4=96=E9=93=BE=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../drawers/project/ProjectOnlineManage.vue | 16 ++++++++--------
src/components/student/CommonStudent.vue | 1 -
src/components/vote/AddVote.vue | 1 +
src/components/vote/CreateVote.vue | 3 +++
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 16bbc9ca..cdfe8fcc 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -348,8 +348,8 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
- taskId: props.datasource.projectTaskId,
- taskType: props.datasource.type,
+ taskId: props.datasource.id,
+ taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
@@ -360,8 +360,8 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
- taskId: props.datasource.projectTaskId,
- taskType: props.datasource.type,
+ taskId: props.datasource.id,
+ taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
@@ -409,9 +409,9 @@ export default {
// 处理在线课字段和表格中字段保持一致
let obj = {
studentUserNo: res.data.data.studyDetailList[i].studentCode,
- studentName: res.data.data.studyDetailList[i].studentName,
- studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
- studentJobName: res.data.data.studyDetailList[i].studentJobName,
+ studentName: res.data.data.studyDetailList[i].studentName,
+ studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
+ studentJobName: res.data.data.studyDetailList[i].studentJobName,
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
}
@@ -709,4 +709,4 @@ export default {
}
}
-
+
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 960b0dc7..fbcc2eb7 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -897,7 +897,6 @@ const submitAuth = () => {
};
function handleStageOk() {
- debugger
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) {
return message.warning("添加小组学员超过最大值");
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index e28e9ae9..b5d9224b 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -193,6 +193,7 @@ const disabledRangeTime = () => ({
async function confirm() {
+ debugger
await validate().catch(({errorFields}) => {
message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过")
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 39771f6a..2d691c91 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -82,6 +82,7 @@ const emit = defineEmits({})
const formData = ref({list: [{}]})
const initData = ref({list: [{}]})
+debugger
console.log(prop.options.length);
const visible = ref(false)
@@ -118,6 +119,7 @@ const closeDrawer = () => {
};
async function confirm() {
+ debugger
console.log('confirm');
initData.value = JSON.parse(JSON.stringify(formData.value));
emit('update:options', formData.value.list)
@@ -126,6 +128,7 @@ async function confirm() {
}
function handleAdd() {
+ debugger
formData.value.list.push({})
}
From b8bf1cd2ddffdc27acd5feb35cf7a5865ba8a207 Mon Sep 17 00:00:00 2001
From: lpq
Date: Thu, 23 Feb 2023 00:24:50 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=9C=AA=E7=BB=93?=
=?UTF-8?q?=E6=9D=9F=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../router/RouterExaminationManage.vue | 47 ++++++++++++++-----
1 file changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index 879d30a9..80537f8b 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -61,7 +61,7 @@
催促考试