Commit 88907b82 by Thews

20231208汪皖苏

1 parent cbdce38e
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<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-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('push',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;"> <!-- <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="" /> <img class="btn_icon" src="@/assets/编辑_icon_default.png" alt="" />
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operate('push')">发布</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>
</span> </span>
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0, //总条数
}, },
dicObj: { dicObj: {
state: { state: {
...@@ -212,9 +212,8 @@ export default { ...@@ -212,9 +212,8 @@ export default {
} }
getJGYSGLlist(this.params).then(res => { getJGYSGLlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; this.page.total = res.data.total;
// this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData = res.data;
} }
}); });
}, },
...@@ -271,7 +270,7 @@ export default { ...@@ -271,7 +270,7 @@ export default {
} }
}); });
} }
}else if (type == "push") { }else if (type == "pushAdd") {
this.formData.state = 1; this.formData.state = 1;
if (this.formData.eleRelaId) { if (this.formData.eleRelaId) {
// 编辑发布 // 编辑发布
...@@ -292,6 +291,17 @@ export default { ...@@ -292,6 +291,17 @@ export default {
} }
}); });
} }
}else if (type == "pushEdit") {
// 编辑发布
this.formData = item
this.formData.state = 1;
getJGYSGLUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("发布成功");
this.add_dialog = false;
this.getList();
}
});
}else if (type == "stop") { }else if (type == "stop") {
// 停用 // 停用
this.formData = item; this.formData = item;
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<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-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('push',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> </div>
</template> </template>
...@@ -109,8 +109,7 @@ ...@@ -109,8 +109,7 @@
</el-select> </el-select>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<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.viewName"></el-input> -->
<el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item"> <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-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</el-select> </el-select>
...@@ -138,7 +137,7 @@ ...@@ -138,7 +137,7 @@
</div> --> </div> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operate('push')">发布</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>
</span> </span>
...@@ -203,7 +202,7 @@ export default { ...@@ -203,7 +202,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0, //总条数
}, },
dicObj: { dicObj: {
state: { state: {
...@@ -295,14 +294,10 @@ export default { ...@@ -295,14 +294,10 @@ export default {
methods: { methods: {
// 查询列表 // 查询列表
getList() { getList() {
// if (this.params.state != '') {
// this.params.state = Number(this.params.state)
// }
getJGSTPZlist(this.params).then(res => { getJGSTPZlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; this.page.total = res.data.total;
// this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData = res.data;
} }
}); });
}, },
...@@ -310,7 +305,6 @@ export default { ...@@ -310,7 +305,6 @@ export default {
getViewNameList() { getViewNameList() {
getViewNameList().then(res => { getViewNameList().then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log(res);
let arr = JSON.parse(res.msg); let arr = JSON.parse(res.msg);
let viewStr = arr[0].viewName; let viewStr = arr[0].viewName;
this.viewNameList = viewStr.split(","); this.viewNameList = viewStr.split(",");
...@@ -371,7 +365,7 @@ export default { ...@@ -371,7 +365,7 @@ export default {
} }
}); });
} }
}else if (type == "push") { }else if (type == "pushAdd") {
this.formData.state = 1; this.formData.state = 1;
if (this.formData.viewId) { if (this.formData.viewId) {
// 编辑发布 // 编辑发布
...@@ -392,6 +386,17 @@ export default { ...@@ -392,6 +386,17 @@ export default {
} }
}); });
} }
}else if (type == "pushEdit") {
// 编辑发布
this.formData = item
this.formData.state = 1;
getJGSTPZUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("发布成功");
this.add_dialog = false;
this.getList();
}
});
}else if (type == "stop") { }else if (type == "stop") {
// 停用 // 停用
this.formData = item; this.formData = item;
......
...@@ -79,13 +79,23 @@ ...@@ -79,13 +79,23 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_content_1">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典名称</div> <div class="dialog_form_item">
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input> <div class="dialog_form_item_title">元素名称</div>
</div> <el-input placeholder="" class="dialog_form_item_content" v-model="formData.elementName" :disabled="true"></el-input>
<div class="dialog_form_item"> </div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典描述</div> <div class="dialog_form_item">
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input> <div class="dialog_form_item_title">架构归属</div>
<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-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">状态</div>
<el-select v-model="formData.state" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in stateList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -143,7 +153,7 @@ export default { ...@@ -143,7 +153,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0, //总条数
}, },
dicObj: { dicObj: {
state: { state: {
...@@ -184,9 +194,8 @@ export default { ...@@ -184,9 +194,8 @@ export default {
getList() { getList() {
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; this.page.total = res.data.total;
// this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData = res.data;
} }
}); });
}, },
...@@ -215,11 +224,7 @@ export default { ...@@ -215,11 +224,7 @@ export default {
// 所有操作 // 所有操作
operate(type,item){ operate(type,item){
this.openType = type; this.openType = type;
if (type == "add") { if (type == "edit") {
this.add_dialog = true;
this.title = "新建字典";
this.resetForm();
}else if (type == "edit") {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑字典"; this.title = "编辑字典";
this.formData = item; this.formData = item;
...@@ -353,6 +358,10 @@ export default { ...@@ -353,6 +358,10 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.dialog_content_1{
display: flex;
justify-content: space-between;
}
.search_menu{ .search_menu{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -84,13 +84,27 @@ ...@@ -84,13 +84,27 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_content_1">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典名称</div> <div class="dialog_form_item">
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input> <div class="dialog_form_item_title">元素关系名称</div>
</div> <el-input placeholder="" class="dialog_form_item_content" v-model="formData.rsName" :disabled="true"></el-input>
<div class="dialog_form_item"> </div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典描述</div> <div class="dialog_form_item">
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input> <div class="dialog_form_item_title">适用范围</div>
<el-select v-model="formData.scope" placeholder="" :disabled="true" class="search_item">
<el-option label="业务架构" value="业务架构"></el-option>
<el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option>
<el-option label="技术架构" value="技术架构"></el-option>
<el-option label="安全架构" value="安全架构"></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">状态</div>
<el-select v-model="formData.state" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in stateList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -147,7 +161,7 @@ export default { ...@@ -147,7 +161,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0, //总条数
}, },
dicObj: { dicObj: {
state: { state: {
...@@ -184,9 +198,8 @@ export default { ...@@ -184,9 +198,8 @@ export default {
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
console.log(res); console.log(res);
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; this.page.total = res.data.total;
// this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData = res.data;
} }
}); });
}, },
...@@ -342,6 +355,10 @@ export default { ...@@ -342,6 +355,10 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.dialog_content_1{
display: flex;
justify-content: space-between;
}
.search_menu{ .search_menu{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -86,13 +86,25 @@ ...@@ -86,13 +86,25 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_content_1">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典名称</div> <div class="dialog_form_item">
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input> <div class="dialog_form_item_title">架构视图名称</div>
</div> <el-select v-model="params.viewName" placeholder="" :disabled="true" class="search_item">
<div class="dialog_form_item"> <el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字典描述</div> </el-select>
<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>
<el-select v-model="formData.schemaLevel" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">架构归属</div>
<el-select v-model="formData.schemaBelong" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -152,7 +164,7 @@ export default { ...@@ -152,7 +164,7 @@ export default {
current: 1, current: 1,
sizes: [10, 20, 50, 100, 200], sizes: [10, 20, 50, 100, 200],
size: 10, size: 10,
total: 20 //总条数 total: 0, //总条数
}, },
dicObj: { dicObj: {
state: { state: {
...@@ -247,9 +259,8 @@ export default { ...@@ -247,9 +259,8 @@ export default {
getList() { getList() {
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; this.page.total = res.data.total;
// this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData = res.data;
} }
}); });
}, },
...@@ -418,6 +429,10 @@ export default { ...@@ -418,6 +429,10 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.dialog_content_1{
display: flex;
justify-content: space-between;
}
.search_menu{ .search_menu{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!