diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..280006f --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "tabWidth": 2, + "useTabs": false, + "semi": false, + "singleQuote": true, + "trailingComma": "es5", + "bracketSpacing": false +} diff --git a/src/App.vue b/src/App.vue index d9596d5..2d77f5f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,30 +1,55 @@ diff --git a/src/assets/image/crop.png b/src/assets/image/crop.png new file mode 100644 index 0000000..d28af61 Binary files /dev/null and b/src/assets/image/crop.png differ diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index b7b8474..0466263 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -29,9 +29,6 @@ html { .column { flex-direction: column; } -.HYZongYiTiJ { - font-family: "HYZongYiTiJ" !important; -} .flex-warp { flex-wrap: wrap; diff --git a/src/router/index.js b/src/router/index.js index aa7429d..869c964 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,21 +1,27 @@ -import Vue from "vue"; -import VueRouter from "vue-router"; -import HomeView from "../views/home.vue"; +import Vue from 'vue' +import VueRouter from 'vue-router' +import HomeView from '../views/home.vue' +import residentAnalysis from '@/views/residentAnalysis/index.vue' -Vue.use(VueRouter); +Vue.use(VueRouter) const routes = [ { - path: "/", - name: "home", + path: '/', + name: 'home', component: HomeView, }, -]; + { + path: '/residentAnalysis', + name: 'residentAnalysis', + component: residentAnalysis, + }, +] const router = new VueRouter({ - mode: "history", + mode: 'hash', base: process.env.BASE_URL, routes, -}); +}) -export default router; +export default router diff --git a/src/utils/localStorage.js b/src/utils/localStorage.js index b15b552..ff843cc 100644 --- a/src/utils/localStorage.js +++ b/src/utils/localStorage.js @@ -1,6 +1,9 @@ function setStorage(item, value) { - return localStorage.setItem(item, JSON.stringify(value)); + return window.localStorage.setItem(item, JSON.stringify(value)) } + function getStorage(item) { - return JSON.parse(localStorage.getItem(item)); + return JSON.parse(window.localStorage.getItem(item)) } + +export {setStorage, getStorage} diff --git a/src/views/header/index.vue b/src/views/header/index.vue index 4a35a98..f97f3dd 100644 --- a/src/views/header/index.vue +++ b/src/views/header/index.vue @@ -3,7 +3,7 @@
diff --git a/vue.config.js b/vue.config.js index e1ccf24..a35545f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,8 +1,9 @@ -const { defineConfig } = require("@vue/cli-service"); -const postcssPxToViewport = require("postcss-px-to-viewport"); +const {defineConfig} = require('@vue/cli-service') +const postcssPxToViewport = require('postcss-px-to-viewport') +const path = require('path') // 需要引入 path 模块 module.exports = defineConfig({ - publicPath: "./", + publicPath: './', transpileDependencies: false, lintOnSave: false, devServer: { @@ -12,7 +13,12 @@ module.exports = defineConfig({ }, configureWebpack: (config) => { //调试JS - config.devtool = "source-map"; + config.devtool = 'source-map' + config.resolve = { + alias: { + '@': path.resolve(__dirname, 'src'), + }, + } }, css: { loaderOptions: { @@ -21,13 +27,13 @@ module.exports = defineConfig({ // 增加这一层 postcssOptions plugins: [ postcssPxToViewport({ - unitToConvert: "px", + unitToConvert: 'px', viewportWidth: 1920, unitPrecision: 6, - viewportUnit: "vw", - fontViewportUnit: "vw", - propList: ["*"], - selectorBlackList: ["ignore-"], + viewportUnit: 'vw', + fontViewportUnit: 'vw', + propList: ['*'], + selectorBlackList: ['ignore-'], minPixelValue: 1, mediaQuery: false, replace: true, @@ -40,4 +46,4 @@ module.exports = defineConfig({ }, }, }, -}); +})