suojin
/
smartpark-front
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.新增[告警恢复]按钮

Browse Source 
2.修改设备管理、历史报警记录、运维记录页面布局
main
PC-20220105PWAZ\Administrator 3 years ago
parent f9b647b97c
commit 3918237ef8
14 changed files with 150 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/monitoring/conditioner.vue
  2. 22
      src/components/monitoring/door.vue
  3. 12
      src/components/monitoring/electricity.vue
  4. 24
      src/components/monitoring/firefighting.vue
  5. 6
      src/components/monitoring/lift.vue
  6. 14
      src/components/monitoring/light.vue
  7. 10
      src/components/monitoring/monitoring.vue
  8. 22
      src/components/monitoring/wall.vue
  9. 20
      src/components/monitoring/warm.vue
  10. 20
      src/components/monitoring/water.vue
  11. 4
      src/views/equipment/index.vue
  12. 4
      src/views/equipment/operationRecord.vue
  13. 31
      src/views/equipment/warnHistory.vue
  14. 2
      src/views/garden/generalizePattern.vue

6
src/components/monitoring/conditioner.vue
Unescape View File

@ -56,7 +56,7 @@
:style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
<p>
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
</div>
<div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''">
@ -306,7 +306,7 @@ import {
getFloorTemp,
getLifList,
getAirWarnList,//报警列表
getCancelWarn,//关闭告警
getCancelWarn,//确认告警
setLoraTemp,//设置lora面板温度
setLoraStatus,//设置lora面板开关0：关机 1：开机
setLoraModel,//设置lora面板模式0:内机制热 1:内机地暖同时制热(默认) 2::地暖制热 3:制冷模式 9:通风模式|
@ -544,7 +544,7 @@ export default {
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getAirWarnList();

22
src/components/monitoring/door.vue
Unescape View File

@ -116,7 +116,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
@ -151,7 +157,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center">
@ -361,7 +373,7 @@ import {
getDoorWarn,
getDoorSbList,
getDoorWarnList, //报警列表
getCancelWarn, //关闭告警
getCancelWarn, //确认告警
} from "@/api/garden/monitoring";
import backHome from "./backHome";
export default {
@ -643,7 +655,7 @@ export default {
this.getNavigationMap();
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getDoorWarnList2();
@ -674,7 +686,7 @@ export default {
});
},
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEquipList.splice(index, 1, item);

12
src/components/monitoring/electricity.vue
Unescape View File

@ -60,7 +60,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
@ -437,7 +443,7 @@ export default {
// 塔台总用电量
tataiTotal: "",
isMapViewer: 0,
alarmAlert: true, //鼠标悬停在报警列表里查看详情和关闭告警是否出现
alarmAlert: true, //鼠标悬停在报警列表里查看详情和确认告警是否出现
};
},
created() {
@ -635,7 +641,7 @@ export default {
},
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getElectricWarnList();

24
src/components/monitoring/firefighting.vue
Unescape View File

@ -83,7 +83,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
@ -113,7 +119,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center">
@ -239,7 +251,7 @@ import {
getfireData,
getFightWarn,
getFiredWarnList, //告警列表
getCancelWarn, //关闭告警
getCancelWarn, //确认告警
} from "@/api/garden/monitoring";
import backHome from "./backHome";
export default {
@ -498,7 +510,7 @@ export default {
},
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getFiredWarnList();
@ -530,7 +542,7 @@ export default {
});
},
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEquipList.splice(index, 1, item);
@ -879,7 +891,7 @@ export default {
// 点击构件的筛选条件
getfireData(this.bimModel, data.elementId).then((res) => {
if (res.data.code == 200) {
if (res.data.code == 200 && Object.keys(res.data.data).length>0) {
// console.log(res)
let { name, status, location } = res.data.data;
// 如果当前点击的是电箱 先清除所以标签

6
src/components/monitoring/lift.vue
Unescape View File

@ -50,7 +50,7 @@
<div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="">
<span>关闭告警</span>
<span>确认告警</span>
</p>
</div>
<div class="box flex-center" style="justify-content: space-around;"
@ -152,7 +152,7 @@ import {
getYwqLiftData, // 获取所以电梯运行状态数据
getLifList,
getLiftWarnList,//告警列表
getCancelWarn,//关闭告警
getCancelWarn,//确认告警
} from '@/api/garden/monitoring';
import backHome from './backHome';
import { dateFormat } from "@/util/date";
@ -334,7 +334,7 @@ export default {
bfHelper.clearComponent();
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getFiredWarnList();

14
src/components/monitoring/light.vue
Unescape View File

@ -77,7 +77,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''">
@ -109,7 +115,7 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
</div>
<div class="box flex-center">
@ -486,7 +492,7 @@ export default {
})
}
},
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getLightWarnList();
@ -519,7 +525,7 @@ export default {
},
// 设备告警、告警事件
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEquipList.splice(index, 1, item);

10
src/components/monitoring/monitoring.vue
Unescape View File

@ -70,8 +70,14 @@
<span>|</span>
<p>
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
<div class="left flex-center-center">
@ -569,7 +575,7 @@ export default {
}
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getCameraWarnList();

22
src/components/monitoring/wall.vue
Unescape View File

@ -85,7 +85,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center">
@ -120,7 +126,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
@ -253,7 +265,7 @@ import {
getWallRecords,
getWallGK,
getFenceWarnList, //报警列表
getCancelWarn, //关闭告警
getCancelWarn, //确认告警
} from "@/api/garden/monitoring";
export default {
props: {
@ -787,7 +799,7 @@ export default {
}
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getFenceWarnList();
@ -818,7 +830,7 @@ export default {
});
},
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEquipList.splice(index, 1, item);

20
src/components/monitoring/warm.vue
Unescape View File

@ -192,7 +192,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" style="color: red">
@ -222,7 +228,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" style="color: red">
@ -575,7 +587,7 @@ export default {
this.getNavigationMap();
},
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getHeatWarnList();
@ -607,7 +619,7 @@ export default {
});
},
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEquipList.splice(index, 1, item);

20
src/components/monitoring/water.vue
Unescape View File

@ -189,7 +189,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
@ -217,7 +223,13 @@
<span v-if="item.homepageShow == 1">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>关闭告警</span>
<span>确认告警</span>
</p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div>
<div class="box flex-center">
@ -553,7 +565,7 @@ export default {
},
beforeDestroy() { },
methods: {
//关闭告警 - 重新查询告警列表
//确认告警 - 重新查询告警列表
doCancelWarn(id) {
getCancelWarn(id).then((res) => {
this.getWaterWarnList();
@ -585,7 +597,7 @@ export default {
});
},
showAlarkAlert(item, index, key) {
//鼠标悬停在设备概况列表里出现查看详情和关闭告警
//鼠标悬停在设备概况列表里出现查看详情和确认告警
item.showAlert = true;
if (key == 0) {
this.listData.warnEventList.splice(index, 1, item);

4
src/views/equipment/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :span="5">
<el-col :span="3">
<div class="box">
<el-scrollbar>
<basic-container>
@ -9,7 +9,7 @@
</el-scrollbar>
</div>
</el-col>
<el-col :span="19">
<el-col :span="21">
<basic-container>
<avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
v-model="form" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"

4
src/views/equipment/operationRecord.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :span="5">
<el-col :span="3">
<div class="box">
<el-scrollbar>
<basic-container>
@ -9,7 +9,7 @@
</el-scrollbar>
</div>
</el-col>
<el-col :span="19">
<el-col :span="21">
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
:permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"

31
src/views/equipment/warnHistory.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :span="5">
<el-col :span="3">
<div class="box">
<el-scrollbar>
<basic-container>
@ -9,7 +9,7 @@
</el-scrollbar>
</div>
</el-col>
<el-col :span="19">
<el-col :span="21">
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
:permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @row-del="rowDel"
@ -77,6 +77,13 @@
},{
label:'塔台',
value:'2'
}],
recoveryMethod:[{
label: '手动',
value: '1'
}, {
label: '自动',
value: '2'
}]
}
export default {
@ -107,7 +114,7 @@
index: true,
selection: true,
viewBtn: true,
menuWidth: 300,
menuWidth: 80,
dialogClickModal: false,
addBtn:false,
delBtn:false,
@ -151,6 +158,7 @@
label: "报警时间",
prop: "warnDate",
type:'datetime',
width:"140",
// format:'yyyy-MM-dd',
// valueFormat:'yyyy-MM-dd',
align:'center',
@ -177,6 +185,23 @@
display: false,
viewDisplay:false
},
{
label: "恢复方式",
prop: "recoveryMethod",
type:"select",
dicData: DIC.recoveryMethod,
align:'center',
},
{
label: "操作人",
prop: "user",
align:'center',
},
{
label: "操作时间",
prop: "time",
align:'center',
},
]
},
data: [],

2
src/views/garden/generalizePattern.vue
Unescape View File

@ -1273,7 +1273,7 @@ export default {
},
},
{
subtext: "事件警告",
subtext: "事件告警",
left: "23%",
top: "37%",
textAlign: "center",

Write Preview
Loading…
Cancel
Save