joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-05 16:53:46 +08:00
commit b9cfd28c17
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/iscs/iscsDraw/iscsAcsOperate/index.vue
View File

@ -10,7 +10,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="门禁" name="entranceGuard">
<el-tab-pane label="门禁" name="EntranceGuard">
<entrance-guard
ref="entranceGuard"
style="width: 90%;"
@ -18,7 +18,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -26,7 +26,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -34,7 +34,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"

12
src/views/iscs/iscsDraw/iscsAfcOperate/index.vue
View File

@ -10,7 +10,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="闸机" name="brakeMachine">
<el-tab-pane label="闸机" name="BrakeMachine">
<brake-machine
ref="brakeMachine"
style="width: 90%;"
@ -18,7 +18,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="自动售货机" name="ticketMachine">
<el-tab-pane label="自动售货机" name="TicketMachine">
<ticket-machine
ref="ticketMachine"
style="width: 90%"
@ -26,7 +26,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="半自动售货机" name="semiAutomaticTicketMachine">
<el-tab-pane label="半自动售货机" name="SemiAutomaticTicketMachine">
<semi-automatic-ticket-machine
ref="semiAutomaticTicketMachine"
style="width: 90%"
@ -34,7 +34,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -42,7 +42,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -50,7 +50,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"

28
src/views/iscs/iscsDraw/iscsBasOperate/index.vue
View File

@ -11,7 +11,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="冷冻泵/冷却泵" name="frozenPump">
<el-tab-pane label="冷冻泵/冷却泵" name="FrozenPump">
<frozen-pump
ref="frozenPump"
style="width:90%"
@ -19,7 +19,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="冷水机组" name="chiller">
<el-tab-pane label="冷水机组" name="Chiller">
<chiller
ref="chiller"
style="width:90%"
@ -27,7 +27,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="冷却塔" name="coolTower">
<el-tab-pane label="冷却塔" name="CoolTower">
<cool-tower
ref="coolTower"
style="width:90%"
@ -35,7 +35,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="排风机" name="ventilator">
<el-tab-pane label="排风机" name="Ventilator">
<ventilator
ref="ventilator"
style="width:90%"
@ -43,7 +43,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="空调机" name="airConditioner">
<el-tab-pane label="空调机" name="AirConditioner">
<air-conditioner
ref="airConditioner"
style="width:90%"
@ -51,7 +51,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="轨道排风机" name="orbitalVentilator">
<el-tab-pane label="轨道排风机" name="OrbitalVentilator">
<orbital-ventilator
ref="orbitalVentilator"
style="width:90%"
@ -59,7 +59,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="射流风机" name="jetFan">
<el-tab-pane label="射流风机" name="JetFan">
<jet-fan
ref="jetFan"
style="width:90%"
@ -67,7 +67,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="隧道风机" name="tunnelFan">
<el-tab-pane label="隧道风机" name="TunnelFan">
<tunnel-fan
ref="tunnelFan"
style="width:90%"
@ -75,7 +75,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="防火阀" name="fireDamper">
<el-tab-pane label="防火阀" name="FireDamper">
<fire-damper
ref="fireDamper"
style="width:90%"
@ -83,7 +83,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="防烟防火阀" name="smookProofFd">
<el-tab-pane label="防烟防火阀" name="SmookProofFd">
<smook-proof-fd
ref="smookProofFd"
style="width:90%"
@ -91,14 +91,14 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="风量调节阀" name="volumeControlDamper">
<el-tab-pane label="风量调节阀" name="VolumeControlDamper">
<volume-control-damper
ref="volumeControlDamper"
style="width: 90%"
@createDataModel="createDataModel"
@deleteDataModel="deleteDataModel"
/>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -106,7 +106,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -114,7 +114,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"

10
src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
View File

@ -10,7 +10,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="固定摄像机" name="vidicon">
<el-tab-pane label="固定摄像机" name="Vidicon">
<vidicon
ref="vidiconCloud"
style="width:90%"
@ -18,7 +18,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="云台摄像机" name="vidiconCloud">
<el-tab-pane label="云台摄像机" name="VidiconCloud">
<vidicon-cloud
ref="vidicon"
style="width:90%"
@ -26,7 +26,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -34,7 +34,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -42,7 +42,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"

18
src/views/iscs/iscsDraw/iscsOperate/index.vue
View File

@ -10,7 +10,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="手动报警按钮" name="maButton">
<el-tab-pane label="手动报警按钮" name="ManualAlarmButton">
<manual-alarm-button
ref="maButton"
style="width:90%"
@ -18,7 +18,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="消火栓报警按钮" name="fhaButton">
<el-tab-pane label="消火栓报警按钮" name="FireHydranAlarmButton">
<fire-hydran-alarm-button
ref="fhaButton"
style="width: 90%"
@ -26,7 +26,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="气体灭火" name="gasFireControl">
<el-tab-pane label="气体灭火" name="GasFireControl">
<gas-fire-control
ref="gasFireControl"
style="width: 90%;"
@ -34,7 +34,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="烟感探测器" name="smokeDetector">
<el-tab-pane label="烟感探测器" name="SmokeDetector">
<smoke-detector
ref="smokeDetector"
style="width: 90%;"
@ -42,7 +42,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="温度探测器" name="temperatureDetector">
<el-tab-pane label="温度探测器" name="TemperatureDetector">
<temperature-detector
ref="temperatureDetector"
style="width: 90%"
@ -50,7 +50,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -58,7 +58,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -66,7 +66,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"
@ -123,7 +123,7 @@ export default {
}
},
mounted() {
this.$emit('iscsChange', this.$route.params.id);
this.$emit('iscsChange', this.$route.params.id);
},
beforeDestroy() {

12
src/views/iscs/iscsDraw/iscsPsdOperate/index.vue
View File

@ -10,7 +10,7 @@
>{{ $t('ibp.save') }}</el-button>
</div>
<el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
<el-tab-pane label="屏蔽门" name="psd">
<el-tab-pane label="屏蔽门" name="PlatformScreenDoor">
<platform-screen-door
ref="platformScreenDoor"
style="width: 90%;"
@ -18,7 +18,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="端头门" name="endDoor">
<el-tab-pane label="端头门" name="EndDoor">
<end-door
ref="endDoor"
style="width: 90%;"
@ -26,7 +26,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="圆角边框" name="borderRadius">
<el-tab-pane label="圆角边框" name="BorderRadius">
<border-radius
ref="borderRadius"
style="width: 90%;"
@ -34,7 +34,7 @@
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="文字" name="iscsText">
<el-tab-pane label="文字" name="IscsText">
<iscs-text
ref="iscsText"
style="width: 90%;"
@ -42,7 +42,7 @@
@deleteDataModel="deleteDataModel">
</iscs-text>
</el-tab-pane>
<el-tab-pane label="线段" name="iscsLine">
<el-tab-pane label="线段" name="IscsLine">
<iscs-line
ref="iscsLine"
style="width: 90%;"
@ -50,7 +50,7 @@
@deleteDataModel="deleteDataModel">
</iscs-line>
</el-tab-pane>
<el-tab-pane label="矩形" name="iscsRect">
<el-tab-pane label="矩形" name="IscsRect">
<iscs-rect
ref="iscsRect"
style="width: 90%;"