作者 王勇

修改服务器的端口号类型

@@ -18,14 +18,10 @@ @@ -18,14 +18,10 @@
18 size="medium" clearable prefix-icon="el-icon-search" 18 size="medium" clearable prefix-icon="el-icon-search"
19 placeholder="虚拟主机名称"></el-input> 19 placeholder="虚拟主机名称"></el-input>
20 </el-col> 20 </el-col>
21 - <el-col :span="4">  
22 - <el-input v-model="messageNote_queryInfo.exchangeName" placeholder="交换机名称"  
23 - size="medium" clearable prefix-icon="el-icon-search"></el-input>  
24 - </el-col>  
25 </el-row> 21 </el-row>
26 <el-row> 22 <el-row>
27 <el-col :span="4"> 23 <el-col :span="4">
28 - <el-input v-model="messageNote_queryInfo.queueName" placeholder="队列名称" 24 + <el-input v-model="messageNote_queryInfo.exchangeName" placeholder="交换机名称"
29 size="medium" clearable prefix-icon="el-icon-search"></el-input> 25 size="medium" clearable prefix-icon="el-icon-search"></el-input>
30 </el-col> 26 </el-col>
31 <el-col :span="4"> 27 <el-col :span="4">
@@ -37,20 +33,15 @@ @@ -37,20 +33,15 @@
37 type="date" value-format="yyyy-MM-dd" 33 type="date" value-format="yyyy-MM-dd"
38 size="medium" style="width: auto"></el-date-picker> 34 size="medium" style="width: auto"></el-date-picker>
39 </el-col> 35 </el-col>
40 - <el-col :span="4">  
41 - <el-date-picker v-model="messageNote_queryInfo.receiveTime" type="date"  
42 - value-format="yyyy-MM-dd"  
43 - placeholder="消息接收时间" size="medium" style="width: auto"></el-date-picker>  
44 - </el-col>  
45 </el-row> 36 </el-row>
46 <el-row> 37 <el-row>
47 <el-col :span="15"> 38 <el-col :span="15">
48 <el-button type="success" style="width:150px" size="medium" @click="messageNote_getList"> 39 <el-button type="success" style="width:150px" size="medium" @click="messageNote_getList">
49 - 查询消息收发记录 40 + 查询消息记录
50 </el-button> 41 </el-button>
51 <el-button type="primary" style="width:150px" size="medium" 42 <el-button type="primary" style="width:150px" size="medium"
52 @click="messageNote_toAddDialog"> 43 @click="messageNote_toAddDialog">
53 - 添加消息收发记录 44 + 发送消息
54 </el-button> 45 </el-button>
55 <el-button type="warning" style="width:150px" size="medium" 46 <el-button type="warning" style="width:150px" size="medium"
56 @click="messageNote_openDeleteTime"> 47 @click="messageNote_openDeleteTime">
@@ -72,15 +63,11 @@ @@ -72,15 +63,11 @@
72 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center" 63 <el-table-column label="虚拟主机名称" prop="virtualHostName" align="center"
73 width="220"></el-table-column> 64 width="220"></el-table-column>
74 <el-table-column label="交换机名称" prop="exchangeName" align="center" width="220"></el-table-column> 65 <el-table-column label="交换机名称" prop="exchangeName" align="center" width="220"></el-table-column>
75 - <el-table-column label="队列名称" prop="queueName" align="center" width="220"></el-table-column>  
76 <el-table-column label="路由键名称" prop="routingKeyName" align="center" 66 <el-table-column label="路由键名称" prop="routingKeyName" align="center"
77 width="220"></el-table-column> 67 width="220"></el-table-column>
78 <el-table-column label="消息发送时间" prop="sendTime" align="center" 68 <el-table-column label="消息发送时间" prop="sendTime" align="center"
79 width="220"> 69 width="220">
80 </el-table-column> 70 </el-table-column>
81 - <el-table-column label="消息获取时间" prop="receiveTime" align="center"  
82 - width="220">  
83 - </el-table-column>  
84 <el-table-column label="发送内容" prop="alias_sendContent" align="center" 71 <el-table-column label="发送内容" prop="alias_sendContent" align="center"
85 width="220"> 72 width="220">
86 </el-table-column> 73 </el-table-column>
@@ -159,22 +146,28 @@ @@ -159,22 +146,28 @@
159 </div> 146 </div>
160 <!-- 增加,对话框区域 --> 147 <!-- 增加,对话框区域 -->
161 <div> 148 <div>
162 - <el-dialog title="添加消息收发记录" 149 + <el-dialog title="发送消息"
163 :visible.sync="messageNote_dialog.addDialog" 150 :visible.sync="messageNote_dialog.addDialog"
164 - style="margin-top: -50px" text-align="center" width="60%" 151 + style="margin-top: -50px" text-align="center" width="65%"
165 @close="messageNote_addDialogClosed"> 152 @close="messageNote_addDialogClosed">
166 153
167 <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"
168 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef"> 155 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef">
169 - <el-form-item label="用户名称:" prop="username">  
170 - <el-input v-model="messageNote_addForm.username" style="width:240px" size="small" clearable  
171 - placeholder="请输入用户名称">  
172 - </el-input> 156 + <el-form-item label="用户名称:" prop="userId">
  157 + <el-select v-model="messageNote_addForm.userId" prefix-icon="el-icon-search" clearable
  158 + style="width:300px" size="medium" filterable
  159 + placeholder="请选择用户">
  160 + <el-option
  161 + v-for="item in (messageNote_config.userInfoList)"
  162 + :key="item.id"
  163 + :label="item.username"
  164 + :value="item.id">
  165 + </el-option>
  166 + </el-select>
173 </el-form-item> 167 </el-form-item>
174 -  
175 <el-form-item label="服务器名称:" prop="serverId"> 168 <el-form-item label="服务器名称:" prop="serverId">
176 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable 169 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable
177 - style="width:240px" size="small" 170 + style="width:300px" size="small"
178 @change="messageNote_server_addChange" 171 @change="messageNote_server_addChange"
179 placeholder="请选择所属服务器"> 172 placeholder="请选择所属服务器">
180 <el-option 173 <el-option
@@ -188,7 +181,7 @@ @@ -188,7 +181,7 @@
188 181
189 <el-form-item label="虚拟主机名称:" prop="virtualHostId"> 182 <el-form-item label="虚拟主机名称:" prop="virtualHostId">
190 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable 183 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable
191 - style="width:240px" size="small" 184 + style="width:300px" size="small"
192 @change="messageNote_virtualHost_addChange" 185 @change="messageNote_virtualHost_addChange"
193 :disabled="messageNote_addForm.serverId===''" 186 :disabled="messageNote_addForm.serverId===''"
194 placeholder="请选择虚拟主机名称"> 187 placeholder="请选择虚拟主机名称">
@@ -203,7 +196,7 @@ @@ -203,7 +196,7 @@
203 196
204 <el-form-item label="交换机名称:" prop="exchangeId"> 197 <el-form-item label="交换机名称:" prop="exchangeId">
205 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable 198 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable
206 - style="width:240px" size="small" 199 + style="width:300px" size="small"
207 @change="messageNote_exchange_addChange" 200 @change="messageNote_exchange_addChange"
208 :disabled="messageNote_addForm.virtualHostId===''" 201 :disabled="messageNote_addForm.virtualHostId===''"
209 placeholder="请选择交换机名称"> 202 placeholder="请选择交换机名称">
@@ -216,23 +209,9 @@ @@ -216,23 +209,9 @@
216 </el-select> 209 </el-select>
217 </el-form-item> 210 </el-form-item>
218 211
219 - <el-form-item label="队列名称:" prop="queueId">  
220 - <el-select v-model="messageNote_addForm.queueId" prefix-icon="el-icon-search" clearable  
221 - style="width:240px" size="small"  
222 - :disabled="messageNote_addForm.virtualHostId===''"  
223 - placeholder="请选择交换机名称">  
224 - <el-option  
225 - v-for="item in (messageNote_config.queueList)"  
226 - :key="item.id"  
227 - :label="item.queueName"  
228 - :value="item.id">  
229 - </el-option>  
230 - </el-select>  
231 - </el-form-item>  
232 -  
233 <el-form-item label="路由键名称:" prop="routingKeyId"> 212 <el-form-item label="路由键名称:" prop="routingKeyId">
234 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable 213 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable
235 - style="width:240px" size="small" 214 + style="width:300px" size="small"
236 :disabled="messageNote_addForm.exchangeId===''" 215 :disabled="messageNote_addForm.exchangeId===''"
237 placeholder="请选择路由键名称"> 216 placeholder="请选择路由键名称">
238 <el-option 217 <el-option
@@ -246,22 +225,22 @@ @@ -246,22 +225,22 @@
246 <el-form-item label="消息发送时间:" prop="sendTime"> 225 <el-form-item label="消息发送时间:" prop="sendTime">
247 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime" 226 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime"
248 value-format="yyyy-MM-dd HH:mm:ss" 227 value-format="yyyy-MM-dd HH:mm:ss"
249 - placeholder="选择发送时间" size="small" style="width:240px"></el-date-picker>  
250 - </el-form-item>  
251 - <el-form-item label="消息获取时间:" prop="receiveTime">  
252 - <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"  
253 - value-format="yyyy-MM-dd HH:mm:ss"  
254 - placeholder="消息获取时间" size="small" style="width:240px"></el-date-picker> 228 + placeholder="选择发送时间" size="small" style="width:300px"></el-date-picker>
255 </el-form-item> 229 </el-form-item>
  230 + <!-- <el-form-item label="消息获取时间:" prop="receiveTime">-->
  231 + <!-- <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"-->
  232 + <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
  233 + <!-- placeholder="消息获取时间" size="small" style="width:300px"></el-date-picker>-->
  234 + <!-- </el-form-item>-->
256 235
257 <el-form-item label="发送内容:" prop="alias_sendContent"> 236 <el-form-item label="发送内容:" prop="alias_sendContent">
258 - <el-input v-model="messageNote_addForm.alias_sendContent" style="width:240px" size="small" 237 + <el-input v-model="messageNote_addForm.alias_sendContent" style="width:300px" size="small"
259 clearable type="textarea" :rows="1" 238 clearable type="textarea" :rows="1"
260 placeholder="请输入相关描述"> 239 placeholder="请输入相关描述">
261 </el-input> 240 </el-input>
262 </el-form-item> 241 </el-form-item>
263 <el-form-item label="相关描述:" prop="description"> 242 <el-form-item label="相关描述:" prop="description">
264 - <el-input v-model="messageNote_addForm.description" style="width:240px" size="small" clearable 243 + <el-input v-model="messageNote_addForm.description" style="width:300px" size="small" clearable
265 placeholder="请输入相关描述"> 244 placeholder="请输入相关描述">
266 </el-input> 245 </el-input>
267 </el-form-item> 246 </el-form-item>
@@ -278,24 +257,30 @@ @@ -278,24 +257,30 @@
278 </div> 257 </div>
279 <!-- 编辑,对话框区域 --> 258 <!-- 编辑,对话框区域 -->
280 <div> 259 <div>
281 - <el-dialog title="编辑消息收发记录" 260 + <el-dialog title="编辑消息记录"
282 :visible.sync="messageNote_dialog.editDialog" 261 :visible.sync="messageNote_dialog.editDialog"
283 - style="margin-top: -50px" text-align="center" width="60%" 262 + style="margin-top: -50px" text-align="center" width="65%"
284 @close="messageNote_editDialogClosed"> 263 @close="messageNote_editDialogClosed">
285 264
286 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 265 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
287 :model="messageNote_editForm" :rules="messageNote_editFormRules" ref="messageNote_editFormRef"> 266 :model="messageNote_editForm" :rules="messageNote_editFormRules" ref="messageNote_editFormRef">
288 - <el-form-item label="用户名称:" prop="username">  
289 - <el-input v-model="messageNote_editForm.username" style="width:240px" size="small" clearable  
290 - disabled  
291 - placeholder="请输入用户名称">  
292 - </el-input> 267 + <el-form-item label="用户名称:" prop="userId">
  268 + <el-select v-model="messageNote_editForm.userId" prefix-icon="el-icon-search" clearable
  269 + style="width:300px" size="medium" filterable disabled
  270 + placeholder="请选择用户">
  271 + <el-option
  272 + v-for="item in (messageNote_config.userInfoList)"
  273 + :key="item.id"
  274 + :label="item.username"
  275 + :value="item.id">
  276 + </el-option>
  277 + </el-select>
293 </el-form-item> 278 </el-form-item>
294 279
295 <el-form-item label="服务器名称:" prop="serverId"> 280 <el-form-item label="服务器名称:" prop="serverId">
296 <el-select v-model="messageNote_editForm.serverId" prefix-icon="el-icon-search" clearable 281 <el-select v-model="messageNote_editForm.serverId" prefix-icon="el-icon-search" clearable
297 disabled 282 disabled
298 - style="width:240px" size="small" 283 + style="width:300px" size="small"
299 @change="messageNote_server_editChange" 284 @change="messageNote_server_editChange"
300 placeholder="请选择所属服务器"> 285 placeholder="请选择所属服务器">
301 <el-option 286 <el-option
@@ -311,7 +296,7 @@ @@ -311,7 +296,7 @@
311 <!-- :disabled="messageNote_editForm.serverId===''" --> 296 <!-- :disabled="messageNote_editForm.serverId===''" -->
312 <el-select v-model="messageNote_editForm.virtualHostId" prefix-icon="el-icon-search" clearable 297 <el-select v-model="messageNote_editForm.virtualHostId" prefix-icon="el-icon-search" clearable
313 disabled 298 disabled
314 - style="width:240px" size="small" 299 + style="width:300px" size="small"
315 @change="messageNote_virtualHost_editChange" 300 @change="messageNote_virtualHost_editChange"
316 placeholder="请选择虚拟主机名称"> 301 placeholder="请选择虚拟主机名称">
317 <el-option 302 <el-option
@@ -327,7 +312,7 @@ @@ -327,7 +312,7 @@
327 <!-- :disabled="messageNote_editForm.virtualHostId===''" --> 312 <!-- :disabled="messageNote_editForm.virtualHostId===''" -->
328 <el-select v-model="messageNote_editForm.exchangeId" prefix-icon="el-icon-search" clearable 313 <el-select v-model="messageNote_editForm.exchangeId" prefix-icon="el-icon-search" clearable
329 disabled 314 disabled
330 - style="width:240px" size="small" 315 + style="width:300px" size="small"
331 @change="messageNote_exchange_editChange" 316 @change="messageNote_exchange_editChange"
332 placeholder="请选择交换机名称"> 317 placeholder="请选择交换机名称">
333 <el-option 318 <el-option
@@ -339,26 +324,11 @@ @@ -339,26 +324,11 @@
339 </el-select> 324 </el-select>
340 </el-form-item> 325 </el-form-item>
341 326
342 - <el-form-item label="队列名称:" prop="queueId">  
343 - <!-- :disabled="messageNote_editForm.virtualHostId===''" -->  
344 - <el-select v-model="messageNote_editForm.queueId" prefix-icon="el-icon-search" clearable  
345 - disabled  
346 - style="width:240px" size="small"  
347 - placeholder="请选择交换机名称">  
348 - <el-option  
349 - v-for="item in (messageNote_config.queueList)"  
350 - :key="item.id"  
351 - :label="item.queueName"  
352 - :value="item.id">  
353 - </el-option>  
354 - </el-select>  
355 - </el-form-item>  
356 -  
357 <el-form-item label="路由键名称:" prop="routingKeyId"> 327 <el-form-item label="路由键名称:" prop="routingKeyId">
358 <!-- :disabled="messageNote_editForm.exchangeId===''" --> 328 <!-- :disabled="messageNote_editForm.exchangeId===''" -->
359 <el-select v-model="messageNote_editForm.routingKeyId" prefix-icon="el-icon-search" clearable 329 <el-select v-model="messageNote_editForm.routingKeyId" prefix-icon="el-icon-search" clearable
360 disabled 330 disabled
361 - style="width:240px" size="small" 331 + style="width:300px" size="small"
362 placeholder="请选择路由键名称"> 332 placeholder="请选择路由键名称">
363 <el-option 333 <el-option
364 v-for="item in (messageNote_config.routingKeyList)" 334 v-for="item in (messageNote_config.routingKeyList)"
@@ -371,22 +341,18 @@ @@ -371,22 +341,18 @@
371 <el-form-item label="消息发送时间:" prop="sendTime"> 341 <el-form-item label="消息发送时间:" prop="sendTime">
372 <el-date-picker v-model="messageNote_editForm.sendTime" disabled clearable type="datetime" 342 <el-date-picker v-model="messageNote_editForm.sendTime" disabled clearable type="datetime"
373 value-format="yyyy-MM-dd HH:mm:ss" 343 value-format="yyyy-MM-dd HH:mm:ss"
374 - placeholder="选择发送时间" size="small" style="width:240px"></el-date-picker>  
375 - </el-form-item>  
376 - <el-form-item label="消息获取时间:" prop="receiveTime">  
377 - <el-date-picker v-model="messageNote_editForm.receiveTime" disabled="" clearable type="datetime"  
378 - value-format="yyyy-MM-dd HH:mm:ss"  
379 - placeholder="消息获取时间" size="small" style="width:240px"></el-date-picker> 344 + placeholder="选择发送时间" size="small" style="width:300px"></el-date-picker>
380 </el-form-item> 345 </el-form-item>
381 346
382 <el-form-item label="发送内容:" prop="alias_sendContent"> 347 <el-form-item label="发送内容:" prop="alias_sendContent">
383 - <el-input v-model="messageNote_editForm.alias_sendContent" style="width:240px" size="small" 348 + <el-input v-model="messageNote_editForm.alias_sendContent" style="width:300px" size="small"
384 clearable disabled type="textarea" :rows="1" 349 clearable disabled type="textarea" :rows="1"
385 placeholder="请输入相关描述"> 350 placeholder="请输入相关描述">
386 </el-input> 351 </el-input>
387 </el-form-item> 352 </el-form-item>
  353 +
388 <el-form-item label="相关描述:" prop="description"> 354 <el-form-item label="相关描述:" prop="description">
389 - <el-input v-model="messageNote_editForm.description" style="width:240px" size="small" clearable 355 + <el-input v-model="messageNote_editForm.description" style="width:300px" size="small" clearable
390 placeholder="请输入相关描述"> 356 placeholder="请输入相关描述">
391 </el-input> 357 </el-input>
392 </el-form-item> 358 </el-form-item>
@@ -411,7 +377,7 @@ @@ -411,7 +377,7 @@
411 updateMessageNote, 377 updateMessageNote,
412 deleteMessageNote, 378 deleteMessageNote,
413 batchRemoveMessageNote, getServerList, getHostList, getExchangeList, getQueueList, getRoutingKeyList, 379 batchRemoveMessageNote, getServerList, getHostList, getExchangeList, getQueueList, getRoutingKeyList,
414 - getDeleteTime, setDeleteTime 380 + getDeleteTime, setDeleteTime, getUserInfoList
415 } from "../../api/message_bus"; 381 } from "../../api/message_bus";
416 382
417 export default { 383 export default {
@@ -424,6 +390,8 @@ @@ -424,6 +390,8 @@
424 * messageNote,配置与参数 390 * messageNote,配置与参数
425 */ 391 */
426 messageNote_config: { 392 messageNote_config: {
  393 + // 用户信息列表
  394 + userInfoList: [],
427 // 服务器列表 395 // 服务器列表
428 serverList: [], 396 serverList: [],
429 // 虚拟主机列表 397 // 虚拟主机列表
@@ -492,8 +460,6 @@ @@ -492,8 +460,6 @@
492 virtualHostId: '', 460 virtualHostId: '',
493 // 交换机id 461 // 交换机id
494 exchangeId: '', 462 exchangeId: '',
495 - // 队列id  
496 - queueId: '',  
497 // 路由键id 463 // 路由键id
498 routingKeyId: '', 464 routingKeyId: '',
499 // 消息发送时间 465 // 消息发送时间
@@ -1072,7 +1038,21 @@ @@ -1072,7 +1038,21 @@
1072 // 根据交换机ID,获取出对应的路由键的列表 1038 // 根据交换机ID,获取出对应的路由键的列表
1073 this.messageNote_selectRoutingKeyList(value); 1039 this.messageNote_selectRoutingKeyList(value);
1074 }, 1040 },
1075 - 1041 + /**
  1042 + * 获取所有用户的信息
  1043 + */
  1044 + note_getUserInfoList() {
  1045 + getUserInfoList().then((response) => {
  1046 + let res = response.data;
  1047 + if (res.code !== '200') {
  1048 + return this.$message.error('获取用户信息列表,失败!');
  1049 + }
  1050 + // 获取列表数据
  1051 + this.messageNote_config.userInfoList = res.data;
  1052 + }).catch(error => {
  1053 + this.$message.error(error.toString());
  1054 + });
  1055 + },
1076 }, 1056 },
1077 created() { 1057 created() {
1078 // 刷新列表 1058 // 刷新列表
@@ -1082,6 +1062,7 @@ @@ -1082,6 +1062,7 @@
1082 }, 1062 },
1083 mounted() { 1063 mounted() {
1084 this.messageNote_selectServerList(); 1064 this.messageNote_selectServerList();
  1065 + this.note_getUserInfoList();
1085 }, 1066 },
1086 computed: {}, 1067 computed: {},
1087 } 1068 }
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 // 服务器IP 211 // 服务器IP
212 serverIp: '', 212 serverIp: '',
213 // 服务器端口号 213 // 服务器端口号
214 - serverPort: '', 214 + serverPort: undefined,
215 // 相关描述 215 // 相关描述
216 description: '', 216 description: '',
217 }, 217 },
@@ -243,7 +243,8 @@ @@ -243,7 +243,8 @@
243 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center" 243 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center"
244 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef"> 244 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef">
245 <el-form-item label="用户名称:" prop="username"> 245 <el-form-item label="用户名称:" prop="username">
246 - <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable disabled 246 + <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable
  247 + disabled
247 placeholder="请输入用户名称"> 248 placeholder="请输入用户名称">
248 </el-input> 249 </el-input>
249 </el-form-item> 250 </el-form-item>
@@ -959,7 +960,7 @@ @@ -959,7 +960,7 @@
959 getUserInfoList().then((response) => { 960 getUserInfoList().then((response) => {
960 let res = response.data; 961 let res = response.data;
961 if (res.code !== '200') { 962 if (res.code !== '200') {
962 - return this.$message.error('获取路由键列表,失败!'); 963 + return this.$message.error('获取用户信息列表,失败!');
963 } 964 }
964 // 获取列表数据 965 // 获取列表数据
965 this.umb_config.userInfoList = res.data; 966 this.umb_config.userInfoList = res.data;