diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 0e4a403..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/components/Header.vue b/src/components/Header.vue index b0089cb..63cafdf 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -158,7 +158,8 @@ export default { .popper-user-box .nickname { position: relative; - color: #ffffff; + color: #000; + font-size: 20px; } .popper-user-box .nickname .logout { diff --git a/src/components/PzSet.vue b/src/components/PzSet.vue index cea399b..a9d5f6d 100644 --- a/src/components/PzSet.vue +++ b/src/components/PzSet.vue @@ -58,30 +58,33 @@ - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index b3a4fd7..eecb95e 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -2,7 +2,7 @@
- logo + logo 数据控制
@@ -63,13 +63,6 @@ export default { iconName: 'Management', children: [], }, - { - id: 2, - name: "规则引擎", - index: "/rules", - iconName: 'Management', - children: [], - }, // { // id: 4, // name: "透传管理", @@ -105,6 +98,13 @@ export default { // }, ], }, + { + id: 2, + name: "规则引擎", + index: "/rules", + iconName: 'Management', + children: [], + } ], }); return { diff --git a/src/css/index.scss b/src/css/index.scss index 960b6b0..6991d80 100644 --- a/src/css/index.scss +++ b/src/css/index.scss @@ -321,4 +321,7 @@ s { } .el-drawer__header { margin-bottom: 0 !important; +} +.el-popper { + background: rgb(209, 235, 188) !important; } \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index 0588086..e96e2aa 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -31,7 +31,7 @@ export const pathMap = { login: '登录', home: '设备信息', level: '网络配置', - model: '模块管理', + model: '模板管理', page: '驱动管理', data: '实时数据', report: '上报管理', diff --git a/src/views/Login.vue b/src/views/Login.vue index ad56cfb..e4e6b29 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -2,7 +2,7 @@