From 35a98a6e00c63a9f8311e08167e1dee1bdb84b01 Mon Sep 17 00:00:00 2001 From: lVAL Date: Tue, 19 Jan 2021 18:22:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20nameAlone=20=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index dad44c3c4..b834a7b97 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -259,7 +259,7 @@ export default class Section extends Group { setSpeedUpperLimit(speedUpLimit) { if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有 this.line.setStyle({stroke: this.style.Section.line.speedLimitColor}); - } else if (this.style.Section.speedLimitName.nameAlone && this.model.type == '03') { // 南京2，道岔区段只显示一个名称 + } else if (this.style.Section.speedLimitName && this.style.Section.speedLimitName.nameAlone && this.model.type == '03') { // 南京2，道岔区段只显示一个名称 const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode]; if (switchModel && switchModel.sectionACode == this._code) { this.speedLimit && this.speedLimit.show(); From 01260663227146670af72873775556a040376f5c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 19 Jan 2021 19:03:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=A0=E8=BE=93?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 1a032f59c..fb235f2c2 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -628,7 +628,9 @@ export default { this.guide = false; this.selectRouteList = []; this.routeList.forEach(item => { - if (item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.code) { + if (this.selectedObj.type !== 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.code) { + this.selectRouteList.push(item); + } else if (this.selectedObj.type === 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.linkSignalCode) { this.selectRouteList.push(item); } }); From 6742f0810f15e4f33a5ca9f7a26240b7337fed5c Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 19 Jan 2021 19:31:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9productionSourceMap?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 340fccb47480c7370debdd53adbe69f17cc0a558) --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index efe54c291..6c42bf449 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,7 +32,7 @@ module.exports = { outputDir: outputDir, assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录 lintOnSave: false, - productionSourceMap: process.env.VUE_APP_SOURCE_MAP, + productionSourceMap: false, devServer: { port: port, host: '0.0.0.0', From 68366b25b120860926ecaa9b7020a69bff6af7ea Mon Sep 17 00:00:00 2001 From: lVAL Date: Wed, 20 Jan 2021 09:49:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=20=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=94=9F=E4=BA=A7source-map?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 - .env.production | 1 - .env.staging | 1 - vue.config.js | 11 ++++++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index ddb549af1..b387ff05b 100644 --- a/.env.development +++ b/.env.development @@ -19,4 +19,3 @@ VUE_APP_UPLOAD_API = 'https://upload.joylink.club' # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_SOURCE_MAP = true diff --git a/.env.production b/.env.production index 4c64df13f..71363ca9f 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,3 @@ NODE_ENV = 'production' VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_UPLOAD_API = 'https://upload.joylink.club' -VUE_APP_SOURCE_MAP = false diff --git a/.env.staging b/.env.staging index 9277c1c33..d1042b068 100644 --- a/.env.staging +++ b/.env.staging @@ -5,4 +5,3 @@ NODE_ENV = 'test' VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_UPLOAD_API = 'https://upload.joylink.club' -VUE_APP_SOURCE_MAP = false diff --git a/vue.config.js b/vue.config.js index efe54c291..c9d69dcba 100644 --- a/vue.config.js +++ b/vue.config.js @@ -19,6 +19,7 @@ let outputDir = ''; outputDir = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl' ? 'dist' : 'dist/cbtc'; })(); + // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { /** @@ -32,7 +33,7 @@ module.exports = { outputDir: outputDir, assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录 lintOnSave: false, - productionSourceMap: process.env.VUE_APP_SOURCE_MAP, + productionSourceMap: false, devServer: { port: port, host: '0.0.0.0', @@ -72,7 +73,7 @@ module.exports = { // }) // ); if (process.env.NODE_ENV != 'development') { - config.mode = 'production'; + config.mode = 'production'; Object.assign(config, { output:{ @@ -83,8 +84,8 @@ module.exports = { }); } else { // 为开发环境修改配置... - config.mode = 'development'; - config.name = name; + config.mode = 'development'; + config.name = name; } config.resolve = { @@ -142,7 +143,7 @@ module.exports = { config // https://webpack.js.org/configuration/devtool/#development .when(process.env.NODE_ENV === 'development', - config => config.devtool('cheap-source-map') + config => config.devtool('eval-source-map') ); config