diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
index 8a53f09a..5e55d884 100644
--- a/src/components/drawers/ AssessmentList.vue
+++ b/src/components/drawers/ AssessmentList.vue
@@ -104,7 +104,9 @@ export default {
watch(
props,
(newVal) => {
- state.selectedRowKeys = [newVal.assessmentId];
+ state.selectedRowKeys = newVal.assessmentId
+ ? [newVal.assessmentId]
+ : [];
},
{ deep: true }
);
@@ -218,7 +220,8 @@ export default {
};
array.push(obj);
});
- (state.selectedRowKeys = []), (state.tableData = array);
+ // (state.selectedRowKeys = []), (state.tableData = array);
+ state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d0c24022..8c6969da 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2302,6 +2302,25 @@
+
完成规则
@@ -3082,6 +3101,7 @@ import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
import ProjOwnerShip from "../../components/drawers/ProjectOwn";
import ProjPowerList from "../../components/drawers/ProjPowerList";
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
+import AssessmentList from "../../components/drawers/ AssessmentList.vue";
import {
list,
edit,
@@ -3621,6 +3641,7 @@ export default defineComponent({
ProjOwnerShip,
ProjPowerList,
ProjCheckShip,
+ AssessmentList,
// VNodes: (_, {attrs}) => {
// return attrs.vnodes;
// },
@@ -3884,6 +3905,11 @@ export default defineComponent({
addStudentList: null, //选中列表
newCourseName: null, //新建开课名称
+
+ assessment: {},
+ assessmentId: null,
+ assessmentName: "",
+ assessmentVisible: false,
});
const showStuAdd = (record) => {
@@ -4264,6 +4290,24 @@ export default defineComponent({
});
};
+ const showAssessment = () => {
+ state.assessmentVisible = true;
+ };
+ const removePG = () => {
+ console.log("11111");
+ state.assessmentId = null;
+ state.assessmentName = "";
+ // state.isEvaluate = "0";
+ };
+ const getCheckedAss = (ass) => {
+ console.log("ass");
+ console.log(ass);
+ state.assessmentId = ass.assessmentId;
+ state.assessmentName = ass.name;
+ state.assessment = ass;
+ // state.assessment1 = null;
+ };
+
const rest = () => {
options4CurName.value = "";
options4CurId.value = "";
@@ -4712,6 +4756,7 @@ export default defineComponent({
state.xjkkinputV4 = null;
state.checked1 = false;
state.checked4 = false;
+ removePG();
};
//保存开课
const handleSureStu = () => {
@@ -4735,6 +4780,7 @@ export default defineComponent({
completeType: type,
endTime: endTime,
evalFlag: state.checked4 ? 1 : 0,
+ evaluateId: Number(state.assessmentId),
name: state.xjkkinputV1,
signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
// signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
@@ -4792,6 +4838,7 @@ export default defineComponent({
(state.comLeave =
item.completeType.split(",")[1] == "1" ? true : false),
(state.checked4 = item.evalFlag === 1 ? true : false);
+ state.assessmentId = String(item.evaluateId);
state.xjkkinputV1 = item.name;
if (item.signFlag === 1) {
//是否允许未报名的签到:1是0否
@@ -5681,6 +5728,9 @@ export default defineComponent({
handelChangePage1,
handleSearch1,
handleRest1,
+ showAssessment,
+ removePG,
+ getCheckedAss,
beforeUpload,
beforeUpload2,
handleDel,
@@ -8037,6 +8087,42 @@ export default defineComponent({
}
}
+// 选择评估
+.main_item {
+ display: flex;
+ align-items: center;
+ margin-top: 32px;
+ margin-bottom: 32px;
+
+ .signbox {
+ width: 120px;
+ display: flex;
+ justify-content: end;
+ align-items: center;
+
+ .sign {
+ margin-right: 5px;
+ }
+ }
+
+ .btnbox {
+ display: flex;
+ flex: 1;
+ align-items: center;
+
+ .xkbtn {
+ cursor: pointer;
+ width: 130px;
+ height: 40px;
+ background: #388be1;
+ border-radius: 8px;
+ border: 0;
+ margin-right: 8px;
+ color: #fff;
+ }
+ }
+}
+
.DelModal {
.ant-modal {
.ant-modal-content {