diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index fbc24f68..2e9052b6 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -445,6 +445,7 @@ export default { const getTableData = () => { // debugger + console.log('当前是项目还是路径图 1 路径图 2 项目', props) console.log('当前是项目还是路径图 1 路径图 2 项目', props.types) if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 @@ -458,7 +459,7 @@ export default { taskType: props.datasource.type, status: state.projectName, studentName: state.name, - signStatus: state.projectName2 + signStatus: state.projectName2, }); api .AssessmentManagementMessage({ @@ -471,7 +472,7 @@ export default { taskType: props.datasource.type, status: state.projectName, studentName: state.name, - signStatus: state.projectName2 + signStatus: state.projectName2, }) .then((res) => { console.log(res); @@ -499,7 +500,7 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, - taskId: props.datasource.projectTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -512,7 +513,7 @@ export default { currentStageId: props.datasource.stageId, type: 1, // 1项目 2 路径 pid: props.datasource.projectId, - taskId: props.datasource.projectTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -758,7 +759,7 @@ export default { courseId: Number(props.datasource.courseId), routerId: Number(props.datasource.projectId), ids: [value.record.studentId], - taskId: Number(props.datasource.projectTaskId), + taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), type: 2, }; diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 672a48e6..eb4a3a92 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -27,10 +27,15 @@
+
+
+
@@ -99,6 +104,7 @@ const columns = ref([ ]) const initParams = { keyWord: '', + authorName: '', pageIndex: 1, pageSize: 10, orderAsc: true @@ -148,8 +154,12 @@ const rowSelection = computed(() => ({ selectedRowKeys: rowSelectKeys.value, onChange: onSelectChange, preserveSelectedRowKeys: true, + getCheckboxProps: getCheckboxProps })); - +const getCheckboxProps = () => ({ + // 某几项默认禁止选中(R: 当state等于1时) + disabled: false +}) function onSelectChange(e, l) { rowSelectKeys.value = e; selectsData.value = l; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 34c43294..313b554d 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -18,43 +18,25 @@ />
-
- - -
-
+
-
+
@@ -68,7 +50,6 @@
-
- + {{ formData.examinationTestName }}
@@ -116,8 +97,8 @@ style="width: 400px; height: 40px; border-radius: 8px" :show-time="{format:'hh:mm'}" :disabled-date="disabledDate" - :disabled-time="disabledRangeTime" - format="YYYY/MM/DD HH:mm" + format="YYYY-MM-DD HH:mm" + valueFormat="YYYY-MM-DD HH:mm" v-model:value="dateTime" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" @@ -136,7 +117,6 @@
允许重复考试:
@@ -232,7 +208,6 @@
@@ -247,7 +222,6 @@
@@ -264,7 +238,6 @@
@@ -292,7 +265,7 @@
取消 - 确定 - 确定 + 确定
- -
- -
- -
+ diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue new file mode 100644 index 00000000..8bb43ba0 --- /dev/null +++ b/src/components/drawers/CommonTest.vue @@ -0,0 +1,695 @@ + + + diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index bebbbcf2..de2867a1 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -163,7 +163,12 @@ const rowSelection = computed(() => ({ selectedRowKeys: rowSelectKeys.value, onChange: onSelectChange, preserveSelectedRowKeys: true, + getCheckboxProps: getCheckboxProps })); +const getCheckboxProps = () => ({ + // 某几项默认禁止选中(R: 当state等于1时) + disabled: false +}) function onSelectChange(e, l) { rowSelectKeys.value = e; diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index dca1f0f7..c89e0734 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -37,6 +37,8 @@ :showUploadList="false" :data="{ type: type, + taskId: Number(id), + workId: datesource.info.id, targetId: Number(id), }" > @@ -148,8 +150,7 @@ display: flex; align-items: center; width: 500px; - height: 40px; - " + height: 40px;" :style="{ background: errNum ? 'rgba(255, 116, 116, 0.1)' @@ -199,6 +200,12 @@ export default { type: Boolean, default: false, }, + datesource: { + type: Object, + default: function () { + return {}; + }, + }, //type=3:面授课 type: { type: String, @@ -240,6 +247,7 @@ export default { const afterVisibleChange = (bool) => { console.log("state", bool); + console.log(props.datesource) }; //上传文件 diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 8b474718..b34611c5 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -8,7 +8,7 @@ >
-
组员名单
+
组员名单1
{ - deleteOne(value.record.key); + deleteOne(value.record.key,value.record); }} > 删除 @@ -323,12 +323,17 @@ export default { }; //点击确认批量删除弹窗 const sureDeModal = () => { + // 判断选择的人员中是否有小组长 + let arr = [...state.tabledata].filter(x => [...state.selectedRowKeys].some(id => id === x.key)).filter(item => item.leaderId !== null); + if (arr.length > 0) { + return message.warning("选择人员中:"+arr[0].name + "是小组长,请勿删除!"); + } + console.log(arr) let obj = { projectGroupId: props.chooseGroupId, projectId: props.projectId, ids: state.selectedRowKeys, }; - delGroupStudent(obj) .then((res) => { console.log(res, "删除成功"); @@ -362,6 +367,7 @@ export default { groupId: value.groupId, //小组id group: value.groupName, //小组名 studentId: value.studentId, //学生id + leaderId: value.leaderId, //小组长 currentStageId: value.currentStageId, //当前关卡id name: value.studentName, //用户名 bum: value.studentDepartName, //部门 @@ -471,8 +477,11 @@ export default { //重新获取列表 getStu(); }; - const deleteOne = (id) => { - // console.log(id, "fewfew"); + const deleteOne = (id,row) => { + console.log("row", row); + if (row.leaderId !== null) { + return message.warning(""+row.name + "是小组长,请勿删除!"); + } console.log(`${id}`); state.deone = true; state.selectedRows = []; diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 82017f3b..89221cfd 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -1,22 +1,14 @@