autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-13 18:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 添加鉴权卡

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-01 16:11:31 +08:00
parent d98d2720a8
commit 327365ddd3
3 changed files with 365 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
View File

@@ -106,9 +106,6 @@ public class MemberBasicInfoController extends BaseController {
@GetMapping("/getMerchantListByAuth")
public RestApiResponse<?> getMerchantListByAuth() {
RestApiResponse<?> response = null;
// List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
// List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth();
// List<MerchantInfoVO> list = UserUtils.getMerchantListByAuth();
LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
List<MerchantInfoVO> list = loginUserDetail.getMerchantInfoVOList();

8
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -36,10 +36,10 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
#url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: jsowell_dev
url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_prd_copy
password: 123456
# 从库数据源
slave:

88
jsowell-ui/src/views/pile/card/index.vue
View File

@@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="逻辑卡号" prop="logicCard">
<el-input
v-model="queryParams.logicCard"
@@ -40,7 +41,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['pile:card:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -51,7 +53,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['pile:card:edit']"
>修改</el-button>
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -62,7 +65,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['pile:card:remove']"
>删除</el-button>
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
@@ -109,14 +113,16 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pile:card:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-circle-close"
@click="handleDeactivateCard(scope.row)"
v-hasPermi="['pile:card:remove']"
>停用</el-button>
>停用
</el-button>
</template>
</el-table-column>
</el-table>
@@ -132,16 +138,16 @@
<!-- 添加或修改充电站鉴权卡对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="一级运营商" prop="merchantId">
<el-form-item label="选择运营商" prop="merchantId">
<el-select
v-model="form.merchantId"
clearable placeholder="请选择一级运营商"
clearable placeholder="请选择运营商"
>
<el-option
v-for="item in firstLevelMerchantList"
:key="item.merchantName"
v-for="item in merchantList"
:key="item.merchantId"
:label="item.merchantName"
:value="item.id">
:value="item.merchantId">
</el-option>
</el-select>
</el-form-item>
@@ -151,29 +157,6 @@
<el-form-item label="手机号码" prop="phoneNumber">
<el-input v-model="form.phoneNumber" placeholder="请输入会员的手机号码"/>
</el-form-item>
<!-- <el-form-item label="选择状态" prop="status">-->
<!-- <el-select-->
<!-- placeholder="请选择状态"-->
<!-- v-model="form.status"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.type.card_status"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物理卡号" prop="physicsCard">-->
<!-- <el-input v-model="form.physicsCard" placeholder="请输入物理卡号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="会员id" prop="memberId">-->
<!-- <el-input v-model="form.memberId" placeholder="请输入所属用户" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="删除标识" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -186,6 +169,7 @@
<script>
import {listCard, getCard, delCard, addCard, updateCard, deactivateCard} from "@/api/pile/card";
import {queryFirstLevelMerchant} from "@/api/pile/merchant";
import {getMerchantList} from "@/api/member/info";
export default {
name: "card",
@@ -213,6 +197,7 @@ export default {
// 卡号是否可填写
isDisabled: false,
firstLevelMerchantList: [],
merchantList: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -254,7 +239,8 @@ export default {
},
created() {
this.getList();
this.getFirstLevelMerchantList();
// this.getFirstLevelMerchantList();
this.getMerchantList();
},
methods: {
/** 查询充电站鉴权卡列表 */
@@ -271,8 +257,17 @@ export default {
queryFirstLevelMerchant().then(response => {
console.log("getFirstLevelMerchantList", response)
this.firstLevelMerchantList = response.rows;
});
},
// 获取运营商列表
getMerchantList() {
getMerchantList().then((response) => {
console.log("getMerchantList response", response)
this.merchantList = response.obj;
this.form.merchantId = this.merchantList[0].merchantId
})
},
// 取消按钮
cancel() {
this.open = false;
@@ -281,19 +276,15 @@ export default {
// 表单重置
reset() {
this.form = {
id: null,
logicCard: null,
physicsCard: null,
memberId: null,
merchantId: null,
phoneNumber: null,
createTime: null,
createBy: null,
updateTime: null,
updateBy: null,
delFlag: null
};
this.resetForm("form");
if (this.merchantList.length > 0) {
this.form.merchantId = this.merchantList[0].merchantId
}
},
/** 搜索按钮操作 */
handleQuery() {
@@ -313,9 +304,9 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
// this.reset();
this.open = true;
this.title = "添加充电站鉴权卡";
this.title = "添加充电站鉴权卡11";
this.isDisabled = false;
},
/** 修改按钮操作 */
@@ -338,15 +329,18 @@ export default {
updateCard(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.reset();
this.getList();
});
} else {
addCard(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.reset();
this.getList();
});
}
}
});
},
@@ -358,7 +352,8 @@ export default {
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
// 停用按钮
@@ -369,7 +364,8 @@ export default {
}).then(() => {
this.getList();
this.$modal.msgSuccess("停用成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {