Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
               ),
           },
           {

src/views/admin/cockpitManage/HD.vue

@@ -220,4 +220,16 @@ bottom-data {
   top: 30px;
   left: 10px;
 }
+
+
+
+@media screen and (max-width: 1650px) {
+.zuobian {
+  width: 150px;
+  position: absolute;
+  top: 10px;
+  left: 10px;
+}
+}
+
 </style>

src/views/home/Index.vue

@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       loading: false,
-      isShowHd: false, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
+      isShowHd: true, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
     };
   },
   methods: {
@@ -129,4 +129,10 @@ export default {
   // width: 170px;
   width: 52px;
 }
+
+@media screen and (max-width: 1650px) {
+  ::v-deep .el-header {
+    height: 60px !important;
+  }
+}
 </style>

src/views/home/components/MenuHD.vue

@@ -392,41 +392,41 @@ export default {
 @media screen and (max-width: 1650px) {
   ::v-deep .menuParentItem {
     width: 140px !important;
-    height: 100px !important;
+    height: 60px !important;
   }
 
   ::v-deep .headerText {
-    font-size: 22px;
+    font-size: 20px;
     height: 50px;
   }
 }
 
 
 // 非华电公司放开这个注释下面的
-.el-submenu__title * {
-  font-size: 16px;
-}
-.el-menu-item * {
-  font-size: 16px;
-}
-</style>
-
- <!-- /* 华电时的菜单打开这个 */ -->
- <style lang="scss">
-// .el-menu--popup {
-//   width: 100% !important;
-//   min-width: 120px !important;
-//   .el-menu-item {
-//     width: 100% !important;
-//     min-width: unset !important;
-//     text-align: center;
-//     padding: 0 5px !important;
-//   }
-// }
 // .el-submenu__title * {
-//   font-size: 20px;
+//   font-size: 16px;
 // }
 // .el-menu-item * {
-//   font-size: 20px;
+//   font-size: 16px;
 // }
+</style>
+
+ <!-- /* 华电时的菜单打开这个 */ -->
+ <style lang="scss">
+.el-menu--popup {
+  width: 100% !important;
+  min-width: 120px !important;
+  .el-menu-item {
+    width: 100% !important;
+    min-width: unset !important;
+    text-align: center;
+    padding: 0 5px !important;
+  }
+}
+.el-submenu__title * {
+  font-size: 20px;
+}
+.el-menu-item * {
+  font-size: 20px;
+}
 </style>