From 5c42377389755a27467940e6c72efaf853b067fd Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 17 Oct 2022 18:09:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AE=A1=E7=90=86=E6=8A=BD=E5=B1=89=20=E9=9D=A2?= =?UTF-8?q?=E6=8E=88=E7=AE=A1=E7=90=86=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/FaceManage.vue | 556 ++++++++ src/components/drawers/TimeManage.vue | 473 +++++++ src/views/learningpath/LearningPath.vue | 38 - src/views/projectcenter/TaskPage.vue | 1684 ++++++++++++++--------- 4 files changed, 2063 insertions(+), 688 deletions(-) create mode 100644 src/components/drawers/FaceManage.vue create mode 100644 src/components/drawers/TimeManage.vue diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue new file mode 100644 index 00000000..28053dfa --- /dev/null +++ b/src/components/drawers/FaceManage.vue @@ -0,0 +1,556 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue new file mode 100644 index 00000000..8c6a31fa --- /dev/null +++ b/src/components/drawers/TimeManage.vue @@ -0,0 +1,473 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 650997b4..c55c4d9a 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -354,12 +354,6 @@ export default { width: 100, align: "center", className: "h", - // ellipsis: true, - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text, record) => { - // console.log(text, record); - // return {text.text}; - // }, }, { title: "路径图名称", @@ -411,38 +405,6 @@ export default { key: "opacation", width: 200, align: "center", - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text) => { - // console.log(text); - // return ( - //
- //
- // - // 发布 - // - // 编辑 - // - // 关卡 - // - - //
- // 授权 - //
- //
- //
- - //
- // 更多 - //
- //
- //
- //
- //
- // ); - // }, }, ]; return columns; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 13b078b1..eeefd42d 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file From b1f7d5fc342ad816dcc28b34958f23badcf23407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 17 Oct 2022 18:28:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 175 ++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index dec6a136..c58e46a7 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -340,7 +340,55 @@
- Content of Tab Pane 3 + +
+
+ + 学员管理 + +
+
+
小组名称：
+ +
+
+
+ + 搜索 +
+
+ + 重置 +
+
+
+
+
+ + 创建小组 +
+
+ + 随机分组 +
+
+
+
+
+
+
好好学习小组
+
...
+
+
+
+
+ +
+
+ + +
+ Content of Tab Pane 3 Content of Tab Pane 3 Content of Tab Pane 3 @@ -414,7 +462,8 @@ export default { checked: false, checked1: true, checked2: false, - activeKey: '1', + activeKey: '3', + activeKey1: '9', }); const showModal = () => { state.pubproject = true; @@ -1059,5 +1108,127 @@ export default { } } } + .content3 { + margin-top: 20px; + .ant-tabs-tab-btn { + font-size: 18px; + font-weight: 700; + } + .group { + display: flex; + justify-content: space-between; + .groupleft { + display: flex; + align-items: center; + margin-left: 32px; + .groupname { + color: #000000; + font-size: 14px; + } + .ant-input { + height: 40px; + } + } + .groupright { + display: flex; + .btn1 { + width: 100px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16px; + border: 1px solid #409EFF; + border-radius: 8px; + background: #409EFF; + cursor: pointer; + .btn1text { + color: #FFFFFF; + margin-left: 5px; + font-size: 14px; + } + } + .btn2 { + width: 100px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 32px; + border: 1px solid #409EFF; + border-radius: 8px; + cursor: pointer; + background: #FFFFFF; + .btn2text { + color: #409EFF; + margin-left: 5px; + font-size: 14px; + } + } + } + } + .second2 { + display: flex; + margin: 30px 0 0 32px; + .btn1 { + width: 130px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16px; + border: 1px solid #409EFF; + border-radius: 8px; + background: #409EFF; + cursor: pointer; + .btn1text { + color: #FFFFFF; + margin-left: 5px; + font-size: 14px; + } + } + .btn2 { + width: 130px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 32px; + border: 1px solid #409EFF; + border-radius: 8px; + cursor: pointer; + background: #FFFFFF; + .btn2text { + color: #409EFF; + margin-left: 5px; + font-size: 14px; + } + } + } + .groupmain { + display: flex; + margin-left: 32px; + .groupbox { + width: 264px; + height: 181px; + display: flex; + justify-content: center; + border: 1px solid #E9E9E9; + box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.0500); + margin-top: 16px; + margin-right: 20px; + .grouptitle { + display: flex; + justify-content: space-betwwen; + border-bottom: 1px solid rgba(232, 232, 232, 1); + .goodgruop { + color: rgba(0, 0, 0, 0.8500); + font-size: 16px; + line-height: 36px; + } + } + } + } + } } \ No newline at end of file From 8a232ed70c63e0d91c4d6a99b1f14ce39b107766 Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 17 Oct 2022 18:34:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9EAddOnline=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 232 ++++++++ src/views/projectcenter/TaskAdd.vue | 829 +++++++++++++-------------- 2 files changed, 618 insertions(+), 443 deletions(-) create mode 100644 src/components/drawers/AddOnline.vue diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue new file mode 100644 index 00000000..772b81cf --- /dev/null +++ b/src/components/drawers/AddOnline.vue @@ -0,0 +1,232 @@ + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 0bbd1138..338f6785 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -62,12 +62,17 @@
-
+
-
在线
+
在线
+ +
+ +
+
@@ -222,42 +227,6 @@
-
- -
-
-
关联项目
- -
-
- - -
-
- - -
-
- -
import { reactive, toRefs, onMounted, onUnmounted } from "vue"; +import AddOnline from "../../components/drawers/AddOnline.vue"; const drawercolumns = [ { title: "项目名称", @@ -357,431 +327,404 @@ const drawercolumns = [ }, ]; export default { - name: "LevelAddDetail", - setup() { - const state = reactive({ - projectNameList: [ - { - id: 1, - value: "项目一", - label: "项目一", - }, - { - id: 2, - value: "项目二", - label: "项目二", - }, - { - id: 3, - value: "项目三", - label: "项目三", - }, - { - id: 4, - value: "项目四", - label: "项目四", - }, - ], - projectNameList2: [ - { - id: 1, - value: "删除任务", - label: "删除任务", - }, - { - id: 2, - value: "移动任务到关卡", - label: "移动任务到关卡", - }, - ], - level: [ - { - id: "1", - tit: "阶段1", - name: "腾飞班1基础", - }, - { - id: "2", - tit: "阶段2", - name: "腾飞班基础", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - { - id: "2", - tit: "阶段2", - name: "中级产品经理", - }, - ], - tableData: [ - { - key: 1, - lei: "在线", - // state: "已发布", - creater: "管理者课程", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 2, - lei: "面授", - // state: "草稿", - creater: "管理者面授", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 1, - lei: "在线", - // state: "已发布", - creater: "管理者课程", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 3, - lei: "作业", - // state: "已停用", - creater: "管理者作业", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, - { - key: 4, - lei: "考试", - // state: "草稿", - creater: "管理者考试", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 5, - lei: "案例", - // state: "草稿", - creater: "腾飞班1案例", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: true, - checkedd: false, - }, - { - key: 4, - lei: "考试", - // state: "草稿", - creater: "管理者考试", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: false, - checkedd: false, - }, - { - key: 5, - lei: "案例", - // state: "草稿", - creater: "腾飞班1案例", - // pubtime: "2022-07-20 14:00:03", - cretime: "20分钟", - haspub: true, - checked1: true, - checkedd: false, - }, - ], - drawertableData: [ - { - key: 1, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "1-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ + name: "LevelAddDetail", + components: { + AddOnline, + }, + setup() { + const state = reactive({ + projectNameList: [ { - key: "1-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", + id: 1, + value: "项目一", + label: "项目一", }, - ], - }, - ], - }, - { - key: 2, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "2-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ { - key: "2-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", + id: 2, + value: "项目二", + label: "项目二", }, - ], - }, - ], - }, - - { - key: 3, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 4, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 5, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 6, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 7, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - currentPage: 1, - tableDataTotal: 100, - pageSize: 10, - visible: false, - stage: false, - selectedRowKeys: [], - }); - const selectProjectName = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName2 = (value, index) => { - console.log("value", value, index); - }; - const showDrawer = () => { - state.visible = !state.visible; - }; - const afterVisibleChange = (bool) => { - console.log("visible", bool); - }; - const tableDataFunc = () => { - const columns = [ - { - title: "类型", - dataIndex: "state", - // width: "30%", - key: "state", - width: 60, - align: "left", - className: "classify", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: (text) => { - // console.log(text.record.checked1); - return ( -
-
{ - console.log("点击了"); - }} - >
+ { + id: 3, + value: "项目三", + label: "项目三", + }, + { + id: 4, + value: "项目四", + label: "项目四", + }, + ], + projectNameList2: [ + { + id: 1, + value: "删除任务", + label: "删除任务", + }, + { + id: 2, + value: "移动任务到关卡", + label: "移动任务到关卡", + }, + ], + level: [ + { + id: "1", + tit: "阶段1", + name: "腾飞班1基础", + }, + { + id: "2", + tit: "阶段2", + name: "腾飞班基础", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + { + id: "2", + tit: "阶段2", + name: "中级产品经理", + }, + ], + tableData: [ + { + key: 1, + lei: "在线", + // state: "已发布", + creater: "管理者课程", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 2, + lei: "面授", + // state: "草稿", + creater: "管理者面授", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 1, + lei: "在线", + // state: "已发布", + creater: "管理者课程", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 3, + lei: "作业", + // state: "已停用", + creater: "管理者作业", + // pubtime: "2022-07-20 14:00:03", + cretime: "60分钟", + haspub: false, + checked1: false, + checkedd: false, + }, + { + key: 4, + lei: "考试", + // state: "草稿", + creater: "管理者考试", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 5, + lei: "案例", + // state: "草稿", + creater: "腾飞班1案例", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: true, + checkedd: false, + }, + { + key: 4, + lei: "考试", + // state: "草稿", + creater: "管理者考试", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: false, + checkedd: false, + }, + { + key: 5, + lei: "案例", + // state: "草稿", + creater: "腾飞班1案例", + // pubtime: "2022-07-20 14:00:03", + cretime: "20分钟", + haspub: true, + checked1: true, + checkedd: false, + }, + ], + drawertableData: [ + { + key: 1, + projectName: "管理者进阶", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "1-1", + projectName: "管理者进阶-腾飞班", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "1-1-1", + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + }, + ], + }, + { + key: 2, + projectName: "管理者进阶", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "2-1", + projectName: "管理者进阶-腾飞班", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + children: [ + { + key: "2-1-1", + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + }, + ], + }, + { + key: 3, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 4, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 5, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 6, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + { + key: 7, + projectName: "管理者进阶-腾飞班K1", + manager: "黄华 刘俊", + creater: "毛继禹", + time: "2022-07-20 14:00:03", + }, + ], + currentPage: 1, + tableDataTotal: 100, + pageSize: 10, + visible: false, + stage: false, + selectedRowKeys: [], + }); + const selectProjectName = (value, index) => { + console.log("value", value, index); + }; + const selectProjectName2 = (value, index) => { + console.log("value", value, index); + }; + const afterVisibleChange = (bool) => { + console.log("visible", bool); + }; + const tableDataFunc = () => { + const columns = [ + { + title: "类型", + dataIndex: "state", + // width: "30%", + key: "state", + width: 60, + align: "left", + className: "classify", + scopedSlots: { customRender: "action" }, + customRender: (text) => { + // console.log(text.record.checked1); + return (
+
{ + console.log("点击了"); + }}>
{text.record.lei} {/** -
- - {text.record.lei} - -*/} -
- ); - }, - }, - { - title: "任务名称", - dataIndex: "creater", - // width: "30%", - key: "creater", - width: 200, - align: "center", - className: "h", - }, - { - title: "必修/选修", - dataIndex: "pubtime", - key: "pubtime", - // width: 100, - align: "center", - className: "h", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: (text) => { - // console.log(text.record.checked1); - return ( -
+
+ + {text.record.lei} + + */} +
); + }, + }, + { + title: "任务名称", + dataIndex: "creater", + // width: "30%", + key: "creater", + width: 200, + align: "center", + className: "h", + }, + { + title: "必修/选修", + dataIndex: "pubtime", + key: "pubtime", + // width: 100, + align: "center", + className: "h", + scopedSlots: { customRender: "action" }, + customRender: (text) => { + // console.log(text.record.checked1); + return (
- { - console.log("点击了"); - text.record.checked1 = !text.record.checked1; - }} - /> + { + console.log("点击了"); + text.record.checked1 = !text.record.checked1; + }}/>
-
+
必修
选修
-
- ); - }, - }, - { - title: "时长", - dataIndex: "cretime", - key: "cretime", - // width: 100, - align: "center", - className: "h", - }, - { - title: "操作", - className: "h", - dataIndex: "opacation", - key: "opacation", - // width: 100, - align: "center", - scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: () => { - return ( -
+
); + }, + }, + { + title: "时长", + dataIndex: "cretime", + key: "cretime", + // width: 100, + align: "center", + className: "h", + }, + { + title: "操作", + className: "h", + dataIndex: "opacation", + key: "opacation", + // width: 100, + align: "center", + scopedSlots: { customRender: "action" }, + customRender: () => { + return (
编辑 删除
-
- ); - }, - }, - ]; - return columns; - }; - - const onSelectChange = (selectedRowKeys) => { - console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; - }; - - // const getClientHeight = () => { - // state.rightheight = - // document.getElementsByClassName("addhead")[0].offsetHeight + - // document.getElementsByClassName("mid")[0].offsetHeight + - // document.getElementsByClassName("boom")[0].offsetHeight + - // 40 + - // "px"; - // }; - const showModal = () => { - state.stage = true; - }; - const closeModal = () => { - state.stage = false; - }; - onMounted(() => { - document.getElementsByTagName("main")[0].style.background = - "rgb(245, 247, 250,1)"; - document.getElementsByTagName("main")[0].style.boxShadow = "none"; - }); - onUnmounted(() => { - document.getElementsByTagName("main")[0].style.background = "#ffffff"; - document.getElementsByTagName("main")[0].style.boxShadow = - "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; - }); - return { - ...toRefs(state), - selectProjectName, - selectProjectName2, - tableDataFunc, - showModal, - closeModal, - showDrawer, - afterVisibleChange, - drawercolumns, - onSelectChange, - }; - }, +
); + }, + }, + ]; + return columns; + }; + const onSelectChange = (selectedRowKeys) => { + console.log("selectedRowKeys changed: ", selectedRowKeys); + state.selectedRowKeys = selectedRowKeys; + }; + // const getClientHeight = () => { + // state.rightheight = + // document.getElementsByClassName("addhead")[0].offsetHeight + + // document.getElementsByClassName("mid")[0].offsetHeight + + // document.getElementsByClassName("boom")[0].offsetHeight + + // 40 + + // "px"; + // }; + const showModal = () => { + state.stage = true; + }; + const closeModal = () => { + state.stage = false; + }; + onMounted(() => { + document.getElementsByTagName("main")[0].style.background = + "rgb(245, 247, 250,1)"; + document.getElementsByTagName("main")[0].style.boxShadow = "none"; + }); + onUnmounted(() => { + document.getElementsByTagName("main")[0].style.background = "#ffffff"; + document.getElementsByTagName("main")[0].style.boxShadow = + "0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; + }); + const showDrawerOnline = () => { + state.visible = true; + }; + return { + ...toRefs(state), + selectProjectName, + selectProjectName2, + tableDataFunc, + showModal, + closeModal, + // showDrawer, + afterVisibleChange, + drawercolumns, + onSelectChange, + showDrawerOnline, + }; + }, }; From 445d9e693ddbe4f0fd3dc8f04485b83eaf227421 Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 17 Oct 2022 18:47:54 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat=EF=BC=9A=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 2635 ++++++++++++-------------- 1 file changed, 1192 insertions(+), 1443 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 07d723ec..b9552ddc 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,1506 +1,1255 @@ + + import { reactive, toRefs } from "vue"; + import TimeManage from "../../components/drawers/TimeManage"; + import FaceManage from "../../components/drawers/FaceManage"; + export default { + name:"taskPage", + components: { TimeManage, FaceManage }, + setup(){ + const state = reactive({ + visible: false, //时间管理 + FaceVisivle: true, //面授管理 + pubproject: false, + checked: false, + checked1: true, + checked2: false, + activeKey: '3', + activeKey1: '9', + }); + const showModal = () => { + state.pubproject = true; + }; + const closeModal = () => { + state.pubproject = false; + }; + //新增 + const showTime = () => { + console.log("点击管理"); + state.visible = true; + }; + //新增 + const showFace = () => { + //面授管理的抽屉 + // console.log("点击管理"); + state.FaceVisivle = true; + }; + return { + ...toRefs(state), + showModal, + closeModal, + showTime, + showFace, + }; + }, + } + \ No newline at end of file + + \ No newline at end of file From 2fa9bc6228ed01f6739c6ac1f29e40a1f05a386e Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 17 Oct 2022 18:50:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:addonline(=E6=9C=AA=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 33 +++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 772b81cf..9bf68249 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -64,6 +64,9 @@ 清空
+
+ +
@@ -75,7 +78,24 @@ import { reactive, toRefs, ref } from "vue"; value: "value1", label: "请选择状态", }, - ]); + ]); + const columns1 = [ + { + title: "课程编号", + width: 100, + dataIndex: "num", + key: "num", + align: "center", + }, + { + title: "名称", + width: 200, + dataIndex: "name", + key: "name", + ellipsis: true, + align: "center", + }, + ] export default { name: "AddOnline", props: { @@ -85,7 +105,14 @@ import { reactive, toRefs, ref } from "vue"; }, }, setup(props, ctx) { - const state = reactive({}); + const state = reactive({ + tableData1: [ + { + key: "1", + num: 1, + }, + ] + }); const closeDrawer = () => { ctx.emit("update:addonlineVisible", false); }; @@ -95,13 +122,13 @@ import { reactive, toRefs, ref } from "vue"; const showDrawerOnline = () => { state.visible = true; }; - return { ...toRefs(state), afterVisibleChange, showDrawerOnline, closeDrawer, options1, + columns1, // change, }; }, From 93c8ca9879086d6941f6efc8173de8befdabd438 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 18 Oct 2022 09:39:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=BC=B9=E7=AA=97AddOnline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 198 +++++++++++++++++++++++++-- 1 file changed, 190 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 9bf68249..0fd2359f 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -65,7 +65,36 @@
- + +
+
+ +
@@ -82,20 +111,59 @@ import { reactive, toRefs, ref } from "vue"; const columns1 = [ { title: "课程编号", - width: 100, + width: '20%', dataIndex: "num", key: "num", align: "center", }, { title: "名称", - width: 200, + width: '20%', dataIndex: "name", key: "name", - ellipsis: true, + align: "center", + }, + { + title: "内容分类", + width: '13%', + dataIndex: "content", + key: "content", + align: "center", + }, + { + title: "授课教师", + width: '13%', + dataIndex: "teacher", + key: "teacher", + align: "center", + }, + { + title: "创建人", + width: '13%', + dataIndex: "creator", + key: "creator", + align: "center", + }, + { + title: "完成时间", + width: '20%', + dataIndex: "time", + key: "time", align: "center", }, ] + const rowSelection = ref({ + checkStrictly: false, + onChange: (selectedRowKeys, selectedRows) => { + console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + }, + onSelect: (record, selected, selectedRows) => { + console.log(record, selected, selectedRows); + }, + onSelectAll: (selected, selectedRows, changeRows) => { + console.log(selected, selectedRows, changeRows); + }, + }); export default { name: "AddOnline", props: { @@ -107,11 +175,91 @@ import { reactive, toRefs, ref } from "vue"; setup(props, ctx) { const state = reactive({ tableData1: [ - { - key: "1", - num: 1, + { + key: "1", + num: 'JDF2022071100001', + name:'时间管理课程', + content:'通用力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', }, - ] + { + key: "2", + num: 'JDF2022071100001', + name:'管理能力课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "3", + num: 'JDF2022071100001', + name:'快速换模SMED', + content:'通用力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "4", + num: 'JDF2022071100001', + name:'巧妙对话人见人夸', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "5", + num: 'JDF2022071100001', + name:'管理能力课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "6", + num: 'JDF2022071100001', + name:'时间管理课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "7", + num: 'JDF2022071100001', + name:'时间管理课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "8", + num: 'JDF2022071100001', + name:'时间管理课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + { + key: "9", + num: 'JDF2022071100001', + name:'时间管理课程', + content:'领导力', + teacher:'BOE教师', + creator:'管理员', + time:'2022-10-31 23:12:00', + }, + ], + currentPage: 1, + tableDataTotal: 100, + pageSize: 10, }); const closeDrawer = () => { ctx.emit("update:addonlineVisible", false); @@ -129,12 +277,16 @@ import { reactive, toRefs, ref } from "vue"; closeDrawer, options1, columns1, + rowSelection, // change, }; }, }; \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 6424a0f1..569cf566 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -697,13 +697,70 @@
状态：
已审核
-
+ + + 1 + + +
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+
+
搜索
+
+
+
+
+ + + +
+ + + +
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 338f6785..855b3f0a 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -225,6 +225,11 @@ /> + +
+ +
+ @@ -575,6 +580,7 @@ export default { tableDataTotal: 100, pageSize: 10, visible: false, + visible2:false, stage: false, selectedRowKeys: [], }); @@ -669,7 +675,12 @@ export default { customRender: () => { return (
- + { + state.visible2 = true; + }} + style="color:#4EA6FF;margin-right:25px;cursor:pointer" + > 编辑 删除 From 03eb4686aaafad8511f8ab1cbb81736a5e6798ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 18 Oct 2022 10:32:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 313 ++++++++++++++++++++++++++- 1 file changed, 305 insertions(+), 8 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 46e1a5c1..5a595afd 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -363,7 +363,7 @@
-
+
创建小组
@@ -377,7 +377,22 @@
好好学习小组
-
...
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
@@ -399,7 +414,7 @@ - +
- + + +
+ +
+
+ 创建多层项目 +
+
+ +
+
+
+
+
+ +
+
项目名称:
+
+ +
+
+
+
+ +
+
分类:
+
+ +
+
+
+
+ +
+
项目经理:
+
+ +
+
+
+
+ +
+
资源归属:
+
+ +
+
+
+ 取消 + 确定 +
+
+ +
+