seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/117/head
13621160019@163.com 2022-01-07 21:13:38 +08:00
parent b64f94251c 3afaee3c5e
commit 4e3d34a557
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/app/controllers/settings/tariff/tariff.controller.js
View File

@ -176,6 +176,7 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerSeconds: true,
timePickerIncrement: 1, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };
@ -257,6 +258,7 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerSeconds: true,
timePickerIncrement: 1, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };

1
admin/css/myems.css
View File

@ -103,6 +103,7 @@ td.fontorange{
} }
select.sm{ select.sm{
width:60px; width:60px;
font-size: 12px;
} }
td.action{ td.action{
width:100px !important; width:100px !important;

11
admin/views/settings/tariff/tariff.model.html
View File

@ -113,11 +113,16 @@
</tr> </tr>
<tr> <tr>
<td class="text-center sm"> <td class="text-center sm">
<div class="col-sm-7">
<div uib-timepicker ng-model="t.start_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <input date-range-picker class="form-control date-picker" type="text" ng-model="t.start_time_of_day" options="dtOptions" style="width: auto"
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<div uib-timepicker ng-model="t.end_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <div class="col-sm-7">
<input date-range-picker class="form-control date-picker" type="text" ng-model="t.end_time_of_day" options="dtOptions" style="width: auto"
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<select ng-model="t.peak_type" class="form-control input-sm sm" name="peak"> <select ng-model="t.peak_type" class="form-control input-sm sm" name="peak">