20231213wangwansu

src/views/archiEleRela/index.vue

@@ -67,7 +67,7 @@
 					<template slot-scope="scope">
 						<div style="display: flex;align-items: center;justify-content: center;">
 							<el-button icon="el-icon-view" size="mini" @click="operate('view',scope.row)">查看</el-button>
-							<el-button icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
+							<!-- <el-button icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button> -->
 							<el-button icon="el-icon-remove-outline" size="mini" @click="operate('stop',scope.row)" :disabled="scope.row.state != 1">停用</el-button>
 							<el-button icon="el-icon-upload2" size="mini" @click="operate('pushEdit',scope.row)" :disabled="scope.row.state == 1">发布</el-button>
 							<el-button icon="el-icon-delete" size="mini" @click="operate('del',scope.row)" :disabled="scope.row.state != 2">删除</el-button>
@@ -147,7 +147,9 @@
 							</div>
 							<div class="formItem">
 								<div class="label">适用范围</div>
-								<el-input placeholder="" class="dialog_form_item_content" v-model="item.scope" :disabled="true"></el-input>
+								<el-select v-model="item.scope" placeholder="请选择" :disabled="true" @change="selectChange1(item,index)">
+									<el-option v-for="(item,idnex) in guishuList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
+								</el-select>
 							</div>
 							<div class="newBtn" v-if="openType != 'view'">
 								<el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="formData.arrList.length == index+1"></el-button>
@@ -172,9 +174,21 @@
 			<div class="add_dialog_content">
 				<el-table :data="formData.arrList" stripe border height="300">
 					<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
-					<el-table-column prop="rsName" label="对象1" align="center"></el-table-column>
-					<el-table-column prop="content" label="对象2" align="center"></el-table-column>
-					<el-table-column prop="version" label="适用范围" align="center"></el-table-column>
+					<el-table-column prop="eleGtId" label="对象1" align="center">
+						<template slot-scope="scope">
+							<span >{{dicObj.eleLtId[scope.row.eleGtId]}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="eleLtId" label="对象2" align="center">
+						<template slot-scope="scope">
+							<span >{{dicObj.eleLtId[scope.row.eleLtId]}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="scope" label="适用范围" align="center">
+						<template slot-scope="scope">
+							<span >{{dicObj.scope[scope.row.scope]}}</span>
+						</template>
+					</el-table-column>
 				</el-table>
 			</div>
 		</el-dialog>
@@ -242,6 +256,17 @@ export default {
 					1: "已发布",
 					2: "暂存",
 				},
+				scope: {
+					0: "架构之间",
+					1: "业务架构",
+					2: "应用架构",
+					3: "数据架构",
+					4: "技术架构",
+					5: "安全架构",
+				},
+				eleLtId: {
+
+				}
 			},
 			stateList: [
 				{
@@ -257,6 +282,32 @@ export default {
 					value: 2,
 				},
 			],
+			guishuList: [
+				{
+					label: "架构之间",
+					value: 0,
+				},
+				{
+					label: "业务架构",
+					value: 1,
+				},
+				{
+					label: "应用架构",
+					value: 2,
+				},
+				{
+					label: "数据架构",
+					value: 3,
+				},
+				{
+					label: "技术架构",
+					value: 4,
+				},
+				{
+					label: "安全架构",
+					value: 5,
+				},
+			],
 			eleList: [],
 			radioName: "",
 			search_select1: [],
@@ -294,6 +345,9 @@ export default {
 			getEleList().then(res => {
 				if (res.code == 200) {
 					this.eleList = res.data;
+					this.eleList.forEach(item=>{
+						this.dicObj.eleLtId[item.elementId] = item.elementName;
+					})
 				}
 			});
 		},
@@ -522,22 +576,22 @@ export default {
 					}
 					this.search_select1.forEach(itemX => {
 						if (lastStr == itemX.belongId) {
-							this.formData.arrList[index].scope = itemX.name;
 							if (itemX.name == "业务架构") {
 								this.formData.arrList[index].scope = 1;
-							}else if (itemX.name == "业务架构") {
-								this.formData.arrList[index].scope = 1;
+							}else if (itemX.name == "应用架构") {
+								this.formData.arrList[index].scope = 2;
+							}else if (itemX.name == "数据架构") {
+								this.formData.arrList[index].scope = 3;
+							}else if (itemX.name == "技术架构") {
+								this.formData.arrList[index].scope = 4;
+							}else if (itemX.name == "安全架构") {
+								this.formData.arrList[index].scope = 5;
 							}
 						}
 					})
 				}
 			}
-			console.log(item,index,this.formData.arrList);
-			console.log(this.eleList,this.search_select1);
-		},
-		selectChange2(item,index){
 		},
-		
 	},
 
 }

src/views/metaModelDic/pages/page3.vue

@@ -49,8 +49,8 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column>
-				<el-table-column prop="let6" label="元素范围" width="150" align="center"></el-table-column>
-				<el-table-column prop="let7" label="包含元素" width="150" align="center"></el-table-column>
+				<el-table-column prop="eleName" label="元素范围" width="150" align="center"></el-table-column>
+				<el-table-column prop="relName" label="包含元素" width="150" align="center"></el-table-column>
 				<el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
 				<el-table-column prop="state" label="状态" align="center">
 					<template slot-scope="scope">