diff --git a/.env.development b/.env.development index d3b24f6..3d5a50f 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://localhost:9993/' +VUE_APP_BASE_API = '/dev-api' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/.env.production b/.env.production index 6350e01..51a50f6 100644 --- a/.env.production +++ b/.env.production @@ -9,24 +9,13 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/' # 吴总测试服务器 -VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # 平潭 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' -# 文明东 -# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' - -# 实施测试服务器 ljy -# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/' - -# 实施测试服务器 wqq -# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/' - -# 平潭内网 -# VUE_APP_BASE_API = 'http://10.200.200.253:9160/UDI_SPMS_SERVER/' - - +# 文明点 +VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' diff --git a/package.json b/package.json index b20deae..57441c3 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "LionLi", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve --mode development", - "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode production", + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 01a3075..6ca76b0 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -906,7 +906,7 @@ - +
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue index c1714bb..8ff2646 100644 --- a/src/views/sync/SysUdimsConfig.vue +++ b/src/views/sync/SysUdimsConfig.vue @@ -6,9 +6,8 @@ @@ -23,7 +22,7 @@
说明: 修改同步参数时,请关闭数据同步服务 + >说明: 修改同步参数时,请关闭数据同步服务
@@ -51,7 +50,7 @@ style="margin-left: 20px" :disabled="configQuery.downstreamEnable" :loading="testLoading" - >测试连通 + >测试连通
@@ -65,7 +64,7 @@ - + + + + + + + + + + + + - + @@ -132,7 +170,12 @@ - + @@ -153,7 +196,12 @@ - + @@ -180,7 +228,12 @@ - + @@ -207,7 +260,12 @@ - + @@ -234,7 +292,12 @@ - + @@ -270,7 +333,12 @@ - + @@ -333,7 +401,7 @@ size="small" :disabled="configQuery.downstreamEnable" @click="addToInBusTypeDialog()" - >添加扫码单据类型 + >添加扫码单据类型
@@ -368,7 +436,7 @@ size="small" :disabled="configQuery.downstreamEnable" @click.native="removeToInBus(scope.$index, scope.row)" - >移除 + >移除 @@ -402,7 +470,7 @@ > 单据下载时间间隔(单位:分钟): 单据下载时间间隔(单位:分钟):  添加扫码单据类型 + >添加扫码单据类型 @@ -462,7 +530,7 @@ size="small" :disabled="configQuery.downstreamEnable" @click.native="remveBus(scope.$index, scope.row)" - >移除 + >移除 @@ -489,7 +557,7 @@ size="small" :disabled="configQuery.downstreamEnable" @click="addChangeBusTypeDialog()" - >添加业务单据类型 + >添加业务单据类型 @@ -523,7 +591,7 @@ size="small" :disabled="configQuery.downstreamEnable" @click.native="removeChangeBus(scope.$index, scope.row)" - >移除 + >移除 @@ -541,9 +609,8 @@ >
选入 - + >选入 +
选入 - + >选入 +
选入 - + >选入 +
{ - }); + .catch(() => {}); }, testConnect() { @@ -832,8 +896,7 @@ export default { this.busTypes = response.data.list || []; this.total = response.data.total || 0; }) - .catch(() => { - }); + .catch(() => {}); }, addBusTypeDialog() { diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index 7cb543f..72bc695 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -30,11 +30,10 @@ 重置 - + >重置 + 查询 + >查询 @@ -45,7 +44,7 @@ type="primary" icon="el-icon-sort" @click="toggleExpandAll" - >展开/折叠 + >展开/折叠 @@ -72,7 +71,7 @@ @@ -83,18 +82,18 @@ type="text" :disabled="scope.row.status == 0" @click.native="subAddDeptDialog(scope.row)" - >新增 + >新增 编辑 + >编辑 删除 + >删除 @@ -184,7 +183,7 @@
提交 + >提交 取消
@@ -214,13 +213,13 @@ type="primary" icon="el-icon-refresh" @click="onUserReset" - >重置 + >重置 查询 + >查询 移除 + >移除 @@ -288,13 +287,13 @@ type="primary" icon="el-icon-refresh" @click="onInvReset" - >重置 + >重置 查询 + >查询 { console.log(qwe); if (qwe === null) { @@ -629,8 +629,7 @@ export default { } }); }) - .catch(() => { - }); + .catch(() => {}); }, toggleExpandAll() { this.refreshTable = false; @@ -668,7 +667,7 @@ export default { }); }, getDeptStatusMenuTreeselect(deptId) { - let query = {deptId: deptId}; + let query = { deptId: deptId }; return treeSelectedList(query).then((response) => { this.menuOptions = response.data.menus; return response; @@ -751,8 +750,7 @@ export default { } }); }) - .catch(() => { - }); + .catch(() => {}); }, //仓库相关 @@ -773,9 +771,8 @@ export default { this.getInvList(); }, }, - components: {Treeselect}, - mounted() { - }, + components: { Treeselect }, + mounted() {}, created() { this.getList(); }, diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue index 73d05ee..876e97b 100644 --- a/src/views/system/param/systemParamConfig.vue +++ b/src/views/system/param/systemParamConfig.vue @@ -98,7 +98,7 @@ { if (valid) { this.formLoading = true; diff --git a/vue.config.js b/vue.config.js index 2eee3de..f9d3b19 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,15 +1,15 @@ -'use strict' -const path = require('path') +"use strict"; +const path = require("path"); function resolve(dir) { - return path.join(__dirname, dir) + return path.join(__dirname, dir); } -const CompressionPlugin = require('compression-webpack-plugin') +const CompressionPlugin = require("compression-webpack-plugin"); -const name = process.env.VUE_APP_TITLE || 'UDI自助平台' // 网页标题 +const name = process.env.VUE_APP_TITLE || "UDI自助平台"; // 网页标题 -const port = process.env.port || process.env.npm_config_port || 80 // 端口 +const port = process.env.port || process.env.npm_config_port || 80; // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -20,117 +20,112 @@ module.exports = { // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 publicPath: process.env.VUE_APP_CONTEXT_PATH, // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'UDI_SPMS_CLIENT', + outputDir: "UDI_SPMS_CLIENT", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', + assetsDir: "static", // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', + lintOnSave: process.env.NODE_ENV === "development", // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 productionSourceMap: false, // webpack-dev-server 相关配置 devServer: { - host: '0.0.0.0', + host: "0.0.0.0", port: port, open: false, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: process.env.VUE_APP_BASE_API, + target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`, changeOrigin: true, pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } + ["^" + process.env.VUE_APP_BASE_API]: "", + }, + }, }, - disableHostCheck: true + disableHostCheck: true, }, css: { loaderOptions: { sass: { - sassOptions: { outputStyle: "expanded" } - } - } + sassOptions: { outputStyle: "expanded" }, + }, + }, }, configureWebpack: { name: name, resolve: { alias: { - '@': resolve('src') - } + "@": resolve("src"), + }, }, plugins: [ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 new CompressionPlugin({ - cache: false, // 不启用文件缓存 - test: /\.(js|css|html)?$/i, // 压缩文件格式 - filename: '[path].gz[query]', // 压缩后的文件名 - algorithm: 'gzip', // 使用gzip压缩 - minRatio: 0.8 // 压缩率小于1才会压缩 - }) + cache: false, // 不启用文件缓存 + test: /\.(js|css|html)?$/i, // 压缩文件格式 + filename: "[path].gz[query]", // 压缩后的文件名 + algorithm: "gzip", // 使用gzip压缩 + minRatio: 0.8, // 压缩率小于1才会压缩 + }), ], }, chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test + config.plugins.delete("preload"); // TODO: need test + config.plugins.delete("prefetch"); // TODO: need test // set svg-sprite-loader + config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end(); config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') + .rule("icons") .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) + .include.add(resolve("src/assets/icons")) .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') + .use("svg-sprite-loader") + .loader("svg-sprite-loader") .options({ - symbolId: 'icon-[name]' + symbolId: "icon-[name]", }) - .end() + .end(); - config - .when(process.env.NODE_ENV !== 'development', - config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single'), + config.when(process.env.NODE_ENV !== "development", (config) => { + config + .plugin("ScriptExtHtmlWebpackPlugin") + .after("html") + .use("script-ext-html-webpack-plugin", [ { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './' //到根目录下 - } - } - ) - } -} + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/, + }, + ]) + .end(); + config.optimization.splitChunks({ + chunks: "all", + cacheGroups: { + libs: { + name: "chunk-libs", + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: "initial", // only package third parties that are initially dependent + }, + elementUI: { + name: "chunk-elementUI", // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm + }, + commons: { + name: "chunk-commons", + test: resolve("src/components"), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true, + }, + }, + }); + config.optimization.runtimeChunk("single"), + { + from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 + to: "./", //到根目录下 + }; + }); + }, +};