monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 2a6de723fb1175f1e03e580d68d94b4e177f9bef 1 parent e590b58e

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

Inline Side-by-side
Showing 16 changed files with 29 additions and 63 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 <cm-table-page :columns="columns" 39 <cm-table-page :columns="columns"
40 :dataList="resourceData" 40 :dataList="resourceData"
41 :total="count" 41 :total="count"
42 - :layout="'total, prev,pager,next,sizes, jumper'"  
43 :pageSize="search.limit" 42 :pageSize="search.limit"
44 @loaddata="loadTableDataList" 43 @loaddata="loadTableDataList"
45 @selectionChange="selectionChange" 44 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <cm-table-page :columns="data.columns" 27 <cm-table-page :columns="data.columns"
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :total="data.count" 29 :total="data.count"
30 - :pageSize="pageSize" 30 + :pageSize="data.searchParams.limit"
31 @loaddata="loadTableDataList" 31 @loaddata="loadTableDataList"
32 @selectionChange="selectionChange" 32 @selectionChange="selectionChange"
33 :showIndex="true" 33 :showIndex="true"
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -44,7 +44,6 @@ @@ -44,7 +44,6 @@
44 <cm-table-page :columns="columns" 44 <cm-table-page :columns="columns"
45 :dataList="resourceData" 45 :dataList="resourceData"
46 :total="count" 46 :total="count"
47 - :layout="'total, prev,pager,next,sizes, jumper'"  
48 :pageSize="search.limit" 47 :pageSize="search.limit"
49 @loaddata="loadTableDataList" 48 @loaddata="loadTableDataList"
50 @selectionChange="selectionChange" 49 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
42 <cm-table-page :columns="columns" 42 <cm-table-page :columns="columns"
43 :dataList="resourceData" 43 :dataList="resourceData"
44 :total="count" 44 :total="count"
45 - :layout="'total, prev,pager,next,sizes, jumper'"  
46 :pageSize="search.limit" 45 :pageSize="search.limit"
47 @loaddata="loadTableDataList" 46 @loaddata="loadTableDataList"
48 @selectionChange="selectionChange" 47 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -39,7 +37,7 @@ export default { @@ -39,7 +37,7 @@ export default {
39 resType: '', 37 resType: '',
40 keyword: '', 38 keyword: '',
41 page: 1, 39 page: 1,
42 - limit: 20, 40 + limit: 50,
43 }); 41 });
44 let resTypeOptions=Vue.ref([]) 42 let resTypeOptions=Vue.ref([])
45 const columns = [ 43 const columns = [
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
42 <cm-table-page :columns="columns" 42 <cm-table-page :columns="columns"
43 :dataList="resourceData" 43 :dataList="resourceData"
44 :total="count" 44 :total="count"
45 - :layout="'total, prev,pager,next,sizes, jumper'"  
46 :pageSize="search.limit" 45 :pageSize="search.limit"
47 @loaddata="loadTableDataList" 46 @loaddata="loadTableDataList"
48 @selectionChange="selectionChange" 47 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -43,7 +41,7 @@ export default { @@ -43,7 +41,7 @@ export default {
43 resType: '', 41 resType: '',
44 keyword: '', 42 keyword: '',
45 page: 1, 43 page: 1,
46 - limit: 20, 44 + limit: 50,
47 }); 45 });
48 let resTypeOptions=Vue.ref([]) 46 let resTypeOptions=Vue.ref([])
49 const columns = [ 47 const columns = [
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
29 <cm-table-page :columns="columns" 29 <cm-table-page :columns="columns"
30 :dataList="resourceData" 30 :dataList="resourceData"
31 :total="count" 31 :total="count"
32 - :layout="'total, prev,pager,next,sizes, jumper'"  
33 :pageSize="search.limit" 32 :pageSize="search.limit"
34 @loaddata="loadTableDataList" 33 @loaddata="loadTableDataList"
35 @selectionChange="selectionChange" 34 @selectionChange="selectionChange"
@@ -28,8 +28,6 @@ export default { @@ -28,8 +28,6 @@ export default {
28 let count = Vue.ref(0); 28 let count = Vue.ref(0);
29 //列表高度 29 //列表高度
30 let height = Vue.ref(window.innerHeight); 30 let height = Vue.ref(window.innerHeight);
31 - //列表分页  
32 - let limit = Vue.ref(400);  
33 //加载 31 //加载
34 let loading = Vue.ref(true); 32 let loading = Vue.ref(true);
35 //选中数据 33 //选中数据
@@ -38,7 +36,7 @@ export default { @@ -38,7 +36,7 @@ export default {
38 resType: '', 36 resType: '',
39 keyword: '', 37 keyword: '',
40 page: 1, 38 page: 1,
41 - limit: 20, 39 + limit: 50,
42 }); 40 });
43 const columns = [ 41 const columns = [
44 { 42 {
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 :dataList="data.tableData" 28 :dataList="data.tableData"
29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }" 29 :treeProps="{ children: 'children', hasChildren: 'hasChildren' }"
30 :total="data.count" 30 :total="data.count"
31 - :pageSize="pageSize" 31 + :pageSize="data.searchParams.limit"
32 @loaddata="loadTableDataList" 32 @loaddata="loadTableDataList"
33 @selectionChange="selectionChange" 33 @selectionChange="selectionChange"
34 :showIndex="true" 34 :showIndex="true"
@@ -29,60 +29,41 @@ export default { @@ -29,60 +29,41 @@ export default {
29 userDialogFlag : false, 29 userDialogFlag : false,
30 count: 0, 30 count: 0,
31 columns: [{ 31 columns: [{
32 - prop: "busTypeName", 32 + prop: "topoName",
33 label: "名称", 33 label: "名称",
34 width: "250", 34 width: "250",
35 sortable: true, 35 sortable: true,
36 align: 'center' 36 align: 'center'
37 - }, {  
38 - prop: "nickname",  
39 - label: "负责人",  
40 - width: "120",  
41 - sortable: true,  
42 - align: 'center'  
43 - }, {  
44 - prop: "busTypeDesc",  
45 - label: "业务描述",  
46 - width: "200",  
47 - sortable: true,  
48 - align: 'center'  
49 - }, {  
50 - prop: "isUse",  
51 - label: "是否使用", 37 + },
  38 + {
  39 + prop: "isDefault",
  40 + label: "默认状态",
52 sortable: true, 41 sortable: true,
53 align: 'center', 42 align: 'center',
54 render: (row) => { 43 render: (row) => {
55 - switch (row.isUse) { 44 + //1是默认，0为非默认
  45 + switch (row.isDefault) {
56 case 0: 46 case 0:
57 - return '否'; 47 + return '非默认';
58 case 1: 48 case 1:
59 - return '是'; 49 + return '默认';
60 default: 50 default:
61 return ''; 51 return '';
62 } 52 }
63 } 53 }
64 }, { 54 }, {
65 - prop: "important",  
66 - label: "重要程度", 55 + prop: "createUser",
  56 + label: "创建人",
67 sortable: true, 57 sortable: true,
68 align: 'center', 58 align: 'center',
69 - render: (row) => {  
70 - switch (row.important) {  
71 - case 1:  
72 - return '核心';  
73 - case 2:  
74 - return '重要';  
75 - case 3:  
76 - return '一般';  
77 - case 9:  
78 - return '虚拟业务';  
79 - default:  
80 - return '';  
81 - }  
82 - }  
83 }, { 59 }, {
84 - prop: "sort",  
85 - label: "排序", 60 + prop: "createTime",
  61 + label: "创建时间",
  62 + sortable: true,
  63 + align: 'center'
  64 + }, {
  65 + prop: "remark",
  66 + label: "备注",
86 sortable: true, 67 sortable: true,
87 align: 'center' 68 align: 'center'
88 }], 69 }],
@@ -117,7 +98,7 @@ export default { @@ -117,7 +98,7 @@ export default {
117 return a.sort - b.sort 98 return a.sort - b.sort
118 }) 99 })
119 100
120 - dataVal.tableData = tableData; 101 + dataVal.tableData = list;
121 dataVal.count = count; 102 dataVal.count = count;
122 } 103 }
123 }) 104 })