潘钊 / bsth_control · Commits

Commit a7a2fbf0d0732c09efde482558c775017ef0ca85

Authored by 娄高锋
2 parents fad0f81e 11ff04ad
build: skipped

Merge branch 'pudong_jdk8' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong_jdk8

Inline Side-by-side
Showing 17 changed files with 29 additions and 29 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
  View file @a7a2fbf
... ... @@ -100,7 +100,7 @@
100 100 <div class="uk-form-row">
101 101 <label class="uk-form-label">里程</label>
102 102 <div class="uk-form-controls">
103   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  103 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
104 104 required>
105 105 </div>
106 106 </div>
... ... @@ -226,7 +226,7 @@
226 226 <div class="uk-form-row">
227 227 <label class="uk-form-label">里程</label>
228 228 <div class="uk-form-controls">
229   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  229 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
230 230 required>
231 231 </div>
232 232 </div>
... ... @@ -344,7 +344,7 @@
344 344 <div class="uk-form-row">
345 345 <label class="uk-form-label">里程</label>
346 346 <div class="uk-form-controls">
347   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  347 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
348 348 required>
349 349 </div>
350 350 </div>
... ... @@ -473,7 +473,7 @@
473 473 <div class="uk-form-row">
474 474 <label class="uk-form-label">里程</label>
475 475 <div class="uk-form-controls">
476   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  476 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
477 477 required>
478 478 </div>
479 479 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
  View file @a7a2fbf
... ... @@ -144,7 +144,7 @@
144 144 <div class="uk-width-1-1">
145 145 <div class="uk-form-row ct-stacked">
146 146 <div class="uk-form-controls" style="margin-top: 5px;">
147   - <textarea id="form-s-t" cols="30" rows="5" required name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
  147 + <textarea id="form-s-t" cols="30" rows="5" required name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="250" placeholder="备注，不超过250个字符">{{sch.remarks}}</textarea>
148 148 </div>
149 149 </div>
150 150 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @a7a2fbf
... ... @@ -523,7 +523,7 @@
523 523 if (lp.indexOf('临') != -1) {
524 524 max = lp.substr(lp.indexOf('临') + 1);
525 525 if (!isNaN(max))
526   - index = parseInt(max);
  526 + index = Math.max(index, parseInt(max));
527 527 }
528 528 }
529 529  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_oil.html
  View file @a7a2fbf
... ... @@ -31,7 +31,7 @@
31 31 <div class="uk-form-row">
32 32 <label class="uk-form-label">里程</label>
33 33 <div class="uk-form-controls">
34   - <input type="number" step="0.01" name="mileage" max=222
  34 + <input type="number" step="0.01" name="mileage" max=400
35 35 data-fv-lessthan-inclusive="false"
36 36 disabled>
37 37 </div>
... ... @@ -80,7 +80,7 @@
80 80 <div class="uk-form-row">
81 81 <label class="uk-form-label">里程</label>
82 82 <div class="uk-form-controls">
83   - <input type="number" step="0.01" name="mileage" max=222
  83 + <input type="number" step="0.01" name="mileage" max=400
84 84 data-fv-lessthan-inclusive="false"
85 85 required>
86 86 </div>
... ... @@ -129,7 +129,7 @@
129 129 <div class="uk-form-row">
130 130 <label class="uk-form-label">里程</label>
131 131 <div class="uk-form-controls">
132   - <input type="number" step="0.01" name="mileage" max=222
  132 + <input type="number" step="0.01" name="mileage" max=400
133 133 data-fv-lessthan-inclusive="false"
134 134 required>
135 135 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_other.html
  View file @a7a2fbf
... ... @@ -57,7 +57,7 @@
57 57 <div class="uk-form-row">
58 58 <label class="uk-form-label">公里数</label>
59 59 <div class="uk-form-controls">
60   - <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false" required>
  60 + <input class="form-control" name="mileage" max=400 data-fv-lessthan-inclusive="false" required>
61 61 </div>
62 62 </div>
63 63 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/edit.html
  View file @a7a2fbf
... ... @@ -70,7 +70,7 @@
70 70 <div class="uk-form-row">
71 71 <label class="uk-form-label">公里</label>
72 72 <div class="uk-form-controls">
73   - <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
  73 + <input class="form-control" name="mileage" max=400 data-fv-lessthan-inclusive="false"
74 74 required style="width: 42%;" value="{{cTask.mileage}}">
75 75 <select class="form-control nt-dictionary" required name="mileageType"
76 76 data-group="MileageType" style="width: 52%;"></select>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
  View file @a7a2fbf
... ... @@ -98,7 +98,7 @@
98 98 <div class="uk-form-row">
99 99 <label class="uk-form-label">公里</label>
100 100 <div class="uk-form-controls">
101   - <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
  101 + <input class="form-control" name="mileage" max=400 data-fv-lessthan-inclusive="false"
102 102 required style="width: 42%;">
103 103 <select class="form-control nt-dictionary" required name="mileageType"
104 104 data-group="MileageType" style="width: 52%;"></select>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_normal.html
  View file @a7a2fbf
... ... @@ -76,7 +76,7 @@
76 76 <div class="uk-form-row">
77 77 <label class="uk-form-label">里程</label>
78 78 <div class="uk-form-controls">
79   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  79 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
80 80 required>
81 81 </div>
82 82 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_park_to_park.html
  View file @a7a2fbf
... ... @@ -77,7 +77,7 @@
77 77 <div class="uk-form-row">
78 78 <label class="uk-form-label">里程</label>
79 79 <div class="uk-form-controls">
80   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  80 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
81 81 required>
82 82 </div>
83 83 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_two_way.html
  View file @a7a2fbf
... ... @@ -76,7 +76,7 @@
76 76 <div class="uk-form-row">
77 77 <label class="uk-form-label">里程</label>
78 78 <div class="uk-form-controls">
79   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  79 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
80 80 required>
81 81 </div>
82 82 </div>
... ... @@ -194,7 +194,7 @@
194 194 <div class="uk-form-row">
195 195 <label class="uk-form-label">里程</label>
196 196 <div class="uk-form-controls">
197   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  197 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
198 198 required>
199 199 </div>
200 200 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_normal.html
  View file @a7a2fbf
... ... @@ -76,7 +76,7 @@
76 76 <div class="uk-form-row">
77 77 <label class="uk-form-label">里程</label>
78 78 <div class="uk-form-controls">
79   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  79 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
80 80 required>
81 81 </div>
82 82 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_park_to_park.html
  View file @a7a2fbf
... ... @@ -77,7 +77,7 @@
77 77 <div class="uk-form-row">
78 78 <label class="uk-form-label">里程</label>
79 79 <div class="uk-form-controls">
80   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  80 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
81 81 required>
82 82 </div>
83 83 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_two_way.html
  View file @a7a2fbf
... ... @@ -76,7 +76,7 @@
76 76 <div class="uk-form-row">
77 77 <label class="uk-form-label">里程</label>
78 78 <div class="uk-form-controls">
79   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  79 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
80 80 required>
81 81 </div>
82 82 </div>
... ... @@ -204,7 +204,7 @@
204 204 <div class="uk-form-row">
205 205 <label class="uk-form-label">里程</label>
206 206 <div class="uk-form-controls">
207   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  207 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
208 208 required>
209 209 </div>
210 210 </div>
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/editor.html
  View file @a7a2fbf
... ... @@ -128,7 +128,7 @@
128 128 <div class="uk-form-row">
129 129 <label class="uk-form-label" >里程</label>
130 130 <div class="uk-form-controls">
131   - <input type="text" name="jhlc" value="{{sch.jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  131 + <input type="text" name="jhlc" value="{{sch.jhlc}}" max=400 data-fv-lessthan-inclusive="false"
132 132 required>
133 133 </div>
134 134 </div>
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_sub_task_oil.html
  View file @a7a2fbf
... ... @@ -31,7 +31,7 @@
31 31 <div class="uk-form-row">
32 32 <label class="uk-form-label">里程</label>
33 33 <div class="uk-form-controls">
34   - <input type="number" step="0.01" name="mileage" max=222
  34 + <input type="number" step="0.01" name="mileage" max=400
35 35 data-fv-lessthan-inclusive="false"
36 36 disabled>
37 37 </div>
... ... @@ -80,7 +80,7 @@
80 80 <div class="uk-form-row">
81 81 <label class="uk-form-label">里程</label>
82 82 <div class="uk-form-controls">
83   - <input type="number" step="0.01" name="mileage" max=222
  83 + <input type="number" step="0.01" name="mileage" max=400
84 84 data-fv-lessthan-inclusive="false"
85 85 required>
86 86 </div>
... ... @@ -129,7 +129,7 @@
129 129 <div class="uk-form-row">
130 130 <label class="uk-form-label">里程</label>
131 131 <div class="uk-form-controls">
132   - <input type="number" step="0.01" name="mileage" max=222
  132 + <input type="number" step="0.01" name="mileage" max=400
133 133 data-fv-lessthan-inclusive="false"
134 134 required>
135 135 </div>
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_sub_task_other.html
  View file @a7a2fbf
... ... @@ -73,7 +73,7 @@
73 73 <div class="uk-form-row">
74 74 <label class="uk-form-label">公里数</label>
75 75 <div class="uk-form-controls">
76   - <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false" required>
  76 + <input class="form-control" name="mileage" max=400 data-fv-lessthan-inclusive="false" required>
77 77 </div>
78 78 </div>
79 79 </div>
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_temp_sch.html
  View file @a7a2fbf
... ... @@ -100,7 +100,7 @@
100 100 <div class="uk-form-row">
101 101 <label class="uk-form-label">里程</label>
102 102 <div class="uk-form-controls">
103   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  103 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
104 104 required>
105 105 </div>
106 106 </div>
... ... @@ -226,7 +226,7 @@
226 226 <div class="uk-form-row">
227 227 <label class="uk-form-label">里程</label>
228 228 <div class="uk-form-controls">
229   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  229 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
230 230 required>
231 231 </div>
232 232 </div>
... ... @@ -344,7 +344,7 @@
344 344 <div class="uk-form-row">
345 345 <label class="uk-form-label">里程</label>
346 346 <div class="uk-form-controls">
347   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  347 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
348 348 required>
349 349 </div>
350 350 </div>
... ... @@ -473,7 +473,7 @@
473 473 <div class="uk-form-row">
474 474 <label class="uk-form-label">里程</label>
475 475 <div class="uk-form-controls">
476   - <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
  476 + <input type="text" name="jhlc" value="{{jhlc}}" max=400 data-fv-lessthan-inclusive="false"
477 477 required>
478 478 </div>
479 479 </div>
... ...