From d19b0bd99d98ed012d0fa88281fa79439d477917 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 11 Apr 2024 18:30:37 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon/account.png | Bin 0 -> 653 bytes src/assets/images/icon/password.png | Bin 0 -> 399 bytes src/assets/images/login-btn.png | Bin 0 -> 5412 bytes src/components/layouts/UserLayout.vue | 23 --- src/utils/util.js | 25 +++ .../EquipmentManagement.vue | 7 +- src/views/user/Login.vue | 143 +++++++++++++++--- 7 files changed, 148 insertions(+), 50 deletions(-) create mode 100644 src/assets/images/icon/account.png create mode 100644 src/assets/images/icon/password.png create mode 100644 src/assets/images/login-btn.png diff --git a/src/assets/images/icon/account.png b/src/assets/images/icon/account.png new file mode 100644 index 0000000000000000000000000000000000000000..05bb620d46c9b98642a17094d805fdfe2fa5715f GIT binary patch literal 653 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 O0000 literal 0 HcmV?d00001 diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index 5a8f652..7c6e998 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -2,30 +2,7 @@
- - - - - - -
-
- - -
-
- -
- 合众未来 - HEZHONGWEILAI -
-
- - -
diff --git a/src/utils/util.js b/src/utils/util.js index da2cbbb..aaba2d5 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -602,3 +602,28 @@ export function evil (fn) { const Fn = Function // 一个变量指向Function，防止有些前端编译工具报错 return new Fn('return ' + fn)() } + +// 判断当前设备 +export function isMobile () { + const userAgentInfo = navigator.userAgent + + const mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'] + + let mobileFlag = false + + // 根据userAgent判断是否是手机 + for (let v = 0; v < mobileAgents.length; v++) { + if (userAgentInfo.indexOf(mobileAgents[v]) > 0) { + mobileFlag = true + break + } + } + const screenWidth = window.screen.width + const screenHeight = window.screen.height + + // 根据屏幕分辨率判断是否是手机 + if (screenWidth < 500 && screenHeight < 800) { + mobileFlag = true + } + return mobileFlag +} diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue index 723de6a..bc4bc9e 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -269,7 +269,7 @@ export default { dataIndex: 'action', scopedSlots: { customRender: 'action' }, align: 'center', - width: '20%' + width: 120 } ], dataSource: [], @@ -645,9 +645,4 @@ export default { } } } -@media screen and (max-width: 1367px) { - .device-table/deep/.ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header { - margin-right: -2px; - } -} diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index e13643b..2207f73 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -1,5 +1,5 @@