潘钊 / bsth_control · Commits

Commit 6a5c37cad6c1c66d34c7bd7a1677f5b68f336ef9

Authored by 徐烜
2 parents f6089a20 7a8ada4b
build: skipped

Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con… 

…trol into pudong_jdk8_wvp
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
src/main/resources/application-test.properties
  View file @6a5c37c
... ... @@ -83,7 +83,7 @@ wvp.channel.history.list.url=http://61.169.120.202:28080/api/gb_record/query/{de
83 83  
84 84  
85 85 #客流图像
86   -passengerFlow.url = http://58.247.254.118:9999/images/
  86 +passengerFlow.url = http://192.168.168.152:9999/images/
87 87 #DSM图像视频
88 88 dsm.url = http://211.95.61.66:9008/safedriving/SafeDrivingInterface_for_jcpt
89 89  
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
  View file @6a5c37c
... ... @@ -32,17 +32,17 @@
32 32 <p>$$$$$${txt-3624}{{direction}}</p>
33 33 <p>$$$$$${txt-3684}{{lon}}</p>
34 34 <p>$$$$$${txt-3683}{{lat}}</p>
35   - {{if num !=null}}
  35 + {{if kl !=null}}
36 36 <p>$$$$$${txt-4521}：{{kl.num}}</p>
37 37 {{/if}}
38 38 {{if kl !=null && kl.num <= 5}}
39   - <p>$$$$$${txt-3621}<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5002}</a></p>
  39 + <p>$$$$$${txt-3621}<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5002}</a></p>
40 40 {{/if}}
41 41 {{if kl !=null && kl.num > 5 && kl.num <= 10}}
42   - <p>$$$$$${txt-3621}<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5003}</a></p>
  42 + <p>$$$$$${txt-3621}<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5003}</a></p>
43 43 {{/if}}
44 44 {{if kl !=null && kl.num > 10}}
45   - <p>$$$$$${txt-3621}<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5004}</a></p>
  45 + <p>$$$$$${txt-3621}<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5004}</a></p>
46 46 {{/if}}
47 47 {{if energy == 0}}
48 48 <div><span class="field">$$$$$${txt-4435}</span><span style="color: red;">{{energy}}%&nbsp;($$$$$${txt-3832})</span></div>
... ... @@ -55,7 +55,7 @@
55 55 {{if expectStopTime!=null}}
56 56 <a href="javascript:;" style="color: #07D;margin-right: 7px;">$$$$$${txt-1309}</a>
57 57 {{/if}}
58   - <a href="javascript:;" style="float: left;" onclick="javascript:window.open('http://211.95.61.66:9020/transport_server/dvr_monitor2.html?userid=4&zbh={{nbbm}}');">DVR</a>
  58 + <a href="javascript:;" style="float: left;" onclick="javascript:window.open('/other/video/video.html?insideCode_like={{nbbm}}');">DVR</a>
59 59 {{if dvrcode != null}}<a href="W9:1@139.196.29.203@?method=call&1111:{{dvrcode}}" style="margin-left: 50px;" >$$$$$${txt-3044}</a>{{/if}}
60 60 <a href="javascript:;" style="float: right;" onclick="javascript:gb_map_play_back.initParams({deviceId: '{{deviceId}}', nbbm: '{{nbbm}}'});">$$$$$${txt-2477}</a>
61 61 </div>
... ...