数据趋势图

app/Service/DeviceService.php

@@ -92,10 +92,19 @@ class DeviceService extends Service
     public function equipmentDel($data){
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
+        $bool = ScreenDevice::whereIn('del_time',0)
+            ->whereIn('device_id',$data['id'])
+            ->exists();
+        if($bool) return [false,'设备已经绑定仓！'];
+
         Device::whereIn('id',$data['id'])->update([
             'del_time' => time()
         ]);
 
+        ScreenDevice::whereIn('device_id',$data['id'])->update([
+            'del_time' => time()
+        ]);
+
         return [true,'删除成功'];
     }
 

app/Service/ScreenService.php

@@ -196,6 +196,7 @@ class ScreenService extends Service
             ->leftJoin('device_type as c','c.id','b.device_type_id')
             ->where('a.screen_id',$data['screen_id'])
             ->where('a.del_time',0)
+            ->where('b.del_time',0)
             ->select('a.id','b.id as device_id','b.title','b.code','b.gateway_id','b.device_type_id','b.remark','c.title as device_type_name','b.size','b.unit');
 
         if(! empty($data['gateway_id'])) $model->where('b.gateway_id',$data['gateway_id']);