monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit eafa8e6be68528537ea5ed2a8fc87edb9d331424 2 parents e5a55a71 f8d896c3

Merge branch 'master-v32-lushangqing' into 'master' 

【#894】 【用户管理】拓扑负责人给授权后页面不展示数据，表格的pageSize传值更改 #1



See merge request !641
Inline Side-by-side
Showing 16 changed files with 29 additions and 63 deletions
... ... @@ -28,7 +28,7 @@
:dataList="data.tableData"
:treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
:total="data.count"
:pageSize="pageSize"
:pageSize="data.searchParams.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
... ...
... ... @@ -28,7 +28,7 @@
:dataList="data.tableData"
:treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
:total="data.count"
:pageSize="pageSize"
:pageSize="data.searchParams.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
... ...
... ... @@ -39,7 +39,6 @@
<cm-table-page :columns="columns"
:dataList="resourceData"
:total="count"
:layout="'total, prev,pager,next,sizes, jumper'"
:pageSize="search.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
... ...
... ... @@ -28,8 +28,6 @@ export default {
let count = Vue.ref(0);
//列表高度
let height = Vue.ref(window.innerHeight);
//列表分页
let limit = Vue.ref(400);
//加载
let loading = Vue.ref(true);
//选中数据
... ... @@ -39,7 +37,7 @@ export default {
resType: '',
keyword: '',
page: 1,
limit: 20,
limit: 50,
});
let resTypeOptions=Vue.ref([])
const columns = [
... ...
... ... @@ -27,7 +27,7 @@
<cm-table-page :columns="data.columns"
:dataList="data.tableData"
:total="data.count"
:pageSize="pageSize"
:pageSize="data.searchParams.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
... ...
... ... @@ -28,7 +28,7 @@
:dataList="data.tableData"
:treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
:total="data.count"
:pageSize="pageSize"
:pageSize="data.searchParams.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
... ...
... ... @@ -44,7 +44,6 @@
<cm-table-page :columns="columns"
:dataList="resourceData"
:total="count"
:layout="'total, prev,pager,next,sizes, jumper'"
:pageSize="search.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
... ...
... ... @@ -28,8 +28,6 @@ export default {
let count = Vue.ref(0);
//列表高度
let height = Vue.ref(window.innerHeight);
//列表分页
let limit = Vue.ref(400);
//加载
let loading = Vue.ref(true);
//选中数据
... ... @@ -39,7 +37,7 @@ export default {
resType: '',
keyword: '',
page: 1,
limit: 20,
limit: 50,
});
let resTypeOptions=Vue.ref([])
const columns = [
... ...
... ... @@ -42,7 +42,6 @@
<cm-table-page :columns="columns"
:dataList="resourceData"
:total="count"
:layout="'total, prev,pager,next,sizes, jumper'"
:pageSize="search.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
... ...
... ... @@ -28,8 +28,6 @@ export default {
let count = Vue.ref(0);
//列表高度
let height = Vue.ref(window.innerHeight);
//列表分页
let limit = Vue.ref(400);
//加载
let loading = Vue.ref(true);
//选中数据
... ... @@ -39,7 +37,7 @@ export default {
resType: '',
keyword: '',
page: 1,
limit: 20,
limit: 50,
});
let resTypeOptions=Vue.ref([])
const columns = [
... ...
... ... @@ -42,7 +42,6 @@
<cm-table-page :columns="columns"
:dataList="resourceData"
:total="count"
:layout="'total, prev,pager,next,sizes, jumper'"
:pageSize="search.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
... ...
... ... @@ -28,8 +28,6 @@ export default {
let count = Vue.ref(0);
//列表高度
let height = Vue.ref(window.innerHeight);
//列表分页
let limit = Vue.ref(400);
//加载
let loading = Vue.ref(true);
//选中数据
... ... @@ -43,7 +41,7 @@ export default {
resType: '',
keyword: '',
page: 1,
limit: 20,
limit: 50,
});
let resTypeOptions=Vue.ref([])
const columns = [
... ...
... ... @@ -29,7 +29,6 @@
<cm-table-page :columns="columns"
:dataList="resourceData"
:total="count"
:layout="'total, prev,pager,next,sizes, jumper'"
:pageSize="search.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
... ...
... ... @@ -28,8 +28,6 @@ export default {
let count = Vue.ref(0);
//列表高度
let height = Vue.ref(window.innerHeight);
//列表分页
let limit = Vue.ref(400);
//加载
let loading = Vue.ref(true);
//选中数据
... ... @@ -38,7 +36,7 @@ export default {
resType: '',
keyword: '',
page: 1,
limit: 20,
limit: 50,
});
const columns = [
{
... ...
... ... @@ -28,7 +28,7 @@
:dataList="data.tableData"
:treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
:total="data.count"
:pageSize="pageSize"
:pageSize="data.searchParams.limit"
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
... ...
... ... @@ -29,60 +29,41 @@ export default {
userDialogFlag : false,
count: 0,
columns: [{
prop: "busTypeName",
prop: "topoName",
label: "名称",
width: "250",
sortable: true,
align: 'center'
}, {
prop: "nickname",
label: "负责人",
width: "120",
sortable: true,
align: 'center'
}, {
prop: "busTypeDesc",
label: "业务描述",
width: "200",
sortable: true,
align: 'center'
}, {
prop: "isUse",
label: "是否使用",
},
{
prop: "isDefault",
label: "默认状态",
sortable: true,
align: 'center',
render: (row) => {
switch (row.isUse) {
//1是默认，0为非默认
switch (row.isDefault) {
case 0:
return '否';
return '非默认';
case 1:
return '是';
return '默认';
default:
return '';
}
}
}, {
prop: "important",
label: "重要程度",
prop: "createUser",
label: "创建人",
sortable: true,
align: 'center',
render: (row) => {
switch (row.important) {
case 1:
return '核心';
case 2:
return '重要';
case 3:
return '一般';
case 9:
return '虚拟业务';
default:
return '';
}
}
}, {
prop: "sort",
label: "排序",
prop: "createTime",
label: "创建时间",
sortable: true,
align: 'center'
}, {
prop: "remark",
label: "备注",
sortable: true,
align: 'center'
}],
... ... @@ -117,7 +98,7 @@ export default {
return a.sort - b.sort
})
dataVal.tableData = tableData;
dataVal.tableData = list;
dataVal.count = count;
}
})
... ...