Explorar o código

aside + header css

1319612909 %!s(int64=4) %!d(string=hai) anos
pai
achega
ed473822d2

+ 1 - 0
web/.gitingore

@@ -0,0 +1 @@
+node_modules

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 301 - 270
web/package-lock.json


+ 1 - 1
web/package.json

@@ -64,4 +64,4 @@
         "> 1%",
         "last 2 versions"
     ]
-}
+}

+ 1 - 1
web/src/style/basics.scss

@@ -9,11 +9,11 @@ $border-color: #f4f4f4;
 $color-aside:rgba(255, 255, 255,.9);
 $icon-arrow-size-aside:12px;
 $width-submenu-aside:55px;
+$bg-aside:#191a23;
 // header
 $height-header: 60px;
 // nav-scroll
 $height-nav-scroll:40px;
-$bg-nav-scroll:#191a23;
 $active-bg-tabs-item-nav-scroll:#409eff;
 $bg-tabs-item-nav-scroll:#ddd;
 // table

+ 232 - 57
web/src/style/main.scss

@@ -1,3 +1,4 @@
+
 /* Document
    ========================================================================== */
 
@@ -6,7 +7,7 @@
  * 1. Correct the line height in all browsers.
  * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
-
+@import '@/style/basics.scss';
 html {
     line-height: 1.15;
     /* 1 */
@@ -531,17 +532,17 @@ li {
     list-style-type: none;
 }
 
-.el-table__body-wrapper {
-    tr {
-        td {
-            .cell {
-                .el-button+.el-button {
-                    margin-left: 0;
-                }
-            }
-        }
-    }
-}
+// .el-table__body-wrapper {
+//     tr {
+//         td {
+//             .cell {
+//                 .el-button+.el-button {
+//                     margin-left: 0;
+//                 }
+//             }
+//         }
+//     }
+// }
 
 // navbar
 .aside {
@@ -555,7 +556,7 @@ li {
                 color: #fff;
             }
             li {
-                background-color: #001529;
+                background-color: $bg-aside;
                 ul {
                     .el-menu-item {
                         background-color: #000408;
@@ -568,7 +569,7 @@ li {
                 }
             }
             .el-submenu__title:hover {
-                background-color: #001529;
+                background-color: $bg-aside;
             }
             .el-submenu__title:hover i,
             .el-submenu__title:hover span {
@@ -589,10 +590,7 @@ li {
             background-color: #ecf0f5;
             padding: 0;
         }
-        .breadcrumb {
-            background-color: #fff;
-            padding: 0 0 15px 15px;
-        }
+       
     }
 }
 
@@ -739,18 +737,18 @@ li {
         }
     }
     .el-aside {
-        -webkit-transition: width .2s;
-        transition: width .2s;
-        width: 220px;
-        background-color: #304156;
-        height: 100%;
-        position: fixed;
-        font-size: 0;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        z-index: 1001;
-        overflow: hidden;
+            -webkit-transition: width .2s;
+            transition: width .2s;
+            width: 220px;
+            background-color: $bg-aside;
+            height: 100%;
+            position: fixed;
+            font-size: 0;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            z-index: 1001;
+            overflow: hidden;
     }
     .mobile.hideside {
         .el-aside {
@@ -815,23 +813,19 @@ li {
     }
 }
 
-.el-menu .el-menu--inline {
-    background: #2c3b41;
-}
+// .el-menu .el-menu--inline {
+//     background: #2c3b41;
+// }
 
-.el-submenu .el-submenu {
-    background-color: #000408 !important;
-}
+// .el-submenu .el-submenu {
+//     background-color: #000408 !important;
+// }
 
 .aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover {
-    background-color: #000408 !important;
+    background-color: $bg-aside !important;
 }
 
-.el-submenu {
-    .aside .el-scrollbar .el-scrollbar__view .el-submenu__title:hover {
-        background-color: #000408 !important;
-    }
-}
+
 
 .el-menu--vertical {
     .el-menu {
@@ -852,8 +846,8 @@ li {
 // add 5.13
 .el-container {
     .admin-box {
-        padding: 24px 24px 40px 24px;
-        margin: 115px 24px 24px 24px;
+        padding:15px;
+        margin: 115px 15px;
         border-radius: 2px;
         .button-box {
             border: none;
@@ -927,17 +921,17 @@ li {
 }
 
 .el-container.layout-cont {
-    .header-cont,
-    .breadcrumb {
-        height: 40px !important;
-        line-height: 40px !important;
-    }
+    // .header-cont,
+    // .breadcrumb {
+    //     height: 40px !important;
+    //     line-height: 40px !important;
+    // }
     .main-cont.el-main {
         background-color: #f0f2f5;
         .menu-total {
             font-size: 22px;
             color: #838383;
-            margin-top: 7px;
+            margin-top: 16px;
         }
         // background-color: #f0f2f5;
     }
@@ -946,15 +940,24 @@ li {
 .el-container.layout-cont {
     .main-cont {
         .router-history {
-            padding-bottom: 8px;
-            padding-top: 5px;
-            border-color: #f9f9f9;
-            box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+            // box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+            background: #fff;
+            padding: 0 6px;
+            border-top: 1px solid $border-color;
+           padding: 0;
             .el-tabs__header {
                 margin: 0px 0 0 0;
                 .el-tabs__item {
-                    line-height: 35px;
-                    height: 35px;
+                    height: $height-nav-scroll;
+                    height: $height-nav-scroll;
+                    border: none;
+                    border-left: 1px solid $border-color;
+                }
+                .el-tabs__item.is-active{
+                    background-color: rgba(64,158,255,.08);
+                }
+                .el-tabs__nav{
+                    border: none;
                 }
             }
         }
@@ -1031,4 +1034,176 @@ li {
 
 .table-button{
     margin-right:8px !important;
-}
+}
+
+
+$headerHigh: 52px;
+$mainHight: 100vh;
+.dropdown-group {
+  min-width: 100px;
+}
+.topfix {
+  position: fixed;
+  top: 0;
+  box-sizing: border-box;
+  z-index: 999;
+}
+.admin-box {
+  min-height: calc(100vh - 240px);
+  background-color: rgb(255, 255, 255);
+  margin-top: 100px;
+}
+.el-scrollbar__wrap {
+  padding-bottom: 17px;
+}
+.layout-cont {
+  .right-box {
+    text-align: center;
+    vertical-align: middle;
+    img {
+      vertical-align: middle;
+      border: 1px solid #ccc;
+      border-radius: 6px;
+    }
+  }
+
+  .header-cont {
+    height: $height-header;
+    background: #fff;
+  }
+  .main-cont {
+    .breadcrumb {
+      height: $height-header;
+      line-height: $height-header;
+      display: inline-block;
+      background-color: #fff;
+      padding: 0 24px;
+    }
+    .fl-right{
+        height: $height-header;
+        line-height: $height-header;
+    }
+
+    &.el-main {
+      overflow: auto;
+      background: #fff;
+      // padding: 0px 10px;
+      // background: #fff;
+    }
+    height: $mainHight !important;
+    overflow: visible;
+    position: relative;
+    .menu-total {
+      // z-index: 5;
+      // position: absolute;
+      // top: 10px;
+      // right: -35px;
+      margin-left: -10px;
+      float: left;
+      margin-top: 10px;
+      width: 30px;
+      height: 30px;
+      line-height: 30px;
+      font-size: 30px;
+      // border: 0 solid #ffffff;
+      // border-radius: 50%;
+      // background: #fff;
+    }
+    .aside {
+      overflow: auto;
+      // background: #fff;
+      &::-webkit-scrollbar {
+        display: none;
+      }
+    }
+    .el-menu-vertical {
+      height: calc(100vh - 64px) !important;
+      visibility: auto;
+      &:not(.el-menu--collapse) {
+        width: 220px;
+      }
+    }
+    .el-menu--collapse {
+      width: 54px;
+      li {
+        .el-tooltip,
+        .el-submenu__title {
+          padding: 0px 15px !important;
+        }
+      }
+    }
+    &::-webkit-scrollbar {
+      display: none;
+    }
+    &.main-left {
+      width: auto !important;
+    }
+    &.main-right {
+      .admin-title {
+        float: left;
+        font-size: 16px;
+        vertical-align: middle;
+        margin-left: 20px;
+        img {
+          vertical-align: middle;
+        }
+        &.collapse {
+          width: 53px;
+        }
+      }
+    }
+  }
+}
+.tilte {
+  min-height: 64px;
+  line-height: 64px;
+  background: $bg-aside;
+  text-align: center;
+  .logoimg {
+    width: 30px;
+    height: 30px;
+    vertical-align: middle;
+    background: #fff;
+    border-radius: 50%;
+    padding: 3px;
+  }
+  .tit-text {
+    display: inline-block;
+    color: #fff;
+    font-weight: 600;
+    font-size: 20px;
+    vertical-align: middle;
+  }
+}
+
+
+.screenfull {
+  display: inline-block;
+}
+.header-avatar{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.search-component {
+    display: inline-block;
+    .el-input__inner {
+      border: none;
+      border-bottom: 1px solid #606266;
+    }
+    .el-dropdown-link {
+      cursor: pointer;
+    }
+    .search-icon {
+      font-size: $icon-size;
+      margin-right: 14px;
+      display: inline-block;
+      vertical-align: middle;
+      box-sizing: border-box;
+      color: #606266;
+    }
+    .dropdown-group {
+      min-width: 100px;
+    }
+  }

+ 1 - 5
web/src/view/layout/aside/historyComponent/history.vue

@@ -224,10 +224,6 @@ export default {
   background: #f2f2f2;
   cursor: pointer;
 }
-.router-history {
-  background: #fff;
-  padding: 0 6px;
-  border-top: 1px solid #dcdcdc;
-}
+
 
 </style>

+ 143 - 143
web/src/view/layout/index.vue

@@ -241,151 +241,151 @@ export default {
 </script>
 
 <style lang="scss">
-$headerHigh: 52px;
-$mainHight: 100vh;
-.dropdown-group {
-  min-width: 100px;
-}
-.topfix {
-  position: fixed;
-  top: 0;
-  box-sizing: border-box;
-  z-index: 999;
-}
-.admin-box {
-  min-height: calc(100vh - 240px);
-  background-color: rgb(255, 255, 255);
-  margin-top: 100px;
-}
-.el-scrollbar__wrap {
-  padding-bottom: 17px;
-}
-.layout-cont {
-  .right-box {
-    text-align: center;
-    vertical-align: middle;
-    img {
-      vertical-align: middle;
-      border: 1px solid #ccc;
-      border-radius: 6px;
-    }
-  }
+// $headerHigh: 52px;
+// $mainHight: 100vh;
+// .dropdown-group {
+//   min-width: 100px;
+// }
+// .topfix {
+//   position: fixed;
+//   top: 0;
+//   box-sizing: border-box;
+//   z-index: 999;
+// }
+// .admin-box {
+//   min-height: calc(100vh - 240px);
+//   background-color: rgb(255, 255, 255);
+//   margin-top: 100px;
+// }
+// .el-scrollbar__wrap {
+//   padding-bottom: 17px;
+// }
+// .layout-cont {
+//   .right-box {
+//     text-align: center;
+//     vertical-align: middle;
+//     img {
+//       vertical-align: middle;
+//       border: 1px solid #ccc;
+//       border-radius: 6px;
+//     }
+//   }
 
-  .header-cont {
-    height: $headerHigh !important;
-    background: #fff;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-    line-height: $headerHigh;
-  }
-  .main-cont {
-    .breadcrumb {
-      line-height: 48px;
-      display: inline-block;
-      padding: 0 24px;
-      // padding: 6px;
-      // border-bottom: 1px solid #eee;
-    }
+//   .header-cont {
+//     height: $headerHigh !important;
+//     background: #fff;
+//     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+//     line-height: $headerHigh;
+//   }
+//   .main-cont {
+//     .breadcrumb {
+//       line-height: 48px;
+//       display: inline-block;
+//       padding: 0 24px;
+//       // padding: 6px;
+//       // border-bottom: 1px solid #eee;
+//     }
 
-    &.el-main {
-      overflow: auto;
-      background: #fff;
-      // padding: 0px 10px;
-      // background: #fff;
-    }
-    height: $mainHight !important;
-    overflow: visible;
-    position: relative;
-    .menu-total {
-      // z-index: 5;
-      // position: absolute;
-      // top: 10px;
-      // right: -35px;
-      margin-left: -10px;
-      float: left;
-      margin-top: 10px;
-      width: 30px;
-      height: 30px;
-      line-height: 30px;
-      font-size: 30px;
-      // border: 0 solid #ffffff;
-      // border-radius: 50%;
-      // background: #fff;
-    }
-    .aside {
-      overflow: auto;
-      // background: #fff;
-      &::-webkit-scrollbar {
-        display: none;
-      }
-    }
-    .el-menu-vertical {
-      height: calc(100vh - 64px) !important;
-      visibility: auto;
-      &:not(.el-menu--collapse) {
-        width: 220px;
-      }
-    }
-    .el-menu--collapse {
-      width: 54px;
-      li {
-        .el-tooltip,
-        .el-submenu__title {
-          padding: 0px 15px !important;
-        }
-      }
-    }
-    &::-webkit-scrollbar {
-      display: none;
-    }
-    &.main-left {
-      width: auto !important;
-    }
-    &.main-right {
-      .admin-title {
-        float: left;
-        font-size: 16px;
-        vertical-align: middle;
-        margin-left: 20px;
-        img {
-          vertical-align: middle;
-        }
-        &.collapse {
-          width: 53px;
-        }
-      }
-    }
-  }
-}
-.tilte {
-  background: #001529;
-  min-height: 64px;
-  line-height: 64px;
-  background: #002140;
-  text-align: center;
-  .logoimg {
-    width: 30px;
-    height: 30px;
-    vertical-align: middle;
-    background: #fff;
-    border-radius: 50%;
-    padding: 3px;
-  }
-  .tit-text {
-    display: inline-block;
-    color: #fff;
-    font-weight: 600;
-    font-size: 20px;
-    vertical-align: middle;
-  }
-}
+//     &.el-main {
+//       overflow: auto;
+//       background: #fff;
+//       // padding: 0px 10px;
+//       // background: #fff;
+//     }
+//     height: $mainHight !important;
+//     overflow: visible;
+//     position: relative;
+//     .menu-total {
+//       // z-index: 5;
+//       // position: absolute;
+//       // top: 10px;
+//       // right: -35px;
+//       margin-left: -10px;
+//       float: left;
+//       margin-top: 10px;
+//       width: 30px;
+//       height: 30px;
+//       line-height: 30px;
+//       font-size: 30px;
+//       // border: 0 solid #ffffff;
+//       // border-radius: 50%;
+//       // background: #fff;
+//     }
+//     .aside {
+//       overflow: auto;
+//       // background: #fff;
+//       &::-webkit-scrollbar {
+//         display: none;
+//       }
+//     }
+//     .el-menu-vertical {
+//       height: calc(100vh - 64px) !important;
+//       visibility: auto;
+//       &:not(.el-menu--collapse) {
+//         width: 220px;
+//       }
+//     }
+//     .el-menu--collapse {
+//       width: 54px;
+//       li {
+//         .el-tooltip,
+//         .el-submenu__title {
+//           padding: 0px 15px !important;
+//         }
+//       }
+//     }
+//     &::-webkit-scrollbar {
+//       display: none;
+//     }
+//     &.main-left {
+//       width: auto !important;
+//     }
+//     &.main-right {
+//       .admin-title {
+//         float: left;
+//         font-size: 16px;
+//         vertical-align: middle;
+//         margin-left: 20px;
+//         img {
+//           vertical-align: middle;
+//         }
+//         &.collapse {
+//           width: 53px;
+//         }
+//       }
+//     }
+//   }
+// }
+// .tilte {
+//   background: #001529;
+//   min-height: 64px;
+//   line-height: 64px;
+//   background: #002140;
+//   text-align: center;
+//   .logoimg {
+//     width: 30px;
+//     height: 30px;
+//     vertical-align: middle;
+//     background: #fff;
+//     border-radius: 50%;
+//     padding: 3px;
+//   }
+//   .tit-text {
+//     display: inline-block;
+//     color: #fff;
+//     font-weight: 600;
+//     font-size: 20px;
+//     vertical-align: middle;
+//   }
+// }
 
 
-.screenfull {
-  display: inline-block;
-}
-.header-avatar{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
+// .screenfull {
+//   display: inline-block;
+// }
+// .header-avatar{
+// 	display: flex;
+// 	justify-content: center;
+// 	align-items: center;
+// }
 </style>

+ 2 - 2
web/src/view/layout/screenfull/index.vue

@@ -103,8 +103,8 @@ export default {
 </script>
 <style scoped>
 .screenfull-svg {
-  width: 20px;
-  height: 20px;
+  width: 17px;
+  height: 17px;
   cursor: pointer;
   fill: #606266;
   vertical-align: middle;

+ 1 - 21
web/src/view/layout/search/search.vue

@@ -49,25 +49,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.search-component {
-  display: inline-block;
-  .el-input__inner {
-    border: none;
-    border-bottom: 1px solid #606266;
-  }
-  .el-dropdown-link {
-    cursor: pointer;
-  }
-  .search-icon {
-    font-size: 20px;
-    margin-right: 14px;
-    display: inline-block;
-    vertical-align: middle;
-    box-sizing: border-box;
-    color: #606266;
-  }
-  .dropdown-group {
-    min-width: 100px;
-  }
-}
+
 </style>

+ 1 - 1
web/vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
             // 把key的路径代理到target位置
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: { //需要代理的路径   例如 '/api'
-                target: `http://127.0.0.1:8888`, //代理到 目标路径
+                target: `http://139.9.113.229:8888/`, //代理到 目标路径
                 changeOrigin: true,
                 pathRewrite: { // 修改路径数据
                     ['^' + process.env.VUE_APP_BASE_API]: '' // 举例 '^/api:""' 把路径中的/api字符串删除

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio