潘钊 / bsth_control · Commits

Commit cacaa6cc541f30180bac299d6e915203e989a682

Authored by 潘钊
1 parent f3f230a3

update...

Inline Side-by-side
Showing 1 changed file with 23 additions and 5 deletions
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
  View file @cacaa6c
1 <div class="uk-modal ct_move_modal" id="all-devices-modal"> 1 <div class="uk-modal ct_move_modal" id="all-devices-modal">
2 - <div class="uk-modal-dialog" style="width: 1100px;"> 2 + <div class="uk-modal-dialog" style="width: 1140px;">
3 <a href="" class="uk-modal-close uk-close"></a> 3 <a href="" class="uk-modal-close uk-close"></a>
4 <div class="uk-modal-header"> 4 <div class="uk-modal-header">
5 <h2>所有接入平台的设备</h2></div> 5 <h2>所有接入平台的设备</h2></div>
@@ -25,6 +25,14 @@ @@ -25,6 +25,14 @@
25 <div class="uk-autocomplete uk-form autocomplete-device" > 25 <div class="uk-autocomplete uk-form autocomplete-device" >
26 <input type="text" name="deviceId" placeholder="设备号"> 26 <input type="text" name="deviceId" placeholder="设备号">
27 </div> 27 </div>
  28 + <span class="horizontal-field">来源</span>
  29 + <div class="uk-autocomplete uk-form" >
  30 + <select name="source">
  31 + <option value="">全部</option>
  32 + <option value="1">网关</option>
  33 + <option value="0">转发</option>
  34 + </select>
  35 + </div>
28 <button class="uk-button">检索</button> 36 <button class="uk-button">检索</button>
29 </fieldset> 37 </fieldset>
30 </form> 38 </form>
@@ -35,12 +43,13 @@ @@ -35,12 +43,13 @@
35 <tr> 43 <tr>
36 <th style="width: 14%;">线路</th> 44 <th style="width: 14%;">线路</th>
37 <th style="width: 14%;">站点</th> 45 <th style="width: 14%;">站点</th>
38 - <th style="width: 13%;">车辆</th>  
39 - <th style="width: 13%;">设备号</th>  
40 - <th style="width: 10%;">速度</th>  
41 - <th style="width: 10%;">上下行</th> 46 + <th style="width: 11%;">车辆</th>
  47 + <th style="width: 11%;">设备号</th>
  48 + <th style="width: 9%;">速度</th>
  49 + <th style="width: 9%;">上下行</th>
42 <th style="width: 10%;">程序版本</th> 50 <th style="width: 10%;">程序版本</th>
43 <th>最后GPS时间</th> 51 <th>最后GPS时间</th>
  52 + <th style="width: 8%;">来源</th>
44 </tr> 53 </tr>
45 </thead> 54 </thead>
46 <tbody> 55 <tbody>
@@ -63,6 +72,15 @@ @@ -63,6 +72,15 @@
63 <td>{{gps.upDown}}</td> 72 <td>{{gps.upDown}}</td>
64 <td>{{gps.version}}</td> 73 <td>{{gps.version}}</td>
65 <td>{{gps.timeStr}}</td> 74 <td>{{gps.timeStr}}</td>
  75 + <td>
  76 + {{if gps.source==1}}
  77 + <span style="color: #1e1ef5;" title="已切换至新网关">网关</span>
  78 + {{else if gps.source==0}}
  79 + <span style="color: #8e8e8e;" title="通过信息发布转接的数据，无法下发指令">转发</span>
  80 + {{else}}
  81 + <span>未知</span>
  82 + {{/if}}
  83 + </td>
66 </tr> 84 </tr>
67 {{/each}} 85 {{/each}}
68 </script> 86 </script>