Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 0a758ede by liuyong
Options

修改bug

1 parent c5939db4
Inline Side-by-side
Showing with 73 additions and 27 deletions
src/views/archi-asset-manage/index.vue
...@@ -1240,11 +1240,18 @@ export default { ...@@ -1240,11 +1240,18 @@ export default {
} }
queryProjectInfoManageTable(params).then((res) => { queryProjectInfoManageTable(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loading3 = false this.loading3 = false
this.tableData3 = res.data.records res.data.records.map(item => {
this.pager3.current = res.data.current const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
this.pager3.total = res.data.total const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
this.pager3.size = res.data.size
item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData3 = res.data.records
this.pager3.current = res.data.current
this.pager3.total = res.data.total
this.pager3.size = res.data.size
} }
}) })
}, },
...@@ -1315,11 +1322,17 @@ export default { ...@@ -1315,11 +1322,17 @@ export default {
} }
querysystemInfoManageTable(params).then((res) => { querysystemInfoManageTable(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loading2 = false this.loading2 = false
this.tableData2 = res.data.records res.data.records.map(item => {
this.pager2.current = res.data.current const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
this.pager2.total = res.data.total const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
this.pager2.size = res.data.size item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records
this.pager2.current = res.data.current
this.pager2.total = res.data.total
this.pager2.size = res.data.size
} }
}) })
}, },
......
src/views/otherArchiDesign/index.vue
...@@ -246,6 +246,8 @@ export default { ...@@ -246,6 +246,8 @@ export default {
}, },
mounted(){ mounted(){
this.getTreeData(); this.getTreeData();
this.getZuZhiDanWei();
this.getYeWuBuMeng();
}, },
methods: { methods: {
operation(type, data) { operation(type, data) {
...@@ -303,8 +305,6 @@ export default { ...@@ -303,8 +305,6 @@ export default {
this.getJianSheLeiXingSelect().then(res => { this.getJianSheLeiXingSelect().then(res => {
this.jianSheLeiXingSelect = res; this.jianSheLeiXingSelect = res;
}); });
this.getZuZhiDanWei();
this.getYeWuBuMeng();
this.get_table2(); this.get_table2();
}, },
getZuZhiDanWei() {//获取组织单位下拉菜单数据 getZuZhiDanWei() {//获取组织单位下拉菜单数据
...@@ -380,6 +380,13 @@ export default { ...@@ -380,6 +380,13 @@ export default {
queryProjectInfoManageTable(params).then(res => { queryProjectInfoManageTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.loading2 = false; this.loading2 = false;
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records; this.tableData2 = res.data.records;
this.pager2.current = res.data.current; this.pager2.current = res.data.current;
this.pager2.total = res.data.total; this.pager2.total = res.data.total;
......
src/views/projectInfoManage/index.vue
...@@ -1160,11 +1160,18 @@ export default { ...@@ -1160,11 +1160,18 @@ export default {
} }
queryProjectInfoManageTable(params).then((res) => { queryProjectInfoManageTable(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loading3 = false this.loading3 = false
this.tableData3 = res.data.records res.data.records.map(item => {
this.pager3.current = res.data.current const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
this.pager3.total = res.data.total const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
this.pager3.size = res.data.size
item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData3 = res.data.records
this.pager3.current = res.data.current
this.pager3.total = res.data.total
this.pager3.size = res.data.size
} }
}) })
}, },
...@@ -1335,11 +1342,17 @@ export default { ...@@ -1335,11 +1342,17 @@ export default {
} }
querysystemInfoManageTable(params).then((res) => { querysystemInfoManageTable(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loading2 = false this.loading2 = false
this.tableData2 = res.data.records res.data.records.map(item => {
this.pager2.current = res.data.current const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
this.pager2.total = res.data.total const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
this.pager2.size = res.data.size item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records
this.pager2.current = res.data.current
this.pager2.total = res.data.total
this.pager2.size = res.data.size
} }
// res.records.map(item => { // res.records.map(item => {
// const startTime_year = String(new Date(item.startTime).getFullYear()); // const startTime_year = String(new Date(item.startTime).getFullYear());
......
src/views/summaryArchiDesign/index.vue
...@@ -247,6 +247,8 @@ export default { ...@@ -247,6 +247,8 @@ export default {
}, },
mounted(){ mounted(){
this.getTreeData(); this.getTreeData();
this.getZuZhiDanWei();
this.getYeWuBuMeng();
}, },
methods: { methods: {
operation(type, data) { operation(type, data) {
...@@ -304,8 +306,6 @@ export default { ...@@ -304,8 +306,6 @@ export default {
this.getJianSheLeiXingSelect().then(res => { this.getJianSheLeiXingSelect().then(res => {
this.jianSheLeiXingSelect = res; this.jianSheLeiXingSelect = res;
}); });
this.getZuZhiDanWei();
this.getYeWuBuMeng();
this.get_table2(); this.get_table2();
}, },
getZuZhiDanWei() {//获取组织单位下拉菜单数据 getZuZhiDanWei() {//获取组织单位下拉菜单数据
...@@ -381,6 +381,13 @@ export default { ...@@ -381,6 +381,13 @@ export default {
queryProjectInfoManageTable(params).then(res => { queryProjectInfoManageTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.loading2 = false; this.loading2 = false;
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records; this.tableData2 = res.data.records;
this.pager2.current = res.data.current; this.pager2.current = res.data.current;
this.pager2.total = res.data.total; this.pager2.total = res.data.total;
......
src/views/systemArchiViewDesign/index.vue
...@@ -240,6 +240,8 @@ export default { ...@@ -240,6 +240,8 @@ export default {
}, },
mounted(){ mounted(){
this.getTreeData(); this.getTreeData();
this.getZuZhiDanWei();
this.getYeWuBuMeng();
}, },
methods: { methods: {
operation(type, data) { operation(type, data) {
...@@ -316,10 +318,7 @@ export default { ...@@ -316,10 +318,7 @@ export default {
this.getJianSheLeiXingSelect().then(res => { this.getJianSheLeiXingSelect().then(res => {
this.jianSheLeiXingSelect = res; this.jianSheLeiXingSelect = res;
}); });
this.getZuZhiDanWei();
this.getYeWuBuMeng();
this.get_table2(); this.get_table2();
}, },
getZuZhiDanWei() {//获取组织单位下拉菜单数据 getZuZhiDanWei() {//获取组织单位下拉菜单数据
getOrgOption().then(res => { getOrgOption().then(res => {
...@@ -394,6 +393,13 @@ export default { ...@@ -394,6 +393,13 @@ export default {
querysystemInfoManageTable(params).then(res => { querysystemInfoManageTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.loading2 = false; this.loading2 = false;
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records; this.tableData2 = res.data.records;
this.pager2.current = res.data.current; this.pager2.current = res.data.current;
this.pager2.total = res.data.total; this.pager2.total = res.data.total;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!