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

Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 3m46s
Details

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-09-10 12:15:53 +08:00
commit 0212e1af47
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/jlmap3d/drive/equipbox/equipbox.vue
View File

@ -103,7 +103,7 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:70%;"> <div id="doorpick" class="ebpanebutton2" style="top:33%;left:70%;">
<img class="ebbuttonimg2" :src="zuoimg" /> <img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg" @click=""/> <img class="ebbuttonimg2" :src="niuimg" :style="{transform: atpOn ? 'rotate(0deg)':'rotate(45deg)'}"/>
<div class="tfbutton" style="font-size:10px;top:5px;left:33px;" @click="atpclick(false)">正常</div> <div class="tfbutton" style="font-size:10px;top:5px;left:33px;" @click="atpclick(false)">正常</div>
<div class="tfbutton" style="font-size:10px;top:13px;left:50px;" @click="atpclick(true)">切除</div> <div class="tfbutton" style="font-size:10px;top:13px;left:50px;" @click="atpclick(true)">切除</div>
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" > <div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
@ -171,6 +171,10 @@
groupNum: { groupNum: {
type: String, type: String,
default: null default: null
},
atpOn: {
type: Boolean,
default: false
} }
}, },
data() { data() {
@ -224,7 +228,6 @@
} }
} }
}, },
atpclick: function (type){ atpclick: function (type){
let data = { let data = {
groupNumber:this.groupNum, groupNumber:this.groupNum,

8
src/views/jlmap3d/drive/jl3ddrive.vue
View File

@ -51,7 +51,7 @@
<Drive-Mmi v-if="mmishow" ref="mmiui" /> <Drive-Mmi v-if="mmishow" ref="mmiui" />
<Drive-Tms v-if="tmsshow" ref="tmsui" /> <Drive-Tms v-if="tmsshow" ref="tmsui" />
<Drive-Control v-if="dcontrolshow" ref="dcontrol" :group-num="groupnum" :user-role="userrole" /> <Drive-Control v-if="dcontrolshow" ref="dcontrol" :group-num="groupnum" :user-role="userrole" />
<Equip-Box v-if="equipboxshow" :group-num="groupnum" /> <Equip-Box v-if="equipboxshow" :group-num="groupnum" :atpOn="atpOn" ref="equipbox" />
<psl v-if="pslShow" ref="psl" pop-class="xian-01__systerm" /> <psl v-if="pslShow" ref="psl" pop-class="xian-01__systerm" />
</div> </div>
@ -140,7 +140,8 @@ export default {
value: '', value: '',
topid:null, topid:null,
nowdrive:null, nowdrive:null,
takeOver: false takeOver: false,
atpOn: false
}; };
}, },
computed: { computed: {
@ -418,6 +419,9 @@ export default {
if (this.$refs.mmiui) { if (this.$refs.mmiui) {
this.$refs.mmiui.updatetrainstatus(newdata); this.$refs.mmiui.updatetrainstatus(newdata);
} }
if(newdata.hasOwnProperty('atpOn')){
this.atpOn = newdata.atpOn;
}
updatabuttonlight(newdata); updatabuttonlight(newdata);
}, },