Merge branch 'v0.1.1_alarm' of http://10.87.21.221:8000/jzyd_yyds/soc_app into v0.1.1_alarm

src/App.vue

@@ -145,20 +145,22 @@ export default {
     },
     reconnect(){
       //定义重新连接的时间间隔
-      const reconnectInterval = 5;
-    /*  setTimeout(() => {
+      const reconnectInterval = 30;
+      setTimeout(() => {
         this.initWebSocket();
-      }, reconnectInterval * 1000);*/
+      }, reconnectInterval * 1000);
     },
 
     startSocketHeartBeat(){
       this.heartBeatTimer = setInterval(() => {
         if (this.socket.readyState === WebSocket.OPEN) {
           this.socket.send('ping');
+          console.log('发送websocket心跳');
         }
-      },60 * 1000);
+      },30 * 1000);
     },
     stopHeartBeat(){
+      console.log('停止websocket心跳');
       clearInterval(this.heartBeatTimer);
     }
 

src/components/AlarmDeal/index.vue

@@ -14,7 +14,7 @@
           :isAll="true"
           :border="false"
           v-model="submitData.doType"
-          :data-list="getDictItem('alarm_deal_type')"
+          :data-list="alarmDealTypeList"
           />
         <van-field
           rows="2"
@@ -45,7 +45,13 @@ export default {
         content: null,
         iotAlarmDataId: null
       },
-      dicts:['alarm_deal_type']
+      //dicts:['alarm_deal_type'],
+      alarmDealTypeList: [
+        {dictValue: 2, dictLabel: '误报'},
+        {dictValue: 3, dictLabel: '正常报警'},
+        {dictValue: 4, dictLabel: '报修'},
+        {dictValue: 5, dictLabel: '测试'}
+      ]
     }
   },
   methods: {
@@ -82,6 +88,11 @@ export default {
       });
     },
     cancelDialog(){
+      this.submitData = {
+        doType: null,
+        content: null,
+        iotAlarmDataId: null
+      }
       this.$store.commit('SET_MESSAGE_SHOW', true)
     }
   },