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

src/api/index.js

@@ -71,7 +71,7 @@ export function getJGYSGLDel(params) {
 }
 // 查询画布跳转的表格数据
 export function get_drawio_transform_table(params) {
-    return post('/network/mxFile/fdBmd', params);
+    return post('/network/ma-ml/fdBmd', params);
 }
 // 查询元模型管理页面
 export function get_yuan_mo_xing_list(params) {
@@ -494,4 +494,4 @@ export function queryViewManageQingDan(params) {
 // 总体架构资产智能搜索，左侧树
 export function archiIntelligenceSearchTree(params) {
     return post('/network/arc-ast-cn/assetTree', params);
-}
\ No newline at end of file
+}

src/views/archiViewConfig/index.vue

@@ -12,6 +12,8 @@
 						<el-select v-model="params.archiStage" placeholder="请选择" clearable class="search_item">
                 			<el-option label="总体架构" :value="1"></el-option>
                 			<el-option label="系统架构" :value="2" ></el-option>
+                			<el-option label="概设架构" :value="3" ></el-option>
+                			<el-option label="其他架构" :value="4" ></el-option>
 						</el-select>
 					</div>
 					<div class="search_menu_item">
@@ -64,6 +66,8 @@
 					<template slot-scope="scope">
 						<span v-if="scope.row.archiStage == 1">总体架构</span>
 						<span v-else-if="scope.row.archiStage == 2">系统架构</span>
+						<span v-else-if="scope.row.archiStage == 3">概设架构</span>
+						<span v-else-if="scope.row.archiStage == 4">其他架构</span>
 					</template>
 				</el-table-column>
 				<el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
@@ -125,6 +129,8 @@
 							<el-select v-model="formData.archiStage" placeholder="请选择" clearable>
 								<el-option label="总体架构" :value="1"></el-option>
                 				<el-option label="系统架构" :value="2" ></el-option>
+                				<el-option label="概设架构" :value="3" ></el-option>
+                				<el-option label="其他架构" :value="4" ></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item class="cross" label="架构层次:" prop="archiLevelId">
@@ -471,7 +477,7 @@ export default {
 				Message({
 					type: 'info',
 					message: '已取消'
-				});          
+				});
 			});
 		},
 		openDicyDialog() {//打开字典窗口
@@ -624,7 +630,7 @@ export default {
 		handleSizeChange(val) {
 			this.page.current = 1;
 			this.params.current = 1;
-			
+
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
@@ -829,7 +835,7 @@ export default {
 				this.selectList.map(item => {
 					params.viewId.push(item.viewId)
 				})
-				
+
 				this.$confirm("确认批量发布吗", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
@@ -864,7 +870,7 @@ export default {
 				this.$refs.multipleTable1.clearSelection();
 				this.$refs.multipleTable2.clearSelection();
 			});
-			
+
 			this.selectData1 = [];
 			this.selectData2 = [];
 			this.selectData3 = [];
@@ -1113,4 +1119,4 @@ export default {
 		background-color: #0D867F;
 		color: #fff;
 	}
-</style>
\ No newline at end of file
+</style>