Commit bd0f14b5 by 姜雷

修改数据首页点击搜索后才查询

parent 4c06bc96
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-radio-group <el-radio-group
class="Dashboard-Radio" class="Dashboard-Radio"
:value="filters.timeType" :value="filters.timeType"
@input="val => changeFilterHandle({ timeType: val })" @input="val => updateFilters({ timeType: val })"
> >
<el-radio <el-radio
class="Dashboard-Radio-item" class="Dashboard-Radio-item"
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<el-button <el-button
type="primary" type="primary"
@click="fetchConsumeList" @click="fetchConsumeList"
class="CampusRank-search"
>搜索</el-button> >搜索</el-button>
</div> </div>
<CampusRankChart <CampusRankChart
...@@ -134,5 +135,8 @@ export default { ...@@ -134,5 +135,8 @@ export default {
height: 100% !important; height: 100% !important;
} }
} }
.CampusRank-search {
margin-right: 5px;
}
} }
</style> </style>
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
<operator-select <operator-select
:accessType="1" :accessType="1"
:value="filters.operateId" :value="filters.operateId"
@input="val => fetchAllData({operateId: val})" @input="val => updateFilters({operateId: val,areaId:undefined})"
/> />
</search-item> </search-item>
<search-item label="区域"> <search-item label="区域">
<dashboard-area-select <dashboard-area-select
:operateId="filters.operateId" :operateId="filters.operateId"
:value="filters.areaId" :value="filters.areaId"
@input="val => fetchAllData({areaId: val})" @input="val => updateFilters({areaId: val})"
/> />
</search-item> </search-item>
<el-radio-group <el-radio-group
class="Dashboard-Radio" class="Dashboard-Radio"
:value="filters.timeType" :value="filters.timeType"
@input="val => fetchAllData({timeType: val})" @input="val => updateFilters({timeType: val})"
> >
<el-radio <el-radio
class="Dashboard-Radio-item" class="Dashboard-Radio-item"
...@@ -61,7 +61,10 @@ export default { ...@@ -61,7 +61,10 @@ export default {
...mapGetters('Dashboard/customerConsumption', ['filters']), ...mapGetters('Dashboard/customerConsumption', ['filters']),
}, },
methods: { methods: {
...mapActions('Dashboard/customerConsumption', ['getConsumeOrderList']), ...mapActions('Dashboard/customerConsumption', [
'getConsumeOrderList',
'updateFilters',
]),
...mapActions('Dashboard/customerRecharge', ['getRechargeOrderList']), ...mapActions('Dashboard/customerRecharge', ['getRechargeOrderList']),
fetchAllData(entity) { fetchAllData(entity) {
this.getConsumeOrderList(entity); this.getConsumeOrderList(entity);
......
...@@ -249,10 +249,13 @@ export default { ...@@ -249,10 +249,13 @@ export default {
width: 26, width: 26,
height: this.height, height: this.height,
padding: [20, 0, 20, 0], padding: [20, 0, 20, 0],
xAxis: 'rechargeMen', xAxis: 'rechargeMoney',
yAxis: 'index', yAxis: 'index',
scales: { scales: {
min: 0,
max: arrLength - 1,
index: { index: {
type: 'linear',
formatter: val => { formatter: val => {
return parseInt(val, 10); return parseInt(val, 10);
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment