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

1、启用日期改成可以选时分选项，改成html5的原生日期控件 type=datetime_local 2、list页面里启用日期加上时分显示

修改车辆设备信息管理功能
1、启用日期改成可以选时分选项，改成html5的原生日期控件 type=datetime_local 2、list页面里启用日期加上时分显示
徐烜
1 parent 1e836b92
Showing 5 changed files with 89 additions and 69 deletions
src/main/resources/static/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
@@ -61,9 +61,9 @@
 			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
 			rel="stylesheet" type="text/css" />
 	<!-- table 表格控件 -->
-	<link rel="stylesheet"
-		  href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
-		  type="text/css" />
+	<!--<link rel="stylesheet"-->
+		  <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
+		  <!--type="text/css" />-->
 	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
 	<!-- handsontable样式 -->
 	<link rel="stylesheet"
@@ -612,24 +612,24 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
-<script
-		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
-		data-exclude=1></script>
-<script
-		src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
-		data-exclude=1></script>
+<!--<script-->
+		<!--src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"-->
+		<!--data-exclude=1></script>-->
+<!--<script-->
+		<!--src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"-->
+		<!--data-exclude=1></script>-->
+<!--<script type="text/javascript"-->
+		<!--src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"-->
+		<!--data-exclude=1></script>-->
+<!--<script type="text/javascript"-->
+		<!--src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "-->
+		<!--data-exclude=1></script>-->
 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
 <!-- 高德  -->
-<script
-		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
-		data-exclude=1></script>
+<!--<script-->
+		<!--src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"-->
+		<!--data-exclude=1></script>-->
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
@@ -98,7 +98,7 @@
                     <label class="col-md-2 control-label">启用日期*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
-                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日"
+                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
                                ng-model="ctrl.deviceInfoForDetail.qyrq" readonly/>
                     </div>
                 </div>
@@ -82,13 +82,8 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">旧终端号*：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control"
-                               name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
-                               required placeholder="请输入旧终端号"/>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
-                        旧终端号必须填写
+                        <input type="text" class="form-control" name="oldDeviceNo"
+                               ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
                     </div>
                 </div>
@@ -143,31 +138,40 @@
                     </div>
                 </div>
+                <!--<div class="form-group has-success has-feedback">-->
+                    <!--<label class="col-md-2 control-label">启用日期*：</label>-->
+                    <!--<div class="col-md-3">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="text" class="form-control"-->
+                                   <!--name="qyrq" placeholder="请选择启用日期..."-->
+                                   <!--uib-datepicker-popup="yyyy年MM月dd日"-->
+                                   <!--is-open="ctrl.qyrqOpen" required-->
+                                   <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="cde1"-->
+                                   <!--remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
+                                    <!--<i class="glyphicon glyphicon-calendar"></i>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
+                        <!--启用日期必须选择-->
+                    <!--</div>-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
+                <!--</div>-->
+
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">启用日期*：</label>
                     <div class="col-md-3">
-                        <div class="input-group">
-                            <input type="text" class="form-control"
-                                   name="qyrq" placeholder="请选择启用日期..."
-                                   uib-datepicker-popup="yyyy年MM月dd日"
-                                   is-open="ctrl.qyrqOpen" required
-                                   ng-model="ctrl.deviceInfoForSave.qyrq" readonly
-                                   remote-Validation
-                                   remotevtype="cde1"
-                                   remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
-                                    <i class="glyphicon glyphicon-calendar"></i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        启用日期必须选择
-                    </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        {{$remote_msg}}
+                        <input type="text" class="form-control"
+                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
+                               ng-model="ctrl.deviceInfoForSave.qyrq" readonly/>
                     </div>
                 </div>
@@ -82,13 +82,8 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">旧终端号*：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control"
-                               name="oldDeviceNo" ng-model="ctrl.deviceInfoForSave.oldDeviceNo"
-                               required placeholder="请输入旧终端号"/>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.oldDeviceNo.$error.required">
-                        旧终端号必须填写
+                        <input type="text" class="form-control" name="oldDeviceNo"
+                               ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
                     </div>
                 </div>
@@ -143,23 +138,44 @@
                     </div>
                 </div>
+                <!--<div class="form-group has-success has-feedback">-->
+                    <!--<label class="col-md-2 control-label">启用日期*：</label>-->
+                    <!--<div class="col-md-3">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="text" class="form-control"-->
+                                   <!--name="qyrq" placeholder="请选择启用日期..."-->
+                                   <!--uib-datepicker-popup="yyyy年MM月dd日 hh:mm:ss"-->
+                                   <!--is-open="ctrl.qyrqOpen" required-->
+                                   <!--ng-model="ctrl.deviceInfoForSave.qyrq" readonly-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="cde1"-->
+                                   <!--remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>-->
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">-->
+                                    <!--<i class="glyphicon glyphicon-calendar"></i>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
+                        <!--启用日期必须选择-->
+                    <!--</div>-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
+                <!--</div>-->
+
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">启用日期*：</label>
+                    <label class="col-md-2 control-label">启用日期：</label>
                     <div class="col-md-3">
                         <div class="input-group">
-                            <input type="text" class="form-control"
-                                   name="qyrq" placeholder="请选择启用日期..."
-                                   uib-datepicker-popup="yyyy年MM月dd日"
-                                   is-open="ctrl.qyrqOpen" required
-                                   ng-model="ctrl.deviceInfoForSave.qyrq" readonly
+                            <input type="datetime-local" class="form-control" name="qyrq"
+                                   ng-model="ctrl.deviceInfoForSave.qyrq"
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
-                                    <i class="glyphicon glyphicon-calendar"></i>
-                                </button>
-                            </span>
+                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
+
                         </div>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -7,7 +7,7 @@
                 <th style="width: 70px;">序号</th>
                 <th style="width: 15%;">线路名称</th>
                 <th style="width: 10%;">内部编号</th>
-                <th style="width: 100px;">启用日期</th>
+                <th style="width: 160px;">启用日期</th>
                 <th>旧设备编号</th>
                 <th>新设备编号</th>
                 <th style="width: 180px;">操作人/操作时间</th>
@@ -71,7 +71,7 @@
                     <span ng-bind="info.clZbh"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.qyrq | date:'yyyy-MM-dd'"></span>
+                    <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm'"></span>
                 </td>
                 <td>
                     <span ng-bind="info.oldDeviceNo"></span>