diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 7f7cf7dc..9f79593a 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -24,18 +24,26 @@
-
+
+

+
搜索
-
+
+

+
重置
@@ -86,9 +94,9 @@
@@ -97,19 +105,27 @@
-
+
+

+
搜索
-
+
+

+
重置
@@ -168,6 +184,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ce4d23a0..f8eaf142 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -500,7 +500,7 @@
公告内容
a.stutime - b.stutime,
- multiple: 3,
- },
- },
- {
- title: "加入方式",
- dataIndex: "putin",
- key: "putin",
- width: 40,
- align: "center",
- className: "h",
- },
- {
- title: "操作",
- dataIndex: "operations",
- key: "operations",
- width: 60,
- align: "center",
- className: "h",
- },
- ],
+
//进度排行学员
rankjindu: [{ value: "学员", label: "学员" }],
valuestu1: "学员",
@@ -1638,12 +1566,12 @@ export default {
checkedd2: false, //设置按钮2
radioV1: "",
radioV2: "",
- activeKey: "2",
+ activeKey: "3",
activeKey1: "8",
valueName: "", //排行榜输入姓名
valueDate: "", //排行榜输入日期
noticeChecked: true,
- noticeContent: "请输入要发布的公告",
+ noticeContent: "",
//进度排行表
jindutabledata: [
@@ -2185,6 +2113,160 @@ export default {
state.radioV2 = "";
}
};
+
+ //学员管理列表操作
+ const studentData = () => {
+ let arr = state.tabledata;
+ arr.map((value) => {
+ value.operation = (
+
+
+ {value.excellent ? "取消优秀" : "优秀学员"}
+
+
+
查看
+
+
+
+ 换组
+
+
+ {
+ console.log("点击了111");
+ }}
+ >
+ 删除
+
+
+
+
+
+ );
+ });
+ state.tabledata = arr;
+ // console.log("state.tabledata", state.tabledata);
+ };
+ studentData();
+ const studentColumns = () => {
+ const tablecolumns = [
+ {
+ title: "姓名",
+ dataIndex: "name",
+ key: "name",
+ width: 50,
+ align: "left",
+ className: "h",
+ // scopedSlots: { customRender: "action" }, //引入的插槽
+ customRender: (text) => {
+ console.log(text.excellent);
+ return (
+
+ {text.record.excellent ? (
+
+
{text.value}
+
+
![]()
+
优秀
+
+
+ ) : (
+
+ {text.value}
+
+ )}
+
+ );
+ },
+ },
+ {
+ title: "部门",
+ dataIndex: "bum",
+ key: "bum",
+ width: 40,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "岗位",
+ dataIndex: "gangw",
+ key: "gangw",
+ width: 40,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "所属小组",
+ dataIndex: "group",
+ key: "group",
+ width: 40,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "进度",
+ dataIndex: "progress",
+ key: "progress",
+ width: 30,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "证书",
+ dataIndex: "diploma",
+ key: "diploma",
+ width: 30,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "最近学习时间",
+ dataIndex: "stutime",
+ key: "stutime",
+ width: 50,
+ align: "center",
+ className: "h",
+ // sorter: {
+ // compare: (a, b) => a.stutime - b.stutime,
+ // multiple: 3,
+ // },
+ },
+ {
+ title: "加入方式",
+ dataIndex: "putin",
+ key: "putin",
+ width: 40,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "操作",
+ dataIndex: "operation",
+ key: "operation",
+ width: 60,
+ align: "center",
+ className: "h",
+ },
+ ];
+ return tablecolumns;
+ };
+
return {
...toRefs(state),
showModal,
@@ -2211,6 +2293,7 @@ export default {
edit_exit,
cloradio1,
cloradio2,
+ studentColumns,
};
},
};
@@ -2998,7 +3081,7 @@ export default {
}
.taskSyllabus {
// flex: 1;
- overflow-x: scroll;
+ overflow-x: auto;
.ant-collapse {
border: 0px;
@@ -3362,6 +3445,101 @@ export default {
// position: absolute;
// bottom: 20px;
}
+
+ .studentName {
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.65);
+ line-height: 22px;
+ }
+ .studentExcellent {
+ width: 64px;
+ height: 24px;
+ border-radius: 2px;
+ border: 1px solid #ffb64e;
+ background-color: rgba(255, 182, 78, 0.1);
+ margin-left: 24px;
+ display: flex;
+ align-items: center;
+ .studentExcellentImg {
+ width: 13px;
+ height: 14px;
+ margin-left: 8px;
+ }
+ .studentExcellentT {
+ font-size: 12px;
+ font-weight: 400;
+ color: #ffb64e;
+ line-height: 17px;
+ margin-left: 5px;
+ }
+ }
+
+ .studentopea1 {
+ font-size: 14px;
+ font-weight: 400;
+ color: #387df7;
+ line-height: 22px;
+ padding-right: 8px;
+ border-right: 1px solid #e9e9e9;
+ cursor: pointer;
+ }
+ .studentopea2 {
+ font-size: 14px;
+ font-weight: 400;
+ color: #387df7;
+ line-height: 22px;
+ padding-right: 8px;
+ padding-left: 8px;
+ border-right: 1px solid #e9e9e9;
+ cursor: pointer;
+ }
+ .studentSelect {
+ margin-left: 8px;
+ display: inline-block;
+
+ .ant-select:not(.ant-select-customize-input)
+ .ant-select-selector
+ .ant-select-selection-search-input {
+ background-color: rgba(255, 255, 255, 0);
+ border: none;
+ }
+
+ .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+ background-color: rgba(255, 255, 255, 0);
+ border: none;
+ }
+
+ .ant-select-single:not(.ant-select-customize-input)
+ .ant-select-selector {
+ padding: 0;
+ }
+
+ .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
+ .ant-select-selector {
+ box-shadow: none;
+ }
+
+ .ant-select-arrow {
+ right: 0px;
+ color: rgba(56, 125, 247, 1);
+ font-size: 14px;
+ line-height: 36px;
+ // top: 17px;
+ top: 15px;
+ }
+
+ .ant-select-selection-item {
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(56, 125, 247, 1);
+ line-height: 33px;
+ }
+
+ .ant-select-single.ant-select-open .ant-select-selection-item {
+ color: rgba(56, 125, 247, 1);
+ }
+ }
}
.groupmain {
display: flex;
@@ -3706,7 +3884,7 @@ export default {
.set_edit {
.ant-modal {
width: 866px !important;
- height: 870px !important;
+ height: 870px !important;
.ant-modal-body {
.modalHeader {
background: linear-gradient(