Compare commits
No commits in common. "4f4dca4961ef171390719234570dc64ff1dfe1a7" and "5fde7566f40d94696130d46111f5291aba7ad344" have entirely different histories.
4f4dca4961
...
5fde7566f4
|
|
@ -4,7 +4,6 @@ namespace App\Filters;
|
||||||
|
|
||||||
use EloquentFilter\ModelFilter;
|
use EloquentFilter\ModelFilter;
|
||||||
use App\Models\Device;
|
use App\Models\Device;
|
||||||
use App\Models\Keyword;
|
|
||||||
|
|
||||||
class MonitorModeFilter extends ModelFilter
|
class MonitorModeFilter extends ModelFilter
|
||||||
{
|
{
|
||||||
|
|
@ -34,16 +33,4 @@ class MonitorModeFilter extends ModelFilter
|
||||||
};
|
};
|
||||||
return $this->where('type', $type);
|
return $this->where('type', $type);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 指定监控组
|
|
||||||
*/
|
|
||||||
public function customAppoint($customAppoint){
|
|
||||||
$tag = Keyword::where('key', $customAppoint)->first();
|
|
||||||
if($tag){
|
|
||||||
return $this->whereRaw("FIND_IN_SET('".$tag->id."',group_tags)");
|
|
||||||
}else{
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,7 @@ class KeywordSeeder extends Seeder
|
||||||
['name' => 'LINK-OS', 'key'=>'link-os']
|
['name' => 'LINK-OS', 'key'=>'link-os']
|
||||||
]],
|
]],
|
||||||
['key' => 'monitor-mode-group', 'name' => '监测组', 'list' => [
|
['key' => 'monitor-mode-group', 'name' => '监测组', 'list' => [
|
||||||
['name' => '农机', 'key'=>'machinery'],
|
['name' => '农机', 'key'=>'machinery']
|
||||||
['name' => '球机', 'key'=>'ball-camera'],
|
|
||||||
['name' => '大屏监控', 'key'=>'recommend-camera']
|
|
||||||
]],
|
]],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue