sumyangyang 1 рік тому
батько
коміт
332e1a2f7b
33 змінених файлів з 369 додано та 113 видалено
  1. 10 3
      sooka-ui/src/assets/icons/svg/fullscreen.svg
  2. 10 3
      sooka-ui/src/assets/icons/svg/search.svg
  3. 10 3
      sooka-ui/src/assets/icons/svg/size.svg
  4. BIN
      sooka-ui/src/assets/logo/logo.png
  5. 3 1
      sooka-ui/src/assets/styles/element-ui.scss
  6. 1 1
      sooka-ui/src/assets/styles/element-variables.scss
  7. 25 2
      sooka-ui/src/assets/styles/index.scss
  8. 102 11
      sooka-ui/src/assets/styles/sidebar.scss
  9. 59 10
      sooka-ui/src/assets/styles/sooka.scss
  10. 5 5
      sooka-ui/src/assets/styles/variables.scss
  11. 10 6
      sooka-ui/src/components/Hamburger/index.vue
  12. 23 11
      sooka-ui/src/components/HeaderSearch/index.vue
  13. 3 3
      sooka-ui/src/components/TopNav/index.vue
  14. 53 16
      sooka-ui/src/layout/components/Navbar.vue
  15. 6 5
      sooka-ui/src/layout/components/Sidebar/Logo.vue
  16. 20 12
      sooka-ui/src/layout/components/TagsView/index.vue
  17. 1 1
      sooka-ui/src/layout/index.vue
  18. 1 1
      sooka-ui/src/views/login.vue
  19. 3 2
      sooka-ui/src/views/monitor/job/index.vue
  20. 1 1
      sooka-ui/src/views/monitor/job/log.vue
  21. 1 1
      sooka-ui/src/views/register.vue
  22. 1 1
      sooka-ui/src/views/system/config/index.vue
  23. 1 1
      sooka-ui/src/views/system/dept/index.vue
  24. 1 1
      sooka-ui/src/views/system/dict/data.vue
  25. 1 1
      sooka-ui/src/views/system/dict/index.vue
  26. 1 1
      sooka-ui/src/views/system/logininfor/index.vue
  27. 1 1
      sooka-ui/src/views/system/menu/index.vue
  28. 1 1
      sooka-ui/src/views/system/notice/index.vue
  29. 1 1
      sooka-ui/src/views/system/operlog/index.vue
  30. 1 1
      sooka-ui/src/views/system/post/index.vue
  31. 1 1
      sooka-ui/src/views/system/role/index.vue
  32. 11 4
      sooka-ui/src/views/tool/build/index.vue
  33. 1 1
      sooka-ui/src/views/tool/gen/index.vue

Різницю між файлами не показано, бо вона завелика
+ 10 - 3
sooka-ui/src/assets/icons/svg/fullscreen.svg


Різницю між файлами не показано, бо вона завелика
+ 10 - 3
sooka-ui/src/assets/icons/svg/search.svg


+ 10 - 3
sooka-ui/src/assets/icons/svg/size.svg

@@ -1,4 +1,11 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg">
-  <path
-    d="M0 54.857h54.796v18.286H36.531V128H18.265V73.143H0V54.857zm127.857-36.571H91.935V128H72.456V18.286H36.534V0h91.326l-.003 18.286z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="533" height="533" viewBox="0 0 533 533">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #777d8a;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path id="形状_7" data-name="形状 7" class="cls-1" d="M0,310.908H76.3V532.987h38.153V310.908h76.311V266.493H0v44.415ZM75.541,0V88.831H267.074V532.987h76.307V88.831H533.01V0H75.541Z"/>
 </svg>

BIN
sooka-ui/src/assets/logo/logo.png


+ 3 - 1
sooka-ui/src/assets/styles/element-ui.scss

@@ -32,7 +32,9 @@
   .el-button--mini {
     padding: 7px 10px;
     width: 60px;
-  }
+  }
+	box-shadow: 12px 0 11px -7px #f7f7f7, -10px 0 12px 0px #f7f7f7;
+	
 }
 
 .status-col {

+ 1 - 1
sooka-ui/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #1890ff;
+$--color-primary: #6a93ff;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

+ 25 - 2
sooka-ui/src/assets/styles/index.scss

@@ -121,9 +121,32 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 0px;
+	background-color: #fff;
+	.el-form{
+		padding: 20px 20px;
+		position: relative;
+		margin-bottom: 10px;
+		background-color: #fafafa;
+		.el-form-item--small{
+			margin-bottom: 0px;
+		}
+		&::before{
+			 content: " ";
+			    display: block;
+				background: url("../images/sooka-up.png") no-repeat center;
+				height: 10px;
+				width: 85px;
+				position: absolute;
+				bottom:-9px;
+				left: 44%;
+				z-index: 9;
+		}
+	}
+}
+.el-row{
+	background: #fff;
 }
-
 .components-container {
   margin: 30px 50px;
   position: relative;

+ 102 - 11
sooka-ui/src/assets/styles/sidebar.scss

@@ -23,9 +23,9 @@
     bottom: 0;
     left: 0;
     z-index: 1001;
-    overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
-    box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
+     overflow: hidden;
+    // -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
+    // box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
 
     // reset element-ui css
     .horizontal-collapse-transition {
@@ -55,9 +55,29 @@
     }
 
     a {
-      display: inline-block;
+      display: flex;
       width: 100%;
-      overflow: hidden;
+      overflow: hidden;
+	 flex-direction: row;
+	  justify-content: center; 
+	  align-items: center;
+	  h1{
+		  display: flex;
+		  flex-direction: column;
+		  text-align: left;
+		  p{
+			  padding: 0px;
+			  margin: 0px;
+			  line-height: 20px;
+			  font-size:18px ;
+			  font-weight: normal;
+		  }
+		  span{
+			  font-size:11px ;
+			  color: #8e98d9;
+			  line-height: 18px;
+		  }
+	  }
     }
 
     .svg-icon {
@@ -67,13 +87,28 @@
     .el-menu {
       border: none;
       height: 100%;
-      width: 100% !important;
+      width: 100% !important;
+	  a{
+		  justify-content: left;
+		  display: block;
+		  
+	  }
     }
 
     .el-menu-item, .el-submenu__title {
       overflow: hidden !important;
       text-overflow: ellipsis !important;
-      white-space: nowrap !important;
+      white-space: nowrap !important;
+	  margin-right: 20px;
+	  height: 42px;
+	  line-height: 42px;
+	  i{
+	  		  background: url("../images/sooka-on.png") no-repeat center;
+	  		  color: rgb(144 147 153 / 3%)!important;
+	  		  font-size: 18px;
+			  right: 13px;
+			      margin-top: -8px;
+	  }
     }
 
     // menu hover
@@ -82,10 +117,66 @@
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
       }
-    }
-
+    }
+	& .theme-dark .is-active{
+		position: relative;
+		
+		
+		    
+	}
+	.is-active.submenu-title-noDropdown{
+		background-color: #3565e3 !important;
+		border-bottom-right-radius: 25px;
+		border-top-right-radius: 25px;
+		color: #fff !important;
+	}
+	.router-link-active{
+		position: relative;
+		&::after{
+			border-bottom: 7px solid transparent;
+			    border-right: 7px solid #fff;
+			    border-top: 7px solid transparent;
+			    content: " ";
+			    display: block;
+			    height: 0;
+			    margin-left: -19px;
+			    width: 0;
+			    position: absolute;
+			    /* pointer-events: all; */
+			    top: 14px;
+			    right: 0px;
+		}
+		.is-active::after{
+			border-bottom:0!important;
+			    border-right: 0!important;
+			    border-top: 0!important;	
+		}
+	}
+& .theme-dark .is-active::after{
+	border-bottom: 7px solid transparent;
+	    border-right: 7px solid #fff;
+	    border-top: 7px solid transparent;
+	    content: " ";
+	    display: block;
+	    height: 0;
+	    margin-left: -19px;
+	    width: 0;
+	    position: absolute;
+	    /* pointer-events: all; */
+	    top: 14px;
+	    right: 0px;
+			
+}
     & .theme-dark .is-active > .el-submenu__title {
-      color: $base-menu-color-active !important;
+      color: $base-menu-color-active !important;
+	  background-color: #3565e3!important;
+	  border-bottom-right-radius: 25px;
+	  border-top-right-radius: 25px;
+	  i{
+		  background: url("../images/sooka-on.png") no-repeat center;
+		  color: rgb(144 147 153 / 3%)!important;
+		  font-size: 18px;
+	  }
     }
 
     & .nest-menu .el-submenu > .el-submenu__title,
@@ -99,7 +190,7 @@
 
     & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
     & .theme-dark .el-submenu .el-menu-item {
-      background-color: $base-sub-menu-background !important;
+      background-color: #082db1 !important;
 
       &:hover {
         background-color: $base-sub-menu-hover !important;

+ 59 - 10
sooka-ui/src/assets/styles/sooka.scss

@@ -31,7 +31,9 @@
 .mb8 {
   margin-bottom: 8px;
 }
-
+.p10{
+	padding: 10px 20px;
+}
 .ml5 {
   margin-left: 5px;
 }
@@ -90,11 +92,14 @@
   padding: 10px 20px 0;
 }
 
-.el-table {
+.el-table {
+	width: 98%;
+	margin: 0px auto;
+	    border: 1px solid #dfe6ec;
   .el-table__header-wrapper, .el-table__fixed-header-wrapper {
     th {
       word-break: break-word;
-      background-color: #f8f8f9;
+      background-color: #f5f7fa;
       color: #515a6e;
       height: 40px;
       font-size: 13px;
@@ -105,7 +110,13 @@
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
     }
-  }
+  }
+  th.el-table__cell.is-leaf,td.el-table__cell {
+      border-bottom: 1px solid #dfe6ec!important;
+      border-right: 1px solid #dfe6ec!important;
+      text-align: center!important;
+  }
+  
 }
 
 /** 表单布局 **/
@@ -132,11 +143,34 @@
   border: 1px solid #e5e6e7;
   background: #FFFFFF none;
   border-radius: 4px;
-}
-
+}
+.el-form-item__content{
+	.el-button--primary{
+		background-color: #6a93ff;
+		    border-color: #6a93ff;
+	}
+}
+.el-input__inner {
+      border-radius: 25px;
+  }
 .pagination-container .el-pagination {
-  right: 0;
-  position: absolute;
+  right: 20px;
+  position: absolute;
+  .el-select .el-input .el-input__inner {
+      border-radius: 25px;
+  }
+  .el-input__inner {
+      border-radius: 25px;
+  }
+  .btn-prev:disabled{
+	   border-radius: 25px;
+  }
+  .btn-next:disabled{
+  	   border-radius: 25px;
+  }
+  .el-pager li{
+	  border-radius: 25px;
+  }
 }
 
 @media (max-width: 768px) {
@@ -161,7 +195,8 @@
 }
 
 .el-table .el-dropdown, .el-icon-arrow-down {
-  font-size: 12px;
+  font-size: 12px;
+	color: #fff;
 }
 
 .el-tree-node__content > .el-checkbox {
@@ -206,8 +241,15 @@
   padding-right: 15px;
   padding-left: 15px;
   margin-bottom: 10px;
+}
+.el-button{
+	border-radius: 25px;
+}
+.el-button--primary {
+    color: #FFFFFF;
+    // background-color: #6a93ff!important;
+    // border-color: #6a93ff!important;
 }
-
 /* button color */
 .el-button--cyan.is-active,
 .el-button--cyan:active {
@@ -291,3 +333,10 @@
   position: relative;
   float: right;
 }
+
+
+
+
+.fixedHeader{
+	position: fixed;
 top: 0px;
 left: 240px;
 z-index: 99;
 width: 88%;

+}

+ 5 - 5
sooka-ui/src/assets/styles/variables.scss

@@ -10,16 +10,16 @@ $panGreen: #30B08F;
 
 // 默认菜单主题风格
 $base-menu-color: #bfcbd9;
-$base-menu-color-active: #f4f4f5;
-$base-menu-background: #304156;
+$base-menu-color-active: #fff;
+$base-menu-background: #2744c1;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color: rgba(0, 0, 0, .70);
 $base-menu-light-background: #ffffff;
-$base-logo-light-title-color: #001529;
+$base-logo-light-title-color: #fff;
 
 $base-sub-menu-background: #1f2d3d;
-$base-sub-menu-hover: #001528;
+$base-sub-menu-hover: #2744c1;
 
 // 自定义暗色菜单风格
 /**
@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 240px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

+ 10 - 6
sooka-ui/src/components/Hamburger/index.vue

@@ -1,14 +1,14 @@
 <template>
-  <div style="padding: 0 15px;" @click="toggleClick">
+  <div @click="toggleClick">
     <svg
       :class="{'is-active':isActive}"
       class="hamburger"
-      height="64"
+      height="30"
       viewBox="0 0 1024 1024"
-      width="64"
+      width="30"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <path
+      <path fill="#fff"
         d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"/>
     </svg>
   </div>
@@ -35,8 +35,12 @@ export default {
 .hamburger {
   display: inline-block;
   vertical-align: middle;
-  width: 20px;
-  height: 20px;
+  width: 18px;
+  height: 18px;
+  margin-left: 2px;
+	path{
+		fill:#fff;
+	}
 }
 
 .hamburger.is-active {

+ 23 - 11
sooka-ui/src/components/HeaderSearch/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div :class="{'show':show}" class="header-search">
-    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click"/>
+  <div  class="header-search">
+   
     <el-select
       ref="headerSearchSelect"
       v-model="search"
@@ -14,7 +14,8 @@
     >
       <el-option v-for="option in options" :key="option.item.path" :label="option.item.title.join(' > ')"
                  :value="option.item"/>
-    </el-select>
+    </el-select>
+	 <svg-icon class-name="search-icon" icon-class="search" @click.stop="click"/>
   </div>
 </template>
 
@@ -166,31 +167,42 @@ export default {
 
   .search-icon {
     cursor: pointer;
-    font-size: 18px;
+    font-size: 15px;
     vertical-align: middle;
   }
 
   .header-search-select {
     font-size: 18px;
     transition: width 0.2s;
-    width: 0;
+    width: 179px;
     overflow: hidden;
     background: transparent;
     border-radius: 0;
     display: inline-block;
-    vertical-align: middle;
+    vertical-align: middle;
+	
 
     ::v-deep .el-input__inner {
-      border-radius: 0;
+      border-radius: 25px;
       border: 0;
       padding-left: 0;
       padding-right: 0;
       box-shadow: none !important;
-      border-bottom: 1px solid #d9d9d9;
-      vertical-align: middle;
-    }
+      // border-bottom: 1px solid #d9d9d9;
+      vertical-align: middle;
+	  background: none;
+	  height: 30px!important;
+	  line-height: 30px!important;
+    }
+	.el-input__inner {
+	  border-radius: 25px;
+	}
   }
-
+.el-button--primary:hover, .el-button--primary:focus {
+    background: #6a93ff;
+    border-color: #6a93ff;
+    color: #FFFFFF;
+}
   &.show {
     .header-search-select {
       width: 210px;

+ 3 - 3
sooka-ui/src/components/TopNav/index.vue

@@ -186,9 +186,9 @@ export default {
 /* submenu item */
 .topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
   float: left;
-  height: 50px !important;
-  line-height: 50px !important;
-  color: #999093 !important;
+  height: 40px !important;
+  line-height: 40px !important;
+  color: #fff !important;
   padding: 0 5px !important;
   margin: 0 10px !important;
 }

+ 53 - 16
sooka-ui/src/layout/components/Navbar.vue

@@ -10,13 +10,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item"/>
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="sooka-git" class="right-menu-item hover-effect"/>
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="sooka-doc" class="right-menu-item hover-effect"/>
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect"/>
 
@@ -29,7 +29,7 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom"/>
+         <!-- <i class="el-icon-caret-bottom"/> -->
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
@@ -118,18 +118,29 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+  // box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
-    line-height: 46px;
+    line-height: 30px;
     height: 100%;
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color: transparent;
-
+    -webkit-tap-highlight-color: transparent;
+		background-color: #6a93ff;
+		padding:0px 0px;
+		width: 28px;
+		height: 30px;
+		margin-top: 10px;
+		border-bottom-right-radius: 5px;
+		border-top-right-radius: 5px;
+		svg{
+			
+		}
+		
+		
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: #6a93ff;
     }
   }
 
@@ -160,10 +171,10 @@ export default {
       display: inline-block;
       padding: 0 8px;
       height: 100%;
-      font-size: 18px;
+      font-size: 16px;
       color: #5a5e66;
-      vertical-align: text-bottom;
-
+      vertical-align: middle;
+		
       &.hover-effect {
         cursor: pointer;
         transition: background .3s;
@@ -173,19 +184,45 @@ export default {
         }
       }
     }
-
+#header-search{
+	border:1px solid #d9dee9;
+	height:32px;
+	line-height: 32px;
+	border-radius: 25px;
+	margin-right: 10px;
+}
+#screenfull{
+	border:1px solid #d9dee9;
+	border-radius: 50px;
+	height: 34px;
+	width: 34px;
+	line-height: 34px;
+	padding:0px 0px;
+	text-align: center;
+	margin-right: 10px;
+}
+#size-select{
+	border:1px solid #d9dee9;
+	border-radius: 50px;
+	height: 34px;
+	width: 34px;
+	line-height: 34px;
+	padding:0px 0px;
+	text-align: center;
+	margin-right: 10px;
+}
     .avatar-container {
       margin-right: 30px;
 
       .avatar-wrapper {
-        margin-top: 5px;
+        margin-top: 8px;
         position: relative;
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          width: 34px;
+          height: 34px;
+		  border-radius: 50px;
         }
 
         .el-icon-caret-bottom {

+ 6 - 5
sooka-ui/src/layout/components/Sidebar/Logo.vue

@@ -6,13 +6,13 @@
         <img v-if="logo" :src="logo" class="sidebar-logo"/>
         <h1 v-else :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }"
             class="sidebar-title">
-          {{ title }} </h1>
+          <p>{{ title }}</p><span>Shoujia Management System</span></h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo"/>
         <h1 :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }"
             class="sidebar-title">
-          {{ title }} </h1>
+          <p>{{ title }}</p><span>Shoujia Management System</span></h1>
       </router-link>
     </transition>
   </div>
@@ -60,11 +60,12 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
-  line-height: 50px;
+  height: 84px;
+  // line-height: 50px;
   background: #2b2f3a;
   text-align: center;
-  overflow: hidden;
+  overflow: hidden;
+  border-bottom: 2px solid #3957da;
 
   & .sidebar-logo-link {
     height: 100%;

+ 20 - 12
sooka-ui/src/layout/components/TagsView/index.vue

@@ -244,8 +244,9 @@ export default {
   height: 34px;
   width: 100%;
   background: #fff;
-  border-bottom: 1px solid #d8dce5;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  // border-bottom: 1px solid #d8dce5;
+  box-shadow: 0px 4px 4px 0px #ebebeb;
+      margin-bottom: 5px;
 
   .tags-view-wrapper {
     .tags-view-item {
@@ -260,7 +261,8 @@ export default {
       padding: 0 8px;
       font-size: 12px;
       margin-left: 5px;
-      margin-top: 4px;
+      margin-top: 4px;
+			border-radius: 5px;
 
       &:first-of-type {
         margin-left: 15px;
@@ -271,19 +273,25 @@ export default {
       }
 
       &.active {
-        background-color: #42b983;
+        background-color: #6a93ff!important;
         color: #fff;
         border-color: #42b983;
 
         &::before {
-          content: '';
-          background: #fff;
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          border-radius: 50%;
-          position: relative;
-          margin-right: 2px;
+        border-top: 5px solid #6a93ff  ;
+              border-left:5px solid transparent;
+              
+			    border-right: 5px solid transparent;
+              content: " ";
+              display: block;
+              height: 0;
+              margin-left: -19px;
+              width: 0;
+              position: absolute;
+              /* pointer-events: all; */
+              bottom: -5px;
+              left: 50%;
+			  margin-left: -10px;
         }
       }
     }

+ 1 - 1
sooka-ui/src/layout/index.vue

@@ -3,7 +3,7 @@
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
+      <div :class="{'fixed-header':fixedHeader} " >
         <navbar/>
         <tags-view v-if="needTagsView"/>
       </div>

+ 1 - 1
sooka-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">sooka管理系统</h3>
+      <h3 class="title">首佳后台管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

+ 3 - 2
sooka-ui/src/views/monitor/job/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" 
+		size="small">
       <el-form-item label="任务名称" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
@@ -35,7 +36,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['monitor:job:add']"

+ 1 - 1
sooka-ui/src/views/monitor/job/log.vue

@@ -57,7 +57,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['monitor:job:remove']"

+ 1 - 1
sooka-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">sooka管理系统</h3>
+      <h3 class="title">首佳后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>

+ 1 - 1
sooka-ui/src/views/system/config/index.vue

@@ -46,7 +46,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:config:add']"

+ 1 - 1
sooka-ui/src/views/system/dept/index.vue

@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:dept:add']"

+ 1 - 1
sooka-ui/src/views/system/dict/data.vue

@@ -35,7 +35,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:dict:add']"

+ 1 - 1
sooka-ui/src/views/system/dict/index.vue

@@ -51,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:dict:add']"

+ 1 - 1
sooka-ui/src/views/system/logininfor/index.vue

@@ -52,7 +52,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:logininfor:remove']"

+ 1 - 1
sooka-ui/src/views/system/menu/index.vue

@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:menu:add']"

+ 1 - 1
sooka-ui/src/views/system/notice/index.vue

@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:notice:add']"

+ 1 - 1
sooka-ui/src/views/system/operlog/index.vue

@@ -76,7 +76,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:operlog:remove']"

+ 1 - 1
sooka-ui/src/views/system/post/index.vue

@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:post:add']"

+ 1 - 1
sooka-ui/src/views/system/role/index.vue

@@ -51,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:role:add']"

+ 11 - 4
sooka-ui/src/views/tool/build/index.vue

@@ -414,14 +414,21 @@ export default {
 // home
 .right-scrollbar {
   .el-scrollbar__view {
-    padding: 12px 18px 15px 15px;
-  }
+    padding: 12px 18px 15px 15px;
+	a{
+		justify-content: left!important;
+	}
+  }
+	
 }
 
 .left-scrollbar .el-scrollbar__wrap {
   box-sizing: border-box;
   overflow-x: hidden !important;
-  margin-bottom: 0 !important;
+  margin-bottom: 0 !important;
+  a{
+  	justify-content: left!important;
+  }
 }
 
 .center-tabs {
@@ -726,7 +733,7 @@ $lighterBlue: #409EFF;
   }
 
   .el-form-item {
-    margin-bottom: 15px;
+    /* margin-bottom: 15px; */
   }
 }
 

+ 1 - 1
sooka-ui/src/views/tool/gen/index.vue

@@ -34,7 +34,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8 p10">
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['tool:gen:code']"