Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -334,6 +334,9 @@
             <if test="stationDTO.publicFlag != null and stationDTO.publicFlag != ''">
                 and t1.public_flag = #{stationDTO.publicFlag,jdbcType=VARCHAR}
             </if>
+            <if test="stationDTO.merchantId != null and stationDTO.merchantId != ''">
+                and t1.merchant_id = #{stationDTO.merchantId,jdbcType=VARCHAR}
+            </if>
             <!-- 数据范围过滤 -->
             <if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">
                 and t3.dept_id in

jsowell-ui/src/views/pile/station/index.vue

@@ -8,6 +8,16 @@
             v-show="showSearch"
             label-width="68px"
         >
+            <el-form-item label="所属运营商" prop="merchantId" label-width="120">
+                <el-select v-model="queryParams.merchantId" filterable clearable placeholder="请选择运营商">
+                    <el-option
+                        v-for="item in merchantList"
+                        :key="item.merchantName"
+                        :label="item.merchantName"
+                        :value="item.id"
+                    />
+                </el-select>
+            </el-form-item>
             <el-form-item label="站点名称" prop="stationName">
                 <el-input
                     v-model="queryParams.stationName"
@@ -22,10 +32,12 @@
                     icon="el-icon-search"
                     size="mini"
                     @click="handleQuery"
-          >搜索</el-button
+                >搜索
+                </el-button
                 >
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+                >重置
+                </el-button
                 >
             </el-form-item>
         </el-form>
@@ -39,7 +51,8 @@
                     size="mini"
                     @click="handleAdd"
                     v-hasPermi="['pile:station:add']"
-          >新增</el-button
+                >新增
+                </el-button
                 >
             </el-col>
             <el-col :span="1.5">
@@ -51,7 +64,8 @@
                     :disabled="single"
                     @click="handleUpdate"
                     v-hasPermi="['pile:station:edit']"
-          >修改</el-button
+                >修改
+                </el-button
                 >
             </el-col>
             <el-col :span="1.5">
@@ -63,7 +77,8 @@
                     :disabled="multiple"
                     @click="handleDelete"
                     v-hasPermi="['pile:station:remove']"
-          >删除</el-button
+                >删除
+                </el-button
                 >
             </el-col>
             <el-col :span="1.5">
@@ -74,7 +89,8 @@
                     size="mini"
                     @click="handleExport"
                     v-hasPermi="['pile:station:export']"
-          >导出</el-button
+                >导出
+                </el-button
                 >
             </el-col>
             <right-toolbar
@@ -280,6 +296,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 stationName: null,
+                merchantId: null,
                 aloneApply: null,
                 accountNumber: null,
                 capacity: null,
@@ -337,7 +354,7 @@ export default {
     },
     created() {
         this.getList();
-    // this.getMerchantList();
+        this.getMerchantList();
     },
     methods: {
         goStationDetail(scope) {
@@ -353,6 +370,7 @@ export default {
         getMerchantList() {
             getMerchantList().then((response) => {
                 this.merchantList = response.rows;
+                console.log("merchantList", this.merchantList)
             });
         },
         changeFlag(info) {
@@ -415,6 +433,7 @@ export default {
             this.form = {
                 id: null,
                 stationName: null,
+                merchantId: null,
                 aloneApply: null,
                 accountNumber: null,
                 capacity: null,
@@ -462,6 +481,8 @@ export default {
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
+            // this.merchantId = form.merchantId;
+            console.log("merchantId", this.merchantId)
             this.getList();
         },
         /** 重置按钮操作 */
@@ -535,7 +556,8 @@ export default {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-        .catch(() => {});
+                .catch(() => {
+                });
         },
         /** 导出按钮操作 */
         handleExport() {

jsowell-ui/vue.config.js

@@ -35,9 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
         // 更改代理为本地地址
-        target: `http://192.168.2.6:8080`,
+        // target: `http://192.168.2.6:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",