From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/layout/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 4e5d820..2140e57 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -1,5 +1,5 @@
<template>
- <el-container style="flex: 1;">
+ <el-container style="flex: 1;height:100%;">
<div style="width: 200px;background-color: #222f3e" :style="{width: isCollapse?'70px':'250px'}">
<el-aside :width="isCollapse?'70px':'250px'">
<el-col :gutter="20">
@@ -204,15 +204,18 @@
'鐢ㄦ埛绠＄悊': 'UserManagement',
'鐢ㄦ埛鍒楄〃': 'UserList',
'璁惧绠＄悊': 'DeviceManagement',
- '鎶ヨ淇℃伅': 'AlarmInformation',
- '鍙傛暟涓嬪彂': 'ParameterSetting',
- '寮�鍏虫帶鍒�': 'SwitchControl',
- 'I/O鐘舵��': 'I/O Status',
+ '鎶ヨ淇℃伅': 'Alarm',
+ '鍙傛暟涓嬪彂': 'Parameter',
+ '寮�鍏虫帶鍒�': 'Action',
+ 'IO鐘舵��': 'Sign',
'鏉冮檺绠＄悊': 'PermissionManagement',
'鏉冮檺鍒楄〃': 'PermissionList',
'瑙掕壊绠＄悊': 'RoleManagement',
'瑙掕壊鍒楄〃': 'RoleList',
- '鐢垫皵绠＄悊': 'Electrical management'
+ '鐢垫皵绠＄悊': 'Electrical management',
+ '璁惧鐘舵��':'State',
+
+ '涓婚〉': 'Home'
// 鏍规嵁瀹為檯闇�姹傜户缁坊鍔犲鐓у叧绯�
};
--
Gitblit v1.8.0