-
取消
+
取消
发布
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 4dcc8621..00186c7a 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -44,7 +44,7 @@
已修证书
- {{ rank.certNum || 0 }}
+ {{ certificateNum || 0 }}
@@ -168,6 +168,10 @@ export default {
type: Number,
default: null,
},
+ certificateNum: {
+ type: Number,
+ default: null,
+ },
},
setup(props, ctx) {
const state = reactive({
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d4c861a0..b43d2f9c 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -14,7 +14,7 @@
-
+
@@ -304,6 +304,7 @@ import {
} from "@/api/ThirdApi";
import {
saveStu,
+ getAllStudentByProjectId,
// addGroupMember,
getStuPage,
} from "@/api/index1";
@@ -366,6 +367,7 @@ console.log("props.activeKey1" + props.activeKey1);
// 获取项目学员;
const procurrentPage = ref(1);
const projectList = ref([]);
+const allProjectStudent = ref([]);
const proStudentName = ref("");
const projectListTotal = ref(-1);
const projectPageSize = ref(10);
@@ -384,6 +386,16 @@ const projectRowSelection = computed(() => ({
onChange: onProjectSelectChange,
preserveSelectedRowKeys: true,
}));
+
+const getAllStudent = () => {
+ let params = {
+ projectId:props.id
+ };
+ getAllStudentByProjectId(params).then(res => {
+ allProjectStudent.value = res.data.data;
+ })
+};
+getAllStudent();
const getStu = () => {
let obj = {
studentName: proStudentName.value,
@@ -811,15 +823,16 @@ function handleStageOk() {
}
} else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length;
-
-
+ let arr = [...allProjectStudent.value].filter(x => [...selectsData.value.studentList].some(y => y.id === x.studentId));
+ if (arr.length > 0) {
+ message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
+ }
} else if (activeKey.value === 2) {
selectMember = selectsData.value.groupList.length;
} else if (activeKey.value === 3) {
selectMember = selectsData.value.deptList.length;
}
-
if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值");
}
@@ -839,7 +852,7 @@ function handleStageOk() {
stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList.concat(
- selectsData.value.projectMemberList
+ selectsData.value.projectMemberList
),
groupName: props.groupName,
groupId: props.groupId,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 9dcfc1de..c66686db 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,7 +63,7 @@
-
+
![]()
-
+
![]()
-
+
批量换组
-
+
导出学习信息
-
+
导出学习信息
-
+
![]()
-
+
批量调整关卡
-
+
-
批量操作
+
批量操作
+ :style="{ display: hideshow ? 'block' : 'none', color: '#fff', lineHeight: '9px', transform: 'rotate(180deg)'}"
+ >^
+ :style="{ display: hideshow ? 'none' : 'block', color: '#fff', lineHeight: '12px'}"
+ >^
-
+
导出作业
@@ -1004,7 +1004,7 @@ defineExpose({ getStuList, startLoading });
cursor: pointer;
.btnText {
- color: #4ea6ff;
+ color: #fff;
font-size: 14px;
font-weight: 400;
line-height: 40px;
@@ -1025,14 +1025,14 @@ defineExpose({ getStuList, startLoading });
.b_zk {
width: 10px;
height: 8px;
- background-image: url("@/assets/images/coursewareManage/down.png");
+ // background-image: url("@/assets/images/coursewareManage/down.png");
background-size: 100% 100%;
}
.b_sq {
width: 10px;
height: 8px;
- background-image: url("@/assets/images/coursewareManage/up.png");
+ // background-image: url("@/assets/images/coursewareManage/up.png");
background-size: 100% 100%;
}
}
@@ -1063,12 +1063,12 @@ defineExpose({ getStuList, startLoading });
white-space: nowrap;
}
- .btn4_tit:hover,
- .btn4_op1:hover,
- .btn4_op2:hover,
- .btn4_op3:hover {
- color: #4ea6ff;
- }
+ // .btn4_tit:hover,
+ // .btn4_op1:hover,
+ // .btn4_op2:hover,
+ // .btn4_op3:hover {
+ // color: #4ea6ff;
+ // }
}
}
}
@@ -1080,7 +1080,7 @@ defineExpose({ getStuList, startLoading });
width: 17px;
height: 18px;
margin-right: 5px;
- background-image: url("@/assets/images/coursewareManage/export.png");
+ background-image: url("@/assets/images/coursewareManage/export1.png");
}
}
}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 77f98431..7c53ae3f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -28,23 +28,11 @@ export function traverseArr(arr, traverseObj, saveOld = false) {
return newArr;
}
-const admin = [5, 6, 8, 9, 11, 12];
+// const admin = [5, 6, 8, 9, 11, 12];
//检查 管理权和归属权
-export function checkPer(per,createId) {
- if(createId && store?.state?.userInfo?.id === createId){
- return true;
- }
- if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) {
- return true;
- }
- if (store?.state?.userInfo?.isHrbp) {
- return true;
- }
- if (!per) {
- return false;
- }
- return (per + "").split(",").some(t => admin.some(s => s == t));
+export function checkPer() {
+ return true;
}
const adminOwner = [6, 9, 12];
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index e672aa0d..e7b6a5b8 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -284,7 +284,7 @@
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 40f92151..fa0efaaf 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -22,25 +22,25 @@
:key="index + new Date().getTime()"
>
{
const filterComObj = filterCommon(arr, "questionType");
+ console.log(filterComObj)
let resultObj = {};
for (let key in filterComObj) {
if (key === "1") {
@@ -415,72 +434,161 @@ export default {
};
const handleDel = ({ id, type, curItem }) => {
+
// 接口删除
+ // if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
+ // if (type === 1) {
+ // deleteChoiceQuestion({
+ // assessmentId: state.assessmentId,
+ // questionType: "1",
+ // orderNumber: curItem.orderNumber,
+ // }).then((res) => {
+ // if (res.data.code === 200) {
+ // virtualDel(id);
+ // }
+ // });
+ // }
+ // if (type === 2) {
+ // deleteChoiceQuestion({
+ // assessmentId: state.assessmentId,
+ // questionType: "2",
+ // orderNumber: curItem.orderNumber,
+ // }).then((res) => {
+ // if (res.data.code === 200) {
+ // virtualDel(id);
+ // }
+ // });
+ // }
+ // if (type === 3) {
+ // deleteQuestionScAndQa({
+ // assessmentId: state.assessmentId,
+ // questionType: "3",
+ // optionId: curItem.optionId,
+ // }).then((res) => {
+ // if (res.data.code === 200) {
+ // virtualDel(id);
+ // }
+ // });
+ // }
+ // if (type === 4) {
+ // deleteQuestionScAndQa({
+ // assessmentId: state.assessmentId,
+ // questionType: "4",
+ // optionId: curItem.optionId,
+ // }).then((res) => {
+ // if (res.data.code === 200) {
+ // virtualDel(id);
+ // }
+ // });
+ // }
+ // } else {
+ // virtualDel(id);
+ // }
if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
if (type === 1) {
- deleteChoiceQuestion({
- assessmentId: state.assessmentId,
- questionType: "1",
- orderNumber: curItem.orderNumber,
- }).then((res) => {
- if (res.data.code === 200) {
- virtualDel(id);
- }
- });
+ virtualDel(id);
}
if (type === 2) {
- deleteChoiceQuestion({
- assessmentId: state.assessmentId,
- questionType: "2",
- orderNumber: curItem.orderNumber,
- }).then((res) => {
- if (res.data.code === 200) {
- virtualDel(id);
- }
- });
+ virtualDel(id);
}
if (type === 3) {
- deleteQuestionScAndQa({
- assessmentId: state.assessmentId,
- questionType: "3",
- optionId: curItem.optionId,
- }).then((res) => {
- if (res.data.code === 200) {
- virtualDel(id);
- }
- });
+ virtualDel(id);
}
if (type === 4) {
- deleteQuestionScAndQa({
- assessmentId: state.assessmentId,
- questionType: "4",
- optionId: curItem.optionId,
- }).then((res) => {
- if (res.data.code === 200) {
- virtualDel(id);
- }
- });
+ virtualDel(id);
}
} else {
virtualDel(id);
}
};
const virtualDel = (id) => {
+ // 前端删除
+ // state.allFormsData.forEach((item, index) => {
+ // if (item.id === id) {
+ // state.allFormsData.splice(index, 1);
+ // }
+ // });
+ // state.allFormsData.map((item, index) => {
+ // item.id = index + 1;
+ // return item;
+ // });
// 前端删除
state.allFormsData.forEach((item, index) => {
if (item.id === id) {
- state.allFormsData.splice(index, 1);
+ state.allFormsData[index].deleted = true;
}
});
- state.allFormsData.map((item, index) => {
- item.id = index + 1;
- return item;
- });
};
+ // 处理id为空的字段
+ const formatID = (data) => {
+ let obj = {}
+ for(let i in data){
+ if(i=="assessmentSingleChoiceDtoList"){
+ let arr1 = []
+ for(let k=0;k {
let resultPost = {};
- let filterData = parseItem(restData(state.allFormsData, "type"));
+ let filterData = formatID(parseItem(restData(state.allFormsData, "type")));
+ // 处理id为undefined得字段
+ console.log('mmmmmmmmm------->',filterData)
// 校验
if (!checkVal(filterData)) {
return false;
@@ -489,7 +597,7 @@ export default {
if (state.assessmentId) {
resultPost = {
- assessmentId: state.assessmentId,
+ id: state.assessmentId,
assessmentName: state.assessmentName,
assessmentMark: state.valueMore,
...filterData,
@@ -498,6 +606,7 @@ export default {
"assessmentMaxScore",
"assessmentMinScore",
]);
+
editResearchMessage(resultPost).then((res) => {
state.loading = false;
if (res.data.code === 200) {
@@ -576,6 +685,9 @@ export default {
}
console.log("CountNum");
console.log(CountNum);
+ if(CountNum>100){
+ CountNum = 100;
+ }
if (CountNum !== 100) {
message.error("当前权重设置是百分制 请重新配置");
return false;
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 28b4eb0c..e52e547c 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -65,29 +65,68 @@
:pagination="false"
>
-
- 发布
+
+ 发布
- 编辑
+ 编辑
- 基础信息
+ 基础信息
- 管理
+ 管理
- 复制
+ 复制
- 撤回
+ 撤回
- 结束
+ 结束
- 删除
+ 删除
@@ -115,7 +154,7 @@
>
-
+
{{ !formData.id ? "创建" : "编辑" }}评估
-
+
{{ !formData.id ? "下一步" : "确定" }}
-
+