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

This commit is contained in:
岳佳鑫
2022-10-24 09:37:01 +08:00
11 changed files with 371 additions and 116 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@@ -33,23 +33,37 @@
/>
<div>李玉冰</div>
</div>
<img
style="
width: 27px;
height: 26px;
margin: 27px 29px 0px 31px;
cursor: pointer;
"
src="../assets/images/navtop/signout.png"
/>
<div
class="signOutMain"
style="margin: 0px 33px 0px 35px"
@click="showDrawer"
>
<img
style="width: 22px; height: 22px"
src="../assets/images/navtop/download.png"
/>
<span class="signOut">下载</span>
</div>
<div class="signOutMain">
<img
style="width: 27px; height: 27px"
src="../assets/images/navtop/signout.png"
/>
<span class="signOut">退出</span>
</div>
</div>
</div>
</div>
<down-load v-model:downloadVisible="visible" />
</template>
<script>
import { reactive, toRefs } from "vue";
import DownLoad from "../components/drawers/DownLoad";
export default {
name: "NavTop",
components: {
DownLoad,
},
setup() {
const state = reactive({
selectRole: "管理员",
@@ -63,6 +77,8 @@ export default {
name: "学员",
},
],
visible: false,
});
const changeRole = (value) => {
state.roleList.map((item) => {
@@ -71,9 +87,14 @@ export default {
}
});
};
const showDrawer = () => {
state.visible = true;
console.log("点击下载", state.visible);
};
return {
...toRefs(state),
changeRole,
showDrawer,
};
},
};
@@ -148,6 +169,19 @@ export default {
color: #b3bdc4;
line-height: 36px;
}
.signOutMain {
cursor: pointer;
margin-right: 29px;
display: flex;
align-items: center;
}
.signOut {
font-size: 16px;
font-weight: 400;
color: #242424;
line-height: 22px;
margin-left: 5px;
}
}
}
</style>

View File

@@ -52,26 +52,19 @@
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : 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()
// })
},
}"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
<div class="main_btns">
@@ -316,6 +309,44 @@
}
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
.main_btns {

View File

@@ -78,26 +78,20 @@
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : 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()
// })
},
}"
this.getMilitaryDeployment()
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
<div class="main_btns">
@@ -417,6 +411,44 @@ export default {
cursor: pointer;
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
.main_btns {

View File

@@ -51,25 +51,7 @@
:columns="columns1"
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : 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()
// })
},
}"
:pagination="false"
>
<template #bodyCell="{ column }">
<template v-if="column.key === 'opacation'">
@@ -77,6 +59,17 @@
</template>
</template>
</a-table>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
<div class="main_btns">
@@ -316,6 +309,44 @@
}
}
}
.main_table {
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
.main_btns {

View File

@@ -0,0 +1,71 @@
<template>
<a-drawer
:visible="downloadVisible"
class="drawerStyle downloadDrawer"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">下载中心</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main"></div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
export default {
name: "DownLoad",
props: {
downloadVisible: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
console.log("props", props.downloadVisible);
const state = reactive({});
const closeDrawer = () => {
ctx.emit("update:downloadVisible", false);
};
return {
...toRefs(state),
closeDrawer,
};
},
};
</script>
<style lang="scss">
.downloadDrawer {
.drawerMain {
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
margin-left: 24px;
}
}
.contentMain {
}
}
}
</style>

View File

@@ -1082,26 +1082,19 @@
:scroll="{ x: 700, y: 800 }"
expandRowByClick="true"
@expand="expandTable"
: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()
// })
},
}"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
<!-- 有数据表格 -->
</div>
@@ -1439,26 +1432,19 @@
:scroll="{ x: 800 }"
expandRowByClick="true"
@expand="expandTable"
: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()
// })
},
}"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
</div>
@@ -3753,7 +3739,7 @@ export default defineComponent({
width: 479px !important;
.ant-modal-body {
.QR {
z-index: 999;
z-index: 9999;
width: 520px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
@@ -3798,12 +3784,14 @@ export default defineComponent({
}
.qrm_body {
width: 100%;
margin-top: 22px;
margin-bottom: 32px;
.QR_img {
width: 176px;
height: 176px;
margin: 1px auto;
background-color: red;
background-image: url(@/assets/images/taskpage/QR.png);
background-size: 100% 100%;
}
}
.qrm_footer {
@@ -3837,7 +3825,7 @@ export default defineComponent({
// width:679px !important;
.ant-modal-body {
.recordgrade {
z-index: 999;
z-index: 9999;
width: 679px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
@@ -3939,7 +3927,7 @@ export default defineComponent({
// width:679px !important;
.ant-modal-body {
.graduate {
z-index: 999;
z-index: 9999;
width: 679px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
@@ -4046,7 +4034,7 @@ export default defineComponent({
// width:679px !important;
.ant-modal-body {
.agreestudy {
z-index: 999;
z-index: 9999;
width: 679px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
@@ -4851,9 +4839,31 @@ export default defineComponent({
}
}
.stm_table {
width: 90%;
margin: 30px auto;
border: 1px solid #f0f4fe;
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.operation {
display: flex;
justify-content: center;
@@ -4876,6 +4886,16 @@ export default defineComponent({
justify-content: right;
}
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
}
@@ -5063,7 +5083,33 @@ export default defineComponent({
}
}
.stmm_i6 {
margin-top: 20px;
position: relative;
padding-top: 15px;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.operation,
.nselect {
display: flex;
@@ -5076,6 +5122,16 @@ export default defineComponent({
cursor: pointer;
}
}
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
}
@@ -5151,7 +5207,7 @@ export default defineComponent({
width: 424px !important;
.ant-modal-body {
.delete {
z-index: 999;
z-index: 9999;
width: 424px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

View File

@@ -4436,7 +4436,7 @@ export default {
width: 424px !important;
.ant-modal-body {
.delete {
z-index: 999;
z-index: 9999;
width: 424px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

View File

@@ -738,7 +738,7 @@ export default {
width: 424px !important;
.ant-modal-body {
.delete {
z-index: 999;
z-index: 9999;
width: 424px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);