From 1db7db4bf02259e47d5d906d6b21ecc6451b0a09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 23 十月 2023 15:26:46 +0800
Subject: [PATCH] 添加集群手动选主节点, 无线网络显示ip
---
src/pages/settings/views/NetSettings.vue | 293 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 183 insertions(+), 110 deletions(-)
diff --git a/src/pages/settings/views/NetSettings.vue b/src/pages/settings/views/NetSettings.vue
index bb45387..aec11cf 100644
--- a/src/pages/settings/views/NetSettings.vue
+++ b/src/pages/settings/views/NetSettings.vue
@@ -40,46 +40,50 @@
<div class="wifi-set" v-if="activePage == 1 && !inWifiDetail">
<div class="title">鏃犵嚎缃戠粶</div>
- <switchBar :barName="`鏃犵嚎缃戝崱`" @switchChange="wifiControl" :value="isOpenWifi"></switchBar>
+ <switchBar :barName="`鏃犵嚎缃戝崱`" @switchChange="wifiControl" :value="true"></switchBar>
- <div class="wifi-option" v-for="(item, i) in wifiList" :key="i">
+ <div class="wifi-option" v-for="(item, i) in wifiList" :key="i" @click="checkWifi(item)">
<div class="name">
- <span class="icon iconfont" v-if="item.isConnected"></span>
- <span :style="!item.isConnected ? { 'margin-left': '24px' } : {}">{{ item.name }}</span>
+ <span class="icon iconfont" v-if="item.connected"></span>
+ <span :style="!item.connected ? { 'margin-left': '24px' } : {}">{{ item.essid | escape }}</span>
</div>
<div class="more-detail">
- <span class="icon iconfont lock"></span>
+ <span class="icon iconfont lock" v-if="item.encryption_key"></span>
<span class="icon iconfont signal"></span>
- <span class="icon iconfont more-icon" @click="checkWifi(item)"></span>
+ <span class="icon iconfont more-icon"></span>
</div>
</div>
+
+ <el-button type="text" @click="wirelessScan" :loading="wifiScanning">鎵弿鏃犵嚎缃戠粶</el-button>
</div>
<div class="wifi-detail" v-if="activePage == 1 && inWifiDetail" ref="ipvHolder">
<div class="title">鏃犵嚎缃戠粶</div>
- <div class="btns">
- <div class="cancel">鍒犻櫎</div>
- <div class="ok">鏂紑杩炴帴</div>
- </div>
-
<div class="general-box">
- <div class="in-title">閫氱敤</div>
+ <!-- <div class="in-title">閫氱敤</div> -->
- <el-form :model="wifiForm" ref="wifiForm" class="join-form">
+ <el-form :model="selectedWifi" ref="wifiForm" class="join-form">
<el-form-item prop="name">
<div class="p-title">鍚嶇О</div>
<!-- <div class="wifi-name">{{ 12123 }}</div> -->
- <el-input v-model="wifiForm.name" placeholder="" size="small"></el-input>
+ <el-input v-model="selectedWifi.essid" placeholder="" size="small"></el-input>
</el-form-item>
<el-form-item prop="password">
<div class="p-title">瀵嗙爜</div>
- <el-input v-model="wifiForm.password" placeholder="璇疯緭鍏ュ瘑鐮�" size="small" show-password></el-input>
+ <el-input value="******" v-if="selectedWifi.connected"></el-input>
+ <el-input
+ v-model="selectedWifi.password"
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ size="small"
+ show-password
+ v-else
+ ></el-input>
</el-form-item>
</el-form>
</div>
- <switchBar :barName="`楂樼骇璁剧疆`" :value="isHighClass"></switchBar>
+ <!-- <switchBar :barName="`楂樼骇璁剧疆`" :value="isHighClass"></switchBar> -->
<div class="general-box fold" :class="{ hidden: IPV4_hid }">
<div class="in-title">
@@ -87,10 +91,16 @@
<span class="icon iconfont icon-fold" @click="toggleFold('IPV4_hid')"></span>
</div>
- <el-form :model="ipv4Form" :rules="ipv4FormRules" ref="ipv4Form">
+ <el-form :model="wirelessForm" ref="wirelessForm">
<el-form-item>
<div class="p-title">鏂规硶</div>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small" :popper-append-to-body="false">
+ <el-select
+ v-model="wifiProto"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ :popper-append-to-body="false"
+ :disabled="wifiProto == 'dhcp'"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -101,85 +111,52 @@
</el-form-item>
<el-form-item prop="ip">
<div class="p-title">IP</div>
- <ip-input :ip="ipv4Form.ip" @on-blur="ipv4Form.ip = arguments[0]"></ip-input>
+ <ip-input
+ :ip="wirelessForm.ip"
+ @on-blur="wirelessForm.ip = arguments[0]"
+ :disabled="wifiProto == 'dhcp'"
+ ></ip-input>
</el-form-item>
<el-form-item prop="subMask">
<div class="p-title">瀛愮綉鎺╃爜</div>
- <ip-input :ip="ipv4Form.subMask" @on-blur="ipv4Form.subMask = arguments[0]"></ip-input>
+ <ip-input
+ :ip="wirelessForm.subMask"
+ @on-blur="wirelessForm.subMask = arguments[0]"
+ :disabled="wifiProto == 'dhcp'"
+ ></ip-input>
</el-form-item>
<el-form-item prop="gateway">
<div class="p-title">缃戝叧</div>
- <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>
+ <ip-input
+ :ip="wirelessForm.gateway"
+ @on-blur="wirelessForm.gateway = arguments[0]"
+ :disabled="wifiProto == 'dhcp'"
+ ></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">棣栭�塂NS</div>
- <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>
+ <ip-input
+ :ip="wirelessForm.dns1"
+ @on-blur="wirelessForm.dns1 = arguments[0]"
+ :disabled="wifiProto == 'dhcp'"
+ ></ip-input>
</el-form-item>
<el-form-item prop="dns">
<div class="p-title">澶囩敤DNS</div>
- <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>
- </el-form-item>
- </el-form>
- </div>
-
- <div class="general-box fold" :class="{ hidden: IPV6_hid }" ref="ipv6Holder">
- <div class="in-title">
- IPV6
- <span class="icon iconfont icon-fold" @click="toggleFold('IPV6_hid')"></span>
- </div>
-
- <el-form :model="ipv6Form" :rules="ipv6FormRules" ref="ipv6Form">
- <el-form-item>
- <div class="p-title">鏂规硶</div>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small" :popper-append-to-body="false">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item prop="ip">
- <div class="p-title">IP</div>
- <ip-input :ip="ipv6Form.ip" @on-blur="ipv6Form.ip = arguments[0]"></ip-input>
- </el-form-item>
- <el-form-item prop="subMask">
- <div class="p-title">鍓嶇紑</div>
- <div style="display: flex; width: 100%">
- <el-input v-model="ipv6Form.prefix" placeholder size="small"></el-input>
-
- <div class="ad">
- <i class="el-icon-remove-outline" @click="minusPrefix"></i>
- </div>
- <div class="ad">
- <i class="el-icon-circle-plus-outline" @click=";+ipv6Form.prefix++"></i>
- </div>
- <div class="ad">
- <i class="el-icon-refresh-left" @click="ipv6Form.prefix = ''"></i>
- </div>
- </div>
- </el-form-item>
-
- <el-form-item prop="gateway">
- <div class="p-title">缃戝叧</div>
- <ip-input :ip="ipv6Form.gateway" @on-blur="ipv6Form.gateway = arguments[0]"></ip-input>
- </el-form-item>
- <el-form-item prop="dns">
- <div class="p-title">棣栭�塂NS</div>
- <ip-input :ip="ipv6Form.dns1" @on-blur="ipv6Form.dns1 = arguments[0]"></ip-input>
- </el-form-item>
- <el-form-item prop="dns">
- <div class="p-title">澶囩敤DNS</div>
- <ip-input :ip="ipv6Form.dns2" @on-blur="ipv6Form.dns2 = arguments[0]"></ip-input>
+ <ip-input
+ :ip="wirelessForm.dns2"
+ @on-blur="wirelessForm.dns2 = arguments[0]"
+ :disabled="wifiProto == 'dhcp'"
+ ></ip-input>
</el-form-item>
</el-form>
</div>
<div class="btns">
<div class="cancel" @click="inWifiDetail = false">鍙栨秷</div>
- <div class="ok">淇濆瓨</div>
+ <div class="ok" v-if="selectedWifi.connected" @click="disconectedWifi">鏂紑杩炴帴</div>
+ <div class="ok" v-else @click="saveWifi">淇濆瓨</div>
</div>
</div>
@@ -251,7 +228,9 @@
getNetWorkCardInfo,
getDevInfo,
downNetCard,
- upNetCard
+ upNetCard,
+ getWifiList,
+ connectWifi
} from "@/api/system"
import ipInput from "../components/IPInput"
@@ -270,6 +249,11 @@
WifiGateway,
LoraGateway,
MqttGateway
+ },
+ filters: {
+ escape(val) {
+ return unescape(val)
+ }
},
data() {
const checkPwd = (rule, value, callback) => {
@@ -290,17 +274,13 @@
deviceName: "",
port: ""
},
- wifiForm: {
- name: "",
- password: ""
- },
wireArr: [],
inWifiDetail: false,
- wifiList: [
- { name: "鏃犵嚎缃戠粶1", isConnected: false },
- { name: "鏃犵嚎缃戠粶2", isConnected: true }
- ],
+ selectedWifi: {},
+ wifiList: [],
+ wifiScanning: false,
isOpenWifi: false,
+ wifiIfname: "",
inWireDetail: false,
wireForm: {
dns: "",
@@ -350,7 +330,7 @@
rules: {
deviceName: [{ required: true, message: "璇疯緭鍏ヨ澶囧悕绉�", trigger: "change" }]
},
- ipv4Form: {},
+ wirelessForm: {},
ipv6Form: {},
ipv4FormRules: {},
tabList: [
@@ -364,16 +344,16 @@
ipv6FormRules: {},
options: [
{
- value: "閫夐」1",
+ value: "dhcp",
label: "鑷姩"
},
{
- value: "閫夐」2",
+ value: "static",
label: "鎵嬪姩"
}
],
- value: "",
- IPV4_hid: false,
+ wifiProto: "dhcp",
+ IPV4_hid: true,
IPV6_hid: false,
configLoading: false
}
@@ -383,8 +363,24 @@
this.fetchWireList()
},
methods: {
+ wirelessScan() {
+ this.wifiList = []
+ this.wifiScanning = true
+ getWifiList({ ifname: this.wifiIfname })
+ .then((rsp) => {
+ if (rsp && rsp.success) {
+ this.wifiList = rsp.data.filter((e) => {
+ return e.essid != ""
+ })
+ }
+
+ this.wifiScanning = false
+ })
+ .catch(() => {
+ this.wifiScanning = false
+ })
+ },
minusPrefix() {
- debugger
this.ipv6Form.prefix
},
switchNetCard(item) {
@@ -426,9 +422,20 @@
getWireList().then((res) => {
if (res && res.success) {
this.wireArr = res.data
+
+ // 杩囨护缃戠粶鎺ュ彛鐘舵��
this.wireArr.forEach((x) => {
let t = x.flags.split("|")[0] == "up"
this.$set(x, "active", t)
+
+ if (x.wireless) {
+ this.wifiIfname = x.name
+ }
+ })
+
+ // 杩囨护鎺墂ifi鎺ュ彛
+ this.wireArr = res.data.filter((e) => {
+ return !e.wireless
})
}
})
@@ -459,6 +466,7 @@
}
if (i == 1) {
this.inWifiDetail = false
+ this.wirelessScan()
}
this.activePage = i
},
@@ -484,6 +492,7 @@
this.configLoading = true
if (this.wireForm.ip !== this.originalConfig.ip) {
this.configLoading = false
+ console.log("set time out")
var changeIPTimer = setTimeout(() => {
this.$alert(
'<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a target="_parent" href="' +
@@ -510,14 +519,7 @@
})
}
})
- .catch((err) => {
- clearTimeout(changeIPTimer)
- this.configLoading = false
- this.$notify({
- type: "error",
- message: "淇濆瓨澶辫触"
- })
- })
+ .catch((err) => {})
this.$message({
message: "鎿嶄綔瀹屾垚,璇风◢鍚�",
type: "success"
@@ -530,8 +532,19 @@
})
},
wifiControl(val) {},
- checkWifi() {
+ checkWifi(item) {
this.inWifiDetail = true
+ this.selectedWifi = item
+ getNetWorkCardInfo({
+ ifname: this.wifiIfname
+ }).then((res) => {
+ if (res && res.success) {
+ this.wirelessForm.ip = res.data.ip
+ this.wirelessForm.gateway = res.data.gateway
+ this.wirelessForm.dns = res.data.dns
+ this.wirelessForm.subMask = res.data.subMask
+ }
+ })
},
openWireDetail(item) {
this.inWireDetail = true
@@ -579,6 +592,57 @@
}, 300)
}
this[tog] = !this[tog]
+ },
+ disconectedWifi() {
+ let param = {
+ ifname: this.wifiIfname,
+ ssid: "del",
+ passwd: ""
+ }
+
+ this.configLoading = true
+ connectWifi(param)
+ .then((rsp) => {
+ if (rsp && rsp.success) {
+ this.$message.success("閰嶇疆鎴愬姛")
+ } else {
+ this.$message.error("閰嶇疆澶辫触")
+ }
+
+ this.configLoading = false
+ this.wirelessScan()
+ })
+ .catch(() => {
+ this.configLoading = false
+ })
+ },
+ saveWifi() {
+ let param = {
+ ifname: this.wifiIfname,
+ ssid: this.selectedWifi.essid,
+ passwd: this.selectedWifi.password
+ }
+
+ if (this.selectedWifi.password.length < 8) {
+ this.$message.warning("瀵嗙爜涓嶈兘灏戜簬8浣�")
+ return
+ }
+
+ this.configLoading = true
+ connectWifi(param)
+ .then((rsp) => {
+ if (rsp && rsp.success) {
+ this.$message.success("閰嶇疆鎴愬姛")
+ } else {
+ this.$message.error("閰嶇疆澶辫触")
+ }
+
+ this.configLoading = false
+ this.wirelessScan()
+ })
+ .catch(() => {
+ this.configLoading = false
+ })
}
},
computed: {
@@ -593,11 +657,11 @@
width: 100%;
}
.wire {
- width: 456px;
+ // width: 456px;
margin: 0 auto;
}
.wire-detail {
- width: 456px;
+ // width: 456px;
margin: 0 auto;
.title {
font-size: 16px;
@@ -635,7 +699,7 @@
}
}
.net-set {
- max-width: 456px;
+ // max-width: 456px;
margin: 0 auto;
.title {
font-size: 16px;
@@ -808,7 +872,7 @@
max-width: none !important;
}
.wifi-set {
- max-width: 456px;
+ // max-width: 456px;
margin: 0 auto;
.switch-bar {
background: #f2f2f7;
@@ -830,6 +894,7 @@
margin-bottom: 4px;
background: #f2f2f7;
border-radius: 8px;
+ cursor: pointer;
.name {
font-size: 14px;
color: #4f4f4f;
@@ -859,7 +924,7 @@
}
}
.wifi-detail {
- max-width: 454px;
+ // max-width: 454px;
margin: 0 auto;
transition: all 0.3s linear 0s;
.general-box {
@@ -871,10 +936,15 @@
margin-bottom: 20px;
&.fold {
height: 342px;
+
+ .in-title {
+ display: flex;
+ justify-content: space-between;
+ }
+
.icon-fold {
display: inline-block;
font-size: 14px;
- margin-left: 360px;
transition: all 0.3s linear 0s;
cursor: pointer;
}
@@ -966,14 +1036,17 @@
align-items: center;
.el-switch__core {
height: 14px;
- background-color: var(--colorCard) !important;
- border-color: var(--colorCard) !important;
}
.el-switch.is-checked .el-switch__core::after {
left: 100%;
margin-left: -12px;
}
+ .el-switch.is-checked .el-switch__core {
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ }
+
.el-switch__core:after {
content: "";
position: absolute;
--
Gitblit v1.8.0