Commit c17590d1 by 史敦盼

Merge branch 'sdp-v1'

2 parents fb95f916 76da2296
......@@ -218,7 +218,7 @@ import $ from 'jquery'
import GraphGallery from '@/components/graphGallery.vue'
export default {
name: 'ArchiViewManage',
name: 'archiViewManage',
components: {
GraphGallery,
},
......
......@@ -193,13 +193,13 @@
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
<!-- <el-table-column
prop="relName"
label="元素关系范围"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
></el-table-column> -->
<el-table-column
prop="version"
label="版本"
......@@ -381,7 +381,7 @@
<el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
</el-table> -->
</div>
<div class="dialog_form_item">
<!-- <div class="dialog_form_item">
<div class="dialog_form_item_title">
<span class="reqIcon">*</span>元素关系范围
</div>
......@@ -392,13 +392,7 @@
v-if="title == '查看架构视图' ? false : true"
>添加</el-button
>
<!-- <el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2">
<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="rsName" label="元素关系名称" align="center"></el-table-column>
</el-table> -->
</div>
</div> -->
<div
style="text-align: right; margin: 20px 0 10px 0; width: 96%"
v-if="title != '新建架构视图'"
......@@ -1205,10 +1199,10 @@ export default {
this.$message.error('请勾选元素范围')
return
}
if (!this.formData.relName) {
this.$message.error('请勾选元素关系范围')
return
}
// if (!this.formData.relName) {
// this.$message.error('请勾选元素关系范围')
// return
// }
this.formData.state = 2
// 赋值
......@@ -1254,10 +1248,10 @@ export default {
this.$message.error('请勾选元素范围')
return
}
if (!this.formData.relName) {
this.$message.error('请勾选元素关系范围')
return
}
// if (!this.formData.relName) {
// this.$message.error('请勾选元素关系范围')
// return
// }
this.formData.state = 1
// this.formData.eleName = this.selectData1.join(",");
// this.formData.archiEleId = this.selectData2.join(",");
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!