diff --git a/.env.development b/.env.development index f5a3698..9ff868f 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VUE_APP_TITLE = 工业园区工业上楼项目系统 ENV = 'development' # 工业园区工业上楼项目系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = '' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true + diff --git a/package.json b/package.json index 3b80437..c925b7a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "axios": "0.28.1", "clipboard": "2.0.8", "core-js": "3.37.1", - "echarts": "5.4.0", + "echarts": "^5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", "fuse.js": "6.4.3", diff --git a/src/assets/images/allbg.png b/src/assets/images/allbg.png new file mode 100644 index 0000000..4945767 Binary files /dev/null and b/src/assets/images/allbg.png differ diff --git a/src/assets/images/bg@2x.png b/src/assets/images/bg@2x.png new file mode 100644 index 0000000..c67dcbf Binary files /dev/null and b/src/assets/images/bg@2x.png differ diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 34484d4..3296c1d 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -35,8 +35,9 @@ $base-logo-light-title-color: #001529; $base-sub-menu-background:#000c17; $base-sub-menu-hover:#001528; */ - +$base-header-height: 60px; // 头部高度 $base-sidebar-width: 200px; +$base-sidebar-background: #304156; // 侧边栏背景色 // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 466cd98..3f77e97 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,30 +1,11 @@