From 7c382a14c52625026d4338f7a70eedaf86725064 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Thu, 12 Jun 2025 16:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/index.ts | 9 +++++++-- src/api/deviceuser/index.ts | 4 ++-- src/views/person/devicebind.vue | 9 ++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/api/device/index.ts b/src/api/device/index.ts index 204967efc..907c79fa4 100644 --- a/src/api/device/index.ts +++ b/src/api/device/index.ts @@ -11,8 +11,8 @@ export interface DeviceVO { orgid: number // 机构ID orgname: string // 机构名称 description: string // 设备描述 - createtime: Date // 创建时间 - updatetime: Date // 更新时间 + createtime: string // 创建时间 + updatetime: string // 更新时间 createby: string // 创建人 updateby: string // 更新人 } @@ -56,4 +56,9 @@ export const DeviceApi = { exportDevice: async (params) => { return await request.download({ url: `/system/device/export-excel`, params }) }, + + //根据设备ID更新设备状态 + updateDeviceStatus: async (devicecode: number, devicestatus: number) => { + return await request.put({ url: `/system/device/updateDeviceStatus?devicecode=` + devicecode + `&devicestatus=` + devicestatus }) + } } diff --git a/src/api/deviceuser/index.ts b/src/api/deviceuser/index.ts index 90725e384..1e3f8c5d4 100644 --- a/src/api/deviceuser/index.ts +++ b/src/api/deviceuser/index.ts @@ -5,8 +5,8 @@ export interface DeviceuserVO { id: number // 主键ID deviceid: number // 设备ID userid: number // 用户ID - createtime: Date // 创建时间 - updatetime: Date // 更新时间 + createtime: string // 创建时间 + updatetime: string // 更新时间 createby: string // 创建人 updateby: string // 更新人 username: string // 用户姓名 diff --git a/src/views/person/devicebind.vue b/src/views/person/devicebind.vue index 8a83b296c..cf9d555a9 100644 --- a/src/views/person/devicebind.vue +++ b/src/views/person/devicebind.vue @@ -115,6 +115,7 @@ import { getStrDictOptions } from '@/utils/dict' import { DICT_TYPE } from '@/utils/dict' import { ContentWrap } from '@/components/ContentWrap' import { DeviceuserApi, DeviceuserVO } from '@/api/deviceuser' +import dayjs from 'dayjs' defineOptions({ name: 'DeviceBind' }) const userProfile = ref() @@ -201,18 +202,20 @@ const handleBind = async (row: DeviceVO) => { return } + const datetime = dayjs().format('YYYY-MM-DD HH:mm:ss') const data: DeviceuserVO = { id: 0, // 新增时后端会自动生成 - deviceid: row.id, + deviceid: row.devicecode, devicetype: row.devicetype, userid: personId.value, username: personName.value || '', - createtime: new Date(), - updatetime: new Date(), + createtime: datetime, + updatetime: datetime, createby: userProfile.value.nickname, updateby: userProfile.value.nickname } await DeviceuserApi.createDeviceuser(data) + await DeviceApi.updateDeviceStatus(row.devicecode, 1) message.success('绑定成功') dialogVisible.value = false } catch (error) {