|
@@ -31,16 +31,6 @@
|
31
|
31
|
</el-form-item>
|
32
|
32
|
</el-form>
|
33
|
33
|
<br>
|
34
|
|
- <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
|
35
|
|
- <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
|
36
|
|
- </el-table-column>
|
37
|
|
- </el-table>
|
38
|
|
- <div class="table-pagination">
|
39
|
|
- <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
|
40
|
|
- :current-page.sync="pageNum" :page-size.sync="pageSize">
|
41
|
|
- </el-pagination>
|
42
|
|
- </div>
|
43
|
|
- <br>
|
44
|
34
|
<div class="charts" style="display: flex">
|
45
|
35
|
<div style="width: 50%;height: 300px;">
|
46
|
36
|
<h5 style="color: white">收费趋势</h5>
|
|
@@ -179,21 +169,21 @@
|
179
|
169
|
params.end = this.formInline.time[1]
|
180
|
170
|
}
|
181
|
171
|
delete params.time
|
182
|
|
- let requestList = [api.tccqkView(), api.sfqs(params),api.cllx(params), api.jyqk({...params4, ...params})];
|
|
172
|
+ let requestList = [api.tccqkView(params), api.sfqs(params),api.cllx(params)];
|
183
|
173
|
Promise.all(requestList).then(res => {
|
184
|
|
- that.viewDaviewDatata = res[0].data
|
|
174
|
+ that.viewData = res[0].data
|
185
|
175
|
that.linedata = res[1].data || []
|
186
|
|
- console.log(res[2].data, '-----饼图----')
|
187
|
176
|
that.modelData = res[2].data || []
|
188
|
|
- this.tableData = res[3].data.records || []
|
189
|
|
- this.total = res[3].data.total || 0
|
190
|
177
|
})
|
191
|
178
|
},
|
192
|
179
|
lineTooltipFormat(params) {
|
193
|
180
|
return `<div class="line-tooltip">
|
194
|
181
|
<div style="color: ${params[0].color}">${params[0].seriesName}: ${
|
195
|
|
- params[0].data.lastAmount || "--"
|
196
|
|
- }</div>
|
|
182
|
+ params[0].data.lastYearAmount || "--"
|
|
183
|
+ }元</div>
|
|
184
|
+ <div style="color: ${params[1].color}">${params[1].seriesName}: ${
|
|
185
|
+ params[1].data.thisYearAmount || "--"
|
|
186
|
+ }元</div>
|
197
|
187
|
</div>`;
|
198
|
188
|
},
|
199
|
189
|
handlePageChange() {
|