From 3fb5f0d350357b21357fd35ce903177ac5a54fa1 Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 17 Apr 2024 14:31:32 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E9=83=A8=E7=BD=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 2 +- src/components/menu/FirstLevelMenu.vue | 18 +++++++---- src/components/page/GlobalHeader.vue | 2 +- .../EquipmentManagement.vue | 16 +++++----- .../systemSettings/SystemSettings.vue | 32 +++++++++---------- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 2d5c017..1ae5d69 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -2,7 +2,7 @@ // 阿里妈妈数黑体 @font-face { font-family: 'Alimama ShuHeiTi'; - src: url('~@assets/font/AlimamaShuHeiTi-Bold.ttf') format('truetype'); + src: url('~@assets/font/AlimamaShuHeiTi-Bold.ttf'); } /*列表上方操作按钮区域*/ .ant-card-body .table-operator { diff --git a/src/components/menu/FirstLevelMenu.vue b/src/components/menu/FirstLevelMenu.vue index ad31f3b..fbde53e 100644 --- a/src/components/menu/FirstLevelMenu.vue +++ b/src/components/menu/FirstLevelMenu.vue @@ -52,6 +52,10 @@ export default { if (item.hidden) { return false } + // 移动端菜单不显示 + if (item.path === '/mobile') { + return false + } return true }) } @@ -70,13 +74,13 @@ export default { // 选择菜单 selectMenu (menu) { console.log(menu) - // if (menu.path !== '/systemOverview') { - // this.$warning({ - // title: '系统建设中', - // onOk: () => {} - // }) - // return - // } + if (menu.path !== '/systemOverview') { + this.$warning({ + title: '系统建设中', + onOk: () => {} + }) + return + } this.selectPath = menu.path if (menu.children && menu.children.length > 0) { this.$router.push({ path: menu.children[0].path }) diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index 663b9ac..feb22f7 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -201,7 +201,7 @@ export default { @height: 48px; @font-face { font-family: 'UnidreamLED'; - src: url('~@assets/font/UnidreamLED.ttf') format('truetype'); + src: url('~@assets/font/UnidreamLED.ttf'); } .system-title { user-select: none; diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue index d76032a..9b0ed53 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -317,49 +317,49 @@ export default { dataSource: [ { id: '1', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '用户登录', messageContent: '张三登录系统' }, { id: '2', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备上线', messageContent: '树101-1RTU控制器上线' }, { id: '3', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备下线', messageContent: '树101-1RTU控制器上线' }, { id: '4', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备上线', messageContent: '树101-1RTU控制器上线' }, { id: '5', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备上线', messageContent: '树101-1RTU控制器上线' }, { id: '6', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备上线', messageContent: '树101-1RTU控制器上线' }, { id: '7', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '设备下线', messageContent: '树101-1RTU控制器下线' }, { id: '8', - triggerTime: '2024-3-15 13:55:26', + triggerTime: '2024-4-15 13:55:26', messageType: '用户退出', messageContent: '张三退出系统' } diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index 399958f..60aabf2 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -300,50 +300,50 @@ export default { dataSource: [ { id: '1', - time: '2024-3-15 13:55:26', - msgType: 'Host-》Device', + time: '2024-4-15 13:55:26', + msgType: msgType.hostToDevice.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '2', - time: '2024-3-15 13:55:26', - msgType: 'Device-》Host', + time: '2024-4-15 13:55:26', + msgType: msgType.deviceToHost.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '3', - time: '2024-3-15 13:55:26', - msgType: 'Host-》Device', + time: '2024-4-15 13:55:26', + msgType: msgType.hostToDevice.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '4', - time: '2024-3-15 13:55:26', - msgType: 'Device-》Host', + time: '2024-4-15 13:55:26', + msgType: msgType.deviceToHost.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '5', - time: '2024-3-15 13:55:26', - msgType: 'Host-》Device', + time: '2024-4-15 13:55:26', + msgType: msgType.hostToDevice.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '6', - time: '2024-3-15 13:55:26', - msgType: 'Device-》Host', + time: '2024-4-15 13:55:26', + msgType: msgType.deviceToHost.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '7', - time: '2024-3-15 13:55:26', - msgType: 'Host-》Device', + time: '2024-4-15 13:55:26', + msgType: msgType.hostToDevice.label, msgContent: '01 03 00 00 00 05 89 C5' }, { id: '8', - time: '2024-3-15 13:55:26', - msgType: 'Device-》Host', + time: '2024-4-15 13:55:26', + msgType: msgType.deviceToHost.label, msgContent: '01 03 00 00 00 05 89 C5' } ],