Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

src/views/metaModelDic/pages/page1.vue

@@ -38,7 +38,7 @@
 				<el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
 				<el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
           <template slot-scope="scope">
-						<span >{{dicObj.archiLevelId[scope.row.archiLevelId]}}</span>
+            <span>{{ scope.row.archiLevelName }}</span>
           </template>
 				</el-table-column>
 				<el-table-column prop="archiBelongId" label="架构归属" width="150" align="center">
@@ -378,13 +378,17 @@ export default {
 			getYMXZDGLlist(this.params).then(res => {
 				if (res.code == 200) {
 					if(res.data.records.length > 0) {
-						this.get_dialog_select2().then(res2 => {
+            Promise.all([ this.get_dialog_select1(), this.get_dialog_select2() ]).then(res2 => {
+              this.dialog_select1 = res2[0];
+              this.search_select1 = res2[1];
               res.data.records.map(item => {
-								const result = res2.find(item2 => item2.belongId == item.archiBelongId);
-								item['archiBelongName'] = result ? result.name : null;
-							})
-							this.tableData = res.data.records;
+                let result1 = res2[0].find(item2 => item2.levelId == item.archiLevelId);
+                let result2 = res2[1].find(item2 => item2.belongId == item.archiBelongId);
+                item['archiLevelName'] = result1 ? result1.name : '';
+                item['archiBelongName'] = result2 ? result2.name : '';
               });
+              this.tableData = res.data.records;
+            })
 					}else {
 						this.page.total = 0;
 						this.tableData = [];