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

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

Browse Source 
# Conflicts:
#	src/jmapNew/theme/beijing_01/planConvert.js
This commit is contained in:
joylink_cuiweidong 2020-01-07 15:22:50 +08:00
commit 7fd885a1c2
21 changed files with 119 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jmap/theme/beijing_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

16
src/jmap/theme/chengdu_03/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

16
src/jmap/theme/chengdu_04/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

16
src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

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

@ -260,7 +260,7 @@ export default class Station extends Group {
if (this.model.visible) { if (this.model.visible) {
const rect = this.stationText.getBoundingRect().clone(); const rect = this.stationText.getBoundingRect().clone();
if (this.model.subheadDisplay) { if (this.model.subheadDisplay) {
const subheadText = this.subheadText.getBoundingRect(); const subheadText = this.subheadText.getBoundingRect().clone();
rect.union(subheadText); rect.union(subheadText);
return rect; return rect;
} else { } else {

4
src/jmapNew/theme/beijing_01/planConvert.js
View File

@ -271,11 +271,11 @@ export default {
/** 格式化y轴数据*/ /** 格式化y轴数据*/
computedFormatYAxis(stations, params) { computedFormatYAxis(stations, params) {
var yText = ''; var yText = '0m';
stations.forEach(elem => { stations.forEach(elem => {
if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
yText = elem.kmRange + 'm'; yText = Math.floor(elem.kmRange) + 'm';
} }
}); });

16
src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

4
src/jmapNew/theme/chengdu_01/planConvert.js
View File

@ -249,11 +249,11 @@ export default {
/** 格式化y轴数据*/ /** 格式化y轴数据*/
computedFormatYAxis(stations, params) { computedFormatYAxis(stations, params) {
var yText = ''; var yText = '0m';
stations.forEach(elem => { stations.forEach(elem => {
if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
yText = elem.kmRange + 'm'; yText = Math.floor(elem.kmRange) + 'm';
} }
}); });

16
src/jmapNew/theme/chengdu_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

4
src/jmapNew/theme/chengdu_03/planConvert.js
View File

@ -249,11 +249,11 @@ export default {
/** 格式化y轴数据*/ /** 格式化y轴数据*/
computedFormatYAxis(stations, params) { computedFormatYAxis(stations, params) {
var yText = ''; var yText = '0m';
stations.forEach(elem => { stations.forEach(elem => {
if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
yText = elem.kmRange + 'm'; yText = Math.floor(elem.kmRange) + 'm';
} }
}); });

16
src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

4
src/jmapNew/theme/fuzhou_01/planConvert.js
View File

@ -329,10 +329,10 @@ export default {
/** 格式化y轴数据*/ /** 格式化y轴数据*/
computedFormatYAxis(stations, params) { computedFormatYAxis(stations, params) {
var yText = ''; var yText = '0m';
var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple); var index = Math.floor((parseInt(params.value) - this.EdgeHeight) / this.CoordMultiple);
if (index >= 0 && index < stations.length) { if (index >= 0 && index < stations.length) {
yText = stations[index].kmRange + 'm'; yText = Math.floor(stations[index].kmRange) + 'm';
} }
return yText; return yText;
}, },

16
src/jmapNew/theme/fuzhou_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

4
src/jmapNew/theme/ningbo_01/planConvert.js
View File

@ -294,11 +294,11 @@ export default {
/** 格式化y轴数据*/ /** 格式化y轴数据*/
computedFormatYAxis(stations, params) { computedFormatYAxis(stations, params) {
var yText = ''; var yText = '0m';
stations.forEach(elem => { stations.forEach(elem => {
if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) { if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
yText = elem.kmRange + 'm'; yText = Math.floor(elem.kmRange) + 'm';
} }
}); });

16
src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
View File

@ -106,14 +106,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '30px', // right: '30px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

18
src/store/modules/map.js
View File

@ -84,28 +84,10 @@ function saveMapDeviceDefaultRelations(state) {
if (state && state.map) { if (state && state.map) {
const map = state.map; const map = state.map;
const deviceMap = Vue.prototype.$jlmap.mapDevice; const deviceMap = Vue.prototype.$jlmap.mapDevice;
// 是否集中站
// if (map.stationControlList && map.stationControlList.length) {
// map.stationControlList.forEach(elem => {
// const station = deviceMap[elem.stationCode];
// if (station) {
// station.centralized = true;
// }
// });
// }
// 设置区段关联 // 设置区段关联
if (map.sectionList && map.sectionList.length) { if (map.sectionList && map.sectionList.length) {
// map.sectionList.forEach(elem => { // map.sectionList.forEach(elem => {
// if (elem.type !== '03') {
// const station = deviceMap[elem.parentCode];
// if (station) {
// elem.stationCode = station.stationCode;
// }
// } else {
// elem.parentCode = '';
// }
// if (elem.type === '01') { // if (elem.type === '01') {
// elem.nameShow == true; // elem.nameShow == true;
// } // }

4
src/utils/baseUrl.js
View File

@ -3,11 +3,11 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康 BASE_API = 'http://192.168.3.82:9000'; // 杜康
} else { } else {
BASE_API = process.env.VUE_APP_BASE_API; BASE_API = process.env.VUE_APP_BASE_API;
} }

16
src/views/display/demon/runPlanView.vue
View File

@ -52,14 +52,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '20px', // right: '20px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

16
src/views/newMap/displayNew/demon/runPlanView.vue
View File

@ -52,14 +52,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '20px', // right: '20px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {

19
src/views/planMonitor/editTool/schedule.vue
View File

@ -103,15 +103,15 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { // 工具栏 toolbox: { // 工具栏
top: '10px', // top: '10px',
right: '120px', // right: '120px',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
@ -181,6 +181,7 @@ export default {
formatter: this.yAxisPointFormat, formatter: this.yAxisPointFormat,
backgroundColor: 'rgb(0,100,0,0.5)', backgroundColor: 'rgb(0,100,0,0.5)',
color: 'white' color: 'white'
// margin: -60
} }
}, },
min: 0, min: 0,

16
src/views/publish/runPlanEveryDay/runPlanView.vue
View File

@ -37,14 +37,14 @@ export default {
backgroundColor: 'floralwhite' backgroundColor: 'floralwhite'
}, },
toolbox: { toolbox: {
right: '2%', // right: '2%',
feature: { // feature: {
dataZoom: { // dataZoom: {
yAxisIndex: 'none' // yAxisIndex: 'none'
}, // },
restore: {}, // restore: {},
saveAsImage: {} // saveAsImage: {}
} // }
}, },
tooltip: { tooltip: {
axisPointer: { axisPointer: {