修改bug

src/views/archi-intelligence-search/index.vue

@@ -14,7 +14,7 @@
 			</el-tree>
 		</div>
 		<div class="right_container">
-			<div id="main" style="width: 100%;height: 100%;"></div>
+			<div id="echartsContainer" style="width: 100%;height: 100%;"></div>
 		</div>
 	</div>
 </template>
@@ -39,7 +39,7 @@ export default {
 	},
 	methods: {
 		echarts1(seriesData, linkData) {
-			this.myChart = echarts.init(document.getElementById('main'));
+			this.myChart = echarts.init(document.getElementById('echartsContainer'));
 
 			var option = {
 				tooltip: { 

src/views/archiAssetVisualShow/index.vue

@@ -11,7 +11,7 @@
 			ref="tree">
 		</el-tree>
 		<div class="right_container">
-
+			<div id="echartsContainer" style="width: 800px;height: 500px;"></div>
 		</div>
 	</div>
 </template>
@@ -36,13 +36,42 @@ export default {
 				{ id: 'DATA', name: '数据架构', children: [] },
 				{ id: 'TECH', name: '技术架构', children: [] },
 				{ id: 'SAFE', name: '安全架构', children: [] }
-			]
+			],
+			myChart: null
 		};
 	},
 	mounted(){
 		this.getTreeData('BUSI');
+		this.echarts1();
 	},
 	methods: {
+		echarts1(seriesData, linkData) {
+			this.myChart = echarts.init(document.getElementById('echartsContainer'));
+
+			var option = {
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'shadow'
+					}
+				},
+				xAxis: {
+					type: 'category',
+					data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+				},
+				yAxis: {
+					type: 'value'
+				},
+				series: [
+					{
+					data: [120, 200, 150, 80, 70, 110, 130],
+					type: 'bar'
+					}
+				]
+			};
+
+			this.myChart.setOption(option);
+		},
 		getTreeData(type) {//查询左侧树
 			const params = {
 				"assetEnum": type
@@ -78,10 +107,14 @@ export default {
 		width: 300px;
 		height: 100%;
 		overflow-y: auto;
+		border-right: 1px solid #ccc;
 	}
 	.right_container{
 		width: calc(100% - 300px);
 		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 	}
 	/deep/ .is-leaf {
 		background-color: #fff !important;

src/views/archiViewConfig/index.vue

@@ -89,9 +89,10 @@
 						<span >{{dicObj.state[scope.row.state]}}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="360" align="center">
+				<el-table-column label="操作" width="440" align="center">
 					<template  slot-scope="scope">
 						<div style="display: flex;align-items: center;justify-content: center;">
+							<el-button type="primary" icon="el-icon-view" size="mini" @click="operate('view',scope.row)">查看</el-button>
 							<el-button type="primary" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
 							<el-button type="primary" icon="el-icon-upload2" size="mini" @click="operate('pushEdit',scope.row)" :disabled="scope.row.state == 1">发布</el-button>
 							<el-button class="tingYong_btn" icon="el-icon-remove-outline" size="mini" @click="operate('stop',scope.row)" :disabled="scope.row.state != 1">停用</el-button>
@@ -123,10 +124,10 @@
 				<el-form :model="formData" :rules="rules" ref="viewForm">
 					<div class="form_item_container">
 						<el-form-item class="cross" label="架构视图名称:" prop="viewName">
-							<el-input v-model="formData.viewName" maxlength="100"></el-input>
+							<el-input v-model="formData.viewName" maxlength="100" :disabled="true"></el-input>
 						</el-form-item>
 						<el-form-item class="cross" label="架构大类:" prop="archiStage">
-							<el-select v-model="formData.archiStage" placeholder="请选择" clearable>
+							<el-select v-model="formData.archiStage" placeholder="请选择" clearable :disabled="true">
 								<el-option label="总体架构" :value="1"></el-option>
                 				<el-option label="系统架构" :value="2" ></el-option>
                 				<el-option label="概设架构" :value="3" ></el-option>
@@ -754,6 +755,41 @@ export default {
 				this.transferValue1 = [];
 				this.formData.relName = null;
 				this.transferValue2 = [];
+			}else if(type == 'view') {
+				this.title = "查看架构视图";
+				this.add_dialog = true;
+				this.resetForm();
+
+				this.viewId = item.viewId;
+				this.getDicyTable();
+				this.formData = item;
+
+				this.transferValue1 = this.formData.archiEleId.split(",").map(item => Number(item));
+				let tableData1Key = [];
+				this.tableData1.forEach(item => {
+					tableData1Key.push(item.key);
+				})
+				this.leftDefaultChecked1 = tableData1Key.filter(v => !this.transferValue1.find(item => item === v));
+
+				this.transferValue2 = this.formData.archiEleRelId.split(",").map(item => Number(item));
+				let tableData1Key2 = [];
+				this.tableData2.forEach(item => {
+					tableData1Key2.push(item.key);
+				})
+				this.leftDefaultChecked2 = tableData1Key2.filter(v => !this.transferValue2.find(item => item === v));
+
+				if (item.eleName) {
+					this.selectData1 = item.eleName.split(",");
+				}
+				if (item.archiEleId) {
+					this.selectData2 = item.archiEleId.split(",");
+				}
+				if (item.relName) {
+					this.selectData3 = item.relName.split(",");
+				}
+				if (item.archiEleRelId) {
+					this.selectData4 = item.archiEleRelId.split(",");
+				}
 			}else if (type == "edit") {
 				this.add_dialog = true;
 				this.title = "编辑架构视图";

src/views/documentEdit/index.vue

@@ -158,7 +158,19 @@ export default {
 			editor: null,
             editorHtml: '<div></div>',
             toolbarConfig: { },
-            editorConfig: { placeholder: '请输入内容...' },
+            editorConfig: { 
+				placeholder: '请输入内容...',
+				MENU_CONF: {
+					uploadImage: {
+						server: '/api/file/oss/upload',
+						fieldName: 'file',
+    					allowedFileTypes: ['image/*'],
+						metaWithUrl: true, // 参数拼接到 url 上
+						maxFileSize: 1000 * 1024 * 1024, //1g //设置大点 不然图片过大会报错
+						base64LimitSize: 1000000 * 1024,
+					}
+				}
+			},
             mode: 'default', // or 'simple
 		};
 	},

src/views/summaryArchiDesign/index.vue

@@ -416,8 +416,8 @@ export default {
 		getArchiGraph() {//查询综合图
 			return new Promise((resolve, reject) => {
 				const params = {
-					// archiAssetState: 2,
-					// archiStage: 2,
+					archiAssetState: 2,
+					archiStage: 2,
 					delFlag: 0,
 					state: 1,
 					archiBelongId: this.graphGroup,

src/views/systemArchiViewDesign/index.vue

@@ -332,7 +332,7 @@ export default {
 		},
 		getTreeData() {//获取树节点内容
 			const params = {
-				archiStage: 2
+				archiStage: 2,
 			}
 			getArchiViewManage(params).then(res => {
 				if(res.code == 200) {
@@ -409,8 +409,8 @@ export default {
 		getArchiGraph() {//查询综合图
 			return new Promise((resolve, reject) => {
 				const params = {
-					// archiAssetState: 2,
-					// archiStage: 2,
+					archiAssetState: 2,
+					archiStage: 2,
 					delFlag: 0,
 					state: 1,
 					archiBelongId: this.graphGroup,