Merge remote-tracking branch 'origin/master'

This commit is contained in:
齐天大圣 2024-03-06 15:37:49 +08:00
commit a97c077ee8
2 changed files with 5 additions and 5 deletions

View File

@ -91,10 +91,10 @@
<div class="sshi">
<div class="tj-text">未使用卡量</div>
<el-divider></el-divider>
<div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div>
<div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div>
<div>
</div>
<div class="ds"v-for="(item,index) in twolist" :key="index" >
<div class="ds"v-for="(item,index) in threelist" :key="index" >
<div class="tj-num">
<div class="one-size">
@ -127,10 +127,10 @@
<div class="sshi">
<div class="tj-text">已使用卡量</div>
<el-divider></el-divider>
<div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div>
<div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div>
<div>
</div>
<div class="ds"v-for="(item,index) in threelist" :key="index" >
<div class="ds"v-for="(item,index) in twolist" :key="index" >
<div class="tj-num">
<div class="one-size">

View File

@ -327,7 +327,7 @@
activeStatus:'0'
},
queryParams:{
type:'油',
type:'油',
oilType:'',
activeStatus:'',
pageNo:1,