zhaogd/as-partner-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化日志页面/支付配置/设备列表/菜单详情数据解析

Browse Source 
- 支付配置: privateKeyPath改为privateKey，支持textarea粘贴和pem文件上传
- 审计日志: 优化列表展示(head字段/result解析)和详情弹窗
- 橘视厅调用日志: 接口路径截断显示/JSON格式化/耗时颜色分级
- 第三方设备列表: 新增来源/WiFi MAC/UID/心跳时间列，状态改为已激活/未激活
- 菜单/角色/用户详情: 统一用 data.{entity} 提取业务对象
- 设备权益: 去除双层data嵌套，适配后端统一响应结构
This commit is contained in:
freeboss
2026-08-11 16:07:10 +08:00
parent 630dfddc59
commit e39b88d1db
12 changed files with 318 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/views/modules/manage/partner-device.vue
View File

@@ -2,15 +2,15 @@
<div class="mod-partner-device">
<el-form :inline="true" :model="dataForm" @keyup.enter="getDataList()">
<el-form-item>
<el-select v-model="dataForm.partnerId" placeholder="合作商" clearable filterable style="width:180px">
<el-select v-model="dataForm.partnerId" placeholder="合作伙伴" clearable filterable style="width:180px">
<el-option v-for="p in partnerOptions" :key="p.id" :label="p.name" :value="p.partnerId"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-input v-model="dataForm.deviceName" placeholder="设备名称" clearable style="width:160px"></el-input>
<el-input v-model="dataForm.mac" placeholder="MAC地址" clearable style="width:160px"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="dataForm.mac" placeholder="MAC地址" clearable style="width:160px"></el-input>
<el-input v-model="dataForm.deviceSn" placeholder="设备SN" clearable style="width:160px"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
@@ -18,25 +18,37 @@
</el-form>
<div class="table-page-wrap">
<el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%">
<el-table-column type="index" header-align="center" align="center" width="60" label="序号" />
<el-table-column header-align="center" align="center" min-width="140" label="合作商">
<el-table-column type="index" header-align="center" align="center" width="55" label="序号" />
<el-table-column header-align="center" align="center" width="90" label="来源">
<template #default="scope">
<el-tag v-if="scope.row.source === 'PARTNER'" size="small" type="warning">第三方</el-tag>
<el-tag v-else-if="scope.row.source === 'DIRECT'" size="small" type="success">自营</el-tag>
<span v-else>{{ scope.row.source || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="mac" header-align="center" align="center" width="150" label="MAC" show-overflow-tooltip />
<el-table-column prop="wifiMac" header-align="center" align="center" width="150" label="WiFi MAC" show-overflow-tooltip>
<template #default="scope">{{ scope.row.wifiMac || '-' }}</template>
</el-table-column>
<el-table-column prop="deviceSn" header-align="center" align="center" min-width="160" label="SN" show-overflow-tooltip>
<template #default="scope">{{ scope.row.deviceSn || '-' }}</template>
</el-table-column>
<el-table-column prop="deviceUid" header-align="center" align="center" min-width="140" label="设备UID" show-overflow-tooltip>
<template #default="scope">{{ scope.row.deviceUid || '-' }}</template>
</el-table-column>
<el-table-column header-align="center" align="center" min-width="140" label="合作伙伴">
<template #default="scope">{{ partnerNameOf(scope.row.partnerId) }}</template>
</el-table-column>
<el-table-column prop="deviceName" header-align="center" align="center" min-width="140" label="设备名称" />
<el-table-column prop="mac" header-align="center" align="center" width="140" label="MAC" />
<el-table-column prop="deviceSn" header-align="center" align="center" min-width="160" label="设备SN" show-overflow-tooltip />
<el-table-column prop="deviceModel" header-align="center" align="center" width="120" label="型号" />
<el-table-column prop="status" header-align="center" align="center" width="100" label="状态">
<el-table-column prop="status" header-align="center" align="center" width="90" label="状态">
<template #default="scope">
<el-tag v-if="scope.row.status === 'ACTIVE'" size="small" type="success">启用</el-tag>
<el-tag v-else-if="scope.row.status === 'INACTIVE'" size="small" type="danger">禁用</el-tag>
<el-tag v-if="scope.row.status === 'ACTIVE'" size="small" type="success">已激活</el-tag>
<el-tag v-else-if="scope.row.status === 'INACTIVE'" size="small" type="info">未激活</el-tag>
<el-tag v-else size="small">{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="storeName" header-align="center" align="center" min-width="140" label="绑定门店">
<template #default="scope">{{ scope.row.storeName || '-' }}</template>
<el-table-column prop="lastHeartbeat" header-align="center" align="center" width="170" label="心跳时间">
<template #default="scope">{{ scope.row.lastHeartbeat || '-' }}</template>
</el-table-column>
<el-table-column prop="createdAt" header-align="center" align="center" width="170" label="注册时间" />
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@@ -58,10 +70,10 @@ import { getPartnerList, type PartnerInfo } from '@/api/manage/partner'
interface DataForm {
partnerId: string | null
deviceName: string
mac: string
deviceSn: string
}
const dataForm = reactive<DataForm>({ partnerId: null, deviceName: '', mac: '' })
const dataForm = reactive<DataForm>({ partnerId: null, mac: '', deviceSn: '' })
const dataList = ref<DeviceInfo[]>([])
const pageIndex = ref<number>(1)
const pageSize = ref<number>(10)
@@ -94,8 +106,8 @@ async function getDataList (): Promise<void> {
limit: pageSize.value,
source: 'PARTNER',
partnerId: dataForm.partnerId ?? undefined,
deviceName: dataForm.deviceName || undefined,
mac: dataForm.mac || undefined
mac: dataForm.mac || undefined,
deviceSn: dataForm.deviceSn || undefined
})
if (res && res.code === 0) {
dataList.value = res.data?.page?.list || []