浏览代码

fix: 加入对接平台及bug修复

lkd9698906@163.com 1 年之前
父节点
当前提交
da7718ccb4
共有 2 个文件被更改,包括 45 次插入10 次删除
  1. 39 10
      src/pages/mine/wifi/Index.vue
  2. 6 0
      src/pages/mine/wifi/data.ts

+ 39 - 10
src/pages/mine/wifi/Index.vue

@@ -123,7 +123,7 @@
     </div>
   </div>
   <!-- wifi配置信息 -->
-  <van-action-sheet v-model:show="wifiAction" :title="wifiTitle">
+  <van-action-sheet v-model:show="wifiAction" :title="wifiTitle"  @cancel="handleCancel('wifi')">
     <div class="form">
       <van-form @submit="onWifiSubmit">
         <van-cell-group inset>
@@ -132,6 +132,7 @@
               v-model="wifiInfo.name"
               name="name"
               label="名称"
+              @blur="handleBlur"
               placeholder="请输入WIFI名称"
               :rules="[
                 { required: true, message: '请输入WIFI名称' },
@@ -160,7 +161,7 @@
     </div>
   </van-action-sheet>
   <!-- 对接配置信息 -->
-  <van-action-sheet v-model:show="addressAction" :title="addressTitle">
+  <van-action-sheet v-model:show="addressAction" :title="addressTitle" @cancel="handleCancel('address')">
     <div class="form">
       <van-form @submit="onAddressSubmit">
         <van-cell-group inset>
@@ -169,9 +170,9 @@
               v-model="addressInfo.networkType"
               name="networkType "
               label="对接类型"
-              placeholder="请选择接类型"
+              placeholder="请选择接类型"
               @click="showPicker = true"
-              :rules="[{ required: true, message: '请选择接类型' }]"
+              :rules="[{ required: true, message: '请选择接类型' }]"
             />
             <van-popup v-model:show="showPicker" round position="bottom">
               <van-picker
@@ -187,7 +188,7 @@
               name="address"
               label="对接地址"
               placeholder="请输入对接地址"
-              :rules="[{ required: true, message: '请输入WIFI名称' }]"
+              :rules="[{ required: true, message: '请输入对接地址' }]"
             />
           </van-cell>
           <van-cell>
@@ -195,9 +196,26 @@
               v-model="addressInfo.port"
               name="port"
               label="对接端口"
-              placeholder="请填写对接端口"
+              placeholder="请输入对接端口"
+              :rules="[{ required: true, message: '请输入对接端口' }]"
             />
           </van-cell>
+          <van-cell>
+            <van-field
+              v-model="addressInfo.platform"
+              name="platform "
+              label="对接平台"
+              placeholder="请选择对接平台"
+              @click="showPicker = true"
+            />
+            <van-popup v-model:show="showPicker" round position="bottom">
+              <van-picker
+                :columns="platformColumns"
+                @cancel="showPicker = false"
+                @confirm="onConfirm"
+              />
+            </van-popup>
+          </van-cell>
         </van-cell-group>
         <div style="margin: 0.25rem 10%; width: 80%">
           <van-button round block type="primary" native-type="submit">
@@ -219,7 +237,7 @@ import "vant/es/dialog/style";
 import { refreshCurrentRoute } from "@/router";
 import { useStoreOfUserInfo } from "@/store/userInfo";
 import { v4 as uuidv4 } from "uuid";
-import { selColumns } from './data';
+import { selColumns, platformColumns } from './data';
 const userInfo = useStoreOfUserInfo();
 
 const cusNavigation = ref();
@@ -264,7 +282,18 @@ const onConfirm = ( selectedOptions: any ) => {
       addressInfo.value.networkType = selectedOptions.selectedValues[0];
     };
 
-
+    // 失焦去空格
+    function handleBlur () {
+      wifiInfo.value.name = wifiInfo.value.name.trim();
+    }
+    // 取消动作面板清空信息
+    function handleCancel(flag : any) {
+      if(flag === 'wifi'){
+        wifiInfo.value = {};
+      }else {
+        addressInfo.value = {};
+      }
+    }
 // wifi修改及新增确认
 function onWifiSubmit() {
   let tip = '新增';
@@ -318,11 +347,11 @@ function handleAdd(addType: string) {
 // 编辑wifi信息
 function handleEdit(editType: string, record: any) {
   if (editType === "wifi") {
-    wifiInfo.value = record;
+    wifiInfo.value = {...record};
     wifiTitle.value = "编辑WIFI配置";
     wifiAction.value = true;
   } else {
-    addressInfo.value = record;
+    addressInfo.value = {...record};
     addressTitle.value = "编辑对接配置";
     addressAction.value = true;
   }

+ 6 - 0
src/pages/mine/wifi/data.ts

@@ -2,4 +2,10 @@ export const selColumns = [
     {text: 'WiFi', value: 'WiFi'},
     {text: 'NB-IOT', value: 'NB-IOT'},
     {text: '4G', value: '4G'},
+]
+
+export const platformColumns = [
+    {text: '1', value: '阿里云'},
+    {text: '2', value: '驼人'},
+    {text: '3', value: '本地'},
 ]