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

修复设备配置页面测试出现的多个BUG

Browse Source
This commit is contained in:
wu
2022-08-14 18:30:55 +08:00
parent 2d5e542593
commit 36068feed9
4 changed files with 536 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,17 +36,17 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
return request({ url: '?query=servers' })
},
QUERY_SERVE_MONITORING(){
QUERY_SERVE_MONITORING () {
return request({ url: '?query=working_subclasses' })
},
GET_DEVICE(serve_id){
return request({ url: '?query=device_list&id='+serve_id })
GET_DEVICE (serveId) {
return request({ url: '?query=device_list&id=' + serveId })
},
GET_DEVICE_STATUS(serve_id){
return request({ url: '?query=device_status&id='+serve_id })
GET_DEVICE_STATUS (serveId) {
return request({ url: '?query=device_status&id=' + serveId })
},
ADD_DEVICE:(data) => handlePost(request, data),
DEL_DEVICE:(data) => handlePost(request, data),
ADD_DEVICE: (data) => handlePost(request, data),
DEL_DEVICE: (data) => handlePost(request, data),
GET_HSLSERVER_CONFIGURE (url, username, password) {
return request({
auth: {
@@ -57,7 +57,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
url: url + '/Admin/JsonSettingsRequest'
})
},
SET_HSLSERVER_CONFIGURE(url, username, password, data) {
SET_HSLSERVER_CONFIGURE (url, username, password, data) {
return request({
auth: {
username: username,
@@ -68,8 +68,11 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
url: url + '/Admin/JsonSettingsModify'
})
},
SET_DEVICE_CONFIGURE:(data) => handlePost(request, data),
GET_DEVICE_CONFIGURE(id){
return request({ url: '?query=device&id='+id })
SET_DEVICE_CONFIGURE: (data) => handlePost(request, data),
GET_DEVICE_CONFIGURE (id) {
return request({ url: '?query=device&id=' + id })
},
GET_SERVE_MONITORING () {
return request({ url: '?query=all_status' })
}
})

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

@@ -66,24 +66,22 @@
</el-card>
</el-main>
</el-container>
</template>
<script>
import { each,assign,omit } from 'lodash'
import { each, assign } from 'lodash'
export default {
props: {
server_id: {
default: 0
},
}
},
components: {
DeviceConfigure: () => import('./deviceConfigure'),
DeviceConfigure: () => import('./deviceConfigure')
},
data() {
data () {
return {
active: '',
columns: [
@@ -101,7 +99,7 @@ export default {
},
{
title: '绑定',
key: '@Binding',
key: '@Binding'
},
{
@@ -160,7 +158,7 @@ export default {
text: '绑定',
size: 'mini',
emit: 'banding',
show(index, row) {
show (index, row) {
if (row.showBindButton) {
return true
}
@@ -170,7 +168,7 @@ export default {
{
text: '发送',
size: 'mini',
show(index, row) {
show (index, row) {
if (row.showSendButton) {
return true
}
@@ -180,7 +178,7 @@ export default {
{
text: '复制',
size: 'mini',
show(index, row) {
show (index, row) {
if (row.showCopyButton) {
return true
}
@@ -198,44 +196,44 @@ export default {
}
return false
}
},
}
},
formOptions: {
modal: false,
saveLoading: false,
showOverflowTooltip:true
showOverflowTooltip: true
},
addTemplate: {
"@Name": {
'@Name': {
title: '名称'
},
"@Address": {
'@Address': {
title: '地址'
},
"@RequestType": {
'@RequestType': {
title: '类型'
},
"@RequestInterval": {
'@RequestInterval': {
title: '采集周期(ms)'
},
"@Length": {
'@Length': {
title: '长度'
},
"@Description": {
'@Description': {
title: '说明'
},
"@Value": {
'@Value': {
title: '当前值'
}
},
addRules: {
"@Name": [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }],
"@Address": [{ required: true, message: '请输入地址', trigger: 'blur' }],
"@RequestType": [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }],
"@RequestInterval": [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }],
"@Length": [{ required: true, message: '请输入长度', trigger: 'blur' }],
"@Value": [{ required: true, message: '请输入当前值', trigger: 'blur' }],
'@Name': [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }],
'@Address': [{ required: true, message: '请输入地址', trigger: 'blur' }],
'@RequestType': [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }],
'@RequestInterval': [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }],
'@Length': [{ required: true, message: '请输入长度', trigger: 'blur' }],
'@Value': [{ required: true, message: '请输入当前值', trigger: 'blur' }]
},
serverId: 0,
devicePointData: [],
@@ -246,41 +244,40 @@ export default {
defaultDeviceName: '',
defaultFormData: {},
deviceData: [],
deviceConfigure:{}
deviceConfigure: {}
}
},
watch: {
server_id: {
handler(val) {
handler (val) {
this.serverId = val
this.getDevice()
},
immediate: true
},
}
},
methods: {
addRow() {
addRow () {
this.$refs.d2Crud.showDialog({
mode: 'add'
})
},
handleFormDataChange({ key }) {
if (key === 'working_subclass') {
const { working_subclass } = this.$refs.d2Crud.formData
this.getCodesByWorkingSubclass(working_subclass)
handleFormDataChange ({ key }) {
if (key === 'workingSubclass') {
const { workingSubclass } = this.$refs.d2Crud.formData
this.getCodesByWorkingSubclass(workingSubclass)
this.$refs.d2Crud.$forceUpdate()
}
},
handleCellDataChange ({ rowIndex, key, value, row }) {
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode[rowIndex]
handleCellDataChange ({ rowIndex, row }) {
this.devicePointData[rowIndex] = row
this.setDeviceConfigure()
},
bandingNodeTemplate() {
bandingNodeTemplate () {
this.$refs.d2Crud.showDialog({
mode: 'edit',
template: {
working_subclass: {
workingSubclass: {
title: '工序编码',
value: '',
component: {
@@ -289,7 +286,7 @@ export default {
span: 12
}
},
node_code: {
nodeCode: {
title: '节点名称',
value: '',
component: {
@@ -297,19 +294,19 @@ export default {
options: this.nodeCodeData,
span: 12
}
},
}
}
})
},
handleDialogCancel(done) {
handleDialogCancel (done) {
this.$message({
message: '用户取消保存',
type: 'warning'
});
})
done()
},
handleCommand(command) {
handleCommand (command) {
switch (command) {
case 'add':
this.addDevice()
@@ -319,28 +316,27 @@ export default {
break
}
},
async getCodesByWorkingSubclass(workingSubclass) {
async getCodesByWorkingSubclass (workingSubclass) {
try {
const nodeCode = await this.$api.QUERY_CODES(workingSubclass)
let nodeCodeData = []
const nodeCodeData = []
each(nodeCode, (o) => {
nodeCodeData.push({ value: o, label: o })
}
)
this.nodeCodeData = nodeCodeData
this.$nextTick(() => {
this.$refs.d2Crud.handleFormTemplateMode('node_code').component.options = this.nodeCodeData
this.$refs.d2Crud.handleFormTemplateMode('nodeCode').component.options = this.nodeCodeData
this.$refs.d2Crud.$forceUpdate()
})
} catch (e) {
console.log(e)
}
},
async getworkingSubclasses() {
async getworkingSubclasses () {
try {
const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES()
let workingSubclassesData = []
const workingSubclassesData = []
each(workingSubclasses, (o) => {
workingSubclassesData.push({ value: o, label: o })
}
@@ -350,32 +346,32 @@ export default {
console.log(e)
}
},
async getDevice() {
async getDevice () {
try {
this.deviceData = await this.$api.GET_DEVICE(this.serverId)
if(this.deviceData.length >0 ){
if (this.deviceData.length > 0) {
this.getDeviceConfigure(this.deviceActiveStatus)
}
} catch (e) {
console.log(e)
}
},
async getDeviceConfigure(e) {
async getDeviceConfigure (e) {
this.deviceActiveStatus = e
this.devicePointData =[] //当切换设备时把保存configure、point的数据清空
this.defaultDeviceName =[]
this.devicePointData = [] // 当切换设备时把保存configure、point的数据清空
this.defaultDeviceName = ''
const deviceData = await this.$api.GET_DEVICE_CONFIGURE(this.deviceData[e].id)
if(deviceData[0].conf){
let conf = JSON.parse(deviceData[0].conf)
if(conf["@Name"] != undefined){
this.defaultDeviceName = conf["@Name"]
if (deviceData[0].conf) {
const conf = JSON.parse(deviceData[0].conf)
if (conf['@Name'] !== undefined) {
this.defaultDeviceName = conf['@Name']
this.defaultFormData = conf
}
//获取point信息
if(conf.RequestNode != undefined && conf.RequestNode.length > 0){
this.devicePointData = each(conf.RequestNode, (o,i) => (
// 获取point信息
if (conf.RequestNode !== undefined && conf.RequestNode.length > 0) {
this.devicePointData = each(conf.RequestNode, (o, i) => (
assign(o, {
id:i+1,
id: i + 1,
showBindButton: true,
showSendButton: true,
showCopyButton: true,
@@ -385,70 +381,82 @@ export default {
}
}
},
addDevice() {
addDevice () {
const that = this
this.$prompt('输入设备名称', '新加设备', {
confirmButtonText: '确定',
inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
inputErrorMessage: '请输入设备名称'
}).then(({ value }) => {
this.$api.ADD_DEVICE({ action: "add_device", name: value, server_id: this.serverId })
this.$api.ADD_DEVICE({ action: 'add_device', name: value, server_id: this.serverId })
that.getDevice()
this.$message({
message: '新加设备成功',
type: 'success'
});
})
})
},
async delDevice() {
async delDevice () {
try {
await this.$api.DEL_DEVICE({ action: "remove_device", id: this.deviceData[this.deviceActiveStatus].id })
await this.$api.DEL_DEVICE({ action: 'remove_device', id: this.deviceData[this.deviceActiveStatus].id })
this.$message({
message: '删除设备成功',
type: 'success'
});
})
this.getDevice()
} catch (e) {
console.log(e)
}
},
async addDevicePoint(row, done) {
async addDevicePoint (row, done) {
this.formOptions.saveLoading = true
if (!this.$refs.defaultDeviceTypeNameValue) {
this.$message({
message: '请先应用设备配置',
type: 'error'
})
done(false)
} else {
this.devicePointData.push(row)
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData
await this.setDeviceConfigure()
await this.getDevice()
done()
}
this.formOptions.saveLoading = false
},
async delDevicePoint({ index, row }, done){
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData.splice(index,1)
async delDevicePoint ({ index, row }, done) {
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData.splice(index, 1)
await this.setDeviceConfigure()
done()
},
async getDevicePoint() {
const data = {action: 'add_node', server_id: this.serverId, device_id:this.deviceData[this.deviceActiveStatus].id}
async getDevicePoint () {
const data = { action: 'add_node', server_id: this.serverId, device_id: this.deviceData[this.deviceActiveStatus].id }
try {
this.devicePointData = await this.$api.GET_DEVICE_POINT(data)
} catch (e) {
console.log(e)
}
},
async devicePointBandingNode({ index, row }) {
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode[index]['@binding'] = row.node_code
async devicePointBandingNode ({ index, row }, done) {
this.devicePointData[index]['@Binding'] = row.nodeCode
this.setDeviceConfigure()
done()
},
async setDeviceConfigure(){
async setDeviceConfigure () {
try {
let deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522','admin','123456')
deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = [this.$refs.deviceConfigure.deviceConfigureModelValue]
await this.$api.SET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522','admin','123456',{data: deviceConfigure.Content })
const data = {
"action": "update_device",
"conf": JSON.stringify(this.$refs.deviceConfigure.deviceConfigureModelValue),
"id": this.deviceData[this.deviceActiveStatus].id
const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522', 'admin', '123456')
if (this.devicePointData.length > 0) {
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData
}
console.log(this.$refs.deviceConfigure.deviceConfigureModelValue)
deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = [this.$refs.deviceConfigure.deviceConfigureModelValue]
await this.$api.SET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522', 'admin', '123456', { data: deviceConfigure.Content })
const data = {
action: 'update_device',
conf: JSON.stringify(this.$refs.deviceConfigure.deviceConfigureModelValue),
id: this.deviceData[this.deviceActiveStatus].id
}
this.$api.SET_DEVICE_CONFIGURE(data)
this.$message({
message: '操作成功',
@@ -458,22 +466,21 @@ export default {
console.log(e)
}
},
getDeviceStatus(){
this.$api.GET_DEVICE_STATUS(this.serverId).then(res=>{
each(this.deviceData,(item)=>{
if(res.devices[item.id] ){
item.status = data.devices[item.id]
getDeviceStatus () {
this.$api.GET_DEVICE_STATUS(this.serverId).then(res => {
each(this.deviceData, (item) => {
if (item.id in res.device_status) {
item.status = res.device_status[item.id]
}
})
this.$emit('changeStatus',res.server)
this.$emit('changeStatus', res.server_status)
})
}
},
mounted() {
mounted () {
this.getDevice()
this.getworkingSubclasses()
setInterval(this.getDeviceStatus,2000)
setInterval(this.getDeviceStatus, 2000)
}
}
</script>

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

@@ -29,7 +29,6 @@
</el-date-picker>
</template>
</el-form-item>
</el-form>
</div>
@@ -39,13 +38,13 @@
import deviceConfigureFormItemData from './deviceSetting/index.json'
import { each } from 'lodash'
export default {
name:'deviceConfigure',
name: 'deviceConfigure',
props: {
loading: {
default: false
},
defaultDeviceName: {
default: Object.keys(deviceConfigureFormItemData)[0]
default: ''
},
defaultFormData: {
default: () => []
@@ -57,48 +56,45 @@ export default {
},
watch: {
defaultDeviceName: {
handler(val) {
if(val){
handler (val) {
this.defaultDeviceTypeNameValue = val
this.deviceChange(val)
}
},
immediate: true
},
defaultFormData: {
handler(val) {
handler (val) {
this.setDeviceDefaultFormItemValue(val)
},
immediate: true
}
},
},
data() {
data () {
return {
deviceConfigureFormItem: [],
defaultDeviceTypeNameValue: '',
deviceConfigureModelValue: {},
deviceSelectedVlaue: '',
deviceTypeData: [
],
]
}
},
methods: {
deviceChange(e) {
//获取所有字符串的key 用于v-model渲染
let deviceConfigureModelValue = {}
deviceChange (e) {
// 获取所有字符串的key 用于v-model渲染
const deviceConfigureModelValue = {}
each(deviceConfigureFormItemData[e], (item) => {
if (item.type === 'time') {
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : new Date()
} else {
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : ""
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : ''
}
})
this.deviceConfigureModelValue = deviceConfigureModelValue
this. deviceConfigureFormItem = deviceConfigureFormItemData[e]
this.deviceConfigureFormItem = deviceConfigureFormItemData[e]
},
setDeviceDefaultFormItemValue(val) {
let deviceConfigureModelValue = {}
setDeviceDefaultFormItemValue (val) {
const deviceConfigureModelValue = {}
each(deviceConfigureFormItemData[this.defaultDeviceTypeNameValue], (item) => {
if (item.type === 'time') {
deviceConfigureModelValue[item.key] = val[item.key] ? val[item.key] : new Date()
@@ -109,11 +105,11 @@ export default {
)
this.deviceConfigureModelValue = deviceConfigureModelValue
},
getDeviceType() {
getDeviceType () {
this.deviceTypeData = Object.keys(deviceConfigureFormItemData)
}
},
mounted() {
mounted () {
this.getDeviceType()
}

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

@@ -46,7 +46,7 @@ const genRanHex = size => [...Array(size)].map(() => Math.floor(Math.random() *
export default {
components: {
Device: () => import('./device'),
Device: () => import('./device')
},
data () {
return {
@@ -81,26 +81,26 @@ export default {
}
],
isDrawerShow: false,
server_id:0,
serveStatus:{
online:{
name:'在线',
textColor:'#67c23a',
backgroundColor:'#f0f9eb',
borderColor:'#e1f3d8'
server_id: 0,
serveStatus: {
online: {
name: '在线',
textColor: '#67c23a',
backgroundColor: '#f0f9eb',
borderColor: '#e1f3d8'
},
offline:{
name:'离线',
textColor:'#67c23a',
backgroundColor:'#f0f9eb',
borderColor:'#e1f3d8'
offline: {
name: '离线',
textColor: '#67c23a',
backgroundColor: '#f0f9eb',
borderColor: '#e1f3d8'
}
},
selectedServerData:{
name:'',
url:'',
port:'',
status:'offline'
selectedServerData: {
name: '',
url: '',
port: '',
status: 'offline'
},
data: [],
serverSettings: {},
@@ -133,7 +133,7 @@ export default {
{
text: '设备配置',
size: 'small',
emit: 'set-device',
emit: 'set-device'
}
]
},
@@ -330,25 +330,23 @@ export default {
})
done()
},
drawerShow({row}){
drawerShow ({ row }) {
this.selectedServerData = {
name:row.name,
url:row.url,
port:row.port,
status:row.status ? row.status :'offline'
name: row.name,
url: row.url,
port: row.port,
status: row.status ? row.status : 'offline'
}
this.server_id = row.id
this.isDrawerShow = true
},
changeSelectedServerStatus(status){
this.selectedServerData.status = status ? status : 'offline'
changeSelectedServerStatus (status) {
this.selectedServerData.status = status || 'offline'
}
},
mounted () {
this.getServers()
}
}
</script>