diff --git a/src/assets/images/courseManage/reset2.png b/src/assets/images/courseManage/reset2.png new file mode 100644 index 00000000..00cb101c Binary files /dev/null and b/src/assets/images/courseManage/reset2.png differ diff --git a/src/assets/images/taskpage/people1.png b/src/assets/images/taskpage/people1.png new file mode 100644 index 00000000..c16eec4b Binary files /dev/null and b/src/assets/images/taskpage/people1.png differ diff --git a/src/assets/images/taskpage/people2.png b/src/assets/images/taskpage/people2.png new file mode 100644 index 00000000..c5796dc0 Binary files /dev/null and b/src/assets/images/taskpage/people2.png differ diff --git a/src/assets/images/taskpage/people3.png b/src/assets/images/taskpage/people3.png new file mode 100644 index 00000000..5edec63d Binary files /dev/null and b/src/assets/images/taskpage/people3.png differ diff --git a/src/assets/images/taskpage/people4.png b/src/assets/images/taskpage/people4.png new file mode 100644 index 00000000..f7504ad5 Binary files /dev/null and b/src/assets/images/taskpage/people4.png differ diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 02624cf2..46f752c7 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -57,11 +57,7 @@
@@ -81,11 +77,7 @@
@@ -106,11 +98,7 @@ class="taskbox" @click="showModal" style=" - background: linear-gradient( - 180deg, - rgba(229, 246, 236, 1) 100%, - rgba(238, 249, 243, 1) 100% - ); + background: linear-gradient(180deg,rgba(229, 246, 236, 1) ,rgba(238, 249, 243, 1)); " >
@@ -465,7 +453,94 @@
- 学员管理 + +
+
+
+
姓名：
+ +
+
+
小组名称：
+ +
+
+
部门：
+ +
+
+
学员：
+ +
+
+
+
+ + 搜索 +
+
+ + 重置 +
+
+
+
+
+ + 添加学员 +
+
+ + 导入学员 +
+
+ + 批量删除 +
+
+
+ +
+ 已选择 +
+ 2 +
+ 项 + 列表选项总计： + 4 + 条 +
+
清空
+
+
+ +
+ +
+
+
@@ -474,7 +549,7 @@
- + 搜索
@@ -485,11 +560,11 @@
- + 创建小组
- + 随机分组
@@ -513,12 +588,98 @@
组员名单 >
-
+
+
+
+
+
+
- +
+
+
全能小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
+
+
+
+
+
宇宙第一最强小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
+
+
+
+
+
天天向上小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
@@ -555,11 +716,7 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); + background: linear-gradient(0deg,rgba(78, 166, 255, 0) 0%,rgba(78, 166, 255, 0.2) 100%); " >
@@ -625,13 +782,13 @@ :closable="false" wrapClassName="doublepro" width="624px" - height="476px" + height="332px" >
- 创建多层项目 + 创建小组
-
项目名称:
+
小组名称:
-
-
-
-
- -
-
分类:
-
-
@@ -681,26 +821,11 @@ src="../../assets/images/basicinfo/asterisk.png" />
-
项目经理:
-
- -
-
-
-
- -
-
资源归属:
+
小组长:
@@ -724,6 +849,143 @@ export default { components: { TimeManage, FaceManage }, setup(){ const state = reactive({ + goodstuList: [ + { + id: 1, + value: "全部", + label: "全部", + }, + { + id: 2, + value: "普通学员", + label: "普通学员", + }, + { + id: 3, + value: "优秀学员", + label: "优秀学员", + }, + ], + tabledata: [ + { + key: 1, + name: "小李", + bum: "产研部", + gangw: "产品经理", + group: "好好学习", + progress: "5/20", + diploma: "0", + stutime: "2022-10-31 23:12:00", + putin: "手动加入", + }, + { + key: 2, + name: "小刘", + bum: "产研部", + gangw: "产品经理", + group: "天天向上", + progress: "5/20", + diploma: "0", + stutime: "2022-10-31 23:12:00", + putin: "手动加入", + }, + { + key: 3, + name: "小王", + bum: "产研部", + gangw: "后端", + group: "好好学习", + progress: "5/20", + diploma: "0", + stutime: "2022-10-31 23:12:00", + putin: "手动加入", + }, + { + key: 4, + name: "小赵", + bum: "产研部", + gangw: "前端", + group: "天天向上", + progress: "5/20", + diploma: "0", + stutime: "2022-10-31 23:12:00", + putin: "手动加入", + }, + ], + 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", + }, + { + title: "加入方式", + dataIndex: "putin", + key: "putin", + width: 40, + align: "center", + className: "h", + }, + { + title: "操作", + dataIndex: "operations", + key: "operations", + width: 60, + align: "center", + className: "h", + }, + ], visible: false, //时间管理 FaceVisivle: false, //面授管理 pubproject: false, @@ -732,7 +994,7 @@ export default { checked1: true, checked2: false, activeKey: '3', - activeKey1: '9', + activeKey1: '8', }); const showModal = () => { state.pubproject = true; @@ -1498,6 +1760,7 @@ export default { justify-content: space-between; .groupleft { display: flex; + flex-wrap: wrap; align-items: center; margin-left: 32px; .groupname { @@ -1511,6 +1774,12 @@ export default { width: 264px; height: 40px; } + .ant-select-selector { + border-radius: 8px; + width: 264px; + height: 40px; + padding-top: 5px; + } } .groupright { display: flex; @@ -1576,7 +1845,7 @@ export default { display: flex; align-items: center; justify-content: center; - margin-right: 32px; + margin-right: 16px; border: 1px solid #409eff; border-radius: 8px; cursor: pointer; @@ -1588,8 +1857,83 @@ export default { } } } + .talk { + margin-top: 24px; + margin-left: 32px; + margin-right: 32px; + margin-bottom: 11px; + position: relative; + //width: 90%; + height: 40px; + background: #f5faff; + border: 1px solid #4ea6ff; + // opacity: 0.22; + display: flex; + align-items: center; + .im { + width: 14px; + height: 15px; + margin-left: 17px; + } + .xu { + height: 100%; + line-height: 40px; + margin-left: 13px; + .yi { + color: #4f5156; + font-size: 14px; + } + .zon { + color: #999ba3; + font-size: 14px; + margin-left: 34px; + } + .th { + color: #4ea6ff; + } + } + .clear { + cursor: pointer; + font-size: 14px; + color: #387DF7; + line-height: 24px; + position: absolute; + right: 20px; + } + } + .tab { + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + color: rgba(0, 0, 0, 0.8500); + } + .ant-table-tbody > tr > td { + border-bottom: 1px solid #F0F6FC; + color: rgba(0, 0, 0, 0.6500); + } + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: rgba(250, 250, 250, 1); + } + .pa { + // left: 0; + margin-top: 15px; + width: 100%; + // height: 20px; + // background-color: red; + display: flex; + justify-content: right; + // position: absolute; + // bottom: 20px; + } + } .groupmain { display: flex; + flex-wrap: wrap; margin-left: 32px; .groupbox { width: 264px; @@ -1697,6 +2041,26 @@ export default { color: rgba(56, 139, 225, 1); font-size: 14px; } + .peoples { + display: flex; + position: relative; + .people1 { + position: absolute; + right: 22px; + } + .people2 { + position: absolute; + right: 31px; + } + .people3 { + position: absolute; + right: 40px; + } + .people4 { + position: absolute; + right: 49px; + } + } } } }