diff --git a/src/assets/images/taskpage/excellent.png b/src/assets/images/taskpage/excellent.png new file mode 100644 index 00000000..1254b315 Binary files /dev/null and b/src/assets/images/taskpage/excellent.png differ diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index a7b381e9..ef5bfac6 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,34 +705,41 @@ 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, }; }, }; - \ No newline at end of file + 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 99489973..6fda211d 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -407,8 +407,8 @@
@@ -533,7 +533,7 @@
公告内容

- +
- - - - + +
-
-
- 规则 -
-
-
编辑
-
-
-
-
- 当前设计下,学员可以获得 - - 积分 -
-
- 完成【必修/选修】获得 - - 积分
-
- 优秀学员可获得 - - 积分
-
+
+
+ 规则 +
+
+
编辑
+
+
+
+ 当前设计下,学员可以获得 + + 积分 +
+
+ 完成【必修/选修】获得 + + 积分 +
+
+ 优秀学员可获得 + + 积分 +
+
+
@@ -1501,34 +1508,34 @@
-
-
-
-
-
- 提示 -
-
-
- 您确定要删除此课程吗 -
-
-
-
取消
+ v-model:visible="delete_hs" + :footer="null" + :closable="closableQR" + wrapClassName="DelModal" + style="margin-top: 400px" + > +
+
+
+
+
+ 提示 +
-
-
确定
+
+ 您确定要删除此课程吗 +
+
+
+
取消
+
+
+
确定
+
-
- +
@@ -1597,6 +1604,7 @@ export default { diploma: "0", stutime: "2022-10-31 23:12:00", putin: "手动加入", + excellent: true, //是否是优秀学员 }, { key: 2, @@ -1608,6 +1616,7 @@ export default { diploma: "0", stutime: "2022-10-21 23:12:00", putin: "手动加入", + excellent: false, //是否是优秀学员 }, { key: 3, @@ -1619,6 +1628,7 @@ export default { diploma: "0", stutime: "2022-10-11 23:12:00", putin: "手动加入", + excellent: false, //是否是优秀学员 }, { key: 4, @@ -1630,86 +1640,10 @@ export default { diploma: "0", stutime: "2022-10-31 23:12:00", putin: "手动加入", + excellent: true, //是否是优秀学员 }, ], - tablecolumns: [ - { - title: "姓名", - dataIndex: "name", - key: "name", - width: 30, - align: "left", - className: "h", - }, - { - 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: 40, - align: "center", - className: "h", - }, - { - title: "证书", - dataIndex: "diploma", - key: "diploma", - width: 40, - 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: "operations", - key: "operations", - width: 60, - align: "center", - className: "h", - }, - ], + //进度排行学员 rankjindu: [{ value: "学员", label: "学员" }], valuestu1: "学员", @@ -1735,7 +1669,7 @@ export default { Seevisible: false, //查看学员 Changevisible: false, //学员换组 edit_hs: false, //编辑弹窗 - delete_hs:false, //删除弹窗 + delete_hs: false, //删除弹窗 pubproject: false, stugroup: false, canclestu: false, @@ -1746,16 +1680,16 @@ export default { checkedd2: false, //设置按钮2 radioV1: "", radioV2: "", - activeKey: "2", + activeKey: "3", activeKey1: "8", activeKey2: "3", - inputValue:5, - inputValue2:5, - inputValue3:5, + inputValue: 5, + inputValue2: 5, + inputValue3: 5, valueName: "", //排行榜输入姓名 valueDate: "", //排行榜输入日期 noticeChecked: true, - noticeContent: "请输入要发布的公告", + noticeContent: "", TaskFaceImpStuvisible: false, //批量面授报名 //进度排行表 @@ -2227,10 +2161,14 @@ export default { > 优秀学员
-
{ - state.Seevisible = true; - }}>查看
+ state.Seevisible = true; + }} + > + 查看 +
{ state.pubproject = true; @@ -2372,6 +2310,162 @@ 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; + }; const delete_exit = () => { state.delete_hs = false; }; @@ -2402,6 +2496,7 @@ export default { edit_exit, cloradio1, cloradio2, + studentColumns, delete_exit, }; }, @@ -3190,7 +3285,7 @@ export default { } .taskSyllabus { // flex: 1; - overflow-x: scroll; + overflow-x: auto; .ant-collapse { border: 0px; @@ -3593,32 +3688,125 @@ export default { justify-content: right; // position: absolute; // bottom: 20px; - } .operation { - display: flex; - justify-content: center; - align-items: center; - color: #4ea6ff; - .nselect { + display: flex; justify-content: center; align-items: center; - display: flex; - .jc { - margin-left: 20px; - cursor: pointer; + color: #4ea6ff; + .nselect { + justify-content: center; + align-items: center; + display: flex; + .jc { + margin-left: 20px; + cursor: pointer; + white-space: nowrap; + } + } + .tableSelect { + margin-right: 10px; + margin-left: -5px; + display: flex; + align-items: center; + justify-content: right; white-space: nowrap; } } - .tableSelect { - margin-right: 10px; - margin-left: -5px; + .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; - justify-content: right; - white-space: nowrap; + .studentExcellentImg { + width: 16px; + height: 16px; + margin-left: 7px; + } + .studentExcellentT { + font-size: 12px; + font-weight: 400; + color: #ffb64e; + line-height: 17px; + margin-left: 3px; + } + } + + .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; @@ -3753,54 +3941,53 @@ export default { } } } - .projectscore{ - .pjc_body{ - margin-left:34px; - margin-right:34px; - .pjcb_header{ - display: flex; - justify-content: space-between; - align-items: center; - margin:24px auto; - .edit_btn{ - width: 100px; - // padding: 0px 26px 0px 26px; - height: 38px; - background: rgb(64, 158, 255); - border-radius: 8px; - border: 1px solid rgba(64, 158, 255, 1); - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - cursor: pointer; - .edit { - width: 15px; - height: 15px; - background-image: url(@/assets/images/coursewareManage/export1.png); - background-size: 100% 100%; - } - .btnText { - font-size: 14px; - font-weight: 400; - color: rgb(255, 255, 255); - line-height: 36px; - margin-left: 5px; - } - } + .projectscore { + .pjc_body { + margin-left: 34px; + margin-right: 34px; + .pjcb_header { + display: flex; + justify-content: space-between; + align-items: center; + margin: 24px auto; + .edit_btn { + width: 100px; + // padding: 0px 26px 0px 26px; + height: 38px; + background: rgb(64, 158, 255); + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .edit { + width: 15px; + height: 15px; + background-image: url(@/assets/images/coursewareManage/export1.png); + background-size: 100% 100%; } - .pjcb_content{ - border: 1px solid #388BE1; - padding: 32px; - .pjcb_content :last-child{ - margin-bottom:0px; - } - .content{ - margin-bottom:24px; - } - + .btnText { + font-size: 14px; + font-weight: 400; + color: rgb(255, 255, 255); + line-height: 36px; + margin-left: 5px; } + } } + .pjcb_content { + border: 1px solid #388be1; + padding: 32px; + .pjcb_content :last-child { + margin-bottom: 0px; + } + .content { + margin-bottom: 24px; + } + } + } } } .content6 {