diff --git a/src/api/modules/edgeServer.api.js b/src/api/modules/edgeServer.api.js
index 7dbaae9..00c84a6 100644
--- a/src/api/modules/edgeServer.api.js
+++ b/src/api/modules/edgeServer.api.js
@@ -72,14 +72,17 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
GET_DEVICE_CONFIGURE (id) {
return request({ url: '?query=device&id=' + id })
},
- GET_SERVE_DEVICE_MONITORING (url, username, password) {
+ GET_SERVE_DEVICE_MONITORING (url, username, password, deviceName) {
return request({
auth: {
username: username,
password: password
},
method: 'get',
- url: url + '/Edge/DeviceData'
+ url: url + '/Edge/DeviceData?data=' + deviceName
})
+ },
+ GET_ALL_DEVICES () {
+ return request({ url: '?query=all_devices' })
}
})
diff --git a/src/views/edgeServer/edgeServerMonitor/index.vue b/src/views/edgeServer/edgeServerMonitor/index.vue
index 4baf817..e634ded 100644
--- a/src/views/edgeServer/edgeServerMonitor/index.vue
+++ b/src/views/edgeServer/edgeServerMonitor/index.vue
@@ -1,106 +1,121 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 暂停
+
+
+ 重启
+
+
+ 关闭
+
+
+
+
+
+
+ 设备类型
+
+ ：{{ i.device_type }}
+
+
+
+ IP/端口
+
+ ：{{ i.config ? i.config[2] : "" }}
+
+
+
+
+ 活动时间
+
+ ：{{ i.startTime }}
+
+
+
+ 采集耗时
+
+ ：{{ i.captureSpendTime }}
+
+
+
+ 成功次数
+
+ ：{{ i.success }}
+
+
+
+ 失败次数
+
+ ：{{ i.failed }}
+
+
+
+
+
+
-
-
- 暂停
-
-
- 重启
-
-
- 关闭
-
-
-
-
-
-
- 设备类型
-
- ：{{ i.device_type }}
-
-
-
-
- 成功次数
-
- ：{{ i.success_count }}
-
-
-
- 失败次数
-
- ：{{ i.fail_count }}
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+