Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
This commit is contained in:
commit
51aea52701
@ -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>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column align="center" prop="date" label="统计日期" >
|
||||
<template>
|
||||
<!-- {{this.beginTime}} -{{this.endTime}}-->
|
||||
|
@ -267,7 +267,7 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.app-top{
|
||||
width: 100%;
|
||||
|
||||
@ -301,6 +301,7 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
|
||||
.size-hui{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
@ -313,9 +314,6 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
|
||||
}
|
||||
}
|
||||
.size-bole{
|
||||
//font-weight: bold;
|
||||
|
||||
//width: 53px;
|
||||
height: 31px;
|
||||
font-family: YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
@ -356,15 +354,12 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
|
||||
|
||||
|
||||
.icon-img{
|
||||
//margin-left: 110px;
|
||||
width: 100%;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
img{
|
||||
float: right;
|
||||
//width: 100%;
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -290,7 +290,7 @@ import {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.app-top{
|
||||
width: 100%;
|
||||
|
||||
@ -312,12 +312,9 @@ import {
|
||||
align-items: center;
|
||||
}
|
||||
.box{
|
||||
//box-sizing: border-box;
|
||||
padding: 5px;
|
||||
//background: #f9f9f9;
|
||||
margin-right: 20px;
|
||||
padding-left: 20px;
|
||||
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(64,158,255,0.05);
|
||||
@ -330,12 +327,11 @@ import {
|
||||
.size-hui{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
//width: 200px;
|
||||
justify-content: space-between;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
color: #888888;
|
||||
//line-height: 0px;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
@ -349,7 +345,7 @@ import {
|
||||
font-weight: 400;
|
||||
font-size: 24px;
|
||||
color: #555555;
|
||||
//line-height: 0px;
|
||||
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none; }
|
||||
@ -383,15 +379,12 @@ import {
|
||||
|
||||
|
||||
.icon-img{
|
||||
//margin-left: 110px;
|
||||
width: 100%;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
img{
|
||||
float: right;
|
||||
//width: 100%;
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -138,7 +138,7 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.app-top{
|
||||
width: 100%;
|
||||
|
||||
|
@ -264,7 +264,7 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.app-top{
|
||||
width: 100%;
|
||||
|
||||
@ -286,12 +286,9 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
|
||||
align-items: center;
|
||||
}
|
||||
.box{
|
||||
//box-sizing: border-box;
|
||||
padding: 5px;
|
||||
//background: #f9f9f9;
|
||||
margin-right: 20px;
|
||||
padding-left: 20px;
|
||||
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(64,158,255,0.05);
|
||||
@ -304,12 +301,11 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
|
||||
.size-hui{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
//width: 200px;
|
||||
justify-content: space-between;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
color: #888888;
|
||||
//line-height: 0px;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
@ -318,15 +314,11 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
|
||||
}
|
||||
}
|
||||
.size-bole{
|
||||
//font-weight: bold;
|
||||
|
||||
//width: 53px;
|
||||
height: 31px;
|
||||
font-family: YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
font-size: 24px;
|
||||
color: #555555;
|
||||
//line-height: 0px;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
@ -360,15 +352,14 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
|
||||
|
||||
|
||||
.icon-img{
|
||||
//margin-left: 110px;
|
||||
width: 100%;
|
||||
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
img{
|
||||
float: right;
|
||||
//width: 100%;
|
||||
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user