Commit f449fb46 by Thews

20231213汪皖苏

1 parent f1104ee5
...@@ -48,11 +48,8 @@ ...@@ -48,11 +48,8 @@
<el-table :data="tableData" stripe border @selection-change="handleSelectionChange" height="450"> <el-table :data="tableData" stripe border @selection-change="handleSelectionChange" height="450">
<el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="rsName" label="元素关系名称" width="180" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
<el-table-column prop="object1" label="对象1" width="180" align="center"></el-table-column> <el-table-column prop="content" label="关系描述" align="center"></el-table-column>
<el-table-column prop="object2" label="对象2" width="180" align="center"></el-table-column>
<el-table-column prop="scope" label="适用范围" width="180" align="center"></el-table-column>
<el-table-column prop="content" label="关系描述" width="180" align="center"></el-table-column>
<el-table-column label="图标" align="center" width="100"> <el-table-column label="图标" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableIcon"> <div class="tableIcon">
...@@ -64,35 +61,20 @@ ...@@ -64,35 +61,20 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="version" label="版本" width="180" align="center"></el-table-column> <el-table-column prop="version" label="版本" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span> <span >{{dicObj.state[scope.row.state]}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="360" align="center"> <el-table-column label="操作" width="400" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<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-view" size="mini" @click="operate('view',scope.row)">查看</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-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-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> <el-button icon="el-icon-delete" size="mini" @click="operate('del',scope.row)" :disabled="scope.row.state != 2">删除</el-button>
<!-- <div class="add_btn" @click="operate('edit',scope.row)" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/编辑_icon_default.png" alt="" />
<p>编辑</p>
</div>
<div class="reset_btn" @click="operate('stop',scope.row)" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/停用_icon_default.png" alt="" />
<p>停用</p>
</div>
<div class="add_btn" @click="operate('push',scope.row)" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/发布_icon_default.png" alt="" />
<p>发布</p>
</div>
<div class="reset_btn" @click="operate('del',scope.row)" style="border: 0;">
<img class="btn_icon" src="@/assets/删除_icon_default.png" alt="" />
<p>删除</p>
</div> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -115,15 +97,15 @@ ...@@ -115,15 +97,15 @@
:center="false" :center="false"
width="50%"> width="50%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_form_item" v-if="openType != 'view'">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系名称</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系名称</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input> <el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item" v-if="openType != 'view'">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系描述</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input> <el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</div> </div>
<div class="dialog_form_item3"> <div class="dialog_form_item3" v-if="openType != 'view'">
<div class="dialog_form_item_title">图标设置</div> <div class="dialog_form_item_title">图标设置</div>
<div> <div>
<div class="dialog_form_item3_content1"> <div class="dialog_form_item3_content1">
...@@ -172,7 +154,7 @@ ...@@ -172,7 +154,7 @@
<div class="label">适用范围</div> <div class="label">适用范围</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="item.name3" :disabled="true"></el-input> <el-input placeholder="" class="dialog_form_item_content" v-model="item.name3" :disabled="true"></el-input>
</div> </div>
<div class="newBtn"> <div class="newBtn" v-if="openType != 'view'">
<el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="tableData2.length == index+1"></el-button> <el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="tableData2.length == index+1"></el-button>
<el-button class="addItem" icon="el-icon-minus" circle @click="operateDia('del')" v-else></el-button> <el-button class="addItem" icon="el-icon-minus" circle @click="operateDia('del')" v-else></el-button>
</div> </div>
...@@ -180,7 +162,7 @@ ...@@ -180,7 +162,7 @@
</div> </div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer" v-if="openType != 'view'">
<el-button class="greenButton" @click="operate('pushAdd')">发布</el-button> <el-button class="greenButton" @click="operate('pushAdd')">发布</el-button>
<el-button class="greenButton" @click="operate('create')">保存</el-button> <el-button class="greenButton" @click="operate('create')">保存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
...@@ -327,6 +309,10 @@ export default { ...@@ -327,6 +309,10 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑关系元素"; this.title = "编辑关系元素";
this.formData = item; this.formData = item;
}else if (type == "view") {
this.add_dialog = true;
this.title = "查看关系元素";
this.formData = item;
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.formData.state = 2;
if (this.formData.eleRelaId) { if (this.formData.eleRelaId) {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">架构归属</span> <span class="search_title">架构归属</span>
<el-select v-model="params.archIBelongId" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.archIBelongId" placeholder="请选择" clearable class="search_item">
<el-option v-for="item in search_select1" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option> <el-option v-for="item in search_select2" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -36,8 +36,18 @@ ...@@ -36,8 +36,18 @@
<el-table :data="tableData" stripe border height="450"> <el-table :data="tableData" stripe border height="450">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="elementName" label="元素名称" align="center"></el-table-column> <el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
<el-table-column prop="archiLevelName" label="架构层次" align="center"></el-table-column> <el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
<el-table-column prop="archiBelongName" label="架构归属" align="center"></el-table-column> <template slot-scope="scope">
<span >{{dicObj.schemaLevel[scope.row.archiLevelId]}}</span>
</template>
</el-table-column>
<el-table-column prop="archiBelongId" label="架构归属" width="150" align="center">
<template slot-scope="scope">
<span >{{dicObj.schemaBelong[scope.row.archiBelongId]}}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="archiLevelName" label="架构层次" align="center"></el-table-column>
<el-table-column prop="archiBelongName" label="架构归属" align="center"></el-table-column> -->
<el-table-column prop="content" label="描述" align="center"></el-table-column> <el-table-column prop="content" label="描述" align="center"></el-table-column>
<el-table-column label="图标" align="center"> <el-table-column label="图标" align="center">
<template> <template>
...@@ -87,8 +97,8 @@ ...@@ -87,8 +97,8 @@
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">架构归属</div> <div class="dialog_form_item_title">架构归属</div>
<el-select v-model="formData.archIBelongId" placeholder="" :disabled="true" class="search_item"> <el-select v-model="formData.archiBelongId" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option> <el-option v-for="(item,idnex) in search_select2" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
...@@ -211,6 +221,7 @@ import { ...@@ -211,6 +221,7 @@ import {
getYMXZDGLDel, getYMXZDGLDel,
getYMXZDGLUpdate, getYMXZDGLUpdate,
query_jia_gou_gui_shu, query_jia_gou_gui_shu,
query_jia_gou_ceng_ci,
getYMXZDGLProyList, getYMXZDGLProyList,
getYMXZDGLProyDel, getYMXZDGLProyDel,
getYMXZDGLProyAdd, getYMXZDGLProyAdd,
...@@ -271,6 +282,19 @@ export default { ...@@ -271,6 +282,19 @@ export default {
1: "已发布", 1: "已发布",
2: "暂存", 2: "暂存",
}, },
schemaLevel: {
0: "策略层",
1: "管理层",
2: "设计层",
3: "实施层",
},
schemaBelong: {
3: "业务架构",
4: "应用架构",
5: "数据架构",
6: "技术架构",
7: "安全架构",
},
controlType: { controlType: {
0: "单行文本框", 0: "单行文本框",
1: "多行文本框", 1: "多行文本框",
...@@ -292,6 +316,7 @@ export default { ...@@ -292,6 +316,7 @@ export default {
}, },
], ],
search_select1: [], search_select1: [],
search_select2: [],
selectTypeList: [ selectTypeList: [
{ {
label: "单行文本框", label: "单行文本框",
...@@ -313,9 +338,13 @@ export default { ...@@ -313,9 +338,13 @@ export default {
mounted() { mounted() {
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
this.get_dialog_select2().then(res => { this.get_dialog_select1().then(res => {
this.search_select1 = res; this.search_select1 = res;
}); });
this.get_dialog_select2().then(res => {
this.search_select2 = res;
console.log(this.search_select2);
});
}, },
created() { created() {
...@@ -359,6 +388,7 @@ export default { ...@@ -359,6 +388,7 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑字典"; this.title = "编辑字典";
this.formData = item; this.formData = item;
console.log(this.formData);
this.getProyList(item); this.getProyList(item);
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.formData.state = 2;
...@@ -449,6 +479,18 @@ export default { ...@@ -449,6 +479,18 @@ export default {
return false //不可勾选 return false //不可勾选
} }
}, },
get_dialog_select1() {//查询架构层次下拉框值
return new Promise((resolve, reject) => {
query_jia_gou_ceng_ci({}).then(res => {
if(res.code == 200) {
resolve(res.data);
}else{
reject(res.msg);
}
});
});
},
get_dialog_select2() {//查询架构归属下拉框值 get_dialog_select2() {//查询架构归属下拉框值
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
query_jia_gou_gui_shu({}).then(res => { query_jia_gou_gui_shu({}).then(res => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!