From cc2e2fc02dcda99d519b8edc6e79510f161fd60f Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 24 Oct 2022 13:42:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9tab=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectScore.vue | 35 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index df88603e..5a0423f8 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -1,15 +1,14 @@ + + + \ No newline at end of file From ad41b22c1f939bc613c3b1ed24a7735115d301b2 Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 24 Oct 2022 16:23:33 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat=EF=BC=9A=E5=AD=A6=E4=B9=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=9B=BE=20=E6=97=A0=E4=BB=BB=E5=8A=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLevelAddStu.vue | 3 +- src/components/drawers/AddOnline.vue | 1 + src/components/drawers/OwnPower.vue | 749 +++++++++++++++---- src/views/courselibrary/CoursewareManage.vue | 136 ++-- src/views/learningpath/LevelAddDetail.vue | 398 +++++----- src/views/research/ResearchManage.vue | 16 +- 6 files changed, 881 insertions(+), 422 deletions(-) diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 8256fea2..ff52a803 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -1001,7 +1001,8 @@ export default { // bottom: 20px; .ant-pagination-item, .ant-pagination-prev, - .ant-pagination-next { + .ant-pagination-next, + .ant-pagination-options { margin-bottom: 10px; } } diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 08a6bc2d..746c63dc 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -304,6 +304,7 @@ export default { } } .contentMain { + padding-right: 12px; .main_items { display: flex; justify-content: space-between; diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index ca7183fe..d90561a3 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -48,7 +48,7 @@ -
+
-
组织：
-
- -
-
- - -
-
-
受众名称：
+
+
选择组织：
- + +
+
+
姓名：
+ +
+
+ +
@@ -134,8 +140,75 @@
重置
+
+ +
+ +
+
-
+ + +
+
+
+
选择受众：
+
+ +
+
+
+
+
姓名：
+ +
+
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+
@@ -169,9 +242,9 @@ showSizeChanger="true" showQuickJumper="true" hideOnSinglePage="true" - :pageSize="pageSize" - :current="currentPage" - :total="tableDataTotal" + :pageSize="pageSize2" + :current="currentPage2" + :total="tableDataTotal2" class="pagination" />
@@ -182,7 +255,11 @@
-
已选
+
+
已选
+
6
+
人
+
全部清除 @@ -194,7 +271,11 @@
- 李明 + 李大明 +
+
+
+ 李二明
@@ -202,15 +283,11 @@
- 李明 + 李大明
- 李明 -
-
-
- 李明 + 李二明
@@ -239,43 +316,116 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 50, - organizeList: [ + pageSize1: 10, + currentPage1: 1, + tableDataTotal1: 50, + pageSize2: 10, + currentPage2: 1, + tableDataTotal2: 50, + selectedRowKeys: [], + selectedRowKeys1: [], + selectedRowKeys2: [], + activeKey: "1", + value: [], //级联选择框 + choosevalue: null, //受众选择 + 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: "行政部", }, ], }, @@ -287,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: [ @@ -348,17 +507,25 @@ export default { className: "h", }, { - title: "部门", - dataIndex: "bum", - key: "bum", - width: 40, + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, align: "center", className: "h", }, { - title: "岗位", - dataIndex: "gangw", - key: "gangw", + title: "归属组织", + dataIndex: "guishu", + key: "guishu", + width: 30, + align: "center", + className: "h", + }, + { + title: "部门", + dataIndex: "bum", + key: "bum", width: 40, align: "center", className: "h", @@ -367,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, @@ -424,68 +606,185 @@ export default { className: "h", }, { - title: "创建时间", - dataIndex: "time", - key: "time", - width: 40, + title: "工号", + dataIndex: "numb", + key: "numb", + width: 35, align: "center", className: "h", }, { - title: "人数", - dataIndex: "total", - key: "total", - width: 20, - align: "center", - className: "h", - }, - { - title: "状态", - dataIndex: "state", - key: "state", - width: 20, - align: "center", - className: "h", - }, - { - title: "类型", - dataIndex: "type", - key: "type", + title: "归属组织", + dataIndex: "guishu", + key: "guishu", width: 30, align: "center", className: "h", }, + { + title: "部门", + dataIndex: "bum", + key: "bum", + width: 40, + align: "center", + className: "h", + }, + ], + tabledata2: [ + { + key: 1, + name: "小李", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + key: 2, + name: "小刘", + bum: "产研部", + numb: "000000", + guishu: "", + }, + { + 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: "人力资源hrbp", + label: "人力资源hrbp", + }, ], }); const closeDrawer = () => { + state.activeKey = "1"; ctx.emit("update:ownpowervisible", 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 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5814c3cd..3d1a37e9 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1053,7 +1053,7 @@
@@ -1681,24 +1681,34 @@
- + -
+
-
+
+
提示
- 您确定要删除此课程吗 +
+ 您确定要删除此课程吗 +
+
+ 您确定要复制此课程吗 +
+
+ 您确定要停用此课程吗 +
@@ -1712,68 +1722,6 @@
- - -
-
-
-
-
- 提示 -
-
-
- 您确定要复制此课程吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- - - - -
-
-
-
-
- 提示 -
-
-
- 您确定要停用此课程吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- - @@ -2457,6 +2405,7 @@ export default defineComponent({ agreestudy_hs: false, rejectstudy_hs: false, delete_hs: false, + del_hs:false, copy_hs: false, nouse_hs: false, // 二维码标题状态 @@ -2549,6 +2498,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2723,6 +2673,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2756,6 +2707,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.copy_hs = true; }} style={{ width: "30px" }} @@ -2803,6 +2755,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} style="margin-left:22px" > @@ -2857,6 +2810,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2873,6 +2827,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2889,6 +2844,7 @@ export default defineComponent({ class="jc" onClick={() => { state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -2962,6 +2918,7 @@ export default defineComponent({
{ state.delete_hs = true; + state.del_hs = true; }} > 删除 @@ -3039,7 +2996,11 @@ export default defineComponent({ {value.status === "已拒绝" ? (
-
删除
+
{ + state.delete_hs = true; + state.del_hs = true; + }}>删除
) : ( @@ -3066,6 +3027,7 @@ export default defineComponent({
{ + state.delete_hs = true; state.nouse_hs = true; }} > @@ -3238,11 +3200,8 @@ export default defineComponent({ }; const delete_exit = () => { state.delete_hs = false; - }; - const copy_exit = () => { + state.del_hs = false; state.copy_hs = false; - }; - const nouse_exit = () => { state.nouse_hs = false; }; const onSelectChange = (selectedRowKeys) => { @@ -3304,8 +3263,6 @@ export default defineComponent({ agreestudy_exit, rejectstudy_exit, delete_exit, - copy_exit, - nouse_exit, onSelectChange, faceManageChange, openMessage, @@ -4792,8 +4749,6 @@ export default defineComponent({ .notable { width: 100%; height: 100%; - display: flex; - justify-content: center; .notablebox { width: 412px; height: 212px; @@ -4802,8 +4757,7 @@ export default defineComponent({ display: flex; justify-content: center; text-align: center; - margin-top: 77px; - margin-bottom: 109px; + margin:77px auto 109px auto; cursor: pointer; position: relative; .smallleft { @@ -4925,7 +4879,7 @@ export default defineComponent({ } } .studentsmanage { - z-index: 999; + z-index: 1000; min-width: 1000px; background: #ffffff; .stm_main { @@ -5235,18 +5189,18 @@ export default defineComponent({ padding-left: 26px; font-size: 16px; .del-icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/notice.png); - background-size: 100% 100%; - } - .icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/QR.png); - background-size: 100% 100%; + width: 16px; + height: 16px; + position: relative; + margin-right: 10px; + img{ + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; + background-size: 100% 100%; + } } .close_exit { position: absolute; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 11b9e130..a05538e8 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -85,46 +85,16 @@
- -
-
- -
发布
-
- - -
-
更多
-
-
-
复制
-
删除
+ 学习模式： +
+ +
切换模式
-
返回
 @@ -254,16 +224,19 @@
-
- +
+
+ 任务列表 +
+
+
+
移动到任务阶段
+
+
+
+
批量删除
+
+
@@ -306,6 +279,36 @@ />
+ +
+
+
+
+
+ 无任务 +
+
+ 请点击上方，创建任务 +
+
+
+
+
+
+ +
+
+
+
+
+
暂存
+
+
+
确定
+
+
+
下一步
+
@@ -392,40 +395,6 @@ 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", @@ -636,16 +605,11 @@ export default { visible: false, modal: false, clos: false, + stm_hs: false, value1: "", value2: "", selectedRowKeys: [], }); - const selectProjectName = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName2 = (value, index) => { - console.log("value", value, index); - }; const showDrawer = () => { state.visible = true; }; @@ -802,8 +766,6 @@ export default { }); return { ...toRefs(state), - selectProjectName, - selectProjectName2, tableDataFunc, showDrawer, closeDrawer, @@ -1201,16 +1163,44 @@ export default { } .rightt { - // width: 500px; height: 100%; - // background-color: red; - // position: absolute; - // right: 0; display: flex; align-items: center; .select { - margin-right: 50px; - // margin-bottom: 20px; + display: flex; + align-items: center; + white-space: nowrap; + margin-right: 56px; + .inputbox { + display: flex; + align-items: center; + border: 1px solid #c7cbd2; + width: 238px; + height: 40px; + border-radius: 8px; + input { + border: none; + outline: none; + } + .bottonbox { + width: 100px; + height: 40px; + background: #409eff; + border-radius: 8px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + flex-shrink: 0; + .btnText { + font-size: 14px; + font-weight: 400; + color: #ffffff; + line-height: 36px; + margin-left: 5px; + } + } + } } .line { height: 60px; @@ -1218,27 +1208,6 @@ export default { background-color: #e8effa; margin-right: 18px; } - .img2 { - width: 42px; - height: 42px; - margin-right: 18px; - } - .pub { - color: #ffb64e; - font-size: 14px; - margin-top: 5px; - margin-right: 30px; - cursor: pointer; - white-space: nowrap; - } - @media screen and (max-width: 1050px) { - .pub { - margin-right: 10px; - } - .line { - margin-right: 10px; - } - } .return { color: #4ea6ff; font-size: 14px; @@ -1246,53 +1215,6 @@ export default { margin-right: 20px; white-space: nowrap; } - - .role { - display: flex; - align-items: center; - font-size: 16px; - font-weight: 400; - color: #333330; - line-height: 36px; - cursor: pointer; - position: relative; - margin-right: 20px; - .roleArrow { - width: 13px; - height: 7px; - margin-left: 8px; - background-image: url(../../assets/images/navtop/down.png); - background-size: 100%; - } - .roleItems { - width: 109px; - height: 90px; - padding-top: 10px; - background: #ffffff; - box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); - position: absolute; - top: 35px; - right: 0px; - text-align: center; - display: none; - z-index: 100; - } - .roleItem { - font-size: 14px; - font-weight: 400; - color: rgba(79, 81, 86, 1); - line-height: 36px; - } - .roleItem:hover { - color: #4ea6ff; - } - } - .role:hover .roleItems { - display: block; - } - .role:hover .roleArrow { - background-image: url(../../assets/images/navtop/up.png); - } } } } @@ -1353,8 +1275,59 @@ export default { width: 95%; // height: 100%; // background-color: #bfa; - .select { - margin-top: 30px; + .title { + display: flex; + align-items: center; + justify-content: space-between; + .tit_left { + font-size: 16px; + font-weight: 500; + color: #363636; + line-height: 36px; + margin-top: 30px; + } + .tit_right { + display: flex; + align-items: center; + margin-top: 30px; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + margin-right: 14px; + flex-shrink: 0; + cursor: pointer; + white-space: nowrap; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + background-color: #409eff; + .btnText { + color: #ffffff; + } + } + .btn2 { + background-color: #ffffff; + .imgIcon { + width: 16px; + height: 16px; + background-image: url(@/assets/images/projectadd/delete.png); + background-size: 100%; + } + .btnText { + color: #409eff; + } + } + } } .talk { margin-top: 24px; @@ -1426,20 +1399,97 @@ export default { bottom: 20px; } } + .notable { + width: 100%; + height: 100%; + .notablebox { + width: 412px; + height: 212px; + background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%); + border-radius: 10px; + display: flex; + justify-content: center; + text-align: center; + margin: 77px auto 109px auto; + cursor: pointer; + position: relative; + .smallleft { + position: absolute; + top: 18px; + left: 0px; + width: 8px; + height: 21px; + border-radius: 0px 4px 4px 0px; + background-color: #ffb64e; + } + .smallright { + position: absolute; + bottom: 18px; + right: 0px; + width: 8px; + height: 21px; + border-radius: 4px 0px 0px 4px; + background-color: #ffb64e; + } + .boxbody { + .boximg { + width: 72px; + height: 72px; + margin: 32px auto 20px auto; + background-image: url(@/assets/images/coursewareManage/nostate.png); + background-size: 100% 100%; + } + .boxtitle { + margin-bottom: 4px; + } + } + } + } + } + } + .footbtn { + width: 100%; + flex: 1; + background-color: #fff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); + display: flex; + justify-content: end; + .btnbox { + display: flex; + margin-right: 36px; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + margin: 21px 0px 19px 14px; + cursor: pointer; + white-space: nowrap; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + background-color: #409eff; + .btnText { + color: #ffffff; + } + } + .btn2 { + background-color: #ffffff; + .btnText { + color: #409eff; + } + } } } - // .drawerbox { - // // margin: 20px 38px 30px; - // th.h { - // background-color: #eff4fc !important; - // } - - // .ant-table-tbody - // > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) - // > td { - // background: #f6f9fd; - // } - // } } .opat { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 826fc564..6debe957 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -766,14 +766,18 @@ export default { padding-left: 26px; font-size: 16px; .del-icon { - display: flex; - align-items: center; - margin-right: 10px; - // background-image: url(@/assets/images/coursewareManage/notice.png); - img{ - background-size: 100% 100%; width: 16px; height: 16px; + position: relative; + margin-right: 10px; + // background-image: url(@/assets/images/coursewareManage/notice.png); + img{ + width: 100%; + height: 100%; + position: absolute; + top:0px; + left:0px; + background-size: 100% 100%; } } .icon { From 7626334d04f42ae887bf664d8d6e1a4b5708c40a Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 24 Oct 2022 17:24:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=85=B3=E5=8D=A1=E7=9A=84=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E6=9C=89=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 923 ++++++++++++++++++++-------- 1 file changed, 654 insertions(+), 269 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index d1107707..f942b814 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -44,7 +44,170 @@ size="large" :tabBarStyle="{ marginLeft: '10px' }" > - + +
+ +
+
+
快速创建项目详情
+
+
+
+
+ +
+
+ +
+
+ +
+
+ 添加任务 +
+
快速添加任务/阶段
+
+
+
+ +
+
+ +
+
+ +
+
+ 添加学员 +
+
快速添加学员
+
+
+
+ +
+
+ +
+
+ +
+
+ 发布 +
+
快速发布项目
+
+
+
+ + +
+
项目概览
+
+
+ 200 +
总人数
+
+
+ 15 +
必修课
+
+
+ 15 +
选修课
+
+
+
+ 50% +
+
完成率
+
+
+
+ 30% +
+
必修完成率
+
+
+
+ 30% +
+
选修完成率
+
+
+
阶段信息
+
+
阶段1
+
阶段2
+
+
+
阶段名称：
+
管理者进阶-腾飞班1第一阶段
+
+
+
+ +
课程完成率
+
+
+ +
考试通过率
+
+
+ +
作业合格率
+
+
+
10
+
+ 阶段任务总数 + +
+
5
+
+ 必修课 + +
+
1
+
+ 选修课 + +
+
+
+
+ + + +
@@ -168,7 +331,8 @@
- + +
@@ -249,8 +413,8 @@
- - + +
@@ -550,6 +714,7 @@ export default { pageSize: 10, visible: false, sh: false, + nodata: true, closeDeleteAll: false, curLevel: "", //关卡的数据 @@ -1041,7 +1206,6 @@ export default { .addwrapper { width: 100%; height: 100%; - // background-color: green; .addhead { width: 100%; height: 130px; @@ -1198,6 +1362,491 @@ export default { margin-left: 0px !important; padding-left: 32px !important; } + .onerow { + //width: 100%; + display: flex; + height: 40px; + position: relative; + margin-top: 15px; + margin-left: 38px; + //margin-right: 38px; + .taskmain { + font-size: 18px; + padding-top: 7px; + color: #000000; + } + .btn { + position: absolute; + top: 0; + right: 168px; + background-color: #409eff; + width: 130px; + height: 40px; + border-radius: 8px; + border: 1px solid #409eff; + color: #ffffff; + cursor: pointer; + } + .edit { + position: absolute; + right: 38px; + top: 0; + color: #409eff; + width: 100px; + height: 40px; + border: 1px solid #409eff; + border-radius: 8px; + .editimg { + width: 15px; + height: 15px; + margin-top: -2px; + margin-left: 25px; + margin-right: 5px; + } + .editext { + line-height: 40px; + } + } + .edit:hover { + color: #ffffff; + background-color: #409eff; + cursor: pointer; + .editimg { + background-image: url("../../assets/images/projectadd/edit1.png"); + } + } + } + .second { + display: flex; + justify-content: left; + flex-wrap: wrap; + margin-top: 40px; + margin-left: 20px; + .nubbox { + width: 253px; + height: 116px; + margin-top: 20px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background: #fafbfc; + border-radius: 10px; + margin-left: 15px; + .nub1 { + color: #ffb54a; + font-size: 30px; + font-weight: 700; + } + .nub2 { + color: #6d7584; + font-size: 14px; + } + } + .taskbox { + width: 412px; + height: 160px; + border-radius: 10px; + position: relative; + margin-left: 68px; + margin-bottom: 40px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 42px; + left: 37px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 52px; + left: 145px; + font-size: 20px; + font-weight: 700; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + position: absolute; + left: 144px; + bottom: 49px; + } + } + } + .stagemess { + display: flex; + margin-left: 38px; + .stage1 { + width: 100px; + height: 33px; + text-align: center; + line-height: 34px; + border-radius: 6px; + color: #ffffff; + font-size: 16px; + background: #4ea6ff; + margin-right: 10px; + margin-top: 19px; + cursor: pointer; + } + .stage2 { + width: 100px; + height: 33px; + text-align: center; + line-height: 34px; + border-radius: 6px; + border: 1px solid #ebeef3; + color: #000000; + font-size: 16px; + background: #ffffff; + margin-right: 10px; + margin-top: 19px; + cursor: pointer; + } + } + .stagesecond { + display: flex; + margin-left: 39px; + margin-top: 29px; + .staname { + color: #999ba3; + font-size: 14px; + } + .stamess { + color: #4f5156; + font-size: 14px; + } + } + .stagelast { + display: flex; + flex-wrap: wrap; + justify-content: center; + margin-bottom: 55px; + .stagepro { + display: flex; + flex-direction: column; + align-items: center; + margin-top: 55px; + margin-right: 120px; + .ant-progress-circle-path { + stroke: #4ea6ff; + } + .ant-progress-text { + color: #4ea6ff; + font-weight: 700; + } + .protext { + color: #6d7584; + font-size: 14px; + margin-top: 25px; + } + } + .proright { + width: 500px; + margin-top: 55px; + margin-left: 50px; + .ant-progress-bg { + height: 24px !important; + background: #4ea6ff; + } + .ant-progress-inner { + height: 24px; + } + .pronub { + color: #4ea6ff; + font-size: 14px; + margin: 5px 0; + } + .proright1 { + display: flex; + justify-content: right; + .textpro { + color: #6d7584; + font-size: 14px; + margin-right: 20px; + } + .ant-progress-text { + color: #4ea6ff; + font-size: 14px; + font-weight: 700; + } + } + } + } + .sametab { + // margin-left: 30px; + // margin-right: 30px; + margin-top: 30px; + width: 100%; + // background-color: green; + .Lhead { + display: flex; + .btns { + display: flex; + margin-left: 20px; + // flex-wrap: wrap; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + margin-right: 14px; + flex-shrink: 0; + cursor: pointer; + .search { + background-size: 100%; + } + .btnText { + font-size: 14px; + font-weight: 400; + color: rgba(64, 158, 255, 1); + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + .search { + width: 15px; + height: 17px; + background-image: url("../../assets/images/courseManage/search1.png"); + } + } + .btn2 { + .search { + width: 16px; + height: 18px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn3 { + margin-right: 0px; + .search { + width: 17px; + height: 18px; + background-image: url("../../assets/images/courseManage/add1.png"); + } + } + .btn1:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn3:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/add0.png"); + } + .btnText { + color: #ffffff; + } + } + } + } + .Lbom { + position: relative; + margin-bottom: 20px; + .item { + width: 100%; + height: 200px; + // background-color: green; + margin-top: 40px; + border-radius: 8px; + border: 1px solid #f0f4fe; + .itemhead { + height: 50px; + width: 100%; + background-color: #f0f4fe; + display: flex; + align-items: center; + position: relative; + .lev { + margin-left: 27px; + margin-right: 16px; + line-height: 100%; + color: #409eff; + font-size: 16px; + } + .lin { + width: 1px; + height: 35%; + background-color: #c7cbd2; + } + .nam { + margin-left: 16px; + color: #4f5156; + line-height: 100%; + font-size: 16px; + } + .count { + position: absolute; + line-height: 100%; + color: #4f5156; + font-size: 14px; + right: 40px; + span:nth-child(2) { + color: #63ca8c; + } + } + } + .itembomm { + display: flex; + align-items: center; + height: 150px; + .it { + // margin-left: 110px; + // margin-right: 110px; + width: 13%; + text-align: center; + .on { + font-size: 30px; + } + .ittext { + color: #4f5156; + margin-top: 16px; + margin-left: -5px; + } + } + .linee { + background-color: #ecf2fb; + width: 1px; + height: 55%; + } + .itright { + position: absolute; + right: 45px; + display: flex; + .te { + color: #4ea6ff; + font-size: 14px; + cursor: pointer; + } + .more { + position: relative; + height: 30px; + display: flex; + .moreArrow { + width: 13px; + height: 7px; + display: inline-block; + background-image: url("../../assets/images/navtop/down.png"); + background-size: 100%; + margin: 2px; + margin-left: 7px; + margin-top: 6px; + } + .moreItems { + width: 80px; + height: 70px; + display: none; + background: #ffffff; + box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); + border-radius: 3px; + border: 0px solid #dcdcdc; + position: absolute; + left: 0px; + top: 20px; + z-index: 100; + .roleItem { + font-size: 14px; + font-weight: 400; + color: rgba(79, 81, 86, 1); + line-height: 36px; + display: flex; + justify-content: center; + cursor: pointer; + } + .roleItem:hover { + color: #4ea6ff; + } + } + } + .more:hover .moreArrow { + background-image: url("../../assets/images/navtop/up.png"); + } + .more:hover .moreItems { + display: block; + } + } + } + + .show { + color: blue; + } + .noshow { + display: none; + } + } + .create { + margin-top: 40px; + .taskbox { + width: 412px; + height: 160px; + border-radius: 10px; + position: relative; + // margin-left: 68px; + margin-bottom: 40px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 42px; + left: 37px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 52px; + left: 145px; + font-size: 20px; + font-weight: 700; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + position: absolute; + left: 144px; + bottom: 49px; + } + } + } + } + } .cont { display: flex; @@ -1206,270 +1855,6 @@ export default { width: 40px; // background-color: red; } - .sametab { - // margin-left: 30px; - // margin-right: 30px; - margin-top: 30px; - width: 100%; - // background-color: green; - .Lhead { - display: flex; - .btns { - display: flex; - margin-left: 20px; - // flex-wrap: wrap; - .btn { - padding: 0px 26px 0px 26px; - height: 38px; - background: rgba(64, 158, 255, 0); - border-radius: 8px; - border: 1px solid rgba(64, 158, 255, 1); - display: flex; - align-items: center; - justify-content: center; - margin-right: 14px; - flex-shrink: 0; - cursor: pointer; - .search { - background-size: 100%; - } - .btnText { - font-size: 14px; - font-weight: 400; - color: rgba(64, 158, 255, 1); - line-height: 36px; - margin-left: 5px; - } - } - .btn1 { - .search { - width: 15px; - height: 17px; - background-image: url("../../assets/images/courseManage/search1.png"); - } - } - .btn2 { - .search { - width: 16px; - height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - .btn3 { - margin-right: 0px; - .search { - width: 17px; - height: 18px; - background-image: url("../../assets/images/courseManage/add1.png"); - } - } - .btn1:hover { - background: rgba(64, 158, 255, 1); - .search { - background-image: url("../../assets/images/courseManage/search0.png"); - } - .btnText { - color: #ffffff; - } - } - .btn2:hover { - background: rgba(64, 158, 255, 1); - .search { - background-image: url("../../assets/images/courseManage/reset0.png"); - } - .btnText { - color: #ffffff; - } - } - .btn3:hover { - background: rgba(64, 158, 255, 1); - .search { - background-image: url("../../assets/images/courseManage/add0.png"); - } - .btnText { - color: #ffffff; - } - } - } - } - .Lbom { - position: relative; - margin-bottom: 20px; - .item { - width: 100%; - height: 200px; - // background-color: green; - margin-top: 40px; - border-radius: 8px; - border: 1px solid #f0f4fe; - .itemhead { - height: 50px; - width: 100%; - background-color: #f0f4fe; - display: flex; - align-items: center; - position: relative; - .lev { - margin-left: 27px; - margin-right: 16px; - line-height: 100%; - color: #409eff; - font-size: 16px; - } - .lin { - width: 1px; - height: 35%; - background-color: #c7cbd2; - } - .nam { - margin-left: 16px; - color: #4f5156; - line-height: 100%; - font-size: 16px; - } - .count { - position: absolute; - line-height: 100%; - color: #4f5156; - font-size: 14px; - right: 40px; - span:nth-child(2) { - color: #63ca8c; - } - } - } - .itembomm { - display: flex; - align-items: center; - height: 150px; - .it { - // margin-left: 110px; - // margin-right: 110px; - width: 13%; - text-align: center; - .on { - font-size: 30px; - } - .ittext { - color: #4f5156; - margin-top: 16px; - margin-left: -5px; - } - } - .linee { - background-color: #ecf2fb; - width: 1px; - height: 55%; - } - .itright { - position: absolute; - right: 45px; - display: flex; - .te { - color: #4ea6ff; - font-size: 14px; - cursor: pointer; - } - .more { - position: relative; - height: 30px; - display: flex; - .moreArrow { - width: 13px; - height: 7px; - display: inline-block; - background-image: url("../../assets/images/navtop/down.png"); - background-size: 100%; - margin: 2px; - margin-left: 7px; - margin-top: 6px; - } - .moreItems { - width: 80px; - height: 70px; - display: none; - background: #ffffff; - box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); - border-radius: 3px; - border: 0px solid #dcdcdc; - position: absolute; - left: 0px; - top: 20px; - z-index: 100; - .roleItem { - font-size: 14px; - font-weight: 400; - color: rgba(79, 81, 86, 1); - line-height: 36px; - display: flex; - justify-content: center; - cursor: pointer; - } - .roleItem:hover { - color: #4ea6ff; - } - } - } - .more:hover .moreArrow { - background-image: url("../../assets/images/navtop/up.png"); - } - .more:hover .moreItems { - display: block; - } - } - } - - .show { - color: blue; - } - .noshow { - display: none; - } - } - .create { - margin-top: 40px; - .taskbox { - width: 412px; - height: 160px; - border-radius: 10px; - position: relative; - // margin-left: 68px; - margin-bottom: 40px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 42px; - left: 37px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 52px; - left: 145px; - font-size: 20px; - font-weight: 700; - //line-height: 36px; - } - .centermain { - color: rgba(135, 139, 146, 1); - font-size: 14px; - position: absolute; - left: 144px; - bottom: 49px; - } - } - } - } - } } .xwid { // width: 100%;