朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 c6b2e43305c25a8e77905b10a4b5e788896cd73d 1 个父辈 9d71ec25

消息控制中心表格更新

内嵌 并排对比
正在显示 9 个修改的文件 包含 136 行增加 和 97 行删除
... ... @@ -6471,7 +6471,7 @@
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
},
"npm": {
... ...
... ... @@ -28,20 +28,22 @@
</el-row>
</div>
<!-- 列表区域 -->
<div style="margin-top: 20px;">
<div style="margin-top: 20px">
<el-row>
<el-col :span="24">
<el-table :data="es_page.esList" border v-loading="es_loading.listLoading"
@selection-change="es_selectChange" size="small"
element-loading-text="获取信息，拼命加载中"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="集群名称" prop="clusterName" align="center" width="200"></el-table-column>
<el-table-column label="节点名称" prop="elasticsearchName" align="center" width="150"></el-table-column>
<el-table-column label="协议" prop="scheme" align="center" width="100"></el-table-column>
<el-table-column label="IP地址" prop="hostname" align="center" width="140"></el-table-column>
<el-table-column label="端口号" prop="port" align="center" width="100"></el-table-column>
<el-table-column label="状态" prop="elasticsearchState" align="center" width="100">
style="border-radius: 10px 10px 0px 0px;line-height: 25px">
<el-table-column type="selection" width="55px" align="center"></el-table-column>
<el-table-column type="index" align="center" width="55px"></el-table-column>
<el-table-column label="集群名称" prop="clusterName" align="center" width="200px"></el-table-column>
<el-table-column label="节点名称" prop="elasticsearchName" align="center" width="100px"></el-table-column>
<el-table-column label="协议" prop="scheme" align="center" width="100px"></el-table-column>
<el-table-column label="IP地址" prop="hostname" align="center" width="140px"></el-table-column>
<el-table-column label="端口号" prop="port" align="center" width="100px"></el-table-column>
<el-table-column label="状态" prop="elasticsearchState" align="center" width="100px">
<template slot-scope="scope">
<span v-if="scope.row.elasticsearchState ===true" style="color: #3742fa">
运行状态
... ... @@ -51,12 +53,12 @@
</span>
</template>
</el-table-column>
<el-table-column label="描述" prop="description" align="center" width="100"></el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="描述" prop="description" align="center" width="300px"></el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<!-- 编辑按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
<el-button type="primary" icon="el-icon-edit" size="mini"
<el-button type="primary" icon="el-icon-edit" size="mini" style="margin-bottom: 2px"
@click="es_toEditDialog(scope.$index,scope.row)">编辑
</el-button>
</el-tooltip>
... ... @@ -71,6 +73,9 @@
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<!--分页区域-->
<div style="margin-top: 10px">
... ...
... ... @@ -25,6 +25,8 @@
</el-row>
<!-- 列表区域 -->
<el-row style="margin-top: 20px;">
<el-row>
<el-col :span="24">
<el-table
:data="page.tableData"
border size="small" row-key="id" default-expand-all
... ... @@ -33,11 +35,11 @@
style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
@selection-change="selsChange" >
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" prop="id" label="ID" align="center"></el-table-column>
<el-table-column type="index" prop="id" label="ID" align="center" width="55"></el-table-column>
<el-table-column label="消息标签" prop="name" align="center" width="220"></el-table-column>
<el-table-column label="消息类型" prop="type" :formatter="formatType" align="center" width="220"></el-table-column>
<el-table-column label="相关描述" prop="des" align="center" width="220"></el-table-column>
<el-table-column label="创建时间" prop="creattime" align="center" width="145"></el-table-column>
<el-table-column label="创建时间" prop="creattime" align="center" width="220"></el-table-column>
<el-table-column label="操作" width="300px" align="center" fixed="right">
<template slot-scope="scope">
<!-- 新增下级-->
... ... @@ -47,17 +49,20 @@
</el-tooltip>
<!-- 编辑按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
<el-button type="primary" icon="el-icon-edit" size="mini"@click="handleEdit(scope.$index, scope.row)">编辑
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑
</el-button>
</el-tooltip>
<!-- 删除按钮-->
<el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
<el-button type="danger" icon="el-icon-delete" size="mini"@click="handleDel(scope.$index, scope.row)">删除
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除
</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">
... ...
... ... @@ -95,6 +95,8 @@
</div>
<!-- 列表区域 -->
<div style="margin-top: 20px;">
<el-row>
<el-col :span="24">
<el-table :data="messageNote_page.messageNoteList" border
v-loading="messageNote_loading.listLoading" size="small"
@selection-change="messageNote_selectChange"
... ... @@ -102,31 +104,31 @@
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
<el-table-column label="消息ID" prop="msgid" align="center" width="120"></el-table-column>
<el-table-column label="消息序号" prop="seqn" align="center" width="150"></el-table-column>
<el-table-column label="发送者" prop="sndr" align="center" width="120"></el-table-column>
<!-- <el-table-column label="发送内容" prop="msg" align="center" width="220"></el-table-column>-->
<el-table-column label="消息大类" prop="btype" align="center" width="100"></el-table-column>
<el-table-column label="消息子类" prop="stype" align="center" width="100"></el-table-column>
<el-table-column label="消息序号" prop="seqn" align="center" width="130"></el-table-column>
<el-table-column label="发送者" prop="sndr" align="center" width="100"></el-table-column>
<!-- <el-table-column label="发送内容" prop="msg" align="center" width="220"></el-table-column>-->
<el-table-column label="消息大类" prop="btype" align="center" width="80"></el-table-column>
<el-table-column label="消息子类" prop="stype" align="center" width="80"></el-table-column>
<el-table-column label="消息发送时间" prop="ddtm" align="center" width="150"></el-table-column>
<el-table-column label="路由接收者" prop="rcvrs" align="center" width="150">
<el-table-column label="路由接收者" prop="rcvrs" align="center" width="120">
<template slot-scope="scope">
<div v-for="reciver in scope.row.rcvrs">{{reciver.username}}</div>
</template>
</el-table-column>
<el-table-column label="消息接收者" prop="rcvlog" align="center" width="250">
<el-table-column label="消息接收者" prop="rcvlog" align="center" width="300">
<template slot-scope="scope">
<div v-for="logitem in scope.row.rcvlog">{{logitem.username}} [{{logitem.rvtm}}]</div>
</template>
</el-table-column>
<!-- <el-table-column label="相关描述" prop="description" align="center" width="220"></el-table-column>-->
<el-table-column label="操作" width="300px" align="center" fixed="right">
<el-table-column label="操作" width="250" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false">-->
<!-- <el-button type="primary" icon="el-icon-view" size="mini"-->
<!-- @click="messageNote_toEditDialog(scope.$index,scope.row)">查看-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false">-->
<!-- <el-button type="primary" icon="el-icon-view" size="mini"-->
<!-- @click="messageNote_toEditDialog(scope.$index,scope.row)">查看-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<el-tooltip effect="dark" content="查看发送内容" placement="top-start" :enterable="false">
<el-button type="success" icon="el-icon-view" size="mini"
... ... @@ -134,15 +136,18 @@
</el-button>
</el-tooltip>
<!-- 删除按钮-->
<!-- <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">-->
<!-- <el-button type="danger" icon="el-icon-delete" size="mini"-->
<!-- :loading="messageNote_loading.delLoading"-->
<!-- @click="messageNote_remove(scope.$index,scope.row)">删除-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">-->
<!-- <el-button type="danger" icon="el-icon-delete" size="mini"-->
<!-- :loading="messageNote_loading.delLoading"-->
<!-- @click="messageNote_remove(scope.$index,scope.row)">删除-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<!--分页区域-->
<div style="margin-top: 10px">
... ...
... ... @@ -45,37 +45,39 @@
</div>
<!-- 列表区域 -->
<div style="margin-top: 20px;">
<el-row>
<el-col :span="24">
<el-table :data="queue_page.queueList" border v-loading="queue_loading.listLoading"
@selection-change="queue_selectChange"
element-loading-text="获取队列列表，拼命加载中" size="small"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column type="index" align="center" width="55" ></el-table-column>
<el-table-column label="队列名称" prop="queueName" align="center"
width="220"></el-table-column>
width="200"></el-table-column>
<el-table-column label="所属用户" prop="username" align="center"
width="220"></el-table-column>
width="200"></el-table-column>
<el-table-column label="分区数量" prop="partitionCount" align="center"
width="220"></el-table-column>
<el-table-column label="相关描述" prop="description" align="center" width="280"></el-table-column>
<!-- <el-table-column label="是否持久化" prop="durability" align="center" width="145">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.durability ===false">否</span>-->
<!-- <span v-if="scope.row.durability ===true">是</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="创建时间" prop="gmtCreate" align="center" width="145">
width="200"></el-table-column>
<el-table-column label="相关描述" prop="description" align="center" width="200"></el-table-column>
<!-- <el-table-column label="是否持久化" prop="durability" align="center" width="145">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.durability ===false">否</span>-->
<!-- <span v-if="scope.row.durability ===true">是</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="创建时间" prop="gmtCreate" align="center" width="200">
</el-table-column>
<!-- <el-table-column label="扩展参数" prop="arguments" align="center" width="200">-->
<!-- </el-table-column>-->
<!-- fixed="right" -->
<el-table-column label="操作" width="225px" align="center" fixed="right">
<el-table-column label="操作" width="220" align="center" fixed="right">
<template slot-scope="scope">
<!-- 编辑按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
<el-button type="primary" icon="el-icon-edit" size="mini"
<el-button type="primary" icon="el-icon-edit" size="mini" style="margin-bottom: 2px"
@click="queue_toEditDialog(scope.$index,scope.row)">编辑
</el-button>
</el-tooltip>
... ... @@ -90,6 +92,9 @@
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<!--分页区域-->
<div style="margin-top: 10px">
... ...
... ... @@ -44,25 +44,29 @@
<el-table-column
prop="sndr"
label="帐户名称"
width="200"
width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="btype"
label="消息大类"
width="100"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="stype"
label="消息子类"
width="100"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="rcvr_topic"
label="订阅主题"
width="150"
width="250"
align="center"
>
<template slot-scope="scope">
<div v-for="reciver in scope.row.rcvrList">
... ... @@ -74,7 +78,8 @@
<el-table-column
prop="filter"
label="过滤规则"
width="350"
width="450"
align="center"
>
<template slot-scope="scope">
<div v-for="reciver in scope.row.rcvrList">
... ... @@ -83,14 +88,13 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column label="操作" width="250px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="delRouter(scope.$index,scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<div class="block">
... ...
... ... @@ -23,13 +23,15 @@
</div>
<!--服务器信息列表区域-->
<div style="margin-top: 20px;">
<el-row>
<el-col :span="24">
<el-table :data="serverList" border v-loading="server_loading.listLoading"
@selection-change="selectChange" size="small"
element-loading-text="获取服务器列表，拼命加载中"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 15px;">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column type="index" align="center" width="55" ></el-table-column>
<el-table-column type="expand">
<template slot-scope="props">
<el-form :inline="true" label-position="left" label-width="110px" align="left">
... ... @@ -51,18 +53,18 @@
<el-tag type="success">{{props.row.serverPort}}</el-tag>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="客户端端口号:">-->
<!-- <el-tag type="success">{{props.row.clientPort}}</el-tag>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="超级用户名称:">-->
<!-- <el-tag type="success">{{props.row.superUsername}}</el-tag>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="客户端端口号:">-->
<!-- <el-tag type="success">{{props.row.clientPort}}</el-tag>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="超级用户名称:">-->
<!-- <el-tag type="success">{{props.row.superUsername}}</el-tag>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="相关描述:">
<el-tag type="success">{{props.row.description}}</el-tag>
... ... @@ -75,17 +77,17 @@
<el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column>
<el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column>
<el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column>
<!-- <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>-->
<!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
<!-- <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>-->
<!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
<el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" width="300" fixed="right">
<template slot-scope="scope">
<!-- &lt;!&ndash; 虚拟主机 &ndash;&gt;-->
<!-- <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false">-->
<!-- <el-button type="warning" icon="el-icon-link" size="mini"-->
<!-- @click="toVirtualHost(scope.$index,scope.row)">虚拟主机-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<!-- &lt;!&ndash; 虚拟主机 &ndash;&gt;-->
<!-- <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false">-->
<!-- <el-button type="warning" icon="el-icon-link" size="mini"-->
<!-- @click="toVirtualHost(scope.$index,scope.row)">虚拟主机-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<!-- 编辑按钮 -->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
<el-button type="primary" icon="el-icon-edit" size="mini"
... ... @@ -102,6 +104,9 @@
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<!--分页区域-->
<div style="margin-top: 10px">
<el-row :gutter="24">
... ...
... ... @@ -37,19 +37,21 @@
</div>
<!-- 列表区域 -->
<div style="margin-top: 20px;">
<!-- 加入表头背景颜色、字体颜色、表格圆角及高度设置-->
<el-row>
<el-col :span="24">
<!-- 加入表头背景颜色、字体颜色、表格圆角及高度设置-->
<el-table :data="user_page.userInfoList" border v-loading="user_loading.listLoading"
@selection-change="user_selectChange" size="small"
element-loading-text="获取用户信息列表，拼命加载中"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
<el-table-column type="selection" width="55" align="center" ></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="用户名称" prop="username" align="center" width="120%"></el-table-column>
<el-table-column label="真实姓名" prop="realName" align="center" width="120%"></el-table-column>
<el-table-column label="服务器名称" prop="serverName" align="center" width="120%"></el-table-column>
<el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300%"></el-table-column>
<el-table-column label="操作" align="center" type="success">
<el-table-column type="selection" width="55px" align="center" ></el-table-column>
<el-table-column type="index" align="center" width="55px" ></el-table-column>
<el-table-column label="用户名称" prop="username" align="center" width="200px" ></el-table-column>
<el-table-column label="真实姓名" prop="realName" align="center" width="200px" ></el-table-column>
<el-table-column label="服务器名称" prop="serverName" align="center" width="200px" ></el-table-column>
<el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300px" ></el-table-column>
<el-table-column label="操作" align="center" type="success" width="340px" fixed="right">
<template slot-scope="scope">
<!-- 删除用户 -->
<el-tooltip effect="dark" content="删除用户" placement="top-start" :enterable="false">
... ... @@ -74,6 +76,9 @@
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<!-- 分页区域 -->
<div style="margin-top: 10px">
... ...
... ... @@ -61,30 +61,32 @@
</div>
<!-- 列表区域 -->
<div style="margin-top: 20px;">
<el-row>
<el-col :span="24">
<el-table :data="umb_page.umbList" border v-loading="umb_loading.listLoading"
@selection-change="umb_selectChange" size="small"
element-loading-text="获取配置信息列表，拼命加载中"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="用户名称" prop="username" align="center" width="220"></el-table-column>
<el-table-column type="index" align="center" width="55" ></el-table-column>
<el-table-column label="用户名称" prop="username" align="center" width="120"></el-table-column>
<!-- <el-table-column label="订阅者名称" prop="subscriber" align="center" width="220"></el-table-column>-->
<el-table-column label="服务器名称" prop="serverName" align="center"
width="220"></el-table-column>
width="120"></el-table-column>
<el-table-column label="虚拟主机名称" prop="virtualHostName" align="center"
width="220"></el-table-column>
<el-table-column label="交换机名称" prop="exchangeName" align="center" width="220"></el-table-column>
<el-table-column label="队列名称" prop="queueName" align="center" width="400"></el-table-column>
width="120"></el-table-column>
<el-table-column label="交换机名称" prop="exchangeName" align="center" width="120"></el-table-column>
<el-table-column label="队列名称" prop="queueName" align="center" width="220"></el-table-column>
<el-table-column label="路由键名称" prop="routingKeyName" align="center"
width="220"></el-table-column>
width="120"></el-table-column>
<el-table-column label="相关描述" prop="description" align="center"
width="220"></el-table-column>
<el-table-column label="操作" width="245px" align="center" fixed="right">
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<!-- 编辑按钮-->
<el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
<el-button type="primary" icon="el-icon-view" size="mini"
<el-button type="primary" icon="el-icon-view" size="mini" style="margin-bottom: 2px"
@click="umb_toEditDialog(scope.$index,scope.row)">查看
</el-button>
</el-tooltip>
... ... @@ -99,6 +101,9 @@
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<!--分页区域-->
<div style="margin-top: 10px">
... ...