Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
songwc
2022-10-25 17:56:25 +08:00
12 changed files with 270 additions and 172 deletions

View File

@@ -15,7 +15,7 @@
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="centermain">
<div class="titl">
<div class="endtime">
起止时间2022-07-21 14:00 2022-7-30 14:00
@@ -137,13 +137,11 @@
/>
</div> -->
</div>
</div>
<div class="botm"></div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div>
</a-drawer>
<!-- 批量签到弹窗 -->
<a-modal
@@ -710,6 +708,7 @@ export default {
// overflow-x: scroll;
display: flex;
flex-direction: column;
height: 100%;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
@@ -727,12 +726,13 @@ export default {
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
background-color: #bfa;
.centermain {
// width: 100%;
// height: 100%;
// background-color: #bfa;
flex: 1;
overflow-y: auto;
margin-bottom: 75px;
.titl {
display: flex;
.endtime {
@@ -935,7 +935,7 @@ export default {
background: #f6f9fd;
}
.opa {
background-color: #bfa;
// background-color: #bfa;
}
}
// .tab {
@@ -954,21 +954,15 @@ export default {
// }
// }
}
}
.botm {
width: 100%;
height: 90px;
// background-color: red;
// flex-shrink: 1;
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
// position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
// bottom: 0;
// left: 0;
display: flex;
// display: none;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
@@ -993,6 +987,13 @@ export default {
}
}
}
// .botm {
// width: 100%;
// height: 90px;
// // background-color: red;
// // flex-shrink: 1;
// }
}
}
}
</style>

View File

@@ -90,9 +90,16 @@
<span style="margin-right: 3px">活动时长</span>
</div>
<div class="btnbox">
<a-input
<a-input-number
:min="0"
:precision="0"
style="
width: 388px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2"
style="width: 388px; height: 32px"
/>
<span style="margin-left: 5px">分钟</span>
</div>
@@ -126,18 +133,34 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV4"
></a-input>
/>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV5"
></a-input>
/>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -147,10 +170,18 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
:v-model:value="inputV6"
></a-input>
/>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>
@@ -164,7 +195,9 @@
</div>
<div class="btnbox">
<a-radio-group v-model:value="radioV1">
<a-radio v-model:checked="checked" :value="1" @click="cloradio1">仅签到</a-radio>
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio
>
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到签退全部完成</a-radio
>
@@ -231,7 +264,7 @@ export default {
if (value != "") {
state.radioV1 = "";
}
}
};
return {
...toRefs(state),
afterVisibleChange,

View File

@@ -151,18 +151,20 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV5"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -172,10 +174,11 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>

View File

@@ -194,18 +194,20 @@
<div class="setbox">
<div class="timerbox">
<span>开始前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV6"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV7"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
@@ -215,10 +217,11 @@
<div class="setbox">
<div class="timerbox">
<span>结束前</span>
<a-input
style="width: 88px; height: 32px"
<a-input-number
:min="0" :max="30" :precision="0"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
:v-model:value="inputV8"
></a-input>
></a-input-number>
<span style="color: #999999; margin-left: 8px"
>分钟提前签退则记为早退</span
>

View File

@@ -118,9 +118,10 @@
</div>
<div class="btnbox">
<span style="margin-right: 8px">允许重复考试</span>
<a-input
<a-input-number
:min="-1" :precision="0"
v-model:value="inputV3"
style="width: 88px; height: 32px"
style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
/>
<span style="margin-left: 8px"></span>
<span style="margin-left: 24px; color: #999999"
@@ -177,7 +178,7 @@
</div>
<div class="btnbox">
<a-input
v-model:value="value2"
v-model:value="inputV4"
style="width: 88px; height: 32px"
/>
<span style="margin-left: 8px"></span>
@@ -237,6 +238,7 @@ export default {
inputV1: "",
inputV2: "",
inputV3: "",
inputV4: "60",
testV1: "",
radioV1: "",
radioV2: "",

View File

@@ -221,10 +221,12 @@
color: #333333;
line-height: 25px;
margin-left: 24px;
background-color: #ffffff;
}
}
.contentMain {
margin-top: 32px;
padding-right: 20px;
.main_items {
display: flex;
justify-content: space-between;

View File

@@ -1053,7 +1053,7 @@
<!-- 无数据样式 -->
<div
class="notable"
:style="{ display: stm_hs ? 'block' :'none' }"
:style="{ display: stm_hs ? 'block' : 'none' }"
>
<div class="notablebox">
<div class="boxbody">
@@ -1692,12 +1692,27 @@
style="margin-top: 400px"
@cancel="delete_exit"
>
<div class="delete" :style="{ display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none' }">
<div
class="delete"
:style="{
display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none',
}"
>
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="del-icon" :style="{ display: del_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/notice.png" alt=""></div>
<div class="del-icon" :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/QR.png" alt=""></div>
<div
class="del-icon"
:style="{ display: del_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/notice.png" alt="" />
</div>
<div
class="del-icon"
:style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
>
<img src="@/assets/images/coursewareManage/QR.png" alt="" />
</div>
<span>提示</span>
<div class="close_exit" @click="delete_exit"></div>
</div>
@@ -2407,7 +2422,7 @@ export default defineComponent({
agreestudy_hs: false,
rejectstudy_hs: false,
delete_hs: false,
del_hs:false,
del_hs: false,
copy_hs: false,
nouse_hs: false,
// 二维码标题状态
@@ -2998,11 +3013,15 @@ export default defineComponent({
{value.status === "已拒绝" ? (
<div class="nselect">
<div class="ops2">
<div class="jc"
<div
class="jc"
onClick={() => {
state.delete_hs = true;
state.del_hs = true;
}}>删除</div>
}}
>
删除
</div>
</div>
</div>
) : (
@@ -3414,7 +3433,7 @@ export default defineComponent({
}
}
.tableSelect {
margin-right: 10px;
// margin-right: 10px;
margin-left: -5px;
display: flex;
align-items: center;
@@ -4759,7 +4778,7 @@ export default defineComponent({
display: flex;
justify-content: center;
text-align: center;
margin:77px auto 109px auto;
margin: 77px auto 109px auto;
cursor: pointer;
position: relative;
.smallleft {
@@ -4835,7 +4854,7 @@ export default defineComponent({
}
}
.tableSelect {
margin-right: 10px;
// margin-right: 10px;
margin-left: -5px;
display: flex;
align-items: center;
@@ -5201,12 +5220,12 @@ export default defineComponent({
height: 16px;
position: relative;
margin-right: 10px;
img{
img {
width: 100%;
height: 100%;
position: absolute;
top:0px;
left:0px;
top: 0px;
left: 0px;
background-size: 100% 100%;
}
}

View File

@@ -1,5 +1,5 @@
<template>
<div class="allCon">
<div class="leveladddetail">
<div class="left clearfix">
<div class="leftmain">
<div class="tit" style="margin-left: 18px">关卡</div>
@@ -319,7 +319,7 @@
</div>
<div class="drawerbox">
<a-table
:columns="drawercolumns"
:columns="drawertableColumns()"
:data-source="drawertableData"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 700 }"
@@ -374,9 +374,11 @@
<button class="addx" @click="showAddStu">添加学员</button>
<!-- 点击抽屉组件在LevelAdd此处没添加showAddStushowImpStu -->
<button class="addd" @click="showImpStu">导入学员</button>
<button class="addd" @click="showDeleteALLModal">批量删除</button>
<button class="addd" @click="showDeleteALLModal">
批量删除
</button>
</div>
<div class="talk">
<!-- <div class="talk">
<img class="im" src="../../assets/images/leveladd/gan.png" />
<div class="xu">
<span class="yi">已选择</span>
@@ -388,12 +390,11 @@
<span class="yi">5</span>
<span class="yi"></span>
</div>
</div>
<div class="tableBox" style="margin-top: 30px">
</div> -->
<div class="tableBox" style="margin-top: 20px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc2()"
:scroll="{ y: 235 }"
:data-source="tableData2"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@@ -405,7 +406,7 @@
onChange: onSelectChange,
}"
/>
<div class="pa">
<!-- <div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
@@ -415,7 +416,7 @@
:total="tableDataTotal"
class="pagination"
/>
</div>
</div> -->
<!-- 无数据样式 -->
<div
class="notable"
@@ -496,44 +497,6 @@
import { reactive, toRefs, onMounted, onUnmounted } from "vue";
import AddStu from "../../components/drawers/AddLevelAddStu";
import ImpStu from "../../components/drawers/AddLevelImportStu";
const drawercolumns = [
{
title: "项目名称",
dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
// customRender: (text, record) => {
// console.log(text, record);
// return <span>{text.text}</span>;
// },
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width: 100,
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 100,
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 180,
align: "center",
},
];
export default {
name: "LevelAddDetail",
components: {
@@ -737,7 +700,6 @@ export default {
key: "1-1",
projectName: "管理者进阶-腾飞班",
manager: "黄华 刘俊",
creater: "毛继禹",
time: "2022-07-20 14:00:03",
children: [
@@ -836,6 +798,8 @@ export default {
selectedRowKeys: [],
isActive: false,
gqxy_hs: true,
projectChecked: null, //项目单选框
});
const showDrawer = () => {
state.visible = true;
@@ -1067,6 +1031,82 @@ export default {
state.selectedRowKeys = selectedRowKeys;
};
const drawertableColumns = () => {
// let arr = state.drawertableData;
// function traverse(arr) {
// for (var a in arr) {
// // console.log(arr[a]);
// if (arr[a].children) {
// traverse(arr[a].children); //递归遍历
// } else {
// console.log(arr[a].children); //如果是值就显示
// }
// }
// }
// traverse(arr);
const drawercolumns = [
{
title: "项目名称",
dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text.record.key);
if (!text.record.children) {
return (
<div style={{ display: "flex" }}>
<a-checkbox
checked={
state.projectChecked === text.record.key ? true : false
}
value={text.record.key}
onChange={() => {
// console.log("改变了", text.record.key);
if (state.projectChecked === text.record.key) {
state.projectChecked = null;
} else {
state.projectChecked = text.record.key;
}
}}
></a-checkbox>
<span style="margin-left: 5px">{text.text}</span>
</div>
);
} else {
return <span>{text.text}</span>;
}
},
},
{
title: "项目经理",
dataIndex: "manager",
key: "manager",
width: 100,
align: "center",
},
{
title: "创建人",
dataIndex: "creater",
// width: "30%",
key: "creater",
width: 100,
align: "center",
},
{
title: "创建时间",
dataIndex: "time",
key: "time",
width: 180,
align: "center",
},
];
return drawercolumns;
};
// const getClientHeight = () => {
// state.rightheight =
// document.getElementsByClassName("addhead")[0].offsetHeight +
@@ -1096,8 +1136,8 @@ export default {
state.deleteAll = true;
};
const delete_exit = () => {
state.deleteAll = false
}
state.deleteAll = false;
};
return {
...toRefs(state),
tableDataFunc,
@@ -1109,12 +1149,13 @@ export default {
afterVisibleChange,
showAddStu,
showImpStu,
drawercolumns,
// drawercolumns,
onSelectChange,
changebgc,
gqxy_hShow,
showDeleteALLModal,
delete_exit,
drawertableColumns,
};
},
};
@@ -1342,7 +1383,7 @@ export default {
}
}
}
.allCon {
.leveladddetail {
width: 100%;
display: flex;
min-width: 933px;
@@ -1681,7 +1722,7 @@ export default {
}
.tableBox {
margin-top: 21px;
margin-bottom: 80px;
margin-bottom: 20px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
@@ -1786,8 +1827,7 @@ export default {
}
}
.tableBox {
margin-bottom: 80px;
margin-block-end: 20px;
.classify {
margin-left: 11px !important;
padding-left: 9px !important;

View File

@@ -253,7 +253,7 @@
</div>
</div>
<!-- 无数据样式 -->
<div class="notable" style="display:none;">
<div class="notable" style="display: none">
<div class="notablebox">
<div class="boxbody">
<div class="boximg"></div>
@@ -269,7 +269,7 @@
</div>
</div>
<div class="rwbox">
<div class="talk">
<!-- <div class="talk">
<img class="im" src="../../assets/images/leveladd/gan.png" />
<div class="xu">
<span class="yi">已选择</span>
@@ -281,7 +281,7 @@
<span class="yi">5</span>
<span class="yi"></span>
</div>
</div>
</div> -->
<div class="tableBox">
<a-table
style="border: 1px solid #f2f6fe"
@@ -298,7 +298,7 @@
}"
/>
<div class="pa">
<!-- <div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
@@ -308,7 +308,7 @@
:total="tableDataTotal"
class="pagination"
/>
</div>
</div> -->
</div>
</div>
@@ -1860,7 +1860,8 @@ export default {
}
}
.tableBox {
padding-bottom: 80px;
padding-bottom: 20px;
margin-top: 20px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;

View File

@@ -3771,7 +3771,7 @@ export default {
}
}
.tableSelect {
margin-right: 10px;
// margin-right: 10px;
margin-left: -5px;
display: flex;
align-items: center;

View File

@@ -144,7 +144,7 @@
@change="minChange"
/>
</div>
<div class="namebox" style="margin-left: -180px">
<div class="namebox">
<div class="inname">最高分</div>
</div>
<div class="in numberInp">

View File

@@ -87,6 +87,7 @@
:footer="null"
:closable="false"
style="margin-top: 250px"
:centered="center"
>
<div class="out">
<div class="top">
@@ -101,12 +102,6 @@
</div>
<div class="mid clearfix">
<div class="name">
<div class="d" style="margin-top: -4px">
<img
style="width: 10px; height: 10px"
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">调研名称</div>
<div class="in">
<a-input
@@ -477,7 +472,6 @@ export default {
//display: flex;
display: block;
position: absolute;
top: 120px;
width: 680px;
// height: 525px;
background-color: #fff;