diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index d153093..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "recommendations": [ - "voorjaar.windicss-intellisense", - "vscode-icons-team.vscode-icons", - "davidanson.vscode-markdownlint", - "stylelint.vscode-stylelint", - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "vue.volar", - "lokalise.i18n-ally", - "mikestead.dotenv", - "eamodio.gitlens", - "antfu.iconify" - ] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index f43edc0..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "msedge", - "request": "launch", - "name": "Launch Edge against localhost", - "url": "http://localhost", - "webRoot": "${workspaceFolder}/src", - "sourceMaps": true - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 078e5b4..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "typescript.tsdk": "node_modules/typescript/lib", - "prettier.enable": true, - "editor.formatOnType": true, - "editor.formatOnSave": true, - "editor.formatOnPaste": true, - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" - }, - "[vue]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "i18n-ally.localesPaths": ["src/locales"], - "i18n-ally.keystyle": "nested", - "i18n-ally.sortKeys": true, - "i18n-ally.namespace": true, - "i18n-ally.enabledParsers": ["ts"], - "i18n-ally.sourceLanguage": "en", - "i18n-ally.displayLanguage": "zh-CN", - "i18n-ally.enabledFrameworks": ["vue", "react"], - "god.tsconfig": "./tsconfig.json", - "vue-i18n.i18nPaths": "src/locales", - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.expand": false, - "explorer.fileNesting.patterns": { - "*.ts": "$(capture).test.ts, $(capture).test.tsx", - "*.tsx": "$(capture).test.ts, $(capture).test.tsx", - "*.env": "$(capture).env.*", - "CHANGELOG.md": "CHANGELOG*", - "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*", - ".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig" - } -} diff --git a/src/assets/imgs/login2.gif b/src/assets/imgs/login2.gif new file mode 100644 index 0000000..9ffdbf2 Binary files /dev/null and b/src/assets/imgs/login2.gif differ diff --git a/src/assets/imgs/shisong.jpg b/src/assets/imgs/shisong.jpg new file mode 100644 index 0000000..706615d Binary files /dev/null and b/src/assets/imgs/shisong.jpg differ diff --git a/src/views/Home/CloseRate.vue b/src/views/Home/CloseRate.vue index f03d6c6..6eb4e1c 100644 --- a/src/views/Home/CloseRate.vue +++ b/src/views/Home/CloseRate.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/Home/SalesReport.vue b/src/views/Home/SalesReport.vue index b5a2870..e14c264 100644 --- a/src/views/Home/SalesReport.vue +++ b/src/views/Home/SalesReport.vue @@ -174,10 +174,10 @@ const searchForm = ref({}) function handleReset() { const year = new Date().getFullYear() - const month = new Date().getMonth() + 1 + const month = new Date().getMonth() + 1 + '' searchForm.value = { nickname: undefined, - consultTime: [`${year}-${month}-01`, formatDate(new Date())], + consultTime: [`${year}-${month.padStart(2, '0')}-01`, formatDate(new Date())], licenseTypeList: [], sourceId: undefined } diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index db54388..00e1327 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,17 +1,35 @@ - + - - - {{ underlineToHump(appInfo.instanceName) }} + + + 欢迎使用 {{ underlineToHump(appInfo.instanceName) }} + + + + + + + + + + + + + + + + + + - - + + @@ -30,35 +48,21 @@ - + - - {{ underlineToHump(appInfo.instanceName) }} + + - - - - - - - - - - - - - - - + @@ -96,7 +100,7 @@ const chars = computed(() => { return text.slice(0, currentCharIndex.value) }) -async function init() { +function init() { const res = currentRoute.value?.query?.tenantId authUtil.setTenantId(res) @@ -137,7 +141,7 @@ $prefix-cls: #{$namespace}-login; z-index: -1; width: 100%; height: 100%; - background-image: url('@/assets/svgs/login-bg.svg'); + // background-image: url('@/assets/svgs/login-bg.svg'); background-position: center; background-repeat: no-repeat; content: ''; @@ -145,6 +149,20 @@ $prefix-cls: #{$namespace}-login; } } +// .left-box { +// background: #f3f4fb; +// background-image: url('@/assets/imgs/login-left-bg.png'); +// background-repeat: no-repeat; +// background-size: 100% 100%; +// } + +.login-box { + background-image: url('@/assets/imgs/shisong.jpg'); + background-position: center center; + background-repeat: no-repeat; + background-size: 80% 80%; +} + .text-animation-enter-active, .text-animation-leave-active { transition: opacity 0.5s; @@ -160,12 +178,11 @@ $prefix-cls: #{$namespace}-login; width: 80%; display: flex; flex-wrap: wrap; - font-size: 18px; - line-height: 1.8; + font-size: 1rem; + line-height: 1.3; font-family: Lora, serif; white-space: pre; font-weight: 600; - color: #6ee1f5; span { animation: landIn 0.8s ease-out both; diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index dce4edb..72b313a 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -11,10 +11,13 @@ > + + +