潘钊 / bsth_control · Commits

Commit 791d1557cc7cc2f5afcc2867f5e71c4e65f097ea

Authored by 潘钊
1 parent 494e12ff

update...

Inline Side-by-side
Showing 2 changed files with 24 additions and 0 deletions
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
  View file @791d155
... ... @@ -19,6 +19,9 @@
19 19 </a>
20 20 </div>
21 21 <div>
  22 + <span class="field">车牌号：</span>{{plateNo}}
  23 + </div>
  24 + <div>
22 25 <span class="field">站点：</span>{{stationName}}
23 26 </div>
24 27 <!-- <div>
... ... @@ -56,6 +59,9 @@
56 59 </a>
57 60 </div>
58 61 <div>
  62 + <span class="field">车牌号：</span>{{gps.plateNo}}
  63 + </div>
  64 + <div>
59 65 <span class="field">站点：</span>{{gps.stationName}}
60 66 </div>
61 67 <div>
... ...
src/main/resources/static/real_control_v2/js/utils/svg_chart_tooltip.js
  View file @791d155
... ... @@ -13,6 +13,7 @@ var gb_svg_tooltip = (function () {
13 13 if (rect.attr('aria-describedby'))
14 14 return;
15 15 var gps = gb_data_gps.findOne($(this).attr('_id').split('_')[1]);
  16 + addPlateNo(gps);
16 17 $(this).qtip({
17 18 show: {
18 19 ready: true,
... ... @@ -70,6 +71,7 @@ var gb_svg_tooltip = (function () {
70 71 },
71 72 content: {
72 73 text: function () {
  74 + addPlateNo(gpsArray);
73 75 return temps['tooltip_multi_gps_temp']({list: gpsArray});
74 76 }
75 77 },
... ... @@ -190,6 +192,7 @@ var gb_svg_tooltip = (function () {
190 192 */
191 193 var refreshTooltip = function (deviceId, wrap) {
192 194 var gps = gb_data_gps.findOne(deviceId);
  195 + addPlateNo(gps);
193 196  
194 197 var cont = temps['tooltip_gps_temp'](gps);
195 198 var htmlStr = $(cont).find('.cont-text-panel').html();
... ... @@ -201,6 +204,21 @@ var gb_svg_tooltip = (function () {
201 204 //console.log('refreshTooltip htmlStr', htmlStr, wrap);
202 205 };
203 206  
  207 + /**
  208 + * 为GPS附加车牌号
  209 + * @param gpsArray
  210 + */
  211 + function addPlateNo(gpsArray) {
  212 + if (!isArray(gpsArray))
  213 + gpsArray = [gpsArray];
  214 + try {
  215 + $.each(gpsArray, function () {
  216 + if(!this.plateNo)
  217 + this.plateNo = gb_data_basic.nbbm2PlateMap()[this.nbbm];
  218 + });
  219 + }catch (e){}
  220 + }
  221 +
204 222 return {
205 223 update: updateFixedTip,
206 224 refresh: refresh,
... ...