diff --git a/src/api/system/dept.js b/src/api/system/dept.js index fc943cd..b6f4f25 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -49,4 +49,11 @@ export function delDept(deptId) { url: '/system/dept/' + deptId, method: 'delete' }) -} \ No newline at end of file +} +// 查询余额 +export function getBalance(){ + return request({ + url: '/system/dept/getBalance', + method: 'get' + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index f2f76ef..d1f1242 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -18,6 +18,15 @@ export function getUser(userId) { }) } +// 绑定APP用户 +export function bandAppUser(data) { + return request({ + url: '/system/user/bandAppUser', + method: 'put', + data: data + }) +} + // 新增用户 export function addUser(data) { return request({ diff --git a/src/api/system/withdraw.js b/src/api/system/withdraw.js new file mode 100644 index 0000000..4df9197 --- /dev/null +++ b/src/api/system/withdraw.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询提现记录列表 +export function listWithdraw(query) { + return request({ + url: '/system/withdraw/list', + method: 'get', + params: query + }) +} + +// 查询提现记录详细 +export function getWithdraw(id) { + return request({ + url: '/system/withdraw/' + id, + method: 'get' + }) +} + +// 新增提现记录 +export function addWithdraw(data) { + return request({ + url: '/system/withdraw', + method: 'post', + data: data + }) +} + +// 修改提现记录 +export function updateWithdraw(data) { + return request({ + url: '/system/withdraw', + method: 'put', + data: data + }) +} + +// 删除提现记录 +export function delWithdraw(id) { + return request({ + url: '/system/withdraw/' + id, + method: 'delete' + }) +} diff --git a/src/api/user/user.js b/src/api/user/user.js index 7563daa..2ec7653 100644 --- a/src/api/user/user.js +++ b/src/api/user/user.js @@ -10,6 +10,16 @@ export function listUser(query) { }) } +// 根据手机号快速搜索用户列表 +export function fastSearch(query) { + return request({ + url: '/user/user/fast/search', + method: 'get', + params: query + }) +} + + // 查询用户详细 export function getUser(userId) { return request({ diff --git a/src/assets/icons/svg/withdraw.svg b/src/assets/icons/svg/withdraw.svg new file mode 100644 index 0000000..ba8161d --- /dev/null +++ b/src/assets/icons/svg/withdraw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/AreaMap/index.vue b/src/components/AreaMap/index.vue index 0ed6e2b..adf08e9 100644 --- a/src/components/AreaMap/index.vue +++ b/src/components/AreaMap/index.vue @@ -58,7 +58,7 @@ export default { lat2: null }; }, - props: ["pathList", "dataId","lon","lat"], + props: ["pathList", "dataId","lon","lat","zoom"], mounted() { if (this.dataId) { this.start(); @@ -132,7 +132,7 @@ export default { this.map = new AMap.Map("container", { //设置地图容器id viewMode: "3D", //是否为3D地图模式 - zoom: 13, //初始化地图级别 + zoom: this.zoom?this.zoom:13, //初始化地图级别 center: [this.lon2, this.lat2], // 初始化地图中心点位置 }); this.map.setFitView(); diff --git a/src/components/Map/location/LocationMap.vue b/src/components/Map/location/LocationMap.vue index 4387d8e..74676e0 100644 --- a/src/components/Map/location/LocationMap.vue +++ b/src/components/Map/location/LocationMap.vue @@ -54,6 +54,10 @@ export default { type: String, default: '0' }, + deviceSn: { + type: String, + default: '' + } }, data() { return { @@ -124,7 +128,7 @@ export default { // 标点 this.removeAllMarker(); console.log("添加标记点") - this.addMarker(this.initLng, this.initLat, res.regeocode.formattedAddress, this.status, this.onlineStatus); + this.addMarker(this.initLng, this.initLat, this.deviceSn, this.status, this.onlineStatus); this.$emit('map-geo', res, this.initLng, this.initLat); // 地区 @@ -140,14 +144,35 @@ export default { }, addMarker(lng, lat, title,status,onlineStatus) { //创建一个 Marker 实例： + console.log("title==========="+title) let marker = new AMap.Marker({ position: new AMap.LngLat(lng, lat), //经纬度对象 icon: this.formarStatus(status,onlineStatus), title: title, + offset: new AMap.Pixel(-20, -40) }); //将创建的点标记添加到已有的地图实例： this.map.add(marker); this.markers.push(marker); + + // 创建一个 Text 实例来显示标题 + let text = new AMap.Text({ + text: title, + anchor: 'center', // 设置文本的锚点 + position: new AMap.LngLat(lng, lat), // 经纬度对象 + offset: new AMap.Pixel(0, -55), + style: { + 'background-color': '#1890ff', // 背景颜色为蓝色 + 'border': 'none', // 边框颜色与背景一致 + 'border-radius': '5px', // 圆角 5px + 'color': 'white', // 文字颜色为白色 + 'font-size': '14px', // 字体大小 + 'padding': '5px 10px' // 内边距，调整文本框的大小 + } + }); + + // 将文本标签添加到地图实例 + this.map.add(text); }, formarStatus(status,onlineStatus){ if(onlineStatus == "0"){ diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index d4a8f7e..02440b3 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -336,7 +336,7 @@ - + diff --git a/src/views/system/area/noparking.vue b/src/views/system/area/noparking.vue index 2ad66ae..23f0cc9 100644 --- a/src/views/system/area/noparking.vue +++ b/src/views/system/area/noparking.vue @@ -1,7 +1,7 @@