diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 493bd4a5..faf7680f 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -61,6 +61,7 @@ export default { }, { name: "关卡", + href: "/leveladd", }, { name: "创建关卡", diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8cdd00d3..58fd3297 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -139,14 +139,16 @@ >⃰ 授课形式 -
-
- 线上 -
-
-
- 面授 -
+ +
+
+
线上
+
+
+
面授
+
+
+
@@ -154,14 +156,12 @@ >⃰ 是否设置目录 -
-
-
- -
-
-
- + +
+
+
+
+
@@ -1177,6 +1195,82 @@ const columns5 = [ align: "center", }, ]; +const columns6 = [ + { + title: '序号', + width: 200, + dataIndex: 'num', + key: 'num', + align: "center", + }, { + title: '姓名', + width: 200, + dataIndex: 'name', + key: 'name', + }, { + title: '工号', + width: 200, + dataIndex: 'number', + key: '1', + align: "center", + }, { + title: '部门', + width: 200, + dataIndex: 'department', + key: '2', + align: "center", + }, { + title: ' 岗位', + width: 300, + dataIndex: 'postion', + key: '3', + align: "center", + }, { + title: 'Band', + width: 200, + dataIndex: 'band', + key: '4', + align: "center", + }, { + title: '报名状态', + width: 200, + dataIndex: 'status', + key: '5', + align: "center", + }, { + title: '加入方式', + width: 200, + dataIndex: 'join', + key: '6', + align: "center", + }, { + title: '签到状态', + width: 200, + dataIndex: 'signstatus', + key: '7', + align: "center", + }, { + title: '评估状态', + width: 200, + dataIndex: 'evastatus', + key: '8', + align: "center", + }, { + title: '结业状态', + width: 280, + dataIndex: 'overstatus', + key: '9', + align: "center", + },{ + title: '操作', + width: 400, + className: "h", + dataIndex: "operation", + key: 'operation', + fixed: 'right', + align: "center", + }, +]; export default defineComponent({ components: { LoadingOutlined, @@ -1363,9 +1457,6 @@ export default defineComponent({ authority: "管理权", }, ], - currentPage: 1, - tableDataTotal: 50, - pageSize: 5, tableData6: [ { key: 1, @@ -1408,6 +1499,86 @@ export default defineComponent({ createtime: "2022-07-14 14:00:00", }, ], + tableData7: [ + { + key: "1", + num: 1, + name: "李梦", + number: "1000", + department: "显示事业", + postion: "产品经理", + band: "Band9", + status: "待审核", + join: "手动加入", + signstatus: "-", + evastatus: "-", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "2", + num: 2, + name: "李梦", + number: "1001", + department: "智慧医工", + postion: "产品经理", + band: "Band10", + status: "已通过", + join: "手动加入", + signstatus: "已签到", + evastatus: "已评估", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "3", + num: 3, + name: "李梦", + number: "1002", + department: "业务支援", + postion: "产品经理", + band: "Band10", + status: "已拒绝", + join: "手动加入", + signstatus: "-", + evastatus: "-", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "4", + num: 4, + name: "李梦", + number: "1003", + department: "业务支援", + postion: "产品经理", + band: "Band9", + status: "已通过", + join: "报名加入", + signstatus: "已签到", + evastatus: "-", + overstatus: "90/已结业", + operation: "2022-07-20 9:30", + }, + { + key: "5", + num: 5, + name: "李梦", + number: "1004", + department: "业务支援", + postion: "产品经理", + band: "Band9", + status: "已通过", + join: "报名加入", + signstatus: "请假", + evastatus: "-", + overstatus: "", + operation: "2022-07-20 9:30", + }, + ], + currentPage: 1, + tableDataTotal: 100, + pageSize: 10, }); // const tableDataFunc = () => { // const columns = [ @@ -1585,163 +1756,193 @@ export default defineComponent({
{value.status === "已审核" ? (
- + +
开课
- +
- +
管理
- +
-
复制
+
+
复制
+
- - -
权限名单
-
- -
{ - console.log("点击了"); - }} +
+
+ - 归属权 -
- - -
查看权
-
- -
管理权
-
- - - - -
复制
-
- -
{ - console.log("点击了"); - }} + +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+ +
+
+
+
+ - 取消 -
- - - + +
复制
+
+ +
{ + console.log("点击了"); + }} + > + 取消 +
+
+ +
+
) : (
)} {value.status === "待审核" ? (
- + +
开课
- +
-
撤回
+
+
撤回
+
- - -
权限名单
-
- -
{ - console.log("点击了"); - }} +
+
+ - 归属权 -
- - -
查看权
-
- -
管理权
-
- - + +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+ +
+
) : (
)} {value.status === "未提交" ? (
- + +
开课
- +
-
编辑
+
+
编辑
+
-
复制
+
+
复制
+
) : (
)} {value.status === "审核未通过" ? (
- +
开课
- +
-
编辑
+
+
编辑
+
-
复制
+
+
复制
+
- - -
权限名单
-
- -
{ - console.log("点击了"); - }} + +
+
+ - 归属权 -
- - -
查看权
-
- -
管理权
-
- - -
删除
+ +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+ +
+
+
+
删除
+
) : (
@@ -1755,7 +1956,60 @@ export default defineComponent({ }; getTableDate(); + const getTableDate2 = () => { + let data2 = state.tableData7; + data2.map((value) => { + { + //单层项目 + value.operation = ( +
+
+ {value.status === "待审核" ? ( +
+
+
通过
+
+
+
拒绝
+
+
+
删除
+
+
+ ) : ( +
+ )} + {value.status === "已通过" ? ( +
+
+
删除
+
+
+ ) : ( +
+ )} + {value.status === "已拒绝" ? ( +
+
+
删除
+
+
+ ) : ( +
+ )} +
+
+ ); + } + }); + state.tableData2 = data2; + }; + getTableDate2(); + + const onftvalue = ref(); + return { + onftvalue, current, ...toRefs(state), fileList, @@ -1766,10 +2020,12 @@ export default defineComponent({ columns3, columns4, columns5, + columns6, // tableDataFunc, handleChange, beforeUpload, getTableDate, + getTableDate2, }; }, @@ -1821,13 +2077,13 @@ export default defineComponent({ hideshow: true, bs_hs: true, ft_hs:false, - om_1: true, - ftm_1:true, + om_1: false, + ftm_1:false, om_ckxq: false, - gpm_hs:true, - stm_hs: true, + gpm_hs:false, + stm_hs: false, cstm_hs:false, - sm_hs:true, + sm_hs:false, }); const of_hShow = () => { @@ -1846,14 +2102,13 @@ export default defineComponent({ } }; const bs_hShow = () => { - if (state.bs_hs == true) { - state.bs_hs = false; - } else { state.bs_hs = true; - } + }; + const bs_unhShow = () => { + state.bs_hs = false; }; const createft = () => { - if (state.bs_hs == false) { + if (state.bs_hs == true) { state.of_hs = false; state.ft_hs = true; } @@ -1899,6 +2154,7 @@ export default defineComponent({ of_exit, hideShow, bs_hShow, + bs_unhShow, createft, ft_exit, om_exit, @@ -2100,21 +2356,11 @@ export default defineComponent({ background-size: 100% 100%; } } - .checkbtn { - width: 7.8px; - height: 7.8px; - border: 1px solid #4ea6ff; - background-color: #4ea6ff; - border-radius: 50%; - } .ol_checkbox { - width: 14px; - height: 14px; - border: 1px solid #000000; - border-radius: 50%; display: flex; align-items: center; justify-content: center; + margin-left:6px; } .b_header { display: flex; @@ -2138,10 +2384,13 @@ export default defineComponent({ display: flex; align-items: center; margin: 21px auto 14px 80px; - .bc_boxl, - .bc_boxr { + .bc_box{ display: flex; - align-items: center; + .bc_boxl, + .bc_boxr { + display: flex; + align-items: center; + } } } .b_sup { @@ -2149,6 +2398,9 @@ export default defineComponent({ .bs_box { display: flex; align-items: center; + .bc_box{ + display: flex; + } } } .b_footer { @@ -2236,8 +2488,8 @@ export default defineComponent({ } .m_body { display: flex; - height: 500px; - overflow: auto; + height: 500px; + overflow: auto; .mb_left { .mbl_items1 { display: flex; @@ -2331,7 +2583,7 @@ export default defineComponent({ .accessory_icon { width: 15px; height: 15px; - background-color: #4ea6ff; + background-image: url(@/assets/images/coursewareManage/enclosure.png); margin-right: 6px; } } @@ -2343,76 +2595,28 @@ export default defineComponent({ .tableBox { margin: 20px 38px 30px; - .op_box { - display: flex; - justify-content: right; - // .opacation { - // font-size: 14px; - // font-weight: 400; - // color: #4ea6ff; - // // line-height: 36px; - // .activecls { - // display: inline-block; - // } - // .errorCls { - // display: none; - // } - // .more { - // position: relative; - // .moreArrow { - // width: 13px; - // height: 7px; - // display: inline-block; - // background-image: url("@/assets/images/navtop/down.png"); - // background-size: 100%; - // margin: 2px; - // margin-left: 7px; - // } - // .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; - // align-items: center; - // position: absolute; - // left: 0px; - // top: 18px; - // z-index: 9999 !important; - // } - // } - // .more:hover .moreArrow { - // background-image: url("@/assets/images/navtop/up.png"); - // } - // .more:hover .moreItems { - // display: block; - // } - // } - } .operation { display: flex; justify-content: right; .nSelect { + display: flex; .nselect { display: flex; - .jc { - color: #4ea6ff; - font-size: 14px; + color: #4ea6ff; + font-size: 14px; + .ops1,.ops2,.ops3,.ops4,.ops5{ margin-left: 20px; } + // .jc { + // margin-left: 20px; + // } } } .tableSelect { - margin-right: 20px; + margin-left: -30px; display: flex; align-items: center; justify-content: right; - .g1 { - color: #4ea6ff; - font-size: 14px; - } } } } @@ -3232,6 +3436,15 @@ export default defineComponent({ } .stmm_i6{ margin-top:20px; + .operation,.nselect{ + display: flex; + justify-content: center; + color: #4EA6FF; + font-size: 14px; + .ops1,.ops2{ + margin-right: 10px; + } + } } } } diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index d83898ef..32c7e08c 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -793,6 +793,8 @@ export default { height: 100%; background-color: #f1f4f8; display: flex; + // min-width: 1200px; + overflow-x: hidden; .left { margin-right: 20px; width: 208px; @@ -1033,16 +1035,17 @@ export default { .mid { width: 100%; - height: 130px; + // height: 130px; margin-top: 20px; margin-bottom: 20px; background-color: #fff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); display: flex; align-items: center; + flex-wrap: wrap; .item { - height: 100%; - width: 7.7%; + height: 115px; + // width: 7.7%; display: flex; align-items: center; .itcon { @@ -1052,6 +1055,8 @@ export default { justify-content: center; height: 100%; width: 100%; + margin-left: 46px; + margin-right: 46px; .img { cursor: pointer; }