Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/src/assets/less/new.css

+#app {
+  height: 100% !important;
+}
+.layout-menu-wrapper {
+  height: 64px !important;
+  line-height: 64px !important;
+  background: linear-gradient(90deg, #1845c6, #2999ff) !important;
+}
+.layout-menu-wrapper .layout-logo {
+  font-size: 20px;
+  font-weight: bold;
+}
+.layout-menu-wrapper .menu-list li a {
+  display: block;
+  padding: 0 12px;
+  height: 100%;
+  font-size: 14px !important;
+  color: rgba(254, 254, 254, 0.65) !important;
+  text-align: center !important;
+}
+.layout-menu-wrapper .menu-list li a i {
+  font-size: 14px !important;
+  margin-right: 10px !important;
+}
+.layout-menu-wrapper .menu-list li a i:first-child {
+  margin-right: 0px !important;
+}
+.layout-menu-wrapper .menu-list li a:hover {
+  color: #fff !important;
+}
+.layout-menu-wrapper .menu-list li a.router-link-active,
+.layout-menu-wrapper .menu-list li a[active] {
+  color: #fff !important;
+  list-style-type: none;
+  border-bottom: none !important;
+  padding-bottom: 2px;
+  background-color: #1890ff !important;
+}
+.layout-header .layout-submenu-wrapper {
+  width: 95% !important;
+  margin: 0 auto !important;
+  margin-top: 20px !important;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+.page.active {
+  width: 95% !important;
+  margin: 0 auto !important;
+  padding: 20px !important;
+  padding-top: 0 !important;
+}
+.page {
+  height: 82% !important;
+  min-height: 82% !important;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+}

smart-office-manager-ui/admin/src/assets/less/new.less

+#app {
+    height: 100% !important;
+}
+
+.layout-menu-wrapper {
+    height: 64px !important;
+    line-height: 64px !important;
+    background: linear-gradient(90deg, #1845c6, #2999ff) !important;
+
+    .layout-logo {
+        font-size: 20px;
+        font-weight: bold;
+    }
+
+    .menu-list {
+        li {
+            a {
+                display: block;
+                padding: 0 12px;
+                height: 100%;
+                font-size: 14px !important;
+                color: rgba(254, 254, 254, .65) !important;
+                text-align: center !important;
+
+                i {
+                    font-size: 14px !important;
+                    margin-right: 10px !important;
+                }
+
+                i:first-child {
+                    margin-right: 0px !important;
+                }
+
+                &:hover {
+                    color: #fff !important;
+
+                }
+
+                &.router-link-active,
+                &[active] {
+                    //background: #1890ff;
+                    color: #fff !important;
+                    list-style-type: none;
+                    border-bottom: none !important;
+                    padding-bottom: 2px;
+                    background-color: #1890ff !important;
+                }
+            }
+        }
+
+    }
+
+
+}
+
+.layout-header .layout-submenu-wrapper {
+    width: 95% !important;
+    margin: 0 auto !important;
+    margin-top: 20px !important;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+}
+
+.page.active {
+    width: 95% !important;
+    margin: 0 auto !important;
+    padding: 20px !important;
+    padding-top: 0 !important;
+}
+
+.page {
+    height: 82% !important;
+    min-height: 82% !important;
+    border-bottom-left-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
\ No newline at end of file

smart-office-manager-ui/admin/src/main.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './assets/less/base.less'
+import './assets/less/new.less'
 import App from './App.vue'
 import router from './router'
 import store from './store'

smart-office-manager-ui/admin/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/office': {
-				target: 'http://127.0.0.1:21085',
+				target: 'http://192.168.0.98:11085',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',