作者 朱兆平

Merge remote-tracking branch 'origin/message_bus' into message_bus

... ... @@ -24,7 +24,7 @@ module.exports = {
},
dev: {
env: require('./dev.env'),
port: 12020,
port: 12021,
autoOpenBrowser: true,
assetsSubDirectory: 'static',
assetsPublicPath: '/',
... ...
... ... @@ -88,6 +88,8 @@ import UserInfo from "./views/bus/UserInfo.vue"
import QueueView from "./views/bus/view/QueueView.vue"
import ExchangeView from "./views/bus/view/ExchangeView.vue"
import ElasticSearchInfo from "./views/bus/ElasticSearchInfo.vue"
import ConfigureS from "./views/bus/Configure.vue"
let routes = [
{
... ... @@ -159,9 +161,9 @@ let routes = [
{path: '/note', component: MessageNote, name: '消息记录管理'},
{path: '/note_search', component: MessageNoteSearch, name: '消息记录搜索'},
{path: '/es', component: ElasticSearchInfo, name: 'ES信息管理'},
{path: '/configures', component: ConfigureS, name: '消息路由批量配置'}
]
},
{
path: '/bus/view',
component: Home,
... ...
<template>
<el-container>
<el-main>
<div style="border: 6px solid #6F8294;">
<el-row style="margin: -2px">
<el-col :span="6">
<el-row class="bt">
<span>选择消息发送端</span>
</el-row>
<el-row>
<el-tree
:data="send"
show-checkbox
node-key="id"
:props="defaultProps">
</el-tree>
</el-row>
</el-col>
<el-col :span="6" align="center">
<el-row class="bt">
<span>选择要发送的消息</span>
</el-row>
<el-row>
<el-tree
:data="ready"
show-checkbox
node-key="id"
:props="defaultProps">
</el-tree>
</el-row>
</el-col>
<el-col :span="6">
<el-row class="bt">
<span>选择消息接收端</span>
</el-row>
<el-row>
<el-tree
:data="send"
show-checkbox
node-key="id"
:props="defaultProps">
</el-tree>
</el-row>
</el-col>
<el-col :span="6">
<el-row class="bt">
<span>消息路由配置其他属性</span>
</el-row>
<el-row>
<el-form :inline="true" :rules="rules" :model="formInline" class="demo-form-inline" align="center" style="border:3px solid #6F8294;height: 800px;padding-top: 15px">
<el-form-item label="路由状态:">
<el-select v-model="formInline.state" placeholder="请选择" style="width: 150px" size="mini">
<el-option label="启用" value="01"></el-option>
<el-option label="关闭" value="02"></el-option>
</el-select>
</el-form-item>
<el-form-item label="路由用途:">
<el-select v-model="formInline.purpose" placeholder="请选择" style="width: 150px" size="mini">
<el-option label="生产用" value="03"></el-option>
</el-select>
</el-form-item>
<el-form-item label="路由描述:">
<el-input type="textarea" v-model="formInline.describe" style="width: 150px" size="mini"></el-input>
</el-form-item>
</el-form>
</el-row>
</el-col>
</el-row>
</div>
</el-main>
</el-container>
</template>
<script>
export default {
name: "Configure",
data() {
return {
formInline: {
state: '',
purpose:'',
describe:''
},
send: [{
id: 1,
label: '代理人系统接收账号(AGTR)',
}, {
id: 2,
label: '代理人接收中外运预配(AGTZ)',
}, {
id: 3,
label: '【测试】舱单自动化解析系统(AMDB)',
}],
ready: [{
id: 1,
label: '航班动态(1)',
children: [{
id: 7,
label: '',
children: [{
id: 8,
label: ''
}, {
id: 9,
label: ''
}]
}]
}, {
id: 2,
label: '航班历史(2)',
children: [{
id: 7,
label: '',
children: [{
id: 8,
label: ''
}, {
id: 9,
label: ''
}]
}]
}, {
id: 3,
label: '卡口业务交换信息(80)',
children: [{
id: 4,
label: '卡口业务数据(KAKO)',
children: [{
id: 5,
label: 'ALL'
}, {
id: 6,
label: '卡口车单绑定关系数据(CARB)'
}]
}]
}],
defaultProps: {
children: 'children',
label: 'label'
}
}
},
methods: {
onSubmit() {
console.log('submit!');
}
}
}
</script>
<style>
.bt {
font-weight: bold;
background-color: #6F8294;
color: #ffffff;
text-align: center
}
.el-col {
margin-right: 0px;
}
.el-tree {
padding-top: 15px;
border:3px solid #6F8294;
height: 800px
}
.el-row .el-col .el-row {
margin-top: 0px;
}
</style>
... ...
... ... @@ -17,52 +17,66 @@
</el-col>
</el-row>
</div>
<div :index="item.msgid+''" v-for="item in messageNote_page.messageNoteList" :key="item.msgid" style="margin-left: 30px;margin-top: 30px">
<el-row>
<el-col :span="4">
<span>消息id:</span>
<el-tag>{{item.msgid}}</el-tag>
</el-col>
<el-col :span="2">
<span>发送人:</span>
<el-tag>{{item.sndr}}</el-tag>
</el-col>
<el-col :span="1">
<span>消息大类:</span>
<el-tag type="success">{{item.btype}}</el-tag>
</el-col>
<el-col :span="1">
<span>消息子类:</span>
<el-tag type="success">{{item.stype}}</el-tag>
</el-col>
<el-col :span="2">
<span>发送时间:</span>
<el-tag>{{item.ddtm}}</el-tag>
</el-col>
<el-col :span="6">
<span>路由接收者:</span>
<template v-for="reciver in item.rcvrs">
<el-tag type="danger">{{reciver.username}}</el-tag>
</template>
<div class="ft" :index="item.msgid+''" v-for="item in messageNote_page.messageNoteList" :key="item.msgid" style="margin-left: 30px;margin-top: 30px">
<el-row style="min-height: 200px">
<el-row>
<el-col :span="7">
<span>消息id:</span>
<el-tag>{{item.msgid}}</el-tag>
</el-col>
<el-col :span="8">
<span>发送时间:</span>
<el-tag>{{item.ddtm}}</el-tag>
</el-col>
</el-col>
<el-col :span="6">
<span>消息接收者:</span>
<template v-for="logitem in item.rcvlog">
<el-tag type="warning">{{logitem.username}} [{{logitem.rvtm}}]</el-tag>
</template>
</el-col>
<el-col :span="2">
<el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="small">查看内容
</el-button>
</el-col>
</el-row>
<el-row>
<el-col style="width: 90%" :span="22">
<el-input v-model="item.msg" readonly type="textarea" :rows="3"></el-input>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<span>发送人:</span>
<el-tag>{{item.sndr}}</el-tag>
</el-col>
<el-col :span="3">
<span>消息大类:</span>
<el-tag type="success">{{item.btype}}</el-tag>
</el-col>
<el-col :span="3">
<span>消息子类:</span>
<el-tag type="success">{{item.stype}}</el-tag>
</el-col>
<el-col :span="4">
<div>
<span>路由接收者:</span>
</div>
<template v-for="reciver in item.rcvrs">
<el-tag type="danger">{{reciver.username}}</el-tag>
</template>
</el-col>
<el-col :span="4">
<div>
<span >消息接收者:</span>
</div>
<template v-for="logitem in item.rcvlog">
<el-tag type="warning">{{logitem.username}} [{{logitem.rvtm}}]</el-tag>
</template>
</el-col>
</el-row>
</el-row>
<div class="sun">
<el-row>
<el-col :span="2">
<el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="small">查看内容
</el-button>
</el-col>
<el-col style="width: 45%;margin-left: -10px" :span="14">
<el-input v-model="item.msg" readonly type="textarea" :rows="3"></el-input>
</el-col>
</el-row>
<el-row>
</el-row>
</div>
<el-divider></el-divider>
</div>
... ... @@ -209,7 +223,7 @@
if (res.code !== '200') {
// 关闭加载
_this.messageNote_loading.listLoading = false;
return _this.$message.error(res.msg);
return _this.$message.error('获取消息收发记录,失败!');
}
// 获取列表数据
_this.messageNote_page.messageNoteList = res.data.content;
... ... @@ -253,5 +267,12 @@
</script>
<style scoped>
.ft{
position: relative;
}
.sun{
position: absolute;
top:100px;
width: 100%;
}
</style>
... ...