diff --git a/.eslintrc.js b/.eslintrc.js index 2c21180..64360cb 100755 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,9 @@ module.exports = { root: true, env: { - node: true + node: true, + es6: true, + browser: true }, extends: [ 'plugin:vue/essential', @@ -18,6 +20,15 @@ module.exports = { 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-unused-vars': 1, - 'vue/no-unused-components': 1 + 'vue/no-unused-components': 1, + "vue/html-self-closing": ["error", { + "html": { + "void": "never", + "normal": "never", + "component": "always" + }, + "svg": "always", + "math": "always" + }] } } diff --git a/package.json b/package.json index ea28e5f..94fa4f7 100644 --- a/package.json +++ b/package.json @@ -5,43 +5,44 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", + "build:prod": "vue-cli-service build --mode prod", "lint": "vue-cli-service lint" }, "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.30", - "@fortawesome/free-brands-svg-icons": "^5.14.0", - "@fortawesome/free-regular-svg-icons": "^5.14.0", - "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@fortawesome/vue-fontawesome": "~2.0.0", + "@fortawesome/fontawesome-svg-core": "^1.2.34", + "@fortawesome/free-brands-svg-icons": "^5.15.2", + "@fortawesome/free-regular-svg-icons": "^5.15.2", + "@fortawesome/free-solid-svg-icons": "^5.15.2", + "@fortawesome/vue-fontawesome": "~2.0.2", "axios": "^0.20.0", - "core-js": "^3.6.5", + "core-js": "^3.8.3", "echarts": "^4.9.0", - "element-ui": "^2.13.2", + "element-ui": "^2.15.0", "js-cookie": "^2.2.1", "vue": "^2.6.11", "vue-meta": "^2.4.0", - "vue-router": "^3.2.0", - "vuex": "^3.4.0", + "vue-router": "^3.5.1", + "vuex": "^3.6.2", "vuex-router-sync": "^5.0.0" }, "devDependencies": { - "@babel/core": "^7.11.6", - "@babel/eslint-parser": "^7.11.5", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.5.0", - "@vue/cli-service": "~4.5.0", + "@babel/core": "^7.12.13", + "@babel/eslint-parser": "^7.12.13", + "@vue/cli-plugin-babel": "~4.5.11", + "@vue/cli-plugin-eslint": "~4.5.11", + "@vue/cli-plugin-router": "~4.5.11", + "@vue/cli-plugin-vuex": "~4.5.11", + "@vue/cli-service": "~4.5.11", "@vue/eslint-config-standard": "^5.1.2", "eslint": "^6.7.2", - "eslint-plugin-import": "^2.20.2", + "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.0", "eslint-plugin-vue": "^6.2.2", "node-sass": "^4.12.0", "sass-loader": "^8.0.2", - "style-resources-loader": "^1.3.2", + "style-resources-loader": "^1.4.1", "vue-cli-plugin-style-resources-loader": "~0.1.4", "vue-template-compiler": "^2.6.11" } diff --git a/src/assets/images/logo-background.jpg b/src/assets/images/logo-background.jpg new file mode 100644 index 0000000..be603ba Binary files /dev/null and b/src/assets/images/logo-background.jpg differ diff --git a/src/components/IconFont/index.vue b/src/components/IconFont/index.vue new file mode 100644 index 0000000..edccc7a --- /dev/null +++ b/src/components/IconFont/index.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/components/Navigation/MenuBar/MenuBarItem.vue b/src/components/Navigation/MenuBar/MenuBarItem.vue index a0e4045..8e1442d 100644 --- a/src/components/Navigation/MenuBar/MenuBarItem.vue +++ b/src/components/Navigation/MenuBar/MenuBarItem.vue @@ -29,7 +29,7 @@ + > {{ routeItem.name }} @@ -47,7 +47,7 @@ + > {{ routeItem.name }} diff --git a/src/components/Navigation/MenuBar/index.vue b/src/components/Navigation/MenuBar/index.vue index 65c34c4..5d72be8 100644 --- a/src/components/Navigation/MenuBar/index.vue +++ b/src/components/Navigation/MenuBar/index.vue @@ -6,7 +6,7 @@ :class="{ collapse: isCollapse }" - /> + > diff --git a/src/components/Navigation/NavBar.vue b/src/components/Navigation/NavBar.vue index 6c5893b..c645271 100644 --- a/src/components/Navigation/NavBar.vue +++ b/src/components/Navigation/NavBar.vue @@ -5,7 +5,7 @@ >