diff --git a/jsowell-ui/src/views/pile/station/pileList.vue b/jsowell-ui/src/views/pile/station/pileList.vue
index 8a42345d2..82957ee3b 100644
--- a/jsowell-ui/src/views/pile/station/pileList.vue
+++ b/jsowell-ui/src/views/pile/station/pileList.vue
@@ -44,8 +44,8 @@
                     plain
                     icon="el-icon-plus"
                     size="mini"
-                    @click="click"
-                >批量修改站点
+                    @click="handleUpdate"
+                >修改充电桩
                 </el-button>
                 <el-button
                     type="primary"
@@ -54,7 +54,7 @@
                     size="mini"
                     @click="handleAdd"
                     v-hasPermi="['pile:basic:batchAdd']"
-                >批量新增
+                >新增充电桩
                 </el-button>
             </el-col>
         </el-row>
@@ -123,134 +123,99 @@
         />
 
         <!-- 修改充电桩站点 -->
-        <!--        <el-dialog
-                    :title="title"
-                    :visible.sync="open"
-                    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"
-                                    >
-                                        {{ tag }}
-                                    </el-tag>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="运营商">
-                                    <el-select
-                                        v-model="updateData.merchantId"
-                                        placeholder="请选择运营商"
-                                        @change="
+        <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"
+                            >
+                                {{ tag }}
+                            </el-tag>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <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>
-                                </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>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <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>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="枪口数量" prop="connectorNum">
-                                    <el-input
-                                        v-model="updateData.connectorNum"
-                                        placeholder="请输入枪口数量"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                    <div slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="batchUpdate">确 定</el-button>
-                        <el-button @click="cancel">取 消</el-button>
-                    </div>
-                </el-dialog>-->
+                            >
+                                <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>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <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>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="枪口数量" prop="connectorNum">
+                            <el-input
+                                v-model="updateData.connectorNum"
+                                placeholder="请输入枪口数量"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="batchUpdate">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
 
         <!-- 添加或修改设备管理对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+        <el-dialog :title="title" :visible.sync="openAddDialog" width="50%" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-                <!--                <el-row>
-                                    <el-col :span="12">
-                                        <el-form-item label="运营商" prop="merchantId">
-                                            <el-select
-                                                v-model="form.merchantId"
-                                                placeholder="请选择运营商"
-                                                @change="changeSelectMerchant(form.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="form.stationId"
-                                                filterable
-                                                placeholder="请选择站点"
-                                            >
-                                                <el-option
-                                                    v-for="item in stationList"
-                                                    :key="item.id"
-                                                    :label="item.stationName"
-                                                    :value="item.id"
-                                                />
-                                            </el-select>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>-->
-
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="软件协议" prop="softwareProtocol">
@@ -408,7 +373,8 @@ export default {
             // 选中数组
             ids: [],
             // 是否显示弹出层
-            open: false,
+            openAddDialog: false,
+            openUpdateDialog: false,
             // 弹出层标题
             title: "",
             // 充电站详情
@@ -487,7 +453,7 @@ export default {
             this.getMerchantList();
             this.queryStationInfo();
             this.title = "批量添加设备";
-            this.open = true;
+            this.openAddDialog = true;
             this.getModelList();
         },
         /** 提交按钮 */
@@ -498,13 +464,13 @@ export default {
                     if (this.form.id != null) {
                         updateBasic(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
-                            this.open = false;
+                            this.openAddDialog = false;
                             this.getPileList();
                         });
                     } else {
                         batchAddBasic(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
-                            this.open = false;
+                            this.openAddDialog = false;
                             this.getPileList();
                         });
                     }
@@ -559,7 +525,7 @@ export default {
             // console.log(this.updateData.pileIdList);
         },
         /** 按钮操作 */
-        click() {
+        handleUpdate() {
             if (this.updateData.pileIdList.length === 0) {
                 return this.$message({
                     message: "请选择充电桩",
@@ -569,18 +535,20 @@ export default {
             this.getMerchantList();
             this.getModelList();
             this.reset();
-            this.open = true;
+            this.openUpdateDialog = true;
             this.title = "更换站点";
         },
         // 取消按钮
         cancel() {
-            this.open = false;
+            this.openAddDialog = false;
+            this.openUpdateDialog = false;
             this.reset();
             this.stationList = [];
         },
         // 点击弹框右上角×
         handleClose() {
-            this.open = false;
+            this.openAddDialog = false;
+            this.openUpdateDialog = false;
             this.reset();
             this.stationList = [];
         },
@@ -612,7 +580,7 @@ export default {
                         message: "操作成功",
                         type: "success",
                     });
-                    this.open = false;
+                    this.openUpdateDialog = false;
                     this.getPileList();
                     this.stationList = [];
                 })