diff options
| author |   tang peng <tang.peng5@zte.com.cn> | 2018-08-28 01:17:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-28 01:17:52 +0000 |
| commit | 626c238c770c843d56c08a20cb14d2556a753ec9 (patch) | |
| tree | cef602b1e7d2bf3b1c5cca1544763f6b95091268 /rulemgt-frontend | |
| parent | abf2ae6e56e723393c76699223913aba8a78cdf3 (diff) | |
| parent | 436366435bf9ade9f8596dac346db77c0098d4e0 (diff) | |
Merge "Added jquery resource"
Diffstat (limited to 'rulemgt-frontend')
| -rw-r--r-- | rulemgt-frontend/.angular-cli.json | 1 | ||||
| -rw-r--r-- | rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/rulemgt-frontend/.angular-cli.json b/rulemgt-frontend/.angular-cli.json index 5da3c0f..e18a89f 100644 --- a/rulemgt-frontend/.angular-cli.json +++ b/rulemgt-frontend/.angular-cli.json @@ -27,6 +27,7 @@ "assets/framework/browser/thirdparty/css/magic-check.css" ], "scripts": [ + "../node_modules/jquery/dist/jquery.js", "assets/common/js/jQuery-File-Upload/js/jquery.ui.widget.js", "assets/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js", "assets/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js", diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts index fa69e3c..a8a4c07 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts @@ -20,8 +20,6 @@ import {RuleRequest} from './ruleRequest'; import {Router} from '@angular/router'; import {AlarmRuleService} from './alarmRule.service'; -declare var jQuery: any; - @Component({ selector: 'alarmRule', templateUrl: './alarmRule.component.html', |