Commit afdf99305517ffe3dc4d69590cc92565b591b0f4
1 parent
e21439d9
update...
Showing
3 changed files
with
33 additions
and
6 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_other.html
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | <div class="uk-form-row"> | 97 | <div class="uk-form-row"> |
| 98 | <label class="uk-form-label">烂班原因</label> | 98 | <label class="uk-form-label">烂班原因</label> |
| 99 | <div class="uk-form-controls"> | 99 | <div class="uk-form-controls"> |
| 100 | - <select class="form-control" name="destroyReason"> | 100 | + <select class="form-control" name="destroyReason" required> |
| 101 | <option value="">请选择...</option> | 101 | <option value="">请选择...</option> |
| 102 | {{each adjustExps as exp i}} | 102 | {{each adjustExps as exp i}} |
| 103 | <option value="{{exp}}">{{exp}}</option> | 103 | <option value="{{exp}}">{{exp}}</option> |
| @@ -198,12 +198,11 @@ | @@ -198,12 +198,11 @@ | ||
| 198 | 198 | ||
| 199 | //是否烂班 | 199 | //是否烂班 |
| 200 | $('[name=destroy]', f).on('click', function () { | 200 | $('[name=destroy]', f).on('click', function () { |
| 201 | - console.log(this, this.checked); | ||
| 202 | if (this.checked) { | 201 | if (this.checked) { |
| 203 | - $('.destroy_reason_wrap', modal).show(); | 202 | + $('.destroy_reason_wrap', modal).show();//.find('[name=destroyReason]').attr('required', 'required'); |
| 204 | } | 203 | } |
| 205 | else { | 204 | else { |
| 206 | - $('.destroy_reason_wrap', modal).hide(); | 205 | + $('.destroy_reason_wrap', modal).hide();//.find('[name=destroyReason]').removeAttr('required'); |
| 207 | } | 206 | } |
| 208 | }); | 207 | }); |
| 209 | 208 |
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | <option value="A7">行驶中与人交谈</option> | 26 | <option value="A7">行驶中与人交谈</option> |
| 27 | </select> | 27 | </select> |
| 28 | <button class="uk-button">检索</button> | 28 | <button class="uk-button">检索</button> |
| 29 | + <a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a> | ||
| 29 | </fieldset> | 30 | </fieldset> |
| 30 | </form> | 31 | </form> |
| 31 | </div> | 32 | </div> |
| @@ -52,6 +53,7 @@ | @@ -52,6 +53,7 @@ | ||
| 52 | </div> | 53 | </div> |
| 53 | </div> | 54 | </div> |
| 54 | 55 | ||
| 56 | + | ||
| 55 | <script id="all-safe_dring-table-temp" type="text/html"> | 57 | <script id="all-safe_dring-table-temp" type="text/html"> |
| 56 | {{each array as sd i}} | 58 | {{each array as sd i}} |
| 57 | <tr> | 59 | <tr> |
| @@ -86,6 +88,9 @@ | @@ -86,6 +88,9 @@ | ||
| 86 | var page = 0; | 88 | var page = 0; |
| 87 | var pageSize = 12; | 89 | var pageSize = 12; |
| 88 | 90 | ||
| 91 | + $('#showSSSpVedioModal', modal).on('click', function () { | ||
| 92 | + gb_safe_driv.showVedioModal(); | ||
| 93 | + }); | ||
| 89 | $(modal).on('init', function(e, data) { | 94 | $(modal).on('init', function(e, data) { |
| 90 | e.stopPropagation(); | 95 | e.stopPropagation(); |
| 91 | 96 |
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
| @@ -42,8 +42,16 @@ var gb_safe_driv = (function () { | @@ -42,8 +42,16 @@ var gb_safe_driv = (function () { | ||
| 42 | $wrap.append(htmlStr); | 42 | $wrap.append(htmlStr); |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | + var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' + | ||
| 46 | + '<div class="uk-modal-dialog uk-modal-dialog-large">' + | ||
| 47 | + '<button type="button" class="uk-modal-close uk-close"></button>' + | ||
| 48 | + '<div class="uk-modal-header"> <h2>实时视频</h2> </div> '+ | ||
| 49 | + '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=0"></iframe>' + | ||
| 50 | + '</div>' + | ||
| 51 | + '</div>'; | ||
| 52 | + | ||
| 45 | $wrap.on('click', '.safe_driv_pop', function () { | 53 | $wrap.on('click', '.safe_driv_pop', function () { |
| 46 | - var title = $(this).data('title'); | 54 | + var title = $(this).data('title') + ' <button class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>'; |
| 47 | var url = $(this).data('url'); | 55 | var url = $(this).data('url'); |
| 48 | $(this).remove(); | 56 | $(this).remove(); |
| 49 | var lightbox = UIkit.lightbox.create([ | 57 | var lightbox = UIkit.lightbox.create([ |
| @@ -53,9 +61,24 @@ var gb_safe_driv = (function () { | @@ -53,9 +61,24 @@ var gb_safe_driv = (function () { | ||
| 53 | lightbox.show(); | 61 | lightbox.show(); |
| 54 | }); | 62 | }); |
| 55 | 63 | ||
| 64 | + var showVedioModal = function () { | ||
| 65 | + open_modal_dom(vedioModal ,{}, {modal: false}); | ||
| 66 | + $('#ssspVedioModal #vedioIframe').on('load', function () { | ||
| 67 | + var that = this; | ||
| 68 | + setTimeout(function () { | ||
| 69 | + $(that).show(); | ||
| 70 | + $('#ssspVedioModal p.loading').remove(); | ||
| 71 | + }, 500); | ||
| 72 | + }); | ||
| 73 | + }; | ||
| 74 | + | ||
| 75 | + $(document).on('click', '#openVedioModalBtn', showVedioModal); | ||
| 76 | + | ||
| 77 | + | ||
| 56 | return { | 78 | return { |
| 57 | pop: pop, | 79 | pop: pop, |
| 58 | safeCode: codes, | 80 | safeCode: codes, |
| 59 | - urlPath: path | 81 | + urlPath: path, |
| 82 | + showVedioModal: showVedioModal | ||
| 60 | } | 83 | } |
| 61 | })(); | 84 | })(); |
| 62 | \ No newline at end of file | 85 | \ No newline at end of file |