✨ feat: 报警分析-厂界在线 功能3 点击报警次数,弹窗报警管理页面
This commit is contained in:
parent
2abd8ade56
commit
fe0738e619
|
@ -94,7 +94,7 @@
|
||||||
<!--处理报警-->
|
<!--处理报警-->
|
||||||
<deal-alarm :deviceInfo="deviceInfo" v-if="isOpenAlarm" :isOpenAlarm="isOpenAlarm"
|
<deal-alarm :deviceInfo="deviceInfo" v-if="isOpenAlarm" :isOpenAlarm="isOpenAlarm"
|
||||||
@closeAlarm="closeAlarm"></deal-alarm>
|
@closeAlarm="closeAlarm"></deal-alarm>
|
||||||
<el-dialog :title="mapDialogTitle" :visible.sync="mapDialogVisible" width="30%">
|
<el-dialog :title="mapDialogTitle" :visible.sync="mapDialogVisible" width="30%" append-to-body>
|
||||||
<div>
|
<div>
|
||||||
<baidu-map :center="position" :zoom="16" :scroll-wheel-zoom="true" style="width: auto; height: 40vh"
|
<baidu-map :center="position" :zoom="16" :scroll-wheel-zoom="true" style="width: auto; height: 40vh"
|
||||||
:map-type="currentMapType">
|
:map-type="currentMapType">
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!--处理详情-->
|
<!--处理详情-->
|
||||||
<el-dialog title="处理详情" :visible.sync="isOpenDetail" width="50%">
|
<el-dialog title="处理详情" :visible.sync="isOpenDetail" width="50%" append-to-body>
|
||||||
<div>
|
<div>
|
||||||
<el-form :model="detailParams" label-width="130px">
|
<el-form :model="detailParams" label-width="130px">
|
||||||
<!-- 处理状态 -->
|
<!-- 处理状态 -->
|
||||||
|
@ -204,6 +204,7 @@ export default {
|
||||||
currentMapType: "BMAP_HYBRID_MAP",
|
currentMapType: "BMAP_HYBRID_MAP",
|
||||||
mapDialogVisible: false,
|
mapDialogVisible: false,
|
||||||
position: { lng: 116.404, lat: 39.915 }, // 默认值,例如北京的中心点
|
position: { lng: 116.404, lat: 39.915 }, // 默认值,例如北京的中心点
|
||||||
|
mapDialogTitle: "",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<el-table-column label="放置区域" align="center" prop="address" />
|
<el-table-column label="放置区域" align="center" prop="address" />
|
||||||
<el-table-column label="报警次数" align="center" prop="count">
|
<el-table-column label="报警次数" align="center" prop="count">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span :style="{ color: 'red' }">{{ scope.row.count }}</span>
|
<el-tag type="danger" class="count-tag" @click="clickAlarmTag">{{ scope.row.count }}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -64,6 +64,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<el-dialog title="报警管理" :visible.sync="dialogAlarmVisible">
|
||||||
|
<alarm-monitor />
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<!--发送通知-->
|
<!--发送通知-->
|
||||||
<send-msg
|
<send-msg
|
||||||
:deviceInfo="deviceInfo"
|
:deviceInfo="deviceInfo"
|
||||||
|
@ -85,9 +89,10 @@ import to from '@/utils/await-to.js';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import { debounce } from '@/utils';
|
import { debounce } from '@/utils';
|
||||||
import { checkRole } from "@/utils/permission";
|
import { checkRole } from "@/utils/permission";
|
||||||
|
import AlarmMonitor from '@/views/alarmMonitor/bound/index.vue';
|
||||||
export default {
|
export default {
|
||||||
name: "alarm",
|
name: "alarm",
|
||||||
components: { sendMsg, DeviceSelect },
|
components: { sendMsg, DeviceSelect, AlarmMonitor },
|
||||||
dicts: [],
|
dicts: [],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -131,6 +136,7 @@ export default {
|
||||||
endDate: null,
|
endDate: null,
|
||||||
deviceSn: null,
|
deviceSn: null,
|
||||||
},
|
},
|
||||||
|
dialogAlarmVisible: false,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -156,6 +162,9 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
checkRole,
|
checkRole,
|
||||||
|
clickAlarmTag() {
|
||||||
|
this.dialogAlarmVisible = true;
|
||||||
|
},
|
||||||
dateChange() {
|
dateChange() {
|
||||||
this.queryDebounce();
|
this.queryDebounce();
|
||||||
},
|
},
|
||||||
|
@ -358,4 +367,7 @@ export default {
|
||||||
|
|
||||||
background-position-y: 7px;
|
background-position-y: 7px;
|
||||||
}
|
}
|
||||||
|
.count-tag {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<el-dialog title="处理报警" :visible.sync="openConfig1" :before-close="handleClose">
|
<el-dialog title="处理报警" :visible.sync="openConfig1" :before-close="handleClose" append-to-body>
|
||||||
<el-form :model="queryParams" ref="addform" label-width="130px" :rules="dealRule">
|
<el-form :model="queryParams" ref="addform" label-width="130px" :rules="dealRule">
|
||||||
<el-form-item label="处理状态" prop="status">
|
<el-form-item label="处理状态" prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="请选择处理状态" style="width: 500px;">
|
<el-select v-model="queryParams.status" placeholder="请选择处理状态" style="width: 500px;">
|
||||||
|
@ -185,4 +185,3 @@ export default {
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
title="下发通知"
|
title="下发通知"
|
||||||
:visible.sync="openConfig1"
|
:visible.sync="openConfig1"
|
||||||
:before-close="handleClose"
|
:before-close="handleClose"
|
||||||
|
append-to-body
|
||||||
>
|
>
|
||||||
<div style="display: inline-flex; height: 30px; line-height: 30px">
|
<div style="display: inline-flex; height: 30px; line-height: 30px">
|
||||||
<el-button class="agreeButton" style="width: 120px" @click="chooseUser1()"
|
<el-button class="agreeButton" style="width: 120px" @click="chooseUser1()"
|
||||||
|
|
Loading…
Reference in New Issue