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

前端

Browse Source
This commit is contained in:
xvv 2024-07-04 09:47:52 +08:00
parent 98f063b9d1
commit 1e4b125198
5 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fuintAdmin/src/views/indexcomponents/centenrindex.vue
View File

@ -31,21 +31,22 @@
<div class="xse">总销售额(元)</div> <div class="xse">总销售额(元)</div>
</div> </div>
<template v-loading="employeLoading" > <template v-loading="employeLoading" >
<div class="four-boxx" :class="{'four-act':index%2!=0}" v-for="(item,index) in employeList" :key="index" > <div class="box-kuang">
<div class="pm">{{index+1}}</div> <div class="four-boxx" :class="{'four-act':index%2!=0}" v-for="(item,index) in employeList" :key="index" >
<div class="dis"> <div class="pm">{{index+1}}</div>
<div class="touxiang"> <div class="dis">
<img src="../../../src/assets/images/avatar.png" class="touxiang"> <div class="touxiang">
<img src="../../../src/assets/images/avatar.png" class="touxiang">
</div>
<div class="name">{{item.realName}}</div>
</div>
<div class="xs">{{item.cardSum}}</div>
<div class="xs">{{item.fuelSum}}</div>
<div class="xs">{{item.oilSum}}</div>
<div class="xse">{{item.totalSum}}</div>
</div> </div>
<div class="name">{{item.realName}}</div>
</div> </div>
<div class="xs">{{item.cardSum}}</div>
<div class="xs">{{item.fuelSum}}</div>
<div class="xs">{{item.oilSum}}</div>
<div class="xse">{{item.totalSum}}</div>
</div>
</template> </template>
</div> </div>
</div> </div>
</template> </template>
@ -319,4 +320,9 @@ export default {
width: 30%; width: 30%;
text-align: center; text-align: center;
} }
.box-kuang{
width: 100%;
height: 345px;
overflow: auto;
}
</style> </style>

92
fuintAdmin/src/views/member/index.vue
View File

@ -102,68 +102,54 @@
</el-card> </el-card>
<el-card style="margin-top: 20px"> <el-card style="margin-top: 20px">
<div>统计</div> <!-- <div>统计</div>-->
<template> <template>
<div> <div class="ds-dbox">
<el-row :gutter="20"> <div class="k-one">
<el-col :span="4"> <div class="title_">激活会员总数</div>
<div class="sta"> <div class="num-size">{{total}}</div>
<el-statistic </div>
group-separator="," <!-- <el-row :gutter="20">-->
:value="total" <!-- <el-col :span="4">-->
title="会员总数" <!-- <div class="sta">-->
></el-statistic> <!-- <el-statistic-->
</div> <!-- group-separator=","-->
</el-col> <!-- :value="total"-->
<el-col :span="4"> <!-- title="会员总数"-->
<div class="sta"> <!-- ></el-statistic>-->
<el-statistic title="今日新增/昨日新增"> <!-- </div>-->
<template slot="formatter"> <!-- </el-col>-->
{{ addNum }}/{{ yesterdayAddNum }} <!-- <el-col :span="4">-->
</template> <!-- <div class="sta">-->
</el-statistic> <!-- <el-statistic title="今日新增/昨日新增">-->
</div> <!-- <template slot="formatter">-->
</el-col> <!-- {{ addNum }}/{{ yesterdayAddNum }}-->
<el-col :span="4"> <!-- </template>-->
<div class="sta"> <!-- </el-statistic>-->
<el-statistic <!-- </div>-->
group-separator="," <!-- </el-col>-->
:precision="2"
:value="balance"
title="储值总余额"
></el-statistic>
</div>
</el-col>
<!-- <el-col :span="4">--> <!-- <el-col :span="4">-->
<!-- <div class="sta">--> <!-- <div class="sta">-->
<!-- <el-statistic--> <!-- <el-statistic-->
<!-- group-separator=","--> <!-- group-separator=","-->
<!-- :precision="2"--> <!-- :precision="2"-->
<!-- :value="literCard"--> <!-- :value="balance"-->
<!-- title="升数卡总余额"--> <!-- title="储值总余额"-->
<!-- ></el-statistic>--> <!-- ></el-statistic>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="4">
<div class="sta">
<el-statistic
group-separator=","
:value="point"
title="积分总余额"
></el-statistic>
</div>
</el-col>
<!-- <el-col :span="4">--> <!-- <el-col :span="4">-->
<!-- <div class="sta">--> <!-- <div class="sta">-->
<!-- <el-statistic--> <!-- <el-statistic-->
<!-- group-separator=","--> <!-- group-separator=","-->
<!-- :precision="2"--> <!-- :value="point"-->
<!-- :value="refuelMoney"--> <!-- title="积分总余额"-->
<!-- title="加油金余额"-->
<!-- ></el-statistic>--> <!-- ></el-statistic>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-col>--> <!-- </el-col>-->
</el-row>
<!-- </el-row>-->
</div> </div>
</template> </template>
</el-card> </el-card>
@ -856,4 +842,18 @@ export default {
color: red; color: red;
font-size: 18px; font-size: 18px;
} }
.ds-dbox{
display: flex;
align-items: center;
box-sizing: border-box;
padding: 20px;
}
.k-one{
width: 20%;
border-radius: 10px;
border: 1px solid #F5DF1A;
background: rgba(252,238,109,0.1);
box-sizing: border-box;
padding: 20px;
}
</style> </style>

7
fuintAdmin_zt/.env.development
View File

@ -11,9 +11,8 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/' VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址 # 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
#VUE_APP_SERVER_URL = 'http://192.168.31.178:8081' VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/'
# cp端地址 # cp端地址
# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/' # VUE_PC_SERVER_URL = 'http://192.168.31.72:8081/'

3
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -2036,9 +2036,6 @@ export default {
}, },
// 角色过滤 // 角色过滤
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
handleResetPwd(row) { handleResetPwd(row) {

5
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,7 +1,8 @@
# \u57FA\u672C\u914D\u7F6E # \u57FA\u672C\u914D\u7F6E
server.port=8080 server.port=8081
env.profile=dev env.profile=dev
env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/code/oilSystem/fuintBackend/configure/ #env.properties.path=D:/code/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/ #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/