修改代码

This commit is contained in:
zyy 2019-12-04 14:08:55 +08:00
parent f97bd74c39
commit 69e73b2195
3 changed files with 59 additions and 21 deletions

View File

@ -66,7 +66,7 @@
@stationSectionCode="stationEnabledTab" @stationSectionCode="stationEnabledTab"
/> />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane :label="$t('map.zcZoneControl')" class="tab_pane_box" name="ZcControl"> <el-tab-pane :label="$t('map.zcZoneControl')" class="tab_pane_box" name="ZcControl">
<zc-control-draft <zc-control-draft
ref="ZcControl" ref="ZcControl"
:selected="selected" :selected="selected"
@ -90,15 +90,15 @@
@setCenter="setCenter" @setCenter="setCenter"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('map.counter')" class="tab_pane_box" name="Counter"> <!-- <el-tab-pane :label="$t('map.counter')" class="tab_pane_box" name="Counter">
<counter-draft <counter-draft
ref="Counter" ref="Counter"
:selected="selected" :selected="selected"
@updateMapModel="updateMapModel" @updateMapModel="updateMapModel"
@setCenter="setCenter" @setCenter="setCenter"
/> />
</el-tab-pane> </el-tab-pane> -->
<el-tab-pane :label="$t('map.delayUnlock')" class="tab_pane_box" name="DelayUnlock"> <!-- <el-tab-pane :label="$t('map.delayUnlock')" class="tab_pane_box" name="DelayUnlock">
<delay-unlock-draft <delay-unlock-draft
ref="DelayUnlock" ref="DelayUnlock"
:selected="selected" :selected="selected"
@ -181,9 +181,9 @@ import TrainDraft from './train/index';
import LineDraft from './line'; import LineDraft from './line';
import TextDraft from './text'; import TextDraft from './text';
import TrainWindowDraft from './trainwindow'; import TrainWindowDraft from './trainwindow';
// import ZcControlDraft from './zcControl'; import ZcControlDraft from './zcControl';
// import LimitControlDraft from './limitControl'; import LimitControlDraft from './limitControl';
// import LcControlDraft from './lcControl'; import LcControlDraft from './lcControl';
import ImageControlDraft from './ImageControl'; import ImageControlDraft from './ImageControl';
// import ButtonDraft from './buttonDraft'; // import ButtonDraft from './buttonDraft';
import CheckboxDraft from './checkboxDraft'; import CheckboxDraft from './checkboxDraft';
@ -205,9 +205,9 @@ export default {
TrainDraft, TrainDraft,
LineDraft, LineDraft,
TextDraft, TextDraft,
// ZcControlDraft, ZcControlDraft,
// LimitControlDraft, LimitControlDraft,
// LcControlDraft, LcControlDraft,
ImageControlDraft, ImageControlDraft,
// ButtonDraft, // ButtonDraft,
CheckboxDraft CheckboxDraft

View File

@ -41,6 +41,54 @@
</el-button-group> </el-button-group>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane class="view-control" label="控制模式" name="three">
<div style="height: calc(100% - 46px);">
<el-scrollbar wrap-class="scrollbar-wrapper">
111
</el-scrollbar>
</div>
<div class="button_box">
<el-button-group class="map-draft-group">
<el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
</el-button-group>
</div>
</el-tab-pane>
<el-tab-pane class="view-control" label="计数器" name="four">
<div style="height: calc(100% - 46px);">
<el-scrollbar wrap-class="scrollbar-wrapper">
222
</el-scrollbar>
</div>
<div class="button_box">
<el-button-group class="map-draft-group">
<el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
</el-button-group>
</div>
</el-tab-pane>
<el-tab-pane class="view-control" label="延迟解锁" name="five">
<div style="height: calc(100% - 46px);">
<el-scrollbar wrap-class="scrollbar-wrapper">
333
</el-scrollbar>
</div>
<div class="button_box">
<el-button-group class="map-draft-group">
<el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
</el-button-group>
</div>
</el-tab-pane>
<el-tab-pane class="view-control" label="按图折返" name="six">
<div style="height: calc(100% - 46px);">
<el-scrollbar wrap-class="scrollbar-wrapper">
444
</el-scrollbar>
</div>
<div class="button_box">
<el-button-group class="map-draft-group">
<el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
</el-button-group>
</div>
</el-tab-pane>
</el-tabs> </el-tabs>
</template> </template>

View File

@ -32,16 +32,6 @@
@click="hover('standSelectStationCode')" @click="hover('standSelectStationCode')"
>{{ $t('map.activate') }}</el-button> >{{ $t('map.activate') }}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('map.equipmentStation')" prop="deviceStationCode">
<el-select v-model="addModel.deviceStationCode" filterable disabled>
<el-option
v-for="item in stationList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('map.stationstandDirection')" prop="doorLocationType"> <el-form-item :label="$t('map.stationstandDirection')" prop="doorLocationType">
<el-select v-model="addModel.doorLocationType" filterable :placeholder="$t('map.pleaseSelect')"> <el-select v-model="addModel.doorLocationType" filterable :placeholder="$t('map.pleaseSelect')">
<el-option <el-option