wyw/EdgeManager
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

更改设备配置json文件、添加数字输入框、修复设备监控页面BUG

Browse Source
This commit is contained in:
wu
2022-08-18 23:09:51 +08:00
parent 12e00952fb
commit fd060438bf
6 changed files with 1564 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/modules/edgeServer.api.js
View File

@@ -85,5 +85,5 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
GET_ALL_DEVICES () {
return request({ url: '?query=all_devices' })
},
SET_SERVER_EXEC: (data) => handlePost(request, data),
SET_SERVER_EXEC: (data) => handlePost(request, data)
})

2
src/views/edgeServer/edgeServerConfigure/device.vue
View File

@@ -448,7 +448,7 @@ export default {
})
},
async delDevice () {
let deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456')
const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://' + this.serverData.url + ':' + this.serverData.port, 'admin', '123456')
let deviceNode = deviceConfigure.Content.Settings.GroupNode[0].DeviceNode
if (deviceNode !== undefined && isArray(deviceNode)) {
deviceNode = filter(deviceNode, item => {

4
src/views/edgeServer/edgeServerConfigure/deviceConfigure.vue
View File

@@ -15,6 +15,10 @@
<el-input v-model='deviceConfigureModelValue[item.key]' :disabled="item.disabled"
:placeholder="item.placeholder"></el-input>
</template>
<template v-if="item.type === 'number'">
<el-input-number v-model='deviceConfigureModelValue[item.key]' :disabled="item.disabled" :controls="false"
:placeholder="item.placeholder"></el-input-number>
</template>
<template v-if="item.type === 'select'">
<el-select v-model='deviceConfigureModelValue[item.key]' style="width:80px" :disabled="item.disabled"

1534
src/views/edgeServer/edgeServerConfigure/deviceSetting/index.json
View File

File diff suppressed because it is too large Load Diff

4
src/views/edgeServer/edgeServerConfigure/index.vue
View File

@@ -33,7 +33,7 @@
>
{{serveStatus[selectedServerData.status].name}}
</el-tag>
<el-alert title="设备配置已更改，请在服务配置界面重启对应服务生效" type="warning" style="width:400px;display: inline-block;vertical-align: middle; margin-left: 5px;" :closable="false" />
<el-alert v-if="this.selectedServerData.updated === 't'" title="设备配置已更改，请在服务配置界面重启对应服务生效" type="warning" style="width:400px;display: inline-block;vertical-align: middle; margin-left: 5px;" :closable="false" />
</div>
<device :server='server' @changeStatus='changeSelectedServerStatus'/>
</el-drawer>
@@ -131,6 +131,7 @@ export default {
name: '',
url: '',
port: '',
updated: 'f',
status: 'offline'
},
data: [],
@@ -397,6 +398,7 @@ export default {
name: row.name,
url: row.url,
port: row.port,
updated: row.updated,
status: row.status ? row.status : 'offline'
}
this.server = { id: row.id, url: row.url, port: row.port }

2
src/views/edgeServer/edgeServerMonitor/index.vue
View File

@@ -95,7 +95,7 @@ export default {
this.serverData = Object.values(await this.$api.GET_ALL_DEVICES())
this.serverData.forEach((element, index) => {
element.devices.forEach((item, i) => {
this.$api.GET_SERVE_DEVICE_MONITORING('http://' + item.url + ':' + item.port, 'admin', '123456', item.device_name).then(res => {
this.$api.GET_SERVE_DEVICE_MONITORING('http://' + element.url + ':' + element.port, 'admin', '123456', item.device_name).then(res => {
if (res.IsSuccess) {
const temp = {
config: res.Content.__config.split(' '),