朱兆平 / vue_cli · 提交

转到一个项目

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

首页界面及导航栏更新

内嵌 并排对比
正在显示 11 个修改的文件 包含 365 行增加 和 324 行删除
@@ -6471,7 +6471,7 @@ @@ -6471,7 +6471,7 @@
6471 }, 6471 },
6472 "normalize-wheel": { 6472 "normalize-wheel": {
6473 "version": "1.0.1", 6473 "version": "1.0.1",
6474 - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", 6474 + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
6475 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" 6475 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
6476 }, 6476 },
6477 "npm": { 6477 "npm": {
@@ -425,7 +425,7 @@ @@ -425,7 +425,7 @@
425 display: flex; 425 display: flex;
426 // background: #324057; 426 // background: #324057;
427 position: absolute; 427 position: absolute;
428 - top: 60px; 428 + top: 70px;
429 bottom: 0px; 429 bottom: 0px;
430 overflow: hidden; 430 overflow: hidden;
431 431
@@ -93,8 +93,8 @@ @@ -93,8 +93,8 @@
93 } 93 }
94 /*鼠标放一级菜单时显示二级菜单样式(横向效果)*/ 94 /*鼠标放一级菜单时显示二级菜单样式(横向效果)*/
95 #menu li:hover .dropdown_1column { 95 #menu li:hover .dropdown_1column {
96 - left:300px;  
97 - right: 0px; 96 + left:auto;
  97 + right: 2px;
98 top:45px; 98 top:45px;
99 display:inline-block; 99 display:inline-block;
100 font-size:13px; 100 font-size:13px;
@@ -106,6 +106,8 @@ @@ -106,6 +106,8 @@
106 left: -999em; 106 left: -999em;
107 /*text-align: center;*/ 107 /*text-align: center;*/
108 background: rgb(14,119,238); 108 background: rgb(14,119,238);
  109 + display: table;
  110 + text-align: center;
109 } 111 }
110 /*鼠标移至二级菜单栏颜色改变*/ 112 /*鼠标移至二级菜单栏颜色改变*/
111 #menu li:hover div li:hover{background-color: rgb(18,170,255)} 113 #menu li:hover div li:hover{background-color: rgb(18,170,255)}
@@ -28,49 +28,54 @@ @@ -28,49 +28,54 @@
28 </el-row> 28 </el-row>
29 </div> 29 </div>
30 <!-- 列表区域 --> 30 <!-- 列表区域 -->
31 - <div style="margin-top: 20px;">  
32 - <el-table :data="es_page.esList" border v-loading="es_loading.listLoading"  
33 - @selection-change="es_selectChange" size="small"  
34 - element-loading-text="获取信息，拼命加载中"  
35 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
36 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;">  
37 - <el-table-column type="selection" width="55" align="center"></el-table-column>  
38 - <el-table-column type="index" align="center"></el-table-column>  
39 - <el-table-column label="集群名称" prop="clusterName" align="center" width="200"></el-table-column>  
40 - <el-table-column label="节点名称" prop="elasticsearchName" align="center" width="150"></el-table-column>  
41 - <el-table-column label="协议" prop="scheme" align="center" width="100"></el-table-column>  
42 - <el-table-column label="IP地址" prop="hostname" align="center" width="140"></el-table-column>  
43 - <el-table-column label="端口号" prop="port" align="center" width="100"></el-table-column>  
44 - <el-table-column label="状态" prop="elasticsearchState" align="center" width="100">  
45 - <template slot-scope="scope"> 31 + <div style="margin-top: 20px">
  32 + <el-row>
  33 + <el-col :span="24">
  34 + <el-table :data="es_page.esList" border v-loading="es_loading.listLoading"
  35 + @selection-change="es_selectChange" size="small"
  36 + element-loading-text="获取信息，拼命加载中"
  37 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  38 + style="border-radius: 10px 10px 0px 0px;line-height: 25px">
  39 + <el-table-column type="selection" width="55px" align="center"></el-table-column>
  40 + <el-table-column type="index" align="center" width="55px"></el-table-column>
  41 + <el-table-column label="集群名称" prop="clusterName" align="center" width="200px"></el-table-column>
  42 + <el-table-column label="节点名称" prop="elasticsearchName" align="center" width="100px"></el-table-column>
  43 + <el-table-column label="协议" prop="scheme" align="center" width="100px"></el-table-column>
  44 + <el-table-column label="IP地址" prop="hostname" align="center" width="140px"></el-table-column>
  45 + <el-table-column label="端口号" prop="port" align="center" width="100px"></el-table-column>
  46 + <el-table-column label="状态" prop="elasticsearchState" align="center" width="100px">
  47 + <template slot-scope="scope">
46 <span v-if="scope.row.elasticsearchState ===true" style="color: #3742fa"> 48 <span v-if="scope.row.elasticsearchState ===true" style="color: #3742fa">
47 运行状态 49 运行状态
48 </span> 50 </span>
49 - <span v-if="scope.row.elasticsearchState ===false" style="color: #eb2f06"> 51 + <span v-if="scope.row.elasticsearchState ===false" style="color: #eb2f06">
50 宕机状态 52 宕机状态
51 </span> 53 </span>
52 - </template>  
53 - </el-table-column>  
54 - <el-table-column label="描述" prop="description" align="center" width="100"></el-table-column>  
55 - <el-table-column label="操作" align="center">  
56 - <template slot-scope="scope">  
57 - <!-- 编辑按钮-->  
58 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
59 - <el-button type="primary" icon="el-icon-edit" size="mini"  
60 - @click="es_toEditDialog(scope.$index,scope.row)">编辑  
61 - </el-button>  
62 - </el-tooltip> 54 + </template>
  55 + </el-table-column>
  56 + <el-table-column label="描述" prop="description" align="center" width="300px"></el-table-column>
  57 + <el-table-column label="操作" align="center" width="200px" fixed="right">
  58 + <template slot-scope="scope">
  59 + <!-- 编辑按钮-->
  60 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  61 + <el-button type="primary" icon="el-icon-edit" size="mini" style="margin-bottom: 2px"
  62 + @click="es_toEditDialog(scope.$index,scope.row)">编辑
  63 + </el-button>
  64 + </el-tooltip>
  65 +
  66 + <!-- 删除按钮-->
  67 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  68 + <el-button type="danger" icon="el-icon-delete" size="mini"
  69 + :loading="es_loading.delLoading"
  70 + @click="es_remove(scope.$index,scope.row)">删除
  71 + </el-button>
  72 + </el-tooltip>
  73 + </template>
  74 + </el-table-column>
  75 + </el-table>
63 76
64 - <!-- 删除按钮-->  
65 - <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">  
66 - <el-button type="danger" icon="el-icon-delete" size="mini"  
67 - :loading="es_loading.delLoading"  
68 - @click="es_remove(scope.$index,scope.row)">删除  
69 - </el-button>  
70 - </el-tooltip>  
71 - </template>  
72 - </el-table-column>  
73 - </el-table> 77 + </el-col>
  78 + </el-row>
74 </div> 79 </div>
75 <!--分页区域--> 80 <!--分页区域-->
76 <div style="margin-top: 10px"> 81 <div style="margin-top: 10px">
@@ -25,39 +25,44 @@ @@ -25,39 +25,44 @@
25 </el-row> 25 </el-row>
26 <!-- 列表区域 --> 26 <!-- 列表区域 -->
27 <el-row style="margin-top: 20px;"> 27 <el-row style="margin-top: 20px;">
28 - <el-table  
29 - :data="page.tableData"  
30 - border size="small" row-key="id" default-expand-all  
31 - :tree-props="{children: 'children', hasChildren: 'hasChildren'}"  
32 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
33 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;"  
34 - @selection-change="selsChange" >  
35 - <el-table-column type="selection" width="55" align="center"></el-table-column>  
36 - <el-table-column type="index" prop="id" label="ID" align="center"></el-table-column>  
37 - <el-table-column label="消息标签" prop="name" align="center" width="220"></el-table-column>  
38 - <el-table-column label="消息类型" prop="type" :formatter="formatType" align="center" width="220"></el-table-column>  
39 - <el-table-column label="相关描述" prop="des" align="center" width="220"></el-table-column>  
40 - <el-table-column label="创建时间" prop="creattime" align="center" width="145"></el-table-column>  
41 - <el-table-column label="操作" width="300px" align="center" fixed="right">  
42 - <template slot-scope="scope">  
43 - <!-- 新增下级-->  
44 - <el-tooltip effect="dark" content="新增" placement="top-start" :enterable="false">  
45 - <el-button type="success" icon="el-icon-plus" size="mini"@click="handleAdd(scope.$index, scope.row)">新增下级  
46 - </el-button>  
47 - </el-tooltip>  
48 - <!-- 编辑按钮-->  
49 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
50 - <el-button type="primary" icon="el-icon-edit" size="mini"@click="handleEdit(scope.$index, scope.row)">编辑  
51 - </el-button>  
52 - </el-tooltip>  
53 - <!-- 删除按钮-->  
54 - <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">  
55 - <el-button type="danger" icon="el-icon-delete" size="mini"@click="handleDel(scope.$index, scope.row)">删除  
56 - </el-button>  
57 - </el-tooltip>  
58 - </template>  
59 - </el-table-column>  
60 - </el-table> 28 + <el-row>
  29 + <el-col :span="24">
  30 + <el-table
  31 + :data="page.tableData"
  32 + border size="small" row-key="id" default-expand-all
  33 + :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
  34 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  35 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  36 + @selection-change="selsChange" >
  37 + <el-table-column type="selection" width="55" align="center"></el-table-column>
  38 + <el-table-column type="index" prop="id" label="ID" align="center" width="55"></el-table-column>
  39 + <el-table-column label="消息标签" prop="name" align="center" width="220"></el-table-column>
  40 + <el-table-column label="消息类型" prop="type" :formatter="formatType" align="center" width="220"></el-table-column>
  41 + <el-table-column label="相关描述" prop="des" align="center" width="220"></el-table-column>
  42 + <el-table-column label="创建时间" prop="creattime" align="center" width="220"></el-table-column>
  43 + <el-table-column label="操作" width="300px" align="center" fixed="right">
  44 + <template slot-scope="scope">
  45 + <!-- 新增下级-->
  46 + <el-tooltip effect="dark" content="新增" placement="top-start" :enterable="false">
  47 + <el-button type="success" icon="el-icon-plus" size="mini"@click="handleAdd(scope.$index, scope.row)">新增下级
  48 + </el-button>
  49 + </el-tooltip>
  50 + <!-- 编辑按钮-->
  51 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  52 + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑
  53 + </el-button>
  54 + </el-tooltip>
  55 + <!-- 删除按钮-->
  56 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  57 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除
  58 + </el-button>
  59 + </el-tooltip>
  60 + </template>
  61 + </el-table-column>
  62 + </el-table>
  63 +
  64 + </el-col>
  65 + </el-row>
61 </el-row> 66 </el-row>
62 <el-row style="margin-top: 10px"> 67 <el-row style="margin-top: 10px">
63 <el-col :span="5"> 68 <el-col :span="5">
@@ -95,54 +95,59 @@ @@ -95,54 +95,59 @@
95 </div> 95 </div>
96 <!-- 列表区域 --> 96 <!-- 列表区域 -->
97 <div style="margin-top: 20px;"> 97 <div style="margin-top: 20px;">
98 - <el-table :data="messageNote_page.messageNoteList" border  
99 - v-loading="messageNote_loading.listLoading" size="small"  
100 - @selection-change="messageNote_selectChange"  
101 - element-loading-text="获取消息收发记录，拼命加载中"  
102 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
103 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;">  
104 - <el-table-column label="消息ID" prop="msgid" align="center" width="120"></el-table-column>  
105 - <el-table-column label="消息序号" prop="seqn" align="center" width="150"></el-table-column>  
106 - <el-table-column label="发送者" prop="sndr" align="center" width="120"></el-table-column>  
107 -<!-- <el-table-column label="发送内容" prop="msg" align="center" width="220"></el-table-column>-->  
108 - <el-table-column label="消息大类" prop="btype" align="center" width="100"></el-table-column>  
109 - <el-table-column label="消息子类" prop="stype" align="center" width="100"></el-table-column>  
110 - <el-table-column label="消息发送时间" prop="ddtm" align="center" width="150"></el-table-column>  
111 - <el-table-column label="路由接收者" prop="rcvrs" align="center" width="150">  
112 - <template slot-scope="scope">  
113 - <div v-for="reciver in scope.row.rcvrs">{{reciver.username}}</div>  
114 - </template>  
115 - </el-table-column>  
116 - <el-table-column label="消息接收者" prop="rcvlog" align="center" width="250">  
117 - <template slot-scope="scope">  
118 - <div v-for="logitem in scope.row.rcvlog">{{logitem.username}} [{{logitem.rvtm}}]</div>  
119 - </template>  
120 - </el-table-column>  
121 - <!-- <el-table-column label="相关描述" prop="description" align="center" width="220"></el-table-column>-->  
122 - <el-table-column label="操作" width="300px" align="center" fixed="right">  
123 - <template slot-scope="scope"> 98 + <el-row>
  99 + <el-col :span="24">
  100 + <el-table :data="messageNote_page.messageNoteList" border
  101 + v-loading="messageNote_loading.listLoading" size="small"
  102 + @selection-change="messageNote_selectChange"
  103 + element-loading-text="获取消息收发记录，拼命加载中"
  104 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  105 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
  106 + <el-table-column label="消息ID" prop="msgid" align="center" width="120"></el-table-column>
  107 + <el-table-column label="消息序号" prop="seqn" align="center" width="130"></el-table-column>
  108 + <el-table-column label="发送者" prop="sndr" align="center" width="100"></el-table-column>
  109 + <!-- <el-table-column label="发送内容" prop="msg" align="center" width="220"></el-table-column>-->
  110 + <el-table-column label="消息大类" prop="btype" align="center" width="80"></el-table-column>
  111 + <el-table-column label="消息子类" prop="stype" align="center" width="80"></el-table-column>
  112 + <el-table-column label="消息发送时间" prop="ddtm" align="center" width="150"></el-table-column>
  113 + <el-table-column label="路由接收者" prop="rcvrs" align="center" width="120">
  114 + <template slot-scope="scope">
  115 + <div v-for="reciver in scope.row.rcvrs">{{reciver.username}}</div>
  116 + </template>
  117 + </el-table-column>
  118 + <el-table-column label="消息接收者" prop="rcvlog" align="center" width="300">
  119 + <template slot-scope="scope">
  120 + <div v-for="logitem in scope.row.rcvlog">{{logitem.username}} [{{logitem.rvtm}}]</div>
  121 + </template>
  122 + </el-table-column>
  123 + <!-- <el-table-column label="相关描述" prop="description" align="center" width="220"></el-table-column>-->
  124 + <el-table-column label="操作" width="250" align="center" fixed="right">
  125 + <template slot-scope="scope">
  126 +
  127 + <!-- <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false">-->
  128 + <!-- <el-button type="primary" icon="el-icon-view" size="mini"-->
  129 + <!-- @click="messageNote_toEditDialog(scope.$index,scope.row)">查看-->
  130 + <!-- </el-button>-->
  131 + <!-- </el-tooltip>-->
124 132
125 -<!-- <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false">-->  
126 -<!-- <el-button type="primary" icon="el-icon-view" size="mini"-->  
127 -<!-- @click="messageNote_toEditDialog(scope.$index,scope.row)">查看-->  
128 -<!-- </el-button>-->  
129 -<!-- </el-tooltip>--> 133 + <el-tooltip effect="dark" content="查看发送内容" placement="top-start" :enterable="false">
  134 + <el-button type="success" icon="el-icon-view" size="mini"
  135 + @click="messageNote_toViewContentDialogDialog(scope.$index,scope.row)">查看内容
  136 + </el-button>
  137 + </el-tooltip>
  138 + <!-- 删除按钮-->
  139 + <!-- <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">-->
  140 + <!-- <el-button type="danger" icon="el-icon-delete" size="mini"-->
  141 + <!-- :loading="messageNote_loading.delLoading"-->
  142 + <!-- @click="messageNote_remove(scope.$index,scope.row)">删除-->
  143 + <!-- </el-button>-->
  144 + <!-- </el-tooltip>-->
  145 + </template>
  146 + </el-table-column>
  147 + </el-table>
130 148
131 - <el-tooltip effect="dark" content="查看发送内容" placement="top-start" :enterable="false">  
132 - <el-button type="success" icon="el-icon-view" size="mini"  
133 - @click="messageNote_toViewContentDialogDialog(scope.$index,scope.row)">查看内容  
134 - </el-button>  
135 - </el-tooltip>  
136 - <!-- 删除按钮-->  
137 -<!-- <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">-->  
138 -<!-- <el-button type="danger" icon="el-icon-delete" size="mini"-->  
139 -<!-- :loading="messageNote_loading.delLoading"-->  
140 -<!-- @click="messageNote_remove(scope.$index,scope.row)">删除-->  
141 -<!-- </el-button>-->  
142 -<!-- </el-tooltip>-->  
143 - </template>  
144 - </el-table-column>  
145 - </el-table> 149 + </el-col>
  150 + </el-row>
146 </div> 151 </div>
147 <!--分页区域--> 152 <!--分页区域-->
148 <div style="margin-top: 10px"> 153 <div style="margin-top: 10px">
@@ -45,51 +45,56 @@ @@ -45,51 +45,56 @@
45 </div> 45 </div>
46 <!-- 列表区域 --> 46 <!-- 列表区域 -->
47 <div style="margin-top: 20px;"> 47 <div style="margin-top: 20px;">
48 - <el-table :data="queue_page.queueList" border v-loading="queue_loading.listLoading"  
49 - @selection-change="queue_selectChange"  
50 - element-loading-text="获取队列列表，拼命加载中" size="small"  
51 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
52 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;">  
53 - <el-table-column type="selection" width="55" align="center"></el-table-column>  
54 - <el-table-column type="index" align="center"></el-table-column>  
55 - <el-table-column label="队列名称" prop="queueName" align="center"  
56 - width="220"></el-table-column>  
57 - <el-table-column label="所属用户" prop="username" align="center"  
58 - width="220"></el-table-column>  
59 - <el-table-column label="分区数量" prop="partitionCount" align="center"  
60 - width="220"></el-table-column>  
61 - <el-table-column label="相关描述" prop="description" align="center" width="280"></el-table-column>  
62 -<!-- <el-table-column label="是否持久化" prop="durability" align="center" width="145">-->  
63 -<!-- <template slot-scope="scope">-->  
64 -<!-- <span v-if="scope.row.durability ===false">否</span>-->  
65 -<!-- <span v-if="scope.row.durability ===true">是</span>-->  
66 -<!-- </template>-->  
67 -<!-- </el-table-column>-->  
68 - <el-table-column label="创建时间" prop="gmtCreate" align="center" width="145">  
69 - </el-table-column>  
70 - <!-- <el-table-column label="扩展参数" prop="arguments" align="center" width="200">-->  
71 - <!-- </el-table-column>--> 48 + <el-row>
  49 + <el-col :span="24">
  50 + <el-table :data="queue_page.queueList" border v-loading="queue_loading.listLoading"
  51 + @selection-change="queue_selectChange"
  52 + element-loading-text="获取队列列表，拼命加载中" size="small"
  53 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  54 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
  55 + <el-table-column type="selection" width="55" align="center"></el-table-column>
  56 + <el-table-column type="index" align="center" width="55" ></el-table-column>
  57 + <el-table-column label="队列名称" prop="queueName" align="center"
  58 + width="200"></el-table-column>
  59 + <el-table-column label="所属用户" prop="username" align="center"
  60 + width="200"></el-table-column>
  61 + <el-table-column label="分区数量" prop="partitionCount" align="center"
  62 + width="200"></el-table-column>
  63 + <el-table-column label="相关描述" prop="description" align="center" width="200"></el-table-column>
  64 + <!-- <el-table-column label="是否持久化" prop="durability" align="center" width="145">-->
  65 + <!-- <template slot-scope="scope">-->
  66 + <!-- <span v-if="scope.row.durability ===false">否</span>-->
  67 + <!-- <span v-if="scope.row.durability ===true">是</span>-->
  68 + <!-- </template>-->
  69 + <!-- </el-table-column>-->
  70 + <el-table-column label="创建时间" prop="gmtCreate" align="center" width="200">
  71 + </el-table-column>
  72 + <!-- <el-table-column label="扩展参数" prop="arguments" align="center" width="200">-->
  73 + <!-- </el-table-column>-->
  74 +
  75 + <!-- fixed="right" -->
  76 + <el-table-column label="操作" width="220" align="center" fixed="right">
  77 + <template slot-scope="scope">
  78 + <!-- 编辑按钮-->
  79 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  80 + <el-button type="primary" icon="el-icon-edit" size="mini" style="margin-bottom: 2px"
  81 + @click="queue_toEditDialog(scope.$index,scope.row)">编辑
  82 + </el-button>
  83 + </el-tooltip>
72 84
73 - <!-- fixed="right" -->  
74 - <el-table-column label="操作" width="225px" align="center" fixed="right">  
75 - <template slot-scope="scope">  
76 - <!-- 编辑按钮-->  
77 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
78 - <el-button type="primary" icon="el-icon-edit" size="mini"  
79 - @click="queue_toEditDialog(scope.$index,scope.row)">编辑  
80 - </el-button>  
81 - </el-tooltip> 85 + <!-- 删除按钮-->
  86 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  87 + <el-button type="danger" icon="el-icon-delete" size="mini"
  88 + :loading="queue_loading.delLoading"
  89 + @click="queue_remove(scope.$index,scope.row)">删除
  90 + </el-button>
  91 + </el-tooltip>
  92 + </template>
  93 + </el-table-column>
  94 + </el-table>
82 95
83 - <!-- 删除按钮-->  
84 - <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">  
85 - <el-button type="danger" icon="el-icon-delete" size="mini"  
86 - :loading="queue_loading.delLoading"  
87 - @click="queue_remove(scope.$index,scope.row)">删除  
88 - </el-button>  
89 - </el-tooltip>  
90 - </template>  
91 - </el-table-column>  
92 - </el-table> 96 + </el-col>
  97 + </el-row>
93 </div> 98 </div>
94 <!--分页区域--> 99 <!--分页区域-->
95 <div style="margin-top: 10px"> 100 <div style="margin-top: 10px">
@@ -44,25 +44,29 @@ @@ -44,25 +44,29 @@
44 <el-table-column 44 <el-table-column
45 prop="sndr" 45 prop="sndr"
46 label="帐户名称" 46 label="帐户名称"
47 - width="200" 47 + width="150"
  48 + align="center"
48 > 49 >
49 </el-table-column> 50 </el-table-column>
50 <el-table-column 51 <el-table-column
51 prop="btype" 52 prop="btype"
52 label="消息大类" 53 label="消息大类"
53 - width="100" 54 + width="120"
  55 + align="center"
54 > 56 >
55 </el-table-column> 57 </el-table-column>
56 <el-table-column 58 <el-table-column
57 prop="stype" 59 prop="stype"
58 label="消息子类" 60 label="消息子类"
59 - width="100" 61 + width="120"
  62 + align="center"
60 > 63 >
61 </el-table-column> 64 </el-table-column>
62 <el-table-column 65 <el-table-column
63 prop="rcvr_topic" 66 prop="rcvr_topic"
64 label="订阅主题" 67 label="订阅主题"
65 - width="150" 68 + width="250"
  69 + align="center"
66 > 70 >
67 <template slot-scope="scope"> 71 <template slot-scope="scope">
68 <div v-for="reciver in scope.row.rcvrList"> 72 <div v-for="reciver in scope.row.rcvrList">
@@ -74,7 +78,8 @@ @@ -74,7 +78,8 @@
74 <el-table-column 78 <el-table-column
75 prop="filter" 79 prop="filter"
76 label="过滤规则" 80 label="过滤规则"
77 - width="350" 81 + width="450"
  82 + align="center"
78 > 83 >
79 <template slot-scope="scope"> 84 <template slot-scope="scope">
80 <div v-for="reciver in scope.row.rcvrList"> 85 <div v-for="reciver in scope.row.rcvrList">
@@ -83,14 +88,13 @@ @@ -83,14 +88,13 @@
83 </div> 88 </div>
84 </template> 89 </template>
85 </el-table-column> 90 </el-table-column>
86 - <el-table-column label="操作" width="150" align="center" fixed="right"> 91 + <el-table-column label="操作" width="250px" align="center" fixed="right">
87 <template slot-scope="scope"> 92 <template slot-scope="scope">
88 <el-button type="danger" size="mini" @click="delRouter(scope.$index,scope.row)">删除</el-button> 93 <el-button type="danger" size="mini" @click="delRouter(scope.$index,scope.row)">删除</el-button>
89 </template> 94 </template>
90 </el-table-column> 95 </el-table-column>
91 </el-table> 96 </el-table>
92 </el-col> 97 </el-col>
93 -  
94 </el-row> 98 </el-row>
95 <el-row> 99 <el-row>
96 <div class="block"> 100 <div class="block">
@@ -23,85 +23,90 @@ @@ -23,85 +23,90 @@
23 </div> 23 </div>
24 <!--服务器信息列表区域--> 24 <!--服务器信息列表区域-->
25 <div style="margin-top: 20px;"> 25 <div style="margin-top: 20px;">
26 - <el-table :data="serverList" border v-loading="server_loading.listLoading"  
27 - @selection-change="selectChange" size="small"  
28 - element-loading-text="获取服务器列表，拼命加载中"  
29 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
30 - style="border-radius: 10px 10px 0px 0px;line-height: 15px;">  
31 - <el-table-column type="selection" width="55" align="center"></el-table-column>  
32 - <el-table-column type="index" align="center"></el-table-column>  
33 - <el-table-column type="expand">  
34 - <template slot-scope="props">  
35 - <el-form :inline="true" label-position="left" label-width="110px" align="left">  
36 - <el-row>  
37 - <el-col :span="6">  
38 - <el-form-item label="服务器名称:">  
39 - <el-tag type="success">{{props.row.serverName}}</el-tag>  
40 - </el-form-item>  
41 - </el-col>  
42 - <el-col :span="6">  
43 - <el-form-item label="服务器地址:">  
44 - <el-tag type="success">{{props.row.serverIp}}</el-tag>  
45 - </el-form-item>  
46 - </el-col>  
47 - </el-row>  
48 - <el-row>  
49 - <el-col :span="6">  
50 - <el-form-item label="服务器端口号:">  
51 - <el-tag type="success">{{props.row.serverPort}}</el-tag>  
52 - </el-form-item>  
53 - </el-col>  
54 -<!-- <el-col :span="6">-->  
55 -<!-- <el-form-item label="客户端端口号:">-->  
56 -<!-- <el-tag type="success">{{props.row.clientPort}}</el-tag>-->  
57 -<!-- </el-form-item>-->  
58 -<!-- </el-col>-->  
59 -<!-- </el-row>-->  
60 -<!-- <el-row>-->  
61 -<!-- <el-col :span="6">-->  
62 -<!-- <el-form-item label="超级用户名称:">-->  
63 -<!-- <el-tag type="success">{{props.row.superUsername}}</el-tag>-->  
64 -<!-- </el-form-item>-->  
65 -<!-- </el-col>-->  
66 - <el-col :span="8">  
67 - <el-form-item label="相关描述:">  
68 - <el-tag type="success">{{props.row.description}}</el-tag>  
69 - </el-form-item>  
70 - </el-col>  
71 - </el-row>  
72 - </el-form>  
73 - </template>  
74 - </el-table-column>  
75 - <el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column>  
76 - <el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column>  
77 - <el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column>  
78 -<!-- <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>-->  
79 -<!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->  
80 - <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>  
81 - <el-table-column label="操作" align="center">  
82 - <template slot-scope="scope">  
83 -<!-- &lt;!&ndash; 虚拟主机 &ndash;&gt;-->  
84 -<!-- <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false">-->  
85 -<!-- <el-button type="warning" icon="el-icon-link" size="mini"-->  
86 -<!-- @click="toVirtualHost(scope.$index,scope.row)">虚拟主机-->  
87 -<!-- </el-button>-->  
88 -<!-- </el-tooltip>-->  
89 - <!-- 编辑按钮 -->  
90 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
91 - <el-button type="primary" icon="el-icon-edit" size="mini"  
92 - @click="toEditDialog(scope.$index,scope.row)">编辑  
93 - </el-button>  
94 - </el-tooltip>  
95 - <!-- 删除按钮 -->  
96 - <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">  
97 - <el-button type="danger" icon="el-icon-delete" size="mini"  
98 - :loading="server_loading.delLoading"  
99 - @click="removeServerInfo(scope.$index,scope.row)">删除  
100 - </el-button>  
101 - </el-tooltip>  
102 - </template>  
103 - </el-table-column>  
104 - </el-table> 26 + <el-row>
  27 + <el-col :span="24">
  28 + <el-table :data="serverList" border v-loading="server_loading.listLoading"
  29 + @selection-change="selectChange" size="small"
  30 + element-loading-text="获取服务器列表，拼命加载中"
  31 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  32 + style="border-radius: 10px 10px 0px 0px;line-height: 15px;">
  33 + <el-table-column type="selection" width="55" align="center"></el-table-column>
  34 + <el-table-column type="index" align="center" width="55" ></el-table-column>
  35 + <el-table-column type="expand">
  36 + <template slot-scope="props">
  37 + <el-form :inline="true" label-position="left" label-width="110px" align="left">
  38 + <el-row>
  39 + <el-col :span="6">
  40 + <el-form-item label="服务器名称:">
  41 + <el-tag type="success">{{props.row.serverName}}</el-tag>
  42 + </el-form-item>
  43 + </el-col>
  44 + <el-col :span="6">
  45 + <el-form-item label="服务器地址:">
  46 + <el-tag type="success">{{props.row.serverIp}}</el-tag>
  47 + </el-form-item>
  48 + </el-col>
  49 + </el-row>
  50 + <el-row>
  51 + <el-col :span="6">
  52 + <el-form-item label="服务器端口号:">
  53 + <el-tag type="success">{{props.row.serverPort}}</el-tag>
  54 + </el-form-item>
  55 + </el-col>
  56 + <!-- <el-col :span="6">-->
  57 + <!-- <el-form-item label="客户端端口号:">-->
  58 + <!-- <el-tag type="success">{{props.row.clientPort}}</el-tag>-->
  59 + <!-- </el-form-item>-->
  60 + <!-- </el-col>-->
  61 + <!-- </el-row>-->
  62 + <!-- <el-row>-->
  63 + <!-- <el-col :span="6">-->
  64 + <!-- <el-form-item label="超级用户名称:">-->
  65 + <!-- <el-tag type="success">{{props.row.superUsername}}</el-tag>-->
  66 + <!-- </el-form-item>-->
  67 + <!-- </el-col>-->
  68 + <el-col :span="8">
  69 + <el-form-item label="相关描述:">
  70 + <el-tag type="success">{{props.row.description}}</el-tag>
  71 + </el-form-item>
  72 + </el-col>
  73 + </el-row>
  74 + </el-form>
  75 + </template>
  76 + </el-table-column>
  77 + <el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column>
  78 + <el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column>
  79 + <el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column>
  80 + <!-- <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>-->
  81 + <!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
  82 + <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>
  83 + <el-table-column label="操作" align="center" width="300" fixed="right">
  84 + <template slot-scope="scope">
  85 + <!-- &lt;!&ndash; 虚拟主机 &ndash;&gt;-->
  86 + <!-- <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false">-->
  87 + <!-- <el-button type="warning" icon="el-icon-link" size="mini"-->
  88 + <!-- @click="toVirtualHost(scope.$index,scope.row)">虚拟主机-->
  89 + <!-- </el-button>-->
  90 + <!-- </el-tooltip>-->
  91 + <!-- 编辑按钮 -->
  92 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  93 + <el-button type="primary" icon="el-icon-edit" size="mini"
  94 + @click="toEditDialog(scope.$index,scope.row)">编辑
  95 + </el-button>
  96 + </el-tooltip>
  97 + <!-- 删除按钮 -->
  98 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  99 + <el-button type="danger" icon="el-icon-delete" size="mini"
  100 + :loading="server_loading.delLoading"
  101 + @click="removeServerInfo(scope.$index,scope.row)">删除
  102 + </el-button>
  103 + </el-tooltip>
  104 + </template>
  105 + </el-table-column>
  106 + </el-table>
  107 +
  108 + </el-col>
  109 + </el-row>
105 <!--分页区域--> 110 <!--分页区域-->
106 <div style="margin-top: 10px"> 111 <div style="margin-top: 10px">
107 <el-row :gutter="24"> 112 <el-row :gutter="24">
@@ -37,43 +37,48 @@ @@ -37,43 +37,48 @@
37 </div> 37 </div>
38 <!-- 列表区域 --> 38 <!-- 列表区域 -->
39 <div style="margin-top: 20px;"> 39 <div style="margin-top: 20px;">
40 -<!-- 加入表头背景颜色、字体颜色、表格圆角及高度设置-->  
41 - <el-table :data="user_page.userInfoList" border v-loading="user_loading.listLoading"  
42 - @selection-change="user_selectChange" size="small"  
43 - element-loading-text="获取用户信息列表，拼命加载中"  
44 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
45 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;">  
46 - <el-table-column type="selection" width="55" align="center" ></el-table-column>  
47 - <el-table-column type="index" align="center"></el-table-column>  
48 - <el-table-column label="用户名称" prop="username" align="center" width="120%"></el-table-column>  
49 - <el-table-column label="真实姓名" prop="realName" align="center" width="120%"></el-table-column>  
50 - <el-table-column label="服务器名称" prop="serverName" align="center" width="120%"></el-table-column>  
51 - <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300%"></el-table-column>  
52 - <el-table-column label="操作" align="center" type="success">  
53 - <template slot-scope="scope">  
54 - <!-- 删除用户 -->  
55 - <el-tooltip effect="dark" content="删除用户" placement="top-start" :enterable="false">  
56 - <el-button type="danger" icon="el-icon-delete" size="small"  
57 - :loading="user_loading.delLoading"  
58 - @click="user_remove(scope.$index,scope.row)">删除用户  
59 - </el-button>  
60 - </el-tooltip>  
61 - <!-- 编辑关系 -->  
62 - <el-tooltip effect="dark" content="编辑关系" placement="top-start" :enterable="false">  
63 - <el-button type="primary" icon="el-icon-edit" size="small"  
64 - @click="user_toEditDialog(scope.$index,scope.row)">编辑关系  
65 - </el-button>  
66 - </el-tooltip>  
67 - <!-- 删除关系 -->  
68 - <el-tooltip effect="dark" content="删除关系" placement="top-start" :enterable="false">  
69 - <el-button type="danger" icon="el-icon-edit" size="small"  
70 - @click="user_removeRelation(scope.$index,scope.row)">删除关系  
71 - </el-button>  
72 - </el-tooltip>  
73 - <!-- 修改密码 -->  
74 - </template>  
75 - </el-table-column>  
76 - </el-table> 40 + <el-row>
  41 + <el-col :span="24">
  42 + <!-- 加入表头背景颜色、字体颜色、表格圆角及高度设置-->
  43 + <el-table :data="user_page.userInfoList" border v-loading="user_loading.listLoading"
  44 + @selection-change="user_selectChange" size="small"
  45 + element-loading-text="获取用户信息列表，拼命加载中"
  46 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  47 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
  48 + <el-table-column type="selection" width="55px" align="center" ></el-table-column>
  49 + <el-table-column type="index" align="center" width="55px" ></el-table-column>
  50 + <el-table-column label="用户名称" prop="username" align="center" width="200px" ></el-table-column>
  51 + <el-table-column label="真实姓名" prop="realName" align="center" width="200px" ></el-table-column>
  52 + <el-table-column label="服务器名称" prop="serverName" align="center" width="200px" ></el-table-column>
  53 + <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300px" ></el-table-column>
  54 + <el-table-column label="操作" align="center" type="success" width="340px" fixed="right">
  55 + <template slot-scope="scope">
  56 + <!-- 删除用户 -->
  57 + <el-tooltip effect="dark" content="删除用户" placement="top-start" :enterable="false">
  58 + <el-button type="danger" icon="el-icon-delete" size="small"
  59 + :loading="user_loading.delLoading"
  60 + @click="user_remove(scope.$index,scope.row)">删除用户
  61 + </el-button>
  62 + </el-tooltip>
  63 + <!-- 编辑关系 -->
  64 + <el-tooltip effect="dark" content="编辑关系" placement="top-start" :enterable="false">
  65 + <el-button type="primary" icon="el-icon-edit" size="small"
  66 + @click="user_toEditDialog(scope.$index,scope.row)">编辑关系
  67 + </el-button>
  68 + </el-tooltip>
  69 + <!-- 删除关系 -->
  70 + <el-tooltip effect="dark" content="删除关系" placement="top-start" :enterable="false">
  71 + <el-button type="danger" icon="el-icon-edit" size="small"
  72 + @click="user_removeRelation(scope.$index,scope.row)">删除关系
  73 + </el-button>
  74 + </el-tooltip>
  75 + <!-- 修改密码 -->
  76 + </template>
  77 + </el-table-column>
  78 + </el-table>
  79 + </el-col>
  80 + </el-row>
  81 +
77 </div> 82 </div>
78 <!-- 分页区域 --> 83 <!-- 分页区域 -->
79 <div style="margin-top: 10px"> 84 <div style="margin-top: 10px">
@@ -61,44 +61,49 @@ @@ -61,44 +61,49 @@
61 </div> 61 </div>
62 <!-- 列表区域 --> 62 <!-- 列表区域 -->
63 <div style="margin-top: 20px;"> 63 <div style="margin-top: 20px;">
64 - <el-table :data="umb_page.umbList" border v-loading="umb_loading.listLoading"  
65 - @selection-change="umb_selectChange" size="small"  
66 - element-loading-text="获取配置信息列表，拼命加载中"  
67 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"  
68 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;">  
69 - <el-table-column type="selection" width="55" align="center"></el-table-column>  
70 - <el-table-column type="index" align="center"></el-table-column>  
71 - <el-table-column label="用户名称" prop="username" align="center" width="220"></el-table-column>  
72 - <!-- <el-table-column label="订阅者名称" prop="subscriber" align="center" width="220"></el-table-column>-->  
73 - <el-table-column label="服务器名称" prop="serverName" align="center"  
74 - width="220"></el-table-column>  
75 - <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center"  
76 - width="220"></el-table-column>  
77 - <el-table-column label="交换机名称" prop="exchangeName" align="center" width="220"></el-table-column>  
78 - <el-table-column label="队列名称" prop="queueName" align="center" width="400"></el-table-column>  
79 - <el-table-column label="路由键名称" prop="routingKeyName" align="center"  
80 - width="220"></el-table-column>  
81 - <el-table-column label="相关描述" prop="description" align="center"  
82 - width="220"></el-table-column>  
83 - <el-table-column label="操作" width="245px" align="center" fixed="right">  
84 - <template slot-scope="scope">  
85 - <!-- 编辑按钮-->  
86 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
87 - <el-button type="primary" icon="el-icon-view" size="mini"  
88 - @click="umb_toEditDialog(scope.$index,scope.row)">查看  
89 - </el-button>  
90 - </el-tooltip>  
91 -  
92 - <!-- 删除按钮-->  
93 - <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">  
94 - <el-button type="danger" icon="el-icon-delete" size="mini"  
95 - :loading="umb_loading.listLoading"  
96 - @click="umb_remove(scope.$index,scope.row)">删除  
97 - </el-button>  
98 - </el-tooltip>  
99 - </template>  
100 - </el-table-column>  
101 - </el-table> 64 + <el-row>
  65 + <el-col :span="24">
  66 + <el-table :data="umb_page.umbList" border v-loading="umb_loading.listLoading"
  67 + @selection-change="umb_selectChange" size="small"
  68 + element-loading-text="获取配置信息列表，拼命加载中"
  69 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  70 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
  71 + <el-table-column type="selection" width="55" align="center"></el-table-column>
  72 + <el-table-column type="index" align="center" width="55" ></el-table-column>
  73 + <el-table-column label="用户名称" prop="username" align="center" width="120"></el-table-column>
  74 + <!-- <el-table-column label="订阅者名称" prop="subscriber" align="center" width="220"></el-table-column>-->
  75 + <el-table-column label="服务器名称" prop="serverName" align="center"
  76 + width="120"></el-table-column>
  77 + <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center"
  78 + width="120"></el-table-column>
  79 + <el-table-column label="交换机名称" prop="exchangeName" align="center" width="120"></el-table-column>
  80 + <el-table-column label="队列名称" prop="queueName" align="center" width="220"></el-table-column>
  81 + <el-table-column label="路由键名称" prop="routingKeyName" align="center"
  82 + width="120"></el-table-column>
  83 + <el-table-column label="相关描述" prop="description" align="center"
  84 + width="220"></el-table-column>
  85 + <el-table-column label="操作" width="200px" align="center" fixed="right">
  86 + <template slot-scope="scope">
  87 + <!-- 编辑按钮-->
  88 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  89 + <el-button type="primary" icon="el-icon-view" size="mini" style="margin-bottom: 2px"
  90 + @click="umb_toEditDialog(scope.$index,scope.row)">查看
  91 + </el-button>
  92 + </el-tooltip>
  93 +
  94 + <!-- 删除按钮-->
  95 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  96 + <el-button type="danger" icon="el-icon-delete" size="mini"
  97 + :loading="umb_loading.listLoading"
  98 + @click="umb_remove(scope.$index,scope.row)">删除
  99 + </el-button>
  100 + </el-tooltip>
  101 + </template>
  102 + </el-table-column>
  103 + </el-table>
  104 +
  105 + </el-col>
  106 + </el-row>
102 </div> 107 </div>
103 <!--分页区域--> 108 <!--分页区域-->
104 <div style="margin-top: 10px"> 109 <div style="margin-top: 10px">