From eb313f86c02e7af7dc37a881ee39627b44303593 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 13 Aug 2024 09:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=87=AA=E5=8A=A8=E7=99=BB?= =?UTF-8?q?=E5=BD=95=20=E5=8F=82=E6=95=B0=20url=E8=BD=AC=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Lib/Tools.php | 2 +- .../app/Services/Xml/ShenQingDanService.php | 17 ++++++------ YiJi-admin/src/views/AutoLogin.vue | 27 +++++++++++++++---- YiJi-admin/src/views/YeWu/DevicesConfig.vue | 4 +-- YiJi-admin/src/views/YeWu/MainList.vue | 8 +++--- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Laravel/app/Lib/Tools.php b/Laravel/app/Lib/Tools.php index b1bf2fc..ea9d1c0 100644 --- a/Laravel/app/Lib/Tools.php +++ b/Laravel/app/Lib/Tools.php @@ -138,7 +138,7 @@ class Tools curl_setopt($ch, CURLOPT_POSTFIELDS, $xml_data); $r = curl_exec($ch); \Illuminate\Support\Facades\Log::info($r); - + try { $xml = simplexml_load_string($r, 'SimpleXMLElement', LIBXML_NOCDATA); $namespaces = $xml->getNamespaces(true); diff --git a/Laravel/app/Services/Xml/ShenQingDanService.php b/Laravel/app/Services/Xml/ShenQingDanService.php index 4315beb..f1da0d2 100644 --- a/Laravel/app/Services/Xml/ShenQingDanService.php +++ b/Laravel/app/Services/Xml/ShenQingDanService.php @@ -117,7 +117,7 @@ class ShenQingDanService //dd($orderList); $u_count = 0;//循环的数量 try { - $msg=''; + $msg='提示:'; DB::beginTransaction(); $data=[]; $zuofei=['D','U','C']; @@ -162,18 +162,17 @@ class ShenQingDanService $msg=$msg.$order['OEORIOrderItemID'].' 无更新;'; } }else{ - DB::rollBack(); - return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$order['OEORIOrderItemID'].'未找到此医嘱'); + //推送过来的检查项目可能不在库里，不在的直接忽略 +// DB::rollBack(); +// return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$order['OEORIOrderItemID'].'未找到此医嘱'); + $msg=$msg.$order['OEORIOrderItemID'].'不存在;'; } } - if (count($orderList) == $u_count) { + DB::commit(); - return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], 0, '成功'); - } else { - DB::rollBack(); - return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$msg); - } + return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], 0, '成功。'.$msg); + } catch (\Exception $e) { DB::rollBack(); // 处理异常 diff --git a/YiJi-admin/src/views/AutoLogin.vue b/YiJi-admin/src/views/AutoLogin.vue index 05e1a08..0d71894 100644 --- a/YiJi-admin/src/views/AutoLogin.vue +++ b/YiJi-admin/src/views/AutoLogin.vue @@ -106,13 +106,30 @@ passwordRef.value.focus() } onMounted(()=>{ - console.log(route.query) - let p=route.query - username.value=p.u - pwd.value=p.p - login() + + // let p=route.query + + username.value=getParameterByName('u') + pwd.value=getParameterByName('p') + + console.log(username.value) + console.log(pwd.value) + + login() + + }) +//获取url参数 + function getParameterByName(name, url) { + if (!url) url = decodeURIComponent(window.location.href) + name = name.replace(/[\[\]]/g, '\\$&') + var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'), + results = regex.exec(url) + if (!results) return null + if (!results[2]) return '' + return decodeURIComponent(results[2].replace(/\+/g, ' ')) + }