diff --git a/src/api/history-query/index.ts b/src/api/history-query/index.ts new file mode 100644 index 0000000..97bf8a9 --- /dev/null +++ b/src/api/history-query/index.ts @@ -0,0 +1,13 @@ +import { AxiosPromise } from "axios"; +import { HistoryQueryResult } from "@/api/history-query/types"; +import request from "@/utils/request"; + +export function historyQueryApi( + data: SelectForm +): AxiosPromise { + return request({ + url: "/api/history-query/v1/page", + method: "POST", + data, + }); +} diff --git a/src/api/history-query/types.ts b/src/api/history-query/types.ts new file mode 100644 index 0000000..2cc2841 --- /dev/null +++ b/src/api/history-query/types.ts @@ -0,0 +1,14 @@ +export interface HistoryQueryTableVO { + devSno?: string; + + devOui?: string; + + devTypeName?: string; + + userSnNo?: string; + + insertdate?: string; + + updatedate?: string; +} +export type HistoryQueryResult = PageResult; diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue index 552fa17..6ab5901 100644 --- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue +++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue @@ -128,8 +128,7 @@ function resolvePath(routePath: string) { } // 完整路径(/system/user) = 父级路径(/system) + 路由路径(user) - const fullPath = path.resolve(props.basePath, routePath); - return fullPath; + return path.resolve(props.basePath, routePath); } diff --git a/src/layout/index.vue b/src/layout/index.vue index bab1716..b2a71ab 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -9,7 +9,6 @@ -
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 175d07c..cf86dac 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -59,11 +59,9 @@ const filterAsyncRoutes = (routes: RouteRecordRaw[], roles: string[]) => { if (tmpRoute.children) { tmpRoute.children = filterAsyncRoutes(tmpRoute.children, roles); } - asyncRoutes.push(tmpRoute); } }); - return asyncRoutes; }; diff --git a/src/views/family/operate/history-query/index.vue b/src/views/family/operate/history-query/index.vue new file mode 100644 index 0000000..97457c1 --- /dev/null +++ b/src/views/family/operate/history-query/index.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/family/operate/index.vue b/src/views/family/operate/index.vue new file mode 100644 index 0000000..98240ae --- /dev/null +++ b/src/views/family/operate/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/family/statement/detail-inventory-statistics/index.vue b/src/views/family/statement/detail-inventory-statistics/index.vue new file mode 100644 index 0000000..28ef6ec --- /dev/null +++ b/src/views/family/statement/detail-inventory-statistics/index.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/family/statement/index.vue b/src/views/family/statement/index.vue new file mode 100644 index 0000000..d348559 --- /dev/null +++ b/src/views/family/statement/index.vue @@ -0,0 +1,6 @@ + +