diff --git a/config/dev.env.js b/config/dev.env.js index aefeac3..b193360 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,12 +1,14 @@ 'use strict' +//引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 const merge = require('webpack-merge') +//导入prod.env.js配置文件 const prodEnv = require('./prod.env') - +// 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', - BASE_API: '"http://119.254.103.80:14536"' - // BASE_API: '"http://192.168.0.225:14536"' + BASE_API: '"http://119.254.103.80:14537"' + // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://119.254.103.80:14536"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' diff --git a/config/dev.env.js b/config/dev.env.js index aefeac3..b193360 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,12 +1,14 @@ 'use strict' +//引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 const merge = require('webpack-merge') +//导入prod.env.js配置文件 const prodEnv = require('./prod.env') - +// 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', - BASE_API: '"http://119.254.103.80:14536"' - // BASE_API: '"http://192.168.0.225:14536"' + BASE_API: '"http://119.254.103.80:14537"' + // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://119.254.103.80:14536"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' diff --git a/config/index.js b/config/index.js index 8bdbd93..113c70f 100644 --- a/config/index.js +++ b/config/index.js @@ -5,15 +5,18 @@ const path = require('path') module.exports = { + //开发环境 dev: { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', + // 代理表，用来建一个虚拟api用来代理本机的请求，智能用于开发模式 proxyTable: {}, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + //是否自动打开浏览器 autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, @@ -39,6 +42,7 @@ // (https://github.com/webpack/css-loader#sourcemaps) // In our experience, they generally work as expected, // just be aware of this issue when enabling this option. + // 是否生成css，map文件 cssSourceMap: false }, @@ -72,12 +76,15 @@ // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, + //定义要压缩哪些类型的文件 productionGzipExtensions: ['js', 'css'], // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` // Set to `true` or `false` to always turn it on or off + // 用来开启编译完成后的报告，可以通过设置值为true和false来开启或关闭 + // 下面的process.env.npm_config_report表示定义的一个npm_config_report环境变量 bundleAnalyzerReport: process.env.npm_config_report || false, // `npm run build:prod --generate_report` diff --git a/config/dev.env.js b/config/dev.env.js index aefeac3..b193360 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,12 +1,14 @@ 'use strict' +//引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 const merge = require('webpack-merge') +//导入prod.env.js配置文件 const prodEnv = require('./prod.env') - +// 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', - BASE_API: '"http://119.254.103.80:14536"' - // BASE_API: '"http://192.168.0.225:14536"' + BASE_API: '"http://119.254.103.80:14537"' + // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://119.254.103.80:14536"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' diff --git a/config/index.js b/config/index.js index 8bdbd93..113c70f 100644 --- a/config/index.js +++ b/config/index.js @@ -5,15 +5,18 @@ const path = require('path') module.exports = { + //开发环境 dev: { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', + // 代理表，用来建一个虚拟api用来代理本机的请求，智能用于开发模式 proxyTable: {}, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + //是否自动打开浏览器 autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, @@ -39,6 +42,7 @@ // (https://github.com/webpack/css-loader#sourcemaps) // In our experience, they generally work as expected, // just be aware of this issue when enabling this option. + // 是否生成css，map文件 cssSourceMap: false }, @@ -72,12 +76,15 @@ // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, + //定义要压缩哪些类型的文件 productionGzipExtensions: ['js', 'css'], // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` // Set to `true` or `false` to always turn it on or off + // 用来开启编译完成后的报告，可以通过设置值为true和false来开启或关闭 + // 下面的process.env.npm_config_report表示定义的一个npm_config_report环境变量 bundleAnalyzerReport: process.env.npm_config_report || false, // `npm run build:prod --generate_report` diff --git a/config/prod.env.js b/config/prod.env.js index 23e92b9..d2d48be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://119.254.103.80:14536"', + BASE_API: '"http://119.254.103.80:14537"', } diff --git a/config/dev.env.js b/config/dev.env.js index aefeac3..b193360 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,12 +1,14 @@ 'use strict' +//引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 const merge = require('webpack-merge') +//导入prod.env.js配置文件 const prodEnv = require('./prod.env') - +// 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', - BASE_API: '"http://119.254.103.80:14536"' - // BASE_API: '"http://192.168.0.225:14536"' + BASE_API: '"http://119.254.103.80:14537"' + // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://119.254.103.80:14536"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' diff --git a/config/index.js b/config/index.js index 8bdbd93..113c70f 100644 --- a/config/index.js +++ b/config/index.js @@ -5,15 +5,18 @@ const path = require('path') module.exports = { + //开发环境 dev: { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', + // 代理表，用来建一个虚拟api用来代理本机的请求，智能用于开发模式 proxyTable: {}, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + //是否自动打开浏览器 autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, @@ -39,6 +42,7 @@ // (https://github.com/webpack/css-loader#sourcemaps) // In our experience, they generally work as expected, // just be aware of this issue when enabling this option. + // 是否生成css，map文件 cssSourceMap: false }, @@ -72,12 +76,15 @@ // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, + //定义要压缩哪些类型的文件 productionGzipExtensions: ['js', 'css'], // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` // Set to `true` or `false` to always turn it on or off + // 用来开启编译完成后的报告，可以通过设置值为true和false来开启或关闭 + // 下面的process.env.npm_config_report表示定义的一个npm_config_report环境变量 bundleAnalyzerReport: process.env.npm_config_report || false, // `npm run build:prod --generate_report` diff --git a/config/prod.env.js b/config/prod.env.js index 23e92b9..d2d48be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://119.254.103.80:14536"', + BASE_API: '"http://119.254.103.80:14537"', } diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 560c9b7..72d6c17 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -110,7 +110,7 @@ btn_tmp.name = menu.name btn_tmp.icon = menu.icon btns.push(btn_tmp) - console.log(menu.url) + // console.log(menu.url) } } // 过滤路由表 diff --git a/config/dev.env.js b/config/dev.env.js index aefeac3..b193360 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,12 +1,14 @@ 'use strict' +//引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 const merge = require('webpack-merge') +//导入prod.env.js配置文件 const prodEnv = require('./prod.env') - +// 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', - BASE_API: '"http://119.254.103.80:14536"' - // BASE_API: '"http://192.168.0.225:14536"' + BASE_API: '"http://119.254.103.80:14537"' + // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://119.254.103.80:14536"' // BASE_API: '"http://192.168.0.225:8083"' // BASE_API: '"http://127.0.0.1:8083"' diff --git a/config/index.js b/config/index.js index 8bdbd93..113c70f 100644 --- a/config/index.js +++ b/config/index.js @@ -5,15 +5,18 @@ const path = require('path') module.exports = { + //开发环境 dev: { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', + // 代理表，用来建一个虚拟api用来代理本机的请求，智能用于开发模式 proxyTable: {}, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + //是否自动打开浏览器 autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: false, @@ -39,6 +42,7 @@ // (https://github.com/webpack/css-loader#sourcemaps) // In our experience, they generally work as expected, // just be aware of this issue when enabling this option. + // 是否生成css，map文件 cssSourceMap: false }, @@ -72,12 +76,15 @@ // Before setting to `true`, make sure to: // npm install --save-dev compression-webpack-plugin productionGzip: false, + //定义要压缩哪些类型的文件 productionGzipExtensions: ['js', 'css'], // Run the build command with an extra argument to // View the bundle analyzer report after build finishes: // `npm run build --report` // Set to `true` or `false` to always turn it on or off + // 用来开启编译完成后的报告，可以通过设置值为true和false来开启或关闭 + // 下面的process.env.npm_config_report表示定义的一个npm_config_report环境变量 bundleAnalyzerReport: process.env.npm_config_report || false, // `npm run build:prod --generate_report` diff --git a/config/prod.env.js b/config/prod.env.js index 23e92b9..d2d48be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://119.254.103.80:14536"', + BASE_API: '"http://119.254.103.80:14537"', } diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 560c9b7..72d6c17 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -110,7 +110,7 @@ btn_tmp.name = menu.name btn_tmp.icon = menu.icon btns.push(btn_tmp) - console.log(menu.url) + // console.log(menu.url) } } // 过滤路由表 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 23d3e77..ccb17ae 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -307,8 +307,13 @@ } marker.visible = show } + // 如果没有找到符合要求的井 if (hideWellIds.length === this.markers.length) { this.$message.warning('查无结果') + // 将全部查询结果隐藏 + for (const alarmWell of this.alarmWells) { + alarmWell.visible = false + } } else { // 将报警隐藏 for (const alarmWell of this.alarmWells) { @@ -441,7 +446,13 @@ }, // 点击报警详情 openAlarmWindow(wellId, position) { + // 旧弹窗不显示 this.currentWindow.visible = false + // 清空查询条件 + this.listQuery.keywords = '' + this.listQuery.wellType = '' + this.listQuery.deptid = '' + this.search() getWellAlarms(wellId).then(response => { if (response.code === 200) { const wellInfo = response.data