From ba50073d4aeda7a1e30243e6469be9c2cec472b3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 08 十月 2022 18:17:25 +0800
Subject: [PATCH] 修改检索显示的摄像机地址,调整上报页面的查询
---
src/views/hashrate/HashManage/components/EquipmentForm.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/hashrate/HashManage/components/EquipmentForm.vue b/src/views/hashrate/HashManage/components/EquipmentForm.vue
index a4b41d5..2dbadfc 100644
--- a/src/views/hashrate/HashManage/components/EquipmentForm.vue
+++ b/src/views/hashrate/HashManage/components/EquipmentForm.vue
@@ -83,7 +83,7 @@
:current-page="page"
:page-size="size"
layout="total, sizes, prev, pager, next, jumper"
- :page-sizes="[5, 10, 15, 20, 25]"
+ :page-sizes="[5, 10, 15, 20, 25, 100]"
:total="total"
background
:small="true"
@@ -133,19 +133,36 @@
this.dataList = res.data.lists
this.total = res.data.total
}
+
+ // let exportList = []
+
// 鏍规嵁rtsp 鎻愬彇ip鍦板潃
const ipReg = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
this.dataList.forEach((cam) => {
+ // var cinfo = {
+ // channel: cam.rtsp,
+ // nama: cam.name,
+ // task: cam.tasks
+ // .map((task) => {
+ // return task.taskname
+ // })
+ // .join(",")
+ // }
+
+ // exportList.push(cinfo)
+
// 鍥芥爣鎽勫儚鏈轰笉鏄剧ずip
if (cam.type === 1) {
cam.ip = "-"
return
}
let ip = ipReg.exec(cam.rtsp)
- if (ip.length > 0) {
+ if (ip && ip.length > 0) {
cam.ip = ip[0]
}
})
+
+ // console.table(exportList)
},
handleSizeChange(size) {
this.size = size
--
Gitblit v1.8.0