Explorar el Código

优化停车场功

wuxw hace 6 años
padre
commit
4408eba6e0

+ 0 - 1
Api/src/main/java/com/java110/api/listener/parkingArea/SaveParkingAreaListener.java

@@ -31,7 +31,6 @@ public class SaveParkingAreaListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "num", "必填,请填写停车场编号");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填,请填写小区信息");
         Assert.hasKeyAndValue(reqJson, "typeCd", "必填,请选择停车场类型");
-        Assert.hasKeyAndValue(reqJson, "remark", "必填,请填写备注");
 
     }
 

+ 0 - 1
Api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java

@@ -29,7 +29,6 @@ public class UpdateParkingAreaListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "num", "必填,请填写停车场编号");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填,请填写小区信息");
         Assert.hasKeyAndValue(reqJson, "typeCd", "必填,请选择停车场类型");
-        Assert.hasKeyAndValue(reqJson, "remark", "必填,请填写备注");
 
     }
 

+ 0 - 1
WebService/src/main/java/com/java110/web/smo/parkingArea/impl/AddParkingAreaSMOImpl.java

@@ -33,7 +33,6 @@ public class AddParkingAreaSMOImpl extends AbstractComponentSMO implements IAddP
         Assert.hasKeyAndValue(paramIn, "num", "必填,请填写停车场编号");
         Assert.hasKeyAndValue(paramIn, "communityId", "必填,请填写小区信息");
         Assert.hasKeyAndValue(paramIn, "typeCd", "必填,请选择停车场类型");
-        Assert.hasKeyAndValue(paramIn, "remark", "必填,请填写备注");
 
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_PARKINGAREA);

+ 0 - 1
WebService/src/main/java/com/java110/web/smo/parkingArea/impl/EditParkingAreaSMOImpl.java

@@ -31,7 +31,6 @@ public class EditParkingAreaSMOImpl extends AbstractComponentSMO implements IEdi
         Assert.hasKeyAndValue(paramIn, "communityId", "必填,请填写小区信息");
         Assert.hasKeyAndValue(paramIn, "num", "必填,请填写停车场编号");
         Assert.hasKeyAndValue(paramIn, "typeCd", "必填,请选择停车场类型");
-        Assert.hasKeyAndValue(paramIn, "remark", "必填,请填写备注");
 
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST__PARKINGAREA);

+ 3 - 7
WebService/src/main/resources/components/parkingAreaPackage/add-parkingArea/addParkingArea.js

@@ -51,14 +51,10 @@
                         errInfo: "停车场类型格式错误"
                     },
                     ],
-                    'addParkingAreaInfo.remark': [{
-                        limit: "required",
-                        param: "",
-                        errInfo: "备注不能为空"
-                    },
+                    'addParkingAreaInfo.remark': [
                     {
-                        limit: "maxin",
-                        param: "1,4000",
+                        limit: "maxLength",
+                        param: "4000",
                         errInfo: "备注太长"
                     },
                     ],

+ 23 - 19
WebService/src/main/resources/components/parkingAreaPackage/choose-parkingArea/chooseParkingArea.html

@@ -1,4 +1,5 @@
-<div id = "chooseParkingAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseParkingAreaModelLabel" aria-hidden="true" >
+<div id="chooseParkingAreaModel" class="modal fade" tabindex="-1" role="dialog"
+     aria-labelledby="chooseParkingAreaModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
@@ -17,9 +18,12 @@
                                 </div>
                                 <div class="col-sm-5">
                                     <div class="input-group">
-                                        <input placeholder="输入停车场名称" type="text" v-model="chooseParkingAreaInfo._currentParkingAreaName" class="form-control form-control-sm">
+                                        <input placeholder="输入停车场名称" type="text"
+                                               v-model="chooseParkingAreaInfo._currentParkingAreaName"
+                                               class="form-control form-control-sm">
                                         <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryParkingAreas()">查询</button>
+                                                <button type="button" class="btn btn-sm btn-primary"
+                                                        v-on:click="queryParkingAreas()">查询</button>
                                             </span>
                                     </div>
                                 </div>
@@ -27,26 +31,26 @@
                             <div class="table-responsive" style="margin-top:15px">
                                 <table class="table table-striped">
                                     <thead>
-                                        <tr>
-                                                                        <th class="text-center">停车场ID</th>
-                            <th class="text-center">停车场编号</th>
-                            <th class="text-center">停车场类型</th>
-                            <th class="text-center">备注</th>
-                            <th class="text-center">操作</th>
+                                    <tr>
+                                        <th class="text-center">停车场ID</th>
+                                        <th class="text-center">停车场编号</th>
+                                        <th class="text-center">停车场类型</th>
+                                        <th class="text-center">操作</th>
 
-                                        </tr>
+                                    </tr>
                                     </thead>
                                     <tbody>
-                                        <tr v-for="parkingArea in chooseParkingAreaInfo.parkingAreas">
-                                                                        <td class="text-center">{{parkingArea.paId}}</td>
-                            <td class="text-center">{{parkingArea.num}}</td>
-                            <td class="text-center">{{parkingArea.typeCd}}</td>
-                            <td class="text-center">{{parkingArea.remark}}</td>
+                                    <tr v-for="parkingArea in chooseParkingAreaInfo.parkingAreas">
+                                        <td class="text-center">{{parkingArea.paId}}</td>
+                                        <td class="text-center">{{parkingArea.num}}</td>
+                                        <td class="text-center">{{parkingArea.typeCd}}</td>
 
-                                            <td>
-                                                <button class="btn btn-primary btn-xs" v-on:click="chooseParkingArea(parkingArea)">选择</button>
-                                            </td>
-                                        </tr>
+                                        <td>
+                                            <button class="btn btn-primary btn-xs"
+                                                    v-on:click="chooseParkingArea(parkingArea)">选择
+                                            </button>
+                                        </td>
+                                    </tr>
                                     </tbody>
                                 </table>
                             </div>

+ 3 - 7
WebService/src/main/resources/components/parkingAreaPackage/edit-parkingArea/editParkingArea.js

@@ -50,14 +50,10 @@
                         errInfo: "停车场类型格式错误"
                     },
                     ],
-                    'editParkingAreaInfo.remark': [{
-                        limit: "required",
-                        param: "",
-                        errInfo: "备注不能为空"
-                    },
+                    'editParkingAreaInfo.remark': [
                     {
-                        limit: "maxin",
-                        param: "1,4000",
+                        limit: "maxLength",
+                        param: "4000",
                         errInfo: "备注太长"
                     },
                     ],

+ 1 - 1
WebService/src/main/resources/components/parkingSpacePackage/list-parking-space/listParkingSpace.js

@@ -50,7 +50,7 @@
                         num: vc.component.listParkingSpaceInfo.num,
                         psId: vc.component.listParkingSpaceInfo.conditions.psId,
                         area: vc.component.listParkingSpaceInfo.conditions.area,
-                        typeCd: vc.component.listParkingSpaceInfo.conditions.typeCd
+                        paId: vc.component.listParkingSpaceInfo.conditions.paId
                     }
                 }