bf

yiming
1 parent 5afa1c14
Showing 3 changed files with 29 additions and 4 deletions
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/line/map.html
@@ -213,7 +213,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="personAvg != null "> and person_avg = #{personAvg}</if>
 			<if test="startDate != null "> and start_date = #{startDate}</if>
 			<if test="nightParking != null  and nightParking != ''"> and night_parking = #{nightParking}</if>
+			<if test="lineUpdateType != null  and lineUpdateType != ''"> and  line_update_type= #{lineUpdateType}</if>
+			<if test="revenueType != null  and revenueType != ''"> and revenue_type= #{revenueType}</if>
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
+
 		</where>
 	</select>
@@ -197,6 +197,18 @@
 						<li><label>日期截点：</label> <input type="text"
 														class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/>
 						</li>
+						<li><label>性质：</label> <select name="lineUpdateType"
+														 th:with="type=${@dict.getType('lineUpdateType')}">
+							<option value=""></option>
+							<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+									th:value="${dict.dictValue}"></option>
+						</select></li>
+						<li><label>营收类型：</label> <select name="revenueType"
+													   th:with="type=${@dict.getType('revenueType')}">
+							<option value=""></option>
+							<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+									th:value="${dict.dictValue}"></option>
+						</select></li>
 						<li>
 							<el-button size="mini" type="primary" icon="el-icon-search"  onClick="$.table.search();">搜索</el-button>
 							<el-button size="mini" icon="el-icon-refresh"  onClick="$.form.reset();">重置</el-button>
@@ -124,10 +124,10 @@ body, html, #container {
 			<div class="row">
 				<h4></h4>
-				<div class="row pre-scrollable">
+
 				<div id="bus" class="col-sm-12" style="padding-left: 20px;width: 440px">
 				</div>
-				</div>
+
 				<h4 ></h4>
 				<div  class="lf">
 					<i class="fa fa-minus " style="color:#5298ff" id="c1"></i>
@@ -234,6 +234,7 @@ body, html, #container {
 			var lng=p.latLng.lng;
 			var lat=p.latLng.lat;
 			map.centerAndZoom(new BMapGL.Point(lng,lat), 17);
+			map.addOverlay(p);
 			a(lng,lat,distance);
 		}
@@ -261,7 +262,7 @@ body, html, #container {
 							Array.prototype.push.apply(bus, arr);
 							var str='';
 							for ( var j in arr) {
-								str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>、";
+								str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>&nbsp;&nbsp;";
 							}
 							var info = "";
@@ -330,7 +331,7 @@ body, html, #container {
 								Array.prototype.push.apply(bus, arr);
 								var str='';
 								for ( var j in arr) {
-									str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>、";
+									str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>&nbsp;&nbsp;";
 								}
 								var info = "";
 								info += "<span>站点名称：" +  data.data[i].stationName
@@ -467,6 +468,15 @@ body, html, #container {
 		map.addEventListener('rightclick', function(e){
 			var pt = e.latlng;
 			var marker = new BMapGL.Marker(new BMapGL.Point(pt.lng, pt.lat));
+			var myicon = new BMapGL.Icon(
+					'http://webmap0.map.bdstatic.com/wolfman/static/common/images/us_cursor_9517a2b.png', // 百度图片
+					new BMapGL.Size(18,26), // 视窗大小
+					{
+						imageSize: new BMapGL.Size(144,92), // 引用图片实际大小
+						imageOffset:new BMapGL.Size(18,22)  // 图片相对视窗的偏移
+					}
+			);
+			marker.setIcon(myicon);
 			map.removeOverlay(p);
 			p=marker;
 			map.addOverlay(p);