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/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..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/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/windows/DelWins.vue b/src/components/windows/DelWins.vue new file mode 100644 index 00000000..57667bb1 --- /dev/null +++ b/src/components/windows/DelWins.vue @@ -0,0 +1,161 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 49c82cfc..947cf3c7 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -107,6 +107,28 @@
+ +
- + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否结束项目 +
（项目结束后学员将无法继续学习，此操作不可逆）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此项目吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要存为模板吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回项目 +
（项目撤回后学员进度保留，发布后可继续学习）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ @@ -867,6 +1040,16 @@ export default { estabish: false, doublepro: false, doublesonpro: false, + copyModal: false, //复制弹窗 + closeCopy: false, //复制弹窗关闭图标 + stopModal: false, //停用弹窗 + closeStop: false, //停用弹窗关闭图标 + deleteModal: false, //删除弹窗 + closeDelete: false, //删除弹窗关闭图标 + startModal: false, //启用弹窗 + closeStart: false, //启用弹窗关闭图标 + backModal: false, //撤回弹窗 + closeBack: false, //撤回弹窗关闭图标 ProjOwnervisible: false, ProjPvisible: false, }); @@ -946,7 +1129,9 @@ export default { 基础信息 -
存为模板
+
{ + showStartModal(); + }}>存为模板
@@ -988,7 +1173,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
) : value.state === "已结束" ? ( @@ -1028,8 +1215,12 @@ export default {
- 复制 - 删除 + { + showCopyModal(); + }}>复制 + { + showDeleteModal(); + }}>删除
) : (
@@ -1087,10 +1278,14 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
@@ -1136,7 +1331,9 @@ export default { 创建班级 - 复制 + { + showCopyModal(); + }}>复制
) : item.state === "已结束" ? (
@@ -1175,8 +1372,12 @@ export default {
- 复制 - 删除 + { + showCopyModal(); + }}>复制 + { + showDeleteModal(); + }}>删除 ) : (
@@ -1231,13 +1432,19 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1282,7 +1489,9 @@ export default { - 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1342,8 +1557,12 @@ export default {
- 复制 - 复制 + { + showCopyModal(); + }}>复制 + { + showCopyModal(); + }}>复制
-
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1400,7 +1623,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
结束
+
{ + showStopModal(); + }}>结束
 -
撤回
+
{ + showBackModal(); + }}>撤回
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1476,13 +1707,19 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1527,7 +1764,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1587,7 +1832,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
删除
+
{ + showDeleteModal(); + }}>删除
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1647,7 +1900,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1722,7 +1983,9 @@ export default { {value.state === "草稿" ? ( 发布 ) : ( - 复制 + { + showCopyModal(); + }}>复制 )}
{value.state === "草稿" ? ( @@ -1733,19 +1996,23 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
{ - console.log("点击了"); - }} + showDeleteModal(); + }} > 删除
-
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1759,19 +2026,23 @@ export default { dropdownClassName="tabledropdown" > -
存为模板
+
{ + showStartModal(); + }}>存为模板
{ - console.log("点击了"); - }} + showStopModal(); + }} > 结束
-
撤回
+
{ + showBackModal(); + }}>撤回
 基础信息 @@ -1785,13 +2056,15 @@ export default { dropdownClassName="tabledropdown" > -
存为模板
+
{ + showStartModal(); + }}>存为模板
{ - console.log("点击了"); - }} + showDeleteModal(); + }} > 删除
@@ -1841,6 +2114,36 @@ export default { const closeModal3 = () => { state.doublesonpro = false; }; + const showCopyModal = () => { + state.copyModal = true; + }; + const closeCopyModal = () => { + state.copyModal = false; + }; + const showStopModal = () => { + state.stopModal = true; + }; + const closeStopModal = () => { + state.stopModal = false; + }; + const showDeleteModal = () => { + state.deleteModal = true; + }; + const closeDeleteModal = () => { + state.deleteModal = false; + }; + const showStartModal = () => { + state.startModal = true; + }; + const closeStartModal = () => { + state.startModal = false; + }; + const showBackModal = () => { + state.backModal = true; + }; + const closeBackModal = () => { + state.backModal = false; + }; const showProjOwner = () => { state.ProjOwnervisible = true; }; @@ -1860,6 +2163,16 @@ export default { closeModal2, showModal3, closeModal3, + showCopyModal, + closeCopyModal, + showStopModal, + closeStopModal, + showDeleteModal, + closeDeleteModal, + showStartModal, + closeStartModal, + showBackModal, + closeBackModal, getTableDate, showProjOwner, showProjPrower, @@ -2315,4 +2628,115 @@ export default { } } } +.CopyModal { + .ant-modal { + width: 424px !important; + height: 258px !important; + .ant-modal-content { + width: 424px !important; + height: 258px !important; + .ant-modal-body { + width: 424px !important; + height: 258px !important; + padding: 0 !important; + .delete { + z-index: 999; + width: 424px; + height: 258px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + border-radius: 4px; + // position: absolute; + // left: 50%; + // top: 10%; + // transform: translate(-50%, -50%); + .del_header { + position: absolute; + width: calc(100%); + height: 68px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } + .del_main { + width: 100%; + position: relative; + .header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/QR.png); + background-size: 100% 100%; + } + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } + .body { + width: 100%; + margin: 34px auto 56px auto; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + // background-color: red; + position: relative; + .back { + position: absolute; + top: 30px; + font-size: 12px; + font-weight: 400; + color: #666666; + } + } + .del_btnbox { + display: flex; + margin: 30px auto; + justify-content: center; + .del_btn { + width: 100px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + + flex-shrink: 0; + cursor: pointer; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn1 { + border: 1px solid rgba(64, 158, 255, 1); + color: #4ea6ff; + margin-right: 14px; + } + .btn2 { + background-color: #4ea6ff; + color: #ffffff; + } + } + } + } + } + } + } +} diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index cc7cc8b6..97914d79 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -468,6 +468,36 @@
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此任务吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ @@ -795,6 +825,7 @@ export default { confirmModal: false, //确认添加阶段弹窗 cC: false, cancelModal: false, //确认取消阶段弹窗 + deleteModal: false, //确认删除弹窗 }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -915,7 +946,14 @@ export default { > 编辑 - 删除 + { + showDelete(); + }} + > + 删除 + ); @@ -1003,7 +1041,12 @@ export default { const closeCancel = () => { state.cancelModal = false; }; - + const showDelete = () => { + state.deleteModal = true; + }; + const closeDelete = () => { + state.deleteModal = false; + }; return { ...toRefs(state), selectProjectName, @@ -1031,6 +1074,8 @@ export default { closeConfirm, showCancel, closeCancel, + showDelete, + closeDelete, }; }, }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f8eaf142..62154de3 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -208,12 +208,28 @@ - +
+ +
任务大纲
- + 编辑
+