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

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



See merge request !556

@@ -17,7 +17,7 @@ export default {
             () => myImport('views/commonComponents/machineRoom/index')
         ),
     },
-    props:['commandNameData'],
+    props:['commandNameData','machineRoomRes'],
     data(){
         return {
             domainName:sessionStorage.getItem('domainName'),
@@ -82,13 +82,17 @@ export default {
                 try {
                     const ele = proxy.$refs[`machineRoom`];
                     var info = $(ele.$refs['roomDetail'].$refs['roomTable']);
-                    info.find(`td`).prepend('<i class="el-icon-arrow-down" style="color: #1E9FFF"></i>')
                     var params = {
                         theirRoomId : proxy.commandNameDataItem.machineRoomId
                     }
                     proxy.$http.get(`/api-web/bigScreen/cabinetRoom`, params, function (res) {
                         if (res && res.success == true) {
                             res.data.filter(function(v){
+                                let machineRoomRes=props.machineRoomRes;
+                                if(machineRoomRes != null && v.theirCabinet == machineRoomRes.theirCabinet){
+                                    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>')
+                                }
                                 if(v.alarm == '0'){
                                     // 有告警信息展示方式
                                     info.find(`td[name="${v.theirCabinet}"] span`).addClass('arrowBox');//.css('color','blue')

@@ -221,7 +221,7 @@ export default {
         }
         let UpositionBottom=Vue.ref(-1);
         if(props.machineData.Uposition){
-            UpositionBottom.value=(props.machineData.Uposition-1)*16
+            UpositionBottom.value=(props.machineData.Uposition-1)*16+8
         }
         const getDeviceInfo=()=>{
             proxy.deviceDatas.map((item,index)=>{

 <!--机房布局-->
 <div style="margin-left: 15px;margin-top: 6px; ">
-    <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
+    <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData" :machineRoomRes="machineRoomRes"></GetMachineRoom>
 </div>
 

@@ -15,7 +15,9 @@ export default {
         const {proxy} = Vue.getCurrentInstance();
         let roomSecondData=Vue.ref([]);
         let commandNameData=Vue.ref();
+        let machineRoomRes=Vue.ref();
         const getData=(roomRow)=>{
+            proxy.machineRoomRes=roomRow;
             proxy.$http.get('/api-web/machineroom/list',{},function (res){
                 if(res && res.data){
                     let roomSecondDataArr=res.data;
@@ -43,7 +45,8 @@ export default {
         return{
             getData,
             roomSecondData,
-            commandNameData
+            commandNameData,
+            machineRoomRes
         }
     }
 }