diff --git a/src/api/project/project.js b/src/api/project/project.js
index 3f4aa31..4f99135 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -6,7 +6,7 @@ const projectApi = {
// update: 'sys/menu/update',
// del: 'sys/menu/delete',
// updateStatus: 'sys/menu/updateStatus',
- list: 'project/projectList'
+ list: 'project/pageList'
}
// export function menuAdd (params) {
@@ -41,7 +41,7 @@ export function getProjectList (params) {
return request({
url: projectApi.list,
method: 'get',
- data: params
+ params: params
})
}
// export function menuUpdateStatus (params) {
diff --git a/src/components/Table/index.js b/src/components/Table/index.js
index a9301ca..7b1b717 100644
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@@ -178,7 +178,7 @@ export default {
// } catch (e) {
// this.localPagination = false
// }
- this.localDataSource = r.entities // 返回结果中的数组数据
+ this.localDataSource = r.rows // 返回结果中的数组数据
this.localLoading = false
})
}
diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index b9a6c66..8dad88a 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -74,8 +74,8 @@
class="table-page-search-submitButtons"
:style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
>
- 查询
- (queryParam = {})">重置
+ 查询
+ (queryParam = {})">重置
@@ -84,6 +84,7 @@
新建
+
删除
@@ -150,58 +151,65 @@ export default {
// 表头
columns: [
{
- title: '#',
+ title: '序号',
+ width: 60,
scopedSlots: { customRender: 'serial' },
},
{
title: '项目名称',
dataIndex: 'projectName',
+ key: 'projectName'
},
{
title: '时间',
dataIndex: 'description',
},
{
- title: '服务调用次数',
+ title: '人数',
dataIndex: 'callNo',
- sorter: true,
+ // sorter: true,
needTotal: true,
- customRender: (text) => text + ' 次',
+ // customRender: (text) => text + ' 次',
},
{
- title: '状态',
+ title: '项目类型',
+ dataIndex: 'description',
+ },
+ {
+ title: '项目状态',
+ dataIndex: 'description',
+ },
+ {
+ title: '创建人员',
dataIndex: 'projectStatus',
- needTotal: true,
},
{
- title: '更新时间',
+ title: '创建时间',
dataIndex: 'updatedAt',
sorter: true,
},
+ // {
+ // title: '操作',
+ // dataIndex: 'action',
+ // width: '150px',
+ // scopedSlots: { customRender: 'action' },
+ // },
{
title: '操作',
- dataIndex: 'action',
- width: '150px',
- scopedSlots: { customRender: 'action' },
- },
+ key: 'operation',
+ width: 100,
+ align: 'center',
+ scopedSlots: { customRender: 'action' }
+ }
],
- // 加载数据方法 必须为 Promise 对象
- loadData: (parameter) => {
- console.log('loadData.parameter', parameter)
- return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
- return res.rows
- })
- },
- // // 加载数据方法 必须为 Promise 对象
- // loadData: (parameter) => {
- // console.log('loadData.parameter', parameter)
- // return request({
- // url: '/dawa/project/pageList',
- // method: get,
- // data: this.queryParam,
- // })
- // },
+ // 加载数据方法 必须为 Promise 对象
+ loadData: parameter => {
+ return getProjectList(Object.assign(parameter, this.queryParam))
+ .then(res => {
+ return res
+ })
+ },
selectedRowKeys: [],
selectedRows: [],