Merge branch 'master' into feature/h5

app/Http/Controllers/Auth/ZehongTcpController.php

@@ -91,9 +91,9 @@ class  ZehongTcpController extends Controller
     {
         if ($data != []) {
             // 报警提醒
-//            $meTcp = new SwooleCommandMeTcpController();
-//            $alarmData = $data['id'] . '/' . $data['status'] . '/' . $data['np'];
-//            $meTcp->swooletcplist($alarmData);
+            $meTcp = new SwooleCommandMeTcpController();
+            $alarmData = $data['id'] . '/' . $data['status'] . '/' . $data['np'];
+            $meTcp->swooletcplist($alarmData);
             $this->smsphone($data);
             $datainfo = DB::table('device')
                 ->where('devicenum', '=', $data['id'])
@@ -115,7 +115,7 @@ class  ZehongTcpController extends Controller
     public function smsphone($data)
     {
         if (Redis::get($data['id']) == '') {
-            if ($data['status'] != 1 || $data['status'] != 0) {
+            if ($data['status'] > 1) {
                 $sms = new SmsailiyunController();
                 $code1 = json_encode($sms->sendSms());
                 $code = json_decode($code1,true);
@@ -127,6 +127,7 @@ class  ZehongTcpController extends Controller
             }
         } else {
             if ($data['status'] == 1 || $data['status'] == 0) {
+                Log::channel('slack')->info('设备正常 =>' . '' . '设备号=>' . $data['id']);
                 Redis::del($data['id']);
             }
         }

resources/js/views/map/index.vue

@@ -76,7 +76,7 @@
       width="35%"
       :modal="false"
       top="20vh"
-      custom-class="zero-dialog"
+      :custom-class="dialogClass"
     >
       <el-table :data="gridData" :show-header="false">
         <el-table-column property="title" width="180px"></el-table-column>
@@ -209,6 +209,7 @@ export default {
   data(){
     const _this = this;
     return {
+      dialogClass: 'zero-dialog',
       leftDeviceListVisible: true,
       markersGoodsVisible: false,
       markersGoods: [{
@@ -388,12 +389,17 @@ export default {
     },
     // 获取设备详细信息
     getUserDeviceInfo(id) {
+      this.dialogClass = 'zero-dialog';
       deviceinfo(id)
         .then(res => {
           const deviceInfo = res.data;
+          console.log(deviceInfo);
           this.center = deviceInfo.devicecoord.replace(/\s*/g, '').split(',');
           this.dialogTableVisible = true;
           this.markersDeviceVisible = true;
+          if (deviceInfo.devicepolice === 4 || deviceInfo.devicepolice === 5 || deviceInfo.devicepolice === 6) {
+            this.dialogClass += ' device-box-fade-alarm';
+          }
           this.gridData = [
             {
               title: '设备编号',
@@ -596,4 +602,34 @@ export default {
   right: 1px;
   bottom: 1px;
 }
+
+@keyframes fade {
+  from {
+    opacity: 1.0;
+  }
+  50% {
+    opacity: 1.0;
+    background-color: red;
+  }
+  to {
+    opacity: 1.0;
+  }
+}
+
+@-webkit-keyframes fade {
+  from {
+    opacity: 1.0;
+  }
+  50% {
+    opacity: 1.0;
+    background-color: red;
+  }
+  to {
+    opacity: 1.0;
+  }
+}
+.device-box-fade-alarm .el-dialog__header {
+    animation: fade 600ms infinite;
+    -webkit-animation: fade 600ms infinite;
+}
 </style>