安防态势改为全设备,告警信息增加恢复告警,报警记录增加恢复方式恢复人恢复时间

main
zhangqun 3 years ago
parent 3918237ef8
commit 2a339677fa
  1. 21
      src/api/garden/monitoring.js
  2. 3
      src/api/source/total.js
  3. 21
      src/components/monitoring/conditioner.vue
  4. 33
      src/components/monitoring/door.vue
  5. 24
      src/components/monitoring/electricity.vue
  6. 32
      src/components/monitoring/firefighting.vue
  7. 21
      src/components/monitoring/lift.vue
  8. 32
      src/components/monitoring/light.vue
  9. 27
      src/components/monitoring/monitoring.vue
  10. 32
      src/components/monitoring/wall.vue
  11. 32
      src/components/monitoring/warm.vue
  12. 32
      src/components/monitoring/water.vue
  13. 36
      src/views/equipment/warnHistory.vue
  14. 154
      src/views/garden/generalizePattern.vue

@ -793,13 +793,19 @@ export const getdoorData = (area, modelId) => {
}; };
//取消报警 - 20221011 //取消报警 - 20221011
// export const getCancelWarn = (id) => {
// return request({
// url: "/api/blade-desk/equipment/warn-his/hideHomepage-warn",
// method: "get",
// params: {
// id,
// },
// });
// };
export const getCancelWarn = (id) => { export const getCancelWarn = (id) => {
return request({ return request({
url: "/api/blade-desk/equipment/warn-his/hideHomepage-warn", url: "/api/blade-desk/equipment/warn-his/confirm-warn?id="+id,
method: "get", method: "get",
params: {
id,
},
}); });
}; };
//报警记录 - 电 //报警记录 - 电
@ -882,3 +888,10 @@ export const getCameraWarnList = (param) => {
params: param, params: param,
}); });
}; };
//报警记录 - 恢复
export const recoveryWarn = (id) => {
return request({
url: "/api/blade-desk/equipment/warn-his/recovery-warn?id="+id,
method: "get",
});
};

@ -286,12 +286,13 @@ export const getCar = () => {
}); });
}; };
// 安防态势 // 安防态势
export const getSecurityStatus = (area) => { export const getSecurityStatus = (area, type) => {
return request({ return request({
url: "/api/blade-desk/analysis/overview/security-status", url: "/api/blade-desk/analysis/overview/security-status",
method: "get", method: "get",
params: { params: {
area, area,
type,
}, },
}); });
}; };

@ -52,12 +52,17 @@
<div class="warp"> <div class="warp">
<div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative" <div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative"
@mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)"> @mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)">
<div v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)" <div v-if="item.confirmStatus === 0" @click="doCancelWarn(item.id)"
:style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert"> :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
<p> <p>
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.confirmStatus === 0 && item.warnStatus == 1">|</span>
<p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div> </div>
<div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''"> <div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''">
<div class="left flex-center-center"> <div class="left flex-center-center">
@ -312,6 +317,7 @@ import {
setLoraModel,//lora0: 1:() 2:: 3: 9:| setLoraModel,//lora0: 1:() 2:: 3: 9:|
setLoraSpeed,//lora1 2 3 4 setLoraSpeed,//lora1 2 3 4
queryLoraAll,//lora### queryLoraAll,//lora###
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import clickCp from "./clickCp"; import clickCp from "./clickCp";
import backHome from "./backHome"; import backHome from "./backHome";
@ -545,9 +551,16 @@ export default {
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getAirWarnList(); // this.getAirWarnList();
item.confirmStatus = 1;
})
},
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
}) })
}, },
// //

@ -113,14 +113,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -154,14 +153,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus == 1">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus == 1" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -374,6 +372,7 @@ import {
getDoorSbList, getDoorSbList,
getDoorWarnList, // getDoorWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import backHome from "./backHome"; import backHome from "./backHome";
export default { export default {
@ -656,11 +655,19 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getDoorWarnList2(); // this.getDoorWarnList2();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
// this.getFiredWarnList();
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
const routerUrl = this.$router.resolve({ const routerUrl = this.$router.resolve({

@ -57,14 +57,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1"> <p @click="doCancelWarn(item)" v-if="item.confirmStatus === 0">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -375,6 +374,7 @@ import {
mapUpdate, mapUpdate,
mapViewerCamera, mapViewerCamera,
setCameraStatus, setCameraStatus,
recoveryWarn,//
} from "../../util/bfHelper"; } from "../../util/bfHelper";
import * as commonValue from "../../util/commonValue"; import * as commonValue from "../../util/commonValue";
import echarts from "./echarts1"; import echarts from "./echarts1";
@ -642,9 +642,17 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getElectricWarnList(); // this.getElectricWarnList();
item.confirmStatus = 1;
})
},
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
// this.getFiredWarnList();
item.warnStatus = 2;
}) })
}, },
// //

@ -80,14 +80,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -116,14 +115,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -252,6 +250,7 @@ import {
getFightWarn, getFightWarn,
getFiredWarnList, // getFiredWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import backHome from "./backHome"; import backHome from "./backHome";
export default { export default {
@ -511,11 +510,18 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getFiredWarnList(); // this.getFiredWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -48,10 +48,15 @@
<div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative;" <div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative;"
@mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)"> @mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)">
<div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert"> <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt=""> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="">
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.warnStatus == 1">|</span>
<p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div> </div>
<div class="box flex-center" style="justify-content: space-around;" <div class="box flex-center" style="justify-content: space-around;"
:class="bimModel == 2 ? 'tataicon' : ''"> :class="bimModel == 2 ? 'tataicon' : ''">
@ -153,6 +158,7 @@ import {
getLifList, getLifList,
getLiftWarnList,// getLiftWarnList,//
getCancelWarn,// getCancelWarn,//
recoveryWarn,//
} from '@/api/garden/monitoring'; } from '@/api/garden/monitoring';
import backHome from './backHome'; import backHome from './backHome';
import { dateFormat } from "@/util/date"; import { dateFormat } from "@/util/date";
@ -335,11 +341,18 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getFiredWarnList(); // this.getFiredWarnList();
item.confirmStatus = 1;
}) })
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -74,14 +74,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -112,11 +111,16 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.warnStatus == 1">|</span>
<p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span>
</p>
</div> </div>
<div class="box flex-center"> <div class="box flex-center">
<div class="left flex-center-center"> <div class="left flex-center-center">
@ -240,6 +244,7 @@ import {
lightCloseBuild, lightCloseBuild,
getLightWarnList, // getLightWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import backHome from "./backHome"; import backHome from "./backHome";
export default { export default {
@ -493,11 +498,18 @@ export default {
} }
}, },
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getLightWarnList(); // this.getLightWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -67,17 +67,16 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span>|</span> <span v-if="item.confirmStatus === 0">|</span>
<p> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> --> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <span>告警恢复</span>
<span>告警恢复</span> </p>
</p>
</div> </div>
<div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''"> <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
<div class="left flex-center-center"> <div class="left flex-center-center">
@ -218,6 +217,7 @@ import {
getMonitoringList, // getMonitoringList, //
getCameraWarnList, // getCameraWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import clickCp from "./clickCp"; import clickCp from "./clickCp";
import backHome from "./backHome"; import backHome from "./backHome";
@ -576,11 +576,18 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getCameraWarnList(); this.getCameraWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -82,14 +82,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -123,14 +122,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -266,6 +264,7 @@ import {
getWallGK, getWallGK,
getFenceWarnList, // getFenceWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
export default { export default {
props: { props: {
@ -800,11 +799,18 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getFenceWarnList(); // this.getFenceWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
const routerUrl = this.$router.resolve({ const routerUrl = this.$router.resolve({

@ -189,14 +189,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -225,14 +224,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -362,6 +360,7 @@ import {
getWarmMeterData, getWarmMeterData,
getHeatWarnList, // getHeatWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import backHome from "./backHome"; import backHome from "./backHome";
export default { export default {
@ -588,11 +587,18 @@ export default {
}, },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getHeatWarnList(); // this.getHeatWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -186,14 +186,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -220,14 +219,13 @@
<img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
<span>查看详情</span> <span>查看详情</span>
</p> </p>
<span v-if="item.homepageShow == 1">|</span> <span v-if="item.confirmStatus === 0">|</span>
<p @click="doCancelWarn(item.id)" v-if="item.homepageShow == 1"> <p v-if="item.confirmStatus === 0" @click="doCancelWarn(item)">
<img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
<span>确认告警</span> <span>确认告警</span>
</p> </p>
<span v-if="item.homepageShow == 1 || item.warnStatus == 1">|</span> <span v-if="item.warnStatus == 1">|</span>
<p v-if="item.homepageShow == 1 || item.warnStatus == 1"> <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
<!-- <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" /> -->
<i class="el-icon-refresh-right" style="margin-right:10px;"></i> <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
<span>告警恢复</span> <span>告警恢复</span>
</p> </p>
@ -351,6 +349,7 @@ import {
getWaterMeterData, getWaterMeterData,
getWaterWarnList, // getWaterWarnList, //
getCancelWarn, // getCancelWarn, //
recoveryWarn,//
} from "@/api/garden/monitoring"; } from "@/api/garden/monitoring";
import backHome from "./backHome"; import backHome from "./backHome";
export default { export default {
@ -566,11 +565,18 @@ export default {
beforeDestroy() { }, beforeDestroy() { },
methods: { methods: {
// - // -
doCancelWarn(id) { doCancelWarn(item) {
getCancelWarn(id).then((res) => { getCancelWarn(item.id).then((res) => {
this.getWaterWarnList(); // this.getWaterWarnList();
item.confirmStatus = 1;
}); });
}, },
//
doRecoveryWarn(item) {
recoveryWarn(item.id).then((res) => {
item.warnStatus = 2;
})
},
// //
goMoreWarnList() { goMoreWarnList() {
// this.$router.push({ path: '/equipment/warnHistory' }); // this.$router.push({ path: '/equipment/warnHistory' });

@ -65,11 +65,14 @@
var DIC = { var DIC = {
alarmType: [{ alarmType: [{
label: '安全报警', label: '无报警',
value: '1' value: 0
},{
label: '事件报警',
value: 1
}, { }, {
label: '系统报警', label: '设备报警',
value: '2' value: 2
}], }],
aereaType:[{ aereaType:[{
label:'业务区', label:'业务区',
@ -78,12 +81,12 @@
label:'塔台', label:'塔台',
value:'2' value:'2'
}], }],
recoveryMethod:[{ recoveryType:[{
label: '手动', label: '手动',
value: '1' value: 1
}, { }, {
label: '自动', label: '自动',
value: '2' value: 0
}] }]
} }
export default { export default {
@ -141,10 +144,12 @@
searchslot:true, searchslot:true,
search:true, search:true,
type:"select", type:"select",
hide:true, dicData: DIC.aereaType,
// hide:true,
row: false, row: false,
display: false, display: false,
viewDisplay:false viewDisplay:false,
align:'center',
}, },
{ {
label: "报警类型", label: "报警类型",
@ -187,19 +192,20 @@
}, },
{ {
label: "恢复方式", label: "恢复方式",
prop: "recoveryMethod", prop: "recoveryType",
dicData: DIC.recoveryType,
type:"select", type:"select",
dicData: DIC.recoveryMethod,
align:'center', align:'center',
}, },
{ {
label: "操作人", label: "恢复人",
prop: "user", prop: "recoveryPerson",
align:'center', align:'center',
}, },
{ {
label: "操作时间", label: "恢复时间",
prop: "time", prop: "recoveryDate",
type:'datetime',
align:'center', align:'center',
}, },
] ]

@ -185,24 +185,24 @@
/> />
<span>安防态势</span> <span>安防态势</span>
</div> </div>
<div class="flex" style="width: 100%; margin: 2.3rem auto 0"> <div class="flex" style="width: 100%; margin: 2.3rem auto 0; cursor: pointer;">
<div class="state flex-center" style="margin-right: 5px"> <div class="state flex-center" style="margin-right: 5px">
<img <img
src="../../../public/img/home/left_warn.png" src="../../../public/img/home/left_warn.png"
class="state_icon" class="state_icon"
/> />
<div> <div @click="changeSecurityTab(1)">
<div class="state_num">{{ securityData.warnCurNumber }}</div> <div class="state_num" :style="{color:securityTab == 1 ? '#1cb2ff':'rgba(255, 255, 255, 0.8)'}">{{ securityData.warnCurNumber }}</div>
<div class="state_title">当前告警数量</div> <div class="state_title">当前告警数量</div>
</div> </div>
</div> </div>
<div class="state flex-center" style="margin-left: 5px"> <div class="state flex-center" style="margin-left: 5px; cursor: pointer;">
<img <img
src="../../../public/img/home/left_history_warn.png" src="../../../public/img/home/left_history_warn.png"
class="state_icon" class="state_icon"
/> />
<div> <div @click="changeSecurityTab(2)">
<div class="state_num" style="color: rgba(255, 255, 255, 0.8)"> <div class="state_num" :style="{color:securityTab == 2 ? '#1cb2ff':'rgba(255, 255, 255, 0.8)'}">
{{ securityData.warnHisNumber }} {{ securityData.warnHisNumber }}
</div> </div>
<div class="state_title">历史告警数量</div> <div class="state_title">历史告警数量</div>
@ -211,7 +211,7 @@
</div> </div>
</div> </div>
<div style="width: 100%; margin: 41rem auto 0"> <div style="width: 100%; margin: 41rem auto 0">
<div id="statePie" style="width: 100%; height: 220px"></div> <div id="statePie" style="width: 100%; height: 250px"></div>
</div> </div>
</div> </div>
<!-- 中间底部 --> <!-- 中间底部 -->
@ -866,6 +866,7 @@ export default {
yqPeopleTotal: 0, // yqPeopleTotal: 0, //
yqPeopleData: [], // yqPeopleData: [], //
listData: [], // listData: [], //
securityTab: 1,// -
securityData: {}, // securityData: {}, //
listData1: [], // listData1: [], //
classOption: { classOption: {
@ -1151,9 +1152,17 @@ export default {
], ],
}); });
}, },
//
changeSecurityTab(tab) {
console.log('changeSecurityTab================',tab)
if(this.securityTab != tab) {
this.securityTab = tab;
this.getSecurityStatus();
}
},
// //
getSecurityStatus() { getSecurityStatus() {
getSecurityStatus(this.bimModel).then((res) => { getSecurityStatus(this.bimModel,this.securityTab==1?'0':'1').then((res) => {
this.securityData = res.data.data; this.securityData = res.data.data;
this.getSafeState(); this.getSafeState();
}); });
@ -1162,7 +1171,8 @@ export default {
// domecharts // domecharts
var myChart = this.$echarts.init(document.getElementById("statePie")); var myChart = this.$echarts.init(document.getElementById("statePie"));
let warnData = [], let warnData = [],
offlineData = []; offlineData = [],
lengendData = [];
this.securityData.securityWarnCount.map((item) => { this.securityData.securityWarnCount.map((item) => {
let classData = this.classifyData.find( let classData = this.classifyData.find(
(item1) => item1.val == item.classCode (item1) => item1.val == item.classCode
@ -1175,6 +1185,7 @@ export default {
}, },
}; };
warnData.push(obj); warnData.push(obj);
lengendData.push(classData ? classData.name : item.clasCode);
}); });
this.securityData.offlineWarnCount.map((item) => { this.securityData.offlineWarnCount.map((item) => {
let classData = this.classifyData.find( let classData = this.classifyData.find(
@ -1189,75 +1200,88 @@ export default {
}; };
offlineData.push(obj); offlineData.push(obj);
}); });
// console.log("", warnData, offlineData); console.log("安防态势", lengendData);
// //
myChart.setOption({ myChart.setOption({
color: ["#01feae", "#f2b448", "#07a6ff", "#ff8b2e"], // color: ["#01feae", "#f2b448", "#07a6ff", "#ff8b2e"],
tooltip: { tooltip: {
trigger: "item", trigger: "item",
}, },
legend: { legend: {
top: "85%", top: "80%",
left: '-10', left: '20',
right: '20',
padding: [5,0], padding: [5,0],
itemHeight: 0, itemWidth: 15,
itemHeight: 10,
// itemHeight: 0,
formatter: function (name) { formatter: function (name) {
return name == "监控" return name == "电力"
? `{iconMark1|} ${name}` ? ``
: name == "消防" : name;
? `{iconMark2|} ${name}`
: name == "电子门禁"
? `{iconMark3|} ${name}`
: `{iconMark4|} ${name}`;
}, },
textStyle: { textStyle: {
color: "rgba(255,255,255,0.5)", color: "rgba(255,255,255,0.5)",
fontSize: 14, fontSize: 14,
rich: {
iconMark1: {
width: 10,
height: 10,
borderColor: "#01feae",
borderWidth: 3,
borderRadius: 6,
},
iconMark2: {
width: 10,
height: 10,
borderColor: "#f2b448",
borderWidth: 3,
borderRadius: 6,
},
iconMark3: {
width: 10,
height: 10,
borderColor: "#07a6ff",
borderWidth: 3,
borderRadius: 6,
},
iconMark4: {
width: 10,
height: 10,
borderColor: "#ff8b2e",
borderWidth: 3,
borderRadius: 6,
},
},
}, },
data: [ // formatter: function (name) {
{ // return name == ""
name: "监控", // ? `{iconMark1|} ${name}`
}, // : name == ""
{ // ? `{iconMark2|} ${name}`
name: "消防", // : name == ""
}, // ? `{iconMark3|} ${name}`
{ // : `{iconMark4|} ${name}`;
name: "电子门禁", // },
}, // textStyle: {
{ // color: "rgba(255,255,255,0.5)",
name: "电子围界", // fontSize: 14,
}, // rich: {
], // iconMark1: {
// width: 10,
// height: 10,
// borderColor: "#01feae",
// borderWidth: 3,
// borderRadius: 6,
// },
// iconMark2: {
// width: 10,
// height: 10,
// borderColor: "#f2b448",
// borderWidth: 3,
// borderRadius: 6,
// },
// iconMark3: {
// width: 10,
// height: 10,
// borderColor: "#07a6ff",
// borderWidth: 3,
// borderRadius: 6,
// },
// iconMark4: {
// width: 10,
// height: 10,
// borderColor: "#ff8b2e",
// borderWidth: 3,
// borderRadius: 6,
// },
// },
// },
// data: [
// {
// name: "",
// },
// {
// name: "",
// },
// {
// name: "",
// },
// {
// name: "",
// },
// ],
data: lengendData
}, },
title: [ title: [
{ {

Loading…
Cancel
Save