joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-01-20 09:54:26 +08:00
commit 3c76a3139c
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -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 # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
VUE_APP_SOURCE_MAP = true

1
.env.production
View File

@ -5,4 +5,3 @@ NODE_ENV = 'production'
VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud' VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club' VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
VUE_APP_SOURCE_MAP = false

1
.env.staging
View File

@ -5,4 +5,3 @@ NODE_ENV = 'test'
VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink' VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club' VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
VUE_APP_SOURCE_MAP = false

2
src/jmapNew/shape/Section/index.js
View File

@ -259,7 +259,7 @@ export default class Section extends Group {
setSpeedUpperLimit(speedUpLimit) { setSpeedUpperLimit(speedUpLimit) {
if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有 if (this.style.Section.line.speedLimitColor) { // 宁波三号线 独有
this.line.setStyle({stroke: 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]; const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode];
if (switchModel && switchModel.sectionACode == this._code) { if (switchModel && switchModel.sectionACode == this._code) {
this.speedLimit && this.speedLimit.show(); this.speedLimit && this.speedLimit.show();

4
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -647,7 +647,9 @@ export default {
this.guide = false; this.guide = false;
this.selectRouteList = []; this.selectRouteList = [];
this.routeList.forEach(item => { 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); this.selectRouteList.push(item);
} }
}); });

11
vue.config.js
View File

@ -19,6 +19,7 @@ let outputDir = '';
outputDir = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl' ? 'dist' : 'dist/cbtc'; 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/ // All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = { module.exports = {
/** /**
@ -32,7 +33,7 @@ module.exports = {
outputDir: outputDir, outputDir: outputDir,
assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录 assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录
lintOnSave: false, lintOnSave: false,
productionSourceMap: process.env.VUE_APP_SOURCE_MAP, productionSourceMap: false,
devServer: { devServer: {
port: port, port: port,
host: '0.0.0.0', host: '0.0.0.0',
@ -72,7 +73,7 @@ module.exports = {
// }) // })
// ); // );
if (process.env.NODE_ENV != 'development') { if (process.env.NODE_ENV != 'development') {
config.mode = 'production'; config.mode = 'production';
Object.assign(config, { Object.assign(config, {
output:{ output:{
@ -83,8 +84,8 @@ module.exports = {
}); });
} else { } else {
// 为开发环境修改配置... // 为开发环境修改配置...
config.mode = 'development'; config.mode = 'development';
config.name = name; config.name = name;
} }
config.resolve = { config.resolve = {
@ -142,7 +143,7 @@ module.exports = {
config config
// https://webpack.js.org/configuration/devtool/#development // https://webpack.js.org/configuration/devtool/#development
.when(process.env.NODE_ENV === 'development', .when(process.env.NODE_ENV === 'development',
config => config.devtool('cheap-source-map') config => config.devtool('eval-source-map')
); );
config config