youxiw2000 / bsthLineProfiles · Commits

Commit 38d57a3e96e601c6a5175724176bf697d6001bb1

Authored by yiming
1 parent 129c2ac3
build: skipped

bf

Inline Side-by-side
Showing 6 changed files with 44 additions and 40 deletions
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @38d57a3
... ... @@ -1707,11 +1707,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
1707 1707  
1708 1708  
1709 1709 <select id="selectBsthTLineListAndExamine" parameterType="BsthTLine" resultMap="BsthTLineResult">
1710   - select bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line,bsth_t_line_examine
1711   - where bsth_t_line.line_name=bsth_t_line_examine.line_name
  1710 + select bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line left join bsth_t_line_examine
  1711 + on bsth_t_line.line_name=bsth_t_line_examine.line_name
  1712 + <where>
1712 1713 <if test="lineName != null and lineName != ''"> and bsth_t_line.line_name like concat('%', #{lineName}, '%')</if>
1713 1714 <if test="company != null and company != ''"> and bsth_t_line.company = #{company}</if>
1714 1715 <if test="fCompany != null and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if>
  1716 + </where>
1715 1717 </select>
1716 1718  
1717 1719  
... ...
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @38d57a3
... ... @@ -561,9 +561,7 @@
561 561 <label class="col-sm-1 control-label">启用时间：</label>
562 562 <div class="col-sm-2">
563 563 <div class="input-group date">
564   - <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
565   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
566   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  564 + <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
567 565 </div>
568 566 </div></span>
569 567 <!---------------------------------->
... ... @@ -790,9 +788,8 @@
790 788 });
791 789  
792 790 $("input[name='startDate']").datetimepicker({
793   - format : "yyyy-mm-dd",
794   - minView : "month",
795   - autoclose : true
  791 + format: "yyyy-mm-dd hh:ii:ss",
  792 + autoclose: true
796 793 });
797 794  
798 795 $("input[name='isWarrantStartTime']").datetimepicker({
... ...
bsthLineProfiles/src/main/resources/templates/system/line/map.html
  View file @38d57a3
... ... @@ -66,7 +66,7 @@ body, html, #container {
66 66 <body>
67 67 <div class="info" style="width: 450px">
68 68 <ul class="nav nav-tabs" role="tablist">
69   - <li role="presentation" class="active"><a onclick="show('station','road','line','area')" role="tab" data-toggle="tab">站点查询</a></li>
  69 + <li role="presentation" class="active"><a onclick="show('station','road','line','area')" role="tab" data-toggle="tab">地点查询</a></li>
70 70 <li role="presentation"><a onclick="show('road','station','line','area')" role="tab" data-toggle="tab">道路查询</a></li>
71 71 <li role="presentation"><a onclick="show('line','road','station','area')" role="tab" data-toggle="tab">途径线路</a></li>
72 72 <li role="presentation"><a onclick="show('area','road','station','line')" role="tab" data-toggle="tab">区域查询</a></li>
... ... @@ -75,7 +75,7 @@ body, html, #container {
75 75 <form id="station">
76 76 <div class="row">
77 77 <h4></h4>
78   - <label class="col-sm-3"><h4 class="lf">站点</h4></label>
  78 + <label class="col-sm-3"><h4 class="lf">地点</h4></label>
79 79 <div class="col-sm-9" >
80 80 <input type="text" class="form-control" id="stations">
81 81 <div id="searchResultPanel" style="border:1px solid #C0C0C0;width:150px;height:auto; display:none;"></div>
... ... @@ -125,10 +125,10 @@ body, html, #container {
125 125 <div class="row">
126 126 <h4></h4>
127 127 <div class="row pre-scrollable">
128   - <div id="bus" style="padding-left: 25px;width: 440px">
  128 + <div id="bus" class="col-sm-12" style="padding-left: 20px;width: 440px">
129 129 </div>
130 130 </div>
131   - <h4></h4>
  131 + <h4 ></h4>
132 132 <div class="lf">
133 133 <i class="fa fa-minus " style="color:#5298ff" id="c1"></i>
134 134 <i class="fa fa-minus " style="color:#E0312A" id="c2"></i>
... ... @@ -137,6 +137,7 @@ body, html, #container {
137 137 <i class="fa fa-minus " style="color:#0010eb" id="c5"></i>
138 138 </div>
139 139 <h4></h4>
  140 + <h4 class="lf" id="count"></h4>
140 141 <div class="col-sm-4">
141 142 <button type="button" class="el-button el-button--default el-button--mini" onclick="clearline();"><!----><i class="el-icon-refresh"></i><span>清除线路</span></button>
142 143 </div>
... ... @@ -262,6 +263,7 @@ body, html, #container {
262 263 for ( var j in arr) {
263 264 str+="<a onClick='searchBus(\""+arr[j]+"\")'>"+arr[j]+"</a>、";
264 265 }
  266 +
265 267 var info = "";
266 268 info += "<span>站点名称：" + data.data[i].stationName
267 269 + "</span><br/>";
... ... @@ -287,7 +289,7 @@ body, html, #container {
287 289 str+="<a onClick='searchBus(\""+bus[j]+"\")'>"+bus[j]+"</a>、";
288 290 }
289 291 document.getElementById('bus').innerHTML=str;
290   -
  292 + document.getElementById('count').innerHTML='共'+data.data.length+'个站点 &nbsp;&nbsp;&nbsp; 共'+bus.length+'条线路';
291 293 // 绘制圆
292 294 var circle = new BMapGL.Circle(new BMapGL.Point(lng,lat), distance/2, {
293 295 strokeColor: 'blue',
... ... @@ -306,6 +308,7 @@ body, html, #container {
306 308 + distance / 1000, function(data) {
307 309 if (data.code == "200") {
308 310 var bus=new Array();
  311 + var c=0;
309 312 for ( var i in data.data) {
310 313 (function(){
311 314 var station = data.data[i];
... ... @@ -321,6 +324,7 @@ body, html, #container {
321 324  
322 325  
323 326 if(data.data[i].roadName==roadName){
  327 + c++;
324 328 var lineList=data.data[i].lineList;
325 329 var arr=lineList.split("、");
326 330 Array.prototype.push.apply(bus, arr);
... ... @@ -356,6 +360,9 @@ body, html, #container {
356 360 for ( var j in bus) {
357 361 str+="<a onClick='searchBus(\""+bus[j]+"\")'>"+bus[j]+"</a>、";
358 362 }
  363 +
  364 + document.getElementById('count').innerHTML=' 共'+c+'个站点 &nbsp;&nbsp;&nbsp; 共'+bus.length+'条线路';
  365 +
359 366 document.getElementById('bus').innerHTML=str;
360 367 }
361 368 });
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @38d57a3
... ... @@ -474,11 +474,8 @@
474 474 <label class="col-sm-1 control-label">启用时间：</label>
475 475 <div class="col-sm-2">
476 476 <div class="input-group date">
477   - <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
478   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
479   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  477 + <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
480 478 </div>
481   -
482 479 </div>
483 480 <!---------------------------------->
484 481 <label class="col-sm-1 control-label">备注：</label>
... ... @@ -686,9 +683,8 @@
686 683 });
687 684  
688 685 $("input[name='startDate']").datetimepicker({
689   - format : "yyyy-mm-dd",
690   - minView : "month",
691   - autoclose : true
  686 + format: "yyyy-mm-dd hh:ii:ss",
  687 + autoclose: true
692 688 });
693 689  
694 690 $("input[name='isWarrantStartTime']").datetimepicker({
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @38d57a3
... ... @@ -486,11 +486,8 @@
486 486 <label class="col-sm-1 control-label">启用时间：</label>
487 487 <div class="col-sm-2">
488 488 <div class="input-group date">
489   - <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
490   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
491   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  489 + <input name="startDate" type="text" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
492 490 </div>
493   -
494 491 </div>
495 492 <!---------------------------------->
496 493 <label class="col-sm-1 control-label">备注：</label>
... ... @@ -727,9 +724,8 @@
727 724 });
728 725  
729 726 $("input[name='startDate']").datetimepicker({
730   - format : "yyyy-mm-dd",
731   - minView : "month",
732   - autoclose : true
  727 + format: "yyyy-mm-dd hh:ii:ss",
  728 + autoclose: true
733 729 });
734 730 $("input[name='isWarrantStartTime']").datetimepicker({
735 731 format : "yyyy-mm-dd",
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @38d57a3
... ... @@ -3,14 +3,21 @@
3 3 xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
4 4 <head>
5 5 <th:block th:include="include :: header('线路档案信息')"/>
  6 + <style>
  7 + .container-div {
  8 + background: white;
  9 + box-sizing: content-box;
  10 + padding: 28px 28px 0px 28px;
  11 + height: 230%;
  12 + }
  13 + </style>
6 14 </head>
7 15 <body class="gray-bg">
8   -<div class="info col-lg-12">
  16 +<div class="info col-md-6 col-md-offset-3" style="padding-top:30px;">
9 17 <div class="input-group">
10   - <input type="text" class="form-control" id="text" placeholder="请选择">
  18 + <input type="text" class="form-control" id="text" placeholder="请输入线路名">
11 19 <div class="input-group-btn">
12   - <button type="button" class="btn btn-white dropdown-toggle"
13   - data-toggle="dropdown">
  20 + <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
14 21 <span class="caret"></span>
15 22 </button>
16 23 <ul class="dropdown-menu dropdown-menu-right" role="menu">
... ... @@ -813,21 +820,20 @@
813 820 methods: {
814 821 change(index) {
815 822 this.tab='first';//每次点击默认选中第一个
816   - //变更前后数据不同标红
817 823 var l;
818 824 var ol;
  825 + //所有字段改为默认样式
  826 + this.line = this.lines[index];
  827 + l = this.line;
  828 + for (let f in l) {
  829 + $('#'+f).attr('style',"color:#303133");
  830 + }
  831 + //新辟
819 832 if (index == 0) {
820 833 this.oldLine = null;
821   - this.line = this.lines[index];
822   - l = this.line;
823   - for (let f in l) {
824   - $('#'+f).attr('style',"color:#303133");
825   - }
826   - } else {
  834 + } else {//变更的数据标红
827 835 this.oldLine = this.lines[index - 1];
828 836 ol = this.oldLine;
829   - this.line = this.lines[index];
830   - l = this.line;
831 837 if (ol != null) {
832 838 for (let f in l) {
833 839 if (l[f] != ol[f]) {
... ...