diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php index 1f04e76..aa0a7f5 100644 --- a/app/Http/Controllers/DeviceController.php +++ b/app/Http/Controllers/DeviceController.php @@ -271,7 +271,7 @@ class DeviceController extends Controller } }else{ //调整截至到当前小时 - $h = date('h'); + $h = date('H'); for ($i = 0; $i < ($h+1); $i++) { $xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00'; } diff --git a/database/seeders/AgriculturalBaseSeeder.php b/database/seeders/AgriculturalBaseSeeder.php index 3d63f38..a600cf5 100644 --- a/database/seeders/AgriculturalBaseSeeder.php +++ b/database/seeders/AgriculturalBaseSeeder.php @@ -33,6 +33,7 @@ class AgriculturalBaseSeeder extends Seeder ['name' => '普润镇', 'type' => 2, 'description' => '', 'areas' => '58370', 'workforce' => '212'], ]; DB::table('agricultural_bases')->truncate(); + DB::table('base_crops')->truncate(); try { DB::begintransaction(); $this->createBases($bases); diff --git a/database/seeders/EndpointPermissionSeeder.php b/database/seeders/EndpointPermissionSeeder.php index 27e3bec..4c4dae3 100644 --- a/database/seeders/EndpointPermissionSeeder.php +++ b/database/seeders/EndpointPermissionSeeder.php @@ -26,7 +26,7 @@ class EndpointPermissionSeeder extends Seeder 'citydata_statistics' => ['name' => '全市基础数据', 'curd' => ['index', 'edit']], //全市基础数据 'agricultural_basic' => ['name' => '基地数据', 'curd' => true], - 'town_street' => ['name' => '城镇数据', 'curd' => true], + 'town_street' => ['name' => '城镇数据', 'curd' => ['index', 'edit']], //农作物数据 'crops' => ['name' => '基地农作物', 'curd' => true], 'town_crops' => ['name' => '镇街农作物', 'curd' => true],