diff --git a/.gitignore b/.gitignore index 6babebc..e7d2861 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules/ public/ dist/ src/assets/images/ +src/assets/font/ npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/package.json b/package.json index 9e749e3..ae40d37 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@element-plus/icons-vue": "2.3.1", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.11.0", + "autofit.js": "^2.0.1", "axios": "0.28.1", "clipboard": "2.0.11", "echarts": "5.5.1", diff --git a/src/App.vue b/src/App.vue index 31839f2..dee23c3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,13 +3,22 @@ diff --git a/src/assets/icons/svg/loginPass.svg b/src/assets/icons/svg/loginPass.svg new file mode 100644 index 0000000..a0e26c1 --- /dev/null +++ b/src/assets/icons/svg/loginPass.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/svg/loginUser.svg b/src/assets/icons/svg/loginUser.svg new file mode 100644 index 0000000..494a4ec --- /dev/null +++ b/src/assets/icons/svg/loginUser.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 0f175f2..862444b 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -93,4 +93,19 @@ .el-dropdown .el-dropdown-link{ color: var(--el-color-primary) !important; -} \ No newline at end of file +} + + + +.el-input__wrapper{ + background: #F1F3F4; + border-radius: 10px; + input{ + font-size: 16px; + font-weight: 400; + } + input::placeholder{ + color: #949494; + } + +} diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css new file mode 100644 index 0000000..9125c6e --- /dev/null +++ b/src/assets/styles/font.css @@ -0,0 +1,19 @@ +@font-face { + font-family: 'Aboreto-Regular'; + src: url("../font/Aboreto-Regular.ttf"); + } + + @font-face { + font-family: 'MiSans-Medium'; + src: url("../font/MiSans-Medium.ttf"); + } + + @font-face { + font-family: 'MiSans-Regular'; + src: url("../font/MiSans-Regular.ttf"); + } + + @font-face { + font-family: 'Aboreto-Bold'; + src: url("../font/MiSans-Bold.ttf"); + } \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index efc1ddd..890e524 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -5,6 +5,7 @@ @import './sidebar.scss'; @import './btn.scss'; @import './ruoyi.scss'; +@import './font.css'; body { height: 100%; @@ -12,7 +13,8 @@ body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; + font-family: 'MiSans-Regular'; + // font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; } label { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3189dd1..eabb8ab 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -6,9 +6,9 @@
@@ -40,9 +40,9 @@ 个人中心 - + 退出登录 @@ -126,7 +126,6 @@ function toggleTheme() { cursor: pointer; transition: background 0.3s; -webkit-tap-highlight-color: transparent; - &:hover { background: rgba(0, 0, 0, 0.025); } diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 2f17237..aa8c8a8 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -107,6 +107,7 @@ function topNavChange(val) { } function themeChange(val) { + console.log(val) settingsStore.theme = val handleThemeStyle(val) } diff --git a/src/permission.js b/src/permission.js index a4e2a7e..251f981 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register','/map'] +const whiteList = ['/login', '/register',] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) diff --git a/src/router/index.js b/src/router/index.js index 837c2e5..6d6da79 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,8 +62,8 @@ export const constantRoutes = [ hidden: true, }, { - path: "/map", - component: () => import("@/views/map/index"), + path: "/visualization", + component: () => import("@/views/visualization/index"), hidden: true, }, { diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 194d678..da62b37 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -14,7 +14,7 @@ const useSettingsStore = defineStore( { state: () => ({ title: '', - theme: storageSetting.theme || '#409EFF', + theme: storageSetting.theme || '#4776EB', sideTheme: storageSetting.sideTheme || sideTheme, showSettings: showSettings, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, diff --git a/src/views/index.vue b/src/views/index.vue index e543bfa..f1e840b 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -10,6 +10,9 @@ > {{ item.meta.title }}
+
+ 可视化驾驶舱 +
@@ -17,18 +20,31 @@ - diff --git a/src/views/map/index.vue b/src/views/visualization/index.vue similarity index 100% rename from src/views/map/index.vue rename to src/views/visualization/index.vue