Merge remote-tracking branch 'origin/develop'

src/views/jlmap3d/drive/equipbox/equipbox.vue

@@ -103,7 +103,7 @@
 
       <div id="doorpick" class="ebpanebutton2" style="top:33%;left:70%;">
         <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: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'}" >
@@ -171,6 +171,10 @@
 			groupNum: {
 				type: String,
 				default: null
+			},
+			atpOn: {
+				type: Boolean,
+                default: false
 			}
 		},
     data() {
@@ -224,7 +228,6 @@
           }
         }
       },
-
       atpclick: function (type){
 				let data = {
 					groupNumber:this.groupNum,

src/views/jlmap3d/drive/jl3ddrive.vue

@@ -51,7 +51,7 @@
     <Drive-Mmi v-if="mmishow" ref="mmiui" />
     <Drive-Tms v-if="tmsshow" ref="tmsui" />
     <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" />
   </div>
 
@@ -140,7 +140,8 @@ export default {
             value: '',
             topid:null,
             nowdrive:null,
-            takeOver: false
+            takeOver: false,
+			atpOn: false
         };
     },
     computed: {
@@ -418,6 +419,9 @@ export default {
             if (this.$refs.mmiui) {
                 this.$refs.mmiui.updatetrainstatus(newdata);
             }
+			if(newdata.hasOwnProperty('atpOn')){
+				this.atpOn = newdata.atpOn;
+			}
 
             updatabuttonlight(newdata);
         },