diff --git a/src/router/index.js b/src/router/index.js index 2828534b0..6ecd3baea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -372,11 +372,11 @@ export const publicAsyncRoute = [ component: DisplayNew, hidden: true }, - { - path: '/displayCity/:mode', - component: DisplayCity, - hidden: true - }, + { + path: '/displayCity/:mode', + component: DisplayCity, + hidden: true + }, { path: '/design/displayNew/:mode', component: DesignDisplayNew, diff --git a/src/views/planMonitor/components/routingoperate/routeConfig.vue b/src/views/planMonitor/components/routingoperate/routeConfig.vue index 22b37c112..b88876158 100644 --- a/src/views/planMonitor/components/routingoperate/routeConfig.vue +++ b/src/views/planMonitor/components/routingoperate/routeConfig.vue @@ -6,159 +6,157 @@ {{ $t('map.newConstruction') }} - -
- - - - - + + + + + + + + + + + + + + {{ $t('map.activate') }} + + + + + + + + + + + {{ $t('map.activate') }} + + + + + + + + + + + + + + 生成经停区段 + + + + + + + + + + + +
+ 车站: + - - - - - {{ $t('map.activate') }} - - - +
+
+ 区段: + - - - - - {{ $t('map.activate') }} - - - - - - - - - - - - - - 生成经停区段 - - - - - - - - - - - -
- 车站: - - - - {{ $t('map.activate') }} -
-
- 区段: - - - - {{ $t('map.activate') }} - - {{ $t('map.add') }} - -
-
-
- - - {{ $t('map.save') }} + {{ $t('map.add') }} - {{ $t('map.updata') }} - - +
+
+ + {{ $t('map.save') }} + + {{ $t('map.updata') }} + + +
@@ -176,7 +174,7 @@ import Sortable from 'sortablejs'; export default { name:'RouteConfig', components: { - RouteOperate, + RouteOperate // ImportRouteOperate }, data() { @@ -706,30 +704,28 @@ export default { margin-right: 5px; } .routeConfig{ - height:100%; - position: relative; + height: 100%; + display: flex; + flex-direction: column; } .routeConfigTop{ padding: 7px 20px 7px 0px; - position: absolute; background: #fff; width: 100%; z-index: 2; height: 35px; font-size: 16px; - display: inline-block; -webkit-box-shadow: 0px 1px 3px #ccc; box-shadow: 0px 1px 3px #ccc; - right: 0; - top: 0; } .routeConfigTop button{ display:inline-block; } .definition{ - padding: 45px 30px 45px 0px; + padding: 15px 30px 15px 0px; height: 100%; overflow: auto; + flex:1; &::-webkit-scrollbar { width: 4px; } @@ -746,16 +742,12 @@ export default { } } .buttonGroup{ - position: absolute; width: 100%; height: 40px; - bottom: 0; background: #fff; - margin-bottom: 0px; box-shadow: 0px -2px 5px #ccc; - z-index: 2; - text-align: right; padding-right: 26px; padding-top: 4px; + z-index:2; } diff --git a/src/views/planMonitor/components/routingoperate/routeMap.vue b/src/views/planMonitor/components/routingoperate/routeMap.vue index 05e990803..45d376efd 100644 --- a/src/views/planMonitor/components/routingoperate/routeMap.vue +++ b/src/views/planMonitor/components/routingoperate/routeMap.vue @@ -158,31 +158,15 @@ export default { + diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue index 399b99e3e..c36af37b2 100644 --- a/src/views/planMonitor/editTool/index.vue +++ b/src/views/planMonitor/editTool/index.vue @@ -2,7 +2,6 @@
+ .plan-tool { position: absolute; + overflow: hidden; &::before { // content: ''; // position: absolute;