加入车辆黑白名单

WebService/src/main/resources/components/carBlackWhitePackage/add-carBlackWhite/addCarBlackWhite.js

@@ -28,7 +28,7 @@
         },
         methods: {
             _initAddCarBlackWhiteDateInfo: function () {
-                vc.component.addApplicationKeyInfo.startTime = vc.dateFormat(new Date().getTime());
+                vc.component.addCarBlackWhiteInfo.startTime = vc.dateFormat(new Date().getTime());
                 $('.addCarBlackWhiteStartTime').datetimepicker({
                     language: 'zh-CN',
                     format: 'yyyy-mm-dd hh:ii:ss',

WebService/src/main/resources/components/carBlackWhitePackage/carBlackWhite-manage/carBlackWhiteManage.html

@@ -5,27 +5,36 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<select class="custom-select" v-model="carBlackWhiteManageInfo.conditions.blackWhite">
-         <option selected  value="">请选择名单类型</option>
-         <option  value="1111">黑名单</option>
-<option  value="2222">白名单</option>
-  </select>                        </div><div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入车牌号" v-model="carBlackWhiteManageInfo.conditions.carNum" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入名单ID" v-model="carBlackWhiteManageInfo.conditions.bwId" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryCarBlackWhiteMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                        <div class="col-sm-4">
+                            <select class="custom-select" v-model="carBlackWhiteManageInfo.conditions.blackWhite">
+                                <option selected value="">请选择名单类型</option>
+                                <option value="1111">黑名单</option>
+                                <option value="2222">白名单</option>
+                            </select></div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入车牌号"
+                                       v-model="carBlackWhiteManageInfo.conditions.carNum" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入名单ID"
+                                       v-model="carBlackWhiteManageInfo.conditions.bwId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryCarBlackWhiteMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -40,7 +49,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddCarBlackWhiteModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加黑白名单
+                            添加
                         </button>
                     </div>
                 </div>
@@ -51,7 +60,7 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">黑白名单ID</th>
+                            <th class="text-center">黑白名单ID</th>
                             <th class="text-center">名单类型</th>
                             <th class="text-center">车牌号</th>
                             <th class="text-center">开始时间</th>
@@ -63,17 +72,23 @@
                         </thead>
                         <tbody>
                         <tr v-for="carBlackWhite in carBlackWhiteManageInfo.carBlackWhites">
-                                                        <td class="text-center">{{carBlackWhite.bwId}}</td>
+                            <td class="text-center">{{carBlackWhite.bwId}}</td>
                             <td class="text-center">{{carBlackWhite.blackWhite}}</td>
                             <td class="text-center">{{carBlackWhite.carNum}}</td>
                             <td class="text-center">{{carBlackWhite.startTime}}</td>
                             <td class="text-center">{{carBlackWhite.endTime}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditCarBlackWhiteModel(carBlackWhite)">修改</button>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditCarBlackWhiteModel(carBlackWhite)">修改
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteCarBlackWhiteModel(carBlackWhite)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteCarBlackWhiteModel(carBlackWhite)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -92,7 +107,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addCarBlackWhite"
                callBackListener=""

WebService/src/main/resources/components/carBlackWhitePackage/edit-carBlackWhite/editCarBlackWhite.html

@@ -1,42 +1,50 @@
-<div id = "editCarBlackWhiteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editCarBlackWhiteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">修改黑白名单</h3>
+                <h3 class="m-t-none m-b ">修改名单</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">名单类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editCarBlackWhiteInfo.blackWhite">
-         <option selected  disabled value="">必填，请选择名单类型</option>
-         <option  value="1111">黑名单</option>
-<option  value="2222">白名单</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">车牌号</label>
-         <div class="col-sm-10">
-           <input v-model="editCarBlackWhiteInfo.carNum"                   type="text" placeholder="必填，请填写车牌号" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">开始时间</label>
-         <div class="col-sm-10">
-           <input v-model="editCarBlackWhiteInfo.startTime"                   type="text" placeholder="必填，请填写开始时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">结束时间</label>
-         <div class="col-sm-10">
-           <input v-model="editCarBlackWhiteInfo.endTime"                   type="text" placeholder="必填，请填写结束时间" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">名单类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editCarBlackWhiteInfo.blackWhite">
+                                        <option selected disabled value="">必填，请选择名单类型</option>
+                                        <option value="1111">黑名单</option>
+                                        <option value="2222">白名单</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">车牌号</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editCarBlackWhiteInfo.carNum" type="text" placeholder="必填，请填写车牌号"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">开始时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editCarBlackWhiteInfo.startTime" type="text"
+                                           placeholder="必填，请填写开始时间" class="form-control editCarBlackWhiteStartTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">结束时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editCarBlackWhiteInfo.endTime" type="text" placeholder="必填，请填写结束时间"
+                                           class="form-control editCarBlackWhiteEndTime">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editCarBlackWhite()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editCarBlackWhite()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>