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

src/router/index.js

@@ -130,6 +130,11 @@ const routes = [
 				name: 'archiAssetManage',
 				component: () => import('@/views/archi-asset-manage/index.vue'),
 			},
+			{
+				path: '/main/comCenterServeList/',//企业中台服务清单
+				name: 'comCenterServeList',
+				component: () => import('@/views/comCenterServeList/index.vue'),
+			},
 		]
 	}
 ]

src/views/Main/index.vue

@@ -84,7 +84,7 @@
 							<img src="@/assets/main/3img.png" alt="">
 							<span style="margin-left: 5px;">总体架构资产管理</span>
 						</div>
-						<div class="menu_1_item_subtitle">
+						<div class="menu_1_item_subtitle" @click="jumpPage('总体架构资产设计与维护', '总体架构资产维护', '企业中台服务清单')">
 							<img src="@/assets/main/3img.png" alt="">
 							<span style="margin-left: 5px;">企业中台服务清单</span>
 						</div>
@@ -587,6 +587,10 @@
 						this.$router.push( '/main/archiAssetManage', () => {}, () => {} );
 						this.visible1 = false;
 						break;
+					case '企业中台服务清单':
+						this.$router.push( '/main/comCenterServeList', () => {}, () => {} );
+						this.visible1 = false;
+						break;
 				}
 			}
 		}

src/views/archi-asset-manage/index.vue

@@ -32,7 +32,11 @@
 				<el-table-column type="selection" width="55"></el-table-column>
 				<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
 				<el-table-column prop="assetName" label="业务组件名称" align="center"></el-table-column>
-				<el-table-column prop="assetType" label="业务组件类型" align="center"></el-table-column>
+				<el-table-column prop="assetType" label="业务组件类型" align="center">
+					<template slot-scope="scope">
+						<span >{{dicObj.eleLtId[scope.row.assetType]}}</span>
+					</template>
+				</el-table-column>
 				<el-table-column prop="parentAssetName" label="上级业务组件" align="center"></el-table-column>
 				<el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
 				<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
@@ -115,6 +119,8 @@ import {
 	getArchiAssetManageList,
 	getArchiAssetManageAdd,
 	getArchiAssetManageUpdate,
+	getEleList,
+
 	getDianXingAnLiSelectData,
 	getTypicalExampleList,
 	getTypicalExampleAdd,
@@ -217,6 +223,7 @@ export default {
 				prjType: {},
 				problemType: {},
 				problemLevel: {},
+				eleLtId: {},
 			},
 		};
 	},
@@ -226,15 +233,12 @@ export default {
 		})
 		this.set_table_height();
 
+		// 获取元素列表
+		this.getYuansuList();
+
 		// 初始化查询列表
 		this.getList();
 
-		// 获取元素列表
-		// this.get_an_li_lei_xing_select();
-		// this.get_wen_ti_lei_xing_select();
-		// this.get_xiang_mu_lei_xing_select();
-		// this.get_wen_ti_deng_ji_select();
-
 	},
 	methods: {
 		// 查询列表
@@ -369,45 +373,17 @@ export default {
 			})
 		},
 
-		get_an_li_lei_xing_select() {//案例类型下拉
-			const params = {
-					key: "kl_case_type"
-				}
-				getDianXingAnLiSelectData(params).then(res => {
-					if(res.code == 200) {
-						this.selectData1 = res.data;
-					}
-				})
-		},
-		get_wen_ti_lei_xing_select() {//问题类型下拉
-			const params = {
-					key: "kl_question_type"
-				}
-				getDianXingAnLiSelectData(params).then(res => {
-					if(res.code == 200) {
-						this.selectData2 = res.data;
-					}
-				})
-		},
-		get_xiang_mu_lei_xing_select() {//项目类型下拉
-			const params = {
-					key: "kl_project_type"
-				}
-				getDianXingAnLiSelectData(params).then(res => {
-					if(res.code == 200) {
-						this.selectData3 = res.data;
-					}
+		// 获取元素列表
+		getYuansuList() {
+			getEleList().then(res => {
+				if (res.code == 200) {
+					this.eleList = res.data;
+					this.eleList.forEach(item=>{
+						this.dicObj.eleLtId[item.elementId] = item.elementName;
 					})
-		},
-		get_wen_ti_deng_ji_select() {//问题等级下拉
-			const params = {
-					key: "kl_question_level"
+					console.log(this.dicObj.eleLtId);
 				}
-				getDianXingAnLiSelectData(params).then(res => {
-					if(res.code == 200) {
-						this.selectData4 = res.data;
-					}
-				})
+			});
 		},
 		
 		set_table_height() {//动态设置表格高度