20231212汪皖苏

src/api/index.js

@@ -96,12 +96,12 @@ export function getJGSTPZDel(params) {
 export function getViewNameList(params) {
     return post('/vwDis/getviewName', params);
 }
-// 获取元素范围和包含元素
+// 获取元素和元素关系列表
 export function getEleList(params) {
     return post('/vwDis/gtEleList', params);
 }
-export function getViewList(params) {
-    return post('/vwDis/gtVwEleList', params);
+export function gtEleRelList(params) {
+    return post('/vwDis/gtEleRelList', params);
 }
 
 

src/views/archiViewConfig/index.vue

@@ -96,9 +96,10 @@
 				<div class="dialog_content_1">
 					<div class="dialog_form_item">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构视图名称</div>
-						<el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item">
+						<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
+						<!-- <el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item">
                 			<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
-						</el-select>
+						</el-select> -->
 					</div>
 					<div class="dialog_form_item">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
@@ -118,7 +119,7 @@
 					<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
 				</div>
 				<div class="dialog_form_item">
-					<div class="dialog_form_item_title">*元素范围</div>
+					<div class="dialog_form_item_title">*元素</div>
 					<el-table :data="tableData1" border height="195" @selection-change="handleSelectionChange1">
 						<el-table-column type="selection" width="55"></el-table-column>
 						<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
@@ -126,11 +127,11 @@
 					</el-table>
 				</div>
 				<div class="dialog_form_item">
-					<div class="dialog_form_item_title">*包含元素</div>
+					<div class="dialog_form_item_title">*元素关系</div>
 					<el-table :data="tableData2" 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="name" label="元素名称" align="center"></el-table-column>
+						<el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
 					</el-table>
 				</div>
 			</div>
@@ -153,7 +154,7 @@ import {
   getJGSTPZUpdateBatch,
   getViewNameList,
   getEleList,
-  getViewList,
+  gtEleRelList,
 } from "@/api/index.js";
 
 export default {
@@ -281,9 +282,9 @@ export default {
 
 		// 查询视图下拉
 		this.getViewNameList();
-		// 获取包含元素下拉
+		// 获取元素和元素关系下拉
 		this.getEleList();
-		this.getViewList();
+		this.gtEleRelList();
 	},
 	methods: {
 		// 查询列表
@@ -312,27 +313,11 @@ export default {
 				}
 			});
 		},
-		getViewList() {
-			let params = {
-				archiViewId: "22",
-				archiEleId: "33",
-				eleName: "",
-				type: "2",
-			}
-			getViewList(params).then(res => {
-				this.tableData2 = [];
+		gtEleRelList() {
+			gtEleRelList().then(res => {
 				if (res.code == 200) {
 					console.log(res.data);
-					// this.tableData2 = res.data;
-					let eleName = res.data[0].eleName;
-					let arr = eleName.split(",");
-					arr.map(item => {
-						this.tableData2.push(
-							{
-								name: item,
-							}
-						)
-					});
+					this.tableData2 = res.data;
 				}
 			});
 		},