修复设备配置页面测试出现的多个BUG
This commit is contained in:
wu
@@ -36,17 +36,17 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
|
|||||||
return request({ url: '?query=servers' })
|
return request({ url: '?query=servers' })
|
||||||
},
|
},
|
||||||
|
|
||||||
QUERY_SERVE_MONITORING(){
|
QUERY_SERVE_MONITORING () {
|
||||||
return request({ url: '?query=working_subclasses' })
|
return request({ url: '?query=working_subclasses' })
|
||||||
},
|
},
|
||||||
GET_DEVICE(serve_id){
|
GET_DEVICE (serveId) {
|
||||||
return request({ url: '?query=device_list&id='+serve_id })
|
return request({ url: '?query=device_list&id=' + serveId })
|
||||||
},
|
},
|
||||||
GET_DEVICE_STATUS(serve_id){
|
GET_DEVICE_STATUS (serveId) {
|
||||||
return request({ url: '?query=device_status&id='+serve_id })
|
return request({ url: '?query=device_status&id=' + serveId })
|
||||||
},
|
},
|
||||||
ADD_DEVICE:(data) => handlePost(request, data),
|
ADD_DEVICE: (data) => handlePost(request, data),
|
||||||
DEL_DEVICE:(data) => handlePost(request, data),
|
DEL_DEVICE: (data) => handlePost(request, data),
|
||||||
GET_HSLSERVER_CONFIGURE (url, username, password) {
|
GET_HSLSERVER_CONFIGURE (url, username, password) {
|
||||||
return request({
|
return request({
|
||||||
auth: {
|
auth: {
|
||||||
@@ -57,7 +57,7 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
|
|||||||
url: url + '/Admin/JsonSettingsRequest'
|
url: url + '/Admin/JsonSettingsRequest'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
SET_HSLSERVER_CONFIGURE(url, username, password, data) {
|
SET_HSLSERVER_CONFIGURE (url, username, password, data) {
|
||||||
return request({
|
return request({
|
||||||
auth: {
|
auth: {
|
||||||
username: username,
|
username: username,
|
||||||
@@ -68,8 +68,11 @@ export default ({ service, request, serviceForMock, requestForMock, mock, faker,
|
|||||||
url: url + '/Admin/JsonSettingsModify'
|
url: url + '/Admin/JsonSettingsModify'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
SET_DEVICE_CONFIGURE:(data) => handlePost(request, data),
|
SET_DEVICE_CONFIGURE: (data) => handlePost(request, data),
|
||||||
GET_DEVICE_CONFIGURE(id){
|
GET_DEVICE_CONFIGURE (id) {
|
||||||
return request({ url: '?query=device&id='+id })
|
return request({ url: '?query=device&id=' + id })
|
||||||
},
|
},
|
||||||
|
GET_SERVE_MONITORING () {
|
||||||
|
return request({ url: '?query=all_status' })
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -66,24 +66,22 @@
|
|||||||
</el-card>
|
</el-card>
|
||||||
</el-main>
|
</el-main>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</el-container>
|
</el-container>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
import { each,assign,omit } from 'lodash'
|
import { each, assign } from 'lodash'
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
server_id: {
|
server_id: {
|
||||||
default: 0
|
default: 0
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
DeviceConfigure: () => import('./deviceConfigure'),
|
DeviceConfigure: () => import('./deviceConfigure')
|
||||||
},
|
},
|
||||||
data() {
|
data () {
|
||||||
return {
|
return {
|
||||||
active: '',
|
active: '',
|
||||||
columns: [
|
columns: [
|
||||||
@@ -101,7 +99,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '绑定',
|
title: '绑定',
|
||||||
key: '@Binding',
|
key: '@Binding'
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -160,7 +158,7 @@ export default {
|
|||||||
text: '绑定',
|
text: '绑定',
|
||||||
size: 'mini',
|
size: 'mini',
|
||||||
emit: 'banding',
|
emit: 'banding',
|
||||||
show(index, row) {
|
show (index, row) {
|
||||||
if (row.showBindButton) {
|
if (row.showBindButton) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -170,7 +168,7 @@ export default {
|
|||||||
{
|
{
|
||||||
text: '发送',
|
text: '发送',
|
||||||
size: 'mini',
|
size: 'mini',
|
||||||
show(index, row) {
|
show (index, row) {
|
||||||
if (row.showSendButton) {
|
if (row.showSendButton) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -180,7 +178,7 @@ export default {
|
|||||||
{
|
{
|
||||||
text: '复制',
|
text: '复制',
|
||||||
size: 'mini',
|
size: 'mini',
|
||||||
show(index, row) {
|
show (index, row) {
|
||||||
if (row.showCopyButton) {
|
if (row.showCopyButton) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -198,44 +196,44 @@ export default {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
formOptions: {
|
formOptions: {
|
||||||
modal: false,
|
modal: false,
|
||||||
saveLoading: false,
|
saveLoading: false,
|
||||||
showOverflowTooltip:true
|
showOverflowTooltip: true
|
||||||
},
|
},
|
||||||
addTemplate: {
|
addTemplate: {
|
||||||
"@Name": {
|
'@Name': {
|
||||||
title: '名称'
|
title: '名称'
|
||||||
},
|
},
|
||||||
|
|
||||||
"@Address": {
|
'@Address': {
|
||||||
title: '地址'
|
title: '地址'
|
||||||
},
|
},
|
||||||
"@RequestType": {
|
'@RequestType': {
|
||||||
title: '类型'
|
title: '类型'
|
||||||
},
|
},
|
||||||
"@RequestInterval": {
|
'@RequestInterval': {
|
||||||
title: '采集周期(ms)'
|
title: '采集周期(ms)'
|
||||||
},
|
},
|
||||||
"@Length": {
|
'@Length': {
|
||||||
title: '长度'
|
title: '长度'
|
||||||
},
|
},
|
||||||
"@Description": {
|
'@Description': {
|
||||||
title: '说明'
|
title: '说明'
|
||||||
},
|
},
|
||||||
"@Value": {
|
'@Value': {
|
||||||
title: '当前值'
|
title: '当前值'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
addRules: {
|
addRules: {
|
||||||
"@Name": [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }],
|
'@Name': [{ required: true, type: 'string', message: '请输入名称', trigger: 'blur' }],
|
||||||
"@Address": [{ required: true, message: '请输入地址', trigger: 'blur' }],
|
'@Address': [{ required: true, message: '请输入地址', trigger: 'blur' }],
|
||||||
"@RequestType": [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }],
|
'@RequestType': [{ required: true, type: 'string', message: '请选择类型', trigger: 'blur' }],
|
||||||
"@RequestInterval": [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }],
|
'@RequestInterval': [{ required: true, message: '请输入采集周期(ms)', trigger: 'blur' }],
|
||||||
"@Length": [{ required: true, message: '请输入长度', trigger: 'blur' }],
|
'@Length': [{ required: true, message: '请输入长度', trigger: 'blur' }],
|
||||||
"@Value": [{ required: true, message: '请输入当前值', trigger: 'blur' }],
|
'@Value': [{ required: true, message: '请输入当前值', trigger: 'blur' }]
|
||||||
},
|
},
|
||||||
serverId: 0,
|
serverId: 0,
|
||||||
devicePointData: [],
|
devicePointData: [],
|
||||||
@@ -246,41 +244,40 @@ export default {
|
|||||||
defaultDeviceName: '',
|
defaultDeviceName: '',
|
||||||
defaultFormData: {},
|
defaultFormData: {},
|
||||||
deviceData: [],
|
deviceData: [],
|
||||||
deviceConfigure:{}
|
deviceConfigure: {}
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
server_id: {
|
server_id: {
|
||||||
handler(val) {
|
handler (val) {
|
||||||
this.serverId = val
|
this.serverId = val
|
||||||
this.getDevice()
|
this.getDevice()
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
addRow() {
|
addRow () {
|
||||||
this.$refs.d2Crud.showDialog({
|
this.$refs.d2Crud.showDialog({
|
||||||
mode: 'add'
|
mode: 'add'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleFormDataChange({ key }) {
|
handleFormDataChange ({ key }) {
|
||||||
if (key === 'working_subclass') {
|
if (key === 'workingSubclass') {
|
||||||
const { working_subclass } = this.$refs.d2Crud.formData
|
const { workingSubclass } = this.$refs.d2Crud.formData
|
||||||
this.getCodesByWorkingSubclass(working_subclass)
|
this.getCodesByWorkingSubclass(workingSubclass)
|
||||||
this.$refs.d2Crud.$forceUpdate()
|
this.$refs.d2Crud.$forceUpdate()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCellDataChange ({ rowIndex, key, value, row }) {
|
handleCellDataChange ({ rowIndex, row }) {
|
||||||
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode[rowIndex]
|
this.devicePointData[rowIndex] = row
|
||||||
this.setDeviceConfigure()
|
this.setDeviceConfigure()
|
||||||
},
|
},
|
||||||
bandingNodeTemplate() {
|
bandingNodeTemplate () {
|
||||||
this.$refs.d2Crud.showDialog({
|
this.$refs.d2Crud.showDialog({
|
||||||
mode: 'edit',
|
mode: 'edit',
|
||||||
template: {
|
template: {
|
||||||
working_subclass: {
|
workingSubclass: {
|
||||||
title: '工序编码',
|
title: '工序编码',
|
||||||
value: '',
|
value: '',
|
||||||
component: {
|
component: {
|
||||||
@@ -289,7 +286,7 @@ export default {
|
|||||||
span: 12
|
span: 12
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
node_code: {
|
nodeCode: {
|
||||||
title: '节点名称',
|
title: '节点名称',
|
||||||
value: '',
|
value: '',
|
||||||
component: {
|
component: {
|
||||||
@@ -297,19 +294,19 @@ export default {
|
|||||||
options: this.nodeCodeData,
|
options: this.nodeCodeData,
|
||||||
span: 12
|
span: 12
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleDialogCancel(done) {
|
handleDialogCancel (done) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: '用户取消保存',
|
message: '用户取消保存',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
});
|
})
|
||||||
done()
|
done()
|
||||||
},
|
},
|
||||||
handleCommand(command) {
|
handleCommand (command) {
|
||||||
switch (command) {
|
switch (command) {
|
||||||
case 'add':
|
case 'add':
|
||||||
this.addDevice()
|
this.addDevice()
|
||||||
@@ -319,28 +316,27 @@ export default {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getCodesByWorkingSubclass(workingSubclass) {
|
async getCodesByWorkingSubclass (workingSubclass) {
|
||||||
try {
|
try {
|
||||||
const nodeCode = await this.$api.QUERY_CODES(workingSubclass)
|
const nodeCode = await this.$api.QUERY_CODES(workingSubclass)
|
||||||
let nodeCodeData = []
|
const nodeCodeData = []
|
||||||
each(nodeCode, (o) => {
|
each(nodeCode, (o) => {
|
||||||
nodeCodeData.push({ value: o, label: o })
|
nodeCodeData.push({ value: o, label: o })
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this.nodeCodeData = nodeCodeData
|
this.nodeCodeData = nodeCodeData
|
||||||
this.$nextTick(() => {
|
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()
|
this.$refs.d2Crud.$forceUpdate()
|
||||||
})
|
})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
async getworkingSubclasses() {
|
async getworkingSubclasses () {
|
||||||
try {
|
try {
|
||||||
const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES()
|
const workingSubclasses = await this.$api.QUERY_WORKING_SUBCLASSES()
|
||||||
let workingSubclassesData = []
|
const workingSubclassesData = []
|
||||||
each(workingSubclasses, (o) => {
|
each(workingSubclasses, (o) => {
|
||||||
workingSubclassesData.push({ value: o, label: o })
|
workingSubclassesData.push({ value: o, label: o })
|
||||||
}
|
}
|
||||||
@@ -350,32 +346,32 @@ export default {
|
|||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getDevice() {
|
async getDevice () {
|
||||||
try {
|
try {
|
||||||
this.deviceData = await this.$api.GET_DEVICE(this.serverId)
|
this.deviceData = await this.$api.GET_DEVICE(this.serverId)
|
||||||
if(this.deviceData.length >0 ){
|
if (this.deviceData.length > 0) {
|
||||||
this.getDeviceConfigure(this.deviceActiveStatus)
|
this.getDeviceConfigure(this.deviceActiveStatus)
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getDeviceConfigure(e) {
|
async getDeviceConfigure (e) {
|
||||||
this.deviceActiveStatus = e
|
this.deviceActiveStatus = e
|
||||||
this.devicePointData =[] //当切换设备时把保存configure、point的数据清空
|
this.devicePointData = [] // 当切换设备时把保存configure、point的数据清空
|
||||||
this.defaultDeviceName =[]
|
this.defaultDeviceName = ''
|
||||||
const deviceData = await this.$api.GET_DEVICE_CONFIGURE(this.deviceData[e].id)
|
const deviceData = await this.$api.GET_DEVICE_CONFIGURE(this.deviceData[e].id)
|
||||||
if(deviceData[0].conf){
|
if (deviceData[0].conf) {
|
||||||
let conf = JSON.parse(deviceData[0].conf)
|
const conf = JSON.parse(deviceData[0].conf)
|
||||||
if(conf["@Name"] != undefined){
|
if (conf['@Name'] !== undefined) {
|
||||||
this.defaultDeviceName = conf["@Name"]
|
this.defaultDeviceName = conf['@Name']
|
||||||
this.defaultFormData = conf
|
this.defaultFormData = conf
|
||||||
}
|
}
|
||||||
//获取point信息
|
// 获取point信息
|
||||||
if(conf.RequestNode != undefined && conf.RequestNode.length > 0){
|
if (conf.RequestNode !== undefined && conf.RequestNode.length > 0) {
|
||||||
this.devicePointData = each(conf.RequestNode, (o,i) => (
|
this.devicePointData = each(conf.RequestNode, (o, i) => (
|
||||||
assign(o, {
|
assign(o, {
|
||||||
id:i+1,
|
id: i + 1,
|
||||||
showBindButton: true,
|
showBindButton: true,
|
||||||
showSendButton: true,
|
showSendButton: true,
|
||||||
showCopyButton: true,
|
showCopyButton: true,
|
||||||
@@ -385,70 +381,82 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
addDevice() {
|
addDevice () {
|
||||||
const that = this
|
const that = this
|
||||||
this.$prompt('输入设备名称', '新加设备', {
|
this.$prompt('输入设备名称', '新加设备', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
|
inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
|
||||||
inputErrorMessage: '请输入设备名称'
|
inputErrorMessage: '请输入设备名称'
|
||||||
}).then(({ value }) => {
|
}).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()
|
that.getDevice()
|
||||||
this.$message({
|
this.$message({
|
||||||
message: '新加设备成功',
|
message: '新加设备成功',
|
||||||
type: 'success'
|
type: 'success'
|
||||||
});
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async delDevice() {
|
async delDevice () {
|
||||||
try {
|
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({
|
this.$message({
|
||||||
message: '删除设备成功',
|
message: '删除设备成功',
|
||||||
type: 'success'
|
type: 'success'
|
||||||
});
|
})
|
||||||
this.getDevice()
|
this.getDevice()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async addDevicePoint(row, done) {
|
async addDevicePoint (row, done) {
|
||||||
this.formOptions.saveLoading = true
|
this.formOptions.saveLoading = true
|
||||||
|
if (!this.$refs.defaultDeviceTypeNameValue) {
|
||||||
|
this.$message({
|
||||||
|
message: '请先应用设备配置',
|
||||||
|
type: 'error'
|
||||||
|
})
|
||||||
|
done(false)
|
||||||
|
} else {
|
||||||
this.devicePointData.push(row)
|
this.devicePointData.push(row)
|
||||||
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData
|
|
||||||
await this.setDeviceConfigure()
|
await this.setDeviceConfigure()
|
||||||
await this.getDevice()
|
await this.getDevice()
|
||||||
done()
|
done()
|
||||||
|
}
|
||||||
this.formOptions.saveLoading = false
|
this.formOptions.saveLoading = false
|
||||||
},
|
},
|
||||||
async delDevicePoint({ index, row }, done){
|
async delDevicePoint ({ index, row }, done) {
|
||||||
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData.splice(index,1)
|
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData.splice(index, 1)
|
||||||
await this.setDeviceConfigure()
|
await this.setDeviceConfigure()
|
||||||
done()
|
done()
|
||||||
},
|
},
|
||||||
async getDevicePoint() {
|
async getDevicePoint () {
|
||||||
const data = {action: 'add_node', server_id: this.serverId, device_id:this.deviceData[this.deviceActiveStatus].id}
|
const data = { action: 'add_node', server_id: this.serverId, device_id: this.deviceData[this.deviceActiveStatus].id }
|
||||||
try {
|
try {
|
||||||
this.devicePointData = await this.$api.GET_DEVICE_POINT(data)
|
this.devicePointData = await this.$api.GET_DEVICE_POINT(data)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async devicePointBandingNode({ index, row }) {
|
async devicePointBandingNode ({ index, row }, done) {
|
||||||
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode[index]['@binding'] = row.node_code
|
this.devicePointData[index]['@Binding'] = row.nodeCode
|
||||||
this.setDeviceConfigure()
|
this.setDeviceConfigure()
|
||||||
|
done()
|
||||||
},
|
},
|
||||||
async setDeviceConfigure(){
|
async setDeviceConfigure () {
|
||||||
try {
|
try {
|
||||||
let deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522','admin','123456')
|
const deviceConfigure = await this.$api.GET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522', 'admin', '123456')
|
||||||
deviceConfigure.Content.Settings.GroupNode[0].DeviceNode = [this.$refs.deviceConfigure.deviceConfigureModelValue]
|
if (this.devicePointData.length > 0) {
|
||||||
await this.$api.SET_HSLSERVER_CONFIGURE('http://8.sctmes.com:20522','admin','123456',{data: deviceConfigure.Content })
|
this.$refs.deviceConfigure.deviceConfigureModelValue.RequestNode = this.devicePointData
|
||||||
const data = {
|
|
||||||
"action": "update_device",
|
|
||||||
"conf": JSON.stringify(this.$refs.deviceConfigure.deviceConfigureModelValue),
|
|
||||||
"id": this.deviceData[this.deviceActiveStatus].id
|
|
||||||
}
|
}
|
||||||
|
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.$api.SET_DEVICE_CONFIGURE(data)
|
||||||
this.$message({
|
this.$message({
|
||||||
message: '操作成功',
|
message: '操作成功',
|
||||||
@@ -458,22 +466,21 @@ export default {
|
|||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getDeviceStatus(){
|
getDeviceStatus () {
|
||||||
this.$api.GET_DEVICE_STATUS(this.serverId).then(res=>{
|
this.$api.GET_DEVICE_STATUS(this.serverId).then(res => {
|
||||||
each(this.deviceData,(item)=>{
|
each(this.deviceData, (item) => {
|
||||||
if(res.devices[item.id] ){
|
if (item.id in res.device_status) {
|
||||||
item.status = data.devices[item.id]
|
item.status = res.device_status[item.id]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.$emit('changeStatus',res.server)
|
this.$emit('changeStatus', res.server_status)
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted () {
|
||||||
this.getDevice()
|
this.getDevice()
|
||||||
this.getworkingSubclasses()
|
this.getworkingSubclasses()
|
||||||
setInterval(this.getDeviceStatus,2000)
|
setInterval(this.getDeviceStatus, 2000)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -39,13 +38,13 @@
|
|||||||
import deviceConfigureFormItemData from './deviceSetting/index.json'
|
import deviceConfigureFormItemData from './deviceSetting/index.json'
|
||||||
import { each } from 'lodash'
|
import { each } from 'lodash'
|
||||||
export default {
|
export default {
|
||||||
name:'deviceConfigure',
|
name: 'deviceConfigure',
|
||||||
props: {
|
props: {
|
||||||
loading: {
|
loading: {
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
defaultDeviceName: {
|
defaultDeviceName: {
|
||||||
default: Object.keys(deviceConfigureFormItemData)[0]
|
default: ''
|
||||||
},
|
},
|
||||||
defaultFormData: {
|
defaultFormData: {
|
||||||
default: () => []
|
default: () => []
|
||||||
@@ -57,48 +56,45 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
defaultDeviceName: {
|
defaultDeviceName: {
|
||||||
handler(val) {
|
handler (val) {
|
||||||
if(val){
|
|
||||||
this.defaultDeviceTypeNameValue = val
|
this.defaultDeviceTypeNameValue = val
|
||||||
this.deviceChange(val)
|
this.deviceChange(val)
|
||||||
}
|
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
},
|
},
|
||||||
defaultFormData: {
|
defaultFormData: {
|
||||||
handler(val) {
|
handler (val) {
|
||||||
this.setDeviceDefaultFormItemValue(val)
|
this.setDeviceDefaultFormItemValue(val)
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
data () {
|
||||||
data() {
|
|
||||||
return {
|
return {
|
||||||
deviceConfigureFormItem: [],
|
deviceConfigureFormItem: [],
|
||||||
defaultDeviceTypeNameValue: '',
|
defaultDeviceTypeNameValue: '',
|
||||||
deviceConfigureModelValue: {},
|
deviceConfigureModelValue: {},
|
||||||
deviceSelectedVlaue: '',
|
deviceSelectedVlaue: '',
|
||||||
deviceTypeData: [
|
deviceTypeData: [
|
||||||
],
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
deviceChange(e) {
|
deviceChange (e) {
|
||||||
//获取所有字符串的key 用于v-model渲染
|
// 获取所有字符串的key 用于v-model渲染
|
||||||
let deviceConfigureModelValue = {}
|
const deviceConfigureModelValue = {}
|
||||||
each(deviceConfigureFormItemData[e], (item) => {
|
each(deviceConfigureFormItemData[e], (item) => {
|
||||||
|
|
||||||
if (item.type === 'time') {
|
if (item.type === 'time') {
|
||||||
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : new Date()
|
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : new Date()
|
||||||
} else {
|
} else {
|
||||||
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : ""
|
deviceConfigureModelValue[item.key] = item.defaultValue ? item.defaultValue : ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.deviceConfigureModelValue = deviceConfigureModelValue
|
this.deviceConfigureModelValue = deviceConfigureModelValue
|
||||||
this. deviceConfigureFormItem = deviceConfigureFormItemData[e]
|
this.deviceConfigureFormItem = deviceConfigureFormItemData[e]
|
||||||
},
|
},
|
||||||
setDeviceDefaultFormItemValue(val) {
|
setDeviceDefaultFormItemValue (val) {
|
||||||
let deviceConfigureModelValue = {}
|
const deviceConfigureModelValue = {}
|
||||||
each(deviceConfigureFormItemData[this.defaultDeviceTypeNameValue], (item) => {
|
each(deviceConfigureFormItemData[this.defaultDeviceTypeNameValue], (item) => {
|
||||||
if (item.type === 'time') {
|
if (item.type === 'time') {
|
||||||
deviceConfigureModelValue[item.key] = val[item.key] ? val[item.key] : new Date()
|
deviceConfigureModelValue[item.key] = val[item.key] ? val[item.key] : new Date()
|
||||||
@@ -109,11 +105,11 @@ export default {
|
|||||||
)
|
)
|
||||||
this.deviceConfigureModelValue = deviceConfigureModelValue
|
this.deviceConfigureModelValue = deviceConfigureModelValue
|
||||||
},
|
},
|
||||||
getDeviceType() {
|
getDeviceType () {
|
||||||
this.deviceTypeData = Object.keys(deviceConfigureFormItemData)
|
this.deviceTypeData = Object.keys(deviceConfigureFormItemData)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted () {
|
||||||
this.getDeviceType()
|
this.getDeviceType()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ const genRanHex = size => [...Array(size)].map(() => Math.floor(Math.random() *
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
Device: () => import('./device'),
|
Device: () => import('./device')
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
@@ -81,26 +81,26 @@ export default {
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
isDrawerShow: false,
|
isDrawerShow: false,
|
||||||
server_id:0,
|
server_id: 0,
|
||||||
serveStatus:{
|
serveStatus: {
|
||||||
online:{
|
online: {
|
||||||
name:'在线',
|
name: '在线',
|
||||||
textColor:'#67c23a',
|
textColor: '#67c23a',
|
||||||
backgroundColor:'#f0f9eb',
|
backgroundColor: '#f0f9eb',
|
||||||
borderColor:'#e1f3d8'
|
borderColor: '#e1f3d8'
|
||||||
},
|
},
|
||||||
offline:{
|
offline: {
|
||||||
name:'离线',
|
name: '离线',
|
||||||
textColor:'#67c23a',
|
textColor: '#67c23a',
|
||||||
backgroundColor:'#f0f9eb',
|
backgroundColor: '#f0f9eb',
|
||||||
borderColor:'#e1f3d8'
|
borderColor: '#e1f3d8'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
selectedServerData:{
|
selectedServerData: {
|
||||||
name:'',
|
name: '',
|
||||||
url:'',
|
url: '',
|
||||||
port:'',
|
port: '',
|
||||||
status:'offline'
|
status: 'offline'
|
||||||
},
|
},
|
||||||
data: [],
|
data: [],
|
||||||
serverSettings: {},
|
serverSettings: {},
|
||||||
@@ -133,7 +133,7 @@ export default {
|
|||||||
{
|
{
|
||||||
text: '设备配置',
|
text: '设备配置',
|
||||||
size: 'small',
|
size: 'small',
|
||||||
emit: 'set-device',
|
emit: 'set-device'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -330,25 +330,23 @@ export default {
|
|||||||
})
|
})
|
||||||
done()
|
done()
|
||||||
},
|
},
|
||||||
drawerShow({row}){
|
drawerShow ({ row }) {
|
||||||
this.selectedServerData = {
|
this.selectedServerData = {
|
||||||
name:row.name,
|
name: row.name,
|
||||||
url:row.url,
|
url: row.url,
|
||||||
port:row.port,
|
port: row.port,
|
||||||
status:row.status ? row.status :'offline'
|
status: row.status ? row.status : 'offline'
|
||||||
}
|
}
|
||||||
this.server_id = row.id
|
this.server_id = row.id
|
||||||
this.isDrawerShow = true
|
this.isDrawerShow = true
|
||||||
},
|
},
|
||||||
changeSelectedServerStatus(status){
|
changeSelectedServerStatus (status) {
|
||||||
|
this.selectedServerData.status = status || 'offline'
|
||||||
this.selectedServerData.status = status ? status : 'offline'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.getServers()
|
this.getServers()
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user