From 596d6867ebf2be2ca716c7b364ceaa5988f0e380 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 22 Nov 2022 12:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=81=93=E9=97=B8?=
 =?UTF-8?q?=E5=BB=B7=E5=8A=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addBarrierGateMachine.html                     |  9 ++++-----
 .../addBarrierGateMachine/addBarrierGateMachine.js | 14 +++-----------
 .../editBarrierGateMachine.html                    |  8 ++++----
 public/pages/scm/couponRule/couponRule.js          |  4 ++--
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/public/components/property/addBarrierGateMachine/addBarrierGateMachine.html b/public/components/property/addBarrierGateMachine/addBarrierGateMachine.html
index ca9312677..fff9d7971 100644
--- a/public/components/property/addBarrierGateMachine/addBarrierGateMachine.html
+++ b/public/components/property/addBarrierGateMachine/addBarrierGateMachine.html
@@ -30,11 +30,10 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="addBarrierGateMachine"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addBarrierGateMachineInfo.typeId" @change="setAddMachineTypeCd(addBarrierGateMachineInfo.typeId)">
+                                    <select class="custom-select" v-model="addBarrierGateMachineInfo.machineTypeCd">
                                         <option selected disabled value="">{{vc.i18n('必填，请选择类型','addMaaddBarrierGateMachinehine')}}</option>
-                                        <option v-for="(item,index) in addBarrierGateMachineInfo.machineTypes" :key="index" :value="item.typeId" 
-                                        v-if="item.machineTypeCd == '9995' || item.machineTypeCd == '9996'">
-                                            {{item.machineTypeName}}</option>
+                                        <option  value="9996">自有道闸</option>
+                                        <option  value="9995">第三方道闸</option>
                                         </select>
                                     </select>
                                 </div>
@@ -64,7 +63,7 @@
                         <div class="form-group row">
                             <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备IP" namespace="addBarrierGateMachine"></vc:i18n></span></label>
                             <div class="col-sm-10">
-                                <input v-model="addBarrierGateMachineInfo.machineIp" type="text" :placeholder="vc.i18n('选填，请填写设备IP,如 192.168.1.10:8090','addBarrierGateMachine')" class="form-control">
+                                <input v-model="addBarrierGateMachineInfo.machineIp" type="text" :placeholder="vc.i18n('选填，请填写设备IP,如 192.168.1.10:8131','addBarrierGateMachine')" class="form-control">
                             </div>
                         </div>
                         <div class="form-group row">
diff --git a/public/components/property/addBarrierGateMachine/addBarrierGateMachine.js b/public/components/property/addBarrierGateMachine/addBarrierGateMachine.js
index 76eab90e6..28d39f954 100644
--- a/public/components/property/addBarrierGateMachine/addBarrierGateMachine.js
+++ b/public/components/property/addBarrierGateMachine/addBarrierGateMachine.js
@@ -9,9 +9,8 @@
             addBarrierGateMachineInfo: {
                 machineId: '',
                 machineCode: '',
-                machineVersion: 'v1.0',
+                machineVersion: 'v300',
                 machineName: '',
-                machineTypeCd: '',
                 authCode: '未知',
                 machineIp: '',
                 machineMac: '',
@@ -20,7 +19,7 @@
                 locationType: '',
                 locations: [],
                 machineTypes: [],
-
+                machineTypeCd: '9996',
                 attrs: [],
                 typeId: '',
                 isShow: 'true',
@@ -160,7 +159,7 @@
                 vc.component.addBarrierGateMachineInfo = {
                     machineId: '',
                     machineCode: '',
-                    machineVersion: 'v1.0',
+                    machineVersion: 'v300',
                     machineName: '',
                     machineTypeCd: '',
                     authCode: '未知',
@@ -249,13 +248,6 @@
                     }
                 );
             },
-            setAddMachineTypeCd: function(_typeId) {
-                vc.component.addBarrierGateMachineInfo.machineTypes.forEach(item => {
-                    if (item.typeId == _typeId) {
-                        vc.component.addBarrierGateMachineInfo.machineTypeCd = item.machineTypeCd;
-                    }
-                });
-            }
         }
     });
 
diff --git a/public/components/property/editBarrierGateMachine/editBarrierGateMachine.html b/public/components/property/editBarrierGateMachine/editBarrierGateMachine.html
index e70bf841b..d1ff9973a 100644
--- a/public/components/property/editBarrierGateMachine/editBarrierGateMachine.html
+++ b/public/components/property/editBarrierGateMachine/editBarrierGateMachine.html
@@ -30,10 +30,10 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="editBarrierGateMachine"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editBarrierGateMachineInfo.typeId" @change="setEditMachineTypeCd(editBarrierGateMachineInfo.typeId)">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择类型','addMaeditBarrierGateMachinehine')}}</option>
-                                        <option v-for="(item,index) in editBarrierGateMachineInfo.machineTypes" :key="index" :value="item.typeId" v-if="item.machineTypeCd == '9995' || item.machineTypeCd == '9996'">
-                                            {{item.machineTypeName}}</option>
+                                    <select class="custom-select" v-model="editBarrierGateMachineInfo.machineTypeCd">
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择类型','editBarrierGateMachineInfo')}}</option>
+                                        <option  value="9996">自有道闸</option>
+                                        <option  value="9995">第三方道闸</option>
                                         </select>
                                     </select>
                                 </div>
diff --git a/public/pages/scm/couponRule/couponRule.js b/public/pages/scm/couponRule/couponRule.js
index 0777bfd7b..09f9162d3 100644
--- a/public/pages/scm/couponRule/couponRule.js
+++ b/public/pages/scm/couponRule/couponRule.js
@@ -5,14 +5,14 @@
         data: {
             couponRuleInfo: {
                 curCouponRule: {},
-                tabName: 'couponRuleWay'
+                tabName: 'couponRuleCpps'
             },
         },
         _initMethod: function() {},
         _initEvent: function() {
             vc.on('couponRule', 'switchCouponRule', function(_param) {
                 $that.couponRuleInfo.curCouponRule = _param;
-                $that._changeCouponRuleTab('couponRuleWay');
+                $that._changeCouponRuleTab('couponRuleCpps');
             })
         },
         methods: {