lixiaobang
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

逻辑不严谨bug修改

This commit is contained in:
qiudan 2024-04-11 15:45:53 +08:00
parent 76f90e3f88
commit 23016d7da1
1 changed files with 58 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/views/general/network.vue
View File

@ -780,6 +780,9 @@ export default {
console.log('msg', msg); console.log('msg', msg);
// var optionsDataN = this.optionsData // var optionsDataN = this.optionsData
console.log(' msg.netstates[this.optionsData]', this.optionsData); console.log(' msg.netstates[this.optionsData]', this.optionsData);
console.log(' msg.netstates[this.optionsData]', msg.netstates[this.optionsData]);
console.log(' msg.netplan[this.optionsData]', msg.netplan[this.optionsData]);
if (msg.netplan[this.optionsData] != undefined) { if (msg.netplan[this.optionsData] != undefined) {
this.dhcp4 = msg.netplan[this.optionsData].dhcp4 || false; this.dhcp4 = msg.netplan[this.optionsData].dhcp4 || false;
} }
@ -804,29 +807,34 @@ export default {
} else { } else {
this.sizeForm.status = 'NO'; this.sizeForm.status = 'NO';
} }
for (let i = 0; i < data.length; i++) { if (data && data.length > 0) {
if (data[i].family == 17) { for (let i = 0; i < data.length; i++) {
this.sizeForm.mac = data[i].address; if (data[i].family == 17) {
} else if (data[i].family == 2) { this.sizeForm.mac = data[i].address;
this.tableDataPanduan.push(data[i]); } else if (data[i].family == 2) {
this.tableDataPanduan.push(data[i]);
}
} }
} }
if (this.tableDataPanduan.length == msg.netplan[this.optionsData].addresses.length) { if (this.tableDataPanduan.length > 0 && msg.netplan[this.optionsData].addresses) {
for (let i = 0; i < this.tableDataPanduan.length; i++) { if (this.tableDataPanduan.length == msg.netplan[this.optionsData].addresses.length) {
for (let b = 0; b < msg.netplan[this.optionsData].addresses.length; b++) { for (let i = 0; i < this.tableDataPanduan.length; i++) {
// console.log("str1",netstates.netplan.eth0.addresses[b].substring(0,netstates.netplan.eth0.addresses[b].indexOf("/"))) for (let b = 0; b < msg.netplan[this.optionsData].addresses.length; b++) {
var ipos = msg.netplan[this.optionsData].addresses[b].indexOf('/'); //指定开始的字符串 // console.log("str1",netstates.netplan.eth0.addresses[b].substring(0,netstates.netplan.eth0.addresses[b].indexOf("/")))
let str1 = msg.netplan[this.optionsData].addresses[b].substring(0, ipos); var ipos = msg.netplan[this.optionsData].addresses[b].indexOf('/'); //指定开始的字符串
if (this.tableDataPanduan[i].address == str1) { let str1 = msg.netplan[this.optionsData].addresses[b].substring(0, ipos);
} else { if (this.tableDataPanduan[i].address == str1) {
// this.$message({ } else {
// message: '静态地址有误', // this.$message({
// type: 'warning' // message: '静态地址有误',
// }); // type: 'warning'
// });
}
} }
} }
} }
} }
let addressesN = []; let addressesN = [];
if (msg.netplan[this.optionsData].addresses && msg.netplan[this.optionsData].addresses.length > 0) { if (msg.netplan[this.optionsData].addresses && msg.netplan[this.optionsData].addresses.length > 0) {
addressesN = msg.netplan[this.optionsData].addresses.map((value, index) => { addressesN = msg.netplan[this.optionsData].addresses.map((value, index) => {
@ -840,17 +848,25 @@ export default {
//获取静态路由 //获取静态路由
var dataJ = msg.netplan[this.optionsData].routes; var dataJ = msg.netplan[this.optionsData].routes;
this.sizeForm.tableRouter = []; this.sizeForm.tableRouter = [];
for (let r = 0; r < dataJ.length; r++) { if (dataJ && dataJ.length > 0) {
this.sizeForm.tableRouter.push(dataJ[r]); for (let r = 0; r < dataJ.length; r++) {
this.sizeForm.tableRouter.push(dataJ[r]);
}
} }
this.sizeForm.gateway4 = msg.netplan[this.optionsData].gateway4; this.sizeForm.gateway4 = msg.netplan[this.optionsData].gateway4;
var legend = msg.netplan[this.optionsData].nameservers.addresses.map((value, index) => { let legend = [];
return { if (msg.netplan[this.optionsData].nameservers && msg.netplan[this.optionsData].nameservers.addresses) {
address: value, legend = msg.netplan[this.optionsData].nameservers.addresses.map((value, index) => {
id: index return {
}; address: value,
}); id: index
};
});
}
this.sizeForm.tableDataDNS = legend; this.sizeForm.tableDataDNS = legend;
console.log('从mqtt获取数据后重新整理的数据', this.sizeForm);
} else { } else {
this.sizeForm = { this.sizeForm = {
name: this.optionsData, name: this.optionsData,
@ -866,14 +882,18 @@ export default {
mtu: '', mtu: '',
mac: '', mac: '',
moren: '', moren: '',
speed: '' speed: '',
tableData: []
}; };
//获取静态路由 //获取静态路由
var dataJ = msg.netplan[this.optionsData].routes; var dataJ = msg.netplan[this.optionsData].routes;
this.sizeForm.tableRouter = []; this.sizeForm.tableRouter = [];
for (let r = 0; r < dataJ.length; r++) { if (dataJ && dataJ.length > 0) {
this.sizeForm.tableRouter.push(dataJ[r]); for (let r = 0; r < dataJ.length; r++) {
this.sizeForm.tableRouter.push(dataJ[r]);
}
} }
let addressesN = []; let addressesN = [];
if (msg.netplan[this.optionsData].addresses && msg.netplan[this.optionsData].addresses.length > 0) { if (msg.netplan[this.optionsData].addresses && msg.netplan[this.optionsData].addresses.length > 0) {
addressesN = msg.netplan[this.optionsData].addresses.map((value, index) => { addressesN = msg.netplan[this.optionsData].addresses.map((value, index) => {
@ -885,13 +905,17 @@ export default {
} }
this.sizeForm.tableData = addressesN; this.sizeForm.tableData = addressesN;
var legend = msg.netplan[this.optionsData].nameservers.addresses.map((value, index) => { let legend = [];
return { if (msg.netplan[this.optionsData].nameservers && msg.netplan[this.optionsData].nameservers.addresses) {
address: value, legend = msg.netplan[this.optionsData].nameservers.addresses.map((value, index) => {
id: index return {
}; address: value,
}); id: index
};
});
}
this.sizeForm.tableDataDNS = legend; this.sizeForm.tableDataDNS = legend;
console.log('从mqtt获取数据后重新整理的数据2', this.sizeForm);
} }
}, },
changeName(val) { changeName(val) {