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/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue new file mode 100644 index 00000000..26e1769e --- /dev/null +++ b/src/components/drawers/AddFaceteach.vue @@ -0,0 +1,458 @@ + + + diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue new file mode 100644 index 00000000..dee80d18 --- /dev/null +++ b/src/components/drawers/AddOnline.vue @@ -0,0 +1,447 @@ + + + \ No newline at end of file diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index c9061de7..f91322d2 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -2,8 +2,7 @@ + +
+
+
编辑在线
+ +
+
+
+
+
+ 课程名称: +
+
+ +
+
+
+
+
+ 选择课程: +
+
+ + 时间管理 +
+
+
+
+
+
课程编号:
+
+ +
+
+
+
内容分类:
+
+ +
+
+
+
+
+ +
搜索
+
+
+ +
重置
+
+
+
+
+ +
+
+ + +
+
+
+
+ + + \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 6424a0f1..3ffd098e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -104,7 +104,6 @@ />
{{ value5.length }}/20
-
@@ -258,8 +257,8 @@ maxlength="90" style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入课程名称" - > - + /> +
{{ value6.length }}/90
@@ -342,6 +341,7 @@ style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入目标人群" /> +
{{ value7.length }}/50
@@ -357,6 +357,7 @@ style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入课程价值" /> +
{{ value8.length }}/200
@@ -441,6 +442,7 @@ style="width: 440px; height: 100px; border-radius: 8px" placeholder="请输入" /> +
{{ value11.length }}/150
@@ -567,7 +569,7 @@ /> - + - 在线课程管理 +
在线课程管理
+
面授课程管理
状态:
已审核
-
- - 报名管理 - 学习记录 - 资源完成情况 - -
-
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
- -
搜索
-
-
-
-
- -
- - - - -
- - - -
-
- - 面授课程管理 -
-
- -
-
-
-
-
-
-
课程:BMOT2021年职级晋升-安全管理(高级)
-
-
类型:
-
录播课
-
内容分类:
-
领导力
-
状态:
-
已审核
-
-
- - 报名管理 - 学习记录 - -
-
-
- - 状态 - 已通过 - 未审核 - 管理员拒绝 - -
-
- -
-
-
- -
搜索
-
+ +
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+ +
搜索
+
+
+
+
+ +
+
+ +
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+ +
搜索
+
+
+
+
+ + + +
+
+
-
- - - -
-
-
- + +
{{ value20.length }}/50
@@ -1085,12 +1043,10 @@ 签到设置
- - 是否允许未报名的学员签到 - - - 签到是否需要口令 - + + 是否允许未报名的学员签到 + 签到是否需要口令 +
@@ -1108,15 +1064,11 @@ 完成规则
- - 报名即完成 - - - 签到即完成 - - - 请假算完成 - + + 报名即完成 + 签到即完成 + 请假算完成 +
@@ -2129,7 +2081,7 @@ export default defineComponent({ bs_hs: true, ft_hs:false, om_1: false, - ftm_1: false, + ft_1: false, om_ckxq: false, gpm_hs: false, stm_hs: false, @@ -2146,7 +2098,13 @@ export default defineComponent({ // value2:"", value5:"", value6:"", + value7:"", + value8:"", + value11:"", + value20:"", valueE:"", + valueB:"", + valueC:"", selectedRowKeys: [], }); const fileList = ref([]); @@ -2207,10 +2165,12 @@ export default defineComponent({ class="jc" style={{ width: "30px" }} onClick={() => { - if (value.courseform === "线上") { + if (value.courseform === "线上" ) { state.om_1 = true; + state.ft_1 = false; } else if (value.courseform === "面授") { - state.ftm_1 = true; + state.om_1 = true; + state.ft_1 = true; } }} > @@ -2709,9 +2669,6 @@ export default defineComponent({ const om_exit = () => { state.om_1 = false; }; - const ftm_exit = () => { - state.ftm_1 = false; - }; const ckxq_hs = () => { state.om_ckxq = true; }; @@ -2783,7 +2740,6 @@ export default defineComponent({ createft, ft_exit, om_exit, - ftm_exit, ckxq_hs, ftsr_exit, gpm_exit, @@ -2811,6 +2767,7 @@ export default defineComponent({ // color: #4EA6FF !important; // } // } + .courseManage { width: 100%; height: 100%; @@ -2989,6 +2946,7 @@ export default defineComponent({ } .m_body { display: flex; + flex-wrap: wrap; .mb_left { width: 50%; .mbl_items { @@ -3001,6 +2959,7 @@ export default defineComponent({ display: flex; align-items: center; justify-content: flex-end; + white-space: nowrap; .asterisk_icon{ width: 10px; height: 10px; @@ -3010,6 +2969,12 @@ export default defineComponent({ } .item_inp{ flex:1; + position: relative; + .inp_num{ + position: absolute; + left:398px; + top:10px; + } } } .i2_cz{ @@ -3039,6 +3004,7 @@ export default defineComponent({ display: flex; align-items: center; justify-content: flex-end; + white-space: nowrap; .asterisk_icon{ width: 10px; height: 10px; @@ -3048,6 +3014,12 @@ export default defineComponent({ } .item_inp{ flex:1; + position: relative; + .inp_num{ + position: absolute; + left:395px; + bottom:10px; + } } .accessory{ display:flex; @@ -3411,6 +3383,7 @@ export default defineComponent({ } .b_input{ flex:1; + position: relative; .upload_box { display: flex; cursor: pointer; @@ -3420,6 +3393,11 @@ export default defineComponent({ margin-right: 5px; } } + .inp_num{ + position: absolute; + top:9px; + right:10px; + } } } .items_fj{ @@ -3877,8 +3855,7 @@ export default defineComponent({ } } .modalMain{ - .onlinemanage, - .faceteachmanage { + .onlinemanage { display: none; z-index: 999; min-width: 1000px; diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 29acaa1d..30428fa0 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -54,11 +54,11 @@
重置
-
-
- -
创建项目
-
+
+
+ +
创建项目
+
@@ -109,7 +109,7 @@
- -
+
- 请选择项目类别 + 请选择项目类别
-
+
- -
-
-
-
单层子项目
-
-
-
-
-
-
多层子项目
+ +
+
+
+ +
+
+ +
+
+ 单层子项目 +
+
+
+
+ +
+
+ +
+
+ +
+
+ 多层子项目 +
+
@@ -153,22 +196,39 @@
-
+
- 添加阶段 + 请选择项目类别
-
+
- -
-
-
-
-
单层项目
-
不包含子项目,直接填写项目基础信息后创建任务
+ +
+
+ +
+
+ +
+
+ +
+
+ 单层项目 +
+
+ 不包含子项目,直接填写项目基础信息后创建任务
- -
-
-
-
-
多层项目
-
包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务
+ +
+
+ +
+
+ +
+
+ +
+
+ 多层项目 +
+
+ 包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务 +
+
@@ -208,19 +300,33 @@ wrapClassName="doublepro" width="624px" height="476px" + > +
-
+ 创建多层项目 -
- 创建多层项目 -
-
- -
+
+
+ +
@@ -234,7 +340,8 @@
@@ -252,7 +359,7 @@
@@ -268,7 +375,7 @@
@@ -283,13 +390,13 @@
- 取消 - 确定 + 取消 + 确定
@@ -306,24 +413,40 @@ wrapClassName="doublesonpro" width="624px" height="476px" + > +
-
+ 创建多层子项目 -
- 创建多层项目 -
-
- -
+
+
+ +
-
- 项目归属: - 管理者进阶 +
+ 项目归属: + 管理者进阶
@@ -337,7 +460,7 @@
@@ -353,7 +476,7 @@
@@ -369,7 +492,7 @@
@@ -384,13 +507,13 @@
- 取消 - 确定 + 取消 + 确定
@@ -739,7 +862,6 @@ export default { doublesonpro: false, }); - onMounted(() => { // console.log("执行"); }); @@ -788,10 +910,15 @@ export default {
- { - state.sonproject = true; - }}>创建子项目 + { + state.sonproject = true; + }} + > + 创建子项目 +
- 创建班级 + + 创建班级 +
- 创建班级 + + 创建班级 + 复制
) : item.state === "已结束" ? ( @@ -1005,7 +1136,7 @@ export default { a.operation = a.state === "草稿" ? (
- + 编辑
- + 编辑
- + {value.state === "草稿" ? ( + 编辑 + ) : ( + + )}
{ state.sonproject = true; - }; const closeModal = () => { state.sonproject = false; - }; - + const showModal1 = () => { - state.estabish = true; }; const closeModal1 = () => { state.estabish = false; - }; - const showModal2 = () => { + const showModal2 = () => { state.doublepro = true; state.estabish = false; }; const closeModal2 = () => { state.doublepro = false; - }; - const showModal3 = () => { + const showModal3 = () => { state.doublesonpro = true; state.sonproject = false; }; const closeModal3 = () => { state.doublesonpro = false; - }; return { ...toRefs(state), @@ -1818,45 +1947,44 @@ export default { width: 80%; height: 40px; .ant-select-selector { - border-radius: 8px; - // height: 120%; - width: 100%; - height: 40px; - } + border-radius: 8px; + // height: 120%; + width: 100%; + height: 40px; + } } } - - } - .pubtn { - display: flex; - justify-content: center; - margin-top: 25px; - //margin-bottom: 29px; - .pubtn1 { - width: 100px; - height: 40px; - margin-right: 16px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: rgba(78, 166, 255, 1); - font-size: 14px; - //line-height: 36px; - align-items: center; - background: rgba(255, 255, 255, 1) - } - .pubtn2 { - width: 100px; - height: 40px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: #FFFFFF; - font-size: 14px; - align-items: center; - //line-height: 36px; - background: #409EFF; - } + } + .pubtn { + display: flex; + justify-content: center; + margin-top: 25px; + //margin-bottom: 29px; + .pubtn1 { + width: 100px; + height: 40px; + margin-right: 16px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: rgba(78, 166, 255, 1); + font-size: 14px; + //line-height: 36px; + align-items: center; + background: rgba(255, 255, 255, 1); + } + .pubtn2 { + width: 100px; + height: 40px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: #ffffff; + font-size: 14px; + align-items: center; + //line-height: 36px; + background: #409eff; + } } } } @@ -1900,45 +2028,44 @@ export default { width: 100%; height: 40px; .ant-select-selector { - border-radius: 8px; - // height: 120%; - width: 100%; - height: 40px; - } + border-radius: 8px; + // height: 120%; + width: 100%; + height: 40px; + } } } - - } - .pubtn { - display: flex; - justify-content: center; - margin-top: 25px; - //margin-bottom: 29px; - .pubtn1 { - width: 100px; - height: 40px; - margin-right: 16px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: rgba(78, 166, 255, 1); - font-size: 14px; - //line-height: 36px; - align-items: center; - background: rgba(255, 255, 255, 1) - } - .pubtn2 { - width: 100px; - height: 40px; - margin-bottom: 29px; - border: 1px solid #409EFF; - border-radius: 4px; - color: #FFFFFF; - font-size: 14px; - align-items: center; - //line-height: 36px; - background: #409EFF; - } + } + .pubtn { + display: flex; + justify-content: center; + margin-top: 25px; + //margin-bottom: 29px; + .pubtn1 { + width: 100px; + height: 40px; + margin-right: 16px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: rgba(78, 166, 255, 1); + font-size: 14px; + //line-height: 36px; + align-items: center; + background: rgba(255, 255, 255, 1); + } + .pubtn2 { + width: 100px; + height: 40px; + margin-bottom: 29px; + border: 1px solid #409eff; + border-radius: 4px; + color: #ffffff; + font-size: 14px; + align-items: center; + //line-height: 36px; + background: #409eff; + } } } } @@ -1947,49 +2074,49 @@ export default { .sonproject { .ant-modal { .ant-modal-body { - padding: 0 !important; + padding: 0 !important; .modalMain { display: flex; justify-content: center; margin-top: 48px; //margin-bottom: 40px; .taskbox { - width: 310px; - height: 160px; - border-radius: 10px; - position: relative; - margin-bottom: 80px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 44px; - left: 40px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 66px; - left: 136px; - 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; - } + width: 310px; + height: 160px; + border-radius: 10px; + position: relative; + margin-bottom: 80px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 44px; + left: 40px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 66px; + left: 136px; + 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; + } } } } @@ -1998,7 +2125,7 @@ export default { .estabish { .ant-modal { .ant-modal-body { - padding: 0 !important; + padding: 0 !important; .modalMain { display: flex; flex-direction: column; @@ -2006,61 +2133,61 @@ export default { margin-top: 48px; //margin-bottom: 40px; .taskbox { - width: 438px; - height: 160px; - border-radius: 10px; - position: relative; - margin-bottom: 24px; - cursor: pointer; - .leftt { - position: absolute; - top: 18px; - left: 0; - } - .photo { - position: absolute; - top: 44px; - left: 40px; - } - .rightt { - position: absolute; - top: 69px; - right: 26px; - } - .centerbox { - position: absolute; - top: 42px; - left: 120px; - font-size: 20px; - font-weight: 500; - //line-height: 36px; - } - .centerbox1 { - position: absolute; - top: 32px; - left: 120px; - font-size: 20px; - font-weight: 500; - //line-height: 36px; - } - .centermain { - color: rgba(135, 139, 146, 1); - font-size: 14px; - line-height: 20px; - position: absolute; - width: 252px; - left: 120px; - top: 78px; - } - .centermain1 { - color: rgba(135, 139, 146, 1); - font-size: 14px; - line-height: 20px; - position: absolute; - width: 252px; - left: 120px; - top: 68px; - } + width: 438px; + height: 160px; + border-radius: 10px; + position: relative; + margin-bottom: 24px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 44px; + left: 40px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 42px; + left: 120px; + font-size: 20px; + font-weight: 500; + //line-height: 36px; + } + .centerbox1 { + position: absolute; + top: 32px; + left: 120px; + font-size: 20px; + font-weight: 500; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + line-height: 20px; + position: absolute; + width: 252px; + left: 120px; + top: 78px; + } + .centermain1 { + color: rgba(135, 139, 146, 1); + font-size: 14px; + line-height: 20px; + position: absolute; + width: 252px; + left: 120px; + top: 68px; + } } } } diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 0bbd1138..90823948 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -2,7 +2,12 @@
-
阶段
+
+ 阶段 +
添加阶段
@@ -29,7 +34,10 @@
- +
管理者进阶-腾飞班
@@ -62,21 +70,31 @@
-
+
在线
+ +
+ +
+
-
+
面授
+ +
+ +
+
@@ -172,12 +190,15 @@
-
任务列表
- -
- - 批量删除 -
+
任务列表
+ +
+ + 批量删除 +
@@ -220,43 +241,12 @@ />
-
-
-
- -
-
-
关联项目
- -
-
- - -
-
- - -
+ +
+
- + +
@@ -270,45 +260,97 @@ width="624px" height="388px" > -
+
添加阶段
-
+
-
+
-
-
阶段名称:
-
-
- -
+
+
阶段名称:
+
+
+ +
-
-
阶段说明:
-
-
- -
+
+
阶段说明:
+
+
+ +
-
- - +
+ +
@@ -318,6 +360,9 @@ \ No newline at end of file + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index c439ef64..c8bce21e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -56,13 +56,7 @@
@@ -83,8 +77,8 @@ style=" background: linear-gradient( 180deg, - rgba(221, 234, 255, 1) 100%, - rgba(240, 248, 254, 1) 100% + rgba(221, 234, 255, 1), + rgba(240, 248, 254, 1) ); " > @@ -108,8 +102,8 @@ style=" background: linear-gradient( 180deg, - rgba(229, 246, 236, 1) 100%, - rgba(238, 249, 243, 1) 100% + rgba(229, 246, 236, 1), + rgba(238, 249, 243, 1) ); " > @@ -471,7 +465,131 @@
- 学员管理 + +
+
+
+
姓名:
+ +
+
+
小组名称:
+ +
+
+
部门:
+ +
+
+
学员:
+ +
+
+
+
+ + 搜索 +
+
+ + 重置 +
+
+
+
+
+ + 添加学员 +
+
+ + 导入学员 +
+
+ + 批量删除 +
+
+
+ +
+ 已选择 +
+ 2 +
+ + 列表选项总计: + 4 + +
+
清空
+
+
+ +
+ +
+
+
@@ -483,7 +601,7 @@
- + 搜索
@@ -493,12 +611,12 @@
-
- +
+ 创建小组
- + 随机分组
@@ -507,11 +625,190 @@
好好学习小组
-
...
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长:小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
全能小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长:小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
宇宙第一最强小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长:小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
天天向上小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长:小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+ +
+
+ +
+
+ +
+
+ +
+
-
@@ -612,7 +909,85 @@
- + + +
+ +
+
+ 创建小组 +
+
+ +
+
+
+
+
+ +
+
小组名称:
+
+ +
+
+
+
+ +
+
小组长:
+
+ +
+
+
+ 取消 + 确定 +
+
+
+
+
\ No newline at end of file + diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index af79859e..4d32ae84 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -23,6 +23,7 @@
+ Option A