From c65d28ae293da7fcd71c6340e5478437f505478e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Wed, 3 Jul 2024 21:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/backend/DeviceModel/DeviceModel.vue | 774 ++++++++++++++++++ .../views/backend/DeviceModel/contextMenu.vue | 102 +++ .../views/backend/DeviceModel/customTable.vue | 60 ++ .../src/views/backend/DeviceModel/request.ts | 128 +++ .../src/views/backend/DeviceModel/type.ts | 156 ++++ .../src/views/backend/userInfo/userInfo.vue | 3 + 6 files changed, 1223 insertions(+) create mode 100644 ui/dasadmin/src/views/backend/DeviceModel/DeviceModel.vue create mode 100644 ui/dasadmin/src/views/backend/DeviceModel/contextMenu.vue create mode 100644 ui/dasadmin/src/views/backend/DeviceModel/customTable.vue create mode 100644 ui/dasadmin/src/views/backend/DeviceModel/request.ts create mode 100644 ui/dasadmin/src/views/backend/DeviceModel/type.ts diff --git a/ui/dasadmin/src/views/backend/DeviceModel/DeviceModel.vue b/ui/dasadmin/src/views/backend/DeviceModel/DeviceModel.vue new file mode 100644 index 00000000..355fbd77 --- /dev/null +++ b/ui/dasadmin/src/views/backend/DeviceModel/DeviceModel.vue @@ -0,0 +1,774 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/DeviceModel/contextMenu.vue b/ui/dasadmin/src/views/backend/DeviceModel/contextMenu.vue new file mode 100644 index 00000000..2781e6b3 --- /dev/null +++ b/ui/dasadmin/src/views/backend/DeviceModel/contextMenu.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/DeviceModel/customTable.vue b/ui/dasadmin/src/views/backend/DeviceModel/customTable.vue new file mode 100644 index 00000000..dc2a54b4 --- /dev/null +++ b/ui/dasadmin/src/views/backend/DeviceModel/customTable.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/DeviceModel/request.ts b/ui/dasadmin/src/views/backend/DeviceModel/request.ts new file mode 100644 index 00000000..d1ee6099 --- /dev/null +++ b/ui/dasadmin/src/views/backend/DeviceModel/request.ts @@ -0,0 +1,128 @@ +import createAxios from '/@/utils/axios' +import { + RequestReturnType, + GetModelType, + AddModelType, + UpdateModelType, + DelModelType, + GetModelAttributeType, + AddModelAttributeType, + UpdateModelAttributeType, + DelModelAttributeType, + AddModelServiceType, + UpdateModelServiceType, +} from './type' + +export const getModelListReq = (data: GetModelType) => { + return createAxios>({ + url: '/api/equipment/model/list', + method: 'post', + data: data, + }) +} + +export const addModelReq = (data: AddModelType) => { + return createAxios>({ + url: '/api/equipment/model/add', + method: 'post', + data: data, + }) +} + +export const updateModelReq = (data: UpdateModelType) => { + return createAxios({ + url: '/api/equipment/model/update', + method: 'post', + data: data, + }) +} + +export const delModelReq = (data: DelModelType) => { + return createAxios({ + url: '/api/equipment/model/delete', + method: 'post', + data: data, + }) +} + +export const getModelAttributeListReq = (data: GetModelAttributeType) => { + return createAxios>({ + url: '/api/equipment/model/attribute/list', + method: 'post', + data: data, + }) +} + +export const addModelAttributeReq = (data: AddModelAttributeType) => { + return createAxios>({ + url: '/api/equipment/model/attribute/add', + method: 'post', + data: data, + }) +} + +export const updateModelAttributeReq = (data: UpdateModelAttributeType) => { + return createAxios({ + url: '/api/equipment/model/attribute/update', + method: 'post', + data: data, + }) +} + +export const delModelAttributeReq = (data: DelModelAttributeType) => { + return createAxios({ + url: '/api/equipment/model/attribute/delete', + method: 'post', + data: data, + }) +} + +export const getModelServiceListReq = (data: GetModelAttributeType) => { + return createAxios>({ + url: '/api/equipment/model/service/list', + method: 'post', + data: data, + }) +} + +export const addModelServiceReq = (data: AddModelServiceType) => { + return createAxios>({ + url: '/api/equipment/model/service/add', + method: 'post', + data: data, + }) +} + +export const updateModelServiceReq = (data: UpdateModelServiceType) => { + return createAxios({ + url: '/api/equipment/model/service/update', + method: 'post', + data: data, + }) +} + +export const delModelServiceReq = (data: DelModelAttributeType) => { + return createAxios({ + url: '/api/equipment/model/service/delete', + method: 'post', + data: data, + }) +} + +// export const uploadModel = ()=>{ +// return createAxios({ +// url: , +// method: 'post', +// data: data, +// }) +// } + +export const downloadModelReq = (data:{id:string})=>{ + return createAxios({ + url:'/api/equipment/model/export' , + method: 'post', + data: data, + responseType:'blob' + }) +} + diff --git a/ui/dasadmin/src/views/backend/DeviceModel/type.ts b/ui/dasadmin/src/views/backend/DeviceModel/type.ts new file mode 100644 index 00000000..02473883 --- /dev/null +++ b/ui/dasadmin/src/views/backend/DeviceModel/type.ts @@ -0,0 +1,156 @@ +export type RequestReturnType = Promise<{ + code: number + msg: string + success: boolean + data?: T +}> + +export enum ModelFieldsEnums { + 'id' = 'id', + 'objectType' = '设备类型', + 'iotModelCode' = '物模型编码', + 'iotModelName' = '物模型名称', + 'revision' = '乐观锁', + 'createdBy' = '创建人', + 'createdTime' = '创建时间', + 'updatedBy' = '更新人', + 'updatedTime' = '更新时间', +} + +export type ModelFieldsJointType = keyof typeof ModelFieldsEnums + +export type ModelAttributeType = 138 | 139 | 140 + +export type ModelServiceType = 146 | 147 + +export type GetModelType = { + objectType?: number + iotModelName?: string + iotModelCode?: string +} + +export type AddModelType = { + objectType: number | null + iotModelName: string + iotModelCode: string + revision: number + createdBy?: string + createdTime?: string +} + +export type UpdateModelType = { + id: string | null + updatedBy?: string + updatedTime?: string +} & Omit + +export type DelModelType = { + id: string +} + +export enum ModelAttributeFieldsEnums { + 'id' = 'id', + 'iotModelId' = '所属物模型ID', + 'attributeCode' = '属性编码', + 'attributeName' = '属性名称', + 'attributeType' = '属性类型value', + 'attributeTypeName' = '属性类型', + 'porder' = '测点序号', + 'revision' = '乐观锁', + 'createdBy' = '创建人', + 'createdTime' = '创建时间', + 'updatedBy' = '更新人', + 'updatedTime' = '更新时间', +} + +export enum ModelServiceFieldsEnums { + 'id' = 'id', + 'iotModelId' = '所属物模型ID', + 'serviceCode' = '属性编码', + 'serviceName' = '属性名称', + 'serviceType' = '属性类型value', + 'serviceTypeName' = '属性类型', + 'porder' = '测点序号', + 'revision' = '乐观锁', + 'createdBy' = '创建人', + 'createdTime' = '创建时间', + 'updatedBy' = '更新人', + 'updatedTime' = '更新时间', +} + +export type GetModelAttributeType = { + iotModelId: string +} + +export type AddModelAttributeType = { + iotModelId: string + attributeCode: string + attributeName: string + attributeType: ModelAttributeType | null + porder: number | null + revision: number + createdBy?: string + createdTime?: string +} + +export type UpdateModelAttributeType = { + id: string | null + updatedBy?: string + updatedTime?: string +} & Omit + +export type DelModelAttributeType = { + id: string +} + +export type AddModelServiceType = { + iotModelId: string + serviceCode: string + serviceName: string + serviceType: ModelServiceType | null + porder: number | null + revision: number + createdBy?: string + createdTime?: string +} + +export type UpdateModelServiceType = { + id: string | null + updatedBy?: string + updatedTime?: string +} & Omit + +export enum ModelDialogTitleStateType { + 'add' = '新增物模型', + 'edit' = '编辑物模型', + 'detail' = '查看物模型', +} +export type ModelDialogTitleStateKeyType = keyof typeof ModelDialogTitleStateType +export type ModelDialogTitleStateValueType = `${ModelDialogTitleStateType}` + +export type radioGroupType = keyof Pick + +export enum modelTabsType { + 'attribute' = '属性', + 'service' = '方法', +} +export type modelTabsTypeKeyType = keyof typeof modelTabsType + +export type ModelAttributeTableType = AddModelAttributeType & + UpdateModelAttributeType & { + attributeTypeName: string + } +export type ModelServiceTableType = AddModelServiceType & + UpdateModelServiceType & { + serviceTypeName: string + } + +export enum AttributeDialogTitleStateType { + 'add' = '新增物模型属性', + 'edit' = '编辑物模型属性', +} +export enum serviceDialogTitleStateType { + 'add' = '新增物模型方法', + 'edit' = '编辑物模型方法', +} + diff --git a/ui/dasadmin/src/views/backend/userInfo/userInfo.vue b/ui/dasadmin/src/views/backend/userInfo/userInfo.vue index 22ed226d..15fe8cd5 100644 --- a/ui/dasadmin/src/views/backend/userInfo/userInfo.vue +++ b/ui/dasadmin/src/views/backend/userInfo/userInfo.vue @@ -66,6 +66,7 @@ autocomplete="new-password" :placeholder="t('userInfo.Please enter your old password')" v-model="state.passWordInfo.oldPassword" + show-password > @@ -74,6 +75,7 @@ autocomplete="new-password" :placeholder="t('userInfo.Please enter Your New password')" v-model="state.passWordInfo.newPassword" + show-password > @@ -82,6 +84,7 @@ autocomplete="new-password" :placeholder="t('userInfo.Please enter your password again')" v-model="state.passWordInfo.repeatPassword" + show-password >