Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents b45a226c 21467189
Showing 3 changed files with 6 additions and 2 deletions
src/main/resources/static/pages/forms/export/import_Jdl.xls
src/main/resources/static/real_control_v2/js/modal_extend.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback/main.html
@@ -7,6 +7,10 @@ $(document).on(&#39;hide.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
 $(document).on('show.uk.modal', '.uk-modal', function () {
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
         return;
+
+    //临时放过g'ji轨迹回放
+    if($(this).attr('id')=='map-playback-modal')
+        return;
     //计算居中位置
     var win = $('body');
     var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
 <div class="uk-modal ct-form-modal" id="map-playback-modal">
-    <div class="uk-modal-dialog" >
+    <div class="uk-modal-dialog" style="position: relative !important;margin: 50px auto !important;left: 0px !important;top: 0px !important;">
         <a href="" class="uk-modal-close uk-close"></a>
         <h1>轨迹回放</h1>
         <div class="pb_modal_body"></div>
@@ -22,7 +22,7 @@
                     $(this).css('min-width', '1280px');
                 });
                 $('.pb_modal_body', modal).load('/real_control_v2/mapmonitor/fragments/playback/run.html', function () {
-                   $('#playback_run_body', modal).trigger('init', data);
+                    $('#playback_run_body', modal).trigger('init', data);
                 });
             });
         })();