diff --git a/admin/app/controllers/fdd/rule/rule.controller.js b/admin/app/controllers/fdd/rule/rule.controller.js index 527c9b36..b5278d4a 100644 --- a/admin/app/controllers/fdd/rule/rule.controller.js +++ b/admin/app/controllers/fdd/rule/rule.controller.js @@ -3,12 +3,10 @@ app.controller('RuleController', function($scope, $common, $uibModal, $translate, RuleService, toaster, SweetAlert) { $scope.initExpression = [{ - "spaceid": 1, + "sample_object_id": 1, "limit": 1000.000, "recipients": [{ "user_id": "1" - }, { - "user_id": "2" }] }]; diff --git a/admin/app/translations.js b/admin/app/translations.js index 9b78a045..93afe6ec 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -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', diff --git a/admin/views/fdd/rule.html b/admin/views/fdd/rule.html index fc6b8db0..5f01acb2 100644 --- a/admin/views/fdd/rule.html +++ b/admin/views/fdd/rule.html @@ -11,11 +11,13 @@