diff --git a/.gitignore b/.gitignore index cb36b004f..d4afb39e8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,10 +11,13 @@ dist/ **/dist/ # 依赖包 +node_modules node_modules/ **/node_modules/ **/node_modules1/ **/node_modules2/ +*.class +**/*.class # Local authorized Kingbase JDBC vendor binary; provision via scripts/bootstrap/ /RuoYi-Vue/lib/kingbase8-8.6.0.jar diff --git a/RuoYi-Vue/ruoyi-ui/package.json b/RuoYi-Vue/ruoyi-ui/package.json index 583e42ce9..8101842f6 100644 --- a/RuoYi-Vue/ruoyi-ui/package.json +++ b/RuoYi-Vue/ruoyi-ui/package.json @@ -12,18 +12,33 @@ "lint": "eslint --ext .js,.vue src" }, "eslintConfig": { + "root": true, "env": { - "browser": true, - "es2021": true + "node": true }, "extends": [ + "plugin:vue/essential", "eslint:recommended" ], "parserOptions": { - "ecmaVersion": 12, - "sourceType": "module" + "parser": "babel-eslint" }, - "rules": {} + "rules": { + "vue/no-mutating-props": "off", + "vue/no-unused-components": "off", + "no-unused-vars": "off", + "vue/require-valid-default-prop": "off", + "vue/valid-template-root": "off", + "vue/no-use-v-if-with-v-for": "off", + "no-mixed-spaces-and-tabs": "off", + "no-unused-labels": "off", + "vue/no-side-effects-in-computed-properties": "off", + "no-useless-escape": "off", + "no-undef": "off", + "no-empty": "off", + "no-redeclare": "off", + "no-prototype-builtins": "off" + } }, "husky": { "hooks": { diff --git a/RuoYi-Vue/ruoyi-ui/src/views/system/user/index.vue b/RuoYi-Vue/ruoyi-ui/src/views/system/user/index.vue index f38555a10..b619df955 100644 --- a/RuoYi-Vue/ruoyi-ui/src/views/system/user/index.vue +++ b/RuoYi-Vue/ruoyi-ui/src/views/system/user/index.vue @@ -1,21 +1,17 @@ + + diff --git a/build_ui/vue.config.js b/build_ui/vue.config.js index e2087189f..56dc4b5a9 100644 --- a/build_ui/vue.config.js +++ b/build_ui/vue.config.js @@ -14,7 +14,7 @@ function resolve(dir) { const name = process.env.VUE_APP_TITLE || 'SYFJGYD学员管理系统' // 网页标题 -const port = process.env.port || process.env.npm_config_port || 8080 // 端口 +const port = process.env.port || process.env.npm_config_port || 1024 // 端口 const { VueLoaderPlugin } = require('vue-loader') // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -37,18 +37,11 @@ module.exports = { devServer: { host: '0.0.0.0', port: port, - open: true, + open: false, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - //target: `http://192.168.125.228:8329`, - //target: `http://192.168.125.108:8329`, - //target: `http://localhost:8329`, - //target: `http://10.1.191.245:8085`, //changchun - //target: `http://22.89.215.76:8085`, //changchun weburl - //target: `http://22.89.215.76:8085`, - target: `http://localhost:8090`, - //target: `http://121.196.246.126:38085`, + target: process.env.VUE_APP_BACKEND_URL || 'http://127.0.0.1:8096', changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''