Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -64,7 +64,7 @@ export default {
         }
 
         const getRoomDetail = (roomId) => {
-            proxy.$http.get('/api-web/machineroom/list',{},function (res){
+            proxy.$http.get('/api-web/bigScreen/list',{},function (res){
                 if(res && res.data){
                     let roomSecondData=[];
 
@@ -77,7 +77,7 @@ export default {
                     })
                     commandNameData.value = roomSecondData;//机房布局数据
                 }
-            })
+            },undefined,true,false)
         }
 
         const showVideo = (flg) => {

@@ -112,7 +112,7 @@ export default {
                                 }
                             })
                         }
-                    })
+                    },undefined,true,false)
                 } catch (e) {
                     console.log(e);
                 }

@@ -201,7 +201,7 @@ export default {
                 theirRoomId:props.machineData.machineRoomId,
                 theirCabinet:CabinetNum
             }
-            $.get(proxy.domainName+'/api-web/v32/res/cabinet?access_token='+proxy.accessToken,parmas,function (res){
+            $.get(proxy.domainName+'/api-web/bigScreen/cabinet',parmas,function (res){
                 if(res){
                     let resData=res.data;
                     let deviceDatas=[];
@@ -217,7 +217,7 @@ export default {
                     proxy.getDeviceInfo()
 
                 }
-            })
+            },undefined,true,false)
         }
         let UpositionBottom=Vue.ref(-1);
         if(props.machineData.Uposition){
@@ -296,13 +296,14 @@ export default {
         }
         //展示告警列表
         let alarmList=(resId)=>{
+            if(proxy.deviceDataInfo.alarmNum>0){
             hidedialog(true);
             let params={
                 page:currentPage.value,
                 limit:pageSize.value,
                 resId:proxy.deviceDataInfo.resId
             }
-            proxy.$http.get(`/api-web/home/alarm/alarmListPage`, params, function (res) {
+            proxy.$http.get(`/api-web/bigScreen/alarm/alarmListPage`, params, function (res) {
                 if (res && res.success == true && res.data) {
                     tableDataList.value = res.data;
                     count.value=res.count;
@@ -311,7 +312,8 @@ export default {
                     count.value=0;
 
                 }
-            })
+            },undefined,true,false)
+            }
         }
         //告警列表弹框操作
         let dialogVisible=Vue.ref(false);

@@ -386,7 +386,7 @@ export default {
                         width:''
                     },
                     {
-                        name:'B4',
+                        name:'B5',
                         isShow:true,
                         className:'',
                         imgEmpty:false,

@@ -18,7 +18,7 @@ export default {
         let machineRoomRes=Vue.ref();
         const getData=(roomRow)=>{
             proxy.machineRoomRes=roomRow;
-            proxy.$http.get('/api-web/machineroom/list',{},function (res){
+            proxy.$http.get('/api-web/bigScreen/list',{},function (res){
                 if(res && res.data){
                     let roomSecondDataArr=res.data;
                     let roomSecondData=[];
@@ -34,7 +34,7 @@ export default {
 
                     console.log("下层机房数据",proxy.roomSecondData)
                 }
-            })
+            },undefined,true,false)
         }
         // 挂载完
         Vue.onMounted(() => {

@@ -54,7 +54,7 @@ export default {
         * */
         let roomSecondData=Vue.ref([]);//兴议或者湖州下层机房数据
         const getData=(roomRow)=>{
-              proxy.$http.get('/api-web/machineroom/list',{},function (res){
+              proxy.$http.get('/api-web/bigScreen/list',{},function (res){
                   if(res && res.data){
                       let roomSecondDataArr=res.data;
                       let roomSecondData=[];
@@ -70,7 +70,7 @@ export default {
 
                       console.log("下层机房数据",proxy.roomSecondData)
                   }
-            })
+            },undefined,true,false)
         }
 
         return{