Merge branch 'master' of http://47.92.161.104:10080/yanliming/jp-charging-station-portal

src/views/charging/chargingDevice-status.vue

@@ -112,6 +112,12 @@
                       <font color="gray"><el-input v-model="item.customNo" size="mini"/></font>
                     </td>
                   </tr>
+                  <tr>
+                    <td>车位号：</td>
+                    <td>
+                      <font color="gray"><el-input v-model="item.parkingNo" size="mini"/></font>
+                    </td>
+                  </tr>
                   <tr>
                     <td>充电枪编号：</td>
                     <td>

src/views/charging/floorLock-detail.vue

@@ -13,7 +13,7 @@
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'150px'">
         <el-form-item label="所属站点" prop="stationId">
-            <el-select v-model="formModel.stationId" style="width:300px;" @change="changeStation">
+            <el-select v-model="formModel.stationId" style="width:300px;" @change="changeStation" filterable>
                 <el-option
                 v-for="result in chargingStationResult"
                 :key="result.id"
@@ -23,7 +23,7 @@
             </el-select>
         </el-form-item>
         <el-form-item label="充电桩" prop="deviceId">
-          <el-select v-model="formModel.deviceId" style="width:300px;" @change="changeDevice">
+          <el-select v-model="formModel.deviceId" style="width:300px;" @change="changeDevice" filterable>
             <el-option
               v-for="result in deviceList"
               :key="result.id"