Merge branch 'dev' into test

This commit is contained in:
zyy 2019-12-18 13:25:59 +08:00
commit 26de4ee6a4

View File

@ -13,17 +13,17 @@
<el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
</div>
<el-tabs v-model="enabledTab" type="card" class="map_card" @tab-click="changePane">
<el-tab-pane :label="$t('map.routeID')" class="tab_pane_box" name="route">
<route-operate
ref="routeOperate"
<el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
<protect-operate
ref="protectOperate"
:map-info="mapInfo"
:selected="selected"
@setCenter="setCenter"
/>
</el-tab-pane>
<el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
<protect-operate
ref="protectOperate"
<el-tab-pane :label="$t('map.routeID')" class="tab_pane_box" name="route">
<route-operate
ref="routeOperate"
:map-info="mapInfo"
:selected="selected"
@setCenter="setCenter"
@ -109,7 +109,7 @@ export default {
},
data() {
return {
enabledTab: 'route',
enabledTab: 'protect',
oldDevice: null
};
},