Przeglądaj źródła

优化停车位显示不是为中文问题

吴学文 6 lat temu
rodzic
commit
33c072df1a

+ 2 - 1
WebService/src/main/resources/components/parkingSpacePackage/search-parkingSpace/searchParkingSpace.html

@@ -54,7 +54,8 @@
                                             {{parkingSpace.typeCd == '1001'?'地上停车位':'地下停车位'}}
                                             {{parkingSpace.typeCd == '1001'?'地上停车位':'地下停车位'}}
                                         </td>
                                         </td>
                                         <td>
                                         <td>
-                                            {{vc.component._viewParkingSpaceState(parkingSpace.state)}}
+                                           <!-- {{vc.component._viewParkingSpaceState(parkingSpace.state)}}-->
+                                            {{parkingSpace.stateName}}
                                         </td>
                                         </td>
                                         <td>
                                         <td>
                                             {{parkingSpace.area}}
                                             {{parkingSpace.area}}

+ 1 - 1
WebService/src/main/resources/components/parkingSpacePackage/view-select-parkingSpace/viewSelectParkingSpace.html

@@ -36,7 +36,7 @@
                     <div class="col-sm-4">
                     <div class="col-sm-4">
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-form-label" >车位状态:</label>
                             <label class="col-form-label" >车位状态:</label>
-                            <label class="">{{parkingSpaceInfo.state}}</label>
+                            <label class="">{{parkingSpaceInfo.stateName}}</label>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-4">
                     <div class="col-sm-4">

+ 1 - 0
WebService/src/main/resources/components/parkingSpacePackage/view-select-parkingSpace/viewSelectParkingSpace.js

@@ -15,6 +15,7 @@
                 typeCd:'',
                 typeCd:'',
                 area:'',
                 area:'',
                 state:'',
                 state:'',
+                stateName:'',
                 remark:'',
                 remark:'',
                 psId:''
                 psId:''
             }
             }

+ 2 - 2
WebService/src/main/resources/components/roomPackage/addRoomView/addRoomView.html

@@ -68,9 +68,9 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="form-group row">
                 <div class="form-group row">
-                    <label class="col-sm-2 col-form-label">房屋单价(万)</label>
+                    <label class="col-sm-2 col-form-label">房屋单价</label>
                     <div class="col-sm-10">
                     <div class="col-sm-10">
-                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="请填写房屋单价! 万元"
+                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="请填写房屋单价(元)"
                                class="form-control">
                                class="form-control">
                     </div>
                     </div>
                 </div>
                 </div>

+ 4 - 4
WebService/src/main/resources/components/roomPackage/sell-room-select-room/sellRoomSelectRoom.html

@@ -25,7 +25,7 @@
                     <div class="col-sm-4">
                     <div class="col-sm-4">
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-form-label" >单元:</label>
                             <label class="col-form-label" >单元:</label>
-                            <label class="">{{roomInfo.unitNum}}</label>
+                            <label class="">{{roomInfo.unitNum}}单元</label>
                         </div>
                         </div>
                     </div>
                     </div>
 
 
@@ -35,7 +35,7 @@
                     <div class="col-sm-4">
                     <div class="col-sm-4">
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-form-label" >楼层:</label>
                             <label class="col-form-label" >楼层:</label>
-                            <label class="">{{roomInfo.layer}}</label>
+                            <label class="">{{roomInfo.layer}}</label>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-4">
                     <div class="col-sm-4">
@@ -56,13 +56,13 @@
                     <div class="col-sm-4">
                     <div class="col-sm-4">
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-form-label" >建筑面积:</label>
                             <label class="col-form-label" >建筑面积:</label>
-                            <label class="">{{roomInfo.builtUpArea}}</label>
+                            <label class="">{{roomInfo.builtUpArea}}平方米</label>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-4">
                     <div class="col-sm-4">
                         <div class="form-group">
                         <div class="form-group">
                             <label class="col-form-label">单价:</label>
                             <label class="col-form-label">单价:</label>
-                            <label class="">{{roomInfo.unitPrice}}</label>
+                            <label class="">{{roomInfo.unitPrice}}</label>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-4">
                     <div class="col-sm-4">

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/ParkingSpaceDto.java

@@ -19,6 +19,7 @@ public class ParkingSpaceDto extends PageDto implements Serializable {
     private String psId;
     private String psId;
     private String remark;
     private String remark;
     private String state;
     private String state;
+    private String stateName;
     private String communityId;
     private String communityId;
     private String userId;
     private String userId;
 
 
@@ -129,4 +130,12 @@ public class ParkingSpaceDto extends PageDto implements Serializable {
     public void setPsIds(String[] psIds) {
     public void setPsIds(String[] psIds) {
         this.psIds = psIds;
         this.psIds = psIds;
     }
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }
 }

+ 9 - 0
java110-bean/src/main/java/com/java110/vo/api/ApiParkingSpaceDataVo.java

@@ -19,6 +19,7 @@ public class ApiParkingSpaceDataVo extends Vo {
     private String num;
     private String num;
     private String psId;
     private String psId;
     private String state;
     private String state;
+    private String stateName;
     private String communityId;
     private String communityId;
     private String userId;
     private String userId;
 
 
@@ -145,4 +146,12 @@ public class ApiParkingSpaceDataVo extends Vo {
     public void setCarType(String carType) {
     public void setCarType(String carType) {
         this.carType = carType;
         this.carType = carType;
     }
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }
 }

+ 6 - 2
java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml

@@ -111,10 +111,14 @@
             t.b_id,
             t.b_id,
             t.b_id bId,
             t.b_id bId,
             t.user_id,
             t.user_id,
-            t.user_id userId
+            t.user_id userId,
+            td.name stateName
         FROM
         FROM
-          p_parking_space t
+          p_parking_space t,t_dict td
         <where>
         <where>
+            t.state = td.status_cd
+            and td.table_name='p_parking_space'
+            and td.table_columns='state'
             <if test="area !=null and area != ''">
             <if test="area !=null and area != ''">
                 and t.area= #{area}
                 and t.area= #{area}
             </if>
             </if>