hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
李晓鸽
2022-10-12 10:46:23 +08:00
parent bd2b78f264 d4ccd82cff
commit fd73838a25
3 changed files with 447 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/BreadCrumb.vue
View File

@@ -61,6 +61,7 @@ export default {
}, },
{ {
name: "关卡", name: "关卡",
href: "/leveladd",
}, },
{ {
name: "创建关卡", name: "创建关卡",

663
src/views/courselibrary/CoursewareManage.vue
View File

@@ -139,14 +139,16 @@
>⃰</span >⃰</span
> >
<span style="margin-right: 14px">授课形式</span> <span style="margin-right: 14px">授课形式</span>
<div class="bc_boxl"> <a-radio-group v-model:value="onftvalue">
<div class="ol_checkbox"><div class="checkbtn"></div></div> <div class="bc_box">
<span style="margin: auto 31px auto 5px">线上</span> <div class="bc_boxl" @click="bs_unhShow">
</div> <div class="ol_checkbox"><a-radio v-model:checked="checked" :value="1">线上</a-radio></div>
<div class="bc_boxr" @click="bs_hShow"> </div>
<div class="ol_checkbox"><div class="checkbtn"></div></div> <div class="bc_boxr" @click="bs_hShow">
<span style="margin: auto 31px auto 5px">面授</span> <div class="ol_checkbox"><a-radio v-model:checked="checked" :value="2">面授</a-radio></div>
</div> </div>
</div>
</a-radio-group>
</div> </div>
<div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }"> <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
<div class="bs_box"> <div class="bs_box">
@@ -154,14 +156,12 @@
>⃰</span >⃰</span
> >
<span style="margin-right: 14px">是否设置目录</span> <span style="margin-right: 14px">是否设置目录</span>
<div class="ol_checkbox"> <a-radio-group v-model:value="value">
<div class="checkbtn"></div> <div class="bc_box">
</div> <div class="ol_checkbox"><a-radio v-model:checked="checked" :value="1">是</a-radio></div>
<span style="margin: auto 45px auto 5px">是</span> <div class="ol_checkbox"><a-radio v-model:checked="checked" :value="2">否</a-radio></div>
<div class="ol_checkbox"> </div>
<div class="checkbtn"></div> </a-radio-group>
</div>
<span style="margin: auto 0px auto 5px">否</span>
</div> </div>
</div> </div>
<div class="b_footer"> <div class="b_footer">
@@ -624,7 +624,7 @@
> >
<template #bodyCell="{ column }"> <template #bodyCell="{ column }">
<template v-if="column.key === 'opacation'"> <template v-if="column.key === 'opacation'">
<a @click="ckxq_hs">取消授权</a> <a>取消授权</a>
</template> </template>
</template> </template>
</a-table> </a-table>
@@ -901,13 +901,31 @@
</div> </div>
<div class="stmm_i6"> <div class="stmm_i6">
<a-table <a-table
:columns="columns5" :columns="columns6"
:data-source="tableData" :data-source="tableData7"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 800 }" :scroll="{ x: 800 }"
expandRowByClick="true" expandRowByClick="true"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="{
showSizeChanger: true,
showQuickJumper: true,
hideOnSinglePage: true,
pageSizeOptions: [],
pageSize: pageSize,
current: currentPage,
total: tableDataTotal,
onChange: (page, pageSize) => {
currentPage = page;
// console.log('page', page)
// 加翻页查找代码
// this.setState({
// currentPage: page,
// }, () => {
// this.getMilitaryDeployment()
// })
},
}"
/> />
</div> </div>
</div> </div>
@@ -1177,6 +1195,82 @@ const columns5 = [
align: "center", 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({ export default defineComponent({
components: { components: {
LoadingOutlined, LoadingOutlined,
@@ -1363,9 +1457,6 @@ export default defineComponent({
authority: "管理权", authority: "管理权",
}, },
], ],
currentPage: 1,
tableDataTotal: 50,
pageSize: 5,
tableData6: [ tableData6: [
{ {
key: 1, key: 1,
@@ -1408,6 +1499,86 @@ export default defineComponent({
createtime: "2022-07-14 14:00:00", 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 tableDataFunc = () => {
// const columns = [ // const columns = [
@@ -1585,163 +1756,193 @@ export default defineComponent({
<div class="nSelect"> <div class="nSelect">
{value.status === "已审核" ? ( {value.status === "已审核" ? (
<div class="nselect"> <div class="nselect">
<router-link to="/leveladd">
<div class='ops1'>
<div class="jc">开课</div> <div class="jc">开课</div>
</router-link> </div>
<router-link to="/leveladd"> <div class='ops2'>
<div class="jc">管理</div> <div class="jc">管理</div>
</router-link> </div>
<div class="jc">复制</div> <div class='ops3'>
<div class="jc">复制</div>
</div>
<a-select <div class="tableSelect">
style="width: 50px;margin-top:2px;margin-left:25px" <div class='ops4'>
value="授权" <a-select
// options={state.projectNameList} style="width: 50px;margin-top:2px;margin-left:25px"
dropdownClassName="tabledropdown" value="授权"
> // options={state.projectNameList}
<a-select-option value="权限名单" label="权限名单"> dropdownClassName="tabledropdown"
<div>权限名单</div>
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了");
}}
> >
归属权 <a-select-option value="权限名单" label="权限名单">
</div> <div>权限名单</div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="归属权" label="归属权">
<div>查看权</div> <div
</a-select-option> onClick={() => {
<a-select-option value="管理权" label="管理权"> console.log("点击了");
<div>管理权</div> }}
</a-select-option> >
</a-select> 归属权
</div>
<a-select </a-select-option>
style="width: 50px;margin-top:2px;margin-left:25px" <a-select-option value="查看权" label="查看权">
value="更多" <div>查看权</div>
// options={state.projectNameList} </a-select-option>
dropdownClassName="tabledropdown" <a-select-option value="管理权" label="管理权">
> <div>管理权</div>
<a-select-option </a-select-option>
value="复制" </a-select>
label="复制" </div>
style="padding-left:35px" </div>
> <div class="tableSelect">
<div>复制</div> <div class='ops5'>
</a-select-option> <a-select
<a-select-option style="width: 50px;margin-top:2px;margin-left:25px"
value="取消" value="更多"
label="取消" // options={state.projectNameList}
style="padding-left:35px" dropdownClassName="tabledropdown"
>
<div
onClick={() => {
console.log("点击了");
}}
> >
取消 <a-select-option
</div> value="复制"
</a-select-option> label="复制"
</a-select> style="padding-left:35px"
>
<div>复制</div>
</a-select-option>
<a-select-option
value="取消"
label="取消"
style="padding-left:35px"
>
<div
onClick={() => {
console.log("点击了");
}}
>
取消
</div>
</a-select-option>
</a-select>
</div>
</div>
</div> </div>
) : ( ) : (
<div></div> <div></div>
)} )}
{value.status === "待审核" ? ( {value.status === "待审核" ? (
<div class="nselect"> <div class="nselect">
<router-link to="/leveladd">
<div class='ops1'>
<div class="jc">开课</div> <div class="jc">开课</div>
</router-link> </div>
<div class="jc">撤回</div> <div class='ops5'>
<div class="jc">撤回</div>
</div>
<a-select <div class="tableSelect">
style="width: 50px;margin-top:2px;margin-left:25px" <div class='ops4'>
value="授权" <a-select
// options={state.projectNameList} style="width: 50px;margin-top:2px;margin-left:25px"
dropdownClassName="tabledropdown" value="授权"
> // options={state.projectNameList}
<a-select-option value="权限名单" label="权限名单"> dropdownClassName="tabledropdown"
<div>权限名单</div>
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了");
}}
> >
归属权 <a-select-option value="权限名单" label="权限名单">
</div> <div>权限名单</div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="归属权" label="归属权">
<div>查看权</div> <div
</a-select-option> onClick={() => {
<a-select-option value="管理权" label="管理权"> console.log("点击了");
<div>管理权</div> }}
</a-select-option> >
</a-select> 归属权
</div>
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div>查看权</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div>管理权</div>
</a-select-option>
</a-select>
</div>
</div>
</div> </div>
) : ( ) : (
<div></div> <div></div>
)} )}
{value.status === "未提交" ? ( {value.status === "未提交" ? (
<div class="nselect"> <div class="nselect">
<router-link to="/leveladd">
<div class='ops1'>
<div class="jc">开课</div> <div class="jc">开课</div>
</router-link> </div>
<div class="jc">编辑</div> <div class='ops2'>
<div class="jc">编辑</div>
</div>
<div class="jc">复制</div> <div class='ops3'>
<div class="jc">复制</div>
</div>
</div> </div>
) : ( ) : (
<div></div> <div></div>
)} )}
{value.status === "审核未通过" ? ( {value.status === "审核未通过" ? (
<div class="nselect"> <div class="nselect">
<router-link to="/leveladd"> <div class='ops1'>
<div class="jc">开课</div> <div class="jc">开课</div>
</router-link> </div>
<div class="jc">编辑</div> <div class='ops2'>
<div class="jc">编辑</div>
</div>
<div class="jc">复制</div> <div class='ops3'>
<div class="jc">复制</div>
</div>
<a-select
style="width: 50px;margin-top:2px;margin-left:25px" <div class="tableSelect">
value="授权" <div class='ops4'>
// options={state.projectNameList} <a-select
dropdownClassName="tabledropdown" style="width: 50px;margin-top:2px;margin-left:25px"
> value="授权"
<a-select-option value="权限名单" label="权限名单"> // options={state.projectNameList}
<div>权限名单</div> dropdownClassName="tabledropdown"
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了");
}}
> >
归属权 <a-select-option value="权限名单" label="权限名单">
</div> <div>权限名单</div>
</a-select-option> </a-select-option>
<a-select-option value="查看权" label="查看权"> <a-select-option value="归属权" label="归属权">
<div>查看权</div> <div
</a-select-option> onClick={() => {
<a-select-option value="管理权" label="管理权"> console.log("点击了");
<div>管理权</div> }}
</a-select-option> >
</a-select> 归属权
</div>
<div class="jc">删除</div> </a-select-option>
<a-select-option value="查看权" label="查看权">
<div>查看权</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div>管理权</div>
</a-select-option>
</a-select>
</div>
</div>
<div class='ops5'>
<div class="jc">删除</div>
</div>
</div> </div>
) : ( ) : (
<div></div> <div></div>
@@ -1755,7 +1956,60 @@ export default defineComponent({
}; };
getTableDate(); getTableDate();
const getTableDate2 = () => {
let data2 = state.tableData7;
data2.map((value) => {
{
//单层项目
value.operation = (
<div class="operation">
<div class="nSelect">
{value.status === "待审核" ? (
<div class="nselect">
<div class='ops1'>
<div class="jc">通过</div>
</div>
<div class='ops1'>
<div class="jc">拒绝</div>
</div>
<div class='ops2'>
<div class="jc">删除</div>
</div>
</div>
) : (
<div></div>
)}
{value.status === "已通过" ? (
<div class="nselect">
<div class='ops2'>
<div class="jc">删除</div>
</div>
</div>
) : (
<div></div>
)}
{value.status === "已拒绝" ? (
<div class="nselect">
<div class='ops2'>
<div class="jc">删除</div>
</div>
</div>
) : (
<div></div>
)}
</div>
</div>
);
}
});
state.tableData2 = data2;
};
getTableDate2();
const onftvalue = ref();
return { return {
onftvalue,
current, current,
...toRefs(state), ...toRefs(state),
fileList, fileList,
@@ -1766,10 +2020,12 @@ export default defineComponent({
columns3, columns3,
columns4, columns4,
columns5, columns5,
columns6,
// tableDataFunc, // tableDataFunc,
handleChange, handleChange,
beforeUpload, beforeUpload,
getTableDate, getTableDate,
getTableDate2,
}; };
}, },
@@ -1821,13 +2077,13 @@ export default defineComponent({
hideshow: true, hideshow: true,
bs_hs: true, bs_hs: true,
ft_hs:false, ft_hs:false,
om_1: true, om_1: false,
ftm_1:true, ftm_1:false,
om_ckxq: false, om_ckxq: false,
gpm_hs:true, gpm_hs:false,
stm_hs: true, stm_hs: false,
cstm_hs:false, cstm_hs:false,
sm_hs:true, sm_hs:false,
}); });
const of_hShow = () => { const of_hShow = () => {
@@ -1846,14 +2102,13 @@ export default defineComponent({
} }
}; };
const bs_hShow = () => { const bs_hShow = () => {
if (state.bs_hs == true) {
state.bs_hs = false;
} else {
state.bs_hs = true; state.bs_hs = true;
} };
const bs_unhShow = () => {
state.bs_hs = false;
}; };
const createft = () => { const createft = () => {
if (state.bs_hs == false) { if (state.bs_hs == true) {
state.of_hs = false; state.of_hs = false;
state.ft_hs = true; state.ft_hs = true;
} }
@@ -1899,6 +2154,7 @@ export default defineComponent({
of_exit, of_exit,
hideShow, hideShow,
bs_hShow, bs_hShow,
bs_unhShow,
createft, createft,
ft_exit, ft_exit,
om_exit, om_exit,
@@ -2100,21 +2356,11 @@ export default defineComponent({
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.checkbtn {
width: 7.8px;
height: 7.8px;
border: 1px solid #4ea6ff;
background-color: #4ea6ff;
border-radius: 50%;
}
.ol_checkbox { .ol_checkbox {
width: 14px;
height: 14px;
border: 1px solid #000000;
border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left:6px;
} }
.b_header { .b_header {
display: flex; display: flex;
@@ -2138,10 +2384,13 @@ export default defineComponent({
display: flex; display: flex;
align-items: center; align-items: center;
margin: 21px auto 14px 80px; margin: 21px auto 14px 80px;
.bc_boxl, .bc_box{
.bc_boxr {
display: flex; display: flex;
align-items: center; .bc_boxl,
.bc_boxr {
display: flex;
align-items: center;
}
} }
} }
.b_sup { .b_sup {
@@ -2149,6 +2398,9 @@ export default defineComponent({
.bs_box { .bs_box {
display: flex; display: flex;
align-items: center; align-items: center;
.bc_box{
display: flex;
}
} }
} }
.b_footer { .b_footer {
@@ -2236,8 +2488,8 @@ export default defineComponent({
} }
.m_body { .m_body {
display: flex; display: flex;
height: 500px; height: 500px;
overflow: auto; overflow: auto;
.mb_left { .mb_left {
.mbl_items1 { .mbl_items1 {
display: flex; display: flex;
@@ -2331,7 +2583,7 @@ export default defineComponent({
.accessory_icon { .accessory_icon {
width: 15px; width: 15px;
height: 15px; height: 15px;
background-color: #4ea6ff; background-image: url(@/assets/images/coursewareManage/enclosure.png);
margin-right: 6px; margin-right: 6px;
} }
} }
@@ -2343,76 +2595,28 @@ export default defineComponent({
.tableBox { .tableBox {
margin: 20px 38px 30px; 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 { .operation {
display: flex; display: flex;
justify-content: right; justify-content: right;
.nSelect { .nSelect {
display: flex;
.nselect { .nselect {
display: flex; display: flex;
.jc { color: #4ea6ff;
color: #4ea6ff; font-size: 14px;
font-size: 14px; .ops1,.ops2,.ops3,.ops4,.ops5{
margin-left: 20px; margin-left: 20px;
} }
// .jc {
// margin-left: 20px;
// }
} }
} }
.tableSelect { .tableSelect {
margin-right: 20px; margin-left: -30px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: right; justify-content: right;
.g1 {
color: #4ea6ff;
font-size: 14px;
}
} }
} }
} }
@@ -3232,6 +3436,15 @@ export default defineComponent({
} }
.stmm_i6{ .stmm_i6{
margin-top:20px; margin-top:20px;
.operation,.nselect{
display: flex;
justify-content: center;
color: #4EA6FF;
font-size: 14px;
.ops1,.ops2{
margin-right: 10px;
}
}
} }
} }
} }

11
src/views/learningpath/LevelAddDetail.vue
View File

@@ -793,6 +793,8 @@ export default {
height: 100%; height: 100%;
background-color: #f1f4f8; background-color: #f1f4f8;
display: flex; display: flex;
// min-width: 1200px;
overflow-x: hidden;
.left { .left {
margin-right: 20px; margin-right: 20px;
width: 208px; width: 208px;
@@ -1033,16 +1035,17 @@ export default {
.mid { .mid {
width: 100%; width: 100%;
height: 130px; // height: 130px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: #fff; background-color: #fff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
.item { .item {
height: 100%; height: 115px;
width: 7.7%; // width: 7.7%;
display: flex; display: flex;
align-items: center; align-items: center;
.itcon { .itcon {
@@ -1052,6 +1055,8 @@ export default {
justify-content: center; justify-content: center;
height: 100%; height: 100%;
width: 100%; width: 100%;
margin-left: 46px;
margin-right: 46px;
.img { .img {
cursor: pointer; cursor: pointer;
} }