system-clients 3.0.42-fanxian → 3.0.43-fanxian

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.0.42-fanxian",
+  "version": "3.0.43-fanxian",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -128,14 +128,14 @@
     <!--  异常查看  -->
     <modal v-if="showAbnormity" :show.sync="showAbnormity"  :width="1000" v-ref:modal  backdrop="false">
       <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="showAbnormity = false"><span>&times;</span></button>
+        <button type="button" class="close" @click="stopSoundNew"><span>&times;</span></button>
         <h4 class="modal-title">异常报警</h4>
       </header>
       <article  slot="modal-body" class="modal-body modifystyle auto form-horizontal">
         <alarm-information :mergeinfo=abnormityWarningData></alarm-information>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button  type="button" class="btn btn-success" @click='showAbnormity = false'>确认</button>
+        <button  type="button" class="btn btn-success" @click='stopSoundNew'>确认</button>
       </footer>
     </modal>
   </div>
@@ -248,6 +248,7 @@
             if (this.abnormityWarningData.data.length > 0) {
               this.playSound()
               this.showaData = true
+              this.showAbnormity = true
             } else {
               this.showaData = false
             }
@@ -264,6 +265,7 @@
             if (this.abnormityWarningData.data.length > 0) {
               this.playSound()
               this.showaData = true
+              this.showAbnormity = true
             } else {
               this.showaData = false
             }
@@ -346,6 +348,7 @@
         this.audio = new Audio()
         this.audio.src = 'static/newStyle/alarm.mp3' // 替换为实际的音频文件路径
         this.audio.loop = true // 设置循环播放
+        this.audio.autoplay = true
         this.audio.play()
       },
       stopSound () {
@@ -353,6 +356,10 @@
           this.audio.pause()
           this.audio = null
         }
+      },
+      stopSoundNew () {
+        this.showAbnormity = false
+        this.stopSound()
       }
     },
     computed: {