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

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
java110 2023-03-10 11:50:22 +08:00
commit 4867cb6f5e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/components/machine/addChargeMachine/addChargeMachine.html
View File

@ -62,7 +62,7 @@
:placeholder="vc.i18n('必填，请填写小时电价','addChargeMachine')" class="form-control"> :placeholder="vc.i18n('必填，请填写小时电价','addChargeMachine')" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <!-- <div class="form-group row">
<label class="col-sm-2 col-form-label"><span> <label class="col-sm-2 col-form-label"><span>
<vc:i18n name='用量电价' namespace='addChargeMachine'></vc:i18n> <vc:i18n name='用量电价' namespace='addChargeMachine'></vc:i18n>
</span></label> </span></label>
@ -70,7 +70,7 @@
<input v-model="addChargeMachineInfo.energyPrice" type="text" <input v-model="addChargeMachineInfo.energyPrice" type="text"
:placeholder="vc.i18n('必填，请填写用量电价','addChargeMachine')" class="form-control"> :placeholder="vc.i18n('必填，请填写用量电价','addChargeMachine')" class="form-control">
</div> </div>
</div> </div> -->
<div class="ibox-content"> <div class="ibox-content">
<button class="btn btn-primary float-right" type="button" v-on:click="saveChargeMachineInfo()"><i <button class="btn btn-primary float-right" type="button" v-on:click="saveChargeMachineInfo()"><i

4
public/components/machine/addChargeMachine/addChargeMachine.js
View File

@ -12,7 +12,7 @@
machineCode: '', machineCode: '',
implBean: '', implBean: '',
durationPrice: '', durationPrice: '',
energyPrice: '', energyPrice: '1',
factorys:[], factorys:[],
specs: [], specs: [],
portCount:'', portCount:'',
@ -136,7 +136,7 @@
machineCode: '', machineCode: '',
implBean: '', implBean: '',
durationPrice: '', durationPrice: '',
energyPrice: '', energyPrice: '1',
factorys:[], factorys:[],
specs: [], specs: [],
portCount:'', portCount:'',

4
public/components/machine/editChargeMachine/editChargeMachine.html
View File

@ -53,7 +53,7 @@
:placeholder="vc.i18n('必填，请填写小时电价','editChargeMachine')" class="form-control"> :placeholder="vc.i18n('必填，请填写小时电价','editChargeMachine')" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <!-- <div class="form-group row">
<label class="col-sm-2 col-form-label"><span> <label class="col-sm-2 col-form-label"><span>
<vc:i18n name='用量电价' namespace='editChargeMachine'></vc:i18n> <vc:i18n name='用量电价' namespace='editChargeMachine'></vc:i18n>
</span> </label> </span> </label>
@ -61,7 +61,7 @@
<input v-model="editChargeMachineInfo.energyPrice" type="text" <input v-model="editChargeMachineInfo.energyPrice" type="text"
:placeholder="vc.i18n('必填，请填写用量电价','editChargeMachine')" class="form-control"> :placeholder="vc.i18n('必填，请填写用量电价','editChargeMachine')" class="form-control">
</div> </div>
</div> </div> -->
<div class="ibox-content"> <div class="ibox-content">
<button class="btn btn-primary float-right" type="button" v-on:click="editChargeMachine()"><i <button class="btn btn-primary float-right" type="button" v-on:click="editChargeMachine()"><i

4
public/components/machine/editChargeMachine/editChargeMachine.js
View File

@ -8,7 +8,7 @@
machineCode: '', machineCode: '',
implBean: '', implBean: '',
durationPrice: '', durationPrice: '',
energyPrice: '', energyPrice: '1',
factorys:[], factorys:[],
specs: [], specs: [],
} }
@ -135,7 +135,7 @@
machineCode: '', machineCode: '',
implBean: '', implBean: '',
durationPrice: '', durationPrice: '',
energyPrice: '', energyPrice: '1',
factorys:[], factorys:[],
specs: [], specs: [],
} }

6
public/pages/machine/chargeMachineManage/chargeMachineManage.html
View File

@ -70,9 +70,9 @@
<th class="text-center"><span> <th class="text-center"><span>
<vc:i18n name='小时电价' namespace='chargeMachineManage'></vc:i18n> <vc:i18n name='小时电价' namespace='chargeMachineManage'></vc:i18n>
</span></th> </span></th>
<th class="text-center"><span> <!-- <th class="text-center"><span>
<vc:i18n name='用量电价' namespace='chargeMachineManage'></vc:i18n> <vc:i18n name='用量电价' namespace='chargeMachineManage'></vc:i18n>
</span></th> </span></th> -->
<th class="text-center"><span> <th class="text-center"><span>
<vc:i18n name='操作'></vc:i18n> <vc:i18n name='操作'></vc:i18n>
</span></th> </span></th>
@ -85,7 +85,7 @@
<td class="text-center">{{chargeMachine.factoryName}}</td> <td class="text-center">{{chargeMachine.factoryName}}</td>
<td class="text-center">{{chargeMachine.portCount || 0}}(<a href="javascript:void(0)" @click="_viewPort(chargeMachine)">查看</a>)</td> <td class="text-center">{{chargeMachine.portCount || 0}}(<a href="javascript:void(0)" @click="_viewPort(chargeMachine)">查看</a>)</td>
<td class="text-center">{{chargeMachine.durationPrice}}</td> <td class="text-center">{{chargeMachine.durationPrice}}</td>
<td class="text-center">{{chargeMachine.energyPrice}}</td> <!-- <td class="text-center">{{chargeMachine.energyPrice}}</td> -->
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button class="btn-white btn btn-xs" <button class="btn-white btn btn-xs"