youxiw2000 / bsthLineProfiles · Commits

Commit d7f90c62ad009be079cc0f6f8e04bcd641f67620

Authored by yiming
1 parent 5afa1c14
build: skipped

bf

Inline Side-by-side
Showing 3 changed files with 29 additions and 4 deletions
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @d7f90c6
... ... @@ -213,7 +213,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
213 213 <if test="personAvg != null "> and person_avg = #{personAvg}</if>
214 214 <if test="startDate != null "> and start_date = #{startDate}</if>
215 215 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  216 + <if test="lineUpdateType != null and lineUpdateType != ''"> and line_update_type= #{lineUpdateType}</if>
  217 + <if test="revenueType != null and revenueType != ''"> and revenue_type= #{revenueType}</if>
216 218 <if test="createTimeEnd != null and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
  219 +
217 220 </where>
218 221 </select>
219 222  
... ...
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @d7f90c6
... ... @@ -197,6 +197,18 @@
197 197 <li><label>日期截点：</label> <input type="text"
198 198 class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/>
199 199 </li>
  200 + <li><label>性质：</label> <select name="lineUpdateType"
  201 + th:with="type=${@dict.getType('lineUpdateType')}">
  202 + <option value=""></option>
  203 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  204 + th:value="${dict.dictValue}"></option>
  205 + </select></li>
  206 + <li><label>营收类型：</label> <select name="revenueType"
  207 + th:with="type=${@dict.getType('revenueType')}">
  208 + <option value=""></option>
  209 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  210 + th:value="${dict.dictValue}"></option>
  211 + </select></li>
200 212 <li>
201 213 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
202 214 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
... ...
bsthLineProfiles/src/main/resources/templates/system/line/map.html
  View file @d7f90c6
... ... @@ -124,10 +124,10 @@ body, html, #container {
124 124  
125 125 <div class="row">
126 126 <h4></h4>
127   - <div class="row pre-scrollable">
  127 +
128 128 <div id="bus" class="col-sm-12" style="padding-left: 20px;width: 440px">
129 129 </div>
130   - </div>
  130 +
131 131 <h4 ></h4>
132 132 <div class="lf">
133 133 <i class="fa fa-minus " style="color:#5298ff" id="c1"></i>
... ... @@ -234,6 +234,7 @@ body, html, #container {
234 234 var lng=p.latLng.lng;
235 235 var lat=p.latLng.lat;
236 236 map.centerAndZoom(new BMapGL.Point(lng,lat), 17);
  237 + map.addOverlay(p);
237 238 a(lng,lat,distance);
238 239 }
239 240  
... ... @@ -261,7 +262,7 @@ body, html, #container {
261 262 Array.prototype.push.apply(bus, arr);
262 263 var str='';
263 264 for ( var j in arr) {
264   - str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>、";
  265 + str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>&nbsp;&nbsp;";
265 266 }
266 267  
267 268 var info = "";
... ... @@ -330,7 +331,7 @@ body, html, #container {
330 331 Array.prototype.push.apply(bus, arr);
331 332 var str='';
332 333 for ( var j in arr) {
333   - str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>、";
  334 + str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>&nbsp;&nbsp;";
334 335 }
335 336 var info = "";
336 337 info += "<span>站点名称：" + data.data[i].stationName
... ... @@ -467,6 +468,15 @@ body, html, #container {
467 468 map.addEventListener('rightclick', function(e){
468 469 var pt = e.latlng;
469 470 var marker = new BMapGL.Marker(new BMapGL.Point(pt.lng, pt.lat));
  471 + var myicon = new BMapGL.Icon(
  472 + 'http://webmap0.map.bdstatic.com/wolfman/static/common/images/us_cursor_9517a2b.png', // 百度图片
  473 + new BMapGL.Size(18,26), // 视窗大小
  474 + {
  475 + imageSize: new BMapGL.Size(144,92), // 引用图片实际大小
  476 + imageOffset:new BMapGL.Size(18,22) // 图片相对视窗的偏移
  477 + }
  478 + );
  479 + marker.setIcon(myicon);
470 480 map.removeOverlay(p);
471 481 p=marker;
472 482 map.addOverlay(p);
... ...