Skip to content

Commit 3e3819c

Browse files
committed
refine table example demo
1 parent 6d9ddad commit 3e3819c

File tree

4 files changed

+74
-87
lines changed

4 files changed

+74
-87
lines changed

src/api/article_table.js

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,17 @@
11
import { fetch } from 'utils/fetch';
2-
import { param } from 'utils';
3-
4-
// export function calendarsList(query) {
5-
// return fetch({
6-
// url: '/finfo/calendars?' + param(query),
7-
// method: 'get'
8-
// });
9-
// }
102

113
export function fetchList(query) {
124
return fetch({
135
url: '/article_table/list',
14-
method: 'get'
15-
});
16-
}
17-
18-
19-
export function calendarCreate(data) {
20-
return fetch({
21-
url: '/finfo/calendar/create',
22-
method: 'post',
23-
data
24-
});
25-
}
26-
27-
export function calendarDelete(id) {
28-
return fetch({
29-
url: '/finfo/calendar/delete',
30-
method: 'post',
31-
data: { id }
32-
});
33-
}
34-
35-
export function calendarUpdate(data) {
36-
return fetch({
37-
url: '/finfo/calendar/update',
38-
method: 'post',
39-
data
6+
method: 'get',
7+
params: query
408
});
419
}
4210

43-
export function calcountriesList() {
11+
export function fetchPv(pv) {
4412
return fetch({
45-
url: '/finfo/calcountries',
46-
method: 'get'
13+
url: '/article_table/pv',
14+
method: 'get',
15+
params: { pv }
4716
});
4817
}

src/mock/article_table.js

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Mock from 'mockjs';
22

33

44
const List = [];
5-
const count = 50;
5+
const count = 100;
66

77
for (let i = 0; i < count; i++) {
88
List.push(Mock.mock({
@@ -12,34 +12,36 @@ for (let i = 0; i < count; i++) {
1212
title: '@ctitle(10, 20)',
1313
forecast: '@float(0, 100, 2, 2)',
1414
importance: '@integer(1, 3)',
15-
'calendar_type|1': ['FD', 'FE', 'BI', 'VN'],
16-
'status|1': ['published', 'draft', 'deleted']
15+
'type|1': ['FD', 'FE', 'BI', 'VN'],
16+
'status|1': ['published', 'draft', 'deleted'],
17+
pageviews: '@integer(300, 5000)'
1718
}));
1819
}
1920

2021
export default {
21-
getList: config =>
22-
// let {page, sortWay, startTime, endTime, userName, age} = config.params;
23-
// let mockUsers = _Users.filter(user => {
24-
// if (startTime && user.date < startTime) return false;
25-
// if (endTime && user.date > endTime) return false;
26-
// if (userName && user.name !== userName) return false;
27-
// if (age && user.age !== age) return false;
28-
// return true;
29-
// });
30-
// if (sortWay) {
31-
// let {order, prop} = sortWay;
32-
// mockUsers = mockUsers.sort((u1, u2) => order === 'ascending' ? u1[prop] - u2[prop] : u2[prop] - u1[prop]);
33-
// }
34-
// if (page === 0) page++;
35-
// mockUsers = mockUsers.filter((u, index) => index < 20 * page && index >= 20 * (page - 1));
36-
new Promise(resolve => {
37-
setTimeout(() => {
38-
resolve([200, {
39-
total: List.length,
40-
items: List
41-
}]);
42-
}, 100);
43-
})
44-
22+
getList: config => {
23+
const { importance, type, title, page, limit } = config.params;
24+
const mockList = List.filter(item => {
25+
if (importance && item.importance !== importance) return false;
26+
if (type && item.type !== type) return false;
27+
if (title && item.title.indexOf(title) < 0) return false;
28+
return true;
29+
});
30+
const pageList = mockList.filter((item, index) => index < limit * page && index >= limit * (page - 1));
31+
return new Promise(resolve => {
32+
setTimeout(() => {
33+
resolve([200, {
34+
total: mockList.length,
35+
items: pageList
36+
}]);
37+
}, 100);
38+
})
39+
},
40+
getPv: () => new Promise(resolve => {
41+
setTimeout(() => {
42+
resolve([200, {
43+
pvData: [{ key: 'PC网站', pv: 1024 }, { key: 'mobile网站', pv: 1024 }, { key: 'ios', pv: 1024 }, { key: 'android', pv: 1024 }]
44+
}]);
45+
}, 100);
46+
})
4547
};

src/mock/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ mock.onGet('/article/list').reply(200, data);
1919

2020

2121
mock.onGet('/article_table/list').reply(article_tableAPI.getList);
22+
mock.onGet('/article_table/pv').reply(article_tableAPI.getPv);
2223

2324

2425

src/views/example/table.vue

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@
44
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="标题" v-model="listQuery.title">
55
</el-input>
66

7-
<el-date-picker class="filter-item" v-model="time" type="daterange" align="left" placeholder="选择日期范围" :picker-options="pickerOptions"
8-
@input="timeFilter" style="width: 210px">
9-
</el-date-picker>
10-
117
<el-select clearable style="width: 90px" class="filter-item" v-model="listQuery.importance" placeholder="重要性">
128
<el-option v-for="item in importanceOptions" :key="item" :label="item" :value="item">
139
</el-option>
1410
</el-select>
1511

16-
<el-select clearable class="filter-item" style="width: 130px" v-model="listQuery.calendar_type" placeholder="类型">
12+
<el-select clearable class="filter-item" style="width: 130px" v-model="listQuery.type" placeholder="类型">
1713
<el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name+'('+item.key+')'" :value="item.key">
1814
</el-option>
1915
</el-select>
@@ -40,7 +36,7 @@
4036
<el-table-column min-width="300px" label="标题">
4137
<template scope="scope">
4238
<span class="link-type" @click="handleUpdate(scope.row)">{{scope.row.title}}</span>
43-
<el-tag>{{scope.row.calendar_type | typeFilter}}</el-tag>
39+
<el-tag>{{scope.row.type | typeFilter}}</el-tag>
4440
</template>
4541
</el-table-column>
4642

@@ -57,6 +53,12 @@
5753
</template>
5854
</el-table-column>
5955

56+
<el-table-column align="center" label="阅读数" width="95">
57+
<template scope="scope">
58+
<span class="link-type" @click='handleFetchPv(scope.row.pageviews)'>{{scope.row.pageviews}}</span>
59+
</template>
60+
</el-table-column>
61+
6062
<el-table-column class-name="status-col" label="状态" width="90">
6163
<template scope="scope">
6264
<el-tag :type="scope.row.status | statusFilter">{{scope.row.status}}</el-tag>
@@ -77,15 +79,15 @@
7779
</el-table>
7880

7981
<div v-show="!listLoading" class="pagination-container">
80-
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.cursor" :page-sizes="[10,20,30, 50]"
82+
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.page" :page-sizes="[10,20,30, 50]"
8183
:page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
8284
</el-pagination>
8385
</div>
8486

8587
<el-dialog :title="textMap[dialogStatus]" v-model="dialogFormVisible">
8688
<el-form class="small-space" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
8789
<el-form-item label="类型">
88-
<el-select class="filter-item" v-model="temp.calendar_type" placeholder="请选择">
90+
<el-select class="filter-item" v-model="temp.type" placeholder="请选择">
8991
<el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key">
9092
</el-option>
9193
</el-select>
@@ -122,12 +124,23 @@
122124
<el-button v-else type="primary" @click="update">确 定</el-button>
123125
</div>
124126
</el-dialog>
127+
128+
<el-dialog title="阅读数统计" v-model="dialogPvVisible" size="small">
129+
<el-table :data="pvData" border fit highlight-current-row style="width: 100%">
130+
<el-table-column prop="key" label="渠道"> </el-table-column>
131+
<el-table-column prop="pv" label="pv"> </el-table-column>
132+
</el-table>
133+
<span slot="footer" class="dialog-footer">
134+
<el-button type="primary" @click="dialogPvVisible = false">确 定</el-button>
135+
</span>
136+
</el-dialog >
137+
125138
</div>
126139
</template>
127140

128141
<script>
129-
import { fetchList } from 'api/article_table';
130-
import { parseTime, objectMerge, pickerOptions } from 'utils';
142+
import { fetchList, fetchPv } from 'api/article_table';
143+
import { parseTime, objectMerge } from 'utils';
131144
132145
const calendarTypeOptions = [
133146
{ key: 'FD', display_name: '经济数据' },
@@ -150,23 +163,21 @@
150163
total: null,
151164
listLoading: true,
152165
listQuery: {
153-
cursor: 1,
166+
page: 1,
154167
limit: 20,
155-
start: undefined,
156-
end: undefined,
157168
importance: undefined,
158-
title: undefined
169+
title: undefined,
170+
type: undefined
159171
},
160172
temp: {
161173
id: undefined,
162174
importance: 0,
163175
remark: '',
164176
timestamp: 0,
165177
title: '',
166-
calendar_type: '',
178+
type: '',
167179
status: 'published'
168180
},
169-
time: '', // 时间筛选项
170181
importanceOptions: [1, 2, 3],
171182
calendarTypeOptions,
172183
statusOptions: ['published', 'draft', 'deleted'],
@@ -176,9 +187,8 @@
176187
update: '编辑',
177188
create: '创建'
178189
},
179-
pickerOptions: {
180-
shortcuts: pickerOptions
181-
}
190+
dialogPvVisible: false,
191+
pvData: []
182192
}
183193
},
184194
created() {
@@ -201,7 +211,6 @@
201211
getList() {
202212
this.listLoading = true;
203213
fetchList(this.listQuery).then(response => {
204-
console.log(response)
205214
this.list = response.items;
206215
this.total = response.total;
207216
this.listLoading = false;
@@ -215,7 +224,7 @@
215224
this.getList();
216225
},
217226
handleCurrentChange(val) {
218-
this.listQuery.cursor = val;
227+
this.listQuery.page = val;
219228
this.getList();
220229
},
221230
timeFilter(time) {
@@ -291,14 +300,20 @@
291300
timestamp: 0,
292301
title: '',
293302
status: 'published',
294-
calendar_type: ''
303+
type: ''
295304
};
296305
},
306+
handleFetchPv(pv) {
307+
fetchPv(pv).then(response => {
308+
this.pvData = response.pvData
309+
this.dialogPvVisible = true
310+
})
311+
},
297312
handleDownload() {
298313
require.ensure([], () => {
299314
const { export_json_to_excel } = require('vendor/Export2Excel');
300315
const tHeader = ['时间', '地区', '类型', '标题', '重要性'];
301-
const filterVal = ['timestamp', 'province', 'calendar_type', 'title', 'importance'];
316+
const filterVal = ['timestamp', 'province', 'type', 'title', 'importance'];
302317
const data = this.formatJson(filterVal, this.list);
303318
export_json_to_excel(tHeader, data, 'table数据');
304319
})

0 commit comments

Comments
 (0)