Merge branch 'master-v32-xwx' into 'master'

[909] 活动告警显示硬件设备告警信息3#



See merge request !559

@@ -91,7 +91,8 @@ export default {
                                 let machineRoomRes=props.machineRoomRes;
                                 let machineRoomRes=props.machineRoomRes;
                                 if(machineRoomRes != null && v.theirCabinet == machineRoomRes.theirCabinet){
                                 if(machineRoomRes != null && v.theirCabinet == machineRoomRes.theirCabinet){
                                     proxy.commandNameDataItem.Uposition=machineRoomRes.startU;
                                     proxy.commandNameDataItem.Uposition=machineRoomRes.startU;
-                                    info.find(`td[name="${v.theirCabinet}"]`).prepend('<i class="el-icon-arrow-down" style="position:absolute;left:0;right:0;top:-15px;color:#1e9fff;"></i>')
+                                    proxy.commandNameDataItem.umName=machineRoomRes.theirCabinet;
+                                    info.find(`td[name="${v.theirCabinet}"]`).prepend('<i class="el-icon-s-flag" style="position:absolute;left:0;right:0;top:-18px;color:#1e9fff;"></i>')
                                 }
                                 }
                                 if(v.alarm == '0'){
                                 if(v.alarm == '0'){
                                     // 有告警信息展示方式
                                     // 有告警信息展示方式

@@ -33,7 +33,7 @@
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            <i v-if="UpositionBottom!=-1" class="el-icon-arrow-left" :style="'position: absolute;right:-12px;color:#1e9fff;bottom:'+UpositionBottom+'px;'"></i>
+            <i v-if="UpositionBottom!=-1 && machineData.umName == detailData.name" class="el-icon-s-flag" :style="'position: absolute;right:-15px;color:#1e9fff;bottom:'+UpositionBottom+'px;'"></i>
         </div>
         </div>
     </div>
     </div>
     <!-- 右侧机柜详细信息 -->
     <!-- 右侧机柜详细信息 -->

 <!--机房布局-->
 <!--机房布局-->
-<div style="margin-left: 15px;margin-top: 6px; ">
+<div class="dataCenter-container" style="background-image: url(/h5/machineroom/img/img-beijing-dp.png);height: 100%;padding: 10px">
     <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData" :machineRoomRes="machineRoomRes"></GetMachineRoom>
     <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData" :machineRoomRes="machineRoomRes"></GetMachineRoom>
 </div>
 </div>