Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …
…master-v32-lushangqing
Showing
6 changed files
with
14 additions
and
12 deletions
@@ -64,7 +64,7 @@ export default { | @@ -64,7 +64,7 @@ export default { | ||
64 | } | 64 | } |
65 | 65 | ||
66 | const getRoomDetail = (roomId) => { | 66 | const getRoomDetail = (roomId) => { |
67 | - proxy.$http.get('/api-web/machineroom/list',{},function (res){ | 67 | + proxy.$http.get('/api-web/bigScreen/list',{},function (res){ |
68 | if(res && res.data){ | 68 | if(res && res.data){ |
69 | let roomSecondData=[]; | 69 | let roomSecondData=[]; |
70 | 70 | ||
@@ -77,7 +77,7 @@ export default { | @@ -77,7 +77,7 @@ export default { | ||
77 | }) | 77 | }) |
78 | commandNameData.value = roomSecondData;//机房布局数据 | 78 | commandNameData.value = roomSecondData;//机房布局数据 |
79 | } | 79 | } |
80 | - }) | 80 | + },undefined,true,false) |
81 | } | 81 | } |
82 | 82 | ||
83 | const showVideo = (flg) => { | 83 | const showVideo = (flg) => { |
@@ -201,7 +201,7 @@ export default { | @@ -201,7 +201,7 @@ export default { | ||
201 | theirRoomId:props.machineData.machineRoomId, | 201 | theirRoomId:props.machineData.machineRoomId, |
202 | theirCabinet:CabinetNum | 202 | theirCabinet:CabinetNum |
203 | } | 203 | } |
204 | - $.get(proxy.domainName+'/api-web/v32/res/cabinet?access_token='+proxy.accessToken,parmas,function (res){ | 204 | + $.get(proxy.domainName+'/api-web/bigScreen/cabinet',parmas,function (res){ |
205 | if(res){ | 205 | if(res){ |
206 | let resData=res.data; | 206 | let resData=res.data; |
207 | let deviceDatas=[]; | 207 | let deviceDatas=[]; |
@@ -217,7 +217,7 @@ export default { | @@ -217,7 +217,7 @@ export default { | ||
217 | proxy.getDeviceInfo() | 217 | proxy.getDeviceInfo() |
218 | 218 | ||
219 | } | 219 | } |
220 | - }) | 220 | + },undefined,true,false) |
221 | } | 221 | } |
222 | let UpositionBottom=Vue.ref(-1); | 222 | let UpositionBottom=Vue.ref(-1); |
223 | if(props.machineData.Uposition){ | 223 | if(props.machineData.Uposition){ |
@@ -296,13 +296,14 @@ export default { | @@ -296,13 +296,14 @@ export default { | ||
296 | } | 296 | } |
297 | //展示告警列表 | 297 | //展示告警列表 |
298 | let alarmList=(resId)=>{ | 298 | let alarmList=(resId)=>{ |
299 | + if(proxy.deviceDataInfo.alarmNum>0){ | ||
299 | hidedialog(true); | 300 | hidedialog(true); |
300 | let params={ | 301 | let params={ |
301 | page:currentPage.value, | 302 | page:currentPage.value, |
302 | limit:pageSize.value, | 303 | limit:pageSize.value, |
303 | resId:proxy.deviceDataInfo.resId | 304 | resId:proxy.deviceDataInfo.resId |
304 | } | 305 | } |
305 | - proxy.$http.get(`/api-web/home/alarm/alarmListPage`, params, function (res) { | 306 | + proxy.$http.get(`/api-web/bigScreen/alarm/alarmListPage`, params, function (res) { |
306 | if (res && res.success == true && res.data) { | 307 | if (res && res.success == true && res.data) { |
307 | tableDataList.value = res.data; | 308 | tableDataList.value = res.data; |
308 | count.value=res.count; | 309 | count.value=res.count; |
@@ -311,7 +312,8 @@ export default { | @@ -311,7 +312,8 @@ export default { | ||
311 | count.value=0; | 312 | count.value=0; |
312 | 313 | ||
313 | } | 314 | } |
314 | - }) | 315 | + },undefined,true,false) |
316 | + } | ||
315 | } | 317 | } |
316 | //告警列表弹框操作 | 318 | //告警列表弹框操作 |
317 | let dialogVisible=Vue.ref(false); | 319 | let dialogVisible=Vue.ref(false); |
@@ -18,7 +18,7 @@ export default { | @@ -18,7 +18,7 @@ export default { | ||
18 | let machineRoomRes=Vue.ref(); | 18 | let machineRoomRes=Vue.ref(); |
19 | const getData=(roomRow)=>{ | 19 | const getData=(roomRow)=>{ |
20 | proxy.machineRoomRes=roomRow; | 20 | proxy.machineRoomRes=roomRow; |
21 | - proxy.$http.get('/api-web/machineroom/list',{},function (res){ | 21 | + proxy.$http.get('/api-web/bigScreen/list',{},function (res){ |
22 | if(res && res.data){ | 22 | if(res && res.data){ |
23 | let roomSecondDataArr=res.data; | 23 | let roomSecondDataArr=res.data; |
24 | let roomSecondData=[]; | 24 | let roomSecondData=[]; |
@@ -34,7 +34,7 @@ export default { | @@ -34,7 +34,7 @@ export default { | ||
34 | 34 | ||
35 | console.log("下层机房数据",proxy.roomSecondData) | 35 | console.log("下层机房数据",proxy.roomSecondData) |
36 | } | 36 | } |
37 | - }) | 37 | + },undefined,true,false) |
38 | } | 38 | } |
39 | // 挂载完 | 39 | // 挂载完 |
40 | Vue.onMounted(() => { | 40 | Vue.onMounted(() => { |
@@ -54,7 +54,7 @@ export default { | @@ -54,7 +54,7 @@ export default { | ||
54 | * */ | 54 | * */ |
55 | let roomSecondData=Vue.ref([]);//兴议或者湖州下层机房数据 | 55 | let roomSecondData=Vue.ref([]);//兴议或者湖州下层机房数据 |
56 | const getData=(roomRow)=>{ | 56 | const getData=(roomRow)=>{ |
57 | - proxy.$http.get('/api-web/machineroom/list',{},function (res){ | 57 | + proxy.$http.get('/api-web/bigScreen/list',{},function (res){ |
58 | if(res && res.data){ | 58 | if(res && res.data){ |
59 | let roomSecondDataArr=res.data; | 59 | let roomSecondDataArr=res.data; |
60 | let roomSecondData=[]; | 60 | let roomSecondData=[]; |
@@ -70,7 +70,7 @@ export default { | @@ -70,7 +70,7 @@ export default { | ||
70 | 70 | ||
71 | console.log("下层机房数据",proxy.roomSecondData) | 71 | console.log("下层机房数据",proxy.roomSecondData) |
72 | } | 72 | } |
73 | - }) | 73 | + },undefined,true,false) |
74 | } | 74 | } |
75 | 75 | ||
76 | return{ | 76 | return{ |
-
Please register or login to post a comment