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) {
 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) {
 export function get_yuan_mo_xing_list(params) {

src/views/archiViewConfig/index.vue

@@ -12,6 +12,8 @@
 						<el-select v-model="params.archiStage" placeholder="请选择" clearable class="search_item">
 						<el-select v-model="params.archiStage" placeholder="请选择" clearable class="search_item">
                 			<el-option label="总体架构" :value="1"></el-option>
                 			<el-option label="总体架构" :value="1"></el-option>
                 			<el-option label="系统架构" :value="2" ></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-select>
 					</div>
 					</div>
 					<div class="search_menu_item">
 					<div class="search_menu_item">
@@ -64,6 +66,8 @@
 					<template slot-scope="scope">
 					<template slot-scope="scope">
 						<span v-if="scope.row.archiStage == 1">总体架构</span>
 						<span v-if="scope.row.archiStage == 1">总体架构</span>
 						<span v-else-if="scope.row.archiStage == 2">系统架构</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>
 					</template>
 				</el-table-column>
 				</el-table-column>
 				<el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
 				<el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
@@ -125,6 +129,8 @@
 							<el-select v-model="formData.archiStage" placeholder="请选择" clearable>
 							<el-select v-model="formData.archiStage" placeholder="请选择" clearable>
 								<el-option label="总体架构" :value="1"></el-option>
 								<el-option label="总体架构" :value="1"></el-option>
                 				<el-option label="系统架构" :value="2" ></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-select>
 						</el-form-item>
 						</el-form-item>
 						<el-form-item class="cross" label="架构层次:" prop="archiLevelId">
 						<el-form-item class="cross" label="架构层次:" prop="archiLevelId">