diff options
| author |   YILI <li.yi101@zte.com.cn> | 2017-03-14 09:51:58 +0800 |
|---|---|---|
| committer | 6092002077 <li.yi101@zte.com.cn> | 2017-03-14 09:51:58 +0800 |
| commit | 1e6e927eea306eda17e8966215d4f57566472bf2 (patch) | |
| tree | ed1e4b64d9d37340835c7d3527a0c025f490562d /alarm-analysis/src/main/webapp/alarm/index.html | |
| parent | 108730b2f8fe2a95e826bc0144ad84a632a92656 (diff) | |
Resolve the merge conflict
read rule manager gui list,inclode query and table list
Issue-ID:CLIENT-151
Change-Id: Ie5b932cef60f86e106e074565ab1a249ec0c5125
Signed-off-by: YILI <li.yi101@zte.com.cn>
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>
|