From 05018d9b7d41ca5a13c7b054647bbb478bfe89fd Mon Sep 17 00:00:00 2001 From: xuechunyuan <17853500702@163.com> Date: Tue, 1 Aug 2023 19:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A7=86=E9=A2=91=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 3 + .../wirelessintrusion/deployment/list.vue | 2 +- src/views/wirelessintrusion/device/list.vue | 97 +++++++--------- src/views/wirelessintrusion/warn/record.vue | 105 +++++++++--------- 4 files changed, 101 insertions(+), 106 deletions(-) diff --git a/public/index.html b/public/index.html index 2d35ea5..86e8f82 100644 --- a/public/index.html +++ b/public/index.html @@ -18,6 +18,9 @@ + + + diff --git a/src/views/wirelessintrusion/deployment/list.vue b/src/views/wirelessintrusion/deployment/list.vue index 0a13414..5bcb4d0 100644 --- a/src/views/wirelessintrusion/deployment/list.vue +++ b/src/views/wirelessintrusion/deployment/list.vue @@ -34,7 +34,7 @@ + value-format="HH:mm" style="width:100%;"> diff --git a/src/views/wirelessintrusion/device/list.vue b/src/views/wirelessintrusion/device/list.vue index ab7f028..db847d8 100644 --- a/src/views/wirelessintrusion/device/list.vue +++ b/src/views/wirelessintrusion/device/list.vue @@ -42,7 +42,7 @@ export default { column: [ { label: "设备名称", - prop: "name", + prop: "name1", span: 12, search: true, formatter: (val, value, label) => { @@ -85,9 +85,29 @@ export default { labelWidth: 120, viewDisplay: false }, + { + label: "位置", + prop: "position", + labelWidth: 120, + }, + { + label: "经纬度", + prop: "xy", + labelWidth: 120, + hide: true + }, { label: "节点类型", - prop: "nodeLabel", + prop: "nodeLabel1", + labelWidth: 120, + formatter: (data) => { + return data.nodeLabel + } + }, + { + label: "节点类型", + prop: "statusLabel", + span: 12, labelWidth: 120, hide: true, }, @@ -113,13 +133,6 @@ export default { labelWidth: 120, viewDisplay: false, }, - { - label: "节点类型", - prop: "statusLabel", - span: 12, - labelWidth: 120, - hide: true, - }, { label: "创建时间", prop: "createTime", @@ -180,49 +193,6 @@ export default { let idx = column.dicData.findIndex(item => item.dictValue == node); return idx > -1 ? column.dicData[idx].dictLabel : ''; }, - // rowSave(row, done, loading) { - // add(row).then(() => { - // this.onLoad(this.page); - // this.$message({ - // type: "success", - // message: "操作成功!" - // }); - // done(); - // }, error => { - // window.console.log(error); - // loading(); - // }); - // }, - // rowUpdate(row, index, done, loading) { - // update(row).then(() => { - // this.onLoad(this.page); - // this.$message({ - // type: "success", - // message: "操作成功!" - // }); - // done(); - // }, error => { - // window.console.log(error); - // loading(); - // }); - // }, - // rowDel(row) { - // this.$confirm("确定将选择数据删除?", { - // confirmButtonText: "确定", - // cancelButtonText: "取消", - // type: "warning" - // }) - // .then(() => { - // return remove(row.id); - // }) - // .then(() => { - // this.onLoad(this.page); - // this.$message({ - // type: "success", - // message: "操作成功!" - // }); - // }); - // }, searchReset() { this.query = {}; this.onLoad(this.page); @@ -302,9 +272,19 @@ export default { 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; + item.xy = tags.lng + ',' + tags.lat; + item.position = item.buildingNo + '号楼' + item.floorNo + '层'; + } }) - this.data = data.records; + this.data = data.rows; + this.loading = false; + }, () => { this.loading = false; + this.selectionClear(); }); }) } else { @@ -315,7 +295,7 @@ export default { if(res2.data.code == 401){ console.log(res2.data.code) window.sessionStorage.removeItem('bizToken'); - this.onLoad(); + this.onLoad(page); } else if(res2.data.code == 200){ const data = res2.data; @@ -325,10 +305,17 @@ export default { 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; + item.xy = tags.lng + ',' + tags.lat; + item.position = item.buildingNo + '号楼' + item.floorNo + '层'; + } }) this.data = data.rows; } - }, err => { + }, () => { this.loading = false; this.selectionClear(); }); diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue index a7f74b4..277e4c3 100644 --- a/src/views/wirelessintrusion/warn/record.vue +++ b/src/views/wirelessintrusion/warn/record.vue @@ -5,13 +5,15 @@ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">