pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

dev
vine_liutk 2022-11-23 17:06:46 +08:00
parent c351cc169f
commit 3670332227
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/DeviceController.php
View File

@ -271,7 +271,7 @@ class DeviceController extends Controller
} }
}else{ }else{
//调整截至到当前小时 //调整截至到当前小时
$h = date('h'); $h = date('H');
for ($i = 0; $i < ($h+1); $i++) { for ($i = 0; $i < ($h+1); $i++) {
$xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00'; $xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00';
} }

1
database/seeders/AgriculturalBaseSeeder.php
View File

@ -33,6 +33,7 @@ class AgriculturalBaseSeeder extends Seeder
['name' => '普润镇', 'type' => 2, 'description' => '', 'areas' => '58370', 'workforce' => '212'], ['name' => '普润镇', 'type' => 2, 'description' => '', 'areas' => '58370', 'workforce' => '212'],
]; ];
DB::table('agricultural_bases')->truncate(); DB::table('agricultural_bases')->truncate();
DB::table('base_crops')->truncate();
try { try {
DB::begintransaction(); DB::begintransaction();
$this->createBases($bases); $this->createBases($bases);

2
database/seeders/EndpointPermissionSeeder.php
View File

@ -26,7 +26,7 @@ class EndpointPermissionSeeder extends Seeder
'citydata_statistics' => ['name' => '全市基础数据', 'curd' => ['index', 'edit']], 'citydata_statistics' => ['name' => '全市基础数据', 'curd' => ['index', 'edit']],
//全市基础数据 //全市基础数据
'agricultural_basic' => ['name' => '基地数据', 'curd' => true], 'agricultural_basic' => ['name' => '基地数据', 'curd' => true],
'town_street' => ['name' => '城镇数据', 'curd' => true], 'town_street' => ['name' => '城镇数据', 'curd' => ['index', 'edit']],
//农作物数据 //农作物数据
'crops' => ['name' => '基地农作物', 'curd' => true], 'crops' => ['name' => '基地农作物', 'curd' => true],
'town_crops' => ['name' => '镇街农作物', 'curd' => true], 'town_crops' => ['name' => '镇街农作物', 'curd' => true],