diff --git a/ui/dasadmin/package.json b/ui/dasadmin/package.json index 88722da6..e4456dca 100644 --- a/ui/dasadmin/package.json +++ b/ui/dasadmin/package.json @@ -12,6 +12,19 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", + "@univerjs/core": "^0.2.4", + "@univerjs/design": "^0.2.4", + "@univerjs/docs": "^0.2.4", + "@univerjs/docs-ui": "^0.2.4", + "@univerjs/engine-formula": "^0.2.4", + "@univerjs/engine-numfmt": "^0.2.4", + "@univerjs/engine-render": "^0.2.4", + "@univerjs/facade": "^0.2.4", + "@univerjs/rpc": "^0.2.4", + "@univerjs/sheets": "^0.2.4", + "@univerjs/sheets-formula": "^0.2.4", + "@univerjs/sheets-ui": "^0.2.4", + "@univerjs/ui": "^0.2.4", "@vueuse/core": "10.10.0", "axios": "1.7.2", "countup.js": "2.8.0", diff --git a/ui/dasadmin/src/api/backend/node/request.ts b/ui/dasadmin/src/api/backend/node/request.ts index 4a44a9f1..2e72ec25 100644 --- a/ui/dasadmin/src/api/backend/node/request.ts +++ b/ui/dasadmin/src/api/backend/node/request.ts @@ -12,6 +12,9 @@ import { linkType, } from '/@/views/backend/node/type' import createAxios from '/@/utils/axios' +import { encrypt_aes } from '/@/utils/crypto' +import { useAdminInfo } from '/@/stores/adminInfo' +const adminInfo = useAdminInfo() export const getNodeListReq = () => { return createAxios>({ @@ -83,7 +86,7 @@ export const addLinkListReq = (data: addLinkType) => { }) } -export const downloadNodeReq = (data:any) => { +export const downloadNodeReq = (data: any) => { return createAxios({ url: '', method: 'post', @@ -91,10 +94,75 @@ export const downloadNodeReq = (data:any) => { }) } -export const uploadNodeReq = (data:any) => { +export const uploadNodeReq = (data: any) => { return createAxios({ url: '', method: 'post', data: data, }) } + +export const getMappingListReq = (data: any) => { + return createAxios({ + url: '/api/node/link/getMappingList', + method: 'post', + data: data, + }) +} + +export const saveMappingListReq = (data: any) => { + return createAxios({ + url: '/api/node/link/saveMappingList', + method: 'post', + data: data, + }) +} + +export const bindDeviceMeasReq = (data: any) => { + return createAxios({ + url: '/api/node/link/bindDeviceMeas', + method: 'post', + data: data, + }) +} + +export const getBindDeviceTreeReq = (data: any) => { + return createAxios({ + url: '/api/node/link/getBindDeviceTree', + method: 'post', + data: data, + }) +} + +export const downloadMappingListReq = (data: any) => { + return createAxios( + { + url: '/api/node/link/exportMappingList', + method: 'post', + data: data, + responseType: 'blob', + }, + { + reductDataFormat: false, + } + ) +} + +export const uploadMappingListReq = (data: any, v: string) => { + const token = encrypt_aes(adminInfo.token, v) + return createAxios( + { + url: '/api/node/link/importMappingList', + method: 'post', + data: data, + headers: { + 'Content-Type': 'multipart/form-data', + v, + token, + }, + }, + { + customEncrypt: true, + } + ) +} diff --git a/ui/dasadmin/src/router/static.ts b/ui/dasadmin/src/router/static.ts index 931d4dc5..7c075b2e 100644 --- a/ui/dasadmin/src/router/static.ts +++ b/ui/dasadmin/src/router/static.ts @@ -65,6 +65,11 @@ const staticRoutes: Array = [ title: pageTitle('noPower'), }, }, + { + path: '/univer', + name: 'univer', + component: () => import('/@/views/backend/node/univer.vue'), + }, ] const staticFiles: Record> = import.meta.glob('./static/*.ts', { eager: true }) diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue index 29439419..28b0dc98 100644 --- a/ui/dasadmin/src/views/backend/auth/model/index.vue +++ b/ui/dasadmin/src/views/backend/auth/model/index.vue @@ -622,7 +622,7 @@ const closeAttributeForm = () => { attributeFormRef.value?.resetFields() } const submitAttributeForm = () => { - attributeFormRef.value?.validate((valid) => { + attributeFormRef.value?.validate((valid: boolean) => { if (valid) { if (attributeFormTitle.value === AttributeDialogTitleStateType['add']) { attributeForm.value.iotModelId = curContextMenuTreeData.value!.id! @@ -681,7 +681,7 @@ const closeServiceForm = () => { serviceFormRef.value?.resetFields() } const submitServiceForm = () => { - serviceFormRef.value?.validate((valid) => { + serviceFormRef.value?.validate((valid: boolean) => { if (valid) { if (serviceFormTitle.value === serviceDialogTitleStateType['add']) { serviceForm.value.iotModelId = curContextMenuTreeData.value!.id! diff --git a/ui/dasadmin/src/views/backend/auth/org/index.vue b/ui/dasadmin/src/views/backend/auth/org/index.vue index e3d3a967..9779b841 100644 --- a/ui/dasadmin/src/views/backend/auth/org/index.vue +++ b/ui/dasadmin/src/views/backend/auth/org/index.vue @@ -322,7 +322,7 @@ const addInstitutional = (rightClick = false) => { const submitAddForm = () => { console.log(formModel.value) if (!formRef.value) return - formRef.value.validate((valid) => { + formRef.value.validate((valid:boolean) => { if (valid) { if (dialogTitle.value === '新增机构') { formModel.value.parentOrgId = formModel.value.parentOrgId ?? '0' diff --git a/ui/dasadmin/src/views/backend/node/index.vue b/ui/dasadmin/src/views/backend/node/index.vue index 97ae4516..e32ffeb6 100644 --- a/ui/dasadmin/src/views/backend/node/index.vue +++ b/ui/dasadmin/src/views/backend/node/index.vue @@ -98,6 +98,8 @@