From e6f8f739ef829ad5fd05a6cae97d182ba5219659 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 14:21:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E5=91=98=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLevelAddStu.vue | 631 +++++++++++++++++----- 1 file changed, 490 insertions(+), 141 deletions(-) diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index a7b381e9..979ad162 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -48,7 +48,7 @@ -
+
-
组织：
-
- +
选择组织：
+
+ + +
+
+
+
姓名：
+
- - -
-
-
受众名称：
-
- -
-
+ +
@@ -133,8 +140,75 @@
重置
+
+ +
+ +
+
-
+ + +
+
+
+
选择受众：
+
+ +
+
+
+
+
姓名：
+ +
+
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+
@@ -168,9 +242,9 @@ showSizeChanger="true" showQuickJumper="true" hideOnSinglePage="true" - :pageSize="pageSize" - :current="currentPage" - :total="tableDataTotal" + :pageSize="pageSize2" + :current="currentPage2" + :total="tableDataTotal2" class="pagination" />
@@ -181,7 +255,11 @@
-
已选
+
+
已选
+
6
+
人
+
全部清除 @@ -238,47 +316,74 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 50, + pageSize1: 10, + currentPage1: 1, + tableDataTotal1: 50, + pageSize2: 10, + currentPage2: 1, + tableDataTotal2: 50, + selectedRowKeys: [], + selectedRowKeys1: [], + selectedRowKeys2: [], activeKey: "1", - name: "", //输入名字搜索 value: [], //级联选择框 choosevalue: null, //受众选择 - organizeList: [ + valueSelect: null, //树形选择 + name: "", + nameadd: "", + nameaddd: "", + treeData: [ { - id: 1, + title: "京东方", value: "京东方", - label: "京东方", children: [ { - id: 2, + title: "产研部", value: "产研部", - label: "产研部", children: [ { - id: 4, - value: "产品部门", - label: "产品部门", + title: "产品部", + value: "产品部", }, { - id: 5, - value: "研发部门", - label: "研发部门", + title: "研究部", + value: "研究部", }, ], }, { - id: 3, - value: "人力资源部", - label: "人力资源部", + title: "二级标题", + value: "二级标题", children: [ { - id: 6, + title: "三级标题", + value: "三级标题", + children: [ + { + title: "四级标题", + value: "四级标题", + children: [ + { + title: "五级标题", + value: "五级标题", + }, + ], + }, + ], + }, + ], + }, + { + title: "人力资源部", + value: "人力资源部", + children: [ + { + title: "人事部", value: "人事部", - label: "人事部", }, { - id: 7, + title: "行政部", value: "行政部", - label: "行政部", }, ], }, @@ -290,55 +395,64 @@ export default { key: 1, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 2, name: "小刘", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 3, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 4, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 5, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 6, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 7, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 8, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, { key: 9, name: "小李", bum: "产研部", - gangw: "产品经理", + numb: "000000", + guishu: "", }, ], tablecolumns: [ @@ -351,18 +465,26 @@ export default { className: "h", }, { - title: "部门", - dataIndex: "bum", - key: "bum", - width: 45, + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, align: "center", className: "h", }, { - title: "岗位", - dataIndex: "gangw", - key: "gangw", - width: 45, + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", + width: 40, align: "center", className: "h", }, @@ -370,56 +492,71 @@ export default { tabledata1: [ { key: 1, - name: "学习受众", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 2, - name: "2", - time: "2022-10-31 23:12:00", - total: "2", - state: "已发布", - type: "普通受众", + name: "小刘", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 3, - name: "mask", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 4, - name: "学习受众", - time: "2022-10-31 23:12:00", - total: "1", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 5, - name: "学业受众", - time: "2022-10-31 23:12:00", - total: "2", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { key: 6, - name: "案例受众", - time: "2022-10-31 23:12:00", - total: "3", - state: "已发布", - type: "普通受众", + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 7, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 8, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 9, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, ], tablecolumns1: [ { - title: "受众名称", + title: "姓名", dataIndex: "name", key: "name", width: 30, @@ -427,42 +564,137 @@ export default { className: "h", }, { - title: "创建时间", - dataIndex: "time", - key: "time", + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, + align: "center", + className: "h", + }, + { + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", width: 40, align: "center", className: "h", }, + ], + tabledata2: [ { - title: "人数", - dataIndex: "total", - key: "total", - width: 20, - align: "center", - className: "h", + key: 1, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", }, { - title: "状态", - dataIndex: "state", - key: "state", - width: 20, - align: "center", - className: "h", + key: 2, + name: "小刘", + bum: "产研部", + numb: "000000", + guishu: "", }, { - title: "类型", - dataIndex: "type", - key: "type", + key: 3, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 4, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 5, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 6, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 7, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 8, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 9, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + ], + tablecolumns2: [ + { + title: "姓名", + dataIndex: "name", + key: "name", width: 30, + align: "left", + className: "h", + }, + { + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, + align: "center", + className: "h", + }, + { + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", + width: 40, align: "center", className: "h", }, ], organizeList1: [ { - value: "项目一", - label: "项目一", + value: "产品受众群体", + label: "产品受众群体", + }, + { + value: "人力资源hrbp", + label: "人力资源hrbp", }, ], }); @@ -473,11 +705,26 @@ export default { const afterVisibleChange = (bool) => { console.log("state", bool); }; + const onSelectChange = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + const onSelectChange1 = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + const onSelectChange2 = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; return { ...toRefs(state), afterVisibleChange, closeDrawer, + onSelectChange, + onSelectChange1, + onSelectChange2, // change, }; }, @@ -486,21 +733,13 @@ export default { \ 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(