朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 fee94b56a0123bf8b2ee37102d1f1c7fa186f521 1 个父辈 febb8762

jsonview 查看优化

内嵌 并排对比
正在显示 3 个修改的文件 包含 99 行增加 和 79 行删除
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 "vue": "^2.2.2", 30 "vue": "^2.2.2",
31 "vue-count-to": "^1.0.13", 31 "vue-count-to": "^1.0.13",
32 "vue-i18n": "^8.14.0", 32 "vue-i18n": "^8.14.0",
  33 + "vue-json-viewer": "^2.2.22",
33 "vue-quill-editor": "^3.0.6", 34 "vue-quill-editor": "^3.0.6",
34 "vue-router": "^2.3.0", 35 "vue-router": "^2.3.0",
35 "vuex": "^2.0.0-rc.6", 36 "vuex": "^2.0.0-rc.6",
@@ -7,25 +7,25 @@ @@ -7,25 +7,25 @@
7 <el-row> 7 <el-row>
8 <el-col :span="5"> 8 <el-col :span="5">
9 <el-input v-model="ES_queryInfo.sndr" placeholder="发送者" 9 <el-input v-model="ES_queryInfo.sndr" placeholder="发送者"
10 - size="medium" clearable > 10 + size="mini" clearable >
11 <template slot="prepend" ><i class="el-icon-user"></i>&nbsp;消息发送者</template> 11 <template slot="prepend" ><i class="el-icon-user"></i>&nbsp;消息发送者</template>
12 </el-input> 12 </el-input>
13 </el-col> 13 </el-col>
14 <el-col :span="6"> 14 <el-col :span="6">
15 <el-input v-model="ES_queryInfo.btype" placeholder="消息大类" 15 <el-input v-model="ES_queryInfo.btype" placeholder="消息大类"
16 - size="medium" clearable> 16 + size="mini" clearable>
17 <template slot="prepend" ><i class="el-icon-document-checked"></i>&nbsp;消 息大 类 </template> 17 <template slot="prepend" ><i class="el-icon-document-checked"></i>&nbsp;消 息大 类 </template>
18 </el-input> 18 </el-input>
19 </el-col> 19 </el-col>
20 <el-col :span="6"> 20 <el-col :span="6">
21 <el-input v-model="ES_queryInfo.stype" placeholder="消息子类" 21 <el-input v-model="ES_queryInfo.stype" placeholder="消息子类"
22 - size="medium" clearable> 22 + size="mini" clearable>
23 <template slot="prepend"><i class="el-icon-s-platform"></i>消 息子 类</template> 23 <template slot="prepend"><i class="el-icon-s-platform"></i>消 息子 类</template>
24 </el-input> 24 </el-input>
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-input v-model="ES_queryInfo.seqn" 27 <el-input v-model="ES_queryInfo.seqn"
28 - size="medium" clearable 28 + size="mini" clearable
29 placeholder="消息序号"> 29 placeholder="消息序号">
30 <template slot="prepend"><i class="el-icon-s-operation"></i>消 息序 号</template> 30 <template slot="prepend"><i class="el-icon-s-operation"></i>消 息序 号</template>
31 </el-input> 31 </el-input>
@@ -35,13 +35,13 @@ @@ -35,13 +35,13 @@
35 <el-row> 35 <el-row>
36 <el-col :span="5"> 36 <el-col :span="5">
37 <el-input v-model="ES_queryInfo.rcvrsUserName" placeholder="路由接收者" 37 <el-input v-model="ES_queryInfo.rcvrsUserName" placeholder="路由接收者"
38 - size="medium" clearable > 38 + size="mini" clearable >
39 <template slot="prepend"><i class="el-icon-news"></i>路由订阅者</template> 39 <template slot="prepend"><i class="el-icon-news"></i>路由订阅者</template>
40 </el-input> 40 </el-input>
41 </el-col> 41 </el-col>
42 <el-col :span="6"> 42 <el-col :span="6">
43 <el-input v-model="ES_queryInfo.rcvlogUsername" placeholder="消息接收者" 43 <el-input v-model="ES_queryInfo.rcvlogUsername" placeholder="消息接收者"
44 - size="medium" clearable > 44 + size="mini" clearable >
45 <template slot="prepend" ><i class="el-icon-user"></i>消息接收者</template> 45 <template slot="prepend" ><i class="el-icon-user"></i>消息接收者</template>
46 </el-input> 46 </el-input>
47 </el-col> 47 </el-col>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 type="datetimerange" 53 type="datetimerange"
54 :picker-options="pickerOptions" 54 :picker-options="pickerOptions"
55 :default-time="['00:00:00', '23:59:59']" 55 :default-time="['00:00:00', '23:59:59']"
56 - size="medium" 56 + size="mini"
57 align="right" 57 align="right"
58 format = "yyyy-MM-dd HH:mm:ss" 58 format = "yyyy-MM-dd HH:mm:ss"
59 value-format = "yyyy-MM-dd HH:mm:ss" 59 value-format = "yyyy-MM-dd HH:mm:ss"
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </el-col> 62 </el-col>
63 <el-col :span="6"> 63 <el-col :span="6">
64 <el-input v-model="ES_queryInfo.alias_sendContent" placeholder="消息内容" 64 <el-input v-model="ES_queryInfo.alias_sendContent" placeholder="消息内容"
65 - size="medium" clearable > 65 + size="mini" clearable >
66 <template slot="prepend"><i class="el-icon-sort"></i>消息内容</template> 66 <template slot="prepend"><i class="el-icon-sort"></i>消息内容</template>
67 </el-input> 67 </el-input>
68 </el-col> 68 </el-col>
@@ -70,23 +70,23 @@ @@ -70,23 +70,23 @@
70 <el-row> 70 <el-row>
71 <el-col :span="5"> 71 <el-col :span="5">
72 <el-input v-model="ES_queryInfo.msgid" placeholder="消息id" 72 <el-input v-model="ES_queryInfo.msgid" placeholder="消息id"
73 - size="medium" clearable > 73 + size="mini" clearable >
74 <template slot="prepend"><i class="el-icon-sort"></i>消息入库ID</template> 74 <template slot="prepend"><i class="el-icon-sort"></i>消息入库ID</template>
75 </el-input> 75 </el-input>
76 </el-col> 76 </el-col>
77 <el-col :span="15"> 77 <el-col :span="15">
78 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="searchSubmit"> 78 + <el-button type="warning" style="width:150px" size="mini" icon="el-icon-search" @click="searchSubmit">
79 查询消息记录 79 查询消息记录
80 </el-button> 80 </el-button>
81 - <el-button type="primary" style="width:150px" size="medium" icon="el-icon-refresh" 81 + <el-button type="primary" style="width:150px" size="mini" icon="el-icon-refresh"
82 @click="resetSearch"> 82 @click="resetSearch">
83 重置 83 重置
84 </el-button> 84 </el-button>
85 -<!-- <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus"--> 85 +<!-- <el-button type="primary" style="width:150px" size="mini" icon="el-icon-plus"-->
86 <!-- @click="messageNote_toAddDialog">--> 86 <!-- @click="messageNote_toAddDialog">-->
87 <!-- 发送消息--> 87 <!-- 发送消息-->
88 <!-- </el-button>--> 88 <!-- </el-button>-->
89 - <!-- <el-button type="warning" style="width:150px" size="medium"--> 89 + <!-- <el-button type="warning" style="width:150px" size="mini"-->
90 <!-- @click="messageNote_openDeleteTime">--> 90 <!-- @click="messageNote_openDeleteTime">-->
91 <!-- 设置保留时间--> 91 <!-- 设置保留时间-->
92 <!-- </el-button>--> 92 <!-- </el-button>-->
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <el-row> 98 <el-row>
99 <el-col :span="24"> 99 <el-col :span="24">
100 <el-table :data="messageNote_page.messageNoteList" border 100 <el-table :data="messageNote_page.messageNoteList" border
101 - v-loading="messageNote_loading.listLoading" size="small" 101 + v-loading="messageNote_loading.listLoading" size="mini"
102 @selection-change="messageNote_selectChange" 102 @selection-change="messageNote_selectChange"
103 element-loading-text="获取消息收发记录，拼命加载中" 103 element-loading-text="获取消息收发记录，拼命加载中"
104 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" 104 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
@@ -190,12 +190,12 @@ @@ -190,12 +190,12 @@
190 </el-form-item> 190 </el-form-item>
191 </el-form> 191 </el-form>
192 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 192 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
193 - <el-button type="info" @click="messageNote_dialog.deleteTimeDialog = false" size="medium" 193 + <el-button type="info" @click="messageNote_dialog.deleteTimeDialog = false" size="mini"
194 style="width: 100px;background-color: #6F8294;color: #ffffff">取消 194 style="width: 100px;background-color: #6F8294;color: #ffffff">取消
195 </el-button> 195 </el-button>
196 <el-button type="primary" @click="messageNote_setDeleteTime" 196 <el-button type="primary" @click="messageNote_setDeleteTime"
197 :loading="messageNote_loading.addLoading" 197 :loading="messageNote_loading.addLoading"
198 - size="medium" style="width: 100px">设置 198 + size="mini" style="width: 100px">设置
199 </el-button> 199 </el-button>
200 </div> 200 </div>
201 </el-dialog> 201 </el-dialog>
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef"> 211 :model="messageNote_addForm" :rules="messageNote_addFormRules" ref="messageNote_addFormRef">
212 <el-form-item label="" prop="username"> 212 <el-form-item label="" prop="username">
213 <el-select v-model="messageNote_addForm.username" prefix-icon="el-icon-search" clearable 213 <el-select v-model="messageNote_addForm.username" prefix-icon="el-icon-search" clearable
214 - style="width:300px" size="medium" filterable 214 + style="width:300px" size="mini" filterable
215 placeholder="请选择用户名称"> 215 placeholder="请选择用户名称">
216 <el-option 216 <el-option
217 v-for="item in (user_cloud.cloudUserList)" 217 v-for="item in (user_cloud.cloudUserList)"
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 </el-form-item> 225 </el-form-item>
226 <el-form-item label="" prop="serverId"> 226 <el-form-item label="" prop="serverId">
227 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable 227 <el-select v-model="messageNote_addForm.serverId" prefix-icon="el-icon-search" clearable
228 - style="width:300px" size="small" 228 + style="width:300px" size="mini"
229 @change="messageNote_server_addChange" 229 @change="messageNote_server_addChange"
230 placeholder="请选择所属服务器名称"> 230 placeholder="请选择所属服务器名称">
231 <el-option 231 <el-option
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
239 239
240 <el-form-item label="" prop="virtualHostId"> 240 <el-form-item label="" prop="virtualHostId">
241 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable 241 <el-select v-model="messageNote_addForm.virtualHostId" prefix-icon="el-icon-search" clearable
242 - style="width:300px" size="small" 242 + style="width:300px" size="mini"
243 @change="messageNote_virtualHost_addChange" 243 @change="messageNote_virtualHost_addChange"
244 :disabled="messageNote_addForm.serverId===''" 244 :disabled="messageNote_addForm.serverId===''"
245 placeholder="请选择虚拟主机名称"> 245 placeholder="请选择虚拟主机名称">
@@ -254,7 +254,7 @@ @@ -254,7 +254,7 @@
254 254
255 <el-form-item label="" prop="exchangeId"> 255 <el-form-item label="" prop="exchangeId">
256 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable 256 <el-select v-model="messageNote_addForm.exchangeId" prefix-icon="el-icon-search" clearable
257 - style="width:300px" size="small" 257 + style="width:300px" size="mini"
258 @change="messageNote_exchange_addChange" 258 @change="messageNote_exchange_addChange"
259 :disabled="messageNote_addForm.virtualHostId===''" 259 :disabled="messageNote_addForm.virtualHostId===''"
260 placeholder="请选择交换机名称"> 260 placeholder="请选择交换机名称">
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 269
270 <el-form-item label="" prop="routingKeyId"> 270 <el-form-item label="" prop="routingKeyId">
271 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable 271 <el-select v-model="messageNote_addForm.routingKeyId" prefix-icon="el-icon-search" clearable
272 - style="width:300px" size="small" 272 + style="width:300px" size="mini"
273 :disabled="messageNote_addForm.exchangeId===''" 273 :disabled="messageNote_addForm.exchangeId===''"
274 placeholder="请选择路由键名称"> 274 placeholder="请选择路由键名称">
275 <el-option 275 <el-option
@@ -283,33 +283,33 @@ @@ -283,33 +283,33 @@
283 <el-form-item label="" prop="sendTime"> 283 <el-form-item label="" prop="sendTime">
284 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime" 284 <el-date-picker v-model="messageNote_addForm.sendTime" clearable type="datetime"
285 value-format="yyyy-MM-dd HH:mm:ss" 285 value-format="yyyy-MM-dd HH:mm:ss"
286 - placeholder="选择消息发送时间" size="small" style="width:300px"></el-date-picker> 286 + placeholder="选择消息发送时间" size="mini" style="width:300px"></el-date-picker>
287 </el-form-item> 287 </el-form-item>
288 <!-- <el-form-item label="消息获取时间：" prop="receiveTime">--> 288 <!-- <el-form-item label="消息获取时间：" prop="receiveTime">-->
289 <!-- <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"--> 289 <!-- <el-date-picker v-model="messageNote_addForm.receiveTime" clearable type="datetime"-->
290 <!-- value-format="yyyy-MM-dd HH:mm:ss"--> 290 <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
291 - <!-- placeholder="消息获取时间" size="small" style="width:300px"></el-date-picker>--> 291 + <!-- placeholder="消息获取时间" size="mini" style="width:300px"></el-date-picker>-->
292 <!-- </el-form-item>--> 292 <!-- </el-form-item>-->
293 293
294 <el-form-item label="" prop="alias_sendContent"> 294 <el-form-item label="" prop="alias_sendContent">
295 - <el-input v-model="messageNote_addForm.alias_sendContent" style="width:300px" size="small" 295 + <el-input v-model="messageNote_addForm.alias_sendContent" style="width:300px" size="mini"
296 clearable type="textarea" :rows="1" 296 clearable type="textarea" :rows="1"
297 placeholder="请输入发送内容"> 297 placeholder="请输入发送内容">
298 </el-input> 298 </el-input>
299 </el-form-item> 299 </el-form-item>
300 <el-form-item label="" prop="description"> 300 <el-form-item label="" prop="description">
301 - <el-input v-model="messageNote_addForm.description" style="width:300px" size="small" 301 + <el-input v-model="messageNote_addForm.description" style="width:300px" size="mini"
302 clearable type="textarea" :rows="1" 302 clearable type="textarea" :rows="1"
303 placeholder="请输入相关描述"> 303 placeholder="请输入相关描述">
304 </el-input> 304 </el-input>
305 </el-form-item> 305 </el-form-item>
306 </el-form> 306 </el-form>
307 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 307 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
308 - <el-button type="info" @click="messageNote_dialog.addDialog = false" size="medium" 308 + <el-button type="info" @click="messageNote_dialog.addDialog = false" size="mini"
309 style="width: 100px;background-color: #6F8294;color: #ffffff">取消 309 style="width: 100px;background-color: #6F8294;color: #ffffff">取消
310 </el-button> 310 </el-button>
311 <el-button type="primary" @click="messageNote_add" :loading="messageNote_loading.addLoading" 311 <el-button type="primary" @click="messageNote_add" :loading="messageNote_loading.addLoading"
312 - size="medium" style="width: 100px">发送 312 + size="mini" style="width: 100px">发送
313 </el-button> 313 </el-button>
314 </div> 314 </div>
315 </el-dialog> 315 </el-dialog>
@@ -324,12 +324,12 @@ @@ -324,12 +324,12 @@
324 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 324 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
325 :model="messageNote_editForm" :rules="messageNote_editFormRules" ref="messageNote_editFormRef"> 325 :model="messageNote_editForm" :rules="messageNote_editFormRules" ref="messageNote_editFormRef">
326 <el-form-item label="用户名称：" prop="username"> 326 <el-form-item label="用户名称：" prop="username">
327 - <el-input v-model="messageNote_editForm.username" style="width:300px" size="small" readonly 327 + <el-input v-model="messageNote_editForm.username" style="width:300px" size="mini" readonly
328 placeholder="用户名称"> 328 placeholder="用户名称">
329 </el-input> 329 </el-input>
330 330
331 <!-- <el-select v-model="messageNote_editForm.userId" prefix-icon="el-icon-search" clearable--> 331 <!-- <el-select v-model="messageNote_editForm.userId" prefix-icon="el-icon-search" clearable-->
332 - <!-- style="width:300px" size="medium" filterable disabled--> 332 + <!-- style="width:300px" size="mini" filterable disabled-->
333 <!-- placeholder="请选择用户">--> 333 <!-- placeholder="请选择用户">-->
334 <!-- <el-option--> 334 <!-- <el-option-->
335 <!-- v-for="item in (messageNote_config.userInfoList)"--> 335 <!-- v-for="item in (messageNote_config.userInfoList)"-->
@@ -341,13 +341,13 @@ @@ -341,13 +341,13 @@
341 </el-form-item> 341 </el-form-item>
342 342
343 <el-form-item label="服务器名称：" prop="serverName"> 343 <el-form-item label="服务器名称：" prop="serverName">
344 - <el-input v-model="messageNote_editForm.serverName" style="width:300px" size="small" 344 + <el-input v-model="messageNote_editForm.serverName" style="width:300px" size="mini"
345 readonly 345 readonly
346 placeholder="服务器名称"> 346 placeholder="服务器名称">
347 </el-input> 347 </el-input>
348 <!-- <el-select v-model="messageNote_editForm.serverId" prefix-icon="el-icon-search" clearable--> 348 <!-- <el-select v-model="messageNote_editForm.serverId" prefix-icon="el-icon-search" clearable-->
349 <!-- disabled--> 349 <!-- disabled-->
350 - <!-- style="width:300px" size="small"--> 350 + <!-- style="width:300px" size="mini"-->
351 <!-- @change="messageNote_server_editChange"--> 351 <!-- @change="messageNote_server_editChange"-->
352 <!-- placeholder="请选择所属服务器">--> 352 <!-- placeholder="请选择所属服务器">-->
353 <!-- <el-option--> 353 <!-- <el-option-->
@@ -360,14 +360,14 @@ @@ -360,14 +360,14 @@
360 </el-form-item> 360 </el-form-item>
361 361
362 <el-form-item label="虚拟主机名称：" prop="virtualHostName"> 362 <el-form-item label="虚拟主机名称：" prop="virtualHostName">
363 - <el-input v-model="messageNote_editForm.virtualHostName" style="width:300px" size="small" 363 + <el-input v-model="messageNote_editForm.virtualHostName" style="width:300px" size="mini"
364 readonly 364 readonly
365 placeholder="虚拟主机名称"> 365 placeholder="虚拟主机名称">
366 </el-input> 366 </el-input>
367 <!-- :disabled="messageNote_editForm.serverId===''" --> 367 <!-- :disabled="messageNote_editForm.serverId===''" -->
368 <!-- <el-select v-model="messageNote_editForm.virtualHostId" prefix-icon="el-icon-search" clearable--> 368 <!-- <el-select v-model="messageNote_editForm.virtualHostId" prefix-icon="el-icon-search" clearable-->
369 <!-- disabled--> 369 <!-- disabled-->
370 - <!-- style="width:300px" size="small"--> 370 + <!-- style="width:300px" size="mini"-->
371 <!-- @change="messageNote_virtualHost_editChange"--> 371 <!-- @change="messageNote_virtualHost_editChange"-->
372 <!-- placeholder="请选择虚拟主机名称">--> 372 <!-- placeholder="请选择虚拟主机名称">-->
373 <!-- <el-option--> 373 <!-- <el-option-->
@@ -380,14 +380,14 @@ @@ -380,14 +380,14 @@
380 </el-form-item> 380 </el-form-item>
381 381
382 <el-form-item label="交换机名称：" prop="exchangeName"> 382 <el-form-item label="交换机名称：" prop="exchangeName">
383 - <el-input v-model="messageNote_editForm.exchangeName" style="width:300px" size="small" 383 + <el-input v-model="messageNote_editForm.exchangeName" style="width:300px" size="mini"
384 readonly 384 readonly
385 placeholder="交换机名称"> 385 placeholder="交换机名称">
386 </el-input> 386 </el-input>
387 <!-- :disabled="messageNote_editForm.virtualHostId===''" --> 387 <!-- :disabled="messageNote_editForm.virtualHostId===''" -->
388 <!-- <el-select v-model="messageNote_editForm.exchangeId" prefix-icon="el-icon-search" clearable--> 388 <!-- <el-select v-model="messageNote_editForm.exchangeId" prefix-icon="el-icon-search" clearable-->
389 <!-- disabled--> 389 <!-- disabled-->
390 - <!-- style="width:300px" size="small"--> 390 + <!-- style="width:300px" size="mini"-->
391 <!-- @change="messageNote_exchange_editChange"--> 391 <!-- @change="messageNote_exchange_editChange"-->
392 <!-- placeholder="请选择交换机名称">--> 392 <!-- placeholder="请选择交换机名称">-->
393 <!-- <el-option--> 393 <!-- <el-option-->
@@ -400,14 +400,14 @@ @@ -400,14 +400,14 @@
400 </el-form-item> 400 </el-form-item>
401 401
402 <el-form-item label="路由键名称：" prop="routingKeyName"> 402 <el-form-item label="路由键名称：" prop="routingKeyName">
403 - <el-input v-model="messageNote_editForm.routingKeyName" style="width:300px" size="small" 403 + <el-input v-model="messageNote_editForm.routingKeyName" style="width:300px" size="mini"
404 readonly 404 readonly
405 placeholder="路由键名称"> 405 placeholder="路由键名称">
406 </el-input> 406 </el-input>
407 <!-- :disabled="messageNote_editForm.exchangeId===''" --> 407 <!-- :disabled="messageNote_editForm.exchangeId===''" -->
408 <!-- <el-select v-model="messageNote_editForm.routingKeyId" prefix-icon="el-icon-search" clearable--> 408 <!-- <el-select v-model="messageNote_editForm.routingKeyId" prefix-icon="el-icon-search" clearable-->
409 <!-- disabled--> 409 <!-- disabled-->
410 - <!-- style="width:300px" size="small"--> 410 + <!-- style="width:300px" size="mini"-->
411 <!-- placeholder="请选择路由键名称">--> 411 <!-- placeholder="请选择路由键名称">-->
412 <!-- <el-option--> 412 <!-- <el-option-->
413 <!-- v-for="item in (messageNote_config.routingKeyList)"--> 413 <!-- v-for="item in (messageNote_config.routingKeyList)"-->
@@ -418,38 +418,38 @@ @@ -418,38 +418,38 @@
418 <!-- </el-select>--> 418 <!-- </el-select>-->
419 </el-form-item> 419 </el-form-item>
420 <el-form-item label="消息发送时间：" prop="alias_sendTime"> 420 <el-form-item label="消息发送时间：" prop="alias_sendTime">
421 - <el-input v-model="messageNote_editForm.alias_sendTime" style="width:300px" size="small" 421 + <el-input v-model="messageNote_editForm.alias_sendTime" style="width:300px" size="mini"
422 readonly 422 readonly
423 placeholder="消息发送时间"> 423 placeholder="消息发送时间">
424 </el-input> 424 </el-input>
425 <!-- <el-date-picker v-model="messageNote_editForm.sendTime" disabled clearable type="datetime"--> 425 <!-- <el-date-picker v-model="messageNote_editForm.sendTime" disabled clearable type="datetime"-->
426 <!-- value-format="yyyy-MM-dd HH:mm:ss"--> 426 <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
427 - <!-- placeholder="选择发送时间" size="small" style="width:300px"></el-date-picker>--> 427 + <!-- placeholder="选择发送时间" size="mini" style="width:300px"></el-date-picker>-->
428 </el-form-item> 428 </el-form-item>
429 429
430 <el-form-item label="发送内容：" prop="alias_sendContent"> 430 <el-form-item label="发送内容：" prop="alias_sendContent">
431 - <el-input v-model="messageNote_editForm.alias_sendContent" style="width:300px" size="small" 431 + <el-input v-model="messageNote_editForm.alias_sendContent" style="width:300px" size="mini"
432 clearable readonly type="textarea" :rows="1" 432 clearable readonly type="textarea" :rows="1"
433 placeholder="请输入发送内容"> 433 placeholder="请输入发送内容">
434 </el-input> 434 </el-input>
435 </el-form-item> 435 </el-form-item>
436 436
437 <el-form-item label="相关描述：" prop="description"> 437 <el-form-item label="相关描述：" prop="description">
438 - <el-input v-model="messageNote_editForm.description" style="width:300px" size="small" 438 + <el-input v-model="messageNote_editForm.description" style="width:300px" size="mini"
439 clearable readonly type="textarea" :rows="1" 439 clearable readonly type="textarea" :rows="1"
440 placeholder="请输入相关描述"> 440 placeholder="请输入相关描述">
441 </el-input> 441 </el-input>
442 </el-form-item> 442 </el-form-item>
443 </el-form> 443 </el-form>
444 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 444 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
445 - <el-button type="info" @click="messageNote_dialog.editDialog = false" size="medium" 445 + <el-button type="info" @click="messageNote_dialog.editDialog = false" size="mini"
446 style="width: 100px">取消 446 style="width: 100px">取消
447 </el-button> 447 </el-button>
448 - <el-button type="primary" @click="messageNote_dialog.editDialog = false" size="medium" 448 + <el-button type="primary" @click="messageNote_dialog.editDialog = false" size="mini"
449 style="width: 100px">关闭 449 style="width: 100px">关闭
450 </el-button> 450 </el-button>
451 <!-- <el-button type="primary" @click="messageNote_edit" :loading="messageNote_loading.editLoading"--> 451 <!-- <el-button type="primary" @click="messageNote_edit" :loading="messageNote_loading.editLoading"-->
452 - <!-- size="medium" style="width: 100px">查看--> 452 + <!-- size="mini" style="width: 100px">查看-->
453 <!-- </el-button>--> 453 <!-- </el-button>-->
454 </div> 454 </div>
455 </el-dialog> 455 </el-dialog>
@@ -458,37 +458,41 @@ @@ -458,37 +458,41 @@
458 <div> 458 <div>
459 <el-dialog title="查看消息内容" 459 <el-dialog title="查看消息内容"
460 :visible.sync="messageNote_dialog.viewContentDialog" 460 :visible.sync="messageNote_dialog.viewContentDialog"
461 - style="margin-top: -80px" text-align="center" width="70%" 461 + style="margin-top: -80px" text-align="center" width="85%"
462 @close="messageNote_viewContentDialogClosed"> 462 @close="messageNote_viewContentDialogClosed">
  463 + <json-viewer :value="messageNote_viewContentForm.msg.body" :expand-depth=4 icon-style copyable boxed sort :preview-mode="false"></json-viewer>
463 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 464 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
464 :model="messageNote_viewContentForm" :rules="messageNote_viewContentFormRules" ref="messageNote_viewContentFormRef"> 465 :model="messageNote_viewContentForm" :rules="messageNote_viewContentFormRules" ref="messageNote_viewContentFormRef">
465 - <el-form-item label="消息内容：" prop="alias_sendContent">  
466 - <el-input v-model="messageNote_viewContentForm.msg.body"  
467 - v-if="isViewContent === false"  
468 - style="width:800px" size="small" placeholder="消息内容"  
469 - clearable type="textarea" :rows="20">  
470 - </el-input>  
471 - <el-input v-model="xml_content"  
472 - v-if="isViewContent === true"  
473 - style="width:800px" size="small" placeholder="发送内容"  
474 - clearable type="textarea" :rows="20">  
475 - </el-input>  
476 - </el-form-item> 466 +<!-- <el-form-item label="消息内容：" prop="alias_sendContent">-->
  467 +<!-- <el-input v-model="messageNote_viewContentForm.msg.body"-->
  468 +<!-- v-if="isViewContent === false"-->
  469 +<!-- style="width:800px" size="mini" placeholder="消息内容"-->
  470 +<!-- clearable type="textarea" :rows="20">-->
  471 +<!-- </el-input>-->
  472 +<!-- <el-input v-model="xml_content"-->
  473 +<!-- v-if="isViewContent === true"-->
  474 +<!-- style="width:800px" size="mini" placeholder="发送内容"-->
  475 +<!-- clearable type="textarea" :rows="20">-->
  476 +<!-- </el-input>-->
  477 +<!-- </el-form-item>-->
477 </el-form> 478 </el-form>
478 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 479 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
479 480
480 - <el-button type="success" @click="xml_format(messageNote_viewContentForm.alias_sendContent)" size="medium"  
481 - style="width: 100px">xml格式化 481 + <el-button type="success" @click="xml_format(messageNote_viewContentForm.alias_sendContent)" size="mini"
  482 + style="width: 100px">XML格式化
  483 + </el-button>
  484 + <el-button type="success" @click="json_format()" size="mini"
  485 + style="width: 100px">JSON格式化
482 </el-button> 486 </el-button>
483 487
484 - <el-button type="info" @click="messageNote_dialog.viewContentDialog = false" size="medium" 488 + <el-button type="info" @click="messageNote_dialog.viewContentDialog = false" size="mini"
485 style="width: 100px">取消 489 style="width: 100px">取消
486 </el-button> 490 </el-button>
487 - <el-button type="primary" @click="messageNote_dialog.viewContentDialog = false" size="medium" 491 + <el-button type="primary" @click="messageNote_dialog.viewContentDialog = false" size="mini"
488 style="width: 100px">关闭 492 style="width: 100px">关闭
489 </el-button> 493 </el-button>
490 <!-- <el-button type="primary" @click="messageNote_edit" :loading="messageNote_loading.editLoading"--> 494 <!-- <el-button type="primary" @click="messageNote_edit" :loading="messageNote_loading.editLoading"-->
491 - <!-- size="medium" style="width: 100px">查看--> 495 + <!-- size="mini" style="width: 100px">查看-->
492 <!-- </el-button>--> 496 <!-- </el-button>-->
493 </div> 497 </div>
494 </el-dialog> 498 </el-dialog>
@@ -498,6 +502,7 @@ @@ -498,6 +502,7 @@
498 502
499 <script> 503 <script>
500 import vkbeautify from "vkbeautify"; 504 import vkbeautify from "vkbeautify";
  505 + import JsonViewer from 'vue-json-viewer'
501 import { 506 import {
502 selectMessageNoteList, 507 selectMessageNoteList,
503 selectMessageSearchList, 508 selectMessageSearchList,
@@ -508,11 +513,10 @@ @@ -508,11 +513,10 @@
508 getDeleteTime, setDeleteTime, getUserInfoList 513 getDeleteTime, setDeleteTime, getUserInfoList
509 } from "../../api/message_bus"; 514 } from "../../api/message_bus";
510 import {getUserList} from "../../api/user"; 515 import {getUserList} from "../../api/user";
511 -  
512 export default { 516 export default {
513 // 消息收发记录 517 // 消息收发记录
514 name: "MessageNote", 518 name: "MessageNote",
515 - 519 + components:{JsonViewer},
516 data() { 520 data() {
517 return { 521 return {
518 522
@@ -1364,6 +1368,10 @@ @@ -1364,6 +1368,10 @@
1364 this.isViewContent = true; 1368 this.isViewContent = true;
1365 this.xml_content = vkbeautify.xml(content); 1369 this.xml_content = vkbeautify.xml(content);
1366 }, 1370 },
  1371 + json_format(content) {
  1372 + this.isViewContent = true;
  1373 + this.messageNote_viewContentForm.msg.body = JSON.parse(this.messageNote_viewContentForm.msg.body);
  1374 + }
1367 }, 1375 },
1368 created() { 1376 created() {
1369 // 刷新列表 1377 // 刷新列表
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 <el-row style="margin-left: 30px;"> 6 <el-row style="margin-left: 30px;">
7 <el-col :span="7"> 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 > 9 + size="mini" clearable >
10 <template slot="prepend" ><i class="el-icon-document-checked"></i>发送内容</template> 10 <template slot="prepend" ><i class="el-icon-document-checked"></i>发送内容</template>
11 </el-input> 11 </el-input>
12 </el-col> 12 </el-col>
13 <el-col :span="8"> 13 <el-col :span="8">
14 - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="searchSubmit"> 14 + <el-button type="warning" style="width:150px" size="mini" icon="el-icon-search" @click="searchSubmit">
15 查询 15 查询
16 </el-button> 16 </el-button>
17 </el-col> 17 </el-col>
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 <div class="sun"> 64 <div class="sun">
65 <el-row> 65 <el-row>
66 <el-col :span="2"> 66 <el-col :span="2">
67 - <el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="small">查看内容 67 + <el-button type="primary" @click="messageNote_toViewContentDialogDialog(item)" size="mini">查看内容
68 </el-button> 68 </el-button>
69 </el-col> 69 </el-col>
70 <el-col style="width: 45%;margin-left: -10px" :span="14"> 70 <el-col style="width: 45%;margin-left: -10px" :span="14">
@@ -101,29 +101,34 @@ @@ -101,29 +101,34 @@
101 <div> 101 <div>
102 <el-dialog title="查看消息内容" 102 <el-dialog title="查看消息内容"
103 :visible.sync="messageNote_dialog.viewContentDialog" 103 :visible.sync="messageNote_dialog.viewContentDialog"
104 - style="margin-top: -80px" text-align="center" width="70%" 104 + style="margin-top: -80px" text-align="center" width="85%"
105 @close="messageNote_viewContentDialogClosed"> 105 @close="messageNote_viewContentDialogClosed">
  106 + <json-viewer :value="messageNote_viewContentForm.msg.body" :expand-depth=4 icon-style copyable boxed sort :preview-mode="false"></json-viewer>
106 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center" 107 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -10px" align="center"
107 :model="messageNote_viewContentForm" ref="messageNote_viewContentFormRef"> 108 :model="messageNote_viewContentForm" ref="messageNote_viewContentFormRef">
108 - <el-form-item label="消息内容：" prop="alias_sendContent">  
109 - <el-input v-model="messageNote_viewContentForm.msg.body" v-if="isViewContent === false"  
110 - style="width:1000px" type="textarea" :rows="8">  
111 - </el-input>  
112 - <el-input v-model="xml_content" v-if="isViewContent === true"  
113 - style="width:1000px" type="textarea" autosize>  
114 - </el-input>  
115 - </el-form-item> 109 +<!-- <el-form-item label="消息内容：" prop="alias_sendContent">-->
  110 +<!-- <el-input v-model="messageNote_viewContentForm.msg.body" v-if="isViewContent === false"-->
  111 +<!-- style="width:1000px" type="textarea" :rows="8">-->
  112 +<!-- </el-input>-->
  113 +<!-- <el-input v-model="xml_content" v-if="isViewContent === true"-->
  114 +<!-- style="width:1000px" type="textarea" autosize>-->
  115 +<!-- </el-input>-->
  116 +<!-- </el-form-item>-->
116 </el-form> 117 </el-form>
117 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 118 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
118 119
119 - <el-button type="success" @click="xml_format(messageNote_viewContentForm.msg.body)" size="medium" 120 + <el-button type="success" @click="xml_format(messageNote_viewContentForm.msg.body)" size="mini"
120 style="width: 100px">xml格式化 121 style="width: 100px">xml格式化
121 </el-button> 122 </el-button>
122 123
123 - <el-button type="info" @click="messageNote_dialog.viewContentDialog = false" size="medium" 124 + <el-button type="success" @click="json_format()" size="mini"
  125 + style="width: 100px">JSON格式化
  126 + </el-button>
  127 +
  128 + <el-button type="info" @click="messageNote_dialog.viewContentDialog = false" size="mini"
124 style="width: 100px">取消 129 style="width: 100px">取消
125 </el-button> 130 </el-button>
126 - <el-button type="primary" @click="messageNote_dialog.viewContentDialog = false" size="medium" 131 + <el-button type="primary" @click="messageNote_dialog.viewContentDialog = false" size="mini"
127 style="width: 100px">关闭 132 style="width: 100px">关闭
128 </el-button> 133 </el-button>
129 </div> 134 </div>
@@ -136,9 +141,11 @@ @@ -136,9 +141,11 @@
136 <script> 141 <script>
137 import {selectMessageNoteList} from "../../api/message_bus"; 142 import {selectMessageNoteList} from "../../api/message_bus";
138 import vkbeautify from "vkbeautify"; 143 import vkbeautify from "vkbeautify";
  144 + import JsonViewer from 'vue-json-viewer'
139 145
140 export default { 146 export default {
141 name: "MessageNoteSearch", 147 name: "MessageNoteSearch",
  148 + components:{JsonViewer},
142 data() { 149 data() {
143 return { 150 return {
144 // 抽屉 151 // 抽屉
@@ -251,6 +258,10 @@ @@ -251,6 +258,10 @@
251 this.isViewContent = true; 258 this.isViewContent = true;
252 this.xml_content = vkbeautify.xml(content); 259 this.xml_content = vkbeautify.xml(content);
253 }, 260 },
  261 + json_format(content) {
  262 + this.isViewContent = true;
  263 + this.messageNote_viewContentForm.msg.body = JSON.parse(this.messageNote_viewContentForm.msg.body);
  264 + },
254 /** 265 /**
255 * messageNote，查看发送内容，打开事件 266 * messageNote，查看发送内容，打开事件
256 */ 267 */