潘钊 / bsth_control · Commits

Commit 83209d591b559f2491ea04d19a2eded12ed3216b

Authored by 徐烜
1 parent 1e836b92
build: skipped

修改车辆设备信息管理功能 

1、启用日期改成可以选时分选项，改成html5的原生日期控件 type=datetime_local
2、list页面里启用日期加上时分显示
Inline Side-by-side
Showing 5 changed files with 89 additions and 69 deletions
src/main/resources/static/index.html
  View file @83209d5
... ... @@ -61,9 +61,9 @@
61 61 href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
62 62 rel="stylesheet" type="text/css" />
63 63 <!-- table 表格控件 -->
64   - <link rel="stylesheet"
65   - href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
66   - type="text/css" />
  64 + <!--<link rel="stylesheet"-->
  65 + <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
  66 + <!--type="text/css" />-->
67 67 <link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
68 68 <!-- handsontable样式 -->
69 69 <link rel="stylesheet"
... ... @@ -612,24 +612,24 @@
612 612  
613 613 <!-- 地图相关 -->
614 614 <!-- 百度 -->
615   -<script
616   - src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
617   - data-exclude=1></script>
618   -<script
619   - src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
620   - data-exclude=1></script>
621   -<script type="text/javascript"
622   - src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
623   - data-exclude=1></script>
624   -<script type="text/javascript"
625   - src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
626   - data-exclude=1></script>
  615 +<!--<script-->
  616 + <!--src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"-->
  617 + <!--data-exclude=1></script>-->
  618 +<!--<script-->
  619 + <!--src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"-->
  620 + <!--data-exclude=1></script>-->
  621 +<!--<script type="text/javascript"-->
  622 + <!--src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"-->
  623 + <!--data-exclude=1></script>-->
  624 +<!--<script type="text/javascript"-->
  625 + <!--src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "-->
  626 + <!--data-exclude=1></script>-->
627 627 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
628 628 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
629 629 <!-- 高德 -->
630   -<script
631   - src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
632   - data-exclude=1></script>
  630 +<!--<script-->
  631 + <!--src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"-->
  632 + <!--data-exclude=1></script>-->
633 633  
634 634 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
635 635  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html
  View file @83209d5
... ... @@ -98,7 +98,7 @@
98 98 <label class="col-md-2 control-label">启用日期*：</label>
99 99 <div class="col-md-3">
100 100 <input type="text" class="form-control"
101   - name="qyrq" uib-datepicker-popup="yyyy年MM月dd日"
  101 + name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
102 102 ng-model="ctrl.deviceInfoForDetail.qyrq" readonly/>
103 103 </div>
104 104 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
  View file @83209d5
... ... @@ -82,13 +82,8 @@
82 82 <div class="form-group has-success has-feedback">
83 83 <label class="col-md-2 control-label">旧终端号*：</label>
84 84 <div class="col-md-3">
85   - <input type="text" class="form-control"
86   - name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
87   - required placeholder="请输入旧终端号"/>
88   - </div>
89   - <!-- 隐藏块，显示验证信息 -->
90   - <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
91   - 旧终端号必须填写
  85 + <input type="text" class="form-control" name="oldDeviceNo"
  86 + ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
92 87 </div>
93 88 </div>
94 89  
... ... @@ -143,31 +138,40 @@
143 138 </div>
144 139 </div>
145 140  
  141 + <!--<div class="form-group has-success has-feedback">-->
  142 + <!--<label class="col-md-2 control-label">启用日期*：</label>-->
  143 + <!--<div class="col-md-3">-->
  144 + <!--<div class="input-group">-->
  145 + <!--<input type="text" class="form-control"-->
  146 + <!--name="qyrq" placeholder="请选择启用日期..."-->
  147 + <!--uib-datepicker-popup="yyyy年MM月dd日"-->
  148 + <!--is-open="ctrl.qyrqOpen" required-->
  149 + <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
  150 + <!--remote-Validation-->
  151 + <!--remotevtype="cde1"-->
  152 + <!--remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
  153 + <!--<span class="input-group-btn">-->
  154 + <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
  155 + <!--<i class="glyphicon glyphicon-calendar"></i>-->
  156 + <!--</button>-->
  157 + <!--</span>-->
  158 + <!--</div>-->
  159 + <!--</div>-->
  160 + <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
  161 + <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
  162 + <!--启用日期必须选择-->
  163 + <!--</div>-->
  164 + <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
  165 + <!--{{$remote_msg}}-->
  166 + <!--</div>-->
  167 + <!--</div>-->
  168 +
146 169 <div class="form-group has-success has-feedback">
147 170 <label class="col-md-2 control-label">启用日期*：</label>
148 171 <div class="col-md-3">
149   - <div class="input-group">
150   - <input type="text" class="form-control"
151   - name="qyrq" placeholder="请选择启用日期..."
152   - uib-datepicker-popup="yyyy年MM月dd日"
153   - is-open="ctrl.qyrqOpen" required
154   - ng-model="ctrl.deviceInfoForSave.qyrq" readonly
155   - remote-Validation
156   - remotevtype="cde1"
157   - remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
158   - <span class="input-group-btn">
159   - <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
160   - <i class="glyphicon glyphicon-calendar"></i>
161   - </button>
162   - </span>
163   - </div>
164   - </div>
165   - <!-- 隐藏块，显示验证信息 -->
166   - <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
167   - 启用日期必须选择
168   - </div>
169   - <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
170   - {{$remote_msg}}
  172 + <input type="text" class="form-control"
  173 + name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
  174 + ng-model="ctrl.deviceInfoForSave.qyrq" readonly/>
171 175 </div>
172 176 </div>
173 177  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
  View file @83209d5
... ... @@ -82,13 +82,8 @@
82 82 <div class="form-group has-success has-feedback">
83 83 <label class="col-md-2 control-label">旧终端号*：</label>
84 84 <div class="col-md-3">
85   - <input type="text" class="form-control"
86   - name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
87   - required placeholder="请输入旧终端号"/>
88   - </div>
89   - <!-- 隐藏块，显示验证信息 -->
90   - <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
91   - 旧终端号必须填写
  85 + <input type="text" class="form-control" name="oldDeviceNo"
  86 + ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
92 87 </div>
93 88 </div>
94 89  
... ... @@ -143,23 +138,44 @@
143 138 </div>
144 139 </div>
145 140  
  141 + <!--<div class="form-group has-success has-feedback">-->
  142 + <!--<label class="col-md-2 control-label">启用日期*：</label>-->
  143 + <!--<div class="col-md-3">-->
  144 + <!--<div class="input-group">-->
  145 + <!--<input type="text" class="form-control"-->
  146 + <!--name="qyrq" placeholder="请选择启用日期..."-->
  147 + <!--uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"-->
  148 + <!--is-open="ctrl.qyrqOpen" required-->
  149 + <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
  150 + <!--remote-Validation-->
  151 + <!--remotevtype="cde1"-->
  152 + <!--remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
  153 + <!--<span class="input-group-btn">-->
  154 + <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
  155 + <!--<i class="glyphicon glyphicon-calendar"></i>-->
  156 + <!--</button>-->
  157 + <!--</span>-->
  158 + <!--</div>-->
  159 + <!--</div>-->
  160 + <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
  161 + <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
  162 + <!--启用日期必须选择-->
  163 + <!--</div>-->
  164 + <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
  165 + <!--{{$remote_msg}}-->
  166 + <!--</div>-->
  167 + <!--</div>-->
  168 +
146 169 <div class="form-group has-success has-feedback">
147   - <label class="col-md-2 control-label">启用日期*：</label>
  170 + <label class="col-md-2 control-label">启用日期：</label>
148 171 <div class="col-md-3">
149 172 <div class="input-group">
150   - <input type="text" class="form-control"
151   - name="qyrq" placeholder="请选择启用日期..."
152   - uib-datepicker-popup="yyyy年MM月dd日"
153   - is-open="ctrl.qyrqOpen" required
154   - ng-model="ctrl.deviceInfoForSave.qyrq" readonly
  173 + <input type="datetime-local" class="form-control" name="qyrq"
  174 + ng-model="ctrl.deviceInfoForSave.qyrq"
155 175 remote-Validation
156 176 remotevtype="cde1"
157   - remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
158   - <span class="input-group-btn">
159   - <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
160   - <i class="glyphicon glyphicon-calendar"></i>
161   - </button>
162   - </span>
  177 + remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
  178 +
163 179 </div>
164 180 </div>
165 181 <!-- 隐藏块，显示验证信息 -->
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
  View file @83209d5
... ... @@ -7,7 +7,7 @@
7 7 <th style="width: 70px;">序号</th>
8 8 <th style="width: 15%;">线路名称</th>
9 9 <th style="width: 10%;">内部编号</th>
10   - <th style="width: 100px;">启用日期</th>
  10 + <th style="width: 160px;">启用日期</th>
11 11 <th>旧设备编号</th>
12 12 <th>新设备编号</th>
13 13 <th style="width: 180px;">操作人/操作时间</th>
... ... @@ -71,7 +71,7 @@
71 71 <span ng-bind="info.clZbh"></span>
72 72 </td>
73 73 <td>
74   - <span ng-bind="info.qyrq | date:'yyyy-MM-dd'"></span>
  74 + <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm'"></span>
75 75 </td>
76 76 <td>
77 77 <span ng-bind="info.oldDeviceNo"></span>
... ...