|
@@ -74,7 +74,7 @@
|
74
|
74
|
<el-row>
|
75
|
75
|
<el-col :span="8">
|
76
|
76
|
<el-form-item label="设备报警:">
|
77
|
|
- <el-input v-model="formInline3.equipmentAlarm" placeholder="请输入"></el-input>
|
|
77
|
+ <el-input v-model="formInline3.alertInfo" placeholder="请输入"></el-input>
|
78
|
78
|
</el-form-item>
|
79
|
79
|
</el-col>
|
80
|
80
|
<el-col :span="8">
|
|
@@ -118,10 +118,10 @@
|
118
|
118
|
<div class="form-div">
|
119
|
119
|
<el-form disabled label-position="left" label-width="100px" :model="formLabelAlign3">
|
120
|
120
|
<el-form-item label="设备报警">
|
121
|
|
- <el-input v-model="formLabelAlign3.equipmentAlarm"></el-input>
|
|
121
|
+ <el-input v-model="formLabelAlign3.alertInfo"></el-input>
|
122
|
122
|
</el-form-item>
|
123
|
123
|
<el-form-item label="状态">
|
124
|
|
- <el-input v-model="formLabelAlign3.type"></el-input>
|
|
124
|
+ <el-input v-model="formLabelAlign3.readFlag"></el-input>
|
125
|
125
|
</el-form-item>
|
126
|
126
|
</el-form>
|
127
|
127
|
</div>
|
|
@@ -172,14 +172,14 @@
|
172
|
172
|
<div class="form-div">
|
173
|
173
|
<el-form disabled label-position="left" label-width="100px" :model="formLabelAlign4">
|
174
|
174
|
<el-form-item label="设备报警">
|
175
|
|
- <el-input v-model="formLabelAlign4.equipmentAlarm"></el-input>
|
|
175
|
+ <el-input v-model="formLabelAlign4.alertInfo"></el-input>
|
176
|
176
|
</el-form-item>
|
177
|
177
|
<el-form-item label="设备ID">
|
178
|
|
- <el-input v-model="formLabelAlign4.equipmentID"></el-input>
|
|
178
|
+ <el-input v-model="formLabelAlign4.deviceId"></el-input>
|
179
|
179
|
</el-form-item>
|
180
|
180
|
<el-form-item label="报警时间">
|
181
|
181
|
<el-date-picker
|
182
|
|
- v-model="formLabelAlign4.alarmTime"
|
|
182
|
+ v-model="formLabelAlign4.createTime"
|
183
|
183
|
type="date">
|
184
|
184
|
</el-date-picker>
|
185
|
185
|
</el-form-item>
|
|
@@ -192,6 +192,7 @@
|
192
|
192
|
</template>
|
193
|
193
|
<script>
|
194
|
194
|
import api from "@/api/audit.js";
|
|
195
|
+import api_l from "@/api/article_liao.js";
|
195
|
196
|
|
196
|
197
|
export default {
|
197
|
198
|
components: {},
|
|
@@ -235,39 +236,44 @@ export default {
|
235
|
236
|
columns3: [
|
236
|
237
|
{
|
237
|
238
|
label: '设备报警',
|
238
|
|
- key: 'equipmentAlarm'
|
|
239
|
+ key: 'alertInfo'
|
|
240
|
+ },
|
|
241
|
+ {
|
|
242
|
+ label: '详情',
|
|
243
|
+ key: 'alertDetail'
|
239
|
244
|
},
|
240
|
245
|
{
|
241
|
246
|
label: '状态',
|
242
|
|
- key: 'type'
|
|
247
|
+ key: 'readFlag'
|
243
|
248
|
},
|
244
|
249
|
],
|
245
|
|
- tableData3: [{equipmentAlarm: 'sasa111'}],
|
|
250
|
+ tableData3: [],
|
246
|
251
|
total3: 0,
|
247
|
252
|
pageSize3: 10,
|
248
|
253
|
pageNum3: 1,
|
249
|
254
|
formInline3: {
|
250
|
|
- equipmentAlarm: '',
|
|
255
|
+ alertInfo: '',
|
251
|
256
|
},
|
252
|
257
|
title3: '',
|
253
|
258
|
dialogVisible3: false,
|
254
|
259
|
formLabelAlign3: {
|
255
|
260
|
id: '',
|
256
|
|
- equipmentAlarm: '',
|
257
|
|
- type: '',
|
|
261
|
+ readFlag: '',
|
|
262
|
+ alertInfo:'',
|
|
263
|
+
|
258
|
264
|
},
|
259
|
265
|
columns4: [
|
260
|
266
|
{
|
261
|
267
|
label: '设备报警',
|
262
|
|
- key: 'equipmentAlarm'
|
|
268
|
+ key: 'alertInfo'
|
263
|
269
|
},
|
264
|
270
|
{
|
265
|
271
|
label: '设备ID',
|
266
|
|
- key: 'equipmentID'
|
|
272
|
+ key: 'deviceId'
|
267
|
273
|
},
|
268
|
274
|
{
|
269
|
275
|
label: '报警时间',
|
270
|
|
- key: 'alarmTime'
|
|
276
|
+ key: 'createTime'
|
271
|
277
|
},
|
272
|
278
|
],
|
273
|
279
|
tableData4: [{equipmentAlarm: 'sasa1111',alarmTime:'2023'}],
|
|
@@ -275,8 +281,8 @@ export default {
|
275
|
281
|
pageSize4: 10,
|
276
|
282
|
pageNum4: 1,
|
277
|
283
|
formInline4: {
|
278
|
|
- equipmentAlarm: '',
|
279
|
|
- equipmentID: '',
|
|
284
|
+ plateNo: '',
|
|
285
|
+ deviceId: '',
|
280
|
286
|
},
|
281
|
287
|
title4: '',
|
282
|
288
|
dialogVisible4: false,
|
|
@@ -291,13 +297,13 @@ export default {
|
291
|
297
|
mounted() {
|
292
|
298
|
// this.getTableData1()
|
293
|
299
|
// this.getTableData2()
|
294
|
|
- // this.getTableData3()
|
295
|
|
- // this.getTableData4()
|
|
300
|
+ this.getTableData3()
|
|
301
|
+ this.getTableData4()
|
296
|
302
|
},
|
297
|
303
|
watch: {},
|
298
|
304
|
methods: {
|
299
|
305
|
handleConfirm() {
|
300
|
|
- api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
|
|
306
|
+ api_l.optMessageManagementPushAdd({msgTitle: this.formLabelAlign.msgTitle,msgContent:this.formLabelAlign.messageArea}).then(res => {
|
301
|
307
|
if (res.code === 200) {
|
302
|
308
|
this.$message({
|
303
|
309
|
message: '添加成功!',
|
|
@@ -326,7 +332,10 @@ export default {
|
326
|
332
|
},
|
327
|
333
|
onSubmit3() {
|
328
|
334
|
this.pageNum3 = 1
|
329
|
|
- this.getTableData3()
|
|
335
|
+ api_l.optMessageManagementDevicePage({searchKey: this.formLabelAlign3.equipmentAlarm}).then(res => {
|
|
336
|
+ this.tableData3 = res.data.records
|
|
337
|
+ })
|
|
338
|
+
|
330
|
339
|
},
|
331
|
340
|
handleAdd3() {
|
332
|
341
|
this.title3 = '添加'
|
|
@@ -343,7 +352,7 @@ export default {
|
343
|
352
|
this.dialogVisible3 = true
|
344
|
353
|
},
|
345
|
354
|
deleteRow3(record) {
|
346
|
|
- api.deleteWhiteIp({id: record.id}).then(res => {
|
|
355
|
+ api_l.optMessageManagementDeviceDelete([{id: record.id}]).then(res => {
|
347
|
356
|
if (res.code === 200) {
|
348
|
357
|
this.$message({type: 'success', message: '删除成功!'})
|
349
|
358
|
this.getTableData3()
|
|
@@ -441,8 +450,8 @@ export default {
|
441
|
450
|
},
|
442
|
451
|
getTableData3() {
|
443
|
452
|
const {pageNum3, pageSize3} = this
|
444
|
|
- api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
|
445
|
|
- this.tableData3 = res.data.records || []
|
|
453
|
+ api_l.optMessageManagementDevicePage({current: pageNum3, size: pageSize3}).then(res => {
|
|
454
|
+ this.tableData3 = res.data.records
|
446
|
455
|
this.total3 = res.data.total
|
447
|
456
|
})
|
448
|
457
|
},
|
|
@@ -451,8 +460,8 @@ export default {
|
451
|
460
|
},
|
452
|
461
|
getTableData4() {
|
453
|
462
|
const {pageNum4, pageSize4} = this
|
454
|
|
- api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
|
455
|
|
- this.tableData4 = res.data.records || []
|
|
463
|
+ api_l.optMessageManagementVehiclePage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
|
|
464
|
+ this.tableData4 = res.data.records
|
456
|
465
|
this.total4 = res.data.total
|
457
|
466
|
})
|
458
|
467
|
},
|