From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master
---
src/pages/systemSettings/views/NetSettings.vue | 174 ++++++++++++++--------------------------------------------
1 files changed, 42 insertions(+), 132 deletions(-)
diff --git a/src/pages/systemSettings/views/NetSettings.vue b/src/pages/systemSettings/views/NetSettings.vue
index 71fb93e..3ef0dec 100644
--- a/src/pages/systemSettings/views/NetSettings.vue
+++ b/src/pages/systemSettings/views/NetSettings.vue
@@ -9,7 +9,10 @@
@click="openRight(item, i)"
ref="leftbar"
>
- <div><span class="icon iconfont"></span>{{ item.name }}</div>
+ <div>
+ <span class="icon iconfont"></span>
+ {{ item.name }}
+ </div>
<div class="status">宸茶繛鎺�</div>
</div>
</div>
@@ -24,35 +27,23 @@
label-width="150px"
>
<el-form-item label="璁惧鍚嶇О" prop="deviceName">
- <el-input
- v-model="ruleForm.deviceName"
- size="small"
- placeholder="蹇呭～"
- ></el-input>
+ <el-input v-model="ruleForm.deviceName" size="small" placeholder="蹇呭～"></el-input>
</el-form-item>
<el-form-item label="绔彛" prop="port">
- <el-input
- v-model="ruleForm.port"
- placeholder="閫夊～锛屽閮ㄨ闂殑绔彛"
- size="small"
- ></el-input>
+ <el-input v-model="ruleForm.port" placeholder="閫夊～锛屽閮ㄨ闂殑绔彛" size="small"></el-input>
</el-form-item>
</el-form>
<div class="save-btn" @click="saveServerName">淇濆瓨</div>
</div>
<div class="wifi" v-if="activePage == '鏃犵嚎缃戠粶' && !inWifiDetail">
- <switchBar
- :barName="`鏃犵嚎缃戝崱`"
- @switchChange="wifiControl"
- :value="isOpenWifi"
- ></switchBar>
+ <switchBar :barName="`鏃犵嚎缃戝崱`" @switchChange="wifiControl" :value="isOpenWifi"></switchBar>
<div class="wifi-option" v-for="(item, i) in wifiList" :key="i">
<div class="name">
<span class="icon iconfont"></span>
- <span> {{ item.name }} </span>
+ <span>{{ item.name }}</span>
</div>
<div class="more-detail">
@@ -61,15 +52,11 @@
class="icon iconfont"
style="margin-left: 10px; cursor: pointer"
@click="checkWifi(item)"
- ></span
- >
+ ></span>
</div>
</div>
</div>
- <div
- class="wifi-detail"
- v-if="activePage == '鏃犵嚎缃戠粶' && inWifiDetail"
- >
+ <div class="wifi-detail" v-if="activePage == '鏃犵嚎缃戠粶' && inWifiDetail">
<div class="btns">
<div class="left">鍒犻櫎</div>
<div class="right">鏂紑杩炴帴</div>
@@ -89,28 +76,14 @@
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
- <el-input
- v-model="wifiForm.password"
- placeholder="璇疯緭鍏ュ瘑鐮�"
- size="small"
- show-password
- ></el-input>
+ <el-input v-model="wifiForm.password" placeholder="璇疯緭鍏ュ瘑鐮�" size="small" show-password></el-input>
</el-form-item>
</el-form>
- <switchBar
- :barName="`楂樼骇璁剧疆`"
- @switchChange="highClassSetting"
- :value="isHighClass"
- ></switchBar>
+ <switchBar :barName="`楂樼骇璁剧疆`" @switchChange="highClassSetting" :value="isHighClass"></switchBar>
<div class="title">IPV4</div>
- <el-form
- :model="ipv4Form"
- :rules="ipv4FormRules"
- ref="ipv4Form"
- label-width="150px"
- >
+ <el-form :model="ipv4Form" :rules="ipv4FormRules" ref="ipv4Form" label-width="150px">
<el-form-item label="鏂规硶">
<el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
<el-option
@@ -118,51 +91,30 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="IP" prop="ip">
- <ip-input
- :ip="ipv4Form.ip"
- @on-blur="ipv4Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.ip" @on-blur="ipv4Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="瀛愮綉鎺╃爜" prop="subMask">
- <ip-input
- :ip="ipv4Form.subMask"
- @on-blur="ipv4Form.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.subMask" @on-blur="ipv4Form.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="ipv4Form.gateway"
- @on-blur="ipv4Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="棣栭�塂NS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns1"
- @on-blur="ipv4Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="澶囩敤DNS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns2"
- @on-blur="ipv4Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
<div class="title">IPV6</div>
- <el-form
- :model="ipv6Form"
- :rules="ipv6FormRules"
- ref="ipv4Form"
- label-width="150px"
- >
+ <el-form :model="ipv6Form" :rules="ipv6FormRules" ref="ipv4Form" label-width="150px">
<el-form-item label="鏂规硶">
<el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
<el-option
@@ -170,23 +122,15 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="IP鍦板潃" prop="ip">
- <ip-input
- :ip="ipv6Form.ip"
- @on-blur="ipv6Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.ip" @on-blur="ipv6Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="鍓嶇紑" prop="subMask">
<div style="display: flex">
- <el-input
- v-model="wifiForm.password"
- placeholder=""
- size="small"
- ></el-input>
+ <el-input v-model="wifiForm.password" placeholder size="small"></el-input>
<div class="ad">-</div>
<div class="ad">+</div>
@@ -195,22 +139,13 @@
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="ipv6Form.gateway"
- @on-blur="ipv6Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.gateway" @on-blur="ipv6Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="棣栭�塂NS" prop="dns">
- <ip-input
- :ip="ipv6Form.dns1"
- @on-blur="ipv6Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns1" @on-blur="ipv6Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="澶囩敤DNS" prop="dns">
- <ip-input
- :ip="ipv6Form.dns2"
- @on-blur="ipv6Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns2" @on-blur="ipv6Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
@@ -221,12 +156,7 @@
</div>
<div class="wire" v-if="activePage == '鏈夌嚎缃戠粶' && !inWireDetail">
- <div
- class="wire-bar"
- v-for="(item, i) in wireArr"
- :key="i"
- @click.self="checkWire(item)"
- >
+ <div class="wire-bar" v-for="(item, i) in wireArr" :key="i" @click.self="checkWire(item)">
<div class="name">{{ "缃戠粶" + item.index }}</div>
<div class="right">
@@ -236,25 +166,13 @@
v-model="item.active"
active-color="rgba(61, 104, 225, 1)"
@change="switchNetCard"
- >
- </el-switch>
+ ></el-switch>
</div>
-
-
-
</div>
</div>
- <div
- class="wire-detail"
- v-if="activePage == '鏈夌嚎缃戠粶' && inWireDetail"
- >
+ <div class="wire-detail" v-if="activePage == '鏈夌嚎缃戠粶' && inWireDetail">
<div class="title">缃戠粶璁剧疆</div>
- <el-form
- :model="wireForm"
- :rules="wireFormRules"
- ref="wireForm"
- label-width="150px"
- >
+ <el-form :model="wireForm" :rules="wireFormRules" ref="wireForm" label-width="150px">
<el-form-item label="缃戠粶鍚嶇О" prop="name">
<div class="wifi-name">{{ "缃戠粶" + activeWireItem.index }}</div>
</el-form-item>
@@ -262,29 +180,17 @@
<div class="wifi-name">{{ activeWireItem.name }}</div>
</el-form-item>
<el-form-item label="IP" prop="ip">
- <ip-input
- :ip="wireForm.ip"
- @on-blur="wireForm.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.ip" @on-blur="wireForm.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="瀛愮綉鎺╃爜" prop="subMask">
- <ip-input
- :ip="wireForm.subMask"
- @on-blur="wireForm.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.subMask" @on-blur="wireForm.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="wireForm.gateway"
- @on-blur="wireForm.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.gateway" @on-blur="wireForm.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="DNS" prop="dns">
- <ip-input
- :ip="wireForm.dns"
- @on-blur="wireForm.dns = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.dns" @on-blur="wireForm.dns = arguments[0]"></ip-input>
</el-form-item>
</el-form>
@@ -329,6 +235,10 @@
import switchBar from "../components/switchBar";
export default {
+ components: {
+ ipInput,
+ switchBar,
+ },
data() {
const checkPwd = (rule, value, callback) => {
if (!value) {
@@ -404,7 +314,7 @@
this.getCurServer();
this.fetchWireList();
},
- beforeDestroy() {},
+ beforeDestroy() { },
props: ["barName"],
methods: {
// parseFlags(flags) {
@@ -434,10 +344,10 @@
return {
flags: itm.flags,
index: itm.index,
- mtu:itm.mtu,
+ mtu: itm.mtu,
name: itm.name,
wireless: itm.wireless,
- active:f
+ active: f
}
});
}
@@ -493,7 +403,7 @@
}
);
},
- wifiControl(val) {},
+ wifiControl(val) { },
checkWifi() {
this.inWifiDetail = true;
},
--
Gitblit v1.8.0