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

added last_run_datetime and next_run_datetime to rule in admin UI 

Merge branch 'develop'
pull/35/head^2
13621160019@163.com 2021-03-22 18:18:39 +08:00
parent 11200807c6 c9aa2a1f23
commit 10e8fa2e84
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/app/translations.js
View File

@ -100,9 +100,11 @@ function config($translateProvider) {
PRIORITY: 'Priority',
CHANNEL: 'Channel',
IS_ENABLED: 'Is Enabled',
LAST_RUN_DATETIME: 'Last Run Datetime',
NEXT_RUN_DATETIME: 'Next Run Datetime',
EXPRESSION: 'Expression',
MESSAGE_TEMPLATE: 'Message Template',
DES_EXPRESSION: 'Click "Edit" for details',
CLICK_EDIT_FOR_DETAILS: 'Click "Edit" for details',
SMS_ALARM_LIST: 'SMS Alarm List',
RECIPIENT_NAME: 'Recipient Name',
@ -1151,9 +1153,11 @@ function config($translateProvider) {
PRIORITY: '报警优先级',
CHANNEL: '报警通道',
IS_ENABLED: '报警开关',
LAST_RUN_DATETIME: '上次运行时间',
NEXT_RUN_DATETIME: '下次运行时间',
EXPRESSION: '表达式',
MESSAGE_TEMPLATE: '消息模板',
DES_EXPRESSION: '点击"修改"查看详情',
CLICK_EDIT_FOR_DETAILS: '点击"修改"查看详情',
SMS_ALARM_LIST: '短信报警列表',
RECIPIENT_NAME: '接收人',
@ -2199,9 +2203,11 @@ function config($translateProvider) {
PRIORITY: 'Alarmpriorität',
CHANNEL: 'Alarmkanal',
IS_ENABLED: 'Alarmschalter',
LAST_RUN_DATETIME: 'Letzter Lauf Datetime',
NEXT_RUN_DATETIME: 'Nächster Lauf Datetime',
EXPRESSION: 'Ausdruck',
MESSAGE_TEMPLATE: 'Nachrichtenvorlage',
DES_EXPRESSION: 'Klicken Sie auf "Bearbeiten"',
CLICK_EDIT_FOR_DETAILS: 'Klicken Sie auf "Bearbeiten"',
SMS_ALARM_LIST: 'SMS-Alarmliste',
RECIPIENT_NAME: 'Empfänger',

8
admin/views/fdd/rule.html
View File

@ -16,6 +16,8 @@
<th >{{'FDD.PRIORITY' | translate}}</th>
<th >{{'FDD.CHANNEL' | translate}}</th>
<th >{{'FDD.IS_ENABLED' | translate}}</th>
<th >{{'FDD.LAST_RUN_DATETIME' | translate}}</th>
<th >{{'FDD.NEXT_RUN_DATETIME' | translate}}</th>
<th >{{'FDD.EXPRESSION' | translate}}</th>
<th >{{'FDD.MESSAGE_TEMPLATE' | translate}}</th>
<th >{{'SETTING.ACTION' | translate}}</th>
@ -31,8 +33,10 @@
<td >{{ rule.priority }}</td>
<td >{{ rule.channel }}</td>
<td >{{ rule.is_enabled==true?'SETTING.ON':'SETTING.OFF' | translate}}</td>
<td > {{'FDD.DES_EXPRESSION' | translate}} </td>
<td class="col-lg-5 col-md-5">{{ rule.message_template }}</td>
<td >{{ rule.last_run_datetime | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
<td >{{ rule.next_run_datetime | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
<td > {{'FDD.CLICK_EDIT_FOR_DETAILS' | translate}} </td>
<td > {{'FDD.CLICK_EDIT_FOR_DETAILS' | translate}} </td>
<td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editRule(rule)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-click="deleteRule(rule)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>

19
admin/views/fdd/rule.model.html
View File

@ -18,20 +18,36 @@
<select name="fdd_code" ng-model="rule.fdd_code" class="form-control m-b">
<option value="SYSTEM01">SYSTEM01</option>
<option value="SYSTEM02">SYSTEM02</option>
<option value="SPACE01">SPACE02</option>
<option value="REALTIME01">REALTIME01</option>
<option value="REALTIME02">REALTIME02</option>
<option value="SPACE01">SPACE01</option>
<option value="SPACE02">SPACE02</option>
<option value="SPACE03">SPACE03</option>
<option value="SPACE04">SPACE04</option>
<option value="METER01">METER01</option>
<option value="METER02">METER02</option>
<option value="METER03">METER03</option>
<option value="METER04">METER04</option>
<option value="TENANT01">TENANT01</option>
<option value="TENANT02">TENANT02</option>
<option value="TENANT03">TENANT03</option>
<option value="TENANT04">TENANT04</option>
<option value="STORE01">STORE01</option>
<option value="STORE02">STORE02</option>
<option value="STORE03">STORE03</option>
<option value="STORE04">STORE04</option>
<option value="SHOPFLOOR01">SHOPFLOOR01</option>
<option value="SHOPFLOOR02">SHOPFLOOR02</option>
<option value="SHOPFLOOR03">SHOPFLOOR03</option>
<option value="SHOPFLOOR04">SHOPFLOOR04</option>
<option value="EQUIPMENT01">EQUIPMENT01</option>
<option value="EQUIPMENT02">EQUIPMENT02</option>
<option value="EQUIPMENT03">EQUIPMENT03</option>
<option value="EQUIPMENT04">EQUIPMENT04</option>
<option value="COMBINEDEQUIPMENT01">COMBINEDEQUIPMENT01</option>
<option value="COMBINEDEQUIPMENT02">COMBINEDEQUIPMENT02</option>
<option value="COMBINEDEQUIPMENT03">COMBINEDEQUIPMENT03</option>
<option value="COMBINEDEQUIPMENT04">COMBINEDEQUIPMENT04</option>
</select>
<div class="m-t-xs" ng-show="form_rule.fdd_code.$invalid && form_rule.fdd_code.$dirty">
<small class="text-danger" ng-show="form_rule.fdd_code.$error.required">-</small>
@ -42,6 +58,7 @@
<div class="col-sm-10">
<select name="category" ng-model="rule.category" class="form-control m-b">
<option value="SYSTEM">SYSTEM</option>
<option value="REALTIME">REALTIME</option>
<option value="SPACE">SPACE</option>
<option value="METER">METER</option>
<option value="TENANT">TENANT</option>