From f49a4cbcb040af37232c19f3da147e1816cf98ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Sat, 22 Oct 2022 15:12:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/StuAdd.vue | 173 ++++++++++---- src/views/projectcenter/TaskPage.vue | 344 ++++++++++++++++++++------- 2 files changed, 391 insertions(+), 126 deletions(-) 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 @@
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
+
+ 李明 +
+
李明
@@ -201,7 +289,6 @@
- - \ 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( From a2135d25611a05a0310c7c3f62cc6155a3919a91 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 15:45:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:taskAdd=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E6=A8=A1=E6=9D=BF=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=A7=E7=BA=B2=EF=BC=88=E5=B7=AE=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B2=A1=E6=89=BE=E5=88=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 1366 +++++++++++++++++------- src/views/projectcenter/TaskAdd.vue | 261 +++-- src/views/projectcenter/TaskPage.vue | 65 -- 3 files changed, 1147 insertions(+), 545 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 2278df41..266760ad 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -1,261 +1,632 @@