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

updated Tariff Editor in Admin UI

pull/134/head
13621160019@163.com 2022-03-03 22:10:40 +08:00
parent e981e7f175
commit 1f4749ea7c
20 changed files with 603 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,8 @@ app.controller('TariffController', function(
}
});
}
});
}
);
};
$scope.getAllTariffs();

5
admin/views/login/login.html
View File

@ -1,7 +1,6 @@
<div class="" ng-controller="LoginController">
<div class="">
<div class="row">
<div class="paddingtop">
<div class="margincenter">
<div class="panel panel-warning loginform">
@ -39,9 +38,5 @@
</div>
</div>
</div>
</div>

1
admin/views/settings/category/category.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="EnergyCategoryMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/combinedequipment/combinedequipment.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="CombinedEquipmentMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

4
admin/views/settings/contact/contact.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
@ -43,7 +42,4 @@
</div>
</div>
</div>
</div>

1
admin/views/settings/costcenter/costcenter.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="CostCenterMasterController" >
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

4
admin/views/settings/datasource/datasource.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="DataSourceMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
@ -109,7 +108,4 @@
</div>
</div>
</div>
</div>

1
admin/views/settings/distributionsystem/distributionsystem.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="DistributionSystemMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/emailserver/emailserver.html
View File

@ -40,3 +40,4 @@
</div>
</div>
</div>

1
admin/views/settings/energyflowdiagram/energyflowdiagram.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="EnergyFlowDiagramMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/equipment/equipment.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="EquipmentMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/gateway/gateway.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="GatewayMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/menu/menu.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="MenuMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/meter/meter.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="MeterMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/sensor/sensor.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="SensorMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/space/space.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="SpaceMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

1
admin/views/settings/store/store.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="StoreMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">

9
admin/views/settings/tariff/tariff.html
View File

@ -1,9 +1,7 @@
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">
<uib-tabset>
<uib-tab heading="{{'SETTING.TARIFF_LIST' | translate}}" >
<div class="panel-body" ng-controller="TariffController">
@ -33,19 +31,14 @@
<td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editTariff(tariff)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-click="deleteTariff(tariff)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td>
</tr>
</tbody>
</table>
</div>
</uib-tab>
</div>
</div>
</div>
</div>
</div>

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

@ -7,7 +7,6 @@
<div class="col-sm-4 b-r">
<form method="get" class="form-horizontal">
<div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.TARIFF_NAME' | translate}}</label>
<div class="col-sm-7"><input ng-model="tariff.name" type="text" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
@ -32,7 +31,6 @@
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.UNIT' | translate}}</label>
<div class="col-sm-7"><input ng-model="tariff.unit_of_price" type="text" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
@ -49,11 +47,9 @@
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div>
</div>
</form>
</div>
<div class="col-sm-8">
<table id="blockTable" ng-show="tariff.tariff_type=='block'" class="footable table table-bordered table-hover" data-sort="false" data-page-size="10" >
<thead>
<tr>
@ -61,7 +57,6 @@
<th class="text-center">{{'SETTING.END_AMOUNT' | translate}}</th>
<th class="text-center">{{'SETTING.PRICE' | translate}}</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
<tr>
<td class="text-center sm ">
@ -73,7 +68,6 @@
<td class="text-center sm">
<input ng-model="b.price" class="form-control input-sm">
</td>
<td class="text-center sm">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="add(b)" >{{'SETTING.ADD' | translate}}</a>
</td>
@ -85,10 +79,8 @@
<td class="text-center sm">{{ bl.start_amount }}</td>
<td class="text-center sm">{{ bl.end_amount }}</td>
<td class="text-center sm">{{ bl.price }}</td>
<td class="text-center sm">
<a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td>
</tr>
</tbody>
@ -109,69 +101,161 @@
<th class="text-center">{{'SETTING.PEAK_TYPE' | translate}}</th>
<th class="text-center">{{'SETTING.PRICE' | translate}}</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
</tr>
<tr>
<td class="text-center sm">
<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>
<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>
<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>
<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>
</td>
@ -179,62 +263,155 @@
<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>
<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>
<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>
<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>
</td>
@ -262,10 +439,8 @@
<td class="text-center sm">{{ tou.end_time_of_day }}</td>
<td class="text-center sm">{{ showPeakType(tou.peak_type) | translate }}</td>
<td class="text-center sm">{{ tou.price }}</td>
<td class="text-center sm">
<a ng-click="delete($index)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
</td>
</tr>
</tbody>
@ -279,7 +454,6 @@
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button>

1
admin/views/settings/tenant/tenant.html
View File

@ -1,5 +1,4 @@
<div class="wrapper wrapper-content" ng-controller="TenantMasterController">
<div class="row">
<div class="col-lg-12">
<div class="tabs-container">