diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 760180f..b82e192 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,7 +20,8 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://61.174.243.28:15861', + // baseUrl: 'http://61.174.243.28:15861', + baseUrl: 'http://192.168.2.6:8080', // baseUrl: 'https://dianche.chuantewulian.cn/prod-api', loadingText: '努力加载中~', loadingTime: 800, diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue index 38942d2..bd4a5e0 100644 --- a/pages_admin/admin_worke.vue +++ b/pages_admin/admin_worke.vue @@ -9,36 +9,36 @@ 应用入口 - + 运营数据 - + 收入对账 - + 设备管理 - + 用户管理 - + @@ -69,7 +69,25 @@ }, }, methods: { - + topage(num){ + if(num==0){ + uni.navigateTo({ + url:'/pages_admin/worke/worke_Operation' + }) + }else if(num==1){ + uni.navigateTo({ + url:'/pages_admin/worke/worke_income' + }) + }else if(num==2){ + uni.navigateTo({ + url:'/pages_admin/worke/woke_deviceMgmt' + }) + }else if(num==3){ + uni.navigateTo({ + url:'/pages_admin/worke/worke_user' + }) + } + } } } diff --git a/pages_admin/worke/woke_deviceMgmt.vue b/pages_admin/worke/woke_deviceMgmt.vue index 1702ad7..a7fd3fa 100644 --- a/pages_admin/worke/woke_deviceMgmt.vue +++ b/pages_admin/worke/woke_deviceMgmt.vue @@ -9,91 +9,102 @@ 仓库中设备 --> - + - - 设备状态 + + {{tit}} + - - 电量排序 + + {{sctit}} - + + + - + - 设备总数:10 + 设备总数:{{deviceList.length}} - + 批量操作 - - - - 全选 + + + {{ isAllSelected ? '取消全选' : '全选' }} - 已选设备:1 + 已选设备:{{selectedItems.length}} - + 取消 - - + 车辆禁用 - + 车辆解禁 - - + + + + + + + @@ -101,15 +112,210 @@ export default { data() { return { - curtitidx:0, + curtitidx: 0, bgc: { backgroundColor: "#fff", }, + showdsc: false, + sctit: '从高到低', + scidx: 'desc', + show: false, + lists: [{ + value: 'desc', + label: '从高到低' + }, + { + value: 'asc', + label: '从低到高' + }, + ], + list: [{ + value: '', + label: '全部' + }, + { + value: '0', + label: '未上架' + }, + { + value: '1', + label: '待租' + }, + { + value: '2', + label: '预约中' + }, + { + value: '3', + label: '骑行中' + }, + { + value: '4', + label: '临时锁车' + }, + { + value: '8', + label: '下线' + } + + ], + tit: '全部', + typeidx: '', + deviceList: [], + stepindex: 0, + selectedItems: [], + } }, + + onLoad() { + this.getDevice() + }, + computed: { + isAllSelected() { + if (this.selectedItems.length == this.deviceList.length) { + return true + } else { + return false + } + + } + }, + methods: { - changeidx(idx){ - this.curtitidx=idx + ban(){ + let data={ + disableType:'disable', + sns:this.selectedItems.join(',') + } + this.$u.post(`/appVerify/device/disable?sns=`+data.sns+'&disableType=disable').then((res) => { + if (res.code == 200) { + this.closestep() + this.getDevice() + } else { + // 处理接口返回错误的情况 + } + }).catch(error => { + // 处理接口请求失败的情况 + }); + }, + pick(){ + let data={ + disableType:'enable', + sns:this.selectedItems.join(',') + } + this.$u.post(`/appVerify/device/disable?sns=`+data.sns+'&disableType=enable').then((res) => { + if (res.code == 200) { + this.closestep() + this.getDevice() + + + } else { + // 处理接口返回错误的情况 + } + }).catch(error => { + // 处理接口请求失败的情况 + }); + }, + confirms(e){ + + this.scidx = e[0].value + this.sctit = e[0].label + this.getDevice() + }, + getStatusColor(item) { + if (item.onlineStatus == 0) { + // 离线状态为红色 + return 'red'; + } else if (item.status == 0 || item.status == 8) { + // 下线和未上架状态为灰色 + return 'gray'; + } else { + // 其他状态为蓝色 + // return 'blue'; + } + }, + closestep() { + this.selectedItems = [] + this.stepindex = 0 + }, + isSelected(sn) { + return this.selectedItems.includes(sn); + }, + selectItem(sn) { + this.selectedItems.push(sn); + // 更新 isAllSelected + + console.log(this.selectedItems, '选择'); + }, + deselectItem(sn) { + this.selectedItems = this.selectedItems.filter(item => item !== sn); + // 更新 isAllSelected + + console.log(this.selectedItems, '删除'); + }, + + selectAll() { + if (this.selectedItems.length === this.deviceList.length) { + // All items are already selected, so deselect all + this.selectedItems = []; + } else { + // Select all items + this.selectedItems = this.deviceList.map(item => item.sn); + } + }, + status(item) { + if (item.onlineStatus == 0) { + return '离线' + } else { + if (item.status == 0) { + return '未上架' + } else if (item.status == 1) { + return '待租' + } else if (item.status == 2) { + return '预约中' + } else if (item.status == 3) { + return '骑行中' + } else if (item.status == 4) { + return '临时锁车中' + } else if (item.status == 8) { + return '下线' + } + } + + }, + getDevice() { + let data = { + powerStart: '', + powerEnd: '', + sort:this.scidx, + status: this.typeidx + } + + this.selectedItems = []; + this.$u.get(`/appVerify/allVehicleInfo?`, data).then((res) => { + if (res.code == 200) { + this.deviceList = res.data + + + } else { + // 处理接口返回错误的情况 + } + }).catch(error => { + // 处理接口请求失败的情况 + }); + }, + confirm(e) { + // console.log(e,'eeeeeeeeee'); + this.typeidx = e[0].value + this.tit = e[0].label + this.getDevice() + // console.log(e); + // this.mode = e[0].label + // this.gettype() + }, + changeidx(idx) { + this.curtitidx = idx }, } } @@ -117,31 +323,34 @@ + \ No newline at end of file diff --git a/pages_admin/worke/worke_Operation.vue b/pages_admin/worke/worke_Operation.vue index 9cee745..bce8e1a 100644 --- a/pages_admin/worke/worke_Operation.vue +++ b/pages_admin/worke/worke_Operation.vue @@ -17,16 +17,16 @@ - + 今日 - + 昨日 - + 本月 - + 上个月 @@ -37,18 +37,18 @@ - 总营收 ¥0.00 + 总营收 ¥{{info.income.totalIncome}} - 累计待支付 ¥0.00 + 累计待支付 ¥{{info.income.totalIncome}} - 已支付 ¥0.00 + 已支付 ¥{{info.income.totalPaid}} - 已退款 ¥0.00 + 已退款 ¥{{info.income.totalRefund}} @@ -60,57 +60,57 @@ 调度费 - + - 已支付:¥2.00 + 已支付:¥{{info.income.totalRidingFee}} - 已支付:¥2.00 + 已支付:¥{{info.income.totalRidingRefund}} - + - 已退款:¥2.00 + 已退款:¥{{info.income.totalDispatchFee}} - 已退款:¥2.00 + 已退款:¥{{info.income.totalDispatchRefund}} - + - 租赁费 + 预约费 - 调度费 + 管理费 - + - 已支付:¥2.00 + 已支付:¥{{info.income.totalAppointmentFee}} - 已支付:¥2.00 + 已支付:¥{{info.income.totalAppointmentRefund}} - + - + - 已退款:¥2.00 + 已退款:¥{{info.income.totalManageFee}} - 已退款:¥2.00 + 已退款:¥{{info.income.totalManageRefund}} - + @@ -121,7 +121,7 @@ - 0 + {{info.order.ridingOrder}} 新增行程订单 @@ -129,7 +129,7 @@ - 0 + {{info.order.paidOrder}} 已支付订单 @@ -137,7 +137,7 @@ - 0 + {{info.order.refundOrder}} 已退款订单 @@ -145,10 +145,10 @@ - 0 + {{info.order.unpaidOrder}} - 待支付订单 + 待支付订单 @@ -162,7 +162,7 @@ - 0 + {{info.device.inOperationDevice}} 运营中车辆 @@ -170,7 +170,7 @@ - 0 + {{info.device.inOrderDevice}} 有订单车辆 @@ -178,13 +178,13 @@ - 0 + {{info.device.noOrderDevice}} 无订单车辆 - + @@ -196,7 +196,7 @@ - 0 + {{info.user.totalUser}} 用户总数 @@ -204,7 +204,7 @@ - 0 + {{info.user.newUser}} 新增用户 @@ -212,19 +212,19 @@ - 0 + {{info.user.leaseUser}} 租赁用户 - + + :default-time='firsTime'> + :default-time='lasTime'> @@ -237,8 +237,8 @@ }, time1: false, time2: false, - lasTime: '00-00', - firsTime: '00-00', + lasTime: '', + firsTime: '', params: { year: true, month: true, @@ -247,20 +247,85 @@ minute: false, second: false }, + cutidx: 0, + info:{} } }, - methods: { + onLoad() { + let today = new Date(); + // 获取七天前的日期 + + // 格式化日期为 yyyy-MM-dd + this.firsTime = this.formatDate(today); + this.lasTime = this.formatDate(today); + this.operatingData() + }, + methods:{ + changeTime(num) { + if (num == 0) { + this.cutidx = num; + let today = new Date(); + this.firsTime = this.formatDate(today); + this.lasTime = this.formatDate(today); + this.operatingData() + } else if (num == 1) { + this.cutidx = num; + let yesterday = new Date(); + yesterday.setDate(yesterday.getDate() - 1); + this.firsTime = this.formatDate(yesterday); + this.lasTime = this.formatDate(new Date()); + this.operatingData() + } else if (num == 2) { + this.cutidx = num; + let today = new Date(); + let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1); + this.firsTime = this.formatDate(firstDayOfMonth); + this.lasTime = this.formatDate(new Date()); + this.operatingData() + } else if (num == 3) { + this.cutidx = num; + let today = new Date(); + let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1, 1); + let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), 0); + this.firsTime = this.formatDate(firstDayOfLastMonth); + this.lasTime = this.formatDate(lastDayOfLastMonth); + this.operatingData() + } + }, + formatDate(date) { + let year = date.getFullYear(); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; + }, + operatingData() { + let data = { + timeStart: this.firsTime, + timeEnd: this.lasTime, + + } + this.$u.get('/appVerify/operatingData', data).then((res) => { + if (res.code === 200) { + // 处理接口返回的数据,将边界数据转换为地图组件需要的折线结构 + this.info=res.data + } + }).catch(error => { + console.error("Error fetching area data:", error); + }); + }, confirm1(e) { - console.log(e, 'eeeeeeee'); + this.firsTime = e.year + '-' + e.month + '-' + e.day - + this.cutidx=-1 }, confirm2(e) { this.lasTime = e.year + '-' + e.month + '-' + e.day - + this.cutidx=-1 }, } + } +