From 27f5dec30ee350fa31b1a0b8aaffc11ba0423e28 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 27 一月 2022 14:08:29 +0800
Subject: [PATCH] 冲突解决
---
src/pages/settings/components/WifiGateway.vue | 406 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 218 insertions(+), 188 deletions(-)
diff --git a/src/pages/settings/components/WifiGateway.vue b/src/pages/settings/components/WifiGateway.vue
index 85b7673..b3dfbad 100644
--- a/src/pages/settings/components/WifiGateway.vue
+++ b/src/pages/settings/components/WifiGateway.vue
@@ -3,224 +3,254 @@
<el-form :model="wifiForm" ref="wifiForm">
<div class="title form-item">缃戠粶璁剧疆</div>
<el-form-item class="form-item">
- <switchBar
- :barName="`鍏佽澶栫綉璁块棶`"
- :value="accessible"
- ></switchBar>
+ <switchBar
+ :barName="`鍏佽澶栫綉璁块棶`"
+ :value="wifiForm.wanEnable"
+ ></switchBar>
</el-form-item>
<div class="block">
- <el-form-item class="form-item">
- <div class="item-title">鍚嶇О</div>
- <div class="inputContain">
- <el-input
- v-model="wifiForm.name"
- placeholder="璇疯緭鍏ユ棤绾垮悕绉�"
- size="small"
- ></el-input>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">鍚嶇О</div>
+ <div class="inputContain">
+ <el-input
+ v-model="wifiForm.name"
+ placeholder="璇疯緭鍏ユ棤绾垮悕绉�"
+ size="small"
+ ></el-input>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">瀵嗙爜</div>
- <div class="inputContain">
- <el-input
- v-model="wifiForm.password"
- placeholder="璇疯緭鍏ュ瘑鐮�"
- size="small"
- show-password
- auto-complete="new-password"
- ></el-input>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">瀵嗙爜</div>
+ <div class="inputContain">
+ <el-input
+ v-model="wifiForm.password"
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ size="small"
+ show-password
+ auto-complete="new-password"
+ ></el-input>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">WPS鍔犲瘑</div>
- <div class="inputContain">
- <el-select v-model="wifiForm.wps" placeholder="璇烽�夋嫨" size="small"
- :popper-append-to-body="false">
- <el-option
- v-for="item in wps_option"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">WPS鍔犲瘑</div>
+ <div class="inputContain">
+ <el-select
+ v-model="wifiForm.wps"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in wps_option"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">鎺堟潈鏂瑰紡</div>
- <div class="inputContain">
- <el-select v-model="wifiForm.auth" placeholder="璇烽�夋嫨" size="small"
- :popper-append-to-body="false">
- <el-option
- v-for="item in auth_option"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">鎺堟潈鏂瑰紡</div>
+ <div class="inputContain">
+ <el-select
+ v-model="wifiForm.authType"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in auth_option"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">鍙戝皠鍔熺巼璋冩暣</div>
- <el-slider
- v-model="wifiForm.frequency"
- id="wifiForm_frequency"
- :min="0"
- :max="100"
- :show-tooltip="false"
- ></el-slider>
- <div class="slider-info">鑺傝兘</div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">鍙戝皠鍔熺巼璋冩暣</div>
+ <el-slider
+ v-model="wifiForm.powerRate"
+ id="wifiForm_frequency"
+ :min="0"
+ :max="100"
+ :show-tooltip="false"
+ ></el-slider>
+ <div class="slider-info">鑺傝兘</div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">IP鍦板潃</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.ip"
- @on-blur="wifiForm.ip = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">IP鍦板潃</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.ip"
+ @on-blur="wifiForm.ip = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">瀛愮綉鎺╃爜</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.child"
- @on-blur="wifiForm.ip = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">瀛愮綉鎺╃爜</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.mask"
+ @on-blur="wifiForm.mask = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">缃戝叧</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.gateway"
- @on-blur="wifiForm.ip = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">缃戝叧</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.gateway"
+ @on-blur="wifiForm.gateway = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">DNS</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.dns"
- @on-blur="wifiForm.ip = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">DNS</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.dns"
+ @on-blur="wifiForm.dns = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <div class="DHCP">DHCP鏈嶅姟鍣ㄨ缃�</div>
+ <div class="DHCP">DHCP鏈嶅姟鍣ㄨ缃�</div>
- <el-form-item class="form-item">
- <div class="item-title">IP姹犺捣濮嬪湴鍧�</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.dns"
- @on-blur="wifiForm.ipStart = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">IP姹犺捣濮嬪湴鍧�</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.dhcpIpFrom"
+ @on-blur="wifiForm.dhcpIpFrom = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">IP姹犵粨鏉熷湴鍧�</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.dns"
- @on-blur="wifiForm.ipEnd = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">IP姹犵粨鏉熷湴鍧�</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.dhcpIpTo"
+ @on-blur="wifiForm.dhcpIpTo = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">榛樿缃戝叧</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.dns"
- @on-blur="wifiForm.gateDefault = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">榛樿缃戝叧</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.dhcpGateway"
+ @on-blur="wifiForm.dhcpGateway = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">DNS</div>
- <div class="inputContain">
- <ipInput
- :ip="wifiForm.dns"
- @on-blur="wifiForm.dns2 = arguments[0]"
- ></ipInput>
- </div>
- </el-form-item>
-
+ <el-form-item class="form-item">
+ <div class="item-title">DNS</div>
+ <div class="inputContain">
+ <ipInput
+ :ip="wifiForm.dhcpDns"
+ @on-blur="wifiForm.dhcpDns = arguments[0]"
+ ></ipInput>
+ </div>
+ </el-form-item>
</div>
</el-form>
- <div class="ok">淇濆瓨</div>
-
+ <div class="ok" @click="saveList">淇濆瓨</div>
</div>
</template>
<script>
-
import ipInput from "../components/IPInput";
import switchBar from "../components/switchBar";
+import { getWifi, saveWifi } from "@/api/system";
export default {
- name:"wifiGateway",
- data(){
- return{
- accessible:false,
- wps_option:[],
- auth_option:[],
- wifiRules:[],
- wifiForm:{
- name:"",
- password:"",
- wps:"",
- auth:"",
- frequency:50,
- ip:"",
- child:"",
- gateway:"",
- dns:"",
- ipStart:"",
- ipEnd:"",
- gateDefault:"",
- dns2:"",
- },
- }
+ name: "wifiGateway",
+ created() {
+ this.getlist();
+ },
+ data() {
+ return {
+ accessible: false,
+ wps_option: [
+ { label: "鍔犲瘑1", value: "鍔犲瘑1" },
+ { label: "鍔犲瘑2", value: "鍔犲瘑2" },
+ ],
+ auth_option: [
+ { label: "鎺堟潈1", value: "鎺堟潈1" },
+ { label: "鎺堟潈2", value: "鎺堟潈2" },
+ ],
+ wifiRules: [],
+ wifiForm: {
+ wanEnable: true,
+ name: "",
+ password: "",
+ wps: "",
+ authType: "",
+ powerRate: 50,
+ ip: "",
+ mask: "",
+ gateway: "",
+ dns: "",
+ dhcpIpFrom: "",
+ dhcpIpTo: "",
+ dhcpGateway: "",
+ dhcpDns: "",
+ },
+ };
+ },
+ components: {
+ switchBar,
+ ipInput,
+ },
+ methods: {
+ async getlist() {
+ const res = await getWifi();
+ console.log(res);
+ this.wifiForm = res.data;
},
- components :{
- switchBar,
- ipInput
- }
-}
+
+ async saveList() {
+ this.wifiForm.powerRate = `${this.wifiForm.powerRate}`;
+ const res = await saveWifi(this.wifiForm);
+ console.log(res);
+ },
+ },
+};
</script>
<style scoped lang="scss">
-@import '../asset/common.scss';
- .wifi-gateway {
- display: flex;
- flex-direction: column;
- }
-
- .block {
- margin-top: 20px;
- }
-
- .DHCP {
- text-align: left;
- padding-left: 20px;
- height: 56px;
- line-height: 56px;
- font-weight: bold;
- font-size: 14px;
- color: #4F4F4F;
+@import "../asset/common.scss";
+.wifi-gateway {
+ display: flex;
+ flex-direction: column;
}
+.block {
+ margin-top: 20px;
+}
+
+.DHCP {
+ text-align: left;
+ margin: 0 auto;
+ padding-left: 20px;
+ height: 56px;
+ width: 450px;
+ line-height: 56px;
+ font-weight: bold;
+ font-size: 14px;
+ color: #4f4f4f;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0