From 33599888ea8c5c992f441758c9eb4a224700a3c3 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 5 Aug 2025 16:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/Admin/YeWu/PingTaiPushController.php | 8 +++----- el-admin/.env.production | 8 ++++---- el-admin/src/views/PingTai/PushList.vue | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php index e5e011f..937e2b6 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PingTaiPushController.php @@ -14,17 +14,15 @@ class PingTaiPushController extends Controller $searchInfo = request('searchInfo'); $page =request('page'); $pageSize =request('pageSize'); - if(empty($searchInfo['dateRange'])){ + if(!empty($searchInfo['dateRange'])){ $searchInfo['dateRange']=[ - date('Y-m-d')." 00:00:00", - date('Y-m-d')." 23:59:59" + $searchInfo['dateRange'][0]." 00:00:00", + $searchInfo['dateRange'][1]." 23:59:59" ]; } $list = DB::table('health_certificate_push'); if (isset($searchInfo['dateRange']) && count($searchInfo['dateRange'])==2) { $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'])) { diff --git a/el-admin/.env.production b/el-admin/.env.production index 3e024d3..2205e17 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,6 +1,6 @@ ENV = 'production' -VITE_APP_API_66666666 = '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_API = 'http://192.168.50.123:33583/common/la/public/api/' +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_FILE = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file +VITE_APP_API_66666666 = 'http://172.31.68.39:33583/common/la/public/api/' +VITE_APP_FILE_66666666 = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file diff --git a/el-admin/src/views/PingTai/PushList.vue b/el-admin/src/views/PingTai/PushList.vue index 738da5b..0ab1ed6 100644 --- a/el-admin/src/views/PingTai/PushList.vue +++ b/el-admin/src/views/PingTai/PushList.vue @@ -96,11 +96,11 @@ let detailDialogVisible = ref(false) const PageSizeChange = (e) => { // 修改每页数量 pageSize.value = e - + GetList() } const PageCurrentChange = (e) => { //切换页码 currentPage.value = e - + GetList() } //获取列表