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

Merge branch 'PR' into develop

pull/132/head
13621160019@163.com 2022-03-03 13:33:55 +08:00
parent e7ce134690 944d54963a
commit cfebb99859
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,10 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
$scope.timeofuse = []; $scope.timeofuse = [];
$scope.block=[]; $scope.block=[];
$scope.tariff={valid_from:moment(),valid_through:moment()}; $scope.tariff={valid_from:moment(),valid_through:moment()};
$scope.t={start_time_of_day:moment(),end_time_of_day:moment()}; $scope.t={start_time_of_day:moment().startOf('day'),end_time_of_day:moment().endOf('day')};
$scope.t.peak_type = 'midpeak';
$scope.t.price = '0.5';
$scope.dtOptions = { $scope.dtOptions = {
locale:{ locale:{
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -199,8 +202,11 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.add = function(t) { $scope.add = function(t) {
t.start_time_of_day=t.start_time_of_day.format().slice(11, 19); if (t.peak_type == null || t.price == null || t.peak_type == '' || t.price == ''){
t.end_time_of_day=t.end_time_of_day.format().slice(11, 19); return false;
}
t.start_time_of_day=moment(t.start_time_of_day).format().slice(11, 19);
t.end_time_of_day=moment(t.end_time_of_day).format().slice(11, 19);
if ($scope.tariff.tariff_type == 'timeofuse') { if ($scope.tariff.tariff_type == 'timeofuse') {
if ($scope.timeofuse.length > 0) { if ($scope.timeofuse.length > 0) {
$scope.timeofuse.unshift(angular.copy(t)); $scope.timeofuse.unshift(angular.copy(t));
@ -249,7 +255,9 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
$scope.categories = params.categories; $scope.categories = params.categories;
$scope.timeofuse = $scope.tariff.timeofuse; $scope.timeofuse = $scope.tariff.timeofuse;
$scope.block=$scope.tariff.block; $scope.block=$scope.tariff.block;
$scope.t={start_time_of_day:moment(),end_time_of_day:moment()}; $scope.t={start_time_of_day:moment().startOf('day'),end_time_of_day:moment().endOf('day')};
$scope.t.peak_type = 'midpeak';
$scope.t.price = '0.5';
$scope.dtOptions = { $scope.dtOptions = {
locale:{ locale:{
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -283,6 +291,9 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.add = function(t) { $scope.add = function(t) {
if (t.peak_type == null || t.price == null || t.peak_type == '' || t.price == ''){
return false;
}
t.start_time_of_day=moment(t.start_time_of_day).format().slice(11, 19); t.start_time_of_day=moment(t.start_time_of_day).format().slice(11, 19);
t.end_time_of_day=moment(t.end_time_of_day).format().slice(11, 19); t.end_time_of_day=moment(t.end_time_of_day).format().slice(11, 19);
if ($scope.tariff.tariff_type == 'timeofuse') { if ($scope.tariff.tariff_type == 'timeofuse') {

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

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