潘钊 / bsth_control · Commits

Commit 80fc0669c5b1152d5211164ed988d22c136eedd9

Authored by 潘钊
1 parent e2966735

update...

Inline Side-by-side
Showing 4 changed files with 107 additions and 40 deletions
src/main/resources/static/pages/base/geo_data_edit/fragments/versions.html 0 → 100644
  View file @80fc066
  1 +<div>
  2 + <script id="geo_d_e_version_add-temp" type="text/html">
  3 + <div id="add_line_versions_modal" uk-modal esc-close="false" bg-close="false">
  4 + <div class="uk-modal-dialog uk-modal-body">
  5 + <button class="uk-modal-close-default" type="button" uk-close></button>
  6 + <h2 class="uk-modal-title">添加走向版本</h2>
  7 +
  8 + <form class="uk-form-horizontal uk-margin-large">
  9 + <div class="uk-margin">
  10 + <label class="uk-form-label" >变更走向原因</label>
  11 + <div class="uk-form-controls">
  12 + <select class="uk-select" name="remark">
  13 + <option>线路改道</option>
  14 + <option>其他</option>
  15 + </select>
  16 + </div>
  17 + </div>
  18 +
  19 + <div class="uk-margin">
  20 + <label class="uk-form-label" >启用时间</label>
  21 + <div class="uk-form-controls">
  22 + <input class="uk-input _flatpickr" type="text" name="startDate" placeholder="启用该版本走向的时间">
  23 + </div>
  24 + </div>
  25 +
  26 + <div class="uk-margin">
  27 + <label class="uk-form-label" >版本名称</label>
  28 + <div class="uk-form-controls">
  29 + <input class="uk-input" type="text" name="name" placeholder="版本名称">
  30 + </div>
  31 + </div>
  32 +
  33 + <div class="uk-margin">
  34 + <div class="uk-form-label">继承走向</div>
  35 + <div class="uk-form-controls">
  36 + <select class="uk-select" >
  37 + <option>不继承之前的走向</option>
  38 +
  39 + {{each array as obj i}}
  40 + <option data-id="{{obj.id}}" data-versions="{{obj.versions}}">{{obj.name}}</option>
  41 + {{/each}}
  42 + </select>
  43 + </div>
  44 + </div>
  45 +
  46 + </form>
  47 +
  48 + <p class="uk-text-right">
  49 + <button class="uk-button uk-button-default uk-modal-close" type="button">取消</button>
  50 + <button class="uk-button uk-button-primary _submit" type="button">提交</button>
  51 + </p>
  52 + </div>
  53 + </div>
  54 + </script>
  55 +</div>
0 56 \ No newline at end of file
... ...
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
  View file @80fc066
... ... @@ -126,7 +126,7 @@ var gb_road_route = function () {
126 126  
127 127 var addPrevId;//添加路段路由的上一个路由ID
128 128 var insert_road_before = function (road) {
129   - isPrevEnd();
  129 + isPrevEnd(road);
130 130  
131 131 //在之前插入路段
132 132 var cell = getRoadLI(road);
... ... @@ -139,7 +139,7 @@ var gb_road_route = function () {
139 139 };
140 140  
141 141 var insert_road_after = function (road) {
142   - isPrevEnd();
  142 + isPrevEnd(road);
143 143  
144 144 //在之后插入路段
145 145 var cell = getRoadLI(road);
... ... @@ -156,7 +156,7 @@ var gb_road_route = function () {
156 156 add_road(addCell);
157 157 };
158 158  
159   - var isPrevEnd = function () {
  159 + var isPrevEnd = function (r) {
160 160 if($('.up_down_route_list>li:eq('+r.directions+')>.road_route .road_li_transient').length > 0)
161 161 return UIkit.notification("你需要完成上一个路段新增！", {status: 'danger'});
162 162 };
... ...
src/main/resources/static/pages/base/geo_data_edit/js/version_manage.js
  View file @80fc066
... ... @@ -6,6 +6,7 @@ var gb_version_manage = function () {
6 6 var lineName;
7 7 var current;
8 8  
  9 + var temps;
9 10 var init = function (cVersion) {
10 11 var lineCode = storage.getItem("geo_data_edit_line_code");
11 12 //获取线路版本信息
... ... @@ -30,8 +31,51 @@ var gb_version_manage = function () {
30 31 //当前版本
31 32 $('.main_left_panel ._version_dropdown_wrap>._version_text').html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>');
32 33 });
  34 +
  35 + $.get('/pages/base/geo_data_edit/fragments/versions.html', function (dom) {
  36 + temps = gb_common.compileTempByDom(dom, {
  37 + compress: true
  38 + });
  39 + });
33 40 };
34 41  
  42 + /**
  43 + * 新增
  44 + */
  45 + $('.add_line_version_icon').on('click', function () {
  46 + console.log('arrayarray', array);
  47 + var htmlStr = temps['geo_d_e_version_add-temp']({array: array});
  48 +
  49 + $(document.body).append(htmlStr);
  50 + UIkit.modal('#add_line_versions_modal').show();
  51 + flatpickr('#add_line_versions_modal input._flatpickr', gb_common.flatpickrDateTimeConfig);
  52 +
  53 +
  54 + var modal = '#add_line_versions_modal';
  55 + var reSetName = function () {
  56 + var remark = $('[name=remark]', modal).val();
  57 + var rq = $('[name=startDate]', modal).val();
  58 +
  59 + $('[name=name]', modal).val(rq.substr(0, 10).replace(/-/g,'') + remark);
  60 + };
  61 + //自动填充版本名称
  62 + $('[name=remark]', modal).on('change', reSetName);
  63 + $('[name=startDate]', modal).on('input', reSetName);
  64 + });
  65 +
  66 + $(document).on('hidden', '.uk-modal', function () {
  67 + $(this).remove();
  68 + $('.flatpickr-calendar').remove();
  69 + });
  70 +
  71 +
  72 + /**
  73 + * 提交新增的线路版本
  74 + */
  75 + $(document).on('click', '#add_line_versions_modal button._submit', function () {
  76 +
  77 + });
  78 +
35 79 res_load_ep.emitLater('load_version_manage');
36 80 return {
37 81 init: init,
... ...
src/main/resources/static/pages/base/geo_data_edit/main.html
  View file @80fc066
... ... @@ -12,6 +12,7 @@
12 12 type="text/css" />
13 13 <!-- main css -->
14 14 <link rel="stylesheet" href="/pages/base/geo_data_edit/css/mian.css" />
  15 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
15 16 </head>
16 17  
17 18 <body>
... ... @@ -84,40 +85,6 @@
84 85 </div>
85 86 </div>
86 87  
87   -<div id="add_line_versions_modal" uk-modal>
88   - <div class="uk-modal-dialog uk-modal-body">
89   - <button class="uk-modal-close-default" type="button" uk-close></button>
90   - <h2 class="uk-modal-title">新增线路走向版本</h2>
91   -
92   - <form class="uk-form-horizontal uk-margin-large">
93   - <div class="uk-margin">
94   - <label class="uk-form-label" for="form-horizontal-select">原因</label>
95   - <div class="uk-form-controls">
96   - <select class="uk-select" id="form-horizontal-select">
97   - <option>线路改道</option>
98   - </select>
99   - </div>
100   - </div>
101   -
102   - <div class="uk-margin">
103   - <label class="uk-form-label" for="form-horizontal-text">启用时间</label>
104   - <div class="uk-form-controls">
105   - <input class="uk-input" id="form-horizontal-text" type="text" placeholder="启用改版本走向的时间">
106   - </div>
107   - </div>
108   -
109   - <div class="uk-margin">
110   - <div class="uk-form-label">继承</div>
111   - <div class="uk-form-controls uk-form-controls-text">
112   - <label><input class="uk-radio" type="radio" name="radio1"> Option 01</label><br>
113   - <label><input class="uk-radio" type="radio" name="radio1"> Option 02</label>
114   - </div>
115   - </div>
116   -
117   - </form>
118   - </div>
119   -</div>
120   -
121 88 <script id="geo_d_e_search_result-temp" type="text/html">
122 89 <ul class="s_list uk-list">
123 90 {{each list as obj i}}
... ... @@ -153,6 +120,9 @@
153 120 <!-- jquery contextMenu -->
154 121 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js" ></script>
155 122 <script src="/assets/js/baidu/bd_GeoUtils_min.js" ></script>
  123 +<!-- flatpickr -->
  124 +<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
  125 +<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
156 126  
157 127 <script>
158 128 var $loadPanel = $('body>.loading');
... ... @@ -161,6 +131,7 @@
161 131 //___________________________________
162 132  
163 133 top.document.title = "绘制线路";
  134 +
164 135 // 关闭左侧栏
165 136 if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
166 137 //全屏
... ... @@ -225,9 +196,6 @@
225 196 e.stopPropagation();
226 197 return false;
227 198 });
228   -
229   - //$('#add_line_versions_modal').
230   - //UIkit.modal('#add_line_versions_modal').show();
231 199 </script>
232 200  
233 201 <!--- js -->
... ...