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/LoraGateway.vue | 243 ++++++++++++++++++++++++++----------------------
1 files changed, 132 insertions(+), 111 deletions(-)
diff --git a/src/pages/settings/components/LoraGateway.vue b/src/pages/settings/components/LoraGateway.vue
index 62e06d6..cfce9b1 100644
--- a/src/pages/settings/components/LoraGateway.vue
+++ b/src/pages/settings/components/LoraGateway.vue
@@ -4,142 +4,163 @@
<div class="title form-item">缃戠粶璁剧疆</div>
<el-form-item class="form-item">
- <div class="item-title">璁惧ID</div>
- <div class="inputContain">
- <el-input
- v-model="loraForm.deviceId"
- placeholder="璇疯緭鍏ヨ澶嘔D"
- size="small"
- ></el-input>
- </div>
+ <div class="item-title">璁惧ID</div>
+ <div class="inputContain">
+ <el-input
+ v-model="loraForm.devId"
+ placeholder="璇疯緭鍏ヨ澶嘔D"
+ size="small"
+ ></el-input>
+ </div>
</el-form-item>
<el-form-item class="form-item">
- <div class="item-title">APPID</div>
- <div class="inputContain">
- <el-input
- v-model="loraForm.appId"
- placeholder="璇疯緭鍏PPID"
- size="small"
- ></el-input>
- </div>
+ <div class="item-title">APPID</div>
+ <div class="inputContain">
+ <el-input
+ v-model="loraForm.appId"
+ placeholder="璇疯緭鍏PPID"
+ 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="loraForm.password"
- placeholder="璇疯緭鍏ュ瘑鐮�"
- size="small"
- show-password
- auto-complete="new-password"
- ></el-input>
- </div>
+ <div class="item-title">瀵嗙爜</div>
+ <div class="inputContain">
+ <el-input
+ v-model="loraForm.password"
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ size="small"
+ show-password
+ auto-complete="new-password"
+ ></el-input>
+ </div>
</el-form-item>
<div class="block">
<el-form-item class="form-item channel-sele">
- <div class="item-title">棰戦亾</div>
- <el-select v-model="loraForm.channel" placeholder="璇烽�夋嫨" size="small"
- :popper-append-to-body="false">
- <el-option
- v-for="item in channel_option"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <div class="channel">褰撳墠杩炴帴閫氶亾锛�<span class="channelCount">{{channelCount}}</span></div>
- </el-form-item>
-
- <el-form-item class="form-item">
- <div class="item-title">宸ヤ綔棰戠巼</div>
- <el-radio-group v-model="loraForm.workFre">
- <el-radio :label="0">475.5MHz</el-radio>
- <el-radio :label="1">868.5MHz</el-radio>
- <el-radio :label="2">915.5MHz</el-radio>
- </el-radio-group>
+ <div class="item-title">棰戦亾</div>
+ <el-select
+ v-model="loraForm.channel"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in channel_option"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ <div class="channel">
+ 褰撳墠杩炴帴閫氶亾锛�<span class="channelCount">{{ channelCount }}</span>
+ </div>
</el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">閫氫俊妯″紡</div>
- <div class="inputContain">
- <el-input
- v-model="loraForm.mode"
- placeholder="鍏ㄥ弻宸�"
- size="small"
- ></el-input>
- </div>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">宸ヤ綔棰戠巼</div>
+ <el-radio-group v-model="loraForm.hz">
+ <el-radio :label="0">475.5MHz</el-radio>
+ <el-radio :label="1">868.5MHz</el-radio>
+ <el-radio :label="2">915.5MHz</el-radio>
+ </el-radio-group>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">宸ヤ綔棰戠巼</div>
- <el-radio-group v-model="loraForm.workFre2">
- <el-radio :label="0">鏄�</el-radio>
- <el-radio :label="1">鍚�</el-radio>
- <el-radio :label="2">绌洪棽涓嶅伐浣滄ā寮�</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-form-item class="form-item">
+ <div class="item-title">閫氫俊妯″紡</div>
+ <div class="inputContain">
+ <el-input
+ v-model="loraForm.netMode"
+ placeholder="鍏ㄥ弻宸�"
+ size="small"
+ ></el-input>
+ </div>
+ </el-form-item>
- <el-form-item class="form-item">
- <div class="item-title">鍙戝皠鍔熺巼璋冩暣</div>
- <el-slider
- v-model="loraForm.frequency"
- id="loraForm_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-radio-group v-model="loraForm.workMode">
+ <el-radio :label="0">鏄�</el-radio>
+ <el-radio :label="1">鍚�</el-radio>
+ <el-radio :label="2">绌洪棽涓嶅伐浣滄ā寮�</el-radio>
+ </el-radio-group>
+ </el-form-item>
- <div class="ok">淇濆瓨</div>
+ <el-form-item class="form-item">
+ <div class="item-title">鍙戝皠鍔熺巼璋冩暣</div>
+ <el-slider
+ v-model="loraForm.powerRate"
+ id="loraForm_frequency"
+ :min="0"
+ :max="100"
+ :show-tooltip="false"
+ ></el-slider>
+ <div class="slider-info">鑺傝兘</div>
+ </el-form-item>
+ <div class="ok" @click="saveList">淇濆瓨</div>
</div>
-
-
-
-
-
</el-form>
</div>
</template>
<script>
+import { getLora, saveLora } from "@/api/system";
export default {
- name:"loraGateway",
- data(){
- return {
- channel_option:[],
- channelCount:20,
- loraForm:{
- deviceId: "",
- appId: "",
- password: "",
- workFre: "",
- mode: "",
- workFre2: "",
- frequency: 20
- }
- }
- }
-}
+ name: "loraGateway",
+ created() {
+ this.getList();
+ },
+ data() {
+ return {
+ channel_option: [
+ { label: "棰戦亾1", value: "棰戦亾1" },
+ { label: "棰戦亾2", value: "棰戦亾2" },
+ ],
+ channelCount: 20,
+ loraForm: {
+ devId: "",
+ appId: "",
+ password: "",
+ hz: "",
+ netMode: "",
+ workMode: "",
+ powerRate: 20,
+ },
+ };
+ },
+ methods: {
+ async getList() {
+ const res = await getLora();
+ console.log(res);
+ this.loraForm = res.data;
+ },
+ async saveList() {
+ // this.loraForm.powerRate = `${this.loraForm.powerRate}`;
+ this.loraForm.hz = `${this.loraForm.hz}`;
+ // this.loraForm.workMode = `${this.loraForm.workMode}`;
+ const res = await saveLora(this.loraForm);
+ console.log(res);
+ },
+ },
+};
</script>
<style scoped lang="scss">
-@import '../asset/common.scss';
- .lora-gateway {
- display: flex;
- flex-direction: column;
- .block {
- margin-top: 16px;
- }
- .channel-sele {
- .el-select {
- flex: 1;
- margin-left: 88px;
- }
- }
+@import "../asset/common.scss";
+.lora-gateway {
+ display: flex;
+ flex-direction: column;
+ .block {
+ margin-top: 16px;
}
+ .channel-sele {
+ .el-select {
+ flex: 1;
+ margin-left: 88px;
+ }
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0