admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 10:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化 道闸廷加bug

Browse Source
This commit is contained in:
wuxw 2022-11-22 12:40:39 +08:00
parent 5d49bec9ba
commit 596d6867eb
4 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/components/property/addBarrierGateMachine/addBarrierGateMachine.html
View File

@ -30,11 +30,10 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="addBarrierGateMachine"></vc:i18n></span></label> <label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="addBarrierGateMachine"></vc:i18n></span></label>
<div class="col-sm-10"> <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 selected disabled value="">{{vc.i18n('必填，请选择类型','addMaaddBarrierGateMachinehine')}}</option>
<option v-for="(item,index) in addBarrierGateMachineInfo.machineTypes" :key="index" :value="item.typeId" <option value="9996">自有道闸</option>
v-if="item.machineTypeCd == '9995' || item.machineTypeCd == '9996'"> <option value="9995">第三方道闸</option>
{{item.machineTypeName}}</option>
</select> </select>
</select> </select>
</div> </div>
@ -64,7 +63,7 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label"><span><vc:i18n name="设备IP" namespace="addBarrierGateMachine"></vc:i18n></span></label> <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备IP" namespace="addBarrierGateMachine"></vc:i18n></span></label>
<div class="col-sm-10"> <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> </div>
<div class="form-group row"> <div class="form-group row">

14
public/components/property/addBarrierGateMachine/addBarrierGateMachine.js
View File

@ -9,9 +9,8 @@
addBarrierGateMachineInfo: { addBarrierGateMachineInfo: {
machineId: '', machineId: '',
machineCode: '', machineCode: '',
machineVersion: 'v1.0', machineVersion: 'v300',
machineName: '', machineName: '',
machineTypeCd: '',
authCode: '未知', authCode: '未知',
machineIp: '', machineIp: '',
machineMac: '', machineMac: '',
@ -20,7 +19,7 @@
locationType: '', locationType: '',
locations: [], locations: [],
machineTypes: [], machineTypes: [],
machineTypeCd: '9996',
attrs: [], attrs: [],
typeId: '', typeId: '',
isShow: 'true', isShow: 'true',
@ -160,7 +159,7 @@
vc.component.addBarrierGateMachineInfo = { vc.component.addBarrierGateMachineInfo = {
machineId: '', machineId: '',
machineCode: '', machineCode: '',
machineVersion: 'v1.0', machineVersion: 'v300',
machineName: '', machineName: '',
machineTypeCd: '', machineTypeCd: '',
authCode: '未知', authCode: '未知',
@ -249,13 +248,6 @@
} }
); );
}, },
setAddMachineTypeCd: function(_typeId) {
vc.component.addBarrierGateMachineInfo.machineTypes.forEach(item => {
if (item.typeId == _typeId) {
vc.component.addBarrierGateMachineInfo.machineTypeCd = item.machineTypeCd;
}
});
}
} }
}); });

8
public/components/property/editBarrierGateMachine/editBarrierGateMachine.html
View File

@ -30,10 +30,10 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="editBarrierGateMachine"></vc:i18n></span></label> <label class="col-sm-2 col-form-label"><span><vc:i18n name="类型" namespace="editBarrierGateMachine"></vc:i18n></span></label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="custom-select" v-model="editBarrierGateMachineInfo.typeId" @change="setEditMachineTypeCd(editBarrierGateMachineInfo.typeId)"> <select class="custom-select" v-model="editBarrierGateMachineInfo.machineTypeCd">
<option selected disabled value="">{{vc.i18n('必填，请选择类型','addMaeditBarrierGateMachinehine')}}</option> <option selected disabled value="">{{vc.i18n('必填，请选择类型','editBarrierGateMachineInfo')}}</option>
<option v-for="(item,index) in editBarrierGateMachineInfo.machineTypes" :key="index" :value="item.typeId" v-if="item.machineTypeCd == '9995' || item.machineTypeCd == '9996'"> <option value="9996">自有道闸</option>
{{item.machineTypeName}}</option> <option value="9995">第三方道闸</option>
</select> </select>
</select> </select>
</div> </div>

4
public/pages/scm/couponRule/couponRule.js
View File

@ -5,14 +5,14 @@
data: { data: {
couponRuleInfo: { couponRuleInfo: {
curCouponRule: {}, curCouponRule: {},
tabName: 'couponRuleWay' tabName: 'couponRuleCpps'
}, },
}, },
_initMethod: function() {}, _initMethod: function() {},
_initEvent: function() { _initEvent: function() {
vc.on('couponRule', 'switchCouponRule', function(_param) { vc.on('couponRule', 'switchCouponRule', function(_param) {
$that.couponRuleInfo.curCouponRule = _param; $that.couponRuleInfo.curCouponRule = _param;
$that._changeCouponRuleTab('couponRuleWay'); $that._changeCouponRuleTab('couponRuleCpps');
}) })
}, },
methods: { methods: {