分页bug

main
yanzai 4 months ago
parent a65bc762c8
commit 33599888ea

@ -14,17 +14,15 @@ class PingTaiPushController extends Controller
$searchInfo = request('searchInfo'); $searchInfo = request('searchInfo');
$page =request('page'); $page =request('page');
$pageSize =request('pageSize'); $pageSize =request('pageSize');
if(empty($searchInfo['dateRange'])){ if(!empty($searchInfo['dateRange'])){
$searchInfo['dateRange']=[ $searchInfo['dateRange']=[
date('Y-m-d')." 00:00:00", $searchInfo['dateRange'][0]." 00:00:00",
date('Y-m-d')." 23:59:59" $searchInfo['dateRange'][1]." 23:59:59"
]; ];
} }
$list = DB::table('health_certificate_push'); $list = DB::table('health_certificate_push');
if (isset($searchInfo['dateRange']) && count($searchInfo['dateRange'])==2) { if (isset($searchInfo['dateRange']) && count($searchInfo['dateRange'])==2) {
$list = $list->whereBetween('created_at', $searchInfo['dateRange']); $list = $list->whereBetween('created_at', $searchInfo['dateRange']);
} else {
$list = $list->whereBetween('created_at', [date('Y-m-d'), date('Y-m-d')]);
} }
if (isset($searchInfo['orgname'])) { if (isset($searchInfo['orgname'])) {

@ -1,6 +1,6 @@
ENV = 'production' ENV = 'production'
VITE_APP_API_66666666 = 'http://192.168.50.123:33583/common/la/public/api/' VITE_APP_API = 'http://192.168.50.123:33583/common/la/public/api/'
VITE_APP_FILE_66666666 = 'http://192.168.50.123:33583/common/la/public' VITE_APP_FILE = 'http://192.168.50.123:33583/common/la/public'
VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/' VITE_APP_API_66666666 = 'http://172.31.68.39:33583/common/la/public/api/'
VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public' VITE_APP_FILE_66666666 = 'http://172.31.68.39:33583/common/la/public'

@ -96,11 +96,11 @@
let detailDialogVisible = ref(false) let detailDialogVisible = ref(false)
const PageSizeChange = (e) => { // const PageSizeChange = (e) => { //
pageSize.value = e pageSize.value = e
GetList()
} }
const PageCurrentChange = (e) => { // const PageCurrentChange = (e) => { //
currentPage.value = e currentPage.value = e
GetList()
} }
// //

Loading…
Cancel
Save