dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-25 08:35:00 +08:00
commit 51aea52701
5 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -97,9 +97,7 @@
<el-table-column align="center" prop="count92" label="拉卡拉交易笔数"></el-table-column> <el-table-column align="center" prop="count92" label="拉卡拉交易笔数"></el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易占比"></el-table-column> <el-table-column align="center" prop="count92" label="拉卡拉交易占比"></el-table-column>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="date" label="统计日期" > <el-table-column align="center" prop="date" label="统计日期" >
<template> <template>
<!-- {{this.beginTime}} -{{this.endTime}}--> <!-- {{this.beginTime}} -{{this.endTime}}-->

13
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -267,7 +267,7 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;
@ -301,6 +301,7 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
.size-hui{ .size-hui{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 13px;
@ -313,9 +314,6 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
} }
} }
.size-bole{ .size-bole{
//font-weight: bold;
//width: 53px;
height: 31px; height: 31px;
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
font-weight: 400; font-weight: 400;
@ -356,15 +354,12 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
.icon-img{ .icon-img{
//margin-left: 110px; width: 20px;
width: 100%;
height: 20px; height: 20px;
margin-right: 5px; margin-right: 5px;
img{ img{
float: right;
//width: 100%;
width: 20px; width: 20px;
height: 100%; height: 20px;
} }
} }

17
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
View File

@ -290,7 +290,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;
@ -312,12 +312,9 @@ import {
align-items: center; align-items: center;
} }
.box{ .box{
//box-sizing: border-box;
padding: 5px; padding: 5px;
//background: #f9f9f9;
margin-right: 20px; margin-right: 20px;
padding-left: 20px; padding-left: 20px;
width: 211px; width: 211px;
height: 60px; height: 60px;
background: rgba(64,158,255,0.05); background: rgba(64,158,255,0.05);
@ -330,12 +327,11 @@ import {
.size-hui{ .size-hui{
display: flex; display: flex;
align-items: center; align-items: center;
//width: 200px; justify-content: space-between;
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 13px;
color: #888888; color: #888888;
//line-height: 0px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
@ -349,7 +345,7 @@ import {
font-weight: 400; font-weight: 400;
font-size: 24px; font-size: 24px;
color: #555555; color: #555555;
//line-height: 0px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
text-transform: none; } text-transform: none; }
@ -383,15 +379,12 @@ import {
.icon-img{ .icon-img{
//margin-left: 110px; width: 20px;
width: 100%;
height: 20px; height: 20px;
margin-right: 5px; margin-right: 5px;
img{ img{
float: right;
//width: 100%;
width: 20px; width: 20px;
height: 100%; height: 20px;
} }
} }
</style> </style>

2
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/none.vue
View File

@ -138,7 +138,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

21
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -264,7 +264,7 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;
@ -286,12 +286,9 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
align-items: center; align-items: center;
} }
.box{ .box{
//box-sizing: border-box;
padding: 5px; padding: 5px;
//background: #f9f9f9;
margin-right: 20px; margin-right: 20px;
padding-left: 20px; padding-left: 20px;
width: 211px; width: 211px;
height: 60px; height: 60px;
background: rgba(64,158,255,0.05); background: rgba(64,158,255,0.05);
@ -304,12 +301,11 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
.size-hui{ .size-hui{
display: flex; display: flex;
align-items: center; align-items: center;
//width: 200px; justify-content: space-between;
font-family: Source Han Sans CN, Source Han Sans CN; font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 13px;
color: #888888; color: #888888;
//line-height: 0px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
@ -318,15 +314,11 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
} }
} }
.size-bole{ .size-bole{
//font-weight: bold;
//width: 53px;
height: 31px; height: 31px;
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
font-weight: 400; font-weight: 400;
font-size: 24px; font-size: 24px;
color: #555555; color: #555555;
//line-height: 0px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
@ -360,15 +352,14 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
.icon-img{ .icon-img{
//margin-left: 110px;
width: 100%; width: 20px;
height: 20px; height: 20px;
margin-right: 5px; margin-right: 5px;
img{ img{
float: right;
//width: 100%;
width: 20px; width: 20px;
height: 100%; height: 20px;
} }
} }