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

Optimized rate editing ui 2

pull/132/head
tianlinzhong 2022-03-03 16:16:00 +08:00
parent cfebb99859
commit 623ba5e132
2 changed files with 161 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,9 +167,15 @@ 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().startOf('day'),end_time_of_day:moment().endOf('day')}; $scope.t={};
$scope.t.start_hour = '00';
$scope.t.start_min = '00';
$scope.t.start_second = '00';
$scope.t.end_hour = '23';
$scope.t.end_min = '59';
$scope.t.end_second = '59';
$scope.t.peak_type = 'midpeak'; $scope.t.peak_type = 'midpeak';
$scope.t.price = '0.5'; $scope.t.price = 0.5;
$scope.dtOptions = { $scope.dtOptions = {
locale:{ locale:{
@ -202,18 +208,26 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
$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 == ''){ if (t.peak_type == null || t.price == null || t.peak_type == ''){
return false; return false;
} }
t.start_time_of_day=moment(t.start_time_of_day).format().slice(11, 19); t.start_time_of_day= t.start_hour + ':' + t.start_min + ':' + t.start_second;
t.end_time_of_day=moment(t.end_time_of_day).format().slice(11, 19); t.end_time_of_day= t.end_hour + ':' + t.end_min + ':' + t.end_second;
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));
} else { } else {
$scope.timeofuse.push(angular.copy(t)); $scope.timeofuse.push(angular.copy(t));
} }
$scope.t={start_time_of_day:moment(),end_time_of_day:moment()}; $scope.t={};
$scope.t.start_hour = '00';
$scope.t.start_min = '00';
$scope.t.start_second = '00';
$scope.t.end_hour = '23';
$scope.t.end_min = '59';
$scope.t.end_second = '59';
$scope.t.peak_type = 'midpeak';
$scope.t.price = 0.5;
$timeout(function() { $timeout(function() {
angular.element('#touTable').trigger('footable_redraw'); angular.element('#touTable').trigger('footable_redraw');
@ -255,9 +269,15 @@ 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().startOf('day'),end_time_of_day:moment().endOf('day')}; $scope.t={};
$scope.t.start_hour = '00';
$scope.t.start_min = '00';
$scope.t.start_second = '00';
$scope.t.end_hour = '23';
$scope.t.end_min = '59';
$scope.t.end_second = '59';
$scope.t.peak_type = 'midpeak'; $scope.t.peak_type = 'midpeak';
$scope.t.price = '0.5'; $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',
@ -291,18 +311,26 @@ 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 == ''){ if (t.peak_type == null || t.price == null || t.peak_type == ''){
return false; return false;
} }
t.start_time_of_day=moment(t.start_time_of_day).format().slice(11, 19); t.start_time_of_day= t.start_hour + ':' + t.start_min + ':' + t.start_second;
t.end_time_of_day=moment(t.end_time_of_day).format().slice(11, 19); t.end_time_of_day= t.end_hour + ':' + t.end_min + ':' + t.end_second;
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));
} else { } else {
$scope.timeofuse.push(angular.copy(t)); $scope.timeofuse.push(angular.copy(t));
} }
$scope.t={start_time_of_day:moment(),end_time_of_day:moment()}; $scope.t={};
$scope.t.start_hour = '00';
$scope.t.start_min = '00';
$scope.t.start_second = '00';
$scope.t.end_hour = '23';
$scope.t.end_min = '59';
$scope.t.end_second = '59';
$scope.t.peak_type = 'midpeak';
$scope.t.price = 0.5;
$timeout(function() { $timeout(function() {
angular.element('#touTable').trigger('footable_redraw'); angular.element('#touTable').trigger('footable_redraw');

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

@ -113,13 +113,129 @@
</tr> </tr>
<tr> <tr>
<td class="text-center sm"> <td class="text-center sm">
<div class="col-sm-7"> <div>
<div uib-timepicker ng-model="t.start_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <select ng-model="t.start_hour" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option>
</select>
:
<select ng-model="t.start_min" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option>
<option value="58">58</option><option value="59">59</option>
</select>
:
<select ng-model="t.start_second" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option>
<option value="58">58</option><option value="59">59</option>
</select>
</div> </div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<div class="col-sm-7"> <div>
<div uib-timepicker ng-model="t.end_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <select ng-model="t.end_hour" style="background-color: #FFF; border-radius:4px;border:1px solid" >
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option>
</select>
:
<select ng-model="t.end_min" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option>
<option value="58">58</option><option value="59">59</option>
</select>
:
<select ng-model="t.end_second" style="background-color: #FFF; border-radius:4px;border:1px solid">
<option value="00">00</option>
<option value="01">01</option><option value="02">02</option><option value="03">03</option>
<option value="04">04</option><option value="05">05</option><option value="06">06</option>
<option value="07">07</option><option value="08">08</option><option value="09">09</option>
<option value="10">10</option><option value="11">11</option><option value="12">12</option>
<option value="13">13</option><option value="14">14</option><option value="15">15</option>
<option value="16">16</option><option value="17">17</option><option value="18">18</option>
<option value="19">19</option><option value="20">20</option><option value="21">21</option>
<option value="22">22</option><option value="23">23</option><option value="24">24</option>
<option value="25">25</option><option value="26">26</option><option value="27">27</option>
<option value="28">28</option><option value="29">29</option><option value="30">30</option>
<option value="31">31</option><option value="32">32</option><option value="33">33</option>
<option value="34">34</option><option value="35">35</option><option value="36">36</option>
<option value="37">37</option><option value="38">38</option><option value="39">39</option>
<option value="40">40</option><option value="41">41</option><option value="42">42</option>
<option value="43">43</option><option value="44">44</option><option value="45">45</option>
<option value="46">46</option><option value="47">47</option><option value="48">48</option>
<option value="49">49</option><option value="50">50</option><option value="51">51</option>
<option value="50">52</option><option value="53">53</option><option value="54">54</option>
<option value="55">55</option><option value="56">56</option><option value="57">57</option>
<option value="58">58</option><option value="59">59</option>
</select>
</div> </div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
@ -131,7 +247,7 @@
</select> </select>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<input ng-model="t.price" class="form-control input-sm"> <input type="number" min="0" step="0.01" ng-model="t.price" class="form-control input-sm">
</td> </td>
<td class="text-center sm"> <td class="text-center sm">