no message

app/Http/Controllers/DevicesController.php

@@ -507,8 +507,9 @@ class DevicesController extends Controller
                 ->join('status as s','d.devicepolice','=','s.id')
                 ->join('danwei as w','d.devicemonad','=','w.id')
                 ->join('users as u','d.uid','=','u.id')
+                ->join('reportpolice as r','d.devicenum','=','r.devicenumber')
                 ->where('d.devicenum','=',$devicenum)
-                ->select('d.devicenum','d.username','d.nd','d.deviceremark','d.devicecoord','d.deviceaddtime','d.devicestatus','t.tname','g.gas','s.status_name','w.danwei','u.name','u.email')
+                ->select('d.devicenum','d.username','d.nd','d.deviceremark','d.devicecoord','d.deviceaddtime','d.devicestatus','t.tname','g.gas','s.status_name','w.danwei','u.name','u.email','r.location','r.concentration','r.starttime')
                 ->first();
             return $this->jsonSuccessData($data);
         }else{

resources/js/layout/components/TagsView/index.vue

@@ -49,7 +49,13 @@
           <span>{{ gridData.tname }}</span>
         </el-form-item>
         <el-form-item label="设备单位浓度" label-width="100px">
-          <span>{{ gridData.nd }}/{{ gridData.gas }}/{{ gridData.danwei }}</span>
+          <span>{{ gridData.concentration }}/{{ gridData.gas }}/{{ gridData.danwei }}</span>
+        </el-form-item>
+        <el-form-item label="设备报警开始时间" label-width="130px">
+          <span>{{ gridData.starttime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </el-form-item>
+        <el-form-item label="报警位置">
+          <span>{{ gridData.location }}</span>
         </el-form-item>
         <el-form-item label="设备坐标">
           <span>{{ gridData.devicecoord }}</span>