This commit is contained in:
dhr
2025-09-04 22:56:00 +08:00
parent 8a3f338e27
commit c35a75d030
4 changed files with 1050 additions and 1 deletions

View File

@ -0,0 +1,96 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { EquipmentVO, EquipmentForm, EquipmentQuery } from '@/api/equipment/types';
/**
* 查询GPS设备详细列表
* @param query
* @returns {*}
*/
export const listEquipment = (query?: EquipmentQuery): AxiosPromise<EquipmentVO[]> => {
return request({
url: '/gps/equipment/list',
method: 'get',
params: query
});
};
/**
* 查询GPS设备详细详细
* @param id
*/
export const getEquipment = (id: string | number): AxiosPromise<EquipmentVO> => {
return request({
url: '/gps/equipment/' + id,
method: 'get'
});
};
/**
* 新增GPS设备详细
* @param data
*/
export const addEquipment = (data: EquipmentForm) => {
return request({
url: '/gps/equipment',
method: 'post',
data: data
});
};
/**
* 修改GPS设备详细
* @param data
*/
export const updateEquipment = (data: EquipmentForm) => {
return request({
url: '/gps/equipment',
method: 'put',
data: data
});
};
/**
* 删除GPS设备详细
* @param id
*/
export const delEquipment = (id: string | number | Array<string | number>) => {
return request({
url: '/gps/equipment/' + id,
method: 'delete'
});
};
export const bindUser = (data) => {
return request({
url: '/gps/equipment/bindManmachine',
method: 'post',
data: data
});
};
export const getUserId = (projectId) => {
return request({
url: '/gps/equipment/userList',
method: 'get',
params: { projectId }
});
};
export const gethistroyUser = (data) => {
return request({
url: '/gps/equipment/getUserList',
method: 'get',
params: data
});
};
// 解除绑定接口定义确保使用POST方法并正确传递data
export function getRemoveBind(data: { id: number; clientId: string }) {
return request({
url: '/gps/equipment/unbindManmachine',
method: 'post',
data: data
});
}

165
src/api/equipment/types.ts Normal file
View File

@ -0,0 +1,165 @@
export interface EquipmentVO {
/**
*
*/
id: string | number;
/**
* 项目ID
*/
projectId: string | number;
/**
* 用户id
*/
userId: string | number;
/**
* 设备标识
*/
clientId: string | number;
/**
* 设备名称
*/
deviceName: string;
/**
* 是否使用UDP协议0=否1=是
*/
udp: number;
/**
* 远程连接地址IP:端口)
*/
remoteAddressStr: string;
/**
* 连接创建时间
*/
creationTime: number;
/**
* 最后活动时间
*/
lastAccessedTime: number;
/**
* 是否已注册0=未注册1=已注册
*/
registered: number;
/**
* 备注
*/
remark: string;
}
export interface EquipmentForm extends BaseEntity {
/**
*
*/
id?: string | number;
/**
* 项目ID
*/
projectId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 设备标识
*/
clientId?: string | number;
/**
* 设备名称
*/
deviceName?: string;
/**
* 是否使用UDP协议0=否1=是
*/
udp?: number;
/**
* 远程连接地址IP:端口)
*/
remoteAddressStr?: string;
/**
* 连接创建时间
*/
creationTime?: number;
/**
* 最后活动时间
*/
lastAccessedTime?: number;
/**
* 是否已注册0=未注册1=已注册
*/
registered?: number;
/**
* 备注
*/
remark?: string;
}
export interface EquipmentQuery extends PageQuery {
/**
* 项目ID
*/
projectId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 设备标识
*/
clientId?: string | number;
/**
* 设备名称
*/
deviceName?: string;
/**
* 是否使用UDP协议0=否1=是
*/
udp?: number;
/**
* 远程连接地址IP:端口)
*/
remoteAddressStr?: string;
/**
* 连接创建时间
*/
creationTime?: number;
/**
* 最后活动时间
*/
lastAccessedTime?: number;
/**
* 是否已注册0=未注册1=已注册
*/
registered?: number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@ -0,0 +1,788 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="设备标识" prop="clientId">
<el-input v-model="queryParams.clientId" placeholder="请输入设备标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:equipment:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:equipment:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.8">
<el-button type="primary" plain icon="User" :disabled="single" @click="handleBindUser()" v-hasPermi="['system:equipment:bindUser']"
>绑定用户</el-button
>
</el-col>
<el-col :span="2">
<el-button type="primary" plain @click="handleViewAll" v-hasPermi="['system:equipment:view']">{{ viewAllButtonText }}</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目ID" align="center" prop="projectId" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="设备标识" align="center" prop="clientId" />
<!-- 设备名称列点击触发历史用户弹窗传入项目ID+当前用户ID -->
<el-table-column label="设备名称" align="center">
<template #default="scope">
<el-button
type="text"
@click="handleOpenHistoryUser(scope.row.clientId, scope.row.userId)"
style="padding: 0; color: #409eff; cursor: pointer"
>
{{ scope.row.deviceName || '-' }}
</el-button>
</template>
</el-table-column>
<el-table-column label="远程连接地址" align="center" prop="remoteAddressStr" />
<el-table-column label="连接创建时间" align="center">
<template #default="scope">
{{ formatDateTime(scope.row.creationTime) }}
</template>
</el-table-column>
<el-table-column label="最后活动时间" align="center">
<template #default="scope">
{{ formatDateTime(scope.row.lastAccessedTime) }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['gps:equipment:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['gps:equipment:remove']"></el-button>
</el-tooltip>
<el-tooltip :content="scope.row.userId ? '取消绑定' : '绑定用户'" placement="top">
<el-button
link
type="primary"
icon="User"
@click="scope.row.userId ? handleUnbindUser(scope.row) : handleBindUser(scope.row)"
v-hasPermi="['gps:equipment:bindUser']"
>
</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改GPS设备详细对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="equipmentFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<!-- 绑定用户对话框 -->
<el-dialog title="绑定用户" v-model="bindDialogVisible" width="500px" append-to-body>
<el-form ref="bindUserFormRef" :model="bindForm" :rules="bindRules" label-width="80px">
<el-form-item label="项目选择" prop="projectId" required>
<el-select v-model="bindForm.projectId" placeholder="请选择项目" clearable @change="handleProjectChange">
<el-option v-for="project in projectList" :key="project.id" :label="project.name" :value="project.id" />
</el-select>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="bindForm.deviceName" disabled placeholder="设备名称" />
</el-form-item>
<el-form-item label="选择用户" prop="userId" required>
<el-select v-model="bindForm.userId" placeholder="请选择用户" clearable>
<el-option v-for="user in userList" :key="user.sysUserId" :label="user.userName" :value="user.sysUserId" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="bindButtonLoading" type="primary" @click="submitBindUser"> </el-button>
<el-button @click="cancelBindUser"> </el-button>
</div>
</template>
</el-dialog>
<!-- 历史用户弹窗 -->
<el-dialog
title="设备历史用户"
v-model="historyUserDialogVisible"
width="600px"
append-to-body
@close="
() => {
historyUserList.splice(0);
}
"
>
<!-- 加载状态 -->
<div v-loading="historyUserLoading" style="min-height: 200px; padding: 16px">
<!-- 历史用户列表 -->
<el-table
:data="historyUserList"
stripe
size="small"
:show-header="historyUserList.length > 0"
v-if="!historyUserLoading || historyUserList.length > 0"
>
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="用户名" align="center" prop="userName" />
<el-table-column label="状态" align="center" width="120">
<template #default="scope">
<!-- 通过scope.row.type获取当前行的状态值判断后显示对应内容 -->
<el-tag :type="scope.row.type === 1 ? 'success' : 'info'" size="small">
{{ scope.row.type === 1 ? '当前绑定' : '历史绑定' }}
</el-tag>
</template>
</el-table-column>
</el-table>
<!-- 历史用户弹窗-无数据提示 -->
<div v-if="!historyUserLoading && historyUserList.length === 0" style="text-align: center; padding: 50px 0">
<el-empty description="暂无该设备的历史用户数据"></el-empty>
</div>
</div>
<template #footer>
<el-button @click="historyUserDialogVisible = false">关 闭</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup name="Equipment" lang="ts">
// 导入历史用户接口确保API文件中存在该接口
import {
listEquipment,
getEquipment,
delEquipment,
addEquipment,
updateEquipment,
bindUser,
getUserId,
gethistroyUser,
getRemoveBind
} from '@/api/equipment/index';
import { listProject } from '@/api/project/project/index';
import { EquipmentVO, EquipmentQuery, EquipmentForm } from '@/api/equipment/types';
import { getCurrentInstance, ComponentInternalInstance, onMounted, ref, reactive, toRefs, watch, computed } from 'vue';
import { useUserStoreHook } from '@/store/modules/user';
import { Row } from 'element-plus/es/components/table-v2/src/components/index.mjs';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 设备列表相关
const equipmentList = ref<EquipmentVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const isViewAll = ref(false); // 标记是否处于查看全部模式
// 表单相关引用
const queryFormRef = ref<ElFormInstance>();
const equipmentFormRef = ref<ElFormInstance>();
const bindUserFormRef = ref<ElFormInstance>();
// 项目和用户相关
const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
const userList = ref<any[]>([]); // 存储获取到的用户列表
const projectList = ref<any[]>([]); // 存储获取到的项目列表
const projectLoading = ref(false); // 项目列表加载状态
const userLoading = ref(false); // 用户列表加载状态
const viewAllButtonText = computed(() => {
return isViewAll.value ? '查看已绑定设备' : '查看未绑定设备';
});
// 对话框相关
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const bindDialogVisible = ref(false);
const bindButtonLoading = ref(false);
// 历史用户弹窗相关状态移除无用的currentDeviceId
const historyUserDialogVisible = ref(false); // 历史用户弹窗可见性
const historyUserList = ref<HistoryUserVO[]>([]); // 历史用户列表
const historyUserLoading = ref(false); // 历史用户接口加载状态
// 绑定用户表单数据
const bindForm = reactive({
id: undefined,
projectId: undefined,
userId: undefined,
deviceName: undefined
});
// 绑定用户表单验证规则
const bindRules = reactive({
projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
userId: [{ required: true, message: '请选择用户', trigger: 'change' }]
});
// 初始化表单数据
const initFormData: EquipmentForm = {
id: undefined,
projectId: undefined,
userId: undefined,
clientId: undefined,
deviceName: undefined,
udp: undefined,
remoteAddressStr: undefined,
creationTime: undefined,
lastAccessedTime: undefined,
registered: undefined,
remark: undefined
};
// 页面数据
const data = reactive<PageData<EquipmentForm, EquipmentQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: undefined,
userId: undefined,
clientId: undefined,
deviceName: undefined,
udp: undefined,
remoteAddressStr: undefined,
creationTime: undefined,
lastAccessedTime: undefined,
registered: undefined,
params: {}
},
rules: {
deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/**
* 格式化日期时间
* @param timestamp 时间戳、日期字符串或自定义的 yyyyMMddHHmmss 格式数字
* @returns 格式化后的日期时间字符串yyyy-MM-dd HH:mm:ss
*/
const formatDateTime = (timestamp: any): string => {
if (!timestamp) return '-';
let date: Date;
// 处理自定义的 yyyyMMddHHmmss 格式数字
if (typeof timestamp === 'number' && timestamp.toString().length === 14) {
const timeStr = timestamp.toString();
const year = timeStr.substring(0, 4);
const month = timeStr.substring(4, 6);
const day = timeStr.substring(6, 8);
const hours = timeStr.substring(8, 10);
const minutes = timeStr.substring(10, 12);
const seconds = timeStr.substring(12, 14);
date = new Date(`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`);
}
// 处理时间戳(毫秒数)
else if (typeof timestamp === 'number') {
date = new Date(timestamp.toString().length === 10 ? timestamp * 1000 : timestamp);
}
// 处理字符串类型的时间戳或日期
else if (typeof timestamp === 'string') {
if (/^\d+$/.test(timestamp)) {
const num = parseInt(timestamp);
if (timestamp.length === 14) {
const year = timestamp.substring(0, 4);
const month = timestamp.substring(4, 6);
const day = timestamp.substring(6, 8);
const hours = timestamp.substring(8, 10);
const minutes = timestamp.substring(10, 12);
const seconds = timestamp.substring(12, 14);
date = new Date(`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`);
} else {
date = new Date(timestamp.length === 10 ? num * 1000 : num);
}
} else {
date = new Date(timestamp);
}
}
// 其他情况
else {
return '-';
}
// 检查日期是否有效
if (isNaN(date.getTime())) return '-';
// 格式化日期
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
};
const getList = async () => {
loading.value = true;
try {
// 仅当projectId有实际值非undefined、非null才退出未绑定模式
if (queryParams.value.projectId !== undefined && queryParams.value.projectId !== null) {
isViewAll.value = false;
}
// 已绑定模式下:若未选项目,自动用当前项目补全筛选
if (!isViewAll.value && currentProject.value?.id && queryParams.value.projectId === undefined) {
queryParams.value.projectId = currentProject.value.id;
}
const res = await listEquipment(queryParams.value);
equipmentList.value = res.rows;
total.value = res.total;
} catch (error) {
console.error('获取设备列表失败:', error);
proxy?.$modal.msgError('获取设备列表失败,请重试');
} finally {
loading.value = false;
}
};
const getProjects = async () => {
projectLoading.value = true;
try {
const res = await listProject();
projectList.value = res.rows || [];
} catch (error) {
console.error('获取项目列表失败:', error);
} finally {
projectLoading.value = false;
}
};
/** 根据项目ID获取用户列表 */
const getUsersByProjectId = async (projectId: any) => {
if (!projectId) {
userList.value = [];
return;
}
userLoading.value = true;
try {
const res = await getUserId(projectId);
userList.value = res.data || [];
} catch (error) {
console.error('获取用户列表失败:', error);
proxy?.$modal.msgError('获取用户列表失败,请重试');
} finally {
userLoading.value = false;
}
};
/** 项目选择变化时触发 */
const handleProjectChange = (projectId: any) => {
isViewAll.value = false;
bindForm.userId = undefined;
getUsersByProjectId(projectId);
queryParams.value.projectId = projectId;
getList();
};
/** 切换查看未绑定设备无projectId / 查看已绑定设备有projectId */
const handleViewAll = () => {
queryParams.value.pageNum = 1;
if (!isViewAll.value) {
queryParams.value.projectId = null;
isViewAll.value = true;
proxy?.$modal.msgSuccess('已切换到查看未绑定设备模式(仅显示无项目设备)');
} else {
queryParams.value.projectId = currentProject.value?.id;
isViewAll.value = false;
proxy?.$modal.msgSuccess('已切换到查看已绑定设备模式(仅显示当前项目设备)');
}
getList();
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData, projectId: currentProject.value?.id };
equipmentFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
isViewAll.value = false;
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
isViewAll.value = false;
queryFormRef.value?.resetFields();
queryParams.value.projectId = currentProject.value?.id;
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: EquipmentVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 修改按钮操作 */
const handleUpdate = async (row?: EquipmentVO) => {
reset();
const _id = row?.id || ids.value[0];
try {
const res = await getEquipment(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改GPS设备详细';
} catch (error) {
console.error('获取设备详情失败:', error);
proxy?.$modal.msgError('获取设备详情失败,请重试');
}
};
const submitForm = () => {
equipmentFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
try {
if (form.value.id) {
await updateEquipment(form.value);
} else {
await addEquipment(form.value);
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
} catch (error) {
console.error('提交表单失败:', error);
proxy?.$modal.msgError('操作失败');
} finally {
buttonLoading.value = false;
}
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: EquipmentVO) => {
const _ids = row?.id || ids.value;
try {
await proxy?.$modal.confirm('是否确认删除GPS设备详细编号为"' + _ids + '"的数据项');
await delEquipment(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
} catch (error) {
console.error('删除设备失败:', error);
proxy?.$modal.msgError('删除失败请重试');
} finally {
loading.value = false;
}
};
/** 绑定用户按钮操作 */
const handleBindUser = async (row?: EquipmentVO) => {
Object.assign(bindForm, {
id: undefined,
projectId: undefined,
userId: undefined,
clientId: row?.clientId, // 从行数据中获取clientId并保存到bindForm
deviceName: undefined
});
bindUserFormRef.value?.resetFields();
userList.value = [];
const _id = row?.id || ids.value[0];
try {
const res = await getEquipment(_id);
const equipmentData = res.data;
bindForm.id = equipmentData.id;
bindForm.deviceName = equipmentData.deviceName;
// 确保clientId正确赋值优先使用行数据中的值
bindForm.clientId = row?.clientId || equipmentData.clientId;
if (projectList.value.length === 0) {
await getProjects();
}
if (equipmentData.projectId) {
bindForm.projectId = equipmentData.projectId;
await getUsersByProjectId(equipmentData.projectId);
} else if (currentProject.value?.id) {
bindForm.projectId = currentProject.value.id;
await getUsersByProjectId(currentProject.value.id);
}
bindDialogVisible.value = true;
} catch (error) {
console.error('获取绑定用户信息失败:', error);
proxy?.$modal.msgError('获取数据失败请重试');
}
};
/** 提交绑定用户 */
const submitBindUser = () => {
// 移除多余的row参数因为方法没有接收该参数
bindUserFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
// 验证clientId是否存在
if (!bindForm.clientId) {
proxy?.$modal.msgWarning('设备标识clientId不存在无法完成绑定');
bindButtonLoading.value = false;
return;
}
bindButtonLoading.value = true;
try {
const bindData = {
id: bindForm.id,
projectId: bindForm.projectId,
userId: bindForm.userId,
clientId: bindForm.clientId, // 从bindForm获取clientId
deviceName: bindForm.deviceName
};
// 打印参数日志确认clientId已正确传递
console.log('提交绑定用户参数:', bindData);
await bindUser(bindData);
proxy?.$modal.msgSuccess('用户绑定成功');
bindDialogVisible.value = false;
await getList();
} catch (error) {
console.error('绑定用户失败:', error);
proxy?.$modal.msgError('绑定失败请重试');
} finally {
bindButtonLoading.value = false;
}
}
});
};
/** 取消绑定用户 */
const cancelBindUser = () => {
bindDialogVisible.value = false;
};
/** 取消用户绑定操作 */
const handleUnbindUser = async (row: EquipmentVO) => {
try {
// 1. 打印完整行数据用于调试
console.log('解除绑定 - 原始行数据:', {
rowId: row.id,
rowIdType: typeof row.id,
clientId: row.clientId,
clientIdType: typeof row.clientId
});
// 2. 严格验证参数
if (!row) {
proxy?.$modal.msgWarning('未获取到设备信息');
return;
}
// 验证id
if (row.id === undefined || row.id === null || row.id === '') {
proxy?.$modal.msgWarning('设备ID不能为空');
return;
}
const deviceId = Number(row.id);
if (isNaN(deviceId) || deviceId <= 0) {
proxy?.$modal.msgWarning(`设备ID格式错误必须是正整数当前值: ${row.id}`);
return;
}
// 验证clientId
if (!row.clientId || typeof row.clientId !== 'string' || row.clientId.trim() === '') {
proxy?.$modal.msgWarning(`设备标识clientId格式错误必须是非空字符串当前值: ${row.clientId}`);
return;
}
const clientId = row.clientId.trim();
// 3. 构建符合要求的参数对象
const unbindParams = {
id: deviceId, // 确保是数字类型
clientId: clientId // 确保是字符串类型
};
console.log('解除绑定 - 发送参数:', unbindParams);
console.log('解除绑定 - 参数类型:', {
idType: typeof unbindParams.id,
clientIdType: typeof unbindParams.clientId
});
// 4. 确认对话框
await proxy?.$modal.confirm('是否确认解除该设备的用户绑定');
// 5. 调用接口并记录请求详情
console.log('解除绑定 - 开始调用接口:', '/equipment/removeBind');
const response = await getRemoveBind(unbindParams);
// 6. 记录接口响应
console.log('解除绑定 - 接口响应:', response);
// 7. 验证响应是否成功
if (response && response.code === 200) {
// 根据实际接口成功标识调整
proxy?.$modal.msgSuccess('解除绑定成功');
await getList();
} else {
throw new Error(`接口返回非成功状态: ${JSON.stringify(response)}`);
}
} catch (error) {
// 详细错误信息记录
console.error('解除绑定 - 错误详情:', error);
console.error('解除绑定 - 错误堆栈:', error instanceof Error ? error.stack : '无堆栈信息');
// 区分不同错误类型
if (error === 'cancel' || (error instanceof Error && error.message.includes('cancel'))) {
console.log('用户取消了解除绑定操作');
return;
}
// 显示更具体的错误信息
const errorMsg = error instanceof Error ? error.message : typeof error === 'string' ? error : '未知错误';
proxy?.$modal.msgError(`解除绑定失败: ${errorMsg}`);
}
};
/**
* 打开历史用户弹窗修改后传入clientId和当前用户ID
* @param clientId 设备标识原deviceId参数替换为clientId
* @param currentUserId 当前绑定的用户ID
*/
const handleOpenHistoryUser = async (clientId: string | number | undefined, currentUserId: string | number | undefined) => {
// 边界校验改为校验clientId是否存在而非原deviceId
if (!clientId) {
proxy?.$modal.msgWarning('设备标识clientId不存在无法获取历史用户');
return;
}
historyUserDialogVisible.value = true;
historyUserLoading.value = true;
historyUserList.value = [];
try {
// 关键修改:接口调用时传递 clientId而非原deviceId
// 注意:需确认后端接口接收「设备标识」的参数名(此处假设为 clientId若后端仍用 id 则改为 id: clientId
const res = await gethistroyUser({
clientId: clientId, // 传递设备标识参数名需与后端接口一致如后端用id则改为 id: clientId
userId: currentUserId || '' // 保持当前用户ID不变
});
const rawUserList = res.data || [];
if (currentUserId && rawUserList.length > 0) {
// 分离当前用户和历史用户(当前用户置顶)
const currentUser = rawUserList.find((user: HistoryUserVO) => user.sysUserId === currentUserId);
const historyUsers = rawUserList.filter((user: HistoryUserVO) => user.sysUserId !== currentUserId);
historyUserList.value = currentUser ? [currentUser, ...historyUsers] : historyUsers;
} else {
historyUserList.value = rawUserList;
}
} catch (error) {
console.error('获取历史用户接口调用失败clientId%s:', clientId, error);
proxy?.$modal.msgError('获取历史用户失败请重试');
historyUserList.value = [];
} finally {
historyUserLoading.value = false;
}
};
onMounted(() => {
getProjects().then(() => {
getList();
});
});
// 监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,
(nid) => {
if (!isViewAll.value) {
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
}
}
);
onUnmounted(() => {
listeningProject();
});
// 类型补充
interface DialogOption {
visible: boolean;
title: string;
}
interface PageData<T, Q> {
form: T;
queryParams: Q;
rules: Record<string, any[]>;
}
// 历史用户类型定义(根据后端返回字段调整)
interface HistoryUserVO {
sysUserId: string | number; // 用户ID与绑定用户的userId字段一致
userName: string; // 用户名
lastUseTime?: number | string; // 最后使用时间
bindTime?: number | string; // 绑定时间
type?: number; // 1:当前绑定,其他:历史绑定
// 其他后端返回字段...
}
</script>