diff --git a/src/utils/enums.js b/src/utils/enums.js index c452872..63b5a66 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -322,3 +322,36 @@ export const WithdrawServiceType = { POINT: "1", // 按比例 FIXED: "2", // 固定金额 } + +// 日志业务类型 +export const LogBizType = { + UNKNOWN: "UNKNOWN", // 未知 + SUIT: "SUIT", // 套餐 + ORDER: "ORDER", // 订单 + COMPLAINT: "COMPLAINT", // 投诉建议 + DEVICE: "DEVICE", // 设备 + MCH_APPLY: "MCH_APPLY", // 招商加盟 + PAY: "PAY", // 支付 + REAL_NAME: "REAL_NAME", // 实名认证 + AREA: "AREA", // 运营区 + ACCOUNT: "ACCOUNT", // 收款账户 + AD: "AD", // 广告 + AGREEMENT: "AGREEMENT", // 协议 + APP: "APP", // APP + AREA_JOIN: "AREA_JOIN", // 运营加盟 + AREA_SUB: "AREA_SUB", // 子区域 + ARTICLE_CATEGORY: "ARTICLE_CATEGORY", // 文章分类 + ARTICLE: "ARTICLE", // 文章 + BALANCE_LOG: "BALANCE_LOG", // 帐变记录 + BONUS: "BONUS", // 分成 + CHANNEL: "CHANNEL", // 支付渠道 + CUSTOMER_SERVICE: "CUSTOMER_SERVICE", // 客服 + FAULT: "FAULT", // 故障 + HARDWARE_VERSION: "HARDWARE_VERSION", // 硬件版本 + LOCATION_LOG: "LOCATION_LOG", // 定位日志 + MODEL: "MODEL", // 车辆型号 + SOFTWARE_VERSION: "SOFTWARE_VERSION", // 软件版本 + USER_APP: "USER_APP", // 用户APP关联 + WITHDRAW: "WITHDRAW", // 提现 + USER: "USER", // 用户 +} diff --git a/src/views/bst/area/edit/edit.vue b/src/views/bst/area/edit/edit.vue index a27762f..7ec9fa9 100644 --- a/src/views/bst/area/edit/edit.vue +++ b/src/views/bst/area/edit/edit.vue @@ -67,6 +67,14 @@ + + + + + + + + @@ -226,6 +234,8 @@ export default { createTime: null, boundaryDistance: 20, outageDistance: 20, + requiredRingRadius: false, + ringRadius: 500, // vo userName: this.nickName, }; diff --git a/src/views/bst/areaSub/components/AreaMap.vue b/src/views/bst/areaSub/components/AreaMap.vue index 88f3021..aeb4ae7 100644 --- a/src/views/bst/areaSub/components/AreaMap.vue +++ b/src/views/bst/areaSub/components/AreaMap.vue @@ -234,7 +234,6 @@ export default { this.polygonEditor.on('end', this.handlePolygonEnd); } catch (error) { console.error('地图初始化失败:', error); - this.$message.error('地图加载失败'); } }, handlePolygonAdd({target}) { diff --git a/src/views/bst/commandLog/index.vue b/src/views/bst/commandLog/index.vue index 094a228..665d58d 100644 --- a/src/views/bst/commandLog/index.vue +++ b/src/views/bst/commandLog/index.vue @@ -141,6 +141,7 @@ export default { {key: 'userName', visible: true, label: '操作人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'operaTime', visible: true, label: '时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'location', visible: true, label: '定位', minWidth: null, sortable: false, overflow: false, align: 'center', width: null}, + {key: 'originResponse', visible: true, label: '原始响应', minWidth: null, sortable: false, overflow: true, align: 'center', width: null}, ], // 排序方式 orderSorts: ['ascending', 'descending', null], diff --git a/src/views/bst/device/view/view.vue b/src/views/bst/device/view/view.vue index 0cce5ed..d71b0f3 100644 --- a/src/views/bst/device/view/view.vue +++ b/src/views/bst/device/view/view.vue @@ -78,14 +78,18 @@ {{ detail.areaName | dv }} - {{ detail.mchName | dv }} + + + {{ detail.modelName | dv }} - {{ detail.orderNo | dv }} + + + @@ -113,6 +117,9 @@ + + + @@ -124,14 +131,16 @@ import { unlockDevice, lockDevice, ringDevice, rebootDevice, unlockSeatDevice, r import { outDevice, inDevice, disableDevice, enableDevice } from "@/api/bst/device"; import CollapsePanel from '@/components/CollapsePanel/index.vue'; import BooleanTag from '@/components/BooleanTag/index.vue'; -import { DeviceStatus } from '@/utils/enums'; +import { DeviceStatus, LogBizType } from '@/utils/enums'; import { $device } from '@/views/bst/device/mixins'; import OrderDevice from '@/views/bst/orderDevice/index.vue'; import DeviceLocation from '@/views/bst/device/view/components/DeviceLocation.vue'; import CommandLog from '@/views/bst/commandLog/index.vue'; import DeviceBonusPreview from '@/views/bst/device/view/components/DeviceBonusPreview.vue'; import DeviceSn from '@/views/bst/device/components/DeviceSn.vue'; - +import Operlog from '@/views/monitor/operlog/index.vue'; +import OrderLink from '@/components/Business/Order/OrderLink.vue'; +import UserLink from '@/components/Business/User/UserLink.vue'; export default { name: 'DeviceView', @@ -145,13 +154,17 @@ export default { CommandLog, DeviceBonusPreview, DeviceSn, + Operlog, + OrderLink, + UserLink }, data() { return { id: null, detail: {}, loading: false, - DeviceStatus + DeviceStatus, + LogBizType } }, created() { diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue index 3a885c1..50fe9c5 100644 --- a/src/views/bst/order/view/view.vue +++ b/src/views/bst/order/view/view.vue @@ -76,8 +76,7 @@ - {{ detail.suitFreeRideTime | dv }} - + {{ detail.suitFreeRideTime | dv }} 分钟 在{{detail.suitStartRule.startingTime}}{{unitLabel(detail.suitRentalUnit)}}以内,起步价{{detail.suitStartRule.startingPrice}}元; @@ -124,16 +123,26 @@ - {{ detail.deviceSn }} - {{ detail.deviceMac }} - {{ detail.deviceVehicleNum }} + + + + + + + + + - {{ detail.userName }} - {{ detail.userPhone }} + + + + + + @@ -165,6 +174,12 @@ + + + + + + @@ -178,7 +193,7 @@