Merge branch 'dev' into test
This commit is contained in:
commit
26de4ee6a4
@ -13,17 +13,17 @@
|
|||||||
<el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
|
<el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-tabs v-model="enabledTab" type="card" class="map_card" @tab-click="changePane">
|
<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">
|
<el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
|
||||||
<route-operate
|
<protect-operate
|
||||||
ref="routeOperate"
|
ref="protectOperate"
|
||||||
:map-info="mapInfo"
|
:map-info="mapInfo"
|
||||||
:selected="selected"
|
:selected="selected"
|
||||||
@setCenter="setCenter"
|
@setCenter="setCenter"
|
||||||
/>
|
/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane :label="$t('map.continueProtect')" class="tab_pane_box" name="protect">
|
<el-tab-pane :label="$t('map.routeID')" class="tab_pane_box" name="route">
|
||||||
<protect-operate
|
<route-operate
|
||||||
ref="protectOperate"
|
ref="routeOperate"
|
||||||
:map-info="mapInfo"
|
:map-info="mapInfo"
|
||||||
:selected="selected"
|
:selected="selected"
|
||||||
@setCenter="setCenter"
|
@setCenter="setCenter"
|
||||||
@ -109,7 +109,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
enabledTab: 'route',
|
enabledTab: 'protect',
|
||||||
oldDevice: null
|
oldDevice: null
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user