-
@@ -1721,15 +1827,10 @@ import { useStore } from "vuex";
const columns1 = [
{
title: "课程编号",
- width: 100,
- dataIndex: "num",
- key: "num",
+ width: 130,
+ dataIndex: "offcourseNumber",
+ key: "offcourseNumber",
align: "center",
- customRender: ({ index, record }) => {
- const pageNum =
- Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
- return index + 1 + pageNum;
- },
},
{
title: "名称",
@@ -1790,7 +1891,7 @@ const columns1 = [
{
title: "学习人数",
width: 130,
- dataIndex: "stunum",
+ dataIndex: "studentCnt",
key: "4",
align: "center",
customRender: ({ text }) => {
@@ -2098,7 +2199,6 @@ const columns6 = [
return text ? text : "-";
},
},
- // 新加学员数
{
title: "学员数",
dataIndex: "studentCnt",
@@ -2385,18 +2485,19 @@ export default defineComponent({
customRender: ({ record }) => {
return (
- {record.workScore ? (
+ {record.workScore === -2 ? (
+ "-"
+ ) : record.workScore ? (
{record.workScore}
) : (
- // {
- // handlJoinStu(record);
- // }}
- // >
- // 成绩录入
- //
-
+ {
+ handlJoinStu(record);
+ }}
+ >
+ 成绩录入
+
)}
);
@@ -2426,15 +2527,35 @@ export default defineComponent({
key: "8",
align: "center",
},
- // 2023-1-12 隐藏 后面放开
- // {
- // title: "结业状态",
- // width: "15%",
- // dataIndex: "completionStatus",
- // key: "8",
- // align: "center",
- // customRender: ({ record }) =>
{{1:'结业'}[record.completionStatus] || '-'}
,
- // },
+ {
+ title: "结业状态",
+ width: "15%",
+ dataIndex: "completionStatus",
+ key: "8",
+ align: "center",
+ customRender: ({ record }) => {
+ return (
+
+ {record.finishStatus == 1 &&
+ record.workScore != -2 &&
+ record.signStatus == 1 ? (
+
{
+ handleOverStu(record);
+ }}
+ >
+ 结业
+
+ ) : record.completionStatus == 1 ? (
+
已结业
+ ) : (
+
-
+ )}
+
+ );
+ },
+ },
],
shipType: 1,
addLoading: false,
@@ -2688,6 +2809,7 @@ export default defineComponent({
regisCom: false,
comLeave: false,
studentId: 0,
+ homeWorkId: null,
studentItem: {},
addOnlineCoursevisible: false, //新建面授弹窗
@@ -3080,6 +3202,7 @@ export default defineComponent({
endTime: endTime,
beginTime: startTime,
});
+ console.log("获取面授课列表", res);
const { rows, total, pageNo } = res.data.data;
console.log(res.data.data);
state.tableDataTotal1 = total;
@@ -3191,7 +3314,7 @@ export default defineComponent({
state.scoreId = itm.id;
};
const handleOverStu = (itm) => {
- console.log(itm);
+ console.log("点击结业", itm);
state.studentId = itm.studentId;
state.studentItem = itm;
@@ -3964,7 +4087,7 @@ export default defineComponent({
state.kk_eidt = true;
};
const handelGuan = (itm) => {
- console.log(676766);
+ console.log("开课信息", itm);
state.offcourseId = itm.offcourseId;
state.offcoursePlanId = itm.offcoursePlanId;
state.studentId = itm.studentId;
@@ -3977,6 +4100,7 @@ export default defineComponent({
state.sm_hs = true;
// getTableDate2();
+ state.homeWorkId = itm.homeWorkId;
};
const sm_exit = () => {
state.sm_hs = false;
@@ -4061,16 +4185,18 @@ export default defineComponent({
if (state.rg_hs) {
if (state.piliang) {
api1.updateStudent({
- score: state.lrcj_inputV1,
- id: state.scoreId,
+ workScore: state.lrcj_inputV1,
+ workId: state.homeWorkId,
+ studentId: state.studentId,
});
getTableDate2();
delete_exit1();
} else {
api1
.updateStudent({
- score: state.lrcj_inputV1,
- id: state.scoreId,
+ workScore: state.lrcj_inputV1,
+ workId: state.homeWorkId,
+ studentId: state.studentId,
})
.then((res) => {
console.log("成绩录入", res);
@@ -4090,17 +4216,20 @@ export default defineComponent({
};
const handleJie = async () => {
if (state.graduate_hs) {
- handleStudent({
- offcoursePlanId: state.offcoursePlanId,
- score: "",
- studentIds: [state.studentId],
- type: 2,
- }).then((res) => {
- if (res.data.code === 200) {
- getTableDate2();
- delete_exit1();
- }
- });
+ // state.studentItem.id
+ // console.log("state.studentItem.id", state.studentItem.id);
+ api1
+ .batchUpdateStatus({
+ completionStatus: 1,
+ ids: [state.studentItem?.id],
+ // status: 1,
+ })
+ .then((res) => {
+ if (res.data.code === 200) {
+ getTableDate2();
+ delete_exit1();
+ }
+ });
}
};
//确认复制
@@ -7459,24 +7588,24 @@ export default defineComponent({
margin-bottom: 20px;
}
- .tableSelect {
- position: relative;
- .hoverList {
- display: none;
- }
- &:hover {
- .hoverList {
- display: block;
- position: absolute;
- top: 20px;
- left: -20px;
- background: #fff;
- box-sizing: border-box;
- // padding: 20px;
- color: #000000;
- }
- }
- }
+.tableSelect {
+ position: relative;
+ .hoverList {
+ display: none;
+ }
+ &:hover {
+ .hoverList {
+ display: block;
+ position: absolute;
+ top: 20px;
+ left: -20px;
+ background: #fff;
+ box-sizing: border-box;
+ // padding: 20px;
+ color: #000000;
+ }
+ }
+}
// ::v-deep .w-e-toolbar {
// .w-e-bar-item {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 72fe02d3..99b889fd 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -202,7 +202,7 @@
-
+
+
@@ -331,7 +331,7 @@
-
+
{
- if(store.state.userInfo.departId && store.state.userInfo.departName){
+ if (store.state.userInfo.departId && store.state.userInfo.departName) {
state.organizationSelectName = store.state.userInfo.departName;
state.organizationSelectId = store.state.userInfo.departId;
}
@@ -867,7 +864,7 @@ export default {
const handleOut1 = () => {
state.pathName = "";
state.pathBg = "";
- state.pathBgId =1;
+ state.pathBgId = 1;
state.organizationSelectName = null;
state.organizationSelectId = null;
state.pathIntro = "";
@@ -905,13 +902,15 @@ export default {
console.log("err", err);
});
//获取学员列表
- apiStu.projectStudentCount({
+ apiStu
+ .projectStudentCount({
pid: router.id,
- type:2
- }).then((res) => {
- state.routeStudentsNum = res.data.data;
- state.pubLoading = false;
+ type: 2,
})
+ .then((res) => {
+ state.routeStudentsNum = res.data.data;
+ state.pubLoading = false;
+ });
};
//确定发布
const releaseLearnPath = () => {
@@ -1248,21 +1247,31 @@ export default {
{
- 权限名单
+
+ 权限名单
+
- 查看权
+
+ 查看权
+
- 管理权
+
+ 管理权
+
- }
+ }
{text.record.state === "草稿" ? (
@@ -1429,7 +1438,7 @@ export default {
state.organizationSelectId = e;
};
//创建学习路径图
- const createLearnPath = async() => {
+ const createLearnPath = async () => {
if (!state.pathName) {
message.destroy();
return message.warning("请输入路径图名称");
@@ -1447,11 +1456,11 @@ export default {
message.warning("路径图名称重复");
return;
}
- const offName = await validateName({
+ const offName = await validateName({
name: state.pathName,
type: 3,
- id:state.editPathId,
- }).then(res => {
+ id: state.editPathId,
+ }).then((res) => {
return res.data.data == 1;
});
if (offName) {
@@ -1590,17 +1599,16 @@ export default {
arr.forEach((item) => {
if (item.dictValue === state.pathBg) {
state.pathBgId = item.dictCode;
-
}
});
//for (let i = 0; i < arr.length; i++) {
- // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+ // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
// if (arr[i].dictValue === state.pathBg) {
- // state.pathBgId = arr[i].dictCode;
+ // state.pathBgId = arr[i].dictCode;
- // }
- // }
+ // }
+ // }
}
})
.catch((err) => {
@@ -1637,8 +1645,8 @@ export default {
const offName = await validateName({
name: state.pathName,
type: 3,
- id:state.editPathId,
- }).then(res => {
+ id: state.editPathId,
+ }).then((res) => {
return res.data.data == 1;
});
if (offName) {
@@ -1720,7 +1728,7 @@ export default {
state.searchdate = null;
state.startTime = null;
state.endTime = null;
- state.createUser=null;
+ state.createUser = null;
getLearnPath();
};
@@ -1778,7 +1786,7 @@ export default {
// state.imgData = ;
// }
});
- const imgData = computed(()=>store.state.pathmapPic)
+ const imgData = computed(() => store.state.pathmapPic);
//添加权限
watch(
() => state.addAuthList,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index e1c73675..932083ee 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1388,7 +1388,6 @@ export default {
const router = useRouter();
// const store = useStore();
const state = reactive({
- pjModelVisible: false,
hasTask: false,
stage: [],
statess: [],
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 55a671e4..4af94c18 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2836,7 +2836,6 @@ export default {
facestudent: "",
modal1Visible: false, // 证书预览
-
changegroupV: false, //换组弹窗
});