diff options
| author |   Tao Shen <shentao@chinamobile.com> | 2017-03-17 03:59:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2017-03-17 03:59:13 +0000 |
| commit | 71f65aab9d72cbd3a015bb2467a254bf542bf38d (patch) | |
| tree | 18e2438bf1a9e6c0426fff36357863e3903af8a6 /alarm-analysis/src/main/webapp/alarm/index.html | |
| parent | 739b4395c43351361c82b29deedfafedbfd1c6b2 (diff) | |
| parent | 1e6e927eea306eda17e8966215d4f57566472bf2 (diff) | |
Merge "Resolve the merge conflict"
Diffstat (limited to 'alarm-analysis/src/main/webapp/alarm/index.html')
| -rw-r--r-- | alarm-analysis/src/main/webapp/alarm/index.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/alarm-analysis/src/main/webapp/alarm/index.html b/alarm-analysis/src/main/webapp/alarm/index.html index 270f8d81..9762df6a 100644 --- a/alarm-analysis/src/main/webapp/alarm/index.html +++ b/alarm-analysis/src/main/webapp/alarm/index.html @@ -19,11 +19,13 @@ <base href="/iui/LY-Correlation/">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <script src="public/component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+ <script src="public/thirdparty/js/jquery_1.12.4.min.js"></script>
<script src="public/common/js/popModal.js"></script>
+ <script src="public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>
<script src="public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
<script src="public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
<script src="public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>
+
<body style="overflow: auto">
<remote-config>Loading...</remote-config>
|