From 8e3b148182bf2369d3de5eb73f150a16f2985ffe Mon Sep 17 00:00:00 2001 From: jinna Date: Mon, 30 Oct 2023 18:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=8F=8A=E7=89=A9=E8=81=94=E7=BD=91=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/index.vue | 14 +- src/views/alarmcenter/index.vue | 49 ++++--- src/views/alarmcenter/peopleposition/list.vue | 101 ++++++++----- src/views/alarmcenter/point/list.vue | 35 +++-- src/views/alarmcenter/sosAlarm/list.vue | 81 ++++++----- src/views/h5Player/player.vue | 37 ++++- src/views/rails/arealist.vue | 133 +++++++++++++----- src/views/rails/list.vue | 98 +++++++++---- .../wirelessintrusion/deployment/list.vue | 87 ++++++++---- src/views/wirelessintrusion/device/list.vue | 103 +++++++++----- src/views/wirelessintrusion/oneClick/list.vue | 87 ++++++++---- src/views/wirelessintrusion/warn/record.vue | 47 ++++--- 12 files changed, 587 insertions(+), 285 deletions(-) diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 53d33cc..7c67f24 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -68,7 +68,10 @@ -
+
+
X
+ +
诊间报警
@@ -464,9 +467,16 @@ width:86px; height:86px; border-radius:50%; - background: url("~@/assets/image/btn.gif") no-repeat; z-index: 9999; cursor: pointer; + + .close_warn{ + position: absolute; + top: -8px; + right: 13px; + color: rgb(179, 189, 202); + font-size: 14px; + } } .warn_right{ width: 20px; diff --git a/src/views/alarmcenter/index.vue b/src/views/alarmcenter/index.vue index 07f2e53..1910a94 100644 --- a/src/views/alarmcenter/index.vue +++ b/src/views/alarmcenter/index.vue @@ -242,26 +242,35 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => { - const data = res2.data; - this.videoData = data.rows; - if(this.videoData.length === 0){ - this.$message.warning('未查询到该报警点摄像头'); - } - else{ - // this.dialogVisible = true; - const routeData = this.$router.resolve({ - path: '/videoPlayer', // 跳转的路径 - query: { - list: JSON.stringify(this.videoData), // 携带的的参数信息 - showLeft:true - } - }) - console.log('href ===>',routeData.href) - window.open(routeData.href, '_blank') + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => { + const data = res2.data; + this.videoData = data.rows; + if(this.videoData.length === 0){ + this.$message.warning('未查询到该报警点摄像头'); + } + else{ + // this.dialogVisible = true; + const routeData = this.$router.resolve({ + path: '/videoPlayer', // 跳转的路径 + query: { + list: JSON.stringify(this.videoData), // 携带的的参数信息 + showLeft:true + } + }) + console.log('href ===>',routeData.href) + window.open(routeData.href, '_blank') + } + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => { @@ -287,6 +296,8 @@ export default { console.log('href ===>',routeData.href) window.open(routeData.href, '_blank') } + }else{ + this.$message.error('物联网平台访问超时！') } }); } diff --git a/src/views/alarmcenter/peopleposition/list.vue b/src/views/alarmcenter/peopleposition/list.vue index 1ee7174..4cb5b57 100644 --- a/src/views/alarmcenter/peopleposition/list.vue +++ b/src/views/alarmcenter/peopleposition/list.vue @@ -124,26 +124,37 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - terminalList(res.data.data.token, { page: 1, size: 1, buildingIds: this.buildingId, sn: row.sn }).then(res2 => { - if (res2.data.code == 401) { - window.sessionStorage.removeItem('bizToken'); - this.rowMap(row, index) - } - else if (res2.data.code == 0) { - const data = res2.data.data.content; - if (data.length > 0 && data[0].x && data[0].y) { - this.sn = row.sn; - this.x = data[0].x; - this.y = data[0].y; - this.floorNo = data[0].floorNo; - console.log(this.sn, this.x, this.y) - this.dialogVisible = true; - }else{ - this.$message.warning("未查询到该人员定位信息"); - } + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + terminalList(res.data.data.token, { page: 1, size: 1, buildingIds: this.buildingId, sn: row.sn }).then(res2 => { + if (res2.data.code == 401) { + window.sessionStorage.removeItem('bizToken'); + this.rowMap(row, index) + } + else if (res2.data.code == 0) { + const data = res2.data.data.content; + if (data.length > 0 && data[0].x && data[0].y) { + this.sn = row.sn; + this.x = data[0].x; + this.y = data[0].y; + this.floorNo = data[0].floorNo; + console.log(this.sn, this.x, this.y) + this.dialogVisible = true; + }else{ + this.$message.warning("未查询到该人员定位信息"); + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { @@ -164,6 +175,8 @@ export default { }else{ this.$message.warning("未查询到该人员定位信息"); } + }else{ + this.$message.error('物联网平台访问超时！') } }); } @@ -199,38 +212,56 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - this.loading = true; - selectPatientPage(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingIds: this.buildingId })).then(res2 => { - this.loading = false; - if (res2.data.code == 401) { - window.sessionStorage.removeItem('bizToken'); - this.onLoad(this.page); - } - else if (res2.data.code == 0) { - const data = res2.data.data; - this.page.total = data.total; - this.data = data.records; + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + this.loading = true; + selectPatientPage(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingIds: this.buildingId })).then(res2 => { + if (res2.data.code == 401) { + window.sessionStorage.removeItem('bizToken'); + this.onLoad(this.page); + } + else if (res2.data.code == 0) { + this.loading = false; + const data = res2.data.data; + this.page.total = data.total; + this.data = data.records; + }else{ + this.loading = false; + this.$message.error('物联网平台访问超时！') + } + }, err => { + this.loading = false; + this.$message.error('物联网平台访问超时！') + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }, err => { - this.loading = false; - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { this.loading = true; selectPatientPage(token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingIds: this.buildingId })).then(res2 => { - this.loading = false; + // this.loading = true; if (res2.data.code == 401) { window.sessionStorage.removeItem('bizToken'); this.onLoad(this.page); } else if (res2.data.code == 0) { + this.loading = false const data = res2.data.data; this.page.total = data.total; this.data = data.records; + }else{ + this.loading = false; + this.$message.error('物联网平台访问超时！') } }, err => { + this.$message.error('物联网平台访问超时！') this.loading = false; }); } diff --git a/src/views/alarmcenter/point/list.vue b/src/views/alarmcenter/point/list.vue index ea21095..a6a96dd 100644 --- a/src/views/alarmcenter/point/list.vue +++ b/src/views/alarmcenter/point/list.vue @@ -225,20 +225,29 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - if (this.deviceType == '1') { - bizDeviceList(res.data.data.token, { pageSize: this.page1.pageSize, pageNum: this.page1.currentPage }).then(res2 => { - const data = res2.data; - this.page1.total = data.total; - this.tableData = data.rows; - }); - } else { - bizDeviceList(res.data.data.token, { pageSize: this.page1.pageSize, pageNum: this.page1.currentPage, pid: 98 }).then(res2 => { - const data = res2.data; - this.page2.total = data.total; - this.tableData2 = data.rows; - }); + if(res.status == 200){ + if(res.data.code == 200){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + if (this.deviceType == '1') { + bizDeviceList(res.data.data.token, { pageSize: this.page1.pageSize, pageNum: this.page1.currentPage }).then(res2 => { + const data = res2.data; + this.page1.total = data.total; + this.tableData = data.rows; + }); + } else { + bizDeviceList(res.data.data.token, { pageSize: this.page1.pageSize, pageNum: this.page1.currentPage, pid: 98 }).then(res2 => { + const data = res2.data; + this.page2.total = data.total; + this.tableData2 = data.rows; + }); + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') } + }) } else { if (this.deviceType == '1') { diff --git a/src/views/alarmcenter/sosAlarm/list.vue b/src/views/alarmcenter/sosAlarm/list.vue index ba1bd18..1df676e 100644 --- a/src/views/alarmcenter/sosAlarm/list.vue +++ b/src/views/alarmcenter/sosAlarm/list.vue @@ -259,41 +259,56 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => { - const data = res2.data; - this.videoData = data.data; - if(this.videoData.length === 0){ - this.$message.warning('未查询到该报警点摄像头'); - } - else{ - let arr = [] - this.videoData.map(item =>{ - arr.push(item.name) - }) - let tmp = arr.join(',') - console.log('tmp ===>',tmp) - getCameraCode({keys:tmp}).then(res =>{ - console.log(res) - this.carmeraCode = res.data.data - if(this.carmeraCode.length === 0){ - this.$message.warning('未查询到该报警点摄像头'); + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => { + if(res.data.code == 0){ + const data = res2.data; + this.videoData = data.data; + if(this.videoData.length === 0){ + this.$message.warning('未查询到该报警点摄像头'); + } + else{ + let arr = [] + this.videoData.map(item =>{ + arr.push(item.name) + }) + let tmp = arr.join(',') + console.log('tmp ===>',tmp) + getCameraCode({keys:tmp}).then(res =>{ + console.log(res) + this.carmeraCode = res.data.data + if(this.carmeraCode.length === 0){ + this.$message.warning('未查询到该报警点摄像头'); + }else{ + // this.dialogVisible = true; + const routeData = this.$router.resolve({ + path: '/videoPlayer', // 跳转的路径 + query: { + list: JSON.stringify(this.carmeraCode), // 携带的的参数信息 + showLeft:true + } + }) + console.log('href ===>',routeData.href) + window.open(routeData.href, '_blank') + } + }) + // this.dialogVisible = true; + } }else{ - // this.dialogVisible = true; - const routeData = this.$router.resolve({ - path: '/videoPlayer', // 跳转的路径 - query: { - list: JSON.stringify(this.carmeraCode), // 携带的的参数信息 - showLeft:true - } - }) - console.log('href ===>',routeData.href) - window.open(routeData.href, '_blank') + this.$message.error('物联网平台访问超时！') } - }) - // this.dialogVisible = true; + + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { // console.log('ceshi2') @@ -424,6 +439,8 @@ export default { } }) } + }else{ + this.$message.error('物联网平台访问超时！') } }); } diff --git a/src/views/h5Player/player.vue b/src/views/h5Player/player.vue index 327332e..18e7a74 100644 --- a/src/views/h5Player/player.vue +++ b/src/views/h5Player/player.vue @@ -379,17 +379,42 @@ export default { // console.log(this.player) // this.videoList if(this.isOrder){ + // let arr = [] + // this.videoList = [] + // for(let i = 0;i < this.splitNum * this.splitNum;i++){ + // if(this.playUrlList[i]){ + // console.log('url ====>',this.playUrlList[i],i) + // arr.push({url:this.playUrlList[i].url,num:this.playUrlList[i].num}) + // }else{ + // arr.push({num:i + 1}) + // } + // } + // this.videoList = arr + // this.$nextTick(() =>{ + // this.isOrder = true; + // var alist = document.getElementsByClassName( "mask_item_box" ); + // if (alist){ + // for ( var idx = 0; idx < alist.length; idx ++){ + // var mya = alist[idx]; + // mya.style.width = document.getElementById('player').offsetWidth / this.splitNum + 'px'; + // mya.style.height = document.getElementById('player').offsetHeight / this.splitNum + 'px'; + // } + // } + // }) let arr = [] this.videoList = [] for(let i = 0;i < this.splitNum * this.splitNum;i++){ - if(this.playUrlList[i]){ - console.log('url ====>',this.playUrlList[i],i) - arr.push({url:this.playUrlList[i].url,num:this.playUrlList[i].num}) - }else{ - arr.push({num:i + 1}) - } + arr.push({num:i + 1}) } + arr.map(item =>{ + this.playUrlList.map(item1 =>{ + if(item.num == item1.num){ + item.url = item1.url + } + }) + }) this.videoList = arr + // console.log('videp1 ===>',this.videoList) this.$nextTick(() =>{ this.isOrder = true; var alist = document.getElementsByClassName( "mask_item_box" ); diff --git a/src/views/rails/arealist.vue b/src/views/rails/arealist.vue index 4068c83..27fa0ab 100644 --- a/src/views/rails/arealist.vue +++ b/src/views/rails/arealist.vue @@ -241,8 +241,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.submitForm(); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.submitForm(); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else if (res.data.code == 0) { @@ -267,8 +276,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.submitForm(); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.submitForm(); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else if (res.data.code == 0) { @@ -314,8 +332,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.rowDel(row); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.rowDel(row); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } }); @@ -353,22 +380,33 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - this.loading = true; - getRegionRailsList(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingId: this.buildingId })).then(res2 => { - this.loading = false; - if (res2.data.code == 401) { - window.sessionStorage.removeItem('bizToken'); - this.onLoad(this.page); - } - else { - const data = res2.data.data; - this.page.total = data.totalElements; - this.data = data.content; + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + this.loading = true; + getRegionRailsList(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingId: this.buildingId })).then(res2 => { + this.loading = false; + if (res2.data.code == 401) { + window.sessionStorage.removeItem('bizToken'); + this.onLoad(this.page); + } + else if(res2.data.code == 0){ + const data = res2.data.data; + this.page.total = data.totalElements; + this.data = data.content; + }else{ + this.$message.error('物联网平台访问超时！') + } + }, err => { + this.loading = false; + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }, err => { - this.loading = false; - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { @@ -379,10 +417,12 @@ export default { window.sessionStorage.removeItem('bizToken'); this.onLoad(this.page); } - else { + else if(res2.data.code == 0){ const data = res2.data.data; this.page.total = data.totalElements; this.data = data.content; + }else{ + this.$message.error('物联网平台访问超时！') } }, err => { this.loading = false; @@ -401,24 +441,39 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - getRailsList(res.data.data.token, { ...values, size: page.pageSize, page: page.currentPage, buildingId: this.buildingId }).then(res2 => { - const data = res2.data.data; - this.diaPage.total = data.totalElements; - this.tableData = data.content; - if (this.addForm.railIds.length > 0) { // 判断是否存在勾选过的数据 - this.$nextTick(() => { - this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 - this.addForm.railIds.forEach(item => { // 勾选到的数据 - if (row._id === item) { - this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 - } - }); - }) - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + getRailsList(res.data.data.token, { ...values, size: page.pageSize, page: page.currentPage, buildingId: this.buildingId }).then(res2 => { + if(res2.data.code == 0){ + const data = res2.data.data; + this.diaPage.total = data.totalElements; + this.tableData = data.content; + if (this.addForm.railIds.length > 0) { // 判断是否存在勾选过的数据 + this.$nextTick(() => { + this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 + this.addForm.railIds.forEach(item => { // 勾选到的数据 + if (row._id === item) { + this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 + } + }); + }) + }) + } + }else{ + this.$message.error('物联网平台访问超时！') + } + + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { getRailsList(token, { ...values, size: page.pageSize, page: page.currentPage, buildingId: this.buildingId }).then(res2 => { @@ -442,6 +497,8 @@ export default { }) }) } + }else{ + this.$message.error('物联网平台访问超时！') } }, err => { }); diff --git a/src/views/rails/list.vue b/src/views/rails/list.vue index d97b312..b9bae67 100644 --- a/src/views/rails/list.vue +++ b/src/views/rails/list.vue @@ -248,8 +248,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.changeOwn(val, row); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.changeOwn(val, row); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else if(res.data.code == 0) { setTimeout(() => { @@ -322,8 +331,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.submitForm(); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.submitForm(); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else if (res.data.code == 0) { @@ -348,8 +366,18 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.submitForm(); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.submitForm(); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + + }) } else if (res.data.code == 0) { @@ -395,8 +423,17 @@ export default { if (res.data.code == 401) { window.sessionStorage.removeItem('bizToken'); bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res2 => { - window.sessionStorage.setItem('bizToken', res2.data.data.token); - this.rowDel(row); + if(res2.status == 200){ + if(res2.data.code == 0){ + window.sessionStorage.setItem('bizToken', res2.data.data.token); + this.rowDel(row); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } }); @@ -434,22 +471,33 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - this.loading = true; - getRailsList(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingId: this.buildingId })).then(res2 => { - this.loading = false; - if (res2.data.code == 401) { - window.sessionStorage.removeItem('bizToken'); - this.onLoad(this.page); - } - else { - const data = res2.data.data; - this.page.total = data.totalElements; - this.data = data.content; + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + this.loading = true; + getRailsList(res.data.data.token, Object.assign(params, this.query, { page: page.currentPage, size: page.pageSize, buildingId: this.buildingId })).then(res2 => { + this.loading = false; + if (res2.data.code == 401) { + window.sessionStorage.removeItem('bizToken'); + this.onLoad(this.page); + } + else if(res2.data.code == 0){ + const data = res2.data.data; + this.page.total = data.totalElements; + this.data = data.content; + }else{ + this.$message.error('物联网平台访问超时！') + } + }, err => { + this.loading = false; + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }, err => { - this.loading = false; - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { @@ -460,10 +508,12 @@ export default { window.sessionStorage.removeItem('bizToken'); this.onLoad(this.page); } - else { + else if(res2.data.code == 0){ const data = res2.data.data; this.page.total = data.totalElements; this.data = data.content; + }else{ + this.$message.error('物联网平台访问超时！') } }, err => { this.loading = false; diff --git a/src/views/wirelessintrusion/deployment/list.vue b/src/views/wirelessintrusion/deployment/list.vue index 64e5934..199d8f4 100644 --- a/src/views/wirelessintrusion/deployment/list.vue +++ b/src/views/wirelessintrusion/deployment/list.vue @@ -214,13 +214,23 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceStatus(res.data.data.token).then(res => { - this.bizDeviceStatus = res.data.data; - }) - bizNodeType(res.data.data.token).then(res => { - this.bizNodeType = res.data.data; - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceStatus(res.data.data.token).then(res => { + this.bizDeviceStatus = res.data.data; + }) + bizNodeType(res.data.data.token).then(res => { + this.bizNodeType = res.data.data; + }) + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + + }) } else { bizDeviceStatus(token).then(res => { @@ -230,6 +240,8 @@ export default { } else if (res.data.code == 200) { this.bizDeviceStatus = res.data.data; + }else{ + this.$message.error('物联网平台访问超时！') } }) bizNodeType(token).then(res => { @@ -449,31 +461,44 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage,'params[type]':3 }).then(res2 => { - const data = res2.data; - this.diaPage.total = data.total; - data.rows.map(item => { - item.node = item.bizProduct.node; - item.nodeLabel = this.renderLabel(item.node, 'bizNodeType'); - item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus') - item.productName = item.bizProduct.name; - }) - this.tableData = data.records; - let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : []; - if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据 - this.$nextTick(() => { - this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 - multipleSelection.forEach(item => { // 勾选到的数据 - if (row.id === parseInt(item)) { - this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 - } - }); - }) - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage,'params[type]':3 }).then(res2 => { + if (res2.data.code == 200) { + const data = res2.data; + this.diaPage.total = data.total; + data.rows.map(item => { + item.node = item.bizProduct.node; + item.nodeLabel = this.renderLabel(item.node, 'bizNodeType'); + item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus') + item.productName = item.bizProduct.name; + }) + this.tableData = data.records; + let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : []; + if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据 + this.$nextTick(() => { + this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 + multipleSelection.forEach(item => { // 勾选到的数据 + if (row.id === parseInt(item)) { + this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 + } + }); + }) + }) + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceList(token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage, pid: 100,'params[type]':3 }).then(res2 => { @@ -503,6 +528,8 @@ export default { }) }) } + }else{ + this.$message.error('物联网平台访问超时！') } }, err => { }); diff --git a/src/views/wirelessintrusion/device/list.vue b/src/views/wirelessintrusion/device/list.vue index e145f52..f97926c 100644 --- a/src/views/wirelessintrusion/device/list.vue +++ b/src/views/wirelessintrusion/device/list.vue @@ -197,15 +197,24 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceStatus(res.data.data.token).then(res => { - const column = this.findObject(this.option.column, "status"); - column.dicData = res.data.data; - }) - bizNodeType(res.data.data.token).then(res => { - const column = this.findObject(this.option.column, "node"); - column.dicData = res.data.data; - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceStatus(res.data.data.token).then(res => { + const column = this.findObject(this.option.column, "status"); + column.dicData = res.data.data; + }) + bizNodeType(res.data.data.token).then(res => { + const column = this.findObject(this.option.column, "node"); + column.dicData = res.data.data; + }) + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceStatus(token).then(res => { @@ -216,6 +225,8 @@ export default { else if (res.data.code == 200) { const column = this.findObject(this.option.column, "status"); column.dicData = res.data.data; + }else{ + this.$message.error('物联网平台访问超时！') } }) bizNodeType(token).then(res => { @@ -407,37 +418,51 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - this.loading = true; - bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage }).then(res2 => { - const data = res2.data; - this.page.total = data.total; - data.rows.map(item => { - item.node = item.bizProduct.node; - item.nodeLabel = this.renderLabel(item.node, 'node'); - item.statusLabel = this.renderLabel(item.status, 'status') - item.productName = item.bizProduct.name; - if (item.tags) { - let tags = JSON.parse(item.tags); - item.buildingNo = tags.buildingNo; - item.floorNo = tags.floorNo; - // console.log('tags ====>',tags) - // item.xy = tags.coordinate.replace('-',','); - if(tags.coordinate){ - item.xy = tags.coordinate.replace('-',','); + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + this.loading = true; + bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage }).then(res2 => { + if(res2.data.code == 200){ + const data = res2.data; + this.page.total = data.total; + data.rows.map(item => { + item.node = item.bizProduct.node; + item.nodeLabel = this.renderLabel(item.node, 'node'); + item.statusLabel = this.renderLabel(item.status, 'status') + item.productName = item.bizProduct.name; + if (item.tags) { + let tags = JSON.parse(item.tags); + item.buildingNo = tags.buildingNo; + item.floorNo = tags.floorNo; + // console.log('tags ====>',tags) + // item.xy = tags.coordinate.replace('-',','); + if(tags.coordinate){ + item.xy = tags.coordinate.replace('-',','); + }else{ + item.xy = tags.lng + ',' + tags.lat; + } + item.position = tags.buildingNo + '号楼' + tags.floorNo + '层' + tags.address; + } + }) + this.data = data.rows; + console.log('data ====>',data) + this.loading = false; }else{ - item.xy = tags.lng + ',' + tags.lat; + this.$message.error('物联网平台访问超时！') } - item.position = tags.buildingNo + '号楼' + tags.floorNo + '层' + tags.address; - } - }) - this.data = data.rows; - console.log('data ====>',data) - this.loading = false; - }, () => { - this.loading = false; - this.selectionClear(); - }); + + }, () => { + this.loading = false; + this.selectionClear(); + }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { this.loading = true; @@ -472,6 +497,8 @@ export default { this.data = data.rows; console.log('data ====>',this.data) + }else{ + this.$message.error('物联网平台访问超时！') } }, () => { this.loading = false; diff --git a/src/views/wirelessintrusion/oneClick/list.vue b/src/views/wirelessintrusion/oneClick/list.vue index db6c240..84fea42 100644 --- a/src/views/wirelessintrusion/oneClick/list.vue +++ b/src/views/wirelessintrusion/oneClick/list.vue @@ -228,13 +228,22 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceStatus(res.data.data.token).then(res => { - this.bizDeviceStatus = res.data.data; - }) - bizNodeType(res.data.data.token).then(res => { - this.bizNodeType = res.data.data; - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceStatus(res.data.data.token).then(res => { + this.bizDeviceStatus = res.data.data; + }) + bizNodeType(res.data.data.token).then(res => { + this.bizNodeType = res.data.data; + }) + }else{ + this.$message.error('物联网平台访问超时！') + } + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceStatus(token).then(res => { @@ -244,6 +253,8 @@ export default { } else if (res.data.code == 200) { this.bizDeviceStatus = res.data.data; + }else{ + this.$message.error('物联网平台访问超时！') } }) bizNodeType(token).then(res => { @@ -524,31 +535,45 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage,'params[type]':3}).then(res2 => { - const data = res2.data; - this.diaPage.total = data.total; - data.rows.map(item => { - item.node = item.bizProduct.node; - item.nodeLabel = this.renderLabel(item.node, 'bizNodeType'); - item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus') - item.productName = item.bizProduct.name; - }) - this.tableData = data.records; - let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : []; - if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据 - this.$nextTick(() => { - this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 - multipleSelection.forEach(item => { // 勾选到的数据 - if (row.id === parseInt(item)) { - this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 - } - }); - }) - }) + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceList(res.data.data.token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage,'params[type]':3}).then(res2 => { + if (res2.data.code == 200) { + const data = res2.data; + this.diaPage.total = data.total; + data.rows.map(item => { + item.node = item.bizProduct.node; + item.nodeLabel = this.renderLabel(item.node, 'bizNodeType'); + item.statusLabel = this.renderLabel(item.status, 'bizDeviceStatus') + item.productName = item.bizProduct.name; + }) + this.tableData = data.records; + let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : []; + if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据 + this.$nextTick(() => { + this.tableData.forEach(row => { // 获取数据列表接口请求到的数据 + multipleSelection.forEach(item => { // 勾选到的数据 + if (row.id === parseInt(item)) { + this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据 + } + }); + }) + }) + } + }else{ + this.$message.error('物联网平台访问超时！') + } + + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceList(token, { ...values, pageSize: page.pageSize, pageNum: page.currentPage, pid: 100,'params[type]':3 }).then(res2 => { @@ -578,6 +603,8 @@ export default { }) }) } + }else{ + this.$message.error('物联网平台访问超时！') } }, err => { }); diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue index 54e301b..d8dab00 100644 --- a/src/views/wirelessintrusion/warn/record.vue +++ b/src/views/wirelessintrusion/warn/record.vue @@ -426,26 +426,35 @@ export default { let token = window.sessionStorage.getItem('bizToken'); if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { - window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => { - const data = res2.data; - this.videoData = data.rows; - if (this.videoData.length === 0) { - this.$message.warning('未查询到该报警点摄像头'); - } - else { - // this.dialogVisible = true; - const routeData = this.$router.resolve({ - path: '/videoPlayer', // 跳转的路径 - query: { - list: JSON.stringify(this.videoData), // 携带的的参数信息 - showLeft:true + if(res.status == 200){ + if(res.data.code == 0){ + window.sessionStorage.setItem('bizToken', res.data.data.token); + bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => { + const data = res2.data; + this.videoData = data.rows; + if (this.videoData.length === 0) { + this.$message.warning('未查询到该报警点摄像头'); } - }) - console.log('href ===>',routeData.href) - window.open(routeData.href, '_blank') + else { + // this.dialogVisible = true; + const routeData = this.$router.resolve({ + path: '/videoPlayer', // 跳转的路径 + query: { + list: JSON.stringify(this.videoData), // 携带的的参数信息 + showLeft:true + } + }) + console.log('href ===>',routeData.href) + window.open(routeData.href, '_blank') + } + }); + }else{ + this.$message.error('物联网平台访问超时！') } - }); + }else{ + this.$message.error('物联网平台访问超时！') + } + }) } else { bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => { @@ -471,6 +480,8 @@ export default { console.log('href ===>',routeData.href) window.open(routeData.href, '_blank') } + }else{ + this.$message.error('物联网平台访问超时！') } }); }