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

This commit is contained in:
岳佳鑫
2022-10-27 11:30:50 +08:00
3 changed files with 50 additions and 35 deletions

View File

@@ -1361,6 +1361,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="QRModal" wrapClassName="QRModal"
style="margin-top: 400px" style="margin-top: 400px"
:zIndex="9999"
@cancel="qr_exit" @cancel="qr_exit"
> >
<div class="QR" :style="{ display: QR_hs ? 'block' : 'none' }"> <div class="QR" :style="{ display: QR_hs ? 'block' : 'none' }">
@@ -1403,6 +1404,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="recgradeModal" wrapClassName="recgradeModal"
style="margin-top: 400px" style="margin-top: 400px"
:zIndex="9999"
@cancel="rg_exit" @cancel="rg_exit"
> >
<div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }"> <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
@@ -1453,6 +1455,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="graModal" wrapClassName="graModal"
style="margin-top: 400px" style="margin-top: 400px"
:zIndex="9999"
@cancel="graduate_exit" @cancel="graduate_exit"
> >
<div <div
@@ -1560,12 +1563,13 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="DelModal" wrapClassName="DelModal"
style="margin-top: 400px" style="margin-top: 400px"
:zIndex="9999"
@cancel="delete_exit" @cancel="delete_exit"
> >
<div <div
class="delete" class="delete"
:style="{ :style="{
display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none', display: del_hs || copy_hs || nouse_hs ? 'block' : 'none',
}" }"
> >
<div class="del_header"></div> <div class="del_header"></div>
@@ -2714,6 +2718,7 @@ export default defineComponent({
> >
<div <div
onClick={() => { onClick={() => {
state.delete_hs = true;
state.copy_hs = true; state.copy_hs = true;
}} }}
> >
@@ -2928,7 +2933,7 @@ export default defineComponent({
} }
}; };
const createft = () => { const createft = () => {
if (state.bs_hs == false) { if (state.bs_hs == false && state.valueE1 != "") {
state.of_hs = false; state.of_hs = false;
state.ft_hs = true; state.ft_hs = true;
state.valueE1 = ""; state.valueE1 = "";
@@ -2967,9 +2972,11 @@ export default defineComponent({
state.sm_hs = false; state.sm_hs = false;
state.hideshow = true; state.hideshow = true;
}; };
const clear_valueE1 = () => { const clear_valueE1 = (value) => {
state.bs_hs = false; state.bs_hs = false;
state.valueE1 = ""; if (value != "") {
state.valueE1 = "";
}
}; };
const clear_valueE2 = () => { const clear_valueE2 = () => {
state.valueE2 = ""; state.valueE2 = "";
@@ -3899,7 +3906,6 @@ export default defineComponent({
} }
.onlinemanage { .onlinemanage {
display: none; display: none;
z-index: 999;
min-width: 1000px; min-width: 1000px;
background: #ffffff; background: #ffffff;
.om_main { .om_main {
@@ -4337,7 +4343,6 @@ export default defineComponent({
} }
} }
.givepower { .givepower {
z-index: 999;
min-width: 1000px; min-width: 1000px;
background: #ffffff; background: #ffffff;
.gp_main { .gp_main {
@@ -4454,7 +4459,6 @@ export default defineComponent({
} }
} }
.schooltime { .schooltime {
z-index: 999;
min-width: 1000px; min-width: 1000px;
background: #ffffff; background: #ffffff;
.st_main { .st_main {
@@ -4555,7 +4559,6 @@ export default defineComponent({
justify-content: center; justify-content: center;
text-align: center; text-align: center;
margin: 77px auto 109px auto; margin: 77px auto 109px auto;
cursor: pointer;
position: relative; position: relative;
.smallleft { .smallleft {
position: absolute; position: absolute;
@@ -4676,7 +4679,6 @@ export default defineComponent({
} }
} }
.studentsmanage { .studentsmanage {
z-index: 1000;
min-width: 1000px; min-width: 1000px;
background: #ffffff; background: #ffffff;
.stm_main { .stm_main {
@@ -4922,7 +4924,6 @@ export default defineComponent({
} }
.modalMain { .modalMain {
.ftsturecord { .ftsturecord {
z-index: 999;
min-width: 1000px; min-width: 1000px;
background: #ffffff; background: #ffffff;
.ftsr_main { .ftsr_main {
@@ -4964,7 +4965,6 @@ export default defineComponent({
width: 424px !important; width: 424px !important;
.ant-modal-body { .ant-modal-body {
.delete { .delete {
z-index: 99999;
width: 424px; width: 424px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

View File

@@ -40,7 +40,7 @@
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
</div> </div>
<div style="display: flex;margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
<div class="btn btn1"> <div class="btn btn1">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
@@ -50,7 +50,6 @@
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
</div> </div>
</div> </div>
<div class="btns"> <div class="btns">
<!-- <router-link to="/projectadd"> <!-- <router-link to="/projectadd">
@@ -68,17 +67,23 @@
<!-- 搜索框及按钮 --> <!-- 搜索框及按钮 -->
<!-- 无数据 --> <!-- 无数据 -->
<div class="datanull" style="display: none"> <div class="datanull" style="display: none">
<div class="nodata_box"> <div class="nodata_box">
<div class="left"><img src="../../assets/images/taskpage/left1.png"/></div> <div class="left">
<div class="center"><img src="../../assets/images/leveladd/picture.png"/></div> <img src="../../assets/images/taskpage/left1.png" />
<div class="text1">无数据</div>
<div class="text2">请添加路径</div>
<div class="right"><img src="../../assets/images/leveladd/right.png"/></div>
</div> </div>
<div class="center">
<img src="../../assets/images/leveladd/picture.png" />
</div>
<div class="text1">无数据</div>
<div class="text2">请添加路径</div>
<div class="right">
<img src="../../assets/images/leveladd/right.png" />
</div>
</div>
</div> </div>
<!-- 无数据 --> <!-- 无数据 -->
<!-- 表格 --> <!-- 表格 -->
<div class="tableBox" style="padding-bottom: 160px; position: relative"> <div class="tableBox" style="padding-bottom: 0px; position: relative">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()" :columns="tableDataFunc()"
@@ -89,6 +94,8 @@
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
/> />
</div>
<div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
showSizeChanger="true" showSizeChanger="true"
@@ -1647,11 +1654,7 @@ export default {
width: 412px; width: 412px;
height: 212px; height: 212px;
position: relative; position: relative;
background: linear-gradient( background: linear-gradient(180deg, #fef3dd, #fffaf0);
180deg,
#FEF3DD,
#FFFAF0
);
border-radius: 10px; border-radius: 10px;
.left { .left {
position: absolute; position: absolute;
@@ -1668,7 +1671,7 @@ export default {
top: 128px; top: 128px;
left: 178px; left: 178px;
font-size: 20px; font-size: 20px;
color: #FFB64E; color: #ffb64e;
font-weight: 500; font-weight: 500;
} }
.text2 { .text2 {
@@ -1676,7 +1679,7 @@ export default {
bottom: 32px; bottom: 32px;
left: 174px; left: 174px;
font-size: 14px; font-size: 14px;
color: #878B92; color: #878b92;
font-weight: 500; font-weight: 500;
} }
.right { .right {
@@ -1687,8 +1690,8 @@ export default {
} }
} }
.filter { .filter {
margin-left: 38px; margin-left: 35px;
margin-right: 38px; margin-right: 35px;
margin-top: 30px; margin-top: 30px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -1828,7 +1831,8 @@ export default {
} }
} }
.tableBox { .tableBox {
margin: 20px 38px 30px; // margin: 20px 38px 30px;
margin: 20px 35px 0px 35px;
th.h { th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
@@ -1839,6 +1843,8 @@ export default {
> td { > td {
background: #f6f9fd; background: #f6f9fd;
} }
}
.tableBox {
.pa { .pa {
left: 0; left: 0;
width: 100%; width: 100%;
@@ -1846,8 +1852,9 @@ export default {
// background-color: red; // background-color: red;
display: flex; display: flex;
justify-content: center; justify-content: center;
position: absolute; margin-bottom: 10px;
bottom: 20px; // position: absolute;
// bottom: -40px;
} }
} }
.operation { .operation {

View File

@@ -8,12 +8,19 @@
<div class="btnText" @click="showModal">添加关卡</div> <div class="btnText" @click="showModal">添加关卡</div>
</div> </div>
<div class="maincon" style="background-color: #fff"> <div class="maincon" style="background-color: #fff">
<div <!-- <div
class="items" class="items"
:class="{ active: isActive == true }" :class="{ active: isActive == true }"
@click="changebgc" @click="changebgc"
v-for="item in level" v-for="item in level"
:key="item.id" :key="item.id"
> -->
<div
class="items"
:class=" isactive == index ? 'active' : '' "
@click="changebgc(index)"
v-for="( item , index ) in level"
:key="item.id"
> >
<div class="items1"> <div class="items1">
<div class="boxs_left"> <div class="boxs_left">
@@ -798,7 +805,7 @@ export default {
selectedRowKeys: [], selectedRowKeys: [],
isActive: false, isActive: false,
gqxy_hs: true, gqxy_hs: true,
isactive: -1,
projectChecked: null, //项目单选框 projectChecked: null, //项目单选框
}); });
const showDrawer = () => { const showDrawer = () => {
@@ -1126,7 +1133,8 @@ export default {
document.getElementsByTagName("main")[0].style.boxShadow = document.getElementsByTagName("main")[0].style.boxShadow =
"0px 1px 35px 0px rgba(118, 136, 166, 0.07)"; "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
}); });
const changebgc = () => { const changebgc = (index) => {
state.isactive = index;
state.isActive = !state.isActive; state.isActive = !state.isActive;
}; };
const gqxy_hShow = () => { const gqxy_hShow = () => {