diff --git a/jsowell-ui/src/views/pile/station/pileList.vue b/jsowell-ui/src/views/pile/station/pileList.vue
index 82957ee3b..164c57680 100644
--- a/jsowell-ui/src/views/pile/station/pileList.vue
+++ b/jsowell-ui/src/views/pile/station/pileList.vue
@@ -1,143 +1,72 @@
 <template>
     <div class="app-container">
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-            @submit.native.prevent
-        >
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+            @submit.native.prevent>
             <el-form-item label="桩号" prop="pileSn">
-                <el-input
-                    v-model="queryParams.pileSn"
-                    placeholder="请输入桩号"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.pileSn" placeholder="请输入桩号" clearable
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                >搜索
-                </el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                >重置
-                </el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
+                </el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置
+                </el-button>
             </el-form-item>
         </el-form>
         <!-- 切换运营商按钮 -->
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button
-                    v-hasPermi="['pile:station:add']"
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleUpdate"
-                >修改充电桩
+                <el-button v-hasPermi="['pile:station:add']" type="primary" plain icon="el-icon-plus" size="mini"
+                    @click="handleUpdate">修改充电桩
                 </el-button>
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['pile:basic:batchAdd']"
-                >新增充电桩
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['pile:basic:batchAdd']">新增充电桩
                 </el-button>
             </el-col>
         </el-row>
 
-        <el-table
-            v-loading="loading"
-            :data="pileList"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column type="selection" width="55" align="center"/>
+        <el-table v-loading="loading" :data="pileList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="桩号" align="center" prop="sn">
                 <template slot-scope="scope">
-                    <router-link
-                        :to="'/pile/detail/index/' + scope.row.pileId"
-                        class="link-type"
-                    >
+                    <router-link :to="'/pile/detail/index/' + scope.row.pileId" class="link-type">
                         <span>{{ scope.row.pileSn }}</span>
                     </router-link>
                 </template>
             </el-table-column>
             <el-table-column label="运营类型" align="center" prop="businessType">
                 <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.pile_business_type"
-                        :value="scope.row.businessType"
-                    />
+                    <dict-tag :options="dict.type.pile_business_type" :value="scope.row.businessType" />
                 </template>
             </el-table-column>
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.pile_status"
-                        :value="scope.row.status"
-                    />
+                    <dict-tag :options="dict.type.pile_status" :value="scope.row.status" />
                 </template>
             </el-table-column>
-            <el-table-column label="接口数量" align="center" prop="gunNum"/>
-            <el-table-column label="密钥" align="center" prop="secretKey"/>
+            <el-table-column label="接口数量" align="center" prop="gunNum" />
+            <el-table-column label="密钥" align="center" prop="secretKey" />
             <el-table-column label="电桩类型" align="center" prop="pileType">
                 <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.connector_type"
-                        :value="scope.row.pileType"
-                    />
+                    <dict-tag :options="dict.type.connector_type" :value="scope.row.pileType" />
                 </template>
             </el-table-column>
-            <el-table-column
-                label="运营商"
-                align="center"
-                prop="merchantName"
-            />
-            <el-table-column label="充电站" align="center" prop="stationName"/>
-            <el-table-column
-                label="注册时间"
-                align="center"
-                prop="registrationTime"
-            />
+            <el-table-column label="运营商" align="center" prop="merchantName" />
+            <el-table-column label="充电站" align="center" prop="stationName" />
+            <el-table-column label="注册时间" align="center" prop="registrationTime" />
         </el-table>
 
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getPileList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getPileList" />
 
         <!-- 修改充电桩站点 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="openUpdateDialog"
-            width="45%"
-            append-to-body
-            :before-close="handleClose"
-        >
+        <el-dialog :title="title" :visible.sync="openUpdateDialog" width="45%" append-to-body
+            :before-close="handleClose">
             <el-form ref="form" :model="updateData" label-width="120px">
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="已选择的桩">
-                            <el-tag
-                                v-for="tag in updateData.pileSnList"
-                                :key="tag"
-                            >
+                            <el-tag v-for="tag in updateData.pileSnList" :key="tag">
                                 {{ tag }}
                             </el-tag>
                         </el-form-item>
@@ -146,35 +75,19 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="运营商">
-                            <el-select
-                                v-model="updateData.merchantId"
-                                placeholder="请选择运营商"
-                                @change="
-                                            changeSelectMerchant(updateData.merchantId)
-                                        "
-                            >
-                                <el-option
-                                    v-for="item in merchantList"
-                                    :key="item.merchantName"
-                                    :label="item.merchantName"
-                                    :value="item.id"
-                                />
+                            <el-select v-model="updateData.merchantId" placeholder="请选择运营商" @change="
+            changeSelectMerchant(updateData.merchantId)
+            ">
+                                <el-option v-for="item in merchantList" :key="item.merchantName"
+                                    :label="item.merchantName" :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="站点" prop="stationId">
-                            <el-select
-                                v-model="updateData.stationId"
-                                placeholder="请选择站点"
-                                filterable
-                            >
-                                <el-option
-                                    v-for="item in stationList"
-                                    :key="item.id"
-                                    :label="item.stationName"
-                                    :value="item.id"
-                                />
+                            <el-select v-model="updateData.stationId" placeholder="请选择站点" filterable>
+                                <el-option v-for="item in stationList" :key="item.id" :label="item.stationName"
+                                    :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -182,27 +95,24 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="产品型号" prop="modelId">
-                            <el-select
-                                v-model="updateData.modelId"
-                                filterable
-                                placeholder="请选择产品型号"
-                                v-selectLoadMore="selectLoadMore"
-                            >
-                                <el-option
-                                    v-for="item in modelList"
-                                    :key="item.modelName"
-                                    :label="item.modelName"
-                                    :value="item.id"
-                                />
+                            <el-select v-model="updateData.modelId" filterable placeholder="请选择产品型号"
+                                v-selectLoadMore="selectLoadMore">
+                                <el-option v-for="item in modelList" :key="item.modelName" :label="item.modelName"
+                                    :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="枪口数量" prop="connectorNum">
-                            <el-input
-                                v-model="updateData.connectorNum"
-                                placeholder="请输入枪口数量"
-                            />
+                            <el-input v-model="updateData.connectorNum" placeholder="请输入枪口数量" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="桩类型" prop="modelId">
+                            <el-select v-model="updateData.chargerPileType" placeholder="请选择桩类型">
+                                <el-option label="运营桩" value="1" />
+                                <el-option label="个人桩" value="2" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -219,29 +129,16 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="软件协议" prop="softwareProtocol">
-                            <el-select
-                                v-model="form.softwareProtocol"
-                                placeholder="软件协议"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="dict in dict.type.software_protocol"
-                                    :key="dict.value"
-                                    :label="dict.label"
-                                    :value="dict.value"
-                                />
+                            <el-select v-model="form.softwareProtocol" placeholder="软件协议" clearable>
+                                <el-option v-for="dict in dict.type.software_protocol" :key="dict.value"
+                                    :label="dict.label" :value="dict.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="生产日期" prop="productionDate">
-                            <el-date-picker
-                                clearable
-                                v-model="form.productionDate"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择生产日期"
-                            >
+                            <el-date-picker clearable v-model="form.productionDate" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择生产日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -250,31 +147,19 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="产品型号" prop="modelId">
-                            <el-select
-                                filterable
-                                remote
-                                v-model="form.modelId"
-                                placeholder="请选择产品型号"
-                                v-selectLoadMore="selectLoadMore"
-                            >
+                            <el-select filterable remote v-model="form.modelId" placeholder="请选择产品型号"
+                                v-selectLoadMore="selectLoadMore">
                                 <!-- :remote-method="remoteMethod" -->
-                                <el-option
-                                    v-for="item in modelList"
-                                    :key="item.modelName"
-                                    :label="item.modelName"
-                                    :value="item.id"
-                                />
+                                <el-option v-for="item in modelList" :key="item.modelName" :label="item.modelName"
+                                    :value="item.id" />
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="桩类型" prop="modelId">
-                            <el-select
-                                v-model="form.chargerPileType"
-                                placeholder="请选择桩类型"
-                            >
-                                <el-option label="运营桩" value="1"/>
-                                <el-option label="个人桩" value="2"/>
+                            <el-select v-model="form.chargerPileType" placeholder="请选择桩类型">
+                                <el-option label="运营桩" value="1" />
+                                <el-option label="个人桩" value="2" />
                             </el-select>
                         </el-form-item>
                         <!--<el-form-item label="充电桩型号" prop="modelId">
@@ -286,20 +171,12 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="枪口数量" prop="connectorNum">
-                            <el-input
-                                v-model="form.connectorNum"
-                                placeholder="请输入枪口数量"
-                                style="width: 220px"
-                            />
+                            <el-input v-model="form.connectorNum" placeholder="请输入枪口数量" style="width: 220px" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="生产数量" prop="num">
-                            <el-input
-                                v-model="form.num"
-                                placeholder="请输入生产数量"
-                                style="width: 220px"
-                            />
+                            <el-input v-model="form.num" placeholder="请输入生产数量" style="width: 220px" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -307,11 +184,7 @@
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="备注" prop="remark">
-                            <el-input
-                                v-model="form.remark"
-                                placeholder="请输入备注"
-                                style="width: 95%"
-                            />
+                            <el-input v-model="form.remark" placeholder="请输入备注" style="width: 95%" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -324,10 +197,10 @@
     </div>
 </template>
 <script>
-import {batchAddBasic, batchUpdatePileList, listBasic, updateBasic} from "@/api/pile/basic";
-import {getMerchantList} from "@/api/pile/merchant";
-import {getStationInfo, getStationListByMerchantId} from "@/api/pile/station";
-import {listModel} from "@/api/pile/model";
+import { batchAddBasic, batchUpdatePileList, listBasic, updateBasic } from "@/api/pile/basic";
+import { getMerchantList } from "@/api/pile/merchant";
+import { getStationInfo, getStationListByMerchantId } from "@/api/pile/station";
+import { listModel } from "@/api/pile/model";
 
 export default {
     name: "PileList",
@@ -348,19 +221,19 @@ export default {
             // 表单校验
             rules: {
                 softwareProtocol: [
-                    {required: true, message: "请输入软件协议", trigger: "blur"},
+                    { required: true, message: "请输入软件协议", trigger: "blur" },
                 ],
                 productionDate: [
-                    {required: true, message: "请选择生产日期", trigger: "blur"},
+                    { required: true, message: "请选择生产日期", trigger: "blur" },
                 ],
                 modelId: [
-                    {required: true, message: "请输入产品型号", trigger: "blur"},
+                    { required: true, message: "请输入产品型号", trigger: "blur" },
                 ],
                 connectorNum: [
-                    {required: true, message: "请输入枪口数量", trigger: "blur"},
+                    { required: true, message: "请输入枪口数量", trigger: "blur" },
                 ],
-                num: [{required: true, message: "请输入生产数量", trigger: "blur"}],
-                remark: [{required: true, message: "请输入备注", trigger: "blur"}],
+                num: [{ required: true, message: "请输入生产数量", trigger: "blur" }],
+                remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
             },
             // 查询参数
             queryParams: {
@@ -391,6 +264,7 @@ export default {
                 pileSnList: [],
                 connectorNum: null,
                 modelId: null,
+                chargerPileType: null
             },
             // 型号列表
             modelList: [],
@@ -557,6 +431,7 @@ export default {
             this.updateData.stationId = null;
             this.updateData.modelId = null;
             this.updateData.connectorNum = null;
+            this.updateData.chargerPileType = null;
         },
         batchUpdate() {
             if (this.updateData.merchantId === null) {