朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 f2ab071e4adc59d5bdb4ebd434e42be21aa2e3f4 1 个父辈 c0c81c46

消息总线系统界面更改

内嵌 并排对比
正在显示 10 个修改的文件 包含 635 行增加 和 476 行删除
@@ -5,19 +5,23 @@ @@ -5,19 +5,23 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="es_queryInfo.clusterName" prefix-icon="el-icon-search" size="small"  
10 - placeholder="集群名称" clearable></el-input> 8 + <el-col :span="6">
  9 + <el-input v-model="es_queryInfo.clusterName" size="small"
  10 + placeholder="集群名称" clearable>
  11 + <template slot="prepend" ><i class="el-icon-user-solid"></i>集群名称</template>
  12 + </el-input>
11 </el-col> 13 </el-col>
12 - <el-col :span="4">  
13 - <el-input v-model="es_queryInfo.elasticsearchName" prefix-icon="el-icon-search" size="small"  
14 - placeholder="节点（ES）名称" clearable></el-input> 14 + <el-col :span="6">
  15 + <el-input v-model="es_queryInfo.elasticsearchName" size="small"
  16 + placeholder="节点（ES）名称" clearable>
  17 + <template slot="prepend" ><i class="el-icon-more"></i>节点（ES）名称</template>
  18 + </el-input>
15 </el-col> 19 </el-col>
16 <el-col :span="8"> 20 <el-col :span="8">
17 - <el-button type="success" style="width:150px" size="medium" @click="es_getList"> 21 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="es_getList">
18 查询ES信息 22 查询ES信息
19 </el-button> 23 </el-button>
20 - <el-button type="primary" style="width:150px" size="medium" @click="es_toAddDialog"> 24 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="es_toAddDialog">
21 添加ES信息 25 添加ES信息
22 </el-button> 26 </el-button>
23 </el-col> 27 </el-col>
@@ -27,7 +31,9 @@ @@ -27,7 +31,9 @@
27 <div style="margin-top: 20px;"> 31 <div style="margin-top: 20px;">
28 <el-table :data="es_page.esList" border v-loading="es_loading.listLoading" 32 <el-table :data="es_page.esList" border v-loading="es_loading.listLoading"
29 @selection-change="es_selectChange" size="small" 33 @selection-change="es_selectChange" size="small"
30 - element-loading-text="获取信息，拼命加载中"> 34 + element-loading-text="获取信息，拼命加载中"
  35 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  36 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
31 <el-table-column type="selection" width="55" align="center"></el-table-column> 37 <el-table-column type="selection" width="55" align="center"></el-table-column>
32 <el-table-column type="index" align="center"></el-table-column> 38 <el-table-column type="index" align="center"></el-table-column>
33 <el-table-column label="集群名称" prop="clusterName" align="center" width="200"></el-table-column> 39 <el-table-column label="集群名称" prop="clusterName" align="center" width="200"></el-table-column>
@@ -46,7 +52,7 @@ @@ -46,7 +52,7 @@
46 </template> 52 </template>
47 </el-table-column> 53 </el-table-column>
48 <el-table-column label="描述" prop="description" align="center" width="100"></el-table-column> 54 <el-table-column label="描述" prop="description" align="center" width="100"></el-table-column>
49 - <el-table-column label="操作" width="225px" align="center"> 55 + <el-table-column label="操作" align="center">
50 <template slot-scope="scope"> 56 <template slot-scope="scope">
51 <!-- 编辑按钮--> 57 <!-- 编辑按钮-->
52 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 58 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
@@ -99,36 +105,35 @@ @@ -99,36 +105,35 @@
99 :visible.sync="es_dialog.addDialog" 105 :visible.sync="es_dialog.addDialog"
100 style="margin-top: -50px" text-align="center" width="50%" 106 style="margin-top: -50px" text-align="center" width="50%"
101 @close="es_addDialogClosed"> 107 @close="es_addDialogClosed">
102 - <el-form :inline="true" label-width="130px" status-icon style="margin-top: -10px" align="center"  
103 - :model="es_addForm" :rules="es_addFormRules" ref="es_addFormRef">  
104 - <!-- <el-form-item label="集群名称：" prop="clusterName">-->  
105 - <!-- <el-input v-model="es_addForm.clusterName" style="width:280px" size="small" clearable-->  
106 - <!-- placeholder="请输入集群名称">-->  
107 - <!-- </el-input>-->  
108 - <!-- </el-form-item>-->  
109 - <!-- <el-form-item label="节点名称：" prop="elasticsearchName">-->  
110 - <!-- <el-input v-model="es_addForm.elasticsearchName" style="width:280px" size="small" clearable-->  
111 - <!-- placeholder="请输入ES（节点）名称">-->  
112 - <!-- </el-input>-->  
113 - <!-- </el-form-item>-->  
114 - <el-form-item label="协议：" prop="scheme">  
115 - <el-input v-model="es_addForm.scheme" style="width:280px" size="small" clearable 108 + <el-form :label-position="labelPosition" status-icon style="margin-top: -10px" align="center"
  109 + :model="es_addForm" :rules="es_addFormRules" ref="es_addFormRef" >
  110 + <el-form-item label="" prop="scheme">
  111 + <el-input v-model="es_addForm.scheme" size="small" clearable style="width: 300px"
116 placeholder="请输入协议名称：http"> 112 placeholder="请输入协议名称：http">
  113 + <template slot="prepend" >&nbsp;协&nbsp;&nbsp;&nbsp;&nbsp;议&nbsp;</template>
117 </el-input> 114 </el-input>
118 </el-form-item> 115 </el-form-item>
119 - <el-form-item label="IP地址：" prop="hostname">  
120 - <el-input v-model="es_addForm.hostname" style="width:280px" size="small" clearable 116 + <el-form-item label="" prop="hostname">
  117 + <el-input v-model="es_addForm.hostname" size="small" clearable style="width: 300px"
121 placeholder="请输入IP地址"> 118 placeholder="请输入IP地址">
  119 + <template slot="prepend" >I&nbsp;P&nbsp;地&nbsp;址</template>
122 </el-input> 120 </el-input>
123 </el-form-item> 121 </el-form-item>
124 - <el-form-item label="端口号：" prop="port">  
125 - <el-input v-model="es_addForm.port" style="width:280px" size="small" clearable 122 + <el-form-item label="" prop="port">
  123 + <el-input v-model="es_addForm.port" size="small" clearable style="width: 300px"
126 placeholder="请输入端口号"> 124 placeholder="请输入端口号">
  125 + <template slot="prepend">&nbsp;端&nbsp;口&nbsp;号</template>
127 </el-input> 126 </el-input>
128 </el-form-item> 127 </el-form-item>
129 - <el-form-item label="默认节点类型：" prop="isMaster">  
130 - <el-select v-model="es_addForm.isMaster" style="width: 280px" clearable  
131 - size="small" placeholder="请选择默认节点类型？"> 128 + <el-form-item label="" prop="description">
  129 + <el-input v-model="es_addForm.description" size="small" clearable style="width: 300px"
  130 + placeholder="请输入相关描述">
  131 + <template slot="prepend" >相关描述</template>
  132 + </el-input>
  133 + </el-form-item>
  134 + <el-form-item label="" prop="isMaster">
  135 + <el-select v-model="es_addForm.isMaster" clearable
  136 + size="small" placeholder="请选择默认节点类型" style="width: 300px">
132 <el-option 137 <el-option
133 v-for="item in isMasterList" 138 v-for="item in isMasterList"
134 :key="item.value" 139 :key="item.value"
@@ -137,14 +142,9 @@ @@ -137,14 +142,9 @@
137 </el-option> 142 </el-option>
138 </el-select> 143 </el-select>
139 </el-form-item> 144 </el-form-item>
140 - <el-form-item label="相关描述：" prop="description">  
141 - <el-input v-model="es_addForm.description" style="width:280px" size="small" clearable  
142 - placeholder="请输入相关描述">  
143 - </el-input>  
144 - </el-form-item>  
145 </el-form> 145 </el-form>
146 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 146 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
147 - <el-button type="info" @click="es_dialog.addDialog = false" size="medium" style="width: 100px"> 147 + <el-button type="info" @click="es_dialog.addDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">
148 取消 148 取消
149 </el-button> 149 </el-button>
150 <el-button type="success" @click="es_add_test" :loading="es_loading.addLoading" size="medium" style="width: 100px"> 150 <el-button type="success" @click="es_add_test" :loading="es_loading.addLoading" size="medium" style="width: 100px">
@@ -163,36 +163,47 @@ @@ -163,36 +163,47 @@
163 v-loading="es_loading.editLoading" element-loading-text="正在拼命加载，请稍等" 163 v-loading="es_loading.editLoading" element-loading-text="正在拼命加载，请稍等"
164 style="margin-top: -50px" text-align="center" width="50%" 164 style="margin-top: -50px" text-align="center" width="50%"
165 @close="es_editDialogClosed"> 165 @close="es_editDialogClosed">
166 - <el-form :inline="true" label-width="130px" status-icon style="margin-top: -10px" align="center"  
167 - :model="es_editForm" :rules="es_editFormRules" ref="es_editFormRef">  
168 - <el-form-item label="集群名称：" prop="clusterName">  
169 - <el-input v-model="es_editForm.clusterName" style="width:280px" size="small" clearable 166 + <el-form status-icon style="margin-top: -10px" align="center"
  167 + :model="es_editForm" :rules="es_editFormRules" ref="es_editFormRef" :label-position="labelPosition">
  168 + <el-form-item label="" prop="clusterName">
  169 + <el-input v-model="es_editForm.clusterName" style="width:300px" size="small" clearable
170 placeholder="请输入集群名称"> 170 placeholder="请输入集群名称">
  171 + <template slot="prepend" >集群名称</template>
171 </el-input> 172 </el-input>
172 </el-form-item> 173 </el-form-item>
173 - <el-form-item label="节点名称：" prop="elasticsearchName">  
174 - <el-input v-model="es_editForm.elasticsearchName" style="width:280px" size="small" clearable 174 + <el-form-item label="" prop="elasticsearchName">
  175 + <el-input v-model="es_editForm.elasticsearchName" style="width:300px" size="small" clearable
175 placeholder="请输入ES（节点）名称"> 176 placeholder="请输入ES（节点）名称">
  177 + <template slot="prepend" >节点名称</template>
176 </el-input> 178 </el-input>
177 </el-form-item> 179 </el-form-item>
178 - <el-form-item label="协议：" prop="scheme">  
179 - <el-input v-model="es_editForm.scheme" style="width:280px" size="small" clearable readonly 180 + <el-form-item label="" prop="scheme">
  181 + <el-input v-model="es_editForm.scheme" style="width:300px" size="small" clearable readonly
180 placeholder="请输入协议名称：http"> 182 placeholder="请输入协议名称：http">
  183 + <template slot="prepend" >&nbsp;&nbsp;&nbsp;协&nbsp;议&nbsp;&nbsp;&nbsp;</template>
181 </el-input> 184 </el-input>
182 </el-form-item> 185 </el-form-item>
183 - <el-form-item label="IP地址：" prop="hostname">  
184 - <el-input v-model="es_editForm.hostname" style="width:280px" size="small" clearable 186 + <el-form-item label="" prop="hostname">
  187 + <el-input v-model="es_editForm.hostname" style="width:300px" size="small" clearable
185 placeholder="请输入IP地址"> 188 placeholder="请输入IP地址">
  189 + <template slot="prepend" >&nbsp;&nbsp;IP地址&nbsp;&nbsp;</template>
186 </el-input> 190 </el-input>
187 </el-form-item> 191 </el-form-item>
188 - <el-form-item label="端口号：" prop="port">  
189 - <el-input v-model="es_editForm.port" style="width:280px" size="small" clearable 192 + <el-form-item label="" prop="port">
  193 + <el-input v-model="es_editForm.port" style="width:300px" size="small" clearable
190 placeholder="请输入端口号"> 194 placeholder="请输入端口号">
  195 + <template slot="prepend" >&nbsp;&nbsp;端口号&nbsp;&nbsp;</template>
191 </el-input> 196 </el-input>
192 </el-form-item> 197 </el-form-item>
193 - <el-form-item label="默认节点类型：" prop="isMaster">  
194 - <el-select v-model="es_editForm.isMaster" style="width: 280px" clearable  
195 - size="small" placeholder="请选择默认节点类型？"> 198 + <el-form-item label="" prop="description">
  199 + <el-input v-model="es_editForm.description" style="width:300px" size="small" clearable
  200 + placeholder="请输入相关描述">
  201 + <template slot="prepend" >相关描述</template>
  202 + </el-input>
  203 + </el-form-item>
  204 + <el-form-item label="" prop="isMaster">
  205 + <el-select v-model="es_editForm.isMaster" style="width: 300px" clearable
  206 + size="small" placeholder="请选择默认节点类型">
196 <el-option 207 <el-option
197 v-for="item in isMasterList" 208 v-for="item in isMasterList"
198 :key="item.value" 209 :key="item.value"
@@ -201,14 +212,9 @@ @@ -201,14 +212,9 @@
201 </el-option> 212 </el-option>
202 </el-select> 213 </el-select>
203 </el-form-item> 214 </el-form-item>
204 - <el-form-item label="相关描述：" prop="description">  
205 - <el-input v-model="es_editForm.description" style="width:280px" size="small" clearable  
206 - placeholder="请输入相关描述">  
207 - </el-input>  
208 - </el-form-item>  
209 </el-form> 215 </el-form>
210 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 216 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
211 - <el-button type="info" @click="es_dialog.editDialog = false" size="medium" style="width: 100px"> 217 + <el-button type="info" @click="es_dialog.editDialog = false" size="medium" style="width: 100px;background-color: #6F8294;color: #ffffff">
212 取消 218 取消
213 </el-button> 219 </el-button>
214 <el-button type="success" @click="es_edit_test" :loading="es_loading.editLoading" size="medium" style="width: 100px"> 220 <el-button type="success" @click="es_edit_test" :loading="es_loading.editLoading" size="medium" style="width: 100px">
@@ -240,6 +246,7 @@ @@ -240,6 +246,7 @@
240 data() { 246 data() {
241 return { 247 return {
242 status: undefined, 248 status: undefined,
  249 + labelPosition:'right',
243 /** 250 /**
244 * 搜索参数 251 * 搜索参数
245 */ 252 */
@@ -269,7 +276,7 @@ @@ -269,7 +276,7 @@
269 hostname: '', 276 hostname: '',
270 port: 9200, 277 port: 9200,
271 // elasticsearchState: true, 278 // elasticsearchState: true,
272 - isMaster: false, 279 + isMaster: '',
273 description: '', 280 description: '',
274 }, 281 },
275 282
@@ -739,4 +746,4 @@ @@ -739,4 +746,4 @@
739 746
740 <style scoped> 747 <style scoped>
741 748
742 -</style>  
  749 +</style>
@@ -5,12 +5,14 @@ @@ -5,12 +5,14 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="exchange_queryInfo.exchangeName" prefix-icon="el-icon-search" 8 + <el-col :span="7">
  9 + <el-input v-model="exchange_queryInfo.exchangeName"
10 size="medium" 10 size="medium"
11 - placeholder="交换机名称" clearable></el-input> 11 + placeholder="交换机名称" clearable>
  12 + <template slot="prepend" ><i class="el-icon-user"></i>用户名称</template>
  13 + </el-input>
12 </el-col> 14 </el-col>
13 - <el-col :span="4"> 15 + <el-col :span="7">
14 <el-cascader 16 <el-cascader
15 size="medium" filterable 17 size="medium" filterable
16 v-model="exchange_queryInfo.virtualHostId" 18 v-model="exchange_queryInfo.virtualHostId"
@@ -18,15 +20,16 @@ @@ -18,15 +20,16 @@
18 :show-all-levels="false" 20 :show-all-levels="false"
19 :change-on-select="false" 21 :change-on-select="false"
20 clearable 22 clearable
  23 + style="width: 80%"
21 @change="cascadeQueryChange" 24 @change="cascadeQueryChange"
22 :props="exchange_config.cascade.defaultParams" 25 :props="exchange_config.cascade.defaultParams"
23 placeholder="请选择所属虚拟主机"></el-cascader> 26 placeholder="请选择所属虚拟主机"></el-cascader>
24 </el-col> 27 </el-col>
25 <el-col :span="8"> 28 <el-col :span="8">
26 - <el-button type="success" style="width:150px" size="medium" @click="exchange_getList"> 29 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="exchange_getList">
27 查询交换机 30 查询交换机
28 </el-button> 31 </el-button>
29 - <el-button type="primary" style="width:150px" size="medium" @click="exchange_toAddDialog"> 32 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="exchange_toAddDialog">
30 添加交换机 33 添加交换机
31 </el-button> 34 </el-button>
32 </el-col> 35 </el-col>
@@ -35,8 +38,10 @@ @@ -35,8 +38,10 @@
35 <!-- 列表区域 --> 38 <!-- 列表区域 -->
36 <div style="margin-top: 20px;"> 39 <div style="margin-top: 20px;">
37 <el-table :data="exchange_page.exchangeList" border v-loading="exchange_loading.listLoading" 40 <el-table :data="exchange_page.exchangeList" border v-loading="exchange_loading.listLoading"
38 - @selection-change="exchange_selectChange"  
39 - element-loading-text="获取交换机列表，拼命加载中"> 41 + @selection-change="exchange_selectChange" size="small"
  42 + element-loading-text="获取交换机列表，拼命加载中" width="232px"
  43 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  44 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
40 <el-table-column type="selection" width="55" align="center"></el-table-column> 45 <el-table-column type="selection" width="55" align="center"></el-table-column>
41 <el-table-column type="index" align="center"></el-table-column> 46 <el-table-column type="index" align="center"></el-table-column>
42 <el-table-column label="交换机名称" prop="exchangeName" align="center" 47 <el-table-column label="交换机名称" prop="exchangeName" align="center"
@@ -66,7 +71,7 @@ @@ -66,7 +71,7 @@
66 <el-table-column label="扩展参数" prop="arguments" align="center" width="200"> 71 <el-table-column label="扩展参数" prop="arguments" align="center" width="200">
67 </el-table-column> 72 </el-table-column>
68 <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column> 73 <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>
69 - <el-table-column label="操作" width="280px" align="center" fixed="right"> 74 + <el-table-column label="操作" width="300px" align="center" fixed="right">
70 <template slot-scope="scope"> 75 <template slot-scope="scope">
71 <!-- 路由键 style="width:50px;margin-left: 1px;"--> 76 <!-- 路由键 style="width:50px;margin-left: 1px;"-->
72 <el-tooltip effect="dark" content="路由键" placement="top-start" :enterable="false"> 77 <el-tooltip effect="dark" content="路由键" placement="top-start" :enterable="false">
@@ -120,18 +125,20 @@ @@ -120,18 +125,20 @@
120 <el-dialog title="添加交换机" 125 <el-dialog title="添加交换机"
121 :visible.sync="exchange_dialog.addDialog" 126 :visible.sync="exchange_dialog.addDialog"
122 style="margin-top: -50px" 127 style="margin-top: -50px"
123 - width="62%" text-align="center" @close="exchange_addDialogClosed"> 128 + width="60%" text-align="center" @close="exchange_addDialogClosed">
124 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" 129 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px"
125 - :model="exchange_addForm" :rules="exchange_addFormRules" ref="exchange_addFormRef">  
126 - <el-form-item label="交换机名称：" prop="exchangeName">  
127 - <el-input v-model="exchange_addForm.exchangeName" style="width:240px" size="small" clearable 130 + :model="exchange_addForm" :rules="exchange_addFormRules" ref="exchange_addFormRef" align="center">
  131 + <el-form-item label="" prop="exchangeName">
  132 + <el-input v-model="exchange_addForm.exchangeName" style="width:300px" size="small" clearable
128 placeholder="请输入交换机名称"> 133 placeholder="请输入交换机名称">
  134 + <template slot="prepend" >交换机名称</template>
129 </el-input> 135 </el-input>
130 </el-form-item> 136 </el-form-item>
131 - <el-form-item label="所属虚拟主机：" prop="virtualHostId"> 137 +
  138 + <el-form-item label="" prop="virtualHostId">
132 <el-cascader 139 <el-cascader
133 clearable filterable 140 clearable filterable
134 - style="width: 240px" size="small" 141 + style="width: 300px" size="small"
135 v-model="exchange_addForm.virtualHostId" 142 v-model="exchange_addForm.virtualHostId"
136 @change="cascadeAddChange" 143 @change="cascadeAddChange"
137 :options="exchange_config.cascade.server_hostList" 144 :options="exchange_config.cascade.server_hostList"
@@ -141,8 +148,8 @@ @@ -141,8 +148,8 @@
141 placeholder="请选择所属虚拟主机"> 148 placeholder="请选择所属虚拟主机">
142 </el-cascader> 149 </el-cascader>
143 </el-form-item> 150 </el-form-item>
144 - <el-form-item label="交换机类型：" prop="exchangeType">  
145 - <el-select v-model="exchange_addForm.exchangeType" style="width: 240px" clearable 151 + <el-form-item label="" prop="exchangeType">
  152 + <el-select v-model="exchange_addForm.exchangeType" style="width: 300px" clearable
146 size="small" disabled 153 size="small" disabled
147 placeholder="请选择交换机类型"> 154 placeholder="请选择交换机类型">
148 <el-option 155 <el-option
@@ -153,8 +160,8 @@ @@ -153,8 +160,8 @@
153 </el-option> 160 </el-option>
154 </el-select> 161 </el-select>
155 </el-form-item> 162 </el-form-item>
156 - <el-form-item label="是否持久化：" prop="durability">  
157 - <el-select v-model="exchange_addForm.durability" style="width: 240px" clearable size="small" 163 + <el-form-item label="" prop="durability">
  164 + <el-select v-model="exchange_addForm.durability" style="width: 300px" clearable size="small"
158 placeholder="请选择是否持久化"> 165 placeholder="请选择是否持久化">
159 <el-option 166 <el-option
160 v-for="item in booleanList" 167 v-for="item in booleanList"
@@ -164,8 +171,8 @@ @@ -164,8 +171,8 @@
164 </el-option> 171 </el-option>
165 </el-select> 172 </el-select>
166 </el-form-item> 173 </el-form-item>
167 - <el-form-item label="是否自动删除：" prop="autoDelete">  
168 - <el-select v-model="exchange_addForm.autoDelete" style="width: 240px" clearable size="small" 174 + <el-form-item label="" prop="autoDelete">
  175 + <el-select v-model="exchange_addForm.autoDelete" style="width: 300px" clearable size="small"
169 placeholder="请选择是否自动删除"> 176 placeholder="请选择是否自动删除">
170 <el-option 177 <el-option
171 v-for="item in booleanList" 178 v-for="item in booleanList"
@@ -175,8 +182,8 @@ @@ -175,8 +182,8 @@
175 </el-option> 182 </el-option>
176 </el-select> 183 </el-select>
177 </el-form-item> 184 </el-form-item>
178 - <el-form-item label="是否仅内部使用：" prop="internal">  
179 - <el-select v-model="exchange_addForm.internal" style="width: 240px" clearable size="small" 185 + <el-form-item label="" prop="internal">
  186 + <el-select v-model="exchange_addForm.internal" style="width: 300px" clearable size="small"
180 placeholder="是否仅内部使用"> 187 placeholder="是否仅内部使用">
181 <el-option 188 <el-option
182 v-for="item in booleanList" 189 v-for="item in booleanList"
@@ -186,14 +193,14 @@ @@ -186,14 +193,14 @@
186 </el-option> 193 </el-option>
187 </el-select> 194 </el-select>
188 </el-form-item> 195 </el-form-item>
189 - <el-form-item label="扩展参数：" prop="arguments">  
190 - <el-input v-model="exchange_addForm.arguments" style="width:240px" clearable size="small" 196 + <el-form-item label="" prop="arguments">
  197 + <el-input v-model="exchange_addForm.arguments" style="width:300px" clearable size="small"
191 type="textarea" autosize :rows="1" 198 type="textarea" autosize :rows="1"
192 placeholder="扩展参数（JSON格式）"> 199 placeholder="扩展参数（JSON格式）">
193 </el-input> 200 </el-input>
194 </el-form-item> 201 </el-form-item>
195 - <el-form-item label="相关描述：" prop="description">  
196 - <el-input v-model="exchange_addForm.description" style="width:240px" clearable size="small" 202 + <el-form-item label="" prop="description">
  203 + <el-input v-model="exchange_addForm.description" style="width:300px" clearable size="small"
197 type="textarea" autosize :rows="1" 204 type="textarea" autosize :rows="1"
198 placeholder="相关描述"> 205 placeholder="相关描述">
199 </el-input> 206 </el-input>
@@ -201,7 +208,7 @@ @@ -201,7 +208,7 @@
201 </el-form> 208 </el-form>
202 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 209 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
203 <el-button type="info" @click="exchange_dialog.addDialog = false" size="medium" 210 <el-button type="info" @click="exchange_dialog.addDialog = false" size="medium"
204 - style="width: 100px">取消 211 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
205 </el-button> 212 </el-button>
206 <el-button type="primary" @click="exchange_add" :loading="exchange_loading.addLoading" 213 <el-button type="primary" @click="exchange_add" :loading="exchange_loading.addLoading"
207 size="medium" style="width: 100px">添加 214 size="medium" style="width: 100px">添加
@@ -214,19 +221,20 @@ @@ -214,19 +221,20 @@
214 <el-dialog title="编辑交换机" 221 <el-dialog title="编辑交换机"
215 :visible.sync="exchange_dialog.editDialog" 222 :visible.sync="exchange_dialog.editDialog"
216 style="margin-top: -50px" 223 style="margin-top: -50px"
217 - width="62%" text-align="center" @close="exchange_editDialogClosed">  
218 - <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" 224 + width="60%" text-align="center" @close="exchange_editDialogClosed">
  225 + <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" align="center"
219 :model="exchange_editForm" :rules="exchange_editFormRules" ref="exchange_editFormRef"> 226 :model="exchange_editForm" :rules="exchange_editFormRules" ref="exchange_editFormRef">
220 - <el-form-item label="交换机名称：" prop="exchangeName">  
221 - <el-input v-model="exchange_editForm.exchangeName" style="width:240px" size="small" 227 + <el-form-item label="" prop="exchangeName">
  228 + <el-input v-model="exchange_editForm.exchangeName" style="width:300px" size="small"
222 clearable disabled 229 clearable disabled
223 placeholder="请输入交换机名称"> 230 placeholder="请输入交换机名称">
  231 + <template slot="prepend" >服务器名称</template>
224 </el-input> 232 </el-input>
225 </el-form-item> 233 </el-form-item>
226 - <el-form-item label="所属虚拟主机：" prop="virtualHostId"> 234 + <el-form-item label="" prop="virtualHostId">
227 <el-cascader 235 <el-cascader
228 disabled filterable 236 disabled filterable
229 - clearable style="width: 240px" size="small" 237 + clearable style="width: 300px" size="small"
230 v-model="exchange_editForm.virtualHostId" 238 v-model="exchange_editForm.virtualHostId"
231 @change="cascadeEditChange" 239 @change="cascadeEditChange"
232 :options="exchange_config.cascade.server_hostList" 240 :options="exchange_config.cascade.server_hostList"
@@ -235,8 +243,8 @@ @@ -235,8 +243,8 @@
235 :props="exchange_config.cascade.defaultParams" 243 :props="exchange_config.cascade.defaultParams"
236 placeholder="请选择所属虚拟主机"></el-cascader> 244 placeholder="请选择所属虚拟主机"></el-cascader>
237 </el-form-item> 245 </el-form-item>
238 - <el-form-item label="交换机类型：" prop="exchangeType">  
239 - <el-select v-model="exchange_editForm.exchangeType" style="width: 240px" clearable 246 + <el-form-item label="" prop="exchangeType">
  247 + <el-select v-model="exchange_editForm.exchangeType" style="width: 300px" clearable
240 size="small" disabled 248 size="small" disabled
241 placeholder="请选择交换机类型"> 249 placeholder="请选择交换机类型">
242 <el-option 250 <el-option
@@ -247,8 +255,8 @@ @@ -247,8 +255,8 @@
247 </el-option> 255 </el-option>
248 </el-select> 256 </el-select>
249 </el-form-item> 257 </el-form-item>
250 - <el-form-item label="是否持久化：" prop="durability">  
251 - <el-select v-model="exchange_editForm.durability" style="width: 240px" clearable 258 + <el-form-item label="" prop="durability">
  259 + <el-select v-model="exchange_editForm.durability" style="width: 300px" clearable
252 size="small" disabled 260 size="small" disabled
253 placeholder="请选择是否持久化"> 261 placeholder="请选择是否持久化">
254 <el-option 262 <el-option
@@ -259,8 +267,8 @@ @@ -259,8 +267,8 @@
259 </el-option> 267 </el-option>
260 </el-select> 268 </el-select>
261 </el-form-item> 269 </el-form-item>
262 - <el-form-item label="是否自动删除：" prop="autoDelete">  
263 - <el-select v-model="exchange_editForm.autoDelete" style="width: 240px" clearable 270 + <el-form-item label="" prop="autoDelete">
  271 + <el-select v-model="exchange_editForm.autoDelete" style="width: 300px" clearable
264 size="small" disabled 272 size="small" disabled
265 placeholder="请选择是否自动删除"> 273 placeholder="请选择是否自动删除">
266 <el-option 274 <el-option
@@ -271,8 +279,8 @@ @@ -271,8 +279,8 @@
271 </el-option> 279 </el-option>
272 </el-select> 280 </el-select>
273 </el-form-item> 281 </el-form-item>
274 - <el-form-item label="是否仅内部使用：" prop="internal">  
275 - <el-select v-model="exchange_editForm.internal" style="width: 240px" disabled clearable 282 + <el-form-item label="" prop="internal">
  283 + <el-select v-model="exchange_editForm.internal" style="width: 300px" disabled clearable
276 size="small" 284 size="small"
277 placeholder="是否仅内部使用"> 285 placeholder="是否仅内部使用">
278 <el-option 286 <el-option
@@ -283,23 +291,23 @@ @@ -283,23 +291,23 @@
283 </el-option> 291 </el-option>
284 </el-select> 292 </el-select>
285 </el-form-item> 293 </el-form-item>
286 - <el-form-item label="扩展参数：" prop="arguments">  
287 - <el-input v-model="exchange_editForm.arguments" style="width:240px" disabled clearable 294 + <el-form-item label="" prop="arguments">
  295 + <el-input v-model="exchange_editForm.arguments" style="width:300px" disabled clearable
288 size="small" type="textarea" autosize :rows="1" 296 size="small" type="textarea" autosize :rows="1"
289 placeholder="扩展参数（JSON格式）"> 297 placeholder="扩展参数（JSON格式）">
290 </el-input> 298 </el-input>
291 </el-form-item> 299 </el-form-item>
292 - <el-form-item label="相关描述：" prop="description">  
293 - <el-input v-model="exchange_editForm.description" style="width:240px" clearable size="small" 300 + <el-form-item label="" prop="description">
  301 + <el-input v-model="exchange_editForm.description" style="width:300px" clearable size="small"
294 type="textarea" autosize :rows="1" 302 type="textarea" autosize :rows="1"
295 placeholder="相关描述"> 303 placeholder="相关描述">
296 </el-input> 304 </el-input>
297 </el-form-item> 305 </el-form-item>
298 </el-form> 306 </el-form>
299 307
300 - <div slot="footer" class="dialog-footer" style="text-align: center"> 308 + <div slot="footer" class="dialog-footer" align="center">
301 <el-button type="info" @click="exchange_dialog.editDialog = false" size="medium" 309 <el-button type="info" @click="exchange_dialog.editDialog = false" size="medium"
302 - style="width: 100px">取消 310 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
303 </el-button> 311 </el-button>
304 <el-button type="primary" @click="exchange_edit" :loading="exchange_loading.addLoading" 312 <el-button type="primary" @click="exchange_edit" :loading="exchange_loading.addLoading"
305 size="medium" 313 size="medium"
@@ -381,11 +389,11 @@ @@ -381,11 +389,11 @@
381 // 交换机类型,默认 direct；direct(路由-订阅)、topic(动态路由-订阅)、fanout(广播) 389 // 交换机类型,默认 direct；direct(路由-订阅)、topic(动态路由-订阅)、fanout(广播)
382 exchangeType: 'direct', 390 exchangeType: 'direct',
383 // 是否持久化，默认 true 391 // 是否持久化，默认 true
384 - durability: true, 392 + durability: '',
385 // 是否自动删除,默认 false 393 // 是否自动删除,默认 false
386 - autoDelete: false, 394 + autoDelete: '',
387 //是否是RabbitMQ内部使用，默认 false 395 //是否是RabbitMQ内部使用，默认 false
388 - internal: false, 396 + internal: '',
389 // 扩展参数，以JSON格式存储 397 // 扩展参数，以JSON格式存储
390 arguments: '', 398 arguments: '',
391 // 交换机相关描述 399 // 交换机相关描述
@@ -5,50 +5,64 @@ @@ -5,50 +5,64 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="messageNote_queryInfo.serverName" placeholder="服务器名称"  
10 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 8 + <el-col :span="5">
  9 + <el-input v-model="messageNote_queryInfo.username" placeholder="用户名称"
  10 + size="medium" clearable >
  11 + <template slot="prepend" ><i class="el-icon-user"></i>&nbsp;用&nbsp;户&nbsp;名&nbsp;称</template>
  12 + </el-input>
11 </el-col> 13 </el-col>
12 - <el-col :span="4">  
13 - <el-input v-model="messageNote_queryInfo.virtualHostName"  
14 - size="medium" clearable prefix-icon="el-icon-search"  
15 - placeholder="虚拟主机名称"></el-input> 14 + <el-col :span="6">
  15 + <el-input v-model="messageNote_queryInfo.alias_sendContent" placeholder="发送内容"
  16 + size="medium" clearable>
  17 + <template slot="prepend" ><i class="el-icon-document-checked"></i>&nbsp;发&nbsp;送&nbsp;内&nbsp;容</template>
  18 + </el-input>
16 </el-col> 19 </el-col>
17 - <el-col :span="4">  
18 - <el-input v-model="messageNote_queryInfo.exchangeName" placeholder="交换机名称"  
19 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 20 + <el-col :span="6">
  21 + <el-input v-model="messageNote_queryInfo.serverName" placeholder="服务器名称"
  22 + size="medium" clearable>
  23 + <template slot="prepend"><i class="el-icon-s-platform"></i>服务器名称</template>
  24 + </el-input>
20 </el-col> 25 </el-col>
21 - <el-col :span="4">  
22 - <el-input v-model="messageNote_queryInfo.routingKeyName" placeholder="路由键名称"  
23 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 26 + <el-col :span="6">
  27 + <el-input v-model="messageNote_queryInfo.virtualHostName"
  28 + size="medium" clearable
  29 + placeholder="虚拟主机名称">
  30 + <template slot="prepend"><i class="el-icon-s-operation"></i>虚拟主机名称</template>
  31 + </el-input>
24 </el-col> 32 </el-col>
  33 +
25 </el-row> 34 </el-row>
26 <el-row> 35 <el-row>
27 - <el-col :span="4">  
28 - <el-input v-model="messageNote_queryInfo.username" placeholder="用户名称"  
29 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 36 + <el-col :span="5">
  37 + <el-input v-model="messageNote_queryInfo.exchangeName" placeholder="交换机名称"
  38 + size="medium" clearable >
  39 + <template slot="prepend"><i class="el-icon-sort"></i>交换机名称</template>
  40 + </el-input>
30 </el-col> 41 </el-col>
31 - <el-col :span="4">  
32 - <el-input v-model="messageNote_queryInfo.alias_sendContent" placeholder="发送内容"  
33 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 42 + <el-col :span="6">
  43 + <el-input v-model="messageNote_queryInfo.routingKeyName" placeholder="路由键名称"
  44 + size="medium" clearable >
  45 + <template slot="prepend" ><i class="el-icon-user"></i>路由键名称</template>
  46 + </el-input>
34 </el-col> 47 </el-col>
35 - <el-col :span="4"> 48 +
  49 + <el-col :span="6">
36 <el-date-picker v-model="messageNote_queryInfo.sendTimeBegin" placeholder="时间段-开始" 50 <el-date-picker v-model="messageNote_queryInfo.sendTimeBegin" placeholder="时间段-开始"
37 type="date" value-format="yyyy-MM-dd" 51 type="date" value-format="yyyy-MM-dd"
38 - size="medium" style="width: auto"></el-date-picker> 52 + size="medium" style="width: 100%"></el-date-picker>
39 </el-col> 53 </el-col>
40 - <el-col :span="4"> 54 + <el-col :span="6">
41 <el-date-picker v-model="messageNote_queryInfo.sendTimeEnd" placeholder="时间段-结束" 55 <el-date-picker v-model="messageNote_queryInfo.sendTimeEnd" placeholder="时间段-结束"
42 type="date" value-format="yyyy-MM-dd" 56 type="date" value-format="yyyy-MM-dd"
43 - size="medium" style="width: auto"></el-date-picker> 57 + size="medium" style="width: 100%"></el-date-picker>
44 </el-col> 58 </el-col>
45 </el-row> 59 </el-row>
46 <el-row> 60 <el-row>
47 <el-col :span="15"> 61 <el-col :span="15">
48 - <el-button type="success" style="width:150px" size="medium" @click="messageNote_getList"> 62 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="messageNote_getList">
49 查询消息记录 63 查询消息记录
50 </el-button> 64 </el-button>
51 - <el-button type="primary" style="width:150px" size="medium" 65 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus"
52 @click="messageNote_toAddDialog"> 66 @click="messageNote_toAddDialog">
53 发送消息 67 发送消息
54 </el-button> 68 </el-button>
@@ -64,7 +78,9 @@ @@ -64,7 +78,9 @@
64 <el-table :data="messageNote_page.messageNoteList" border 78 <el-table :data="messageNote_page.messageNoteList" border
65 v-loading="messageNote_loading.listLoading" size="small" 79 v-loading="messageNote_loading.listLoading" size="small"
66 @selection-change="messageNote_selectChange" 80 @selection-change="messageNote_selectChange"
67 - element-loading-text="获取消息收发记录，拼命加载中"> 81 + element-loading-text="获取消息收发记录，拼命加载中"
  82 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  83 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
68 <el-table-column type="selection" width="55" align="center"></el-table-column> 84 <el-table-column type="selection" width="55" align="center"></el-table-column>
69 <el-table-column type="index" align="center"></el-table-column> 85 <el-table-column type="index" align="center"></el-table-column>
70 <el-table-column label="用户名称" prop="username" align="center" width="120"></el-table-column> 86 <el-table-column label="用户名称" prop="username" align="center" width="120"></el-table-column>
@@ -144,7 +160,7 @@ @@ -144,7 +160,7 @@
144 </el-form> 160 </el-form>
145 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 161 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
146 <el-button type="info" @click="messageNote_dialog.deleteTimeDialog = false" size="medium" 162 <el-button type="info" @click="messageNote_dialog.deleteTimeDialog = false" size="medium"
147 - style="width: 100px">取消 163 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
148 </el-button> 164 </el-button>
149 <el-button type="primary" @click="messageNote_setDeleteTime" 165 <el-button type="primary" @click="messageNote_setDeleteTime"
150 :loading="messageNote_loading.addLoading" 166 :loading="messageNote_loading.addLoading"
@@ -157,15 +173,15 @@ @@ -157,15 +173,15 @@
157 <div> 173 <div>
158 <el-dialog title="发送消息" 174 <el-dialog title="发送消息"
159 :visible.sync="messageNote_dialog.addDialog" 175 :visible.sync="messageNote_dialog.addDialog"
160 - style="margin-top: -50px" text-align="center" width="65%" 176 + style="margin-top: -50px" text-align="center" width="60%"
161 @close="messageNote_addDialogClosed"> 177 @close="messageNote_addDialogClosed">
162 178
163 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 179 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
164 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef"> 180 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef">
165 - <el-form-item label="用户名称：" prop="username"> 181 + <el-form-item label="" prop="username">
166 <el-select v-model="messageNote_addForm.username" prefix-icon="el-icon-search" clearable 182 <el-select v-model="messageNote_addForm.username" prefix-icon="el-icon-search" clearable
167 style="width:300px" size="medium" filterable 183 style="width:300px" size="medium" filterable
168 - placeholder="请选择用户"> 184 + placeholder="请选择用户名称">
169 <el-option 185 <el-option
170 v-for="item in (user_cloud.cloudUserList)" 186 v-for="item in (user_cloud.cloudUserList)"
171 :key="item.id" 187 :key="item.id"
@@ -176,11 +192,11 @@ @@ -176,11 +192,11 @@
176 </el-option> 192 </el-option>
177 </el-select> 193 </el-select>
178 </el-form-item> 194 </el-form-item>
179 - <el-form-item label="服务器名称：" prop="serverId"> 195 + <el-form-item label="" prop="serverId">
180 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable 196 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable
181 style="width:300px" size="small" 197 style="width:300px" size="small"
182 @change="messageNote_server_addChange" 198 @change="messageNote_server_addChange"
183 - placeholder="请选择所属服务器"> 199 + placeholder="请选择所属服务器名称">
184 <el-option 200 <el-option
185 v-for="item in (messageNote_config.serverList)" 201 v-for="item in (messageNote_config.serverList)"
186 :key="item.id" 202 :key="item.id"
@@ -190,7 +206,7 @@ @@ -190,7 +206,7 @@
190 </el-select> 206 </el-select>
191 </el-form-item> 207 </el-form-item>
192 208
193 - <el-form-item label="虚拟主机名称：" prop="virtualHostId"> 209 + <el-form-item label="" prop="virtualHostId">
194 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable 210 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable
195 style="width:300px" size="small" 211 style="width:300px" size="small"
196 @change="messageNote_virtualHost_addChange" 212 @change="messageNote_virtualHost_addChange"
@@ -205,7 +221,7 @@ @@ -205,7 +221,7 @@
205 </el-select> 221 </el-select>
206 </el-form-item> 222 </el-form-item>
207 223
208 - <el-form-item label="交换机名称：" prop="exchangeId"> 224 + <el-form-item label="" prop="exchangeId">
209 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable 225 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable
210 style="width:300px" size="small" 226 style="width:300px" size="small"
211 @change="messageNote_exchange_addChange" 227 @change="messageNote_exchange_addChange"
@@ -220,7 +236,7 @@ @@ -220,7 +236,7 @@
220 </el-select> 236 </el-select>
221 </el-form-item> 237 </el-form-item>
222 238
223 - <el-form-item label="路由键名称：" prop="routingKeyId"> 239 + <el-form-item label="" prop="routingKeyId">
224 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable 240 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable
225 style="width:300px" size="small" 241 style="width:300px" size="small"
226 :disabled="messageNote_addForm.exchangeId===''" 242 :disabled="messageNote_addForm.exchangeId===''"
@@ -233,10 +249,10 @@ @@ -233,10 +249,10 @@
233 </el-option> 249 </el-option>
234 </el-select> 250 </el-select>
235 </el-form-item> 251 </el-form-item>
236 - <el-form-item label="消息发送时间：" prop="sendTime"> 252 + <el-form-item label="" prop="sendTime">
237 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime" 253 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime"
238 value-format="yyyy-MM-dd HH:mm:ss" 254 value-format="yyyy-MM-dd HH:mm:ss"
239 - placeholder="选择发送时间" size="small" style="width:300px"></el-date-picker> 255 + placeholder="选择消息发送时间" size="small" style="width:300px"></el-date-picker>
240 </el-form-item> 256 </el-form-item>
241 <!-- <el-form-item label="消息获取时间：" prop="receiveTime">--> 257 <!-- <el-form-item label="消息获取时间：" prop="receiveTime">-->
242 <!-- <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"--> 258 <!-- <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"-->
@@ -244,13 +260,13 @@ @@ -244,13 +260,13 @@
244 <!-- placeholder="消息获取时间" size="small" style="width:300px"></el-date-picker>--> 260 <!-- placeholder="消息获取时间" size="small" style="width:300px"></el-date-picker>-->
245 <!-- </el-form-item>--> 261 <!-- </el-form-item>-->
246 262
247 - <el-form-item label="发送内容：" prop="alias_sendContent"> 263 + <el-form-item label="" prop="alias_sendContent">
248 <el-input v-model="messageNote_addForm.alias_sendContent" style="width:300px" size="small" 264 <el-input v-model="messageNote_addForm.alias_sendContent" style="width:300px" size="small"
249 clearable type="textarea" :rows="1" 265 clearable type="textarea" :rows="1"
250 placeholder="请输入发送内容"> 266 placeholder="请输入发送内容">
251 </el-input> 267 </el-input>
252 </el-form-item> 268 </el-form-item>
253 - <el-form-item label="相关描述：" prop="description"> 269 + <el-form-item label="" prop="description">
254 <el-input v-model="messageNote_addForm.description" style="width:300px" size="small" 270 <el-input v-model="messageNote_addForm.description" style="width:300px" size="small"
255 clearable type="textarea" :rows="1" 271 clearable type="textarea" :rows="1"
256 placeholder="请输入相关描述"> 272 placeholder="请输入相关描述">
@@ -259,7 +275,7 @@ @@ -259,7 +275,7 @@
259 </el-form> 275 </el-form>
260 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 276 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
261 <el-button type="info" @click="messageNote_dialog.addDialog = false" size="medium" 277 <el-button type="info" @click="messageNote_dialog.addDialog = false" size="medium"
262 - style="width: 100px">取消 278 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
263 </el-button> 279 </el-button>
264 <el-button type="primary" @click="messageNote_add" :loading="messageNote_loading.addLoading" 280 <el-button type="primary" @click="messageNote_add" :loading="messageNote_loading.addLoading"
265 size="medium" style="width: 100px">发送 281 size="medium" style="width: 100px">发送
@@ -4,12 +4,14 @@ @@ -4,12 +4,14 @@
4 <el-card style="background-color: #F5F7FA"> 4 <el-card style="background-color: #F5F7FA">
5 <div> 5 <div>
6 <el-row style="margin-left: 30px;"> 6 <el-row style="margin-left: 30px;">
7 - <el-col :span="4"> 7 + <el-col :span="7">
8 <el-input v-model="messageNote_queryInfo.alias_sendContent" placeholder="发送内容" 8 <el-input v-model="messageNote_queryInfo.alias_sendContent" placeholder="发送内容"
9 - size="medium" clearable prefix-icon="el-icon-search"></el-input> 9 + size="medium" clearable >
  10 + <template slot="prepend" ><i class="el-icon-document-checked"></i>发送内容</template>
  11 + </el-input>
10 </el-col> 12 </el-col>
11 - <el-col :span="4">  
12 - <el-button type="success" style="width:150px" size="medium" @click="messageNote_getList"> 13 + <el-col :span="8">
  14 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="messageNote_getList">
13 查询 15 查询
14 </el-button> 16 </el-button>
15 </el-col> 17 </el-col>
@@ -235,4 +237,4 @@ @@ -235,4 +237,4 @@
235 237
236 <style scoped> 238 <style scoped>
237 239
238 -</style>  
  240 +</style>
@@ -5,17 +5,21 @@ @@ -5,17 +5,21 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="queue_queryInfo.queueName" prefix-icon="el-icon-search" 8 + <el-col :span="7">
  9 + <el-input v-model="queue_queryInfo.queueName"
10 size="medium" 10 size="medium"
11 - placeholder="队列名称" clearable></el-input> 11 + placeholder="队列名称" clearable>
  12 + <template slot="prepend" ><i class="el-icon-notebook-2"></i>队列名称</template>
  13 + </el-input>
12 </el-col> 14 </el-col>
13 15
14 - <el-col :span="4">  
15 - <el-input v-model="queue_queryInfo.username" prefix-icon="el-icon-search"  
16 - size="medium" placeholder="所属用户" clearable></el-input> 16 + <el-col :span="7">
  17 + <el-input v-model="queue_queryInfo.username"
  18 + size="medium" placeholder="所属用户" clearable>
  19 + <template slot="prepend" ><i class="el-icon-user"></i>所属用户</template>
  20 + </el-input>
17 </el-col> 21 </el-col>
18 - <el-col :span="4"> 22 + <el-col :span="5">
19 <el-cascader 23 <el-cascader
20 size="medium" 24 size="medium"
21 v-model="queue_queryInfo.virtualHostId" 25 v-model="queue_queryInfo.virtualHostId"
@@ -25,13 +29,15 @@ @@ -25,13 +29,15 @@
25 clearable filterable 29 clearable filterable
26 @change="cascadeQueryChange" 30 @change="cascadeQueryChange"
27 :props="queue_config.cascade.defaultParams" 31 :props="queue_config.cascade.defaultParams"
28 - placeholder="请选择所属虚拟主机"></el-cascader> 32 + placeholder="请选择所属虚拟主机"
  33 + slot="append">
  34 + </el-cascader>
29 </el-col> 35 </el-col>
30 <el-col :span="8"> 36 <el-col :span="8">
31 - <el-button type="success" style="width:150px" size="medium" @click="queue_getList"> 37 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="queue_getList">
32 查询队列 38 查询队列
33 </el-button> 39 </el-button>
34 - <el-button type="primary" style="width:150px" size="medium" @click="queue_toAddDialog"> 40 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="queue_toAddDialog">
35 添加队列 41 添加队列
36 </el-button> 42 </el-button>
37 </el-col> 43 </el-col>
@@ -41,7 +47,9 @@ @@ -41,7 +47,9 @@
41 <div style="margin-top: 20px;"> 47 <div style="margin-top: 20px;">
42 <el-table :data="queue_page.queueList" border v-loading="queue_loading.listLoading" 48 <el-table :data="queue_page.queueList" border v-loading="queue_loading.listLoading"
43 @selection-change="queue_selectChange" 49 @selection-change="queue_selectChange"
44 - element-loading-text="获取队列列表，拼命加载中"> 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;">
45 <el-table-column type="selection" width="55" align="center"></el-table-column> 53 <el-table-column type="selection" width="55" align="center"></el-table-column>
46 <el-table-column type="index" align="center"></el-table-column> 54 <el-table-column type="index" align="center"></el-table-column>
47 <el-table-column label="队列名称" prop="queueName" align="center" 55 <el-table-column label="队列名称" prop="queueName" align="center"
@@ -118,18 +126,19 @@ @@ -118,18 +126,19 @@
118 :visible.sync="queue_dialog.addDialog" 126 :visible.sync="queue_dialog.addDialog"
119 style="margin-top: -50px" text-align="center" width="60%" 127 style="margin-top: -50px" text-align="center" width="60%"
120 @close="queue_addDialogClosed"> 128 @close="queue_addDialogClosed">
121 -  
122 - <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px;margin-left: 60px"  
123 - :model="queue_addForm" :rules="queue_addFormRules" ref="queue_addFormRef">  
124 - <el-form-item label="队列名称：" prop="queueName">  
125 - <el-input v-model="queue_addForm.queueName" style="width:240px" size="small" clearable 129 + <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px"
  130 + :model="queue_addForm" :rules="queue_addFormRules" ref="queue_addFormRef" align="center">
  131 + <el-form-item label="" prop="queueName">
  132 + <el-input v-model="queue_addForm.queueName" style="width:300px" size="small" clearable
126 placeholder="请输入队列名称"> 133 placeholder="请输入队列名称">
  134 + <template slot="prepend" >队列名称</template>
127 </el-input> 135 </el-input>
128 </el-form-item> 136 </el-form-item>
129 137
130 - <el-form-item label="用户名称：" prop="username">  
131 - <el-input v-model="queue_addForm.username" style="width:240px" size="small" clearable 138 + <el-form-item label="" prop="username">
  139 + <el-input v-model="queue_addForm.username" style="width:300px" size="small" clearable
132 placeholder="请输入用户名称"> 140 placeholder="请输入用户名称">
  141 + <template slot="prepend" >用户名称</template>
133 </el-input> 142 </el-input>
134 </el-form-item> 143 </el-form-item>
135 144
@@ -146,9 +155,9 @@ @@ -146,9 +155,9 @@
146 <!-- </el-select>--> 155 <!-- </el-select>-->
147 <!-- </el-form-item>--> 156 <!-- </el-form-item>-->
148 157
149 - <el-form-item label="所属虚拟主机：" prop="virtualHostId"> 158 + <el-form-item label="" prop="virtualHostId">
150 <el-cascader 159 <el-cascader
151 - clearable style="width: 240px" size="small" 160 + clearable style="width: 300px" size="small"
152 v-model="queue_addForm.virtualHostId" 161 v-model="queue_addForm.virtualHostId"
153 @change="cascadeAddChange" 162 @change="cascadeAddChange"
154 :options="queue_config.cascade.server_hostList" 163 :options="queue_config.cascade.server_hostList"
@@ -158,8 +167,8 @@ @@ -158,8 +167,8 @@
158 placeholder="请选择所属虚拟主机"></el-cascader> 167 placeholder="请选择所属虚拟主机"></el-cascader>
159 </el-form-item> 168 </el-form-item>
160 169
161 - <el-form-item label="是否持久化：" prop="durability">  
162 - <el-select v-model="queue_addForm.durability" style="width: 240px" clearable size="small" 170 + <el-form-item label="" prop="durability">
  171 + <el-select v-model="queue_addForm.durability" style="width: 300px" clearable size="small"
163 placeholder="请选择是否持久化"> 172 placeholder="请选择是否持久化">
164 <el-option 173 <el-option
165 v-for="item in booleanList" 174 v-for="item in booleanList"
@@ -169,8 +178,8 @@ @@ -169,8 +178,8 @@
169 </el-option> 178 </el-option>
170 </el-select> 179 </el-select>
171 </el-form-item> 180 </el-form-item>
172 - <el-form-item label="是否自动删除：" prop="autoDelete">  
173 - <el-select v-model="queue_addForm.autoDelete" style="width: 240px" clearable size="small" 181 + <el-form-item label="" prop="autoDelete">
  182 + <el-select v-model="queue_addForm.autoDelete" style="width: 300px" clearable size="small"
174 placeholder="请选择是否自动删除"> 183 placeholder="请选择是否自动删除">
175 <el-option 184 <el-option
176 v-for="item in booleanList" 185 v-for="item in booleanList"
@@ -180,14 +189,14 @@ @@ -180,14 +189,14 @@
180 </el-option> 189 </el-option>
181 </el-select> 190 </el-select>
182 </el-form-item> 191 </el-form-item>
183 - <el-form-item label="扩展参数：" prop="arguments">  
184 - <el-input v-model="queue_addForm.arguments" style="width:240px" clearable size="small" 192 + <el-form-item label="" prop="arguments">
  193 + <el-input v-model="queue_addForm.arguments" style="width:300px" clearable size="small"
185 type="textarea" autosize :rows="1" 194 type="textarea" autosize :rows="1"
186 placeholder="扩展参数（JSON格式）"> 195 placeholder="扩展参数（JSON格式）">
187 </el-input> 196 </el-input>
188 </el-form-item> 197 </el-form-item>
189 - <el-form-item label="相关描述：" prop="description">  
190 - <el-input v-model="queue_addForm.description" style="width:240px" clearable size="small" 198 + <el-form-item label="" prop="description">
  199 + <el-input v-model="queue_addForm.description" style="width:300px" clearable size="small"
191 type="textarea" autosize :rows="1" 200 type="textarea" autosize :rows="1"
192 placeholder="相关描述"> 201 placeholder="相关描述">
193 </el-input> 202 </el-input>
@@ -195,7 +204,7 @@ @@ -195,7 +204,7 @@
195 </el-form> 204 </el-form>
196 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 205 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
197 <el-button type="info" @click="queue_dialog.addDialog = false" size="medium" 206 <el-button type="info" @click="queue_dialog.addDialog = false" size="medium"
198 - style="width: 100px">取消 207 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
199 </el-button> 208 </el-button>
200 <el-button type="primary" @click="queue_add" :loading="queue_loading.addLoading" 209 <el-button type="primary" @click="queue_add" :loading="queue_loading.addLoading"
201 size="medium" style="width: 100px">添加 210 size="medium" style="width: 100px">添加
@@ -209,18 +218,20 @@ @@ -209,18 +218,20 @@
209 :visible.sync="queue_dialog.editDialog" 218 :visible.sync="queue_dialog.editDialog"
210 style="margin-top: -50px" text-align="center" width="60%" 219 style="margin-top: -50px" text-align="center" width="60%"
211 @close="queue_editDialogClosed"> 220 @close="queue_editDialogClosed">
212 - <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px;margin-left: 60px" 221 + <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
213 :model="queue_editForm" :rules="queue_editFormRules" ref="queue_editFormRef"> 222 :model="queue_editForm" :rules="queue_editFormRules" ref="queue_editFormRef">
214 - <el-form-item label="队列名称：" prop="queueName">  
215 - <el-input v-model="queue_editForm.queueName" style="width:240px" size="small" clearable 223 + <el-form-item label="" prop="queueName">
  224 + <el-input v-model="queue_editForm.queueName" style="width:300px" size="small" clearable
216 disabled 225 disabled
217 placeholder="请输入队列名称"> 226 placeholder="请输入队列名称">
  227 + <template slot="prepend" >队列名称</template>
218 </el-input> 228 </el-input>
219 </el-form-item> 229 </el-form-item>
220 230
221 - <el-form-item label="用户名称：" prop="username"> 231 + <el-form-item label="" prop="username">
222 <el-input v-model="queue_editForm.username" placeholder="请输入用户名称" 232 <el-input v-model="queue_editForm.username" placeholder="请输入用户名称"
223 - style="width:240px" size="small" clearable disabled> 233 + style="width:300px" size="small" clearable disabled>
  234 + <template slot="prepend" >用户名称</template>
224 </el-input> 235 </el-input>
225 </el-form-item> 236 </el-form-item>
226 237
@@ -237,9 +248,9 @@ @@ -237,9 +248,9 @@
237 <!-- </el-select>--> 248 <!-- </el-select>-->
238 <!-- </el-form-item>--> 249 <!-- </el-form-item>-->
239 250
240 - <el-form-item label="所属虚拟主机：" prop="virtualHostId"> 251 + <el-form-item label="" prop="virtualHostId">
241 <el-cascader 252 <el-cascader
242 - disabled clearable style="width: 240px" size="small" 253 + disabled clearable style="width: 300px" size="small"
243 v-model="queue_editForm.virtualHostId" 254 v-model="queue_editForm.virtualHostId"
244 @change="cascadeEditChange" 255 @change="cascadeEditChange"
245 :options="queue_config.cascade.server_hostList" 256 :options="queue_config.cascade.server_hostList"
@@ -249,8 +260,8 @@ @@ -249,8 +260,8 @@
249 placeholder="请选择所属虚拟主机"></el-cascader> 260 placeholder="请选择所属虚拟主机"></el-cascader>
250 </el-form-item> 261 </el-form-item>
251 262
252 - <el-form-item label="是否持久化：" prop="durability">  
253 - <el-select v-model="queue_editForm.durability" style="width: 240px" disabled clearable 263 + <el-form-item label="" prop="durability">
  264 + <el-select v-model="queue_editForm.durability" style="width: 300px" disabled clearable
254 size="small" 265 size="small"
255 placeholder="请选择是否持久化"> 266 placeholder="请选择是否持久化">
256 <el-option 267 <el-option
@@ -261,8 +272,8 @@ @@ -261,8 +272,8 @@
261 </el-option> 272 </el-option>
262 </el-select> 273 </el-select>
263 </el-form-item> 274 </el-form-item>
264 - <el-form-item label="是否自动删除：" prop="autoDelete">  
265 - <el-select v-model="queue_editForm.autoDelete" style="width: 240px" disabled clearable 275 + <el-form-item label="" prop="autoDelete">
  276 + <el-select v-model="queue_editForm.autoDelete" style="width: 300px" disabled clearable
266 size="small" 277 size="small"
267 placeholder="请选择是否自动删除"> 278 placeholder="请选择是否自动删除">
268 <el-option 279 <el-option
@@ -273,14 +284,14 @@ @@ -273,14 +284,14 @@
273 </el-option> 284 </el-option>
274 </el-select> 285 </el-select>
275 </el-form-item> 286 </el-form-item>
276 - <el-form-item label="扩展参数：" prop="arguments">  
277 - <el-input v-model="queue_editForm.arguments" style="width:240px" disabled clearable 287 + <el-form-item label="" prop="arguments">
  288 + <el-input v-model="queue_editForm.arguments" style="width:300px" disabled clearable
278 size="small" type="textarea" autosize :rows="1" 289 size="small" type="textarea" autosize :rows="1"
279 placeholder="扩展参数（JSON格式）"> 290 placeholder="扩展参数（JSON格式）">
280 </el-input> 291 </el-input>
281 </el-form-item> 292 </el-form-item>
282 - <el-form-item label="相关描述：" prop="description">  
283 - <el-input v-model="queue_editForm.description" style="width:240px" clearable size="small" 293 + <el-form-item label="" prop="description">
  294 + <el-input v-model="queue_editForm.description" style="width:300px" clearable size="small"
284 type="textarea" autosize :rows="1" 295 type="textarea" autosize :rows="1"
285 placeholder="相关描述"> 296 placeholder="相关描述">
286 </el-input> 297 </el-input>
@@ -289,7 +300,7 @@ @@ -289,7 +300,7 @@
289 300
290 <div slot="footer" class="dialog-footer" style="text-align: center"> 301 <div slot="footer" class="dialog-footer" style="text-align: center">
291 <el-button type="info" @click="queue_dialog.editDialog = false" size="medium" 302 <el-button type="info" @click="queue_dialog.editDialog = false" size="medium"
292 - style="width: 100px">取消 303 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
293 </el-button> 304 </el-button>
294 <el-button type="primary" @click="queue_edit" :loading="queue_loading.addLoading" 305 <el-button type="primary" @click="queue_edit" :loading="queue_loading.addLoading"
295 size="medium" style="width: 100px">编辑 306 size="medium" style="width: 100px">编辑
@@ -372,9 +383,9 @@ @@ -372,9 +383,9 @@
372 // 所属虚拟机id 383 // 所属虚拟机id
373 virtualHostId: '', 384 virtualHostId: '',
374 // 是否持久化，默认 true 385 // 是否持久化，默认 true
375 - durability: true, 386 + durability: '',
376 // 是否自动删除,默认 false 387 // 是否自动删除,默认 false
377 - autoDelete: false, 388 + autoDelete: '',
378 // 扩展参数，以JSON格式存储 389 // 扩展参数，以JSON格式存储
379 arguments: '', 390 arguments: '',
380 // 相关描述 391 // 相关描述
@@ -5,28 +5,31 @@ @@ -5,28 +5,31 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4"> 8 + <el-col :span="7">
9 <el-input v-model="routingKey_queryInfo.routingKeyName" placeholder="路由键名称" 9 <el-input v-model="routingKey_queryInfo.routingKeyName" placeholder="路由键名称"
10 - prefix-icon="el-icon-search" size="medium" clearable> 10 + size="medium" clearable>
  11 + <template slot="prepend" ><i class="el-icon-user"></i>路由键名称</template>
11 </el-input> 12 </el-input>
12 </el-col> 13 </el-col>
13 14
14 - <el-col :span="4"> 15 + <el-col :span="7">
15 <el-cascader 16 <el-cascader
16 size="medium" filterable clearable 17 size="medium" filterable clearable
17 v-model="routingKey_queryInfo.exchangeId" 18 v-model="routingKey_queryInfo.exchangeId"
18 :options="routingKey_config.cascade.server_host_exchangeList" 19 :options="routingKey_config.cascade.server_host_exchangeList"
19 :show-all-levels="false" 20 :show-all-levels="false"
20 :change-on-select="false" 21 :change-on-select="false"
  22 + style="width: 70%"
21 @change="cascadeQueryChange" 23 @change="cascadeQueryChange"
22 :props="routingKey_config.cascade.defaultParams" 24 :props="routingKey_config.cascade.defaultParams"
23 - placeholder="请选择所属交换机"></el-cascader> 25 + placeholder="请选择所属交换机">
  26 + </el-cascader>
24 </el-col> 27 </el-col>
25 <el-col :span="8"> 28 <el-col :span="8">
26 - <el-button type="success" style="width:150px" size="medium" @click="routingKey_getList"> 29 + <el-button type="warning " style="width:150px" size="medium" icon="el-icon-search" @click="routingKey_getList">
27 查询路由键 30 查询路由键
28 </el-button> 31 </el-button>
29 - <el-button type="primary" style="width:150px" size="medium" @click="routingKey_toAddDialog"> 32 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="routingKey_toAddDialog">
30 添加路由键 33 添加路由键
31 </el-button> 34 </el-button>
32 </el-col> 35 </el-col>
@@ -36,7 +39,9 @@ @@ -36,7 +39,9 @@
36 <div style="margin-top: 20px;"> 39 <div style="margin-top: 20px;">
37 <el-table :data="routingKey_page.routingKeyList" border v-loading="routingKey_loading.listLoading" 40 <el-table :data="routingKey_page.routingKeyList" border v-loading="routingKey_loading.listLoading"
38 @selection-change="routingKey_selectChange" 41 @selection-change="routingKey_selectChange"
39 - element-loading-text="获取路由键列表，拼命加载中"> 42 + element-loading-text="获取路由键列表，拼命加载中" size="small"
  43 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  44 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
40 <el-table-column type="selection" width="55" align="center"></el-table-column> 45 <el-table-column type="selection" width="55" align="center"></el-table-column>
41 <el-table-column type="index" align="center"></el-table-column> 46 <el-table-column type="index" align="center"></el-table-column>
42 <el-table-column label="路由键名称" prop="routingKeyName" align="center" 47 <el-table-column label="路由键名称" prop="routingKeyName" align="center"
@@ -45,7 +50,7 @@ @@ -45,7 +50,7 @@
45 width="220"></el-table-column> 50 width="220"></el-table-column>
46 <el-table-column label="相关描述" prop="description" align="center" width="280"></el-table-column> 51 <el-table-column label="相关描述" prop="description" align="center" width="280"></el-table-column>
47 <!-- fixed="right" --> 52 <!-- fixed="right" -->
48 - <el-table-column label="操作" width="232px" align="center"> 53 + <el-table-column label="操作" align="center">
49 <template slot-scope="scope"> 54 <template slot-scope="scope">
50 <!-- 编辑按钮--> 55 <!-- 编辑按钮-->
51 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> 56 <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
@@ -99,33 +104,40 @@ @@ -99,33 +104,40 @@
99 104
100 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 105 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
101 :model="routingKey_addForm" :rules="routingKey_addFormRules" ref="routingKey_addFormRef"> 106 :model="routingKey_addForm" :rules="routingKey_addFormRules" ref="routingKey_addFormRef">
102 - <el-form-item label="路由键名称：" prop="routingKeyName">  
103 - <el-input v-model="routingKey_addForm.routingKeyName" placeholder="请输入路由键名称"  
104 - style="width:270px" size="small" clearable>  
105 - </el-input>  
106 - </el-form-item>  
107 - <el-form-item label="所属交换机：" prop="exchangeId">  
108 - <el-cascader  
109 - style="width:270px" size="small"  
110 - filterable clearable  
111 - v-model="routingKey_addForm.exchangeId"  
112 - :options="routingKey_config.cascade.server_host_exchangeList"  
113 - :show-all-levels="false"  
114 - :change-on-select="false"  
115 - @change="cascadeAddChange"  
116 - :props="routingKey_config.cascade.defaultParams"  
117 - placeholder="请选择所属交换机"></el-cascader>  
118 - </el-form-item>  
119 - <el-form-item label="相关描述：" prop="description">  
120 - <el-input v-model="routingKey_addForm.description" style="width:270px" clearable size="small"  
121 - type="textarea" autosize :rows="1"  
122 - placeholder="相关描述">  
123 - </el-input>  
124 - </el-form-item> 107 + <el-row>
  108 + <el-form-item label="" prop="routingKeyName">
  109 + <el-input v-model="routingKey_addForm.routingKeyName" placeholder="请输入路由键名称"
  110 + style="width:300px" size="small" clearable>
  111 + <template slot="prepend" >路由键名称</template>
  112 + </el-input>
  113 + </el-form-item>
  114 + </el-row>
  115 + <el-row>
  116 + <el-form-item label="" prop="exchangeId">
  117 + <el-cascader
  118 + style="width:300px" size="small"
  119 + filterable clearable
  120 + v-model="routingKey_addForm.exchangeId"
  121 + :options="routingKey_config.cascade.server_host_exchangeList"
  122 + :show-all-levels="false"
  123 + :change-on-select="false"
  124 + @change="cascadeAddChange"
  125 + :props="routingKey_config.cascade.defaultParams"
  126 + placeholder="请选择所属交换机"></el-cascader>
  127 + </el-form-item>
  128 + </el-row>
  129 + <el-row>
  130 + <el-form-item label="" prop="description">
  131 + <el-input v-model="routingKey_addForm.description" style="width:300px" clearable size="small"
  132 + type="textarea" autosize :rows="1"
  133 + placeholder="请输入相关描述">
  134 + </el-input>
  135 + </el-form-item>
  136 + </el-row>
125 </el-form> 137 </el-form>
126 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 138 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
127 <el-button type="info" @click="routingKey_dialog.addDialog = false" size="medium" 139 <el-button type="info" @click="routingKey_dialog.addDialog = false" size="medium"
128 - style="width: 100px">取消 140 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
129 </el-button> 141 </el-button>
130 <el-button type="primary" @click="routingKey_add" :loading="routingKey_loading.addLoading" 142 <el-button type="primary" @click="routingKey_add" :loading="routingKey_loading.addLoading"
131 size="medium" style="width: 100px">添加 143 size="medium" style="width: 100px">添加
@@ -142,34 +154,40 @@ @@ -142,34 +154,40 @@
142 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 154 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
143 :model="routingKey_editForm" :rules="routingKey_editFormRules" 155 :model="routingKey_editForm" :rules="routingKey_editFormRules"
144 ref="routingKey_editFormRef"> 156 ref="routingKey_editFormRef">
145 - <el-form-item label="路由键名称：" prop="routingKeyName">  
146 - <el-input v-model="routingKey_editForm.routingKeyName" placeholder="请输入路由键名称"  
147 - style="width:270px" size="small" disabled clearable>  
148 - </el-input>  
149 - </el-form-item>  
150 - <el-form-item label="所属交换机：" prop="exchangeId">  
151 - <el-cascader  
152 - style="width:270px" size="small"  
153 - filterable clearable disabled  
154 - v-model="routingKey_editForm.exchangeId"  
155 - :options="routingKey_config.cascade.server_host_exchangeList"  
156 - :show-all-levels="false"  
157 - :change-on-select="false"  
158 - @change="cascadeEditChange"  
159 - :props="routingKey_config.cascade.defaultParams"  
160 - placeholder="请选择所属交换机"></el-cascader>  
161 - </el-form-item>  
162 - <el-form-item label="相关描述：" prop="description">  
163 - <el-input v-model="routingKey_editForm.description" style="width:270px" clearable size="small"  
164 - type="textarea" autosize :rows="1"  
165 - placeholder="相关描述">  
166 - </el-input>  
167 - </el-form-item> 157 + <el-row>
  158 + <el-form-item label="" prop="routingKeyName">
  159 + <el-input v-model="routingKey_editForm.routingKeyName" placeholder="请输入路由键名称"
  160 + style="width:300px" size="small" disabled clearable>
  161 + <template slot="prepend" >路由键名称</template>
  162 + </el-input>
  163 + </el-form-item>
  164 + </el-row>
  165 + <el-row>
  166 + <el-form-item label="" prop="exchangeId">
  167 + <el-cascader
  168 + style="width:300px" size="small"
  169 + filterable clearable disabled
  170 + v-model="routingKey_editForm.exchangeId"
  171 + :options="routingKey_config.cascade.server_host_exchangeList"
  172 + :show-all-levels="false"
  173 + :change-on-select="false"
  174 + @change="cascadeEditChange"
  175 + :props="routingKey_config.cascade.defaultParams"
  176 + placeholder="请选择所属交换机"></el-cascader>
  177 + </el-form-item>
  178 + </el-row>
  179 + <el-row>
  180 + <el-form-item label="" prop="description">
  181 + <el-input v-model="routingKey_editForm.description" style="width:300px" clearable size="small"
  182 + type="textarea" autosize :rows="1"
  183 + placeholder="相关描述">
  184 + </el-input>
  185 + </el-form-item>
  186 + </el-row>
168 </el-form> 187 </el-form>
169 -  
170 <div slot="footer" class="dialog-footer" style="text-align: center"> 188 <div slot="footer" class="dialog-footer" style="text-align: center">
171 <el-button type="info" @click="routingKey_dialog.editDialog = false" size="medium" 189 <el-button type="info" @click="routingKey_dialog.editDialog = false" size="medium"
172 - style="width: 100px">取消 190 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
173 </el-button> 191 </el-button>
174 <el-button type="primary" @click="routingKey_edit" :loading="routingKey_loading.addLoading" 192 <el-button type="primary" @click="routingKey_edit" :loading="routingKey_loading.addLoading"
175 size="medium" 193 size="medium"
@@ -5,15 +5,17 @@ @@ -5,15 +5,17 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4"> 8 + <el-col :span="7">
9 <el-input v-model="queryInfo.serverName" prefix-icon="el-icon-search" size="medium" 9 <el-input v-model="queryInfo.serverName" prefix-icon="el-icon-search" size="medium"
10 - placeholder="服务器名称" clearable></el-input> 10 + placeholder="服务器名称" clearable>
  11 + <template slot="prepend" ><i class="el-icon-user"></i>服务器名称</template>
  12 + </el-input>
11 </el-col> 13 </el-col>
12 - <el-col :span="8">  
13 - <el-button type="success" style="width:150px" size="medium" @click="getServerList"> 14 + <el-col :span="14">
  15 + <el-button type="warning" style="width:160px" icon="el-icon-search" size="medium" @click="getServerList">
14 查询服务器信息 16 查询服务器信息
15 </el-button> 17 </el-button>
16 - <el-button type="primary" style="width:150px" size="medium" @click="toAddDialog"> 18 + <el-button type="primary" style="width:160px" icon="el-icon-plus" size="medium" @click="toAddDialog">
17 添加服务器信息 19 添加服务器信息
18 </el-button> 20 </el-button>
19 </el-col> 21 </el-col>
@@ -22,8 +24,10 @@ @@ -22,8 +24,10 @@
22 <!--服务器信息列表区域--> 24 <!--服务器信息列表区域-->
23 <div style="margin-top: 20px;"> 25 <div style="margin-top: 20px;">
24 <el-table :data="serverList" border v-loading="server_loading.listLoading" 26 <el-table :data="serverList" border v-loading="server_loading.listLoading"
25 - @selection-change="selectChange"  
26 - element-loading-text="获取服务器列表，拼命加载中"> 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;">
27 <el-table-column type="selection" width="55" align="center"></el-table-column> 31 <el-table-column type="selection" width="55" align="center"></el-table-column>
28 <el-table-column type="index" align="center"></el-table-column> 32 <el-table-column type="index" align="center"></el-table-column>
29 <el-table-column type="expand"> 33 <el-table-column type="expand">
@@ -74,7 +78,7 @@ @@ -74,7 +78,7 @@
74 <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column> 78 <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>
75 <!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>--> 79 <!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
76 <!-- <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>--> 80 <!-- <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>-->
77 - <el-table-column label="操作" width="300px" align="center"> 81 + <el-table-column label="操作" align="center">
78 <template slot-scope="scope"> 82 <template slot-scope="scope">
79 <!-- 虚拟主机 --> 83 <!-- 虚拟主机 -->
80 <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false"> 84 <el-tooltip effect="dark" content="虚拟主机" placement="top-start" :enterable="false">
@@ -128,47 +132,63 @@ @@ -128,47 +132,63 @@
128 <el-dialog title="添加服务器信息" 132 <el-dialog title="添加服务器信息"
129 :visible.sync="serverDialog.addDialog" 133 :visible.sync="serverDialog.addDialog"
130 style="margin-top: -50px" 134 style="margin-top: -50px"
131 - width="50%" text-align="center" @close="serverAddDialogClosed"> 135 + width="60%" text-align="center" @close="serverAddDialogClosed">
132 <el-form :inline="true" :model="addServerForm" label-width="120px" status-icon 136 <el-form :inline="true" :model="addServerForm" label-width="120px" status-icon
133 :rules="addServerFormRules" ref="addServerFormRef" style="margin-top: -30px" align="center"> 137 :rules="addServerFormRules" ref="addServerFormRef" style="margin-top: -30px" align="center">
134 - <el-form-item label="服务器名称：" prop="serverName">  
135 - <el-input v-model="addServerForm.serverName" style="width:270px" size="small" clearable  
136 - placeholder="请输入服务器名称"></el-input> 138 + <el-form-item label="" prop="serverName">
  139 + <el-input v-model="addServerForm.serverName" style="width:300px" size="small" clearable
  140 + placeholder="请输入服务器名称">
  141 + <template slot="prepend" >&nbsp;服务器名称&nbsp;&nbsp;&nbsp;</template>
  142 + </el-input>
137 </el-form-item> 143 </el-form-item>
138 - <el-form-item label="IP地址：" prop="serverIp">  
139 - <el-input v-model="addServerForm.serverIp" style="width:270px" size="small" clearable  
140 - placeholder="请输入服务器IP地址"></el-input> 144 + <el-form-item label="" prop="serverIp">
  145 + <el-input v-model="addServerForm.serverIp" style="width:300px" size="small" clearable
  146 + placeholder="请输入服务器IP地址">
  147 + <template slot="prepend" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;IP地址&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</template>
  148 + </el-input>
141 </el-form-item> 149 </el-form-item>
142 - <el-form-item label="服务器端口号：" prop="serverPort">  
143 - <el-input v-model="addServerForm.serverPort" style="width:270px" size="small" clearable  
144 - placeholder="请输入服务器端口号"></el-input> 150 + <el-form-item label="" prop="serverPort">
  151 + <el-input v-model="addServerForm.serverPort" style="width:300px" size="small" clearable
  152 + placeholder="请输入服务器端口号">
  153 + <template slot="prepend" >服务器端口号</template>
  154 + </el-input>
145 </el-form-item> 155 </el-form-item>
146 - <el-form-item label="客户端端口号：" prop="clientPort">  
147 - <el-input v-model="addServerForm.clientPort" style="width:270px" size="small" clearable  
148 - placeholder="请输入客户端端口号"></el-input> 156 + <el-form-item label="" prop="clientPort">
  157 + <el-input v-model="addServerForm.clientPort" style="width:300px" size="small" clearable
  158 + placeholder="请输入客户端端口号">
  159 + <template slot="prepend" >客户端端口号</template>
  160 + </el-input>
149 </el-form-item> 161 </el-form-item>
150 - <el-form-item label="超级用户名称：" prop="superUsername">  
151 - <el-input v-model="addServerForm.superUsername" style="width:270px" size="small" clearable  
152 - placeholder="请输入超级用户名称"></el-input> 162 + <el-form-item label="" prop="superUsername">
  163 + <el-input v-model="addServerForm.superUsername" style="width:300px" size="small" clearable
  164 + placeholder="请输入超级用户名称">
  165 + <template slot="prepend" >超级用户名称</template>
  166 + </el-input>
153 </el-form-item> 167 </el-form-item>
154 - <el-form-item label="超级用户密码：" prop="firstPassword">  
155 - <el-input type="password" v-model="addServerForm.firstPassword" style="width:270px"  
156 - size="small" clearable show-password placeholder="请输入超级用户密码"></el-input> 168 + <el-form-item label="" prop="firstPassword">
  169 + <el-input type="password" v-model="addServerForm.firstPassword" style="width:300px"
  170 + size="small" clearable show-password placeholder="请输入超级用户密码">
  171 + <template slot="prepend" >超级用户密码</template>
  172 + </el-input>
157 </el-form-item> 173 </el-form-item>
158 - <el-form-item label="重新输入密码：" prop="superPassword">  
159 - <el-input type="password" v-model="addServerForm.superPassword" style="width:270px"  
160 - size="small" clearable show-password placeholder="请重新输入密码"></el-input> 174 + <el-form-item label="" prop="superPassword">
  175 + <el-input type="password" v-model="addServerForm.superPassword" style="width:300px"
  176 + size="small" clearable show-password placeholder="请重新输入密码">
  177 + <template slot="prepend" >重新输入密码</template>
  178 + </el-input>
161 </el-form-item> 179 </el-form-item>
162 - <el-form-item label="相关描述：" prop="description"> 180 + <el-form-item label="" prop="description">
163 <el-input v-model="addServerForm.description" placeholder="请输入相关描述" 181 <el-input v-model="addServerForm.description" placeholder="请输入相关描述"
164 - style="width:270px" size="small" clearable  
165 - type="textarea" autosize :rows="1"></el-input> 182 + style="width:300px" size="small" clearable
  183 + type="textarea" autosize :rows="1">
  184 + <template slot="prepend" >相关描述</template>
  185 + </el-input>
166 </el-form-item> 186 </el-form-item>
167 </el-form> 187 </el-form>
168 188
169 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 189 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
170 <el-button type="info" @click="serverDialog.addDialog = false" size="medium" 190 <el-button type="info" @click="serverDialog.addDialog = false" size="medium"
171 - style="width: 100px">取消 191 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
172 </el-button> 192 </el-button>
173 <el-button type="primary" @click="addServerInfo" :loading="server_loading.addLoading" 193 <el-button type="primary" @click="addServerInfo" :loading="server_loading.addLoading"
174 size="medium" 194 size="medium"
@@ -187,41 +207,51 @@ @@ -187,41 +207,51 @@
187 <el-form :inline="true" :model="editServerForm" label-width="120px" status-icon 207 <el-form :inline="true" :model="editServerForm" label-width="120px" status-icon
188 :rules="editServerFormRules" ref="editServerFormRef" 208 :rules="editServerFormRules" ref="editServerFormRef"
189 align="center"> 209 align="center">
190 - <el-form-item label="服务器名称：" prop="serverName">  
191 - <el-input v-model="editServerForm.serverName" style="width:270px" size="small" clearable 210 + <el-form-item label="" prop="serverName">
  211 + <el-input v-model="editServerForm.serverName" style="width:300px" size="small" clearable
192 readonly disabled 212 readonly disabled
193 - placeholder="请输入服务器名称"></el-input> 213 + placeholder="请输入服务器名称">
  214 + <template slot="prepend" >&nbsp;&nbsp;服务器名称&nbsp;</template>
  215 + </el-input>
194 </el-form-item> 216 </el-form-item>
195 - <el-form-item label="IP地址：" prop="serverIp">  
196 - <el-input v-model="editServerForm.serverIp" style="width:270px" size="small" clearable 217 + <el-form-item label="" prop="serverIp">
  218 + <el-input v-model="editServerForm.serverIp" style="width:300px" size="small" clearable
197 readonly disabled 219 readonly disabled
198 - placeholder="请输入服务器IP地址"></el-input> 220 + placeholder="请输入服务器IP地址">
  221 + <template slot="prepend" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;IP地址&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</template>
  222 + </el-input>
199 </el-form-item> 223 </el-form-item>
200 - <el-form-item label="服务器端口号：" prop="serverPort">  
201 - <el-input v-model="editServerForm.serverPort" style="width:270px" size="small" clearable 224 + <el-form-item label="" prop="serverPort">
  225 + <el-input v-model="editServerForm.serverPort" style="width:300px" size="small" clearable
202 readonly disabled 226 readonly disabled
203 - placeholder="请输入服务器端口号"></el-input> 227 + placeholder="请输入服务器端口号">
  228 + <template slot="prepend" >服务器端口号</template>
  229 + </el-input>
204 </el-form-item> 230 </el-form-item>
205 - <el-form-item label="客户端端口号：" prop="clientPort">  
206 - <el-input v-model="editServerForm.clientPort" style="width:270px" size="small" clearable  
207 - readonly disabled placeholder="请输入客户端端口号"></el-input> 231 + <el-form-item label="" prop="clientPort">
  232 + <el-input v-model="editServerForm.clientPort" style="width:300px" size="small" clearable
  233 + readonly disabled placeholder="请输入客户端端口号">
  234 + <template slot="prepend" >客户端端口号</template>
  235 + </el-input>
208 </el-form-item> 236 </el-form-item>
209 237
210 - <el-form-item label="超级用户名称：" prop="superUsername">  
211 - <el-input v-model="editServerForm.superUsername" style="width:270px" size="small" clearable  
212 - readonly disabled placeholder="请输入超级用户名称"></el-input> 238 + <el-form-item label="" prop="superUsername">
  239 + <el-input v-model="editServerForm.superUsername" style="width:300px" size="small" clearable
  240 + readonly disabled placeholder="请输入超级用户名称">
  241 + <template slot="prepend" >超级用户名称</template>
  242 + </el-input>
213 </el-form-item> 243 </el-form-item>
214 244
215 - <el-form-item label="相关描述：" prop="description"> 245 + <el-form-item label="" prop="description">
216 <el-input v-model="editServerForm.description" placeholder="请输入相关描述" 246 <el-input v-model="editServerForm.description" placeholder="请输入相关描述"
217 - style="width:270px" size="small" clearable 247 + style="width:300px" size="small" clearable
218 type="textarea" autosize :rows="1"></el-input> 248 type="textarea" autosize :rows="1"></el-input>
219 </el-form-item> 249 </el-form-item>
220 </el-form> 250 </el-form>
221 251
222 <div slot="footer" class="dialog-footer" style="text-align: center"> 252 <div slot="footer" class="dialog-footer" style="text-align: center">
223 <el-button type="info" @click="serverDialog.editDialog = false" size="medium" 253 <el-button type="info" @click="serverDialog.editDialog = false" size="medium"
224 - style="width: 100px">取消 254 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
225 </el-button> 255 </el-button>
226 <el-button type="primary" @click="editServerInfo" :loading="server_loading.addLoading" 256 <el-button type="primary" @click="editServerInfo" :loading="server_loading.addLoading"
227 size="medium" 257 size="medium"
@@ -643,5 +673,15 @@ @@ -643,5 +673,15 @@
643 } 673 }
644 </script> 674 </script>
645 675
646 -<style scoped> 676 +<style >
  677 + .el-input-group__prepend {
  678 + background-color: #6F8294;
  679 + color:#ffffff
  680 + }
  681 + .el-input__inner{
  682 + background-color: #F7F7F7;
  683 + }
  684 + .el-form-item__content .el-textarea__inner{
  685 + background-color: #F7F7F7;
  686 + }
647 </style> 687 </style>
@@ -5,23 +5,31 @@ @@ -5,23 +5,31 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="user_queryInfo.username" prefix-icon="el-icon-search" size="medium"  
10 - placeholder="用户名称" clearable></el-input> 8 + <el-col :span="7">
  9 + <el-input v-model="user_queryInfo.username" size="medium"
  10 + placeholder="用户名称" clearable >
  11 +<!-- 加入前置插槽及背景颜色设置-->
  12 + <template slot="prepend" >&nbsp;<i class="el-icon-user"></i>用户名称&nbsp;</template>
  13 + </el-input>
11 </el-col> 14 </el-col>
12 - <el-col :span="4">  
13 - <el-input v-model="user_queryInfo.serverName" prefix-icon="el-icon-search" size="medium"  
14 - placeholder="服务器名称" clearable></el-input> 15 + <el-col :span="7">
  16 + <el-input v-model="user_queryInfo.serverName"size="medium"
  17 + placeholder="服务器名称" clearable>
  18 + <template slot="prepend"><i class="el-icon-s-platform"></i>服务器名称</template>
  19 + </el-input>
15 </el-col> 20 </el-col>
16 - <el-col :span="4">  
17 - <el-input v-model="user_queryInfo.virtualHostName" prefix-icon="el-icon-search" size="medium"  
18 - placeholder="虚拟主机名称" clearable></el-input> 21 + <el-col :span="7">
  22 + <el-input v-model="user_queryInfo.virtualHostName"size="medium"
  23 + placeholder="虚拟主机名称" clearable>
  24 + <template slot="prepend"><i class="el-icon-s-operation"></i>虚拟主机名称</template>
  25 + </el-input>
19 </el-col> 26 </el-col>
20 - <el-col :span="8">  
21 - <el-button type="success" style="width:150px" size="medium" @click="user_getList"> 27 + <el-col :span="7" >
  28 +<!-- 添加图标-->
  29 + <el-button type="warning" style="width:140px;margin-top: 15px" size="medium" icon="el-icon-search" @click="user_getList">
22 查询用户关系 30 查询用户关系
23 </el-button> 31 </el-button>
24 - <el-button type="primary" style="width:150px" size="medium" @click="user_toAddDialog"> 32 + <el-button type="primary" style="width:140px" size="medium" icon="el-icon-plus" @click="user_toAddDialog">
25 添加用户关系 33 添加用户关系
26 </el-button> 34 </el-button>
27 </el-col> 35 </el-col>
@@ -29,16 +37,19 @@ @@ -29,16 +37,19 @@
29 </div> 37 </div>
30 <!-- 列表区域 --> 38 <!-- 列表区域 -->
31 <div style="margin-top: 20px;"> 39 <div style="margin-top: 20px;">
  40 +<!-- 加入表头背景颜色、字体颜色、表格圆角及高度设置-->
32 <el-table :data="user_page.userInfoList" border v-loading="user_loading.listLoading" 41 <el-table :data="user_page.userInfoList" border v-loading="user_loading.listLoading"
33 @selection-change="user_selectChange" size="small" 42 @selection-change="user_selectChange" size="small"
34 - element-loading-text="获取用户信息列表，拼命加载中">  
35 - <el-table-column type="selection" width="55" align="center"></el-table-column> 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>
36 <el-table-column type="index" align="center"></el-table-column> 47 <el-table-column type="index" align="center"></el-table-column>
37 <el-table-column label="用户名称" prop="username" align="center" width="120%"></el-table-column> 48 <el-table-column label="用户名称" prop="username" align="center" width="120%"></el-table-column>
38 <el-table-column label="真实姓名" prop="realName" align="center" width="120%"></el-table-column> 49 <el-table-column label="真实姓名" prop="realName" align="center" width="120%"></el-table-column>
39 <el-table-column label="服务器名称" prop="serverName" align="center" width="120%"></el-table-column> 50 <el-table-column label="服务器名称" prop="serverName" align="center" width="120%"></el-table-column>
40 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300%"></el-table-column> 51 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" width="300%"></el-table-column>
41 - <el-table-column label="操作" width="340px" align="center"> 52 + <el-table-column label="操作" align="center" type="success">
42 <template slot-scope="scope"> 53 <template slot-scope="scope">
43 <!-- 删除用户 --> 54 <!-- 删除用户 -->
44 <el-tooltip effect="dark" content="删除用户" placement="top-start" :enterable="false"> 55 <el-tooltip effect="dark" content="删除用户" placement="top-start" :enterable="false">
@@ -103,20 +114,22 @@ @@ -103,20 +114,22 @@
103 width="50%" text-align="center" @close="user_addDialogClosed"> 114 width="50%" text-align="center" @close="user_addDialogClosed">
104 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" 115 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px"
105 :model="user_addForm" :rules="user_addFormRules" ref="user_addFormRef" align="center"> 116 :model="user_addForm" :rules="user_addFormRules" ref="user_addFormRef" align="center">
106 - <el-form-item label="用户名称：" prop="username">  
107 - <el-input v-model="user_addForm.username" style="width:270px" size="small" clearable 117 + <el-form-item label="" prop="username">
  118 + <el-input v-model="user_addForm.username" style="width:300px" size="small" clearable
108 placeholder="请输入用户名称"> 119 placeholder="请输入用户名称">
  120 + <template slot="prepend" >用户名称</template>
109 </el-input> 121 </el-input>
110 </el-form-item> 122 </el-form-item>
111 - <el-form-item label="真实姓名：" prop="realName">  
112 - <el-input v-model="user_addForm.realName" style="width:270px" size="small" clearable 123 + <el-form-item label="" prop="realName">
  124 + <el-input v-model="user_addForm.realName" style="width:300px" size="small" clearable
113 placeholder="请输入真实姓名"> 125 placeholder="请输入真实姓名">
  126 + <template slot="prepend" >真实姓名</template>
114 </el-input> 127 </el-input>
115 </el-form-item> 128 </el-form-item>
116 <br/> 129 <br/>
117 - <el-form-item label="选择用户关系："> 130 + <el-form-item label="选择用户关系：" >
118 <br/> 131 <br/>
119 - <el-tree style="width:270px" 132 + <el-tree style="width:300px"
120 :data="user_config.tree.server_hostList" 133 :data="user_config.tree.server_hostList"
121 :props="user_config.tree.defaultParams" 134 :props="user_config.tree.defaultParams"
122 ref="tree" 135 ref="tree"
@@ -126,8 +139,8 @@ @@ -126,8 +139,8 @@
126 </el-form-item> 139 </el-form-item>
127 </el-form> 140 </el-form>
128 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 141 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
129 - <el-button type="info" @click="user_dialog.addDialog = false" size="medium"  
130 - style="width: 100px">取消 142 + <el-button @click="user_dialog.addDialog = false" size="medium"
  143 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
131 </el-button> 144 </el-button>
132 <el-button type="primary" @click="user_add" :loading="user_loading.addLoading" 145 <el-button type="primary" @click="user_add" :loading="user_loading.addLoading"
133 size="medium" style="width: 100px">添加 146 size="medium" style="width: 100px">添加
@@ -145,19 +158,19 @@ @@ -145,19 +158,19 @@
145 width="50%" text-align="center" @close="user_editDialogClosed"> 158 width="50%" text-align="center" @close="user_editDialogClosed">
146 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" 159 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px"
147 :model="user_editForm" :rules="user_editFormRules" ref="user_editFormRef" align="center"> 160 :model="user_editForm" :rules="user_editFormRules" ref="user_editFormRef" align="center">
148 - <el-form-item label="用户名称：" prop="username"> 161 + <el-form-item label="" prop="username">
149 <el-input v-model="user_editForm.username" style="width:300px" size="small" clearable readonly 162 <el-input v-model="user_editForm.username" style="width:300px" size="small" clearable readonly
150 - placeholder="请输入用户名称"></el-input> 163 + placeholder="请输入用户名称"><template slot="prepend" >用户名称</template></el-input>
151 </el-form-item> 164 </el-form-item>
152 - <el-form-item label="服务器名称：" prop="serverName"> 165 + <el-form-item label="" prop="serverName">
153 <el-input v-model="user_editForm.serverName" style="width:300px" size="small" clearable readonly 166 <el-input v-model="user_editForm.serverName" style="width:300px" size="small" clearable readonly
154 - placeholder="请输入服务器名称"></el-input> 167 + placeholder="请输入服务器名称"><template slot="prepend" >服务器名称</template></el-input>
155 </el-form-item> 168 </el-form-item>
156 169
157 <br/> 170 <br/>
158 <el-form-item label="选择用户关系："> 171 <el-form-item label="选择用户关系：">
159 <br/> 172 <br/>
160 - <el-tree style="width:270px" 173 + <el-tree style="width:300px"
161 @check-change="user_editTreeChange" 174 @check-change="user_editTreeChange"
162 :data="user_config.tree.edit_serverHostList" 175 :data="user_config.tree.edit_serverHostList"
163 :props="user_config.tree.defaultParams" 176 :props="user_config.tree.defaultParams"
@@ -172,7 +185,7 @@ @@ -172,7 +185,7 @@
172 185
173 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 186 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
174 <el-button type="info" @click="user_dialog.editDialog = false" size="medium" 187 <el-button type="info" @click="user_dialog.editDialog = false" size="medium"
175 - style="width: 100px">取消 188 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
176 </el-button> 189 </el-button>
177 <el-button type="primary" @click="user_edit" :loading="user_loading.editLoading" 190 <el-button type="primary" @click="user_edit" :loading="user_loading.editLoading"
178 size="medium" style="width: 100px">编辑关系 191 size="medium" style="width: 100px">编辑关系
@@ -182,8 +195,18 @@ @@ -182,8 +195,18 @@
182 </el-dialog> 195 </el-dialog>
183 </div> 196 </div>
184 </el-container> 197 </el-container>
  198 +
185 </template> 199 </template>
  200 +<style>
  201 + .el-input-group__prepend {
  202 + background-color: #6F8294;
  203 + color:#ffffff
  204 + }
  205 + .el-input__inner{
  206 + background-color: #F7F7F7;
  207 + }
186 208
  209 +</style>
187 <script> 210 <script>
188 import { 211 import {
189 getServerAndHostList, 212 getServerAndHostList,
@@ -712,6 +735,4 @@ @@ -712,6 +735,4 @@
712 } 735 }
713 </script> 736 </script>
714 737
715 -<style scoped>  
716 738
717 -</style>  
@@ -5,37 +5,49 @@ @@ -5,37 +5,49 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="umb_queryInfo.username" prefix-icon="el-icon-search" 8 + <el-col :span="5">
  9 + <el-input v-model="umb_queryInfo.username"
10 size="medium" 10 size="medium"
11 - placeholder="用户名称" clearable></el-input> 11 + placeholder="用户名称" clearable>
  12 + <template slot="prepend" ><i class="el-icon-user"></i>用户名称</template>
  13 + </el-input>
12 </el-col> 14 </el-col>
13 - <el-col :span="4">  
14 - <el-input v-model="umb_queryInfo.serverName" prefix-icon="el-icon-search" 15 + <el-col :span="6">
  16 + <el-input v-model="umb_queryInfo.serverName"
15 size="medium" 17 size="medium"
16 - placeholder="服务器名称" clearable></el-input> 18 + placeholder="服务器名称" clearable>
  19 + <template slot="prepend"><i class="el-icon-s-platform"></i>服务器名称</template>
  20 + </el-input>
17 </el-col> 21 </el-col>
18 - <el-col :span="4">  
19 - <el-input v-model="umb_queryInfo.virtualHostName" prefix-icon="el-icon-search" 22 + <el-col :span="6">
  23 + <el-input v-model="umb_queryInfo.virtualHostName"
20 size="medium" 24 size="medium"
21 - placeholder="虚拟主机名称" clearable></el-input> 25 + placeholder="虚拟主机名称" clearable>
  26 + <template slot="prepend"><i class="el-icon-s-operation"></i>虚拟主机名称</template>
  27 + </el-input>
22 </el-col> 28 </el-col>
23 - <el-col :span="4">  
24 - <el-input v-model="umb_queryInfo.exchangeName" prefix-icon="el-icon-search" 29 + <el-col :span="6">
  30 + <el-input v-model="umb_queryInfo.exchangeName"
25 size="medium" 31 size="medium"
26 - placeholder="交换机名称" clearable></el-input> 32 + placeholder="交换机名称" clearable>
  33 + <template slot="prepend"><i class="el-icon-sort"></i>交换机名称</template>
  34 + </el-input>
27 </el-col> 35 </el-col>
28 </el-row> 36 </el-row>
29 <el-row> 37 <el-row>
30 - <el-col :span="4">  
31 - <el-input v-model="umb_queryInfo.queueName" prefix-icon="el-icon-search" 38 + <el-col :span="5">
  39 + <el-input v-model="umb_queryInfo.queueName"
32 size="medium" 40 size="medium"
33 - placeholder="队列名称" clearable></el-input> 41 + placeholder="队列名称" clearable>
  42 + <template slot="prepend"><i class="el-icon-notebook-2"></i>队列名称</template>
  43 + </el-input>
34 </el-col> 44 </el-col>
35 - <el-col :span="4">  
36 - <el-input v-model="umb_queryInfo.routingKeyName" prefix-icon="el-icon-search" 45 + <el-col :span="6">
  46 + <el-input v-model="umb_queryInfo.routingKeyName"
37 size="medium" 47 size="medium"
38 - placeholder="路由键名称" clearable></el-input> 48 + placeholder="路由键名称" clearable>
  49 + <template slot="prepend" ><i class="el-icon-user"></i>路由键名称</template>
  50 + </el-input>
39 </el-col> 51 </el-col>
40 <!-- <el-col :span="4">--> 52 <!-- <el-col :span="4">-->
41 <!-- <el-input v-model="umb_queryInfo.subscriber" prefix-icon="el-icon-search"--> 53 <!-- <el-input v-model="umb_queryInfo.subscriber" prefix-icon="el-icon-search"-->
@@ -43,10 +55,10 @@ @@ -43,10 +55,10 @@
43 <!-- placeholder="订阅者名称" clearable></el-input>--> 55 <!-- placeholder="订阅者名称" clearable></el-input>-->
44 <!-- </el-col>--> 56 <!-- </el-col>-->
45 <el-col :span="8"> 57 <el-col :span="8">
46 - <el-button type="success" style="width:150px" size="medium" @click="umb_getList"> 58 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="umb_getList">
47 查询配置信息 59 查询配置信息
48 </el-button> 60 </el-button>
49 - <el-button type="primary" style="width:150px" size="medium" @click="umb_toAddDialog"> 61 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="umb_toAddDialog">
50 添加配置信息 62 添加配置信息
51 </el-button> 63 </el-button>
52 </el-col> 64 </el-col>
@@ -55,8 +67,10 @@ @@ -55,8 +67,10 @@
55 <!-- 列表区域 --> 67 <!-- 列表区域 -->
56 <div style="margin-top: 20px;"> 68 <div style="margin-top: 20px;">
57 <el-table :data="umb_page.umbList" border v-loading="umb_loading.listLoading" 69 <el-table :data="umb_page.umbList" border v-loading="umb_loading.listLoading"
58 - @selection-change="umb_selectChange"  
59 - element-loading-text="获取配置信息列表，拼命加载中"> 70 + @selection-change="umb_selectChange" size="small"
  71 + element-loading-text="获取配置信息列表，拼命加载中"
  72 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  73 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
60 <el-table-column type="selection" width="55" align="center"></el-table-column> 74 <el-table-column type="selection" width="55" align="center"></el-table-column>
61 <el-table-column type="index" align="center"></el-table-column> 75 <el-table-column type="index" align="center"></el-table-column>
62 <el-table-column label="用户名称" prop="username" align="center" width="220"></el-table-column> 76 <el-table-column label="用户名称" prop="username" align="center" width="220"></el-table-column>
@@ -140,10 +154,10 @@ @@ -140,10 +154,10 @@
140 <!-- </el-select>--> 154 <!-- </el-select>-->
141 <!-- </el-form-item>--> 155 <!-- </el-form-item>-->
142 156
143 - <el-form-item label="用户名称：" prop="usernames"> 157 + <el-form-item label="" prop="usernames">
144 <el-select v-model="umb_addForm.usernames" prefix-icon="el-icon-search" clearable 158 <el-select v-model="umb_addForm.usernames" prefix-icon="el-icon-search" clearable
145 @change="umb_userInfo_addChange" 159 @change="umb_userInfo_addChange"
146 - style="width:400px" size="medium" filterable multiple 160 + style="width:300px" size="medium" filterable multiple
147 placeholder="请选择用户"> 161 placeholder="请选择用户">
148 <el-option 162 <el-option
149 v-for="item in (user_cloud.cloudUserList)" 163 v-for="item in (user_cloud.cloudUserList)"
@@ -161,9 +175,9 @@ @@ -161,9 +175,9 @@
161 <!-- placeholder="请输入订阅者名称">--> 175 <!-- placeholder="请输入订阅者名称">-->
162 <!-- </el-input>--> 176 <!-- </el-input>-->
163 <!-- </el-form-item>--> 177 <!-- </el-form-item>-->
164 - <el-form-item label="服务器名称：" prop="serverId"> 178 + <el-form-item label="" prop="serverId">
165 <el-select v-model="umb_addForm.serverId" prefix-icon="el-icon-search" clearable 179 <el-select v-model="umb_addForm.serverId" prefix-icon="el-icon-search" clearable
166 - style="width:400px" size="medium" filterable 180 + style="width:300px" size="medium" filterable
167 :disabled="umb_addForm.usernames.length===0" 181 :disabled="umb_addForm.usernames.length===0"
168 @change="umb_server_addChange" 182 @change="umb_server_addChange"
169 placeholder="请选择服务器"> 183 placeholder="请选择服务器">
@@ -176,9 +190,9 @@ @@ -176,9 +190,9 @@
176 </el-select> 190 </el-select>
177 </el-form-item> 191 </el-form-item>
178 192
179 - <el-form-item label="虚拟主机名称：" prop="virtualHostId"> 193 + <el-form-item label="" prop="virtualHostId">
180 <el-select v-model="umb_addForm.virtualHostId" prefix-icon="el-icon-search" clearable 194 <el-select v-model="umb_addForm.virtualHostId" prefix-icon="el-icon-search" clearable
181 - style="width:400px" size="medium" filterable 195 + style="width:300px" size="medium" filterable
182 @change="umb_virtualHost_addChange" 196 @change="umb_virtualHost_addChange"
183 :disabled="umb_addForm.serverId==='' || umb_addForm.usernames.length===0" 197 :disabled="umb_addForm.serverId==='' || umb_addForm.usernames.length===0"
184 placeholder="请选择虚拟主机"> 198 placeholder="请选择虚拟主机">
@@ -191,9 +205,9 @@ @@ -191,9 +205,9 @@
191 </el-select> 205 </el-select>
192 </el-form-item> 206 </el-form-item>
193 207
194 - <el-form-item label="交换机名称：" prop="exchangeIds"> 208 + <el-form-item label="" prop="exchangeIds">
195 <el-select v-model="umb_addForm.exchangeIds" prefix-icon="el-icon-search" clearable 209 <el-select v-model="umb_addForm.exchangeIds" prefix-icon="el-icon-search" clearable
196 - style="width:400px" size="medium" filterable multiple 210 + style="width:300px" size="medium" filterable multiple
197 @change="umb_exchange_addChange" 211 @change="umb_exchange_addChange"
198 :disabled="umb_addForm.virtualHostId===''" 212 :disabled="umb_addForm.virtualHostId===''"
199 placeholder="请选择交换机"> 213 placeholder="请选择交换机">
@@ -206,9 +220,9 @@ @@ -206,9 +220,9 @@
206 </el-select> 220 </el-select>
207 </el-form-item> 221 </el-form-item>
208 222
209 - <el-form-item label="路由键名称：" prop="routingKeyIds"> 223 + <el-form-item label="" prop="routingKeyIds">
210 <el-select v-model="umb_addForm.routingKeyIds" prefix-icon="el-icon-search" clearable 224 <el-select v-model="umb_addForm.routingKeyIds" prefix-icon="el-icon-search" clearable
211 - style="width:400px" size="medium" filterable multiple 225 + style="width:300px" size="medium" filterable multiple
212 :disabled="umb_addForm.exchangeIds===''" 226 :disabled="umb_addForm.exchangeIds===''"
213 placeholder="请选择路由键"> 227 placeholder="请选择路由键">
214 <el-option 228 <el-option
@@ -220,9 +234,9 @@ @@ -220,9 +234,9 @@
220 </el-select> 234 </el-select>
221 </el-form-item> 235 </el-form-item>
222 236
223 - <el-form-item label="订阅者队列：" prop="queueIds"> 237 + <el-form-item label="" prop="queueIds">
224 <el-select v-model="umb_addForm.queueIds" prefix-icon="el-icon-search" clearable 238 <el-select v-model="umb_addForm.queueIds" prefix-icon="el-icon-search" clearable
225 - style="width:400px" size="medium" filterable multiple 239 + style="width:300px" size="medium" filterable multiple
226 :disabled="umb_addForm.virtualHostId==='' || umb_addForm.usernames.length===0" 240 :disabled="umb_addForm.virtualHostId==='' || umb_addForm.usernames.length===0"
227 placeholder="请选择订阅者队列"> 241 placeholder="请选择订阅者队列">
228 <el-option 242 <el-option
@@ -234,8 +248,8 @@ @@ -234,8 +248,8 @@
234 </el-select> 248 </el-select>
235 </el-form-item> 249 </el-form-item>
236 250
237 - <el-form-item label="相关描述：" prop="description">  
238 - <el-input v-model="umb_addForm.description" style="width:400px" size="medium" clearable 251 + <el-form-item label="" prop="description">
  252 + <el-input v-model="umb_addForm.description" style="width:300px" size="medium" clearable
239 type="textarea" autosize :rows="1" 253 type="textarea" autosize :rows="1"
240 placeholder="请输入相关描述"> 254 placeholder="请输入相关描述">
241 </el-input> 255 </el-input>
@@ -243,7 +257,7 @@ @@ -243,7 +257,7 @@
243 </el-form> 257 </el-form>
244 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: 0px"> 258 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: 0px">
245 <el-button type="info" @click="umb_dialog.addDialog = false" size="medium" 259 <el-button type="info" @click="umb_dialog.addDialog = false" size="medium"
246 - style="width: 100px">取消 260 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
247 </el-button> 261 </el-button>
248 <el-button type="primary" @click="umb_add" :loading="umb_loading.addLoading" 262 <el-button type="primary" @click="umb_add" :loading="umb_loading.addLoading"
249 size="medium" style="width: 100px">添加 263 size="medium" style="width: 100px">添加
@@ -259,9 +273,10 @@ @@ -259,9 +273,10 @@
259 @close="umb_editDialogClosed"> 273 @close="umb_editDialogClosed">
260 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center" 274 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center"
261 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef"> 275 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef">
262 - <el-form-item label="用户名称：" prop="username"> 276 + <el-form-item label="" prop="username">
263 <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable disabled 277 <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable disabled
264 placeholder="请输入用户名称"> 278 placeholder="请输入用户名称">
  279 + <template slot="prepend" >用户名称</template>
265 </el-input> 280 </el-input>
266 </el-form-item> 281 </el-form-item>
267 <!-- <el-form-item label="订阅者名称：" prop="subscriber">--> 282 <!-- <el-form-item label="订阅者名称：" prop="subscriber">-->
@@ -271,7 +286,7 @@ @@ -271,7 +286,7 @@
271 <!-- </el-form-item>--> 286 <!-- </el-form-item>-->
272 287
273 <!-- @change="umb_server_editChange" --> 288 <!-- @change="umb_server_editChange" -->
274 - <el-form-item label="服务器名称：" prop="serverId"> 289 + <el-form-item label="" prop="serverId">
275 <el-select v-model="umb_editForm.serverId" prefix-icon="el-icon-search" clearable 290 <el-select v-model="umb_editForm.serverId" prefix-icon="el-icon-search" clearable
276 style="width:300px" size="small" filterable disabled 291 style="width:300px" size="small" filterable disabled
277 placeholder="请选择所属服务器"> 292 placeholder="请选择所属服务器">
@@ -285,7 +300,7 @@ @@ -285,7 +300,7 @@
285 </el-form-item> 300 </el-form-item>
286 301
287 <!-- :disabled="umb_editForm.serverId===''"--> 302 <!-- :disabled="umb_editForm.serverId===''"-->
288 - <el-form-item label="虚拟主机名称：" prop="virtualHostId"> 303 + <el-form-item label="" prop="virtualHostId">
289 <el-select v-model="umb_editForm.virtualHostId" prefix-icon="el-icon-search" clearable 304 <el-select v-model="umb_editForm.virtualHostId" prefix-icon="el-icon-search" clearable
290 style="width:300px" size="small" filterable disabled 305 style="width:300px" size="small" filterable disabled
291 @change="umb_virtualHost_editChange" 306 @change="umb_virtualHost_editChange"
@@ -300,7 +315,7 @@ @@ -300,7 +315,7 @@
300 </el-form-item> 315 </el-form-item>
301 316
302 <!-- :disabled="umb_editForm.virtualHostId===''" --> 317 <!-- :disabled="umb_editForm.virtualHostId===''" -->
303 - <el-form-item label="交换机名称：" prop="exchangeId"> 318 + <el-form-item label="" prop="exchangeId">
304 <el-select v-model="umb_editForm.exchangeId" prefix-icon="el-icon-search" clearable 319 <el-select v-model="umb_editForm.exchangeId" prefix-icon="el-icon-search" clearable
305 style="width:300px" size="small" filterable disabled 320 style="width:300px" size="small" filterable disabled
306 @change="umb_exchange_editChange" 321 @change="umb_exchange_editChange"
@@ -315,7 +330,7 @@ @@ -315,7 +330,7 @@
315 </el-form-item> 330 </el-form-item>
316 331
317 <!-- :disabled="umb_editForm.exchangeId===''" --> 332 <!-- :disabled="umb_editForm.exchangeId===''" -->
318 - <el-form-item label="路由键名称：" prop="routingKeyId"> 333 + <el-form-item label="" prop="routingKeyId">
319 <el-select v-model="umb_editForm.routingKeyId" prefix-icon="el-icon-search" clearable 334 <el-select v-model="umb_editForm.routingKeyId" prefix-icon="el-icon-search" clearable
320 style="width:300px" size="small" filterable disabled 335 style="width:300px" size="small" filterable disabled
321 placeholder="请选择路由键名称"> 336 placeholder="请选择路由键名称">
@@ -329,7 +344,7 @@ @@ -329,7 +344,7 @@
329 </el-form-item> 344 </el-form-item>
330 345
331 <!-- :disabled="umb_editForm.virtualHostId===''" --> 346 <!-- :disabled="umb_editForm.virtualHostId===''" -->
332 - <el-form-item label="订阅者队列：" prop="queueIds"> 347 + <el-form-item label="" prop="queueIds">
333 <el-select v-model="umb_editForm.queueIds" prefix-icon="el-icon-search" clearable 348 <el-select v-model="umb_editForm.queueIds" prefix-icon="el-icon-search" clearable
334 style="width:300px" size="small" filterable multiple disabled 349 style="width:300px" size="small" filterable multiple disabled
335 placeholder="请选择订阅者队列"> 350 placeholder="请选择订阅者队列">
@@ -342,7 +357,7 @@ @@ -342,7 +357,7 @@
342 </el-select> 357 </el-select>
343 </el-form-item> 358 </el-form-item>
344 359
345 - <el-form-item label="相关描述：" prop="description"> 360 + <el-form-item label="" prop="description">
346 <el-input v-model="umb_editForm.description" style="width:300px" size="small" clearable 361 <el-input v-model="umb_editForm.description" style="width:300px" size="small" clearable
347 type="textarea" autosize :rows="1" disabled 362 type="textarea" autosize :rows="1" disabled
348 placeholder="请输入相关描述"> 363 placeholder="请输入相关描述">
@@ -351,7 +366,7 @@ @@ -351,7 +366,7 @@
351 </el-form> 366 </el-form>
352 <div slot="footer" class="dialog-footer" style="text-align: center"> 367 <div slot="footer" class="dialog-footer" style="text-align: center">
353 <el-button type="info" @click="umb_dialog.editDialog = false" size="medium" 368 <el-button type="info" @click="umb_dialog.editDialog = false" size="medium"
354 - style="width: 100px">取消 369 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
355 </el-button> 370 </el-button>
356 <el-button type="primary" @click="umb_dialog.editDialog = false" :loading="umb_loading.addLoading" disabled 371 <el-button type="primary" @click="umb_dialog.editDialog = false" :loading="umb_loading.addLoading" disabled
357 size="medium" style="width: 100px">关闭 372 size="medium" style="width: 100px">关闭
@@ -5,13 +5,15 @@ @@ -5,13 +5,15 @@
5 <!-- 搜素区域 --> 5 <!-- 搜素区域 -->
6 <div> 6 <div>
7 <el-row> 7 <el-row>
8 - <el-col :span="4">  
9 - <el-input v-model="queryInfo.virtualHostName" prefix-icon="el-icon-search" size="medium"  
10 - placeholder="虚拟主机名称" clearable></el-input> 8 + <el-col :span="7">
  9 + <el-input v-model="queryInfo.virtualHostName" size="medium"
  10 + placeholder="虚拟主机名称" clearable>
  11 + <template slot="prepend"><i class="el-icon-s-operation"></i>虚拟主机名称</template>
  12 + </el-input>
11 </el-col> 13 </el-col>
12 - <el-col :span="4"> 14 + <el-col :span="7">
13 <el-select v-model="queryInfo.serverId" placeholder="请选择所属服务器" 15 <el-select v-model="queryInfo.serverId" placeholder="请选择所属服务器"
14 - prefix-icon="el-icon-search" clearable size="medium" filterable> 16 + prefix-icon="el-icon-search" clearable size="medium" filterable >
15 <el-option 17 <el-option
16 v-for="item in (virtualHost_config.serverList)" 18 v-for="item in (virtualHost_config.serverList)"
17 :key="item.id" 19 :key="item.id"
@@ -21,10 +23,10 @@ @@ -21,10 +23,10 @@
21 </el-select> 23 </el-select>
22 </el-col> 24 </el-col>
23 <el-col :span="8"> 25 <el-col :span="8">
24 - <el-button type="success" style="width:150px" size="medium" @click="getVirtualHostList"> 26 + <el-button type="warning" style="width:150px" icon="el-icon-search" size="medium" @click="getVirtualHostList">
25 查询虚拟主机 27 查询虚拟主机
26 </el-button> 28 </el-button>
27 - <el-button type="primary" style="width:150px" size="medium" @click="toAddDialog"> 29 + <el-button type="primary" style="width:150px" icon="el-icon-plus" size="medium" @click="toAddDialog">
28 添加虚拟主机 30 添加虚拟主机
29 </el-button> 31 </el-button>
30 </el-col> 32 </el-col>
@@ -33,8 +35,10 @@ @@ -33,8 +35,10 @@
33 <!-- 列表区域 --> 35 <!-- 列表区域 -->
34 <div style="margin-top: 20px;"> 36 <div style="margin-top: 20px;">
35 <el-table :data="virtualHostList" border v-loading="virtualHost_loading.listLoading" 37 <el-table :data="virtualHostList" border v-loading="virtualHost_loading.listLoading"
36 - @selection-change="selectChange"  
37 - element-loading-text="获取虚拟主机列表，拼命加载中"> 38 + @selection-change="selectChange" size="small"
  39 + element-loading-text="获取虚拟主机列表，拼命加载中"
  40 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  41 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;">
38 <el-table-column type="selection" width="55" align="center"></el-table-column> 42 <el-table-column type="selection" width="55" align="center"></el-table-column>
39 <el-table-column type="index" align="center"></el-table-column> 43 <el-table-column type="index" align="center"></el-table-column>
40 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" 44 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center"
@@ -42,38 +46,42 @@ @@ -42,38 +46,42 @@
42 <el-table-column label="所属服务器" prop="busServer.serverName" align="center" width="220"> 46 <el-table-column label="所属服务器" prop="busServer.serverName" align="center" width="220">
43 </el-table-column> 47 </el-table-column>
44 <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column> 48 <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>
45 - <el-table-column label="操作" width="250px" align="center"> 49 + <el-table-column label="操作" align="center" >
46 <template slot-scope="scope"> 50 <template slot-scope="scope">
47 - <!-- 交换机-->  
48 - <el-tooltip effect="dark" content="交换机" placement="top-start" :enterable="false">  
49 - <el-button type="warning" icon="el-icon-link" size="small"  
50 - style="width:97px;margin-left: 1px;"  
51 - @click="toExchange(scope.$index,scope.row)">交换机  
52 - </el-button>  
53 - </el-tooltip> 51 + <el-row>
  52 + <!-- 交换机-->
  53 + <el-tooltip effect="dark" content="交换机" placement="top-start" :enterable="false">
  54 + <el-button type="warning" icon="el-icon-link" size="small"
  55 + style="width:97px;margin-left: 1px;"
  56 + @click="toExchange(scope.$index,scope.row)">交换机
  57 + </el-button>
  58 + </el-tooltip>
54 59
55 - <!-- 编辑按钮-->  
56 - <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">  
57 - <el-button type="primary" icon="el-icon-edit" size="small"  
58 - style="width:97px;margin-left: 1px;"  
59 - @click="toEditDialog(scope.$index,scope.row)">编辑  
60 - </el-button>  
61 - </el-tooltip>  
62 - <!-- 队列-->  
63 - <el-tooltip effect="dark" content="队列" placement="top-start" :enterable="false">  
64 - <el-button type="warning" icon="el-icon-link" size="small"  
65 - style="width:97px;margin-left: 1px;margin-top: 3px;"  
66 - @click="toQueue(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-delete" size="small"  
72 - style="width:97px;margin-left: 1px;"  
73 - :loading="virtualHost_loading.delLoading"  
74 - @click="removeVirtualHostInfo(scope.$index,scope.row)">删除  
75 - </el-button>  
76 - </el-tooltip> 60 + <!-- 编辑按钮-->
  61 + <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false">
  62 + <el-button type="primary" icon="el-icon-edit" size="small"
  63 + style="width:97px;margin-left: 1px;"
  64 + @click="toEditDialog(scope.$index,scope.row)">编辑
  65 + </el-button>
  66 + </el-tooltip>
  67 + </el-row>
  68 + <el-row>
  69 + <!-- 队列-->
  70 + <el-tooltip effect="dark" content="队列" placement="top-start" :enterable="false">
  71 + <el-button type="success" icon="el-icon-link" size="small"
  72 + style="width:97px;margin-left: 1px;margin-top: 3px;"
  73 + @click="toQueue(scope.$index,scope.row)">队列
  74 + </el-button>
  75 + </el-tooltip>
  76 + <!-- 删除按钮-->
  77 + <el-tooltip effect="dark" content="删除" placement="top-start" :enterable="false">
  78 + <el-button type="danger" icon="el-icon-delete" size="small"
  79 + style="width:97px;margin-left: 1px;"
  80 + :loading="virtualHost_loading.delLoading"
  81 + @click="removeVirtualHostInfo(scope.$index,scope.row)">删除
  82 + </el-button>
  83 + </el-tooltip>
  84 + </el-row>
77 </template> 85 </template>
78 </el-table-column> 86 </el-table-column>
79 </el-table> 87 </el-table>
@@ -111,33 +119,40 @@ @@ -111,33 +119,40 @@
111 <el-form :inline="true" :model="addVirtualHostForm" label-width="130px" status-icon 119 <el-form :inline="true" :model="addVirtualHostForm" label-width="130px" status-icon
112 :rules="addVirtualHostFormRules" ref="addVirtualHostRef" 120 :rules="addVirtualHostFormRules" ref="addVirtualHostRef"
113 align="center"> 121 align="center">
114 - <el-form-item label="虚拟主机名称：" prop="virtualHostName">  
115 - <el-input v-model="addVirtualHostForm.virtualHostName" style="width:300px" size="small"  
116 - clearable  
117 - placeholder="请输入虚拟主机名称"></el-input>  
118 - </el-form-item>  
119 - <el-form-item label="所属服务器：" prop="serverId">  
120 - <el-select v-model="addVirtualHostForm.serverId" clearable style="width:300px" size="small"  
121 - filterable placeholder="请选择服务器名称">  
122 - <el-option  
123 - v-for="item in (virtualHost_config.serverList)"  
124 - :key="item.id"  
125 - :label="item.serverName"  
126 - :value="item.id">  
127 - </el-option>  
128 - </el-select>  
129 - </el-form-item>  
130 -  
131 - <el-form-item label="相关描述：" prop="description">  
132 - <el-input v-model="addVirtualHostForm.description" placeholder="请输入相关描述"  
133 - style="width:300px" clearable size="small"  
134 - type="textarea" autosize :rows="1"></el-input>  
135 - </el-form-item> 122 + <el-row>
  123 + <el-form-item label="" prop="virtualHostName">
  124 + <el-input v-model="addVirtualHostForm.virtualHostName" style="width:300px" size="small"
  125 + clearable
  126 + placeholder="请输入虚拟主机名称">
  127 + <template slot="prepend" >虚拟主机名称</template>
  128 + </el-input>
  129 + </el-form-item>
  130 + </el-row>
  131 + <el-row>
  132 + <el-form-item label="" prop="serverId">
  133 + <el-select v-model="addVirtualHostForm.serverId" clearable style="width:300px" size="small"
  134 + filterable placeholder="请选择服务器名称">
  135 + <el-option
  136 + v-for="item in (virtualHost_config.serverList)"
  137 + :key="item.id"
  138 + :label="item.serverName"
  139 + :value="item.id">
  140 + </el-option>
  141 + </el-select>
  142 + </el-form-item>
  143 + </el-row>
  144 + <el-row>
  145 + <el-form-item label="" prop="description">
  146 + <el-input v-model="addVirtualHostForm.description" placeholder="请输入相关描述"
  147 + style="width:300px" clearable size="small"
  148 + type="textarea" autosize :rows="1">
  149 + </el-input>
  150 + </el-form-item>
  151 + </el-row>
136 </el-form> 152 </el-form>
137 -  
138 <div slot="footer" class="dialog-footer" style="text-align: center"> 153 <div slot="footer" class="dialog-footer" style="text-align: center">
139 <el-button type="info" @click="virtualHostDialog.addDialog = false" size="medium" 154 <el-button type="info" @click="virtualHostDialog.addDialog = false" size="medium"
140 - style="width: 100px">取消 155 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
141 </el-button> 156 </el-button>
142 <el-button type="primary" @click="addVirtualHostInfo" :loading="virtualHost_loading.addLoading" 157 <el-button type="primary" @click="addVirtualHostInfo" :loading="virtualHost_loading.addLoading"
143 size="medium" 158 size="medium"
@@ -156,33 +171,39 @@ @@ -156,33 +171,39 @@
156 <el-form :inline="true" :model="editVirtualHostForm" label-width="120px" status-icon 171 <el-form :inline="true" :model="editVirtualHostForm" label-width="120px" status-icon
157 :rules="editVirtualHostFormRules" ref="editVirtualHostRef" 172 :rules="editVirtualHostFormRules" ref="editVirtualHostRef"
158 align="center"> 173 align="center">
159 - <el-form-item label="虚拟主机名称：" prop="virtualHostName">  
160 - <el-input v-model="editVirtualHostForm.virtualHostName" style="width:300px" clearable  
161 - readonly disabled size="small"  
162 - placeholder="请输入虚拟主机名称"></el-input>  
163 - </el-form-item>  
164 - <el-form-item label="所属服务器：" prop="serverId">  
165 - <el-select v-model="editVirtualHostForm.serverId" placeholder="请选择服务器名称"  
166 - size="small" clearable disabled style="width:300px">  
167 - <el-option  
168 - v-for="item in (virtualHost_config.serverList)"  
169 - :key="item.id"  
170 - :label="item.serverName"  
171 - :value="item.id">  
172 - </el-option>  
173 - </el-select>  
174 - </el-form-item>  
175 -  
176 - <el-form-item label="相关描述：" prop="description">  
177 - <el-input v-model="editVirtualHostForm.description" placeholder="请输入相关描述"  
178 - style="width:300px" clearable size="small"  
179 - type="textarea" autosize :rows="1"/>  
180 - </el-form-item> 174 + <el-row>
  175 + <el-form-item label="" prop="virtualHostName">
  176 + <el-input v-model="editVirtualHostForm.virtualHostName" style="width:300px" clearable
  177 + readonly disabled size="small"
  178 + placeholder="请输入虚拟主机名称">
  179 + <template slot="prepend" >虚拟主机名称</template>
  180 + </el-input>
  181 + </el-form-item>
  182 + </el-row>
  183 + <el-row>
  184 + <el-form-item label="" prop="serverId">
  185 + <el-select v-model="editVirtualHostForm.serverId" placeholder="请选择服务器名称"
  186 + size="small" clearable disabled style="width:300px">
  187 + <el-option
  188 + v-for="item in (virtualHost_config.serverList)"
  189 + :key="item.id"
  190 + :label="item.serverName"
  191 + :value="item.id">
  192 + </el-option>
  193 + </el-select>
  194 + </el-form-item>
  195 + </el-row>
  196 + <el-row>
  197 + <el-form-item label="" prop="description">
  198 + <el-input v-model="editVirtualHostForm.description" placeholder="请输入相关描述"
  199 + style="width:300px" clearable size="small"
  200 + type="textarea" autosize :rows="1"/>
  201 + </el-form-item>
  202 + </el-row>
181 </el-form> 203 </el-form>
182 -  
183 <div slot="footer" class="dialog-footer" style="text-align: center"> 204 <div slot="footer" class="dialog-footer" style="text-align: center">
184 <el-button type="info" @click="virtualHostDialog.editDialog = false" size="medium" 205 <el-button type="info" @click="virtualHostDialog.editDialog = false" size="medium"
185 - style="width: 100px">取消 206 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消
186 </el-button> 207 </el-button>
187 <el-button type="primary" @click="editVirtualHostInfo" :loading="virtualHost_loading.addLoading" 208 <el-button type="primary" @click="editVirtualHostInfo" :loading="virtualHost_loading.addLoading"
188 size="medium" 209 size="medium"