diff --git a/src/assets/images/projectadd/nopro.png b/src/assets/images/projectadd/nopro.png new file mode 100644 index 00000000..e14d35d6 Binary files /dev/null and b/src/assets/images/projectadd/nopro.png differ diff --git a/src/assets/images/taskpage/check.png b/src/assets/images/taskpage/check.png new file mode 100644 index 00000000..53bcd491 Binary files /dev/null and b/src/assets/images/taskpage/check.png differ diff --git a/src/assets/images/taskpage/edit.png b/src/assets/images/taskpage/edit.png new file mode 100644 index 00000000..3d4e21c5 Binary files /dev/null and b/src/assets/images/taskpage/edit.png differ 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/assets/images/taskpage/picture8.png b/src/assets/images/taskpage/picture8.png new file mode 100644 index 00000000..cdc3f46b Binary files /dev/null and b/src/assets/images/taskpage/picture8.png differ diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index a7b381e9..8256fea2 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,116 @@ 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: "五级标题", + children: [ + { + title: "六级标题", + value: "六级标题", + children: [ + { + title: "七级标题", + value: "七级标题", + children: [ + { + title: "八级标题", + value: "八级标题", + children: [ + { + title: "九级标题", + value: "九级标题", + children: [ + { + title: "十级标题", + value: "十级标题", + children: [ + { + title: "十一级标题", + value: "十一级标题", + children: [ + { + title: "十二级标题", + value: "十二级标题", + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + { + title: "人力资源部", + value: "人力资源部", + children: [ + { + title: "人事部", value: "人事部", - label: "人事部", }, { - id: 7, + title: "行政部", value: "行政部", - label: "行政部", }, ], }, @@ -290,55 +437,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 +507,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 +534,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,84 +606,188 @@ 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", }, ], }); const closeDrawer = () => { + state.activeKey = "1"; ctx.emit("update:AddSvisible", false); }; 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 +.changetreedropdown { + width: 550px !important; +} + +.ant-select-tree-list-scrollbar { + width: 5px !important; + .ant-select-tree-list-scrollbar-thumb { + background-color: #4ea6ff !important; + } +} + diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue index e72e2bcc..15148941 100644 --- a/src/components/drawers/FaceStu.vue +++ b/src/components/drawers/FaceStu.vue @@ -78,12 +78,12 @@
-
导入学员
+
导入学员
-
+
批量签到
-
+
批量签退
@@ -149,12 +149,76 @@
+ + + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签到吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量签退吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + \ 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/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue new file mode 100644 index 00000000..babf1784 --- /dev/null +++ b/src/components/drawers/TaskFaceIn.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 3be140a8..61506af6 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -54,7 +54,7 @@
-
+
催促考试
@@ -80,12 +80,17 @@
+
+
+
催促学员成功
+
+ + \ No newline at end of file diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 2278df41..648556be 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -1,263 +1,634 @@ - \ No newline at end of file + diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index c93a8d1a..947cf3c7 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -107,6 +107,28 @@
+ +
- + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 是否结束项目 +
(项目结束后学员将无法继续学习,此操作不可逆)
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此项目吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要存为模板吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回项目 +
(项目撤回后学员进度保留,发布后可继续学习)
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ +