admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into xinghong-dev

Browse Source
This commit is contained in:
xiaogang 2021-01-05 08:17:24 +08:00
commit 903cc0b48d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/components/property/addMachine/addMachine.html
View File

@ -96,7 +96,7 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">设备IP</label>
<div class="col-sm-10">
<input v-model="addMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP"
<input v-model="addMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP,如 192.168.1.10:8090"
class="form-control">
</div>
</div>

2
public/components/property/editMachine/editMachine.html
View File

@ -94,7 +94,7 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">设备IP</label>
<div class="col-sm-10">
<input v-model="editMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP"
<input v-model="editMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP,如 192.168.1.10:8090"
class="form-control">
</div>
</div>

7
public/pages/property/propertyFee/propertyFee.html
View File

@ -62,11 +62,10 @@
{{feeDetail.createTime}}
</td>
<td class="text-center">
{{feeDetail.startTime}}
</td>
<td class="text-center">
{{feeDetail.endTime}}
{{vc.dateFormat(feeDetail.startTime)}}
</td>
<td class="text-center" v-if="feeDetail.startTime >= feeDetail.endTime">{{vc.dateFormat(feeDetail.endTime)}}</td>
<td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}}</td>
<td class="text-center">
{{feeDetail.stateName}}
</td>