Commit b56bec56b1eef25db74ee4d139f6fdc59cce2dc1
1 parent
9a8a3ad8
update...
Showing
2 changed files
with
14 additions
and
11 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
| @@ -42,9 +42,9 @@ | @@ -42,9 +42,9 @@ | ||
| 42 | <div class="uk-grid"> | 42 | <div class="uk-grid"> |
| 43 | <div class="uk-width-1-1"> | 43 | <div class="uk-width-1-1"> |
| 44 | <div class="uk-form-row ct-stacked"> | 44 | <div class="uk-form-row ct-stacked"> |
| 45 | - <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过20个字符）</small></label> | 45 | + <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过50个字符）</small></label> |
| 46 | <div class="uk-form-controls"> | 46 | <div class="uk-form-controls"> |
| 47 | - <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" >{{remarks}}</textarea> | 47 | + <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" >{{remarks}}</textarea> |
| 48 | </div> | 48 | </div> |
| 49 | </div> | 49 | </div> |
| 50 | </div> | 50 | </div> |
| @@ -167,8 +167,7 @@ | @@ -167,8 +167,7 @@ | ||
| 167 | if(sch.bcType == 'in' || sch.bcType == 'out') | 167 | if(sch.bcType == 'in' || sch.bcType == 'out') |
| 168 | return; | 168 | return; |
| 169 | 169 | ||
| 170 | - //重置类型，等待调整界面触发刷新事件 | ||
| 171 | - $(this).val(sch.bcType); | 170 | + |
| 172 | var url, detailModal; | 171 | var url, detailModal; |
| 173 | if(type=='venting'){ | 172 | if(type=='venting'){ |
| 174 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html'; | 173 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html'; |
| @@ -181,6 +180,8 @@ | @@ -181,6 +180,8 @@ | ||
| 181 | else | 180 | else |
| 182 | return; | 181 | return; |
| 183 | 182 | ||
| 183 | + //重置类型，等待调整界面触发刷新事件 | ||
| 184 | + $(this).val(sch.bcType); | ||
| 184 | $.get(url, function(htmlStr){ | 185 | $.get(url, function(htmlStr){ |
| 185 | $(document.body).append(htmlStr); | 186 | $(document.body).append(htmlStr); |
| 186 | 187 | ||
| @@ -194,9 +195,9 @@ | @@ -194,9 +195,9 @@ | ||
| 194 | */ | 195 | */ |
| 195 | $('[name=bcType]', modal).mousedown(function () { | 196 | $('[name=bcType]', modal).mousedown(function () { |
| 196 | this.sindex = $(this)[0].selectedIndex; | 197 | this.sindex = $(this)[0].selectedIndex; |
| 197 | - $(this)[0].selectedIndex = 0; | 198 | + $(this)[0].selectedIndex = -1; |
| 198 | }).mouseout(function () { | 199 | }).mouseout(function () { |
| 199 | - if ($(this)[0].selectedIndex === 0) { | 200 | + if ($(this)[0].selectedIndex === -1) { |
| 200 | $(this)[0].selectedIndex = this.sindex; | 201 | $(this)[0].selectedIndex = this.sindex; |
| 201 | } | 202 | } |
| 202 | }); | 203 | }); |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
| @@ -270,17 +270,19 @@ | @@ -270,17 +270,19 @@ | ||
| 270 | if(sch.bcType == 'in' || sch.bcType == 'out') | 270 | if(sch.bcType == 'in' || sch.bcType == 'out') |
| 271 | return; | 271 | return; |
| 272 | 272 | ||
| 273 | - //重置类型，等待调整界面触发刷新事件 | ||
| 274 | - $(this).val(sch.bcType); | ||
| 275 | var url, detailModal; | 273 | var url, detailModal; |
| 276 | if(type=='venting'){ | 274 | if(type=='venting'){ |
| 277 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html'; | 275 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html'; |
| 278 | detailModal='#bctype-venting-modal'; | 276 | detailModal='#bctype-venting-modal'; |
| 279 | } | 277 | } |
| 280 | - else{ | 278 | + else if(type=='major'){ |
| 281 | detailModal='#bctype-major-modal'; | 279 | detailModal='#bctype-major-modal'; |
| 282 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html'; | 280 | url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html'; |
| 283 | } | 281 | } |
| 282 | + else return; | ||
| 283 | + | ||
| 284 | + //重置类型，等待调整界面触发刷新事件 | ||
| 285 | + $(this).val(sch.bcType); | ||
| 284 | 286 | ||
| 285 | $.get(url, function(htmlStr){ | 287 | $.get(url, function(htmlStr){ |
| 286 | $(document.body).append(htmlStr); | 288 | $(document.body).append(htmlStr); |
| @@ -295,9 +297,9 @@ | @@ -295,9 +297,9 @@ | ||
| 295 | */ | 297 | */ |
| 296 | $('select[name=bcType]', modal).mousedown(function () { | 298 | $('select[name=bcType]', modal).mousedown(function () { |
| 297 | this.sindex = $(this)[0].selectedIndex; | 299 | this.sindex = $(this)[0].selectedIndex; |
| 298 | - $(this)[0].selectedIndex = 0; | 300 | + $(this)[0].selectedIndex = -1; |
| 299 | }).mouseout(function () { | 301 | }).mouseout(function () { |
| 300 | - if ($(this)[0].selectedIndex === 0) { | 302 | + if ($(this)[0].selectedIndex === -1) { |
| 301 | $(this)[0].selectedIndex = this.sindex; | 303 | $(this)[0].selectedIndex = this.sindex; |
| 302 | } | 304 | } |
| 303 | }); | 305 | }); |