From bd8e12dcbab6ee61ff123ee4a40f932846a620d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Tue, 22 Oct 2024 14:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=B0=83=E6=95=B4=EF=BC=9A?= =?UTF-8?q?=E9=A1=B5=E7=A0=81=E7=BB=9F=E4=B8=80=E5=88=9D=E5=A7=8B=E5=B1=95?= =?UTF-8?q?=E7=A4=BA20=E6=9D=A1=E6=95=B0=E6=8D=AE=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9A=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/backend/control/request.ts | 9 + ui/dasadmin/src/router/static.ts | 10 + .../src/views/backend/auth/model/index.vue | 2 +- .../src/views/backend/auth/org/index.vue | 4 +- .../src/views/backend/auth/role/index.vue | 4 +- .../src/views/backend/auth/user/index.vue | 4 +- .../views/backend/equipment/control/index.vue | 203 ++++++++++++++++++ .../equipment/equipmentManagement/index.vue | 20 +- ui/dasadmin/src/views/backend/node/index.vue | 2 +- 9 files changed, 248 insertions(+), 10 deletions(-) create mode 100644 ui/dasadmin/src/api/backend/control/request.ts create mode 100644 ui/dasadmin/src/views/backend/equipment/control/index.vue diff --git a/ui/dasadmin/src/api/backend/control/request.ts b/ui/dasadmin/src/api/backend/control/request.ts new file mode 100644 index 00000000..fc9f1e37 --- /dev/null +++ b/ui/dasadmin/src/api/backend/control/request.ts @@ -0,0 +1,9 @@ +import createAxios from '/@/utils/axios' + +export const sendValueReq = (data: any) => { + return createAxios({ + url: '/api/node/link/deviceControl', + method: 'post', + data: data, + }) +} \ No newline at end of file diff --git a/ui/dasadmin/src/router/static.ts b/ui/dasadmin/src/router/static.ts index f42588e8..b646d2f9 100644 --- a/ui/dasadmin/src/router/static.ts +++ b/ui/dasadmin/src/router/static.ts @@ -70,6 +70,16 @@ const staticRoutes: Array = [ name: 'univer', component: () => import('/@/views/backend/node/univer.vue'), }, + { + path: adminBaseRoutePath +'/airBlower', + name: 'airBlower', + component: () => import('/@/views/backend/equipment/airBlower/index.vue'), + }, + { + path: adminBaseRoutePath +'/control', + name: 'control', + component: () => import('/@/views/backend/equipment/control/index.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 bb831216..282a9ede 100644 --- a/ui/dasadmin/src/views/backend/auth/model/index.vue +++ b/ui/dasadmin/src/views/backend/auth/model/index.vue @@ -960,7 +960,7 @@ const downLoadModel = () => { } const currentPage = ref(1) -const currentPageSize = ref(10) +const currentPageSize = ref(20) const pageTotal = ref(0) const pagePagination = ref([10, 20, 30]) const getcurrentPage = () => { diff --git a/ui/dasadmin/src/views/backend/auth/org/index.vue b/ui/dasadmin/src/views/backend/auth/org/index.vue index b4f947bb..6548119b 100644 --- a/ui/dasadmin/src/views/backend/auth/org/index.vue +++ b/ui/dasadmin/src/views/backend/auth/org/index.vue @@ -379,9 +379,9 @@ const getInstitutionList = (data: getDataType = { name: null }) => { }) } -const pagePagination = [5, 10, 20, 30] +const pagePagination = [ 10, 20, 30] const currentPage = ref(1) -const currentPageSize = ref(pagePagination[0]) +const currentPageSize = ref(pagePagination[1]) const pageTotal = ref(0) const originData = ref() const tableData = computed(() => { diff --git a/ui/dasadmin/src/views/backend/auth/role/index.vue b/ui/dasadmin/src/views/backend/auth/role/index.vue index c9442f74..9c71a9ce 100644 --- a/ui/dasadmin/src/views/backend/auth/role/index.vue +++ b/ui/dasadmin/src/views/backend/auth/role/index.vue @@ -203,9 +203,9 @@ const tableData = computed(() => { return originData.value?.slice(start, end) }) -const pagePagination = [5, 10, 20, 30] +const pagePagination = [10, 20, 30] const currentPage = ref(1) -const currentPageSize = ref(pagePagination[0]) +const currentPageSize = ref(pagePagination[1]) const pageTotal = ref(0) const originData = ref[]>() const addClick = () => { diff --git a/ui/dasadmin/src/views/backend/auth/user/index.vue b/ui/dasadmin/src/views/backend/auth/user/index.vue index c26c7d44..4e0e44cf 100644 --- a/ui/dasadmin/src/views/backend/auth/user/index.vue +++ b/ui/dasadmin/src/views/backend/auth/user/index.vue @@ -546,9 +546,9 @@ const selectUpdataName = (data: string) => { formUserUpData.profilePicture = data } // 分页 -const pagePagination = [5, 10, 20, 30] +const pagePagination = [ 10, 20, 30] const currentPage = ref(1) -const currentPageSize = ref(pagePagination[0]) +const currentPageSize = ref(pagePagination[1]) const handleSizeChange = (val: number) => { formQuery.pageSize = val RyUserQuery(formQuery) diff --git a/ui/dasadmin/src/views/backend/equipment/control/index.vue b/ui/dasadmin/src/views/backend/equipment/control/index.vue new file mode 100644 index 00000000..dae6cd16 --- /dev/null +++ b/ui/dasadmin/src/views/backend/equipment/control/index.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue index cba1ed83..c7765f76 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue @@ -49,6 +49,8 @@