From e84c471c68f796d8af5bf0fdc858e546d8f7f1d4 Mon Sep 17 00:00:00 2001 From: ChenX Date: Fri, 20 Mar 2020 14:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91:=E9=94=99=E8=AF=AF=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=8F=90=E4=BE=9B=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/ErrorMonitoring.ts | 4 +++- src/Common/StoreageKeys.ts | 1 + src/UI/Components/MainContent/Login.tsx | 1 + src/UI/Components/Panel.tsx | 8 ++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Common/ErrorMonitoring.ts b/src/Common/ErrorMonitoring.ts index 49f1ccdf2..e7dcff4e4 100644 --- a/src/Common/ErrorMonitoring.ts +++ b/src/Common/ErrorMonitoring.ts @@ -33,13 +33,15 @@ export async function ReportError(stack: any, msg: string = "未捕获的错误! } let userName = localStorage.getItem(StoreageKeys.UserName); + let userPhone = localStorage.getItem(StoreageKeys.UserPhone); await PostData("https://cf.qcad.cc:25100/monitoring", { stack, href: window.location.href, path: window.location.pathname, user: userName, - msg: msg + "\n" + browserMsg + msg: msg + "\n" + browserMsg, + phone: userPhone }); console.log("上报成功"); } diff --git a/src/Common/StoreageKeys.ts b/src/Common/StoreageKeys.ts index 39625f382..67953b257 100644 --- a/src/Common/StoreageKeys.ts +++ b/src/Common/StoreageKeys.ts @@ -4,6 +4,7 @@ export enum StoreageKeys PlatSession = "platSession", PlatToken = "platToken", UserName = "userName", + UserPhone = "userPhone", RenderType = "renderType", ExactDrill = "openExactDrill", ConfigName = "configName_", diff --git a/src/UI/Components/MainContent/Login.tsx b/src/UI/Components/MainContent/Login.tsx index 9c7fc9538..8cc42060a 100644 --- a/src/UI/Components/MainContent/Login.tsx +++ b/src/UI/Components/MainContent/Login.tsx @@ -27,6 +27,7 @@ export function saveLoginInfos(data: IResponseData) localStorage.setItem(StoreageKeys.UserName, data.user_info.login_name); localStorage.setItem(StoreageKeys.IsNewErp, data.user_info.new_erp); localStorage.setItem(StoreageKeys.Uid, data.user_info.user_id); + localStorage.setItem(StoreageKeys.UserPhone, data.user_info.user_phone); userConfig.isAdmin = data.ext_info.if_admin === 1; } diff --git a/src/UI/Components/Panel.tsx b/src/UI/Components/Panel.tsx index 8269f5dd9..5ee225a0e 100644 --- a/src/UI/Components/Panel.tsx +++ b/src/UI/Components/Panel.tsx @@ -101,10 +101,10 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}> onClick={() => { AppToaster.show({ message: "建议通过F11呼出全屏,避免Esc按钮被占用!", timeout: 2000 }); - if (document.fullscreenElement) - document.exitFullscreen(); - else - document.body.requestFullscreen(); + // if (document.fullscreenElement) + // document.exitFullscreen(); + // else + // document.body.requestFullscreen(); }} />