diff --git a/package.json b/package.json index fae095787..9d86044e8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "axios": "0.18.0", "echarts": "^4.7.0", - "element-ui": "^2.7.2", + "element-ui": "^2.12.0", "file-saver": "^1.3.3", "js-cookie": "2.2.0", "js-md5": "^0.7.3", diff --git a/public/index.html b/public/index.html index 032c92604..2f384b84c 100644 --- a/public/index.html +++ b/public/index.html @@ -18,9 +18,9 @@ - - - + + + <% } %> diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 64d5aefae..c1bec15a9 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -240,8 +240,8 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: {x: -8, y: -4}, // 运行时间偏移量 - textColor: '#C0C0C0', // 停站时间字体颜色 + offset: {x: -50, y: 10}, // 运行时间偏移量 + textColor: '#FFFFFF', // 停站时间字体颜色 textFontSize: 10 }, jump: { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue index 89a553807..0d2540d23 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue @@ -32,32 +32,32 @@ :height="140" > - + - - {{ handleRouteName(scope.row.name) }} - + + {{ handleRouteName(scope.row.name) }} + - + - - {{ handleDirection(scope.row.startSignalCode) }} - + + {{ handleDirection(scope.row.startSignalCode) }} + - + - - {{ scope.row.turnBack ? '折返': '直通' }} - + + {{ scope.row.turnBack ? '折返': '直通' }} + - + - - {{ scope.row.atsControl == '0' ? '人工' : '自动' }} - + + {{ scope.row.atsControl == '0' ? '人工' : '自动' }} + @@ -93,7 +93,8 @@ export default { selected: null, tempData: [], stationName: '', - signalName: '' + signalName: '', + domIdChoose: '' }; }, computed: { diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue index 696eed1e0..83cd8f1e3 100644 --- a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue +++ b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue @@ -51,6 +51,7 @@ export default { }, data() { return { + lineCode: '' }; }, computed: { diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index 54c282ba1..30c5769a9 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -12,11 +12,10 @@ /> - @@ -26,7 +25,7 @@ - +