From 3b964e0ddfa665099a0e906a6a4220fc71cca0cd Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 12 Nov 2024 21:22:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=9F=A5=20=E6=94=B9=E6=88=90=20=E6=A3=80?= =?UTF-8?q?=E5=89=8D=E9=97=AE=E5=8D=B7=E3=80=82=E9=97=AE=E5=8D=B7=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=9F=E5=8F=B7=E3=80=82=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=20=E5=A7=93=E5=90=8D=20=E6=89=8B=E6=9C=BA=E5=8F=B7=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/main/question/question/question.vue | 31 ++++++++- h5/pages/main/question/src/question.vue | 1 - h5/pages/main/questionnaire/index.vue | 67 +++++++++----------- 3 files changed, 61 insertions(+), 38 deletions(-) diff --git a/h5/pages/main/question/question/question.vue b/h5/pages/main/question/question/question.vue index bf05c53..290f514 100644 --- a/h5/pages/main/question/question/question.vue +++ b/h5/pages/main/question/question/question.vue @@ -310,10 +310,39 @@ - - - 共 {{ topicList.length }} 题/第 - {{ topicIndex + 1 }} 题 + + 共 {{ topicList.length }} 题 {{ topicList[topicIndex]?.question }} - + { :placeholder="topicList[topicIndex]?.content" /> - + { - - - - 上一题 - - - 下一题 - - - Date: Tue, 12 Nov 2024 22:35:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E5=88=86=E8=AF=8A?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 2d3757b..1272aa0 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -36,7 +36,7 @@ class FenzhenController extends Controller { // 这里放 检查是否有 体检引导的数据 $id_number = request('id_number'); - $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->where('tj_number', '!=', null)->orderBy('id', 'desc')->get(); + $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->where('tj_number', '!=', null)->get(); if (count($list) == 0) { $list = DB::table('orders')->where(['id_number' => $id_number])->whereIn('status', [2, 4])->orderBy('id', 'desc')->get(); } From 96ade6b60826d28c7e22f4fc3ac371078631a841 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 12 Nov 2024 23:01:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E9=A2=84=E8=AE=A1?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 1272aa0..2e13970 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -243,6 +243,9 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $res['data']['start_time'] . ':00', 'end_time' => $res['data']['end_time'], + 'yuji_end_time' => $res['data']['yuji_end_time'], + 'yuji_use_time' => $res['data']['yuji_use_time'], + 'use_time' => $res['data']['use_time'], 'qrcode' => $person_ghzid, 'tj_number' => $info->tj_number, 'ghzid' => $person_ghzid, @@ -260,6 +263,9 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $info->appointment_time, 'end_time' => $end_time, + 'yuji_end_time' => $end_time, + 'yuji_use_time' => '', + 'use_time' => '', 'qrcode' => $person_ghzid, 'ghzid' => $person_ghzid, 'tj_number' => $info->tj_number, From cf3bea139063544d92dc0e03f7766b2882c5daa1 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Wed, 13 Nov 2024 00:15:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=9A=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=94=B9=E6=88=90=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=88=E5=87=8F=E5=B0=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=EF=BC=89=EF=BC=8C=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=B0=B1=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/user/fenzhen/fenzhen.vue | 145 +++++++++++++++++++++++------- 1 file changed, 113 insertions(+), 32 deletions(-) diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue index cec4fdc..d523a28 100644 --- a/h5/pages/user/fenzhen/fenzhen.vue +++ b/h5/pages/user/fenzhen/fenzhen.vue @@ -40,7 +40,8 @@ fenzhen_list.value = response.data; console.log(window.location.href) setTimeout(() => { - if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen')) { + if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen') && + !window.location.href.includes('192.168.31.84:5173')) { getFenzhenList(false) } }, 1000 * 10) @@ -59,12 +60,6 @@ } }; - const toRouter = (clinic) => { - uni.navigateTo({ - url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic, - }); - }; - const timeShow = (time) => { let time_array = time.split(":"); return `${time_array[0]}:${time_array[1]}`; @@ -95,6 +90,44 @@ }) } + const toRouter = (clinic) => { + uni.navigateTo({ + url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic, + }); + }; + const fenzhen_active = ref(-1) + const fenzhen_info = ref(false) + const infoShowClick = (clinic) => { + if (clinic !== fenzhen_active.value) { + fenzhen_info.value = false + getFenzhenInfo(clinic) + } else { + fenzhen_active.value = -1 + } + } + const qijian = (item) => { + uni.navigateTo({ + url: `/pages/user/fenzhen/qijian?id=${$props.id}&xmid=${item.id}&tj_number=${fenzhen_list.value.info.tj_number}`, + }); + }; + + const getFenzhenInfo = async (clinic) => { + fenzhen_active.value = clinic + uni.showLoading(); + const response = await $api("FenzhenInfo", { + id: $props.id, + clinic: clinic, + }); + uni.hideLoading(); + $response(response, () => { + fenzhen_info.value = response.data; + }); + }; + + const useTimeShow = (time) => { + return Math.ceil(Number(time)) + } + onShow(() => { if (!!config_ref.value) { mountedAction(); @@ -151,14 +184,32 @@ - 开始体检时间 + 开始时间 {{ timeShow(fenzhen_list.info.start_time) }} - — 预计结束时间 + + + 预计结束 {{ - timeShow(fenzhen_list.info.end_time) - }} + timeShow(fenzhen_list.info.yuji_end_time) + }} + — 预计用时 + {{ + useTimeShow(fenzhen_list.info.yuji_use_time) + }} + 分钟 + + + 结束时间 + {{ + timeShow(fenzhen_list.info.end_time) + }} + — 实际用时 + {{ + useTimeShow(fenzhen_list.info.use_time) + }} + 分钟 @@ -171,28 +222,50 @@ 自助导检 - - - {{ - i.time - }} - - - - - - - - - - {{ k + 1 }}.{{ i.name }} - {{ i.desc }} + + + + {{ + i.time + }} + + + + + - - - {{ i.tip }} - 查看详情>> + + + + {{ k + 1 }}.{{ i.name }} + {{ i.desc }} + + + + {{ i.tip }} + 查看详情>> + + + + + + @@ -207,6 +280,10 @@ + + + +
+ +
+
分诊自助登记
+
+ + + + + + 查询 +
+ @if($id_number != '') +
+ @if(count($queue) != 0) +
+ + {{ $queue[0]['name'] }} + {{ $queue[0]['clinic'] }} + {{ $queue[0]['item'] }} + +
+ 确认并登记 + @else +
未查询到排队信息
+ @endif +
+ @endif +
+ +
+ + + + + diff --git a/Laravel/routes/web-zhao.php b/Laravel/routes/web-zhao.php index 41d9218..d6baef9 100644 --- a/Laravel/routes/web-zhao.php +++ b/Laravel/routes/web-zhao.php @@ -4,6 +4,7 @@ use Illuminate\Support\Facades\Route; Route::any('/api/test', 'App\Http\Controllers\TestController@ApiTest'); +Route::get("/fenzhen", [\App\Http\Controllers\H5\FenzhenController::class, 'check_in']); Route::any("/api/H5/User/hunjian", [\App\Http\Controllers\API\H5\UserController::class, 'hunjian']); Route::any("/api/H5/Question/choose", [\App\Http\Controllers\API\H5\QuestionnaireController::class, 'list']); Route::any("/api/H5/QuestionLog/push", [\App\Http\Controllers\API\H5\QuestionnairesLogsController::class, 'push']);