Commit 19fc29f7 authored by 纪泽龙's avatar 纪泽龙

Merge branch 'develop_jzl'

parents 83d1eb52 fa748965
<template> <template>
<div> <div>
<div class="audio" > <div class="audio">
<audio ref="audio" :src="mp3Src"></audio> <audio ref="audio" :src="mp3Src"></audio>
</div> </div>
<div <div
...@@ -519,12 +519,12 @@ export default { ...@@ -519,12 +519,12 @@ export default {
} }
}, },
audio(){ audio() {
console.log("this.$refs.audio.paused",this.$refs.audio.paused) console.log("this.$refs.audio.paused", this.$refs.audio.paused);
if (this.$refs.audio.paused) { if (this.$refs.audio.paused) {
// this.$refs.audio.paused = false; // this.$refs.audio.paused = false;
this.$refs.audio.play(); this.$refs.audio.play();
} }
}, },
initMap() { initMap() {
let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER); let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
...@@ -727,6 +727,8 @@ export default { ...@@ -727,6 +727,8 @@ export default {
options.lineData.alarmValue = null; options.lineData.alarmValue = null;
console.log("管道回复"); console.log("管道回复");
} else { } else {
// 报警声音
this.audio();
polyline.setOptions({ strokeColor: "#ff0000" }); polyline.setOptions({ strokeColor: "#ff0000" });
options.lineData.alarmState = 1; options.lineData.alarmState = 1;
// 报警类型 // 报警类型
...@@ -740,7 +742,7 @@ export default { ...@@ -740,7 +742,7 @@ export default {
console.log(item.selfData.alarmState); console.log(item.selfData.alarmState);
return item.selfData.alarmState; return item.selfData.alarmState;
})[0]; })[0];
// console.log("this.allList[0]", this.allList[0]); // console.log("this.allList[0]", this.allList[0]);
// console.log("myP", myP); // console.log("myP", myP);
// 改变左侧列表的状态(1报警,0,正常) // 改变左侧列表的状态(1报警,0,正常)
...@@ -776,6 +778,8 @@ export default { ...@@ -776,6 +778,8 @@ export default {
// 报警信息 // 报警信息
options.alarmValue = null; options.alarmValue = null;
} else { } else {
// 报警声音
this.audio();
options.alarmState = 1; options.alarmState = 1;
// 报警类型 // 报警类型
options.alarmType = alarmType; options.alarmType = alarmType;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment