+
+
+
+
+ {{ translateRouteTitle(tag.title) }}
+
+
+
+
- {
*/
const addCurrentTag = () => {
if (!route.meta?.title) return;
-
tagsViewStore.addView({
name: route.name as string,
title: route.meta.title,
@@ -185,6 +250,7 @@ const addCurrentTag = () => {
affix: route.meta.affix || false,
keepAlive: route.meta.keepAlive || false,
query: route.query,
+ icon: route.meta.icon,
});
};
@@ -254,6 +320,101 @@ const handleScroll = (event: WheelEvent) => {
scrollbarRef.value.setScrollLeft(newScrollLeft);
};
+/**
+ * 滚动距离
+ */
+const scrollLeft = ref
-
-
-
-
-
-
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 73916a09..4950fa29 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -1,37 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - {
*/
const addCurrentTag = () => {
if (!route.meta?.title) return;
+
tagsViewStore.addView({
name: route.name as string,
title: route.meta.title,
@@ -250,7 +185,6 @@ const addCurrentTag = () => {
affix: route.meta.affix || false,
keepAlive: route.meta.keepAlive || false,
query: route.query,
- icon: route.meta.icon,
});
};
@@ -320,101 +254,6 @@ const handleScroll = (event: WheelEvent) => {
scrollbarRef.value.setScrollLeft(newScrollLeft);
};
-/**
- * 滚动距离
- */
-const scrollLeft = ref
+
+
+
+
+
+
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 4950fa29..73916a09 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -1,13 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ {{ translateRouteTitle(tag.title) }}
+
+
+
+
- {
*/
const addCurrentTag = () => {
if (!route.meta?.title) return;
-
tagsViewStore.addView({
name: route.name as string,
title: route.meta.title,
@@ -185,6 +250,7 @@ const addCurrentTag = () => {
affix: route.meta.affix || false,
keepAlive: route.meta.keepAlive || false,
query: route.query,
+ icon: route.meta.icon,
});
};
@@ -254,6 +320,101 @@ const handleScroll = (event: WheelEvent) => {
scrollbarRef.value.setScrollLeft(newScrollLeft);
};
+/**
+ * 滚动距离
+ */
+const scrollLeft = ref
- 
+ 
@@ -24,17 +24,14 @@
-
-
## Introduction
[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) is a minimalist enterprise-level backend management frontend template built with Vue3, Vite7, TypeScript, and Element-Plus. It comes with complementary Java backend [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) and Node backend [youlai-nest](https://gitee.com/youlaiorg/youlai-nest). A simplified version [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) and a JavaScript version [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) are also available for developers to quickly start development.
-
## Project Features
- **Simple and Easy-to-use**: Upgraded version of [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) for Vue3, with minimal encapsulation and easy to get started.
@@ -46,7 +43,6 @@
- **Infrastructure**: Provides internationalization, multiple layouts, dark mode, full screen, watermark, API documentation, and code generator functionality.
- **Continuous Updates**: Project is continuously updated with real-time updates of tools and dependencies.
-
## Project Screenshots
🖥️ **Dashboard**
@@ -72,8 +68,6 @@
| Java Backend | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
| Node Backend | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest) | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
-
-
## Development Guide
| Name | Link |
@@ -85,11 +79,8 @@
| Commit Standards | [Husky + Lint-staged + Commitlint + Commitizen + cz-git for Git Commit Standards](https://youlai.blog.csdn.net/article/details/145615236) |
| API Documentation | [https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
-
-
## Project Setup
-
- **Environment Preparation**
| Environment Type | Name |
@@ -97,8 +88,6 @@
| **Development Tool** | [Visual Studio Code](https://code.visualstudio.com/Download) |
| **Runtime Environment** | ^20.19.0 || >=22.12.0 |
-
-
- **Quick Start**
```bash
@@ -121,7 +110,6 @@ pnpm install
pnpm run dev
```
-
## Project Deployment
After executing the `pnpm run build` command, the project will be bundled and a `dist` directory will be generated. Next, upload the files from the `dist` directory to the `/usr/share/nginx/html` directory on your server and configure Nginx for reverse proxy.
@@ -162,8 +150,7 @@ The project supports both online and local Mock interfaces. By default, it uses
1. Get the backend source code based on `Java` and `SpringBoot` from [youlai-boot](https://gitee.com/youlaiorg/youlai-boot.git).
2. Follow the instructions in the backend project's README.md to [set up and run locally](https://gitee.com/youlaiorg/youlai-boot#%E9%A1%B9%E7%9B%AE%E8%BF%90%E8%A1%8C).
-3. Modify the value of `VITE_APP_API_URL` in the `.env.development` file, changing it from https://api.youlai.tech to http://localhost:8989.
-
+3. Modify the value of `VITE_APP_API_URL` in the `.env.development` file, changing it from
-
+
@@ -44,7 +44,7 @@
- **权限管理：** 支持动态路由、按钮权限、角色权限和数据权限等多种权限管理方式。
- **基础设施：** 提供国际化、多布局、暗黑模式、全屏、水印、接口文档和代码生成器等功能。
-- **持续更新**：项目持续开源更新，实时更新工具和依赖。
+- **持续更新**：项目持续更新，实时更新工具和依赖。
## 项目截图
diff --git a/licenses/vue3-element-admin/LICENSE b/licenses/vue3-element-admin/LICENSE
index 9825cba0..53fbcfa0 100644
--- a/licenses/vue3-element-admin/LICENSE
+++ b/licenses/vue3-element-admin/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2021-present 有来开源组织
+Copyright (c) 2021-present
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
index e02246ab..3fcb9563 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,6 @@
"node": "^20.19.0 || >=22.12.0"
},
"repository": "https://gitee.com/youlaiorg/vue3-element-admin.git",
- "author": "有来开源组织",
+ "author": "",
"license": "MIT"
}
diff --git a/src/api/vehicle/vehicle-info-api.ts b/src/api/vehicle/vehicle-info-api.ts
new file mode 100644
index 00000000..4f2060f0
--- /dev/null
+++ b/src/api/vehicle/vehicle-info-api.ts
@@ -0,0 +1,209 @@
+import { apiJsonGetParams, apiJsonPageQuery } from "@/utils/apijson";
+import request from "@/utils/request";
+import { apiJsonOmit } from "../../utils/apijson";
+
+const VEHICLEINFO_BASE_URL = "/api/v1/vehicle-info";
+const APIJSON_BASE_URL = "/api";
+const VehicleInfoAPI = {
+ /** 获取车辆基本信息分页数据 */
+ getPage(queryParams?: VehicleInfoPageQuery) {
+ return request
diff --git a/src/enums/api/code-enum.ts b/src/enums/api/code-enum.ts
index 6afe5904..57b19caa 100644
--- a/src/enums/api/code-enum.ts
+++ b/src/enums/api/code-enum.ts
@@ -21,3 +21,17 @@ export const enum ApiCodeEnum {
*/
REFRESH_TOKEN_INVALID = "A0231",
}
+
+/**
+ * API响应码枚举
+ */
+export const enum ApiJsonCodeEnum {
+ /**
+ * 成功
+ */
+ SUCCESS = 200,
+ /**
+ * 错误
+ */
+ ERROR = 500,
+}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index c907f33a..d70effc4 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -90,4 +90,4 @@ $sidebar-logo-text-color: var(--sidebar-logo-text-color); // 侧边栏 Logo 文
$sidebar-width: 210px; // 侧边栏宽度
$sidebar-width-collapsed: 54px; // 侧边栏收缩宽度
$navbar-height: 50px; // 导航栏高度
-$tags-view-height: 34px; // TagsView 高度
+$tags-view-height: 37px; // TagsView 高度
diff --git a/src/types/api-json.d.ts b/src/types/api-json.d.ts
new file mode 100644
index 00000000..54b924f2
--- /dev/null
+++ b/src/types/api-json.d.ts
@@ -0,0 +1,90 @@
+import { number } from "echarts/core";
+import { Interface } from "readline";
+
+declare global {
+ /**
+/**
+ * 分页查询参数
+ */
+ interface ApiJsonPageQuery {
+ page: number;
+ count: number;
+ }
+ /**
+ * 表查询条件
+ */
+ interface ApiJsonGetTableParams {
+ [key: string]: string | number | Array | undefined | null;
+ /**
+ * 字段过滤, "id,date,content:text"
+ * 别名写法：content:time
+ */
+ "@column"?: string;
+ }
+
+ /**
+ * 查询类型
+ */
+ enum ApiJsonGetQueryType {
+ /**
+ * 只查询总数
+ */
+ COLUMN = 1,
+ /**
+ * 查询并返回所有数据
+ */
+ DEFAULT = 2,
+ }
+
+ interface ApiJsoParams {
+ /**
+ * {表名： 查询条件}
+ */
+ [key: string]: ApiJsonGetTableParams | any;
+ query?: ApiJsonGetQueryType;
+ tag?: string;
+ page?: number;
+ count?: number;
+ }
+
+ /**
+ * 查询总数
+ */
+ interface ApiJsonGetParams {
+ "[]": ApiJsoParams;
+ "total@"?: "/[]/total";
+ }
+
+ interface ApiJsonPageQueryResult {
+ code: number;
+ msg: string;
+ ok: boolean;
+ time: number;
+ "[]"?: Array;
+ }
+
+ interface PaginationInfo {
+ total: number;
+ count: number;
+ page: number;
+ max: number;
+ more: boolean;
+ first: boolean;
+ last: boolean;
+ }
+
+ interface ApiJsonResponse {
+ code: number;
+ msg: string;
+ ok: boolean;
+ time: number;
+ [key: string]: T;
+ count?: number;
+ page?: number;
+ listInfo?: PaginationInfo;
+ listTotal?: number;
+ "[]"?: Array;
+ }
+}
+
+export {};
diff --git a/src/utils/apijson.ts b/src/utils/apijson.ts
new file mode 100644
index 00000000..382ef689
--- /dev/null
+++ b/src/utils/apijson.ts
@@ -0,0 +1,80 @@
+import { ApiCodeEnum, ApiJsonCodeEnum } from "@/enums";
+
+/**
+ * apijson 分页
+ * @param page 当前页
+ * @param size 每页数量
+ * @returns ApiJsonPageQuery
+ */
+export function apiJsonPageQuery(page: number = 1, size: number = 10): ApiJsonPageQuery {
+ return {
+ page: page - 1,
+ count: size,
+ };
+}
+
+/**
+ * PageQuery 转换为 ApiJsonPageQuery
+ * @param pager
+ * @returns
+ */
+export function PageQueryToApiJsonPageQuery(pager: PageQuery): ApiJsonPageQuery {
+ if (pager.pageNum === undefined || pager.pageSize === undefined) {
+ return apiJsonPageQuery();
+ }
+ return apiJsonPageQuery(pager.pageNum, pager.pageSize);
+}
+
+/**
+ * 忽略对象属性
+ * @param obj
+ * @param keys 忽略的key
+ * @returns
+ * apiJsonOmit(obj, 'key1', 'key2', ...)
+ */
+export function apiJsonOmit(
+ obj: T | undefined,
+ ...keys: K[]
+): Omit {
+ if (!obj) {
+ return {} as Omit;
+ }
+ const result = { ...obj };
+ keys.forEach((key) => {
+ delete result[key];
+ });
+ return result;
+}
+
+export function apiJsonGetParams(
+ tableName: string,
+ params: ApiJsonGetTableParams,
+ pager: ApiJsonPageQuery | undefined = undefined,
+ query: ApiJsonGetQueryType | undefined = 2
+): ApiJsonGetParams {
+ return {
+ "[]": {
+ [tableName]: params,
+ query,
+ page: pager?.page,
+ count: pager?.count,
+ },
+ "total@": "/[]/total",
+ };
+}
+
+export function apiJsonResponseToApiResponse(res: ApiJsonResponse): ApiResponse {
+ const code = res.code === ApiJsonCodeEnum.SUCCESS ? ApiCodeEnum.SUCCESS : ApiCodeEnum.ERROR;
+ const data = res["[]"] as any[];
+ const list = data.map((e) => Object.values(e)[0]);
+ return {
+ code,
+ data: {
+ list,
+ total: res.listInfo?.total,
+ page: res.listInfo?.page,
+ count: res.listInfo?.count,
+ },
+ msg: res.msg,
+ };
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 6da85474..e2469691 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,9 +1,10 @@
import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
import qs from "qs";
-import { ApiCodeEnum } from "@/enums/api/code-enum";
+import { ApiCodeEnum, ApiJsonCodeEnum } from "@/enums/api/code-enum";
import { AuthStorage, redirectToLogin } from "@/utils/auth";
import { useTokenRefresh } from "@/composables/auth/useTokenRefresh";
import { authConfig } from "@/settings";
+import { apiJsonResponseToApiResponse } from "./apijson";
// 初始化token刷新组合式函数
const { refreshTokenAndRetry } = useTokenRefresh();
@@ -44,13 +45,18 @@ httpRequest.interceptors.request.use(
* 响应拦截器 - 统一处理响应和错误
*/
httpRequest.interceptors.response.use(
- (response: AxiosResponse) => {
+ (response: AxiosResponse) => {
// 如果响应是二进制数据，则直接返回response对象（用于文件下载、Excel导出、图片显示等）
if (response.config.responseType === "blob" || response.config.responseType === "arraybuffer") {
return response;
}
- const { code, data, msg } = response.data;
+ const responseData =
+ response.data.code === ApiJsonCodeEnum.SUCCESS || response.data.code === ApiJsonCodeEnum.ERROR
+ ? apiJsonResponseToApiResponse(response.data as ApiJsonResponse)
+ : (response.data as ApiResponse);
+
+ const { code, data, msg } = responseData;
// 请求成功
if (code === ApiCodeEnum.SUCCESS) {
diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index 98200d22..25e3c9bc 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -27,7 +27,7 @@ const selectConfig: ISelectConfig = {
data: [
{
value: 1,
- label: "有来技术",
+ label: "技术",
children: [
{
value: 2,
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 28138d5e..40eabd35 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -3,12 +3,7 @@
OOPS！
-
- 该页面无法访问。
-
- 有来开源官网
-
-
+ 该页面无法访问。
抱歉，您访问的页面不存在。
请确认您输入的网址是否正确，或者点击下方按钮返回首页。
diff --git a/src/views/vehicle/vehicle-info/index.vue b/src/views/vehicle/vehicle-info/index.vue
new file mode 100644
index 00000000..219c54dd
--- /dev/null
+++ b/src/views/vehicle/vehicle-info/index.vue
@@ -0,0 +1,574 @@
+
+ 元素
+ "removeTitle", // 移除 元素
+ "removeDesc", // 移除 <desc> 元素（描述）
+ "removeUselessDefs", // 移除无用的 <defs> 内容
+ "removeXMLNS", // 移除 xmlns 属性（如果不需要）
+ "removeEditorsNSData", // 移除编辑器生成的无用数据（如 Adobe Illustrator 的元数据）
+ "cleanupNumericValues", // 清理数值，如将 1.000 改为 1
+ "convertColors", // 将颜色值转换为最短形式（如 #ff0000 -> #f00）
+ "convertPathData", // 优化路径数据（合并路径、转换形状等）
+ "convertTransform", // 优化 transform 属性
+ "removeEmptyAttrs", // 移除空的属性
+ "removeEmptyContainers", // 移除空的容器元素（如 <g>）
+ "mergePaths", // 合并相邻的路径
+ "removeHiddenElems", // 移除隐藏的元素（如 display:none）
+ "removeUnusedNS", // 移除未使用的命名空间
+ "sortAttrs", // 对属性进行排序（可选，对文件大小影响小，但可提高可读性）
+ "removeUnknownsAndDefaults", // 移除未知元素和默认值
+ ],
+};
diff --git "a/svgo/\344\275\277\347\224\250\350\257\264\346\230\216.md" "b/svgo/\344\275\277\347\224\250\350\257\264\346\230\216.md"
new file mode 100644
index 00000000..8d639148
--- /dev/null
+++ "b/svgo/\344\275\277\347\224\250\350\257\264\346\230\216.md"
@@ -0,0 +1,4 @@
+
+``` bash
+svgo --config svgo.config.cjs -f ./icons
+```
diff --git a/vite.config.ts b/vite.config.ts
index 15bca5f8..f8d4fa5e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -48,7 +48,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
changeOrigin: true,
// 代理目标地址：https://api.youlai.tech
target: env.VITE_APP_API_URL,
- rewrite: (path: string) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
+ //rewrite: (path: string) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
},
},
},
--
Gitee
From 6f6c57e66b43f06d8d44019f7711b87ce7d92f56 Mon Sep 17 00:00:00 2001
From: liqianliang <1012083552@qq.com>
Date: Fri, 3 Oct 2025 23:44:33 +0800
Subject: [PATCH 5/7] =?UTF-8?q?wip:=20:construction:=20apijson=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/request-api.ts | 119 ++++++++
src/api/vehicle/vehicle-info-api.ts | 12 -
src/api/vehicle/vehicle-info-apijson.ts | 212 ++++++++++++++
src/apiJson/system/RequestAPIJSON.ts | 125 +++++++++
src/types/api-json.d.ts | 12 +-
src/utils/apijson.ts | 97 ++++++-
src/views/system/request/index.vue | 336 +++++++++++++++++++++++
src/views/vehicle/vehicle-info/index.vue | 4 +-
8 files changed, 888 insertions(+), 29 deletions(-)
create mode 100644 src/api/system/request-api.ts
create mode 100644 src/api/vehicle/vehicle-info-apijson.ts
create mode 100644 src/apiJson/system/RequestAPIJSON.ts
create mode 100644 src/views/system/request/index.vue
diff --git a/src/api/system/request-api.ts b/src/api/system/request-api.ts
new file mode 100644
index 00000000..6b52971a
--- /dev/null
+++ b/src/api/system/request-api.ts
@@ -0,0 +1,119 @@
+import request from "@/utils/request";
+
+const REQUEST_BASE_URL = "/api/v1/request";
+
+const RequestAPI = {
+ /** 获取apijson校验配置分页数据 */
+ getPage(queryParams?: RequestPageQuery) {
+ return request<any, PageResult<RequestPageVO[]>>({
+ url: `${REQUEST_BASE_URL}/page`,
+ method: "get",
+ params: queryParams,
+ });
+ },
+ /**
+ * 获取apijson校验配置表单数据
+ *
+ * @param id apijson校验配置ID
+ * @returns apijson校验配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, RequestForm>({
+ url: `${REQUEST_BASE_URL}/${id}/form`,
+ method: "get",
+ });
+ },
+
+ /**
+ * 添加apijson校验配置
+ *
+ * @param data apijson校验配置表单数据
+ */
+ create(data: RequestForm) {
+ return request({
+ url: `${REQUEST_BASE_URL}`,
+ method: "post",
+ data,
+ });
+ },
+
+ /**
+ * 更新apijson校验配置
+ *
+ * @param id apijson校验配置ID
+ * @param data apijson校验配置表单数据
+ */
+ update(id: string, data: RequestForm) {
+ return request({
+ url: `${REQUEST_BASE_URL}/${id}`,
+ method: "put",
+ data,
+ });
+ },
+
+ /**
+ * 批量删除apijson校验配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson校验配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${REQUEST_BASE_URL}/${ids}`,
+ method: "delete",
+ });
+ },
+};
+
+export default RequestAPI;
+
+/** apijson校验配置分页查询参数 */
+export interface RequestPageQuery extends PageQuery {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+}
+
+/** apijson校验配置表单对象 */
+export interface RequestForm {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
+
+/** apijson校验配置分页对象 */
+export interface RequestPageVO {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
diff --git a/src/api/vehicle/vehicle-info-api.ts b/src/api/vehicle/vehicle-info-api.ts
index 4f2060f0..5f2c89e0 100644
--- a/src/api/vehicle/vehicle-info-api.ts
+++ b/src/api/vehicle/vehicle-info-api.ts
@@ -14,18 +14,6 @@ const VehicleInfoAPI = {
});
},
- /** 获取车辆基本信息分页数据 */
- getPageApiJson(queryParams?: VehicleInfoPageQuery) {
- return request<any, PageResult<VehicleInfoPageVO[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetParams(
- "VehicleInfo",
- apiJsonOmit(queryParams, "pageNum", "pageSize"),
- apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
- ),
- });
- },
/**
* 获取车辆基本信息表单数据
*
diff --git a/src/api/vehicle/vehicle-info-apijson.ts b/src/api/vehicle/vehicle-info-apijson.ts
new file mode 100644
index 00000000..0be1e639
--- /dev/null
+++ b/src/api/vehicle/vehicle-info-apijson.ts
@@ -0,0 +1,212 @@
+import {
+ apiJsonDeleteTableParams,
+ apiJsonGetOneTableParams,
+ apiJsonPageQuery,
+} from "@/utils/apijson";
+import request from "@/utils/request";
+import { apiJsonOmit } from "../../utils/apijson";
+
+const VEHICLEINFO_BASE_URL = "/api/v1/vehicle-info";
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "VehicleInfo";
+const VehicleInfoAPI = {
+ /** 获取车辆基本信息分页数据 */
+ getPage(queryParams?: VehicleInfoPageQuery) {
+ return request<any, PageResult<VehicleInfoPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取车辆基本信息表单数据
+ *
+ * @param id 车辆基本信息ID
+ * @returns 车辆基本信息表单数据
+ */
+ getFormData(id: number) {
+ return request<any, VehicleInfoForm>({
+ url: `${VEHICLEINFO_BASE_URL}/${id}/form`,
+ method: "get",
+ });
+ },
+
+ /**
+ * 添加车辆基本信息
+ *
+ * @param data 车辆基本信息表单数据
+ */
+ create(data: VehicleInfoForm) {
+ return request({
+ url: `${VEHICLEINFO_BASE_URL}`,
+ method: "post",
+ data,
+ });
+ },
+
+ /**
+ * 更新车辆基本信息
+ *
+ * @param id 车辆基本信息ID
+ * @param data 车辆基本信息表单数据
+ */
+ update(id: string, data: VehicleInfoForm) {
+ return request({
+ url: `${VEHICLEINFO_BASE_URL}/${id}`,
+ method: "put",
+ data,
+ });
+ },
+
+ /**
+ * 批量删除车辆基本信息，多个以英文逗号(,)分割
+ *
+ * @param ids 车辆基本信息ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "delete",
+ data: apiJsonDeleteTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ ""
+ ),
+ });
+ },
+};
+
+export default VehicleInfoAPI;
+
+/** 车辆基本信息分页查询参数 */
+export interface VehicleInfoPageQuery extends PageQuery {}
+
+/** 车辆基本信息表单对象 */
+export interface VehicleInfoForm {
+ /** 主键ID */
+ id?: number;
+ /** 车辆唯一编号（内部系统编号） */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型：手动、自动、手自一体 */
+ gearboxType?: string;
+ /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ status?: string;
+ /** 所属部门ID（无外键约束） */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID（无外键约束） */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
+
+/** 车辆基本信息分页对象 */
+export interface VehicleInfoPageVO {
+ /** 主键ID */
+ id?: number;
+ /** 车辆唯一编号（内部系统编号） */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型：手动、自动、手自一体 */
+ gearboxType?: string;
+ /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ status?: string;
+ /** 所属部门ID（无外键约束） */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID（无外键约束） */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
diff --git a/src/apiJson/system/RequestAPIJSON.ts b/src/apiJson/system/RequestAPIJSON.ts
new file mode 100644
index 00000000..a86d864c
--- /dev/null
+++ b/src/apiJson/system/RequestAPIJSON.ts
@@ -0,0 +1,125 @@
+import { apiJsonGetOneTableParams, apiJsonOmit, apiJsonPageQuery } from "@/utils/apijson";
+import request from "@/utils/request";
+
+const REQUEST_BASE_URL = "/api/v1/request";
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "Request";
+const RequestAPI = {
+ /** 获取apijson校验配置分页数据 */
+ getPage(queryParams?: RequestPageQuery) {
+ return request<any, PageResult<RequestPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取apijson校验配置表单数据
+ *
+ * @param id apijson校验配置ID
+ * @returns apijson校验配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, RequestForm>({
+ url: `${REQUEST_BASE_URL}/${id}/form`,
+ method: "get",
+ });
+ },
+
+ /**
+ * 添加apijson校验配置
+ *
+ * @param data apijson校验配置表单数据
+ */
+ create(data: RequestForm) {
+ return request({
+ url: `${REQUEST_BASE_URL}`,
+ method: "post",
+ data,
+ });
+ },
+
+ /**
+ * 更新apijson校验配置
+ *
+ * @param id apijson校验配置ID
+ * @param data apijson校验配置表单数据
+ */
+ update(id: string, data: RequestForm) {
+ return request({
+ url: `${REQUEST_BASE_URL}/${id}`,
+ method: "put",
+ data,
+ });
+ },
+
+ /**
+ * 批量删除apijson校验配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson校验配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${REQUEST_BASE_URL}/${ids}`,
+ method: "delete",
+ });
+ },
+};
+
+export default RequestAPI;
+
+/** apijson校验配置分页查询参数 */
+export interface RequestPageQuery extends PageQuery {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+}
+
+/** apijson校验配置表单对象 */
+export interface RequestForm {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
+
+/** apijson校验配置分页对象 */
+export interface RequestPageVO {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
diff --git a/src/types/api-json.d.ts b/src/types/api-json.d.ts
index 54b924f2..82365912 100644
--- a/src/types/api-json.d.ts
+++ b/src/types/api-json.d.ts
@@ -13,7 +13,7 @@ declare global {
/**
* 表查询条件
*/
- interface ApiJsonGetTableParams {
+ interface ApiJsonTableParams {
[key: string]: string | number | Array<number | string> | undefined | null;
/**
* 字段过滤, "id,date,content:text"
@@ -40,7 +40,7 @@ declare global {
/**
* {表名： 查询条件}
*/
- [key: string]: ApiJsonGetTableParams | any;
+ [key: string]: ApiJsonTableParams | any;
query?: ApiJsonGetQueryType;
tag?: string;
page?: number;
@@ -55,6 +55,14 @@ declare global {
"total@"?: "/[]/total";
}
+ /**
+ * 删除
+ */
+ interface ApiJsonPutParams {
+ [key: string]: ApiJsonTableParams;
+ tag: string;
+ }
+
interface ApiJsonPageQueryResult<T = any> {
code: number;
msg: string;
diff --git a/src/utils/apijson.ts b/src/utils/apijson.ts
index 382ef689..a29d2db9 100644
--- a/src/utils/apijson.ts
+++ b/src/utils/apijson.ts
@@ -1,4 +1,28 @@
import { ApiCodeEnum, ApiJsonCodeEnum } from "@/enums";
+import { table } from "console";
+
+// 工具类型：将单个 snake_case 字符串转为 camelCase
+type SnakeToCamel<S extends string> = S extends `${infer T}_${infer U}`
+ ? `${T}${Capitalize<U>}`
+ : S;
+
+// 将对象第一层的 key 从 snake_case 转为 camelCase
+type ToCamelCase<T> = {
+ [K in keyof T as SnakeToCamel<string & K>]: T[K];
+};
+
+// 实现函数（仅处理第一层）
+function keysToCamelCase<T extends Record<string, any>>(obj: T): ToCamelCase<T> {
+ const result = {} as any;
+ for (const key in obj) {
+ if (Object.prototype.hasOwnProperty.call(obj, key)) {
+ // 转换 key: snake_case -> camelCase
+ const camelKey = key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+ result[camelKey] = obj[key]; // 直接赋值，不递归
+ }
+ }
+ return result;
+}
/**
* apijson 分页
@@ -46,9 +70,38 @@ export function apiJsonOmit<T extends object, K extends keyof T>(
return result;
}
-export function apiJsonGetParams(
+/**
+ * ApiJsonResponse 转换为 ApiResponse
+ * @param res
+ * @returns
+ */
+export function apiJsonResponseToApiResponse(res: ApiJsonResponse): ApiResponse {
+ const code = res.code === ApiJsonCodeEnum.SUCCESS ? ApiCodeEnum.SUCCESS : ApiCodeEnum.ERROR;
+ const data = res["[]"] as { [key: string]: ApiJsonTableParams }[];
+ const list = data.map((e) => keysToCamelCase(Object.values(e)[0]));
+ return {
+ code,
+ data: {
+ list,
+ total: res.listInfo?.total,
+ page: res.listInfo?.page,
+ count: res.listInfo?.count,
+ },
+ msg: res.msg,
+ };
+}
+
+/**
+ * 单表查询，拼接get请求表参数
+ * @param tableName
+ * @param params
+ * @param pager
+ * @param query
+ * @returns
+ */
+export function apiJsonGetOneTableParams(
tableName: string,
- params: ApiJsonGetTableParams,
+ params: ApiJsonTableParams,
pager: ApiJsonPageQuery | undefined = undefined,
query: ApiJsonGetQueryType | undefined = 2
): ApiJsonGetParams {
@@ -63,18 +116,36 @@ export function apiJsonGetParams(
};
}
-export function apiJsonResponseToApiResponse(res: ApiJsonResponse): ApiResponse {
- const code = res.code === ApiJsonCodeEnum.SUCCESS ? ApiCodeEnum.SUCCESS : ApiCodeEnum.ERROR;
- const data = res["[]"] as any[];
- const list = data.map((e) => Object.values(e)[0]);
+/**
+ * 多表查询，拼接get请求参数
+ * @param tables
+ * @param pager
+ * @param query
+ * @returns
+ */
+export function apiJsonGetTableParams(
+ tables: ApiJsonTableParams,
+ pager: ApiJsonPageQuery | undefined = undefined,
+ query: ApiJsonGetQueryType | undefined = 2
+): ApiJsonGetParams {
return {
- code,
- data: {
- list,
- total: res.listInfo?.total,
- page: res.listInfo?.page,
- count: res.listInfo?.count,
+ "[]": {
+ ...tables,
+ query,
+ page: pager?.page,
+ count: pager?.count,
},
- msg: res.msg,
+ "total@": "/[]/total",
};
}
+
+export function apiJsonDeleteTableParams(
+ tableName: string,
+ params: ApiJsonTableParams,
+ tag: string
+): ApiJsonPutParams {
+ return {
+ [tableName]: params,
+ tag,
+ } as ApiJsonPutParams;
+}
diff --git a/src/views/system/request/index.vue b/src/views/system/request/index.vue
new file mode 100644
index 00000000..72e9480d
--- /dev/null
+++ b/src/views/system/request/index.vue
@@ -0,0 +1,336 @@
+<template>
+ <div class="app-container">
+ <div class="search-container">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="唯一标识" prop="id">
+ <el-input
+ v-model="queryParams.id"
+ placeholder="唯一标识"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
+ <el-form-item label="调试" prop="debug">
+ <Dict v-model="queryParams.debug" code="apijson_debbug" />
+ </el-form-item>
+ <el-form-item label="请求方式" prop="method">
+ <Dict v-model="queryParams.method" code="apijson_method" />
+ </el-form-item>
+ <el-form-item label="标签" prop="tag">
+ <el-input
+ v-model="queryParams.tag"
+ placeholder="标签"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
+ <el-form-item class="search-buttons">
+ <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+ <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <el-card shadow="never">
+ <div class="mb-10px">
+ <el-button
+ v-hasPerm="['system:request:add']"
+ type="success"
+ icon="plus"
+ @click="handleOpenDialog()"
+ >
+ 新增
+ </el-button>
+ <el-button
+ v-hasPerm="['system:request:delete']"
+ type="danger"
+ :disabled="removeIds.length === 0"
+ icon="delete"
+ @click="handleDelete()"
+ >
+ 删除
+ </el-button>
+ </div>
+
+ <el-table
+ ref="dataTableRef"
+ v-loading="loading"
+ :data="pageData"
+ highlight-current-row
+ border
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column key="id" label="唯一标识" prop="id" min-width="150" align="center" />
+ <el-table-column label="调试" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.debug" code="apijson_debbug" />
+ </template>
+ </el-table-column>
+ <el-table-column label="版本" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.version" code="apijson_debbug" />
+ </template>
+ </el-table-column>
+ <el-table-column label="请求方式" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.method" code="apijson_method" />
+ </template>
+ </el-table-column>
+ <el-table-column key="tag" label="标签" prop="tag" min-width="150" align="center" />
+ <el-table-column
+ key="structure"
+ label="校验结构JSON"
+ prop="structure"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="detail"
+ label="详细说明"
+ prop="detail"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column key="date" label="创建日期" prop="date" min-width="150" align="center" />
+ <el-table-column fixed="right" label="操作" width="220">
+ <template #default="scope">
+ <el-button
+ v-hasPerm="['system:request:edit']"
+ type="primary"
+ size="small"
+ link
+ icon="edit"
+ @click="handleOpenDialog(scope.row.id)"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ v-hasPerm="['system:request:delete']"
+ type="danger"
+ size="small"
+ link
+ icon="delete"
+ @click="handleDelete(scope.row.id)"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-if="total > 0"
+ v-model:total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="handleQuery()"
+ />
+ </el-card>
+
+ <!-- apijson校验配置表单弹窗 -->
+ <el-dialog
+ v-model="dialog.visible"
+ :title="dialog.title"
+ width="500px"
+ @close="handleCloseDialog"
+ >
+ <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
+ <el-form-item label="唯一标识" prop="id">
+ <el-input v-model="formData.id" placeholder="唯一标识" />
+ </el-form-item>
+
+ <el-form-item label="调试" prop="debug">
+ <Dict v-model="formData.debug" code="apijson_debbug" />
+ </el-form-item>
+
+ <el-form-item label="版本" prop="version">
+ <el-input v-model="formData.version" placeholder="版本" />
+ </el-form-item>
+
+ <el-form-item label="请求方式" prop="method">
+ <Dict v-model="formData.method" code="apijson_method" />
+ </el-form-item>
+
+ <el-form-item label="标签" prop="tag">
+ <el-input v-model="formData.tag" placeholder="标签" />
+ </el-form-item>
+
+ <el-form-item label="校验结构JSON" prop="structure">
+ <el-input v-model="formData.structure" type="textarea" placeholder="校验结构JSON" />
+ </el-form-item>
+
+ <el-form-item label="详细说明" prop="detail">
+ <el-input v-model="formData.detail" type="textarea" placeholder="详细说明" />
+ </el-form-item>
+
+ <el-form-item label="创建日期" prop="date">
+ <el-date-picker
+ v-model="formData.date"
+ class="!w-[240px]"
+ type="date"
+ placeholder="创建日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleSubmit()">确定</el-button>
+ <el-button @click="handleCloseDialog()">取消</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+ name: "Request",
+ inheritAttrs: false,
+});
+
+import RequestAPI, {
+ RequestPageVO,
+ RequestForm,
+ RequestPageQuery,
+} from "@/apiJson/system/RequestAPIJSON";
+
+const queryFormRef = ref();
+const dataFormRef = ref();
+
+const loading = ref(false);
+const removeIds = ref<number[]>([]);
+const total = ref(0);
+
+const queryParams = reactive<RequestPageQuery>({
+ pageNum: 1,
+ pageSize: 10,
+});
+
+// apijson校验配置表格数据
+const pageData = ref<RequestPageVO[]>([]);
+
+// 弹窗
+const dialog = reactive({
+ title: "",
+ visible: false,
+});
+
+// apijson校验配置表单数据
+const formData = reactive<RequestForm>({});
+
+// apijson校验配置表单校验规则
+const rules = reactive({
+ id: [{ required: true, message: "请输入唯一标识", trigger: "blur" }],
+ debug: [{ required: true, message: "请输入调试", trigger: "blur" }],
+ version: [{ required: true, message: "请输入版本", trigger: "blur" }],
+ tag: [{ required: true, message: "请输入标签", trigger: "blur" }],
+ structure: [{ required: true, message: "请输入校验结构JSON", trigger: "blur" }],
+});
+
+/** 查询apijson校验配置 */
+function handleQuery() {
+ loading.value = true;
+ RequestAPI.getPage(queryParams)
+ .then((data) => {
+ pageData.value = data.list;
+ total.value = data.total;
+ })
+ .finally(() => {
+ loading.value = false;
+ });
+}
+
+/** 重置apijson校验配置查询 */
+function handleResetQuery() {
+ queryFormRef.value!.resetFields();
+ queryParams.pageNum = 1;
+ handleQuery();
+}
+
+/** 行复选框选中记录选中ID集合 */
+function handleSelectionChange(selection: any) {
+ removeIds.value = selection.map((item: any) => item.id);
+}
+
+/** 打开apijson校验配置弹窗 */
+function handleOpenDialog(id?: number) {
+ dialog.visible = true;
+ if (id) {
+ dialog.title = "修改apijson校验配置";
+ RequestAPI.getFormData(id).then((data) => {
+ Object.assign(formData, data);
+ });
+ } else {
+ dialog.title = "新增apijson校验配置";
+ }
+}
+
+/** 提交apijson校验配置表单 */
+function handleSubmit() {
+ dataFormRef.value.validate((valid: any) => {
+ if (valid) {
+ loading.value = true;
+ const id = formData.id;
+ if (id) {
+ RequestAPI.update(id, formData)
+ .then(() => {
+ ElMessage.success("修改成功");
+ handleCloseDialog();
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ } else {
+ RequestAPI.add(formData)
+ .then(() => {
+ ElMessage.success("新增成功");
+ handleCloseDialog();
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ }
+ }
+ });
+}
+
+/** 关闭apijson校验配置弹窗 */
+function handleCloseDialog() {
+ dialog.visible = false;
+ dataFormRef.value.resetFields();
+ dataFormRef.value.clearValidate();
+ formData.id = undefined;
+}
+
+/** 删除apijson校验配置 */
+function handleDelete(id?: number) {
+ const ids = [id || removeIds.value].join(",");
+ if (!ids) {
+ ElMessage.warning("请勾选删除项");
+ return;
+ }
+
+ ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(
+ () => {
+ loading.value = true;
+ RequestAPI.deleteByIds(ids)
+ .then(() => {
+ ElMessage.success("删除成功");
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ },
+ () => {
+ ElMessage.info("已取消删除");
+ }
+ );
+}
+
+onMounted(() => {
+ handleQuery();
+});
+</script>
diff --git a/src/views/vehicle/vehicle-info/index.vue b/src/views/vehicle/vehicle-info/index.vue
index 219c54dd..cabfb32f 100644
--- a/src/views/vehicle/vehicle-info/index.vue
+++ b/src/views/vehicle/vehicle-info/index.vue
@@ -419,7 +419,7 @@ import VehicleInfoAPI, {
VehicleInfoPageVO,
VehicleInfoForm,
VehicleInfoPageQuery,
-} from "@/api/vehicle/vehicle-info-api";
+} from "@/api/vehicle/vehicle-info-apijson";
const queryFormRef = ref();
const dataFormRef = ref();
@@ -469,7 +469,7 @@ const rules = reactive({
/** 查询车辆基本信息 */
function handleQuery() {
loading.value = true;
- VehicleInfoAPI.getPageApiJson(queryParams)
+ VehicleInfoAPI.getPage(queryParams)
.then((data) => {
console.log(data);
pageData.value = data.list;
--
Gitee
From 2355d0bf5c19dd314808bbf325305b08fe4675d8 Mon Sep 17 00:00:00 2001
From: liqianliang <1012083552@qq.com>
Date: Sat, 4 Oct 2025 19:24:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?wip:=20:construction:=20apijson=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 5 +-
src/api/system/access-api.ts | 134 ++++++
src/api/system/request-api.ts | 2 -
src/api/vehicle/vehicle-info-api.ts | 26 +-
src/apiJson3/system/AccessAPIJSON.ts | 161 +++++++
.../system/RequestAPIJSON.ts | 52 ++-
src/apiJson3/system/vehicle-info-apijson.ts | 224 ++++++++++
src/apiJson3/vehicle/vehicle-info-apijson.ts | 239 +++++++++++
src/apijson/system/access-apijson.ts | 166 ++++++++
src/apijson/system/request-apijson.ts | 149 +++++++
.../vehicle/vehicle-info-apijson.ts | 65 +--
src/types/api-json.d.ts | 4 +
src/utils/apijson.ts | 30 +-
src/views/system/access/index.vue | 396 ++++++++++++++++++
src/views/system/request/index.vue | 49 ++-
src/views/vehicle/vehicle-info/index.vue | 117 +++---
16 files changed, 1682 insertions(+), 137 deletions(-)
create mode 100644 src/api/system/access-api.ts
create mode 100644 src/apiJson3/system/AccessAPIJSON.ts
rename src/{apiJson => apiJson3}/system/RequestAPIJSON.ts (70%)
create mode 100644 src/apiJson3/system/vehicle-info-apijson.ts
create mode 100644 src/apiJson3/vehicle/vehicle-info-apijson.ts
create mode 100644 src/apijson/system/access-apijson.ts
create mode 100644 src/apijson/system/request-apijson.ts
rename src/{api => apijson}/vehicle/vehicle-info-apijson.ts (80%)
create mode 100644 src/views/system/access/index.vue
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b622da8c..d05ee60e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -70,5 +70,8 @@
"i18n-ally.keystyle": "nested",
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[markdown]": {
+ "editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
}
-}
+}
\ No newline at end of file
diff --git a/src/api/system/access-api.ts b/src/api/system/access-api.ts
new file mode 100644
index 00000000..64de2a35
--- /dev/null
+++ b/src/api/system/access-api.ts
@@ -0,0 +1,134 @@
+import request from "@/utils/request";
+
+const ACCESS_BASE_URL = "/api/v1/access";
+
+const AccessAPI = {
+ /** 获取apijson权限配置分页数据 */
+ getPage(queryParams?: AccessPageQuery) {
+ return request<any, PageResult<AccessPageVO[]>>({
+ url: `${ACCESS_BASE_URL}/page`,
+ method: "get",
+ params: queryParams,
+ });
+ },
+ /**
+ * 获取apijson权限配置表单数据
+ *
+ * @param id apijson权限配置ID
+ * @returns apijson权限配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, AccessForm>({
+ url: `${ACCESS_BASE_URL}/${id}/form`,
+ method: "get",
+ });
+ },
+
+ /**
+ * 添加apijson权限配置
+ *
+ * @param data apijson权限配置表单数据
+ */
+ create(data: AccessForm) {
+ return request({
+ url: `${ACCESS_BASE_URL}`,
+ method: "post",
+ data,
+ });
+ },
+
+ /**
+ * 更新apijson权限配置
+ *
+ * @param id apijson权限配置ID
+ * @param data apijson权限配置表单数据
+ */
+ update(id: string, data: AccessForm) {
+ return request({
+ url: `${ACCESS_BASE_URL}/${id}`,
+ method: "put",
+ data,
+ });
+ },
+
+ /**
+ * 批量删除apijson权限配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson权限配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${ACCESS_BASE_URL}/${ids}`,
+ method: "delete",
+ });
+ },
+};
+
+export default AccessAPI;
+
+/** apijson权限配置分页查询参数 */
+export interface AccessPageQuery extends PageQuery {
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+}
+
+/** apijson权限配置表单对象 */
+export interface AccessForm {
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
+
+/** apijson权限配置分页对象 */
+export interface AccessPageVO {
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
diff --git a/src/api/system/request-api.ts b/src/api/system/request-api.ts
index 6b52971a..5c3c6213 100644
--- a/src/api/system/request-api.ts
+++ b/src/api/system/request-api.ts
@@ -80,8 +80,6 @@ export interface RequestPageQuery extends PageQuery {
/** apijson校验配置表单对象 */
export interface RequestForm {
- /** 唯一标识 */
- id?: number;
/** 调试 */
debug?: number;
/** 版本 */
diff --git a/src/api/vehicle/vehicle-info-api.ts b/src/api/vehicle/vehicle-info-api.ts
index 5f2c89e0..73bd7df1 100644
--- a/src/api/vehicle/vehicle-info-api.ts
+++ b/src/api/vehicle/vehicle-info-api.ts
@@ -1,9 +1,7 @@
-import { apiJsonGetParams, apiJsonPageQuery } from "@/utils/apijson";
import request from "@/utils/request";
-import { apiJsonOmit } from "../../utils/apijson";
const VEHICLEINFO_BASE_URL = "/api/v1/vehicle-info";
-const APIJSON_BASE_URL = "/api";
+
const VehicleInfoAPI = {
/** 获取车辆基本信息分页数据 */
getPage(queryParams?: VehicleInfoPageQuery) {
@@ -13,7 +11,6 @@ const VehicleInfoAPI = {
params: queryParams,
});
},
-
/**
* 获取车辆基本信息表单数据
*
@@ -70,12 +67,15 @@ const VehicleInfoAPI = {
export default VehicleInfoAPI;
/** 车辆基本信息分页查询参数 */
-export interface VehicleInfoPageQuery extends PageQuery {}
+export interface VehicleInfoPageQuery extends PageQuery {
+ /** 车辆唯一编号（内部系统编号） */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+}
/** 车辆基本信息表单对象 */
export interface VehicleInfoForm {
- /** 主键ID */
- id?: number;
/** 车辆唯一编号（内部系统编号） */
vehicleId?: string;
/** 车牌号 */
@@ -102,7 +102,7 @@ export interface VehicleInfoForm {
registrationDate?: Date;
/** 首次上牌日期 */
firstRegistrationDate?: Date;
- /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ /** 燃料类型 */
fuelType?: string;
/** 排量(L) */
displacement?: number;
@@ -114,9 +114,9 @@ export interface VehicleInfoForm {
tonnage?: number;
/** 颜色 */
color?: string;
- /** 变速箱类型：手动、自动、手自一体 */
+ /** 变速箱类型 */
gearboxType?: string;
- /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ /** 车辆状态 */
status?: string;
/** 所属部门ID（无外键约束） */
ownerDeptId?: number;
@@ -164,7 +164,7 @@ export interface VehicleInfoPageVO {
registrationDate?: Date;
/** 首次上牌日期 */
firstRegistrationDate?: Date;
- /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ /** 燃料类型 */
fuelType?: string;
/** 排量(L) */
displacement?: number;
@@ -176,9 +176,9 @@ export interface VehicleInfoPageVO {
tonnage?: number;
/** 颜色 */
color?: string;
- /** 变速箱类型：手动、自动、手自一体 */
+ /** 变速箱类型 */
gearboxType?: string;
- /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ /** 车辆状态 */
status?: string;
/** 所属部门ID（无外键约束） */
ownerDeptId?: number;
diff --git a/src/apiJson3/system/AccessAPIJSON.ts b/src/apiJson3/system/AccessAPIJSON.ts
new file mode 100644
index 00000000..6e0b31ea
--- /dev/null
+++ b/src/apiJson3/system/AccessAPIJSON.ts
@@ -0,0 +1,161 @@
+import request from "@/utils/request";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
+
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "Access";
+
+const AccessAPI = {
+ /** 获取apijson权限配置分页数据 */
+ getPage(queryParams?: AccessPageQuery) {
+ return request<any, PageResult<AccessPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取apijson权限配置表单数据
+ *
+ * @param id apijson权限配置ID
+ * @returns apijson权限配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, PageResult<AccessForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
+ });
+ },
+
+ /**
+ * 添加apijson权限配置
+ *
+ * @param data apijson权限配置表单数据
+ */
+ create(data: AccessForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/post`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 更新apijson权限配置
+ *
+ * @param id apijson权限配置ID
+ * @param data apijson权限配置表单数据
+ */
+ update(id: string, data: AccessForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 批量删除apijson权限配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson权限配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+};
+
+export default AccessAPI;
+
+/** apijson权限配置分页查询参数 */
+export interface AccessPageQuery extends PageQuery {}
+
+/** apijson权限配置表单对象 */
+export interface AccessForm {
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
+
+/** apijson权限配置分页对象 */
+export interface AccessPageVO {
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
diff --git a/src/apiJson/system/RequestAPIJSON.ts b/src/apiJson3/system/RequestAPIJSON.ts
similarity index 70%
rename from src/apiJson/system/RequestAPIJSON.ts
rename to src/apiJson3/system/RequestAPIJSON.ts
index a86d864c..97d844da 100644
--- a/src/apiJson/system/RequestAPIJSON.ts
+++ b/src/apiJson3/system/RequestAPIJSON.ts
@@ -1,4 +1,9 @@
-import { apiJsonGetOneTableParams, apiJsonOmit, apiJsonPageQuery } from "@/utils/apijson";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
import request from "@/utils/request";
const REQUEST_BASE_URL = "/api/v1/request";
@@ -24,9 +29,10 @@ const RequestAPI = {
* @returns apijson校验配置表单数据
*/
getFormData(id: number) {
- return request<any, RequestForm>({
- url: `${REQUEST_BASE_URL}/${id}/form`,
- method: "get",
+ return request<any, PageResult<RequestForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
});
},
@@ -37,9 +43,15 @@ const RequestAPI = {
*/
create(data: RequestForm) {
return request({
- url: `${REQUEST_BASE_URL}`,
+ url: `${APIJSON_BASE_URL}/json/post`,
method: "post",
- data,
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
});
},
@@ -51,9 +63,16 @@ const RequestAPI = {
*/
update(id: string, data: RequestForm) {
return request({
- url: `${REQUEST_BASE_URL}/${id}`,
- method: "put",
- data,
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
});
},
@@ -64,8 +83,15 @@ const RequestAPI = {
*/
deleteByIds(ids: string) {
return request({
- url: `${REQUEST_BASE_URL}/${ids}`,
- method: "delete",
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
});
},
};
@@ -97,7 +123,7 @@ export interface RequestForm {
/** 标签 */
tag?: string;
/** 校验结构JSON */
- structure?: string;
+ structure?: object;
/** 详细说明 */
detail?: string;
/** 创建日期 */
@@ -117,7 +143,7 @@ export interface RequestPageVO {
/** 标签 */
tag?: string;
/** 校验结构JSON */
- structure?: string;
+ structure?: object;
/** 详细说明 */
detail?: string;
/** 创建日期 */
diff --git a/src/apiJson3/system/vehicle-info-apijson.ts b/src/apiJson3/system/vehicle-info-apijson.ts
new file mode 100644
index 00000000..046ea7e1
--- /dev/null
+++ b/src/apiJson3/system/vehicle-info-apijson.ts
@@ -0,0 +1,224 @@
+import request from "@/utils/request";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
+
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "VehicleInfo";
+
+const VehicleInfoAPI = {
+ /** 获取车辆基本信息分页数据 */
+ getPage(queryParams?: VehicleInfoPageQuery) {
+ return request<any, PageResult<VehicleInfoPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取车辆基本信息表单数据
+ *
+ * @param id 车辆基本信息ID
+ * @returns 车辆基本信息表单数据
+ */
+ getFormData(id: number) {
+ return request<any, PageResult<VehicleInfoForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
+ });
+ },
+
+ /**
+ * 添加车辆基本信息
+ *
+ * @param data 车辆基本信息表单数据
+ */
+ create(data: VehicleInfoForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/post`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 更新车辆基本信息
+ *
+ * @param id 车辆基本信息ID
+ * @param data 车辆基本信息表单数据
+ */
+ update(id: string, data: VehicleInfoForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 批量删除车辆基本信息，多个以英文逗号(,)分割
+ *
+ * @param ids 车辆基本信息ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+};
+
+export default VehicleInfoAPI;
+
+/** 车辆基本信息分页查询参数 */
+export interface VehicleInfoPageQuery extends PageQuery {}
+
+/** 车辆基本信息表单对象 */
+export interface VehicleInfoForm {
+ /** 车辆唯一编号 */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型 */
+ gearboxType?: string;
+ /** 车辆状态 */
+ status?: string;
+ /** 所属部门ID */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
+
+/** 车辆基本信息分页对象 */
+export interface VehicleInfoPageVO {
+ /** 主键ID */
+ id?: number;
+ /** 车辆唯一编号 */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型 */
+ gearboxType?: string;
+ /** 车辆状态 */
+ status?: string;
+ /** 所属部门ID */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
diff --git a/src/apiJson3/vehicle/vehicle-info-apijson.ts b/src/apiJson3/vehicle/vehicle-info-apijson.ts
new file mode 100644
index 00000000..004ed332
--- /dev/null
+++ b/src/apiJson3/vehicle/vehicle-info-apijson.ts
@@ -0,0 +1,239 @@
+import request from "@/utils/request";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
+
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "VehicleInfo";
+
+const VehicleInfoAPI = {
+ /** 获取车辆基本信息分页数据 */
+ getPage(queryParams?: VehicleInfoPageQuery) {
+ return request<any, PageResult<VehicleInfoPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取车辆基本信息表单数据
+ *
+ * @param id 车辆基本信息ID
+ * @returns 车辆基本信息表单数据
+ */
+ getFormData(id: number) {
+ return request<any, PageResult<VehicleInfoForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
+ });
+ },
+
+ /**
+ * 添加车辆基本信息
+ *
+ * @param data 车辆基本信息表单数据
+ */
+ create(data: VehicleInfoForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/post`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 更新车辆基本信息
+ *
+ * @param id 车辆基本信息ID
+ * @param data 车辆基本信息表单数据
+ */
+ update(id: string, data: VehicleInfoForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 批量删除车辆基本信息，多个以英文逗号(,)分割
+ *
+ * @param ids 车辆基本信息ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+};
+
+export default VehicleInfoAPI;
+
+/** 车辆基本信息分页查询参数 */
+export interface VehicleInfoPageQuery extends PageQuery {
+ /** 车辆唯一编号 */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 核定载客数 */
+ seats?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型 */
+ gearboxType?: string;
+ /** 车辆状态 */
+ status?: string;
+}
+
+/** 车辆基本信息表单对象 */
+export interface VehicleInfoForm {
+ /** 车辆唯一编号 */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型 */
+ gearboxType?: string;
+ /** 车辆状态 */
+ status?: string;
+ /** 所属部门ID */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
+
+/** 车辆基本信息分页对象 */
+export interface VehicleInfoPageVO {
+ /** 主键ID */
+ id?: number;
+ /** 车辆唯一编号 */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+ /** 车辆识别代号(VIN) */
+ vin?: string;
+ /** 品牌 */
+ brand?: string;
+ /** 车型 */
+ model?: string;
+ /** 车系 */
+ series?: string;
+ /** 发动机型号 */
+ engineModel?: string;
+ /** 发动机号 */
+ engineNumber?: string;
+ /** 购置日期 */
+ purchaseDate?: Date;
+ /** 购置价格 */
+ purchasePrice?: number;
+ /** 购自单位/个人 */
+ purchaseFrom?: string;
+ /** 注册日期 */
+ registrationDate?: Date;
+ /** 首次上牌日期 */
+ firstRegistrationDate?: Date;
+ /** 燃料类型 */
+ fuelType?: string;
+ /** 排量(L) */
+ displacement?: number;
+ /** 功率(kW) */
+ power?: number;
+ /** 核定载客数 */
+ seats?: number;
+ /** 核定载质量(吨) */
+ tonnage?: number;
+ /** 颜色 */
+ color?: string;
+ /** 变速箱类型 */
+ gearboxType?: string;
+ /** 车辆状态 */
+ status?: string;
+ /** 所属部门ID */
+ ownerDeptId?: number;
+ /** 当前驾驶人ID */
+ currentDriverId?: number;
+ /** 创建时间 */
+ createdAt?: Date;
+ /** 更新时间 */
+ updatedAt?: Date;
+ /** 扩展字段1 */
+ extendedField1?: string;
+ /** 扩展字段2 */
+ extendedField2?: string;
+ /** 扩展字段3 */
+ extendedField3?: string;
+}
diff --git a/src/apijson/system/access-apijson.ts b/src/apijson/system/access-apijson.ts
new file mode 100644
index 00000000..29ed9201
--- /dev/null
+++ b/src/apijson/system/access-apijson.ts
@@ -0,0 +1,166 @@
+import request from "@/utils/request";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
+
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "Access";
+
+const AccessAPI = {
+ /** 获取apijson权限配置分页数据 */
+ getPage(queryParams?: AccessPageQuery) {
+ return request<any, PageResult<AccessPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取apijson权限配置表单数据
+ *
+ * @param id apijson权限配置ID
+ * @returns apijson权限配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, PageResult<AccessForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
+ });
+ },
+
+ /**
+ * 添加apijson权限配置
+ *
+ * @param data apijson权限配置表单数据
+ */
+ create(data: AccessForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/post`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 更新apijson权限配置
+ *
+ * @param id apijson权限配置ID
+ * @param data apijson权限配置表单数据
+ */
+ update(id: string, data: AccessForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 批量删除apijson权限配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson权限配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+};
+
+export default AccessAPI;
+
+/** apijson权限配置分页查询参数 */
+export interface AccessPageQuery extends PageQuery {
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+}
+
+/** apijson权限配置表单对象 */
+export interface AccessForm {
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
+
+/** apijson权限配置分页对象 */
+export interface AccessPageVO {
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 数据库名/模式 */
+ schema?: string;
+ /** 实际表名 */
+ name?: string;
+ /** 表别名 */
+ alias?: string;
+ /** 允许 get 的角色列表 */
+ get?: string;
+ /** 允许 head 的角色列表 */
+ head?: string;
+ /** 允许 gets 的角色列表 */
+ gets?: string;
+ /** 允许 heads 的角色列表 */
+ heads?: string;
+ /** 允许 post 的角色列表 */
+ post?: string;
+ /** 允许 put 的角色列表 */
+ put?: string;
+ /** 允许 delete 的角色列表 */
+ delete?: string;
+ /** 创建时间 */
+ date?: Date;
+ detail?: string;
+}
diff --git a/src/apijson/system/request-apijson.ts b/src/apijson/system/request-apijson.ts
new file mode 100644
index 00000000..62a0d48c
--- /dev/null
+++ b/src/apijson/system/request-apijson.ts
@@ -0,0 +1,149 @@
+import request from "@/utils/request";
+import {
+ apiJsonGetOneTableParams,
+ apiJsonOmit,
+ apiJsonPageQuery,
+ apiJsonPostTableParams,
+} from "@/utils/apijson";
+
+const APIJSON_BASE_URL = "/api";
+const TABLE_NAME = "Request";
+
+const RequestAPI = {
+ /** 获取apijson校验配置分页数据 */
+ getPage(queryParams?: RequestPageQuery) {
+ return request<any, PageResult<RequestPageVO[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(
+ TABLE_NAME,
+ apiJsonOmit(queryParams, "pageNum", "pageSize"),
+ apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
+ ),
+ });
+ },
+ /**
+ * 获取apijson校验配置表单数据
+ *
+ * @param id apijson校验配置ID
+ * @returns apijson校验配置表单数据
+ */
+ getFormData(id: number) {
+ return request<any, PageResult<RequestForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
+ });
+ },
+
+ /**
+ * 添加apijson校验配置
+ *
+ * @param data apijson校验配置表单数据
+ */
+ create(data: RequestForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/post`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 更新apijson校验配置
+ *
+ * @param id apijson校验配置ID
+ * @param data apijson校验配置表单数据
+ */
+ update(id: string, data: RequestForm) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+
+ /**
+ * 批量删除apijson校验配置，多个以英文逗号(,)分割
+ *
+ * @param ids apijson校验配置ID字符串，多个以英文逗号(,)分割
+ */
+ deleteByIds(ids: string) {
+ return request({
+ url: `${APIJSON_BASE_URL}/json/delete`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ "id{}": ids.split(","),
+ },
+ TABLE_NAME
+ ),
+ });
+ },
+};
+
+export default RequestAPI;
+
+/** apijson校验配置分页查询参数 */
+export interface RequestPageQuery extends PageQuery {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+}
+
+/** apijson校验配置表单对象 */
+export interface RequestForm {
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
+
+/** apijson校验配置分页对象 */
+export interface RequestPageVO {
+ /** 唯一标识 */
+ id?: number;
+ /** 调试 */
+ debug?: number;
+ /** 版本 */
+ version?: number;
+ /** 请求方式 */
+ method?: string;
+ /** 标签 */
+ tag?: string;
+ /** 校验结构JSON */
+ structure?: string;
+ /** 详细说明 */
+ detail?: string;
+ /** 创建日期 */
+ date?: Date;
+}
diff --git a/src/api/vehicle/vehicle-info-apijson.ts b/src/apijson/vehicle/vehicle-info-apijson.ts
similarity index 80%
rename from src/api/vehicle/vehicle-info-apijson.ts
rename to src/apijson/vehicle/vehicle-info-apijson.ts
index 0be1e639..151ef99a 100644
--- a/src/api/vehicle/vehicle-info-apijson.ts
+++ b/src/apijson/vehicle/vehicle-info-apijson.ts
@@ -1,14 +1,14 @@
+import request from "@/utils/request";
import {
- apiJsonDeleteTableParams,
apiJsonGetOneTableParams,
+ apiJsonOmit,
apiJsonPageQuery,
+ apiJsonPostTableParams,
} from "@/utils/apijson";
-import request from "@/utils/request";
-import { apiJsonOmit } from "../../utils/apijson";
-const VEHICLEINFO_BASE_URL = "/api/v1/vehicle-info";
const APIJSON_BASE_URL = "/api";
const TABLE_NAME = "VehicleInfo";
+
const VehicleInfoAPI = {
/** 获取车辆基本信息分页数据 */
getPage(queryParams?: VehicleInfoPageQuery) {
@@ -29,9 +29,10 @@ const VehicleInfoAPI = {
* @returns 车辆基本信息表单数据
*/
getFormData(id: number) {
- return request<any, VehicleInfoForm>({
- url: `${VEHICLEINFO_BASE_URL}/${id}/form`,
- method: "get",
+ return request<any, PageResult<VehicleInfoForm[]>>({
+ url: `${APIJSON_BASE_URL}/json/get`,
+ method: "post",
+ data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
});
},
@@ -42,9 +43,15 @@ const VehicleInfoAPI = {
*/
create(data: VehicleInfoForm) {
return request({
- url: `${VEHICLEINFO_BASE_URL}`,
+ url: `${APIJSON_BASE_URL}/json/post`,
method: "post",
- data,
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
});
},
@@ -56,9 +63,16 @@ const VehicleInfoAPI = {
*/
update(id: string, data: VehicleInfoForm) {
return request({
- url: `${VEHICLEINFO_BASE_URL}/${id}`,
- method: "put",
- data,
+ url: `${APIJSON_BASE_URL}/json/put`,
+ method: "post",
+ data: apiJsonPostTableParams(
+ TABLE_NAME,
+ {
+ id,
+ ...(data as ApiJsonTableParams),
+ },
+ TABLE_NAME
+ ),
});
},
@@ -70,13 +84,13 @@ const VehicleInfoAPI = {
deleteByIds(ids: string) {
return request({
url: `${APIJSON_BASE_URL}/json/delete`,
- method: "delete",
- data: apiJsonDeleteTableParams(
+ method: "post",
+ data: apiJsonPostTableParams(
TABLE_NAME,
{
"id{}": ids.split(","),
},
- ""
+ TABLE_NAME
),
});
},
@@ -85,12 +99,15 @@ const VehicleInfoAPI = {
export default VehicleInfoAPI;
/** 车辆基本信息分页查询参数 */
-export interface VehicleInfoPageQuery extends PageQuery {}
+export interface VehicleInfoPageQuery extends PageQuery {
+ /** 车辆唯一编号（内部系统编号） */
+ vehicleId?: string;
+ /** 车牌号 */
+ licensePlate?: string;
+}
/** 车辆基本信息表单对象 */
export interface VehicleInfoForm {
- /** 主键ID */
- id?: number;
/** 车辆唯一编号（内部系统编号） */
vehicleId?: string;
/** 车牌号 */
@@ -117,7 +134,7 @@ export interface VehicleInfoForm {
registrationDate?: Date;
/** 首次上牌日期 */
firstRegistrationDate?: Date;
- /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ /** 燃料类型 */
fuelType?: string;
/** 排量(L) */
displacement?: number;
@@ -129,9 +146,9 @@ export interface VehicleInfoForm {
tonnage?: number;
/** 颜色 */
color?: string;
- /** 变速箱类型：手动、自动、手自一体 */
+ /** 变速箱类型 */
gearboxType?: string;
- /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ /** 车辆状态 */
status?: string;
/** 所属部门ID（无外键约束） */
ownerDeptId?: number;
@@ -179,7 +196,7 @@ export interface VehicleInfoPageVO {
registrationDate?: Date;
/** 首次上牌日期 */
firstRegistrationDate?: Date;
- /** 燃料类型：汽油、柴油、电、混动、氢能源 */
+ /** 燃料类型 */
fuelType?: string;
/** 排量(L) */
displacement?: number;
@@ -191,9 +208,9 @@ export interface VehicleInfoPageVO {
tonnage?: number;
/** 颜色 */
color?: string;
- /** 变速箱类型：手动、自动、手自一体 */
+ /** 变速箱类型 */
gearboxType?: string;
- /** 车辆状态：在用、停用、维修中、已报废、已转卖 */
+ /** 车辆状态 */
status?: string;
/** 所属部门ID（无外键约束） */
ownerDeptId?: number;
diff --git a/src/types/api-json.d.ts b/src/types/api-json.d.ts
index 82365912..7baf68a3 100644
--- a/src/types/api-json.d.ts
+++ b/src/types/api-json.d.ts
@@ -20,6 +20,10 @@ declare global {
* 别名写法：content:time
*/
"@column"?: string;
+ /**
+ * 排序, "date-,id,content+"
+ */
+ "@order"?: string;
}
/**
diff --git a/src/utils/apijson.ts b/src/utils/apijson.ts
index a29d2db9..01b2a6c4 100644
--- a/src/utils/apijson.ts
+++ b/src/utils/apijson.ts
@@ -1,5 +1,6 @@
import { ApiCodeEnum, ApiJsonCodeEnum } from "@/enums";
import { table } from "console";
+import request from "@/utils/request";
// 工具类型：将单个 snake_case 字符串转为 camelCase
type SnakeToCamel<S extends string> = S extends `${infer T}_${infer U}`
@@ -24,6 +25,25 @@ function keysToCamelCase<T extends Record<string, any>>(obj: T): ToCamelCase<T>
return result;
}
+// 工具函数：将 camelCase 转换为 snake_case
+function camelToSnake(str: string): string {
+ return str.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
+}
+
+// 非递归版本：将 camelCase 转换为 snake_case
+function camelToSnakeKeys<T extends object>(obj: T): { [key: string]: any } {
+ const result: { [key: string]: any } = {};
+
+ for (const key in obj) {
+ if (Object.prototype.hasOwnProperty.call(obj, key)) {
+ const snakeKey = camelToSnake(key);
+ result[snakeKey] = obj[key]; // 直接赋值，不做递归处理
+ }
+ }
+
+ return result;
+}
+
/**
* apijson 分页
* @param page 当前页
@@ -78,7 +98,7 @@ export function apiJsonOmit<T extends object, K extends keyof T>(
export function apiJsonResponseToApiResponse(res: ApiJsonResponse): ApiResponse {
const code = res.code === ApiJsonCodeEnum.SUCCESS ? ApiCodeEnum.SUCCESS : ApiCodeEnum.ERROR;
const data = res["[]"] as { [key: string]: ApiJsonTableParams }[];
- const list = data.map((e) => keysToCamelCase(Object.values(e)[0]));
+ const list = data ? data.map((e) => keysToCamelCase(Object.values(e)[0])) : [];
return {
code,
data: {
@@ -107,7 +127,7 @@ export function apiJsonGetOneTableParams(
): ApiJsonGetParams {
return {
"[]": {
- [tableName]: params,
+ [tableName]: camelToSnakeKeys(params),
query,
page: pager?.page,
count: pager?.count,
@@ -130,7 +150,7 @@ export function apiJsonGetTableParams(
): ApiJsonGetParams {
return {
"[]": {
- ...tables,
+ ...camelToSnakeKeys(tables),
query,
page: pager?.page,
count: pager?.count,
@@ -139,13 +159,13 @@ export function apiJsonGetTableParams(
};
}
-export function apiJsonDeleteTableParams(
+export function apiJsonPostTableParams(
tableName: string,
params: ApiJsonTableParams,
tag: string
): ApiJsonPutParams {
return {
- [tableName]: params,
+ [tableName]: camelToSnakeKeys(params),
tag,
} as ApiJsonPutParams;
}
diff --git a/src/views/system/access/index.vue b/src/views/system/access/index.vue
new file mode 100644
index 00000000..72000e18
--- /dev/null
+++ b/src/views/system/access/index.vue
@@ -0,0 +1,396 @@
+<template>
+ <div class="app-container">
+ <div class="search-container">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="实际表名" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="实际表名"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
+ <el-form-item label="表别名" prop="alias">
+ <el-input
+ v-model="queryParams.alias"
+ placeholder="表别名"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
+ <el-form-item class="search-buttons">
+ <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+ <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <el-card shadow="never">
+ <div class="mb-10px">
+ <el-button
+ v-hasPerm="['system:access:add']"
+ type="success"
+ icon="plus"
+ @click="handleOpenDialog()"
+ >
+ 新增
+ </el-button>
+ <el-button
+ v-hasPerm="['system:access:delete']"
+ type="danger"
+ :disabled="removeIds.length === 0"
+ icon="delete"
+ @click="handleDelete()"
+ >
+ 删除
+ </el-button>
+ </div>
+
+ <el-table
+ ref="dataTableRef"
+ v-loading="loading"
+ :data="pageData"
+ highlight-current-row
+ border
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column key="id" label="" prop="id" min-width="150" align="center" />
+ <el-table-column label="调试" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.debug" code="apijson_debbug" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ key="schema"
+ label="数据库名/模式"
+ prop="schema"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column key="name" label="实际表名" prop="name" min-width="150" align="center" />
+ <el-table-column key="alias" label="表别名" prop="alias" min-width="150" align="center" />
+ <el-table-column
+ key="get"
+ label="允许 get 的角色列表"
+ prop="get"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="head"
+ label="允许 head 的角色列表"
+ prop="head"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="gets"
+ label="允许 gets 的角色列表"
+ prop="gets"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="heads"
+ label="允许 heads 的角色列表"
+ prop="heads"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="post"
+ label="允许 post 的角色列表"
+ prop="post"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="put"
+ label="允许 put 的角色列表"
+ prop="put"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column
+ key="delete"
+ label="允许 delete 的角色列表"
+ prop="delete"
+ min-width="150"
+ align="center"
+ />
+ <el-table-column key="date" label="创建时间" prop="date" min-width="150" align="center" />
+ <el-table-column key="detail" label="" prop="detail" min-width="150" align="center" />
+ <el-table-column fixed="right" label="操作" width="220">
+ <template #default="scope">
+ <el-button
+ v-hasPerm="['system:access:edit']"
+ type="primary"
+ size="small"
+ link
+ icon="edit"
+ @click="handleOpenDialog(scope.row.id)"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ v-hasPerm="['system:access:delete']"
+ type="danger"
+ size="small"
+ link
+ icon="delete"
+ @click="handleDelete(scope.row.id)"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-if="total > 0"
+ v-model:total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="handlePagerQuery()"
+ />
+ </el-card>
+
+ <!-- apijson权限配置表单弹窗 -->
+ <el-dialog
+ v-model="dialog.visible"
+ :title="dialog.title"
+ width="500px"
+ @close="handleCloseDialog"
+ >
+ <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
+ <el-form-item label="调试" prop="debug">
+ <Dict v-model="formData.debug" code="apijson_debbug" />
+ </el-form-item>
+
+ <el-form-item label="数据库名/模式" prop="schema">
+ <el-input v-model="formData.schema" placeholder="数据库名/模式" />
+ </el-form-item>
+
+ <el-form-item label="实际表名" prop="name">
+ <el-input v-model="formData.name" placeholder="实际表名" />
+ </el-form-item>
+
+ <el-form-item label="表别名" prop="alias">
+ <el-input v-model="formData.alias" placeholder="表别名" />
+ </el-form-item>
+
+ <el-form-item label="允许 get 的角色列表" prop="get">
+ <el-input v-model="formData.get" placeholder="允许 get 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 head 的角色列表" prop="head">
+ <el-input v-model="formData.head" placeholder="允许 head 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 gets 的角色列表" prop="gets">
+ <el-input v-model="formData.gets" placeholder="允许 gets 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 heads 的角色列表" prop="heads">
+ <el-input v-model="formData.heads" placeholder="允许 heads 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 post 的角色列表" prop="post">
+ <el-input v-model="formData.post" placeholder="允许 post 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 put 的角色列表" prop="put">
+ <el-input v-model="formData.put" placeholder="允许 put 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="允许 delete 的角色列表" prop="delete">
+ <el-input v-model="formData.delete" placeholder="允许 delete 的角色列表" />
+ </el-form-item>
+
+ <el-form-item label="创建时间" prop="date">
+ <el-date-picker
+ v-model="formData.date"
+ class="!w-[240px]"
+ type="date"
+ placeholder="创建时间"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-form-item label="" prop="detail">
+ <el-input v-model="formData.detail" placeholder="" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleSubmit()">确定</el-button>
+ <el-button @click="handleCloseDialog()">取消</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+ name: "Access",
+ inheritAttrs: false,
+});
+
+import AccessAPI, {
+ AccessPageVO,
+ AccessForm,
+ AccessPageQuery,
+} from "@/apijson/system/access-apijson";
+// import AccessAPI, { AccessPageVO, AccessForm, AccessPageQuery } from "@/api/system/access-api";
+
+const queryFormRef = ref();
+const dataFormRef = ref();
+
+const loading = ref(false);
+const removeIds = ref<number[]>([]);
+const total = ref(0);
+
+const queryParams = reactive<AccessPageQuery>({
+ pageNum: 1,
+ pageSize: 10,
+});
+
+// apijson权限配置表格数据
+const pageData = ref<AccessPageVO[]>([]);
+
+// 弹窗
+const dialog = reactive({
+ title: "",
+ visible: false,
+});
+
+// apijson权限配置表单数据
+const formData = reactive<AccessForm>({});
+
+// apijson权限配置表单校验规则
+const rules = reactive({
+ debug: [{ required: true, message: "请输入调试", trigger: "blur" }],
+ name: [{ required: true, message: "请输入实际表名", trigger: "blur" }],
+ get: [{ required: true, message: "请输入允许 get 的角色列表", trigger: "blur" }],
+ head: [{ required: true, message: "请输入允许 head 的角色列表", trigger: "blur" }],
+ gets: [{ required: true, message: "请输入允许 gets 的角色列表", trigger: "blur" }],
+ heads: [{ required: true, message: "请输入允许 heads 的角色列表", trigger: "blur" }],
+ post: [{ required: true, message: "请输入允许 post 的角色列表", trigger: "blur" }],
+ put: [{ required: true, message: "请输入允许 put 的角色列表", trigger: "blur" }],
+ delete: [{ required: true, message: "请输入允许 delete 的角色列表", trigger: "blur" }],
+ date: [{ required: true, message: "请输入创建时间", trigger: "blur" }],
+});
+
+/** 查询apijson权限配置 */
+function handlePagerQuery() {
+ loading.value = true;
+ AccessAPI.getPage(queryParams)
+ .then((data) => {
+ pageData.value = data.list;
+ total.value = data.total;
+ })
+ .finally(() => {
+ loading.value = false;
+ });
+}
+
+function handleQuery() {
+ queryParams.pageNum = 1;
+ handlePagerQuery();
+}
+
+/** 重置apijson权限配置查询 */
+function handleResetQuery() {
+ queryFormRef.value!.resetFields();
+ queryParams.pageNum = 1;
+ handleQuery();
+}
+
+/** 行复选框选中记录选中ID集合 */
+function handleSelectionChange(selection: any) {
+ removeIds.value = selection.map((item: any) => item.id);
+}
+
+/** 打开apijson权限配置弹窗 */
+function handleOpenDialog(id?: number) {
+ dialog.visible = true;
+ if (id) {
+ dialog.title = "修改apijson权限配置";
+ AccessAPI.getFormData(id).then((data) => {
+ if (data.list.length > 0) {
+ Object.assign(formData, data.list[0]);
+ }
+ });
+ } else {
+ dialog.title = "新增apijson权限配置";
+ }
+}
+
+/** 提交apijson权限配置表单 */
+function handleSubmit() {
+ dataFormRef.value.validate((valid: any) => {
+ if (valid) {
+ loading.value = true;
+ const id = formData.id;
+ if (id) {
+ AccessAPI.update(id, formData)
+ .then(() => {
+ ElMessage.success("修改成功");
+ handleCloseDialog();
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ } else {
+ AccessAPI.create(formData)
+ .then(() => {
+ ElMessage.success("新增成功");
+ handleCloseDialog();
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ }
+ }
+ });
+}
+
+/** 关闭apijson权限配置弹窗 */
+function handleCloseDialog() {
+ dialog.visible = false;
+ dataFormRef.value.resetFields();
+ dataFormRef.value.clearValidate();
+ formData.id = undefined;
+}
+
+/** 删除apijson权限配置 */
+function handleDelete(id?: number) {
+ const ids = [id || removeIds.value].join(",");
+ if (!ids) {
+ ElMessage.warning("请勾选删除项");
+ return;
+ }
+
+ ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(
+ () => {
+ loading.value = true;
+ AccessAPI.deleteByIds(ids)
+ .then(() => {
+ ElMessage.success("删除成功");
+ handleResetQuery();
+ })
+ .finally(() => (loading.value = false));
+ },
+ () => {
+ ElMessage.info("已取消删除");
+ }
+ );
+}
+
+onMounted(() => {
+ handleQuery();
+});
+</script>
diff --git a/src/views/system/request/index.vue b/src/views/system/request/index.vue
index 72e9480d..917d67b6 100644
--- a/src/views/system/request/index.vue
+++ b/src/views/system/request/index.vue
@@ -30,7 +30,6 @@
</el-form-item>
</el-form>
</div>
-
<el-card shadow="never">
<div class="mb-10px">
<el-button
@@ -67,11 +66,7 @@
<DictLabel v-model="scope.row.debug" code="apijson_debbug" />
</template>
</el-table-column>
- <el-table-column label="版本" width="150" align="center">
- <template #default="scope">
- <DictLabel v-model="scope.row.version" code="apijson_debbug" />
- </template>
- </el-table-column>
+ <el-table-column label="版本" prop="version" width="150" align="center"></el-table-column>
<el-table-column label="请求方式" width="150" align="center">
<template #default="scope">
<DictLabel v-model="scope.row.method" code="apijson_method" />
@@ -82,9 +77,13 @@
key="structure"
label="校验结构JSON"
prop="structure"
- min-width="150"
+ min-width="250"
align="center"
- />
+ >
+ <template #default="scope">
+ {{ JSON.stringify(scope.row.structure) }}
+ </template>
+ </el-table-column>
<el-table-column
key="detail"
label="详细说明"
@@ -124,7 +123,7 @@
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery()"
+ @pagination="handlePagerQuery()"
/>
</el-card>
@@ -136,10 +135,6 @@
@close="handleCloseDialog"
>
<el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
- <el-form-item label="唯一标识" prop="id">
- <el-input v-model="formData.id" placeholder="唯一标识" />
- </el-form-item>
-
<el-form-item label="调试" prop="debug">
<Dict v-model="formData.debug" code="apijson_debbug" />
</el-form-item>
@@ -157,7 +152,7 @@
</el-form-item>
<el-form-item label="校验结构JSON" prop="structure">
- <el-input v-model="formData.structure" type="textarea" placeholder="校验结构JSON" />
+ <el-input v-model="jsonStructure" type="textarea" placeholder="校验结构JSON" />
</el-form-item>
<el-form-item label="详细说明" prop="detail">
@@ -194,7 +189,8 @@ import RequestAPI, {
RequestPageVO,
RequestForm,
RequestPageQuery,
-} from "@/apiJson/system/RequestAPIJSON";
+} from "@/apijson/system/request-apijson";
+// import RequestAPI, { RequestPageVO, RequestForm, RequestPageQuery } from "@/api/system/request-api";
const queryFormRef = ref();
const dataFormRef = ref();
@@ -220,9 +216,17 @@ const dialog = reactive({
// apijson校验配置表单数据
const formData = reactive<RequestForm>({});
+const jsonStructure = computed({
+ get() {
+ return JSON.stringify(formData.structure);
+ },
+ set(value) {
+ formData.structure = JSON.parse(value);
+ },
+});
+
// apijson校验配置表单校验规则
const rules = reactive({
- id: [{ required: true, message: "请输入唯一标识", trigger: "blur" }],
debug: [{ required: true, message: "请输入调试", trigger: "blur" }],
version: [{ required: true, message: "请输入版本", trigger: "blur" }],
tag: [{ required: true, message: "请输入标签", trigger: "blur" }],
@@ -230,7 +234,7 @@ const rules = reactive({
});
/** 查询apijson校验配置 */
-function handleQuery() {
+function handlePagerQuery() {
loading.value = true;
RequestAPI.getPage(queryParams)
.then((data) => {
@@ -242,6 +246,11 @@ function handleQuery() {
});
}
+function handleQuery() {
+ queryParams.pageNum = 1;
+ handlePagerQuery();
+}
+
/** 重置apijson校验配置查询 */
function handleResetQuery() {
queryFormRef.value!.resetFields();
@@ -260,7 +269,9 @@ function handleOpenDialog(id?: number) {
if (id) {
dialog.title = "修改apijson校验配置";
RequestAPI.getFormData(id).then((data) => {
- Object.assign(formData, data);
+ if (data.list.length > 0) {
+ Object.assign(formData, data.list[0]);
+ }
});
} else {
dialog.title = "新增apijson校验配置";
@@ -282,7 +293,7 @@ function handleSubmit() {
})
.finally(() => (loading.value = false));
} else {
- RequestAPI.add(formData)
+ RequestAPI.create(formData)
.then(() => {
ElMessage.success("新增成功");
handleCloseDialog();
diff --git a/src/views/vehicle/vehicle-info/index.vue b/src/views/vehicle/vehicle-info/index.vue
index cabfb32f..b12fc342 100644
--- a/src/views/vehicle/vehicle-info/index.vue
+++ b/src/views/vehicle/vehicle-info/index.vue
@@ -2,13 +2,28 @@
<div class="app-container">
<div class="search-container">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="车辆唯一编号（内部系统编号）" prop="vehicleId">
+ <el-input
+ v-model="queryParams.vehicleId"
+ placeholder="车辆唯一编号（内部系统编号）"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
+ <el-form-item label="车牌号" prop="licensePlate">
+ <el-input
+ v-model="queryParams.licensePlate"
+ placeholder="车牌号"
+ clearable
+ @keyup.enter="handleQuery()"
+ />
+ </el-form-item>
<el-form-item class="search-buttons">
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
-
<el-card shadow="never">
<div class="mb-10px">
<el-button
@@ -113,13 +128,11 @@
min-width="150"
align="center"
/>
- <el-table-column
- key="fuelType"
- label="燃料类型：汽油、柴油、电、混动、氢能源"
- prop="fuelType"
- min-width="150"
- align="center"
- />
+ <el-table-column label="燃料类型" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.fuelType" code="vehicle_fuel_type" />
+ </template>
+ </el-table-column>
<el-table-column
key="displacement"
label="排量(L)"
@@ -143,20 +156,16 @@
align="center"
/>
<el-table-column key="color" label="颜色" prop="color" min-width="150" align="center" />
- <el-table-column
- key="gearboxType"
- label="变速箱类型：手动、自动、手自一体"
- prop="gearboxType"
- min-width="150"
- align="center"
- />
- <el-table-column
- key="status"
- label="车辆状态：在用、停用、维修中、已报废、已转卖"
- prop="status"
- min-width="150"
- align="center"
- />
+ <el-table-column label="变速箱类型" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.gearboxType" code="vehicle_gearbox_type" />
+ </template>
+ </el-table-column>
+ <el-table-column label="车辆状态" width="150" align="center">
+ <template #default="scope">
+ <DictLabel v-model="scope.row.status" code="vehicle_status" />
+ </template>
+ </el-table-column>
<el-table-column
key="ownerDeptId"
label="所属部门ID（无外键约束）"
@@ -237,7 +246,7 @@
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery()"
+ @pagination="handlePagerQuery()"
/>
</el-card>
@@ -249,10 +258,6 @@
@close="handleCloseDialog"
>
<el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
- <el-form-item label="主键ID" prop="id">
- <el-input v-model="formData.id" placeholder="主键ID" />
- </el-form-item>
-
<el-form-item label="车辆唯一编号（内部系统编号）" prop="vehicleId">
<el-input v-model="formData.vehicleId" placeholder="车辆唯一编号（内部系统编号）" />
</el-form-item>
@@ -323,42 +328,36 @@
/>
</el-form-item>
- <el-form-item label="燃料类型：汽油、柴油、电、混动、氢能源" prop="fuelType">
- <el-input
- v-model="formData.fuelType"
- placeholder="燃料类型：汽油、柴油、电、混动、氢能源"
- />
+ <el-form-item label="燃料类型" prop="fuelType">
+ <Dict v-model="formData.fuelType" code="vehicle_fuel_type" />
</el-form-item>
<el-form-item label="排量(L)" prop="displacement">
- <el-input v-model="formData.displacement" placeholder="排量(L)" />
+ <el-input-number v-model="formData.displacement" placeholder="排量(L)" />
</el-form-item>
<el-form-item label="功率(kW)" prop="power">
- <el-input v-model="formData.power" placeholder="功率(kW)" />
+ <el-input-number v-model="formData.power" placeholder="功率(kW)" />
</el-form-item>
<el-form-item label="核定载客数" prop="seats">
- <el-input v-model="formData.seats" placeholder="核定载客数" />
+ <el-input-number v-model="formData.seats" placeholder="核定载客数" />
</el-form-item>
<el-form-item label="核定载质量(吨)" prop="tonnage">
- <el-input v-model="formData.tonnage" placeholder="核定载质量(吨)" />
+ <el-input v-model="formData.tonnage" type="number" placeholder="核定载质量(吨)" />
</el-form-item>
<el-form-item label="颜色" prop="color">
<el-input v-model="formData.color" placeholder="颜色" />
</el-form-item>
- <el-form-item label="变速箱类型：手动、自动、手自一体" prop="gearboxType">
- <el-input v-model="formData.gearboxType" placeholder="变速箱类型：手动、自动、手自一体" />
+ <el-form-item label="变速箱类型" prop="gearboxType">
+ <Dict v-model="formData.gearboxType" code="vehicle_gearbox_type" />
</el-form-item>
- <el-form-item label="车辆状态：在用、停用、维修中、已报废、已转卖" prop="status">
- <el-input
- v-model="formData.status"
- placeholder="车辆状态：在用、停用、维修中、已报废、已转卖"
- />
+ <el-form-item label="车辆状态" prop="status">
+ <Dict v-model="formData.status" code="vehicle_status" />
</el-form-item>
<el-form-item label="所属部门ID（无外键约束）" prop="ownerDeptId">
@@ -419,7 +418,8 @@ import VehicleInfoAPI, {
VehicleInfoPageVO,
VehicleInfoForm,
VehicleInfoPageQuery,
-} from "@/api/vehicle/vehicle-info-apijson";
+} from "@/apijson/vehicle/vehicle-info-apijson";
+// import VehicleInfoAPI, { VehicleInfoPageVO, VehicleInfoForm, VehicleInfoPageQuery } from "@/api/vehicle/vehicle-info-api";
const queryFormRef = ref();
const dataFormRef = ref();
@@ -430,7 +430,7 @@ const total = ref(0);
const queryParams = reactive<VehicleInfoPageQuery>({
pageNum: 1,
- pageSize: 3,
+ pageSize: 10,
});
// 车辆基本信息表格数据
@@ -447,31 +447,21 @@ const formData = reactive<VehicleInfoForm>({});
// 车辆基本信息表单校验规则
const rules = reactive({
- id: [{ required: true, message: "请输入主键ID", trigger: "blur" }],
vehicleId: [{ required: true, message: "请输入车辆唯一编号（内部系统编号）", trigger: "blur" }],
licensePlate: [{ required: true, message: "请输入车牌号", trigger: "blur" }],
vin: [{ required: true, message: "请输入车辆识别代号(VIN)", trigger: "blur" }],
brand: [{ required: true, message: "请输入品牌", trigger: "blur" }],
model: [{ required: true, message: "请输入车型", trigger: "blur" }],
purchaseDate: [{ required: true, message: "请输入购置日期", trigger: "blur" }],
- fuelType: [
- { required: true, message: "请输入燃料类型：汽油、柴油、电、混动、氢能源", trigger: "blur" },
- ],
- status: [
- {
- required: true,
- message: "请输入车辆状态：在用、停用、维修中、已报废、已转卖",
- trigger: "blur",
- },
- ],
+ fuelType: [{ required: true, message: "请输入燃料类型", trigger: "blur" }],
+ status: [{ required: true, message: "请输入车辆状态", trigger: "blur" }],
});
/** 查询车辆基本信息 */
-function handleQuery() {
+function handlePagerQuery() {
loading.value = true;
VehicleInfoAPI.getPage(queryParams)
.then((data) => {
- console.log(data);
pageData.value = data.list;
total.value = data.total;
})
@@ -480,6 +470,11 @@ function handleQuery() {
});
}
+function handleQuery() {
+ queryParams.pageNum = 1;
+ handlePagerQuery();
+}
+
/** 重置车辆基本信息查询 */
function handleResetQuery() {
queryFormRef.value!.resetFields();
@@ -498,7 +493,9 @@ function handleOpenDialog(id?: number) {
if (id) {
dialog.title = "修改车辆基本信息";
VehicleInfoAPI.getFormData(id).then((data) => {
- Object.assign(formData, data);
+ if (data.list.length > 0) {
+ Object.assign(formData, data.list[0]);
+ }
});
} else {
dialog.title = "新增车辆基本信息";
@@ -520,7 +517,7 @@ function handleSubmit() {
})
.finally(() => (loading.value = false));
} else {
- VehicleInfoAPI.add(formData)
+ VehicleInfoAPI.create(formData)
.then(() => {
ElMessage.success("新增成功");
handleCloseDialog();
--
Gitee
From 5f228a153ac176488182867db7011e528d171eb1 Mon Sep 17 00:00:00 2001
From: liqianliang <1012083552@qq.com>
Date: Tue, 7 Oct 2025 09:50:34 +0800
Subject: [PATCH 7/7] =?UTF-8?q?wip:=20:construction:=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +
.vscode/settings.json | 3 +
package.json | 6 +-
src/apiJson3/system/AccessAPIJSON.ts | 161 -------
src/apiJson3/system/RequestAPIJSON.ts | 151 ------
src/apiJson3/system/vehicle-info-apijson.ts | 224 ---------
src/apiJson3/vehicle/vehicle-info-apijson.ts | 239 ----------
src/apijson/vehicle/vehicle-info-apijson.ts | 3 +-
src/assets/icons/empty02.svg | 1 +
src/assets/icons/res-success.svg | 1 +
src/components/Dict/index.vue | 54 ++-
src/components/Draft/Index.vue | 137 ++++++
src/components/Form/HelpText.vue | 46 ++
src/components/Result/Index.vue | 22 +
src/layouts/components/TagsView/index.vue | 41 +-
src/router/index.ts | 6 +
src/store/modules/dict-store.ts | 5 +-
src/types/env.d.ts | 6 +
src/types/global.d.ts | 7 +
src/utils/db.ts | 157 +++++++
src/utils/page.ts | 13 +
src/views/login/components/Login.vue | 4 +-
src/views/result/Index.vue | 44 ++
src/views/vehicle/vehicle-info/add.vue | 397 ++++++++++++++++
src/views/vehicle/vehicle-info/edit.vue | 455 +++++++++++++++++++
src/views/vehicle/vehicle-info/index.vue | 263 ++---------
svgo/icons/res-success.svg | 1 +
svgo/svgo.config.cjs | 14 +-
28 files changed, 1415 insertions(+), 1050 deletions(-)
delete mode 100644 src/apiJson3/system/AccessAPIJSON.ts
delete mode 100644 src/apiJson3/system/RequestAPIJSON.ts
delete mode 100644 src/apiJson3/system/vehicle-info-apijson.ts
delete mode 100644 src/apiJson3/vehicle/vehicle-info-apijson.ts
create mode 100644 src/assets/icons/empty02.svg
create mode 100644 src/assets/icons/res-success.svg
create mode 100644 src/components/Draft/Index.vue
create mode 100644 src/components/Form/HelpText.vue
create mode 100644 src/components/Result/Index.vue
create mode 100644 src/utils/db.ts
create mode 100644 src/utils/page.ts
create mode 100644 src/views/result/Index.vue
create mode 100644 src/views/vehicle/vehicle-info/add.vue
create mode 100644 src/views/vehicle/vehicle-info/edit.vue
create mode 100644 svgo/icons/res-success.svg
diff --git a/.env.development b/.env.development
index fbd0a553..448d4920 100644
--- a/.env.development
+++ b/.env.development
@@ -15,3 +15,7 @@ VITE_APP_WS_ENDPOINT=
# 启用 Mock 服务
VITE_MOCK_DEV_SERVER=false
+
+VITE_APP_USER_NAME=admin
+
+VITE_APP_USER_PASSWORD=aks123456
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d05ee60e..7e3a7c38 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -73,5 +73,8 @@
},
"[markdown]": {
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
+ },
+ "[typescript]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fcb9563..018b123d 100644
--- a/package.json
+++ b/package.json
@@ -55,9 +55,12 @@
"axios": "^1.12.2",
"codemirror": "^5.65.20",
"codemirror-editor-vue3": "^2.8.0",
+ "crypto-js": "^4.2.0",
+ "dayjs": "^1.11.18",
"default-passive-events": "^2.0.0",
+ "dexie": "^4.2.1",
"echarts": "^5.6.0",
- "element-plus": "^2.11.2",
+ "element-plus": "^2.11.4",
"exceljs": "^4.4.0",
"lodash-es": "^4.17.21",
"nprogress": "^0.2.0",
@@ -78,6 +81,7 @@
"@eslint/js": "^9.35.0",
"@iconify/utils": "^2.3.0",
"@types/codemirror": "^5.60.16",
+ "@types/crypto-js": "^4.2.2",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.4",
"@types/nprogress": "^0.2.3",
diff --git a/src/apiJson3/system/AccessAPIJSON.ts b/src/apiJson3/system/AccessAPIJSON.ts
deleted file mode 100644
index 6e0b31ea..00000000
--- a/src/apiJson3/system/AccessAPIJSON.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import request from "@/utils/request";
-import {
- apiJsonGetOneTableParams,
- apiJsonOmit,
- apiJsonPageQuery,
- apiJsonPostTableParams,
-} from "@/utils/apijson";
-
-const APIJSON_BASE_URL = "/api";
-const TABLE_NAME = "Access";
-
-const AccessAPI = {
- /** 获取apijson权限配置分页数据 */
- getPage(queryParams?: AccessPageQuery) {
- return request<any, PageResult<AccessPageVO[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(
- TABLE_NAME,
- apiJsonOmit(queryParams, "pageNum", "pageSize"),
- apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
- ),
- });
- },
- /**
- * 获取apijson权限配置表单数据
- *
- * @param id apijson权限配置ID
- * @returns apijson权限配置表单数据
- */
- getFormData(id: number) {
- return request<any, PageResult<AccessForm[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
- });
- },
-
- /**
- * 添加apijson权限配置
- *
- * @param data apijson权限配置表单数据
- */
- create(data: AccessForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/post`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 更新apijson权限配置
- *
- * @param id apijson权限配置ID
- * @param data apijson权限配置表单数据
- */
- update(id: string, data: AccessForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/put`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- id,
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 批量删除apijson权限配置，多个以英文逗号(,)分割
- *
- * @param ids apijson权限配置ID字符串，多个以英文逗号(,)分割
- */
- deleteByIds(ids: string) {
- return request({
- url: `${APIJSON_BASE_URL}/json/delete`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- "id{}": ids.split(","),
- },
- TABLE_NAME
- ),
- });
- },
-};
-
-export default AccessAPI;
-
-/** apijson权限配置分页查询参数 */
-export interface AccessPageQuery extends PageQuery {}
-
-/** apijson权限配置表单对象 */
-export interface AccessForm {
- /** 调试 */
- debug?: number;
- /** 数据库名/模式 */
- schema?: string;
- /** 实际表名 */
- name?: string;
- /** 表别名 */
- alias?: string;
- /** 允许 get 的角色列表 */
- get?: string;
- /** 允许 head 的角色列表 */
- head?: string;
- /** 允许 gets 的角色列表 */
- gets?: string;
- /** 允许 heads 的角色列表 */
- heads?: string;
- /** 允许 post 的角色列表 */
- post?: string;
- /** 允许 put 的角色列表 */
- put?: string;
- /** 允许 delete 的角色列表 */
- delete?: string;
- /** 创建时间 */
- date?: Date;
- detail?: string;
-}
-
-/** apijson权限配置分页对象 */
-export interface AccessPageVO {
- id?: number;
- /** 调试 */
- debug?: number;
- /** 数据库名/模式 */
- schema?: string;
- /** 实际表名 */
- name?: string;
- /** 表别名 */
- alias?: string;
- /** 允许 get 的角色列表 */
- get?: string;
- /** 允许 head 的角色列表 */
- head?: string;
- /** 允许 gets 的角色列表 */
- gets?: string;
- /** 允许 heads 的角色列表 */
- heads?: string;
- /** 允许 post 的角色列表 */
- post?: string;
- /** 允许 put 的角色列表 */
- put?: string;
- /** 允许 delete 的角色列表 */
- delete?: string;
- /** 创建时间 */
- date?: Date;
- detail?: string;
-}
diff --git a/src/apiJson3/system/RequestAPIJSON.ts b/src/apiJson3/system/RequestAPIJSON.ts
deleted file mode 100644
index 97d844da..00000000
--- a/src/apiJson3/system/RequestAPIJSON.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import {
- apiJsonGetOneTableParams,
- apiJsonOmit,
- apiJsonPageQuery,
- apiJsonPostTableParams,
-} from "@/utils/apijson";
-import request from "@/utils/request";
-
-const REQUEST_BASE_URL = "/api/v1/request";
-const APIJSON_BASE_URL = "/api";
-const TABLE_NAME = "Request";
-const RequestAPI = {
- /** 获取apijson校验配置分页数据 */
- getPage(queryParams?: RequestPageQuery) {
- return request<any, PageResult<RequestPageVO[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(
- TABLE_NAME,
- apiJsonOmit(queryParams, "pageNum", "pageSize"),
- apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
- ),
- });
- },
- /**
- * 获取apijson校验配置表单数据
- *
- * @param id apijson校验配置ID
- * @returns apijson校验配置表单数据
- */
- getFormData(id: number) {
- return request<any, PageResult<RequestForm[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
- });
- },
-
- /**
- * 添加apijson校验配置
- *
- * @param data apijson校验配置表单数据
- */
- create(data: RequestForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/post`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 更新apijson校验配置
- *
- * @param id apijson校验配置ID
- * @param data apijson校验配置表单数据
- */
- update(id: string, data: RequestForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/put`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- id,
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 批量删除apijson校验配置，多个以英文逗号(,)分割
- *
- * @param ids apijson校验配置ID字符串，多个以英文逗号(,)分割
- */
- deleteByIds(ids: string) {
- return request({
- url: `${APIJSON_BASE_URL}/json/delete`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- "id{}": ids.split(","),
- },
- TABLE_NAME
- ),
- });
- },
-};
-
-export default RequestAPI;
-
-/** apijson校验配置分页查询参数 */
-export interface RequestPageQuery extends PageQuery {
- /** 唯一标识 */
- id?: number;
- /** 调试 */
- debug?: number;
- /** 请求方式 */
- method?: string;
- /** 标签 */
- tag?: string;
-}
-
-/** apijson校验配置表单对象 */
-export interface RequestForm {
- /** 唯一标识 */
- id?: number;
- /** 调试 */
- debug?: number;
- /** 版本 */
- version?: number;
- /** 请求方式 */
- method?: string;
- /** 标签 */
- tag?: string;
- /** 校验结构JSON */
- structure?: object;
- /** 详细说明 */
- detail?: string;
- /** 创建日期 */
- date?: Date;
-}
-
-/** apijson校验配置分页对象 */
-export interface RequestPageVO {
- /** 唯一标识 */
- id?: number;
- /** 调试 */
- debug?: number;
- /** 版本 */
- version?: number;
- /** 请求方式 */
- method?: string;
- /** 标签 */
- tag?: string;
- /** 校验结构JSON */
- structure?: object;
- /** 详细说明 */
- detail?: string;
- /** 创建日期 */
- date?: Date;
-}
diff --git a/src/apiJson3/system/vehicle-info-apijson.ts b/src/apiJson3/system/vehicle-info-apijson.ts
deleted file mode 100644
index 046ea7e1..00000000
--- a/src/apiJson3/system/vehicle-info-apijson.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import request from "@/utils/request";
-import {
- apiJsonGetOneTableParams,
- apiJsonOmit,
- apiJsonPageQuery,
- apiJsonPostTableParams,
-} from "@/utils/apijson";
-
-const APIJSON_BASE_URL = "/api";
-const TABLE_NAME = "VehicleInfo";
-
-const VehicleInfoAPI = {
- /** 获取车辆基本信息分页数据 */
- getPage(queryParams?: VehicleInfoPageQuery) {
- return request<any, PageResult<VehicleInfoPageVO[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(
- TABLE_NAME,
- apiJsonOmit(queryParams, "pageNum", "pageSize"),
- apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
- ),
- });
- },
- /**
- * 获取车辆基本信息表单数据
- *
- * @param id 车辆基本信息ID
- * @returns 车辆基本信息表单数据
- */
- getFormData(id: number) {
- return request<any, PageResult<VehicleInfoForm[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
- });
- },
-
- /**
- * 添加车辆基本信息
- *
- * @param data 车辆基本信息表单数据
- */
- create(data: VehicleInfoForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/post`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 更新车辆基本信息
- *
- * @param id 车辆基本信息ID
- * @param data 车辆基本信息表单数据
- */
- update(id: string, data: VehicleInfoForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/put`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- id,
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 批量删除车辆基本信息，多个以英文逗号(,)分割
- *
- * @param ids 车辆基本信息ID字符串，多个以英文逗号(,)分割
- */
- deleteByIds(ids: string) {
- return request({
- url: `${APIJSON_BASE_URL}/json/delete`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- "id{}": ids.split(","),
- },
- TABLE_NAME
- ),
- });
- },
-};
-
-export default VehicleInfoAPI;
-
-/** 车辆基本信息分页查询参数 */
-export interface VehicleInfoPageQuery extends PageQuery {}
-
-/** 车辆基本信息表单对象 */
-export interface VehicleInfoForm {
- /** 车辆唯一编号 */
- vehicleId?: string;
- /** 车牌号 */
- licensePlate?: string;
- /** 车辆识别代号(VIN) */
- vin?: string;
- /** 品牌 */
- brand?: string;
- /** 车型 */
- model?: string;
- /** 车系 */
- series?: string;
- /** 发动机型号 */
- engineModel?: string;
- /** 发动机号 */
- engineNumber?: string;
- /** 购置日期 */
- purchaseDate?: Date;
- /** 购置价格 */
- purchasePrice?: number;
- /** 购自单位/个人 */
- purchaseFrom?: string;
- /** 注册日期 */
- registrationDate?: Date;
- /** 首次上牌日期 */
- firstRegistrationDate?: Date;
- /** 燃料类型 */
- fuelType?: string;
- /** 排量(L) */
- displacement?: number;
- /** 功率(kW) */
- power?: number;
- /** 核定载客数 */
- seats?: number;
- /** 核定载质量(吨) */
- tonnage?: number;
- /** 颜色 */
- color?: string;
- /** 变速箱类型 */
- gearboxType?: string;
- /** 车辆状态 */
- status?: string;
- /** 所属部门ID */
- ownerDeptId?: number;
- /** 当前驾驶人ID */
- currentDriverId?: number;
- /** 创建时间 */
- createdAt?: Date;
- /** 更新时间 */
- updatedAt?: Date;
- /** 扩展字段1 */
- extendedField1?: string;
- /** 扩展字段2 */
- extendedField2?: string;
- /** 扩展字段3 */
- extendedField3?: string;
-}
-
-/** 车辆基本信息分页对象 */
-export interface VehicleInfoPageVO {
- /** 主键ID */
- id?: number;
- /** 车辆唯一编号 */
- vehicleId?: string;
- /** 车牌号 */
- licensePlate?: string;
- /** 车辆识别代号(VIN) */
- vin?: string;
- /** 品牌 */
- brand?: string;
- /** 车型 */
- model?: string;
- /** 车系 */
- series?: string;
- /** 发动机型号 */
- engineModel?: string;
- /** 发动机号 */
- engineNumber?: string;
- /** 购置日期 */
- purchaseDate?: Date;
- /** 购置价格 */
- purchasePrice?: number;
- /** 购自单位/个人 */
- purchaseFrom?: string;
- /** 注册日期 */
- registrationDate?: Date;
- /** 首次上牌日期 */
- firstRegistrationDate?: Date;
- /** 燃料类型 */
- fuelType?: string;
- /** 排量(L) */
- displacement?: number;
- /** 功率(kW) */
- power?: number;
- /** 核定载客数 */
- seats?: number;
- /** 核定载质量(吨) */
- tonnage?: number;
- /** 颜色 */
- color?: string;
- /** 变速箱类型 */
- gearboxType?: string;
- /** 车辆状态 */
- status?: string;
- /** 所属部门ID */
- ownerDeptId?: number;
- /** 当前驾驶人ID */
- currentDriverId?: number;
- /** 创建时间 */
- createdAt?: Date;
- /** 更新时间 */
- updatedAt?: Date;
- /** 扩展字段1 */
- extendedField1?: string;
- /** 扩展字段2 */
- extendedField2?: string;
- /** 扩展字段3 */
- extendedField3?: string;
-}
diff --git a/src/apiJson3/vehicle/vehicle-info-apijson.ts b/src/apiJson3/vehicle/vehicle-info-apijson.ts
deleted file mode 100644
index 004ed332..00000000
--- a/src/apiJson3/vehicle/vehicle-info-apijson.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import request from "@/utils/request";
-import {
- apiJsonGetOneTableParams,
- apiJsonOmit,
- apiJsonPageQuery,
- apiJsonPostTableParams,
-} from "@/utils/apijson";
-
-const APIJSON_BASE_URL = "/api";
-const TABLE_NAME = "VehicleInfo";
-
-const VehicleInfoAPI = {
- /** 获取车辆基本信息分页数据 */
- getPage(queryParams?: VehicleInfoPageQuery) {
- return request<any, PageResult<VehicleInfoPageVO[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(
- TABLE_NAME,
- apiJsonOmit(queryParams, "pageNum", "pageSize"),
- apiJsonPageQuery(queryParams?.pageNum, queryParams?.pageSize)
- ),
- });
- },
- /**
- * 获取车辆基本信息表单数据
- *
- * @param id 车辆基本信息ID
- * @returns 车辆基本信息表单数据
- */
- getFormData(id: number) {
- return request<any, PageResult<VehicleInfoForm[]>>({
- url: `${APIJSON_BASE_URL}/json/get`,
- method: "post",
- data: apiJsonGetOneTableParams(TABLE_NAME, { id }, apiJsonPageQuery(1, 1)),
- });
- },
-
- /**
- * 添加车辆基本信息
- *
- * @param data 车辆基本信息表单数据
- */
- create(data: VehicleInfoForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/post`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 更新车辆基本信息
- *
- * @param id 车辆基本信息ID
- * @param data 车辆基本信息表单数据
- */
- update(id: string, data: VehicleInfoForm) {
- return request({
- url: `${APIJSON_BASE_URL}/json/put`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- id,
- ...(data as ApiJsonTableParams),
- },
- TABLE_NAME
- ),
- });
- },
-
- /**
- * 批量删除车辆基本信息，多个以英文逗号(,)分割
- *
- * @param ids 车辆基本信息ID字符串，多个以英文逗号(,)分割
- */
- deleteByIds(ids: string) {
- return request({
- url: `${APIJSON_BASE_URL}/json/delete`,
- method: "post",
- data: apiJsonPostTableParams(
- TABLE_NAME,
- {
- "id{}": ids.split(","),
- },
- TABLE_NAME
- ),
- });
- },
-};
-
-export default VehicleInfoAPI;
-
-/** 车辆基本信息分页查询参数 */
-export interface VehicleInfoPageQuery extends PageQuery {
- /** 车辆唯一编号 */
- vehicleId?: string;
- /** 车牌号 */
- licensePlate?: string;
- /** 车辆识别代号(VIN) */
- vin?: string;
- /** 核定载客数 */
- seats?: number;
- /** 颜色 */
- color?: string;
- /** 变速箱类型 */
- gearboxType?: string;
- /** 车辆状态 */
- status?: string;
-}
-
-/** 车辆基本信息表单对象 */
-export interface VehicleInfoForm {
- /** 车辆唯一编号 */
- vehicleId?: string;
- /** 车牌号 */
- licensePlate?: string;
- /** 车辆识别代号(VIN) */
- vin?: string;
- /** 品牌 */
- brand?: string;
- /** 车型 */
- model?: string;
- /** 车系 */
- series?: string;
- /** 发动机型号 */
- engineModel?: string;
- /** 发动机号 */
- engineNumber?: string;
- /** 购置日期 */
- purchaseDate?: Date;
- /** 购置价格 */
- purchasePrice?: number;
- /** 购自单位/个人 */
- purchaseFrom?: string;
- /** 注册日期 */
- registrationDate?: Date;
- /** 首次上牌日期 */
- firstRegistrationDate?: Date;
- /** 燃料类型 */
- fuelType?: string;
- /** 排量(L) */
- displacement?: number;
- /** 功率(kW) */
- power?: number;
- /** 核定载客数 */
- seats?: number;
- /** 核定载质量(吨) */
- tonnage?: number;
- /** 颜色 */
- color?: string;
- /** 变速箱类型 */
- gearboxType?: string;
- /** 车辆状态 */
- status?: string;
- /** 所属部门ID */
- ownerDeptId?: number;
- /** 当前驾驶人ID */
- currentDriverId?: number;
- /** 创建时间 */
- createdAt?: Date;
- /** 更新时间 */
- updatedAt?: Date;
- /** 扩展字段1 */
- extendedField1?: string;
- /** 扩展字段2 */
- extendedField2?: string;
- /** 扩展字段3 */
- extendedField3?: string;
-}
-
-/** 车辆基本信息分页对象 */
-export interface VehicleInfoPageVO {
- /** 主键ID */
- id?: number;
- /** 车辆唯一编号 */
- vehicleId?: string;
- /** 车牌号 */
- licensePlate?: string;
- /** 车辆识别代号(VIN) */
- vin?: string;
- /** 品牌 */
- brand?: string;
- /** 车型 */
- model?: string;
- /** 车系 */
- series?: string;
- /** 发动机型号 */
- engineModel?: string;
- /** 发动机号 */
- engineNumber?: string;
- /** 购置日期 */
- purchaseDate?: Date;
- /** 购置价格 */
- purchasePrice?: number;
- /** 购自单位/个人 */
- purchaseFrom?: string;
- /** 注册日期 */
- registrationDate?: Date;
- /** 首次上牌日期 */
- firstRegistrationDate?: Date;
- /** 燃料类型 */
- fuelType?: string;
- /** 排量(L) */
- displacement?: number;
- /** 功率(kW) */
- power?: number;
- /** 核定载客数 */
- seats?: number;
- /** 核定载质量(吨) */
- tonnage?: number;
- /** 颜色 */
- color?: string;
- /** 变速箱类型 */
- gearboxType?: string;
- /** 车辆状态 */
- status?: string;
- /** 所属部门ID */
- ownerDeptId?: number;
- /** 当前驾驶人ID */
- currentDriverId?: number;
- /** 创建时间 */
- createdAt?: Date;
- /** 更新时间 */
- updatedAt?: Date;
- /** 扩展字段1 */
- extendedField1?: string;
- /** 扩展字段2 */
- extendedField2?: string;
- /** 扩展字段3 */
- extendedField3?: string;
-}
diff --git a/src/apijson/vehicle/vehicle-info-apijson.ts b/src/apijson/vehicle/vehicle-info-apijson.ts
index 151ef99a..73157664 100644
--- a/src/apijson/vehicle/vehicle-info-apijson.ts
+++ b/src/apijson/vehicle/vehicle-info-apijson.ts
@@ -108,6 +108,7 @@ export interface VehicleInfoPageQuery extends PageQuery {
/** 车辆基本信息表单对象 */
export interface VehicleInfoForm {
+ id?: number | string;
/** 车辆唯一编号（内部系统编号） */
vehicleId?: string;
/** 车牌号 */
@@ -189,7 +190,7 @@ export interface VehicleInfoPageVO {
/** 购置日期 */
purchaseDate?: Date;
/** 购置价格 */
- purchasePrice?: number;
+ purchasePrice?: string;
/** 购自单位/个人 */
purchaseFrom?: string;
/** 注册日期 */
diff --git a/src/assets/icons/empty02.svg b/src/assets/icons/empty02.svg
new file mode 100644
index 00000000..34875ded
--- /dev/null
+++ b/src/assets/icons/empty02.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg height="1024" node-id="1" sillyvg="true" template-height="1024" template-width="1024" version="1.1" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="114"><linearGradient gradientUnits="objectBoundingBox" id="SVGID_1_" node-id="9" spreadMethod="pad" x1="-1939.6713" x2="-1948.7948" y1="-419.6226" y2="-419.6226"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_2_" node-id="13" spreadMethod="pad" x1="-1942.03" x2="-1946.8134" y1="-415.9487" y2="-420.6938"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_3_" node-id="18" spreadMethod="pad" x1="-1939.713" x2="-1932.7667" y1="-423.968" y2="-417.3228"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_4_" node-id="22" spreadMethod="pad" x1="-1935.6128" x2="-1940.358" y1="-423.2166" y2="-418.4332"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_5_" node-id="27" spreadMethod="pad" x1="-1933.3893" x2="-1939.3177" y1="-333.2773" y2="-335.9234"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_6_" node-id="31" spreadMethod="pad" x1="-1933.2803" x2="-1938.7743" y1="-334.2078" y2="-335.0294"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_7_" node-id="36" spreadMethod="pad" x1="-1947.9651" x2="-1942.6628" y1="-333.9199" y2="-340.2926"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_8_" node-id="40" spreadMethod="pad" x1="-1945.8871" x2="-1946.1354" y1="-333.9617" y2="-338.4503"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_9_" node-id="45" spreadMethod="pad" x1="-1956.9164" x2="-1952.0746" y1="-371.1068" y2="-373.8923"><stop offset="0" stop-color="#bed3ff"></stop><stop offset="1" stop-color="#d7e5ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_10_" node-id="49" spreadMethod="pad" x1="-1951.3156" x2="-1956.0989" y1="-369.682" y2="-374.4272"><stop offset="0" stop-color="#c1e0ff"></stop><stop offset="1" stop-color="#eaf7ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_11_" node-id="54" spreadMethod="pad" x1="-1962.7445" x2="-1957.9027" y1="-381.0662" y2="-383.8517"><stop offset="0" stop-color="#bed3ff"></stop><stop offset="1" stop-color="#d7e5ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_12_" node-id="58" spreadMethod="pad" x1="-1957.1924" x2="-1961.9757" y1="-379.9869" y2="-384.7321"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_13_" node-id="62" spreadMethod="pad" x1="-1957.1924" x2="-1961.9757" y1="-379.9869" y2="-384.7321"><stop offset="0" stop-color="#c1e0ff"></stop><stop offset="1" stop-color="#eaf7ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_14_" node-id="67" spreadMethod="pad" x1="-1941.0472" x2="-1946.1888" y1="-350.642" y2="-355.7836"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_15_" node-id="71" spreadMethod="pad" x1="-1940.665" x2="-1945.4484" y1="-350.2833" y2="-355.0285"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc" stop-opacity="0"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_16_" node-id="76" spreadMethod="pad" x1="-1422.3761" x2="-1415.8804" y1="-1392.7556" y2="-1391.2916"><stop offset="0" stop-color="#ffd995"></stop><stop offset="1" stop-color="#ff9d6b"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_17_" node-id="81" spreadMethod="pad" x1="-1854.2954" x2="-1848.6338" y1="-112.6566" y2="-108.6218"><stop offset="0" stop-color="#ffd995"></stop><stop offset="1" stop-color="#ff9d6b"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_18_" node-id="87" spreadMethod="pad" x1="-1652.175" x2="-1647.5444" y1="-516.6826" y2="-512.9126"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_19_" node-id="91" spreadMethod="pad" x1="-1646.5701" x2="-1651.3534" y1="-511.5941" y2="-516.3393"><stop offset="0" stop-color="#c1e0ff"></stop><stop offset="1" stop-color="#eaf7ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_20_" node-id="95" spreadMethod="pad" x1="-1646.5701" x2="-1651.3534" y1="-511.5941" y2="-516.3393"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_21_" node-id="101" spreadMethod="pad" x1="-1574.3018" x2="-1569.6711" y1="-632.1608" y2="-628.3909"><stop offset="0" stop-color="#7da4fe"></stop><stop offset="1" stop-color="#d4e3ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_22_" node-id="105" spreadMethod="pad" x1="-1568.6968" x2="-1573.4801" y1="-627.0723" y2="-631.8175"><stop offset="0" stop-color="#c1e0ff"></stop><stop offset="1" stop-color="#eaf7ff"></stop></linearGradient><linearGradient gradientUnits="objectBoundingBox" id="SVGID_23_" node-id="109" spreadMethod="pad" x1="-1568.6968" x2="-1573.4801" y1="-627.0723" y2="-631.8175"><stop offset="0" stop-color="#6aacee"></stop><stop offset="1" stop-color="#c2e7fc"></stop></linearGradient></defs><g node-id="347"><path d="M 923.33 746.33 C 923.33 772.55 879.99 797.69 802.85 816.23 C 725.71 834.77 621.09 845.18 512.00 845.18 C 402.91 845.18 298.29 834.77 221.15 816.23 C 144.01 797.69 100.67 772.55 100.67 746.33 C 100.67 720.11 144.01 694.97 221.15 676.43 C 298.29 657.89 402.91 647.48 512.00 647.48 C 621.09 647.48 725.71 657.89 802.85 676.43 C 879.99 694.97 923.33 720.11 923.33 746.33 Z" fill="#9fcfff" fill-opacity="0.2" fill-rule="nonzero" group-id="1" node-id="259" stroke="none" target-height="197.70001" target-width="822.6599" target-x="100.67001" target-y="647.48004"></path></g><g node-id="348"><g node-id="354"><path d="M 486.29 398.77 L 735.45 425.56 L 598.31 474.79 L 486.29 477.06 L 486.29 398.77 Z" fill="url(#SVGID_1_)" fill-rule="evenodd" group-id="2,8" node-id="266" stroke="none" target-height="78.29007" target-width="249.16" target-x="486.29" target-y="398.76996"></path><path d="M 486.29 398.77 L 735.45 425.56 L 598.31 474.79 L 486.29 477.06 L 486.29 398.77 Z" fill="url(#SVGID_2_)" fill-rule="evenodd" group-id="2,8" node-id="268" stroke="none" target-height="78.29007" target-width="249.16" target-x="486.29" target-y="398.76996"></path></g><g node-id="355"><path d="M 278.38 445.00 L 486.32 398.79 L 486.32 475.90 L 278.38 445.00 Z" fill="url(#SVGID_3_)" fill-rule="evenodd" group-id="2,9" node-id="273" stroke="none" target-height="77.109985" target-width="207.94" target-x="278.38" target-y="398.79"></path><path d="M 278.38 445.00 L 486.32 398.79 L 486.32 475.90 L 278.38 445.00 Z" fill="url(#SVGID_4_)" fill-rule="evenodd" group-id="2,9" node-id="275" stroke="none" target-height="77.109985" target-width="207.94" target-x="278.38" target-y="398.79"></path></g><g node-id="356"><path d="M 518.80 470.18 L 735.52 425.54 L 735.52 696.94 C 735.52 701.49 732.54 705.49 728.18 706.79 L 518.80 769.37 L 518.80 470.18 Z" fill="url(#SVGID_5_)" fill-rule="evenodd" group-id="2,10" node-id="280" stroke="none" target-height="343.83005" target-width="216.72003" target-x="518.8" target-y="425.54"></path><path d="M 518.80 470.18 L 735.52 425.54 L 735.52 696.94 C 735.52 701.49 732.54 705.49 728.18 706.79 L 518.80 769.37 L 518.80 470.18 Z" fill="url(#SVGID_6_)" fill-rule="evenodd" group-id="2,10" node-id="282" stroke="none" target-height="343.83005" target-width="216.72003" target-x="518.8" target-y="425.54"></path></g><g node-id="357"><path d="M 278.38 444.98 L 518.84 470.28 L 518.84 769.39 L 286.71 724.46 C 281.87 723.52 278.38 719.29 278.38 714.36 L 278.38 444.98 Z" fill="url(#SVGID_7_)" fill-rule="evenodd" group-id="2,11" node-id="287" stroke="none" target-height="324.41" target-width="240.46002" target-x="278.38" target-y="444.98"></path><path d="M 278.38 444.98 L 518.84 470.28 L 518.84 769.39 L 286.71 724.46 C 281.87 723.52 278.38 719.29 278.38 714.36 L 278.38 444.98 Z" fill="url(#SVGID_8_)" fill-rule="evenodd" group-id="2,11" node-id="289" stroke="none" target-height="324.41" target-width="240.46002" target-x="278.38" target-y="444.98"></path></g><g node-id="358"><path d="M 518.80 470.18 L 734.88 425.44 L 831.07 495.47 C 834.51 497.97 833.59 503.33 829.52 504.55 L 636.80 562.15 C 628.09 564.75 618.65 562.56 611.98 556.39 L 518.80 470.18 Z" fill="url(#SVGID_9_)" fill-rule="evenodd" group-id="2,12" node-id="294" stroke="none" target-height="139.31" target-width="315.71002" target-x="518.8" target-y="425.44"></path><path d="M 518.80 470.18 L 734.88 425.44 L 831.07 495.47 C 834.51 497.97 833.59 503.33 829.52 504.55 L 636.80 562.15 C 628.09 564.75 618.65 562.56 611.98 556.39 L 518.80 470.18 Z" fill="url(#SVGID_10_)" fill-rule="evenodd" group-id="2,12" node-id="296" stroke="none" target-height="139.31" target-width="315.71002" target-x="518.8" target-y="425.44"></path></g><g node-id="359"><path d="M 278.40 445.01 L 518.81 470.24 L 433.34 555.76 C 426.09 563.02 415.70 566.19 405.63 564.23 L 193.44 522.94 C 189.12 522.10 187.79 516.58 191.24 513.86 L 278.40 445.01 Z" fill="url(#SVGID_11_)" fill-rule="evenodd" group-id="2,13" node-id="301" stroke="none" target-height="121.17999" target-width="331.02002" target-x="187.79" target-y="445.01"></path><path d="M 278.40 445.01 L 518.81 470.24 L 433.34 555.76 C 426.09 563.02 415.70 566.19 405.63 564.23 L 193.44 522.94 C 189.12 522.10 187.79 516.58 191.24 513.86 L 278.40 445.01 Z" fill="url(#SVGID_12_)" fill-rule="evenodd" group-id="2,13" node-id="303" stroke="none" target-height="121.17999" target-width="331.02002" target-x="187.79" target-y="445.01"></path><path d="M 278.40 445.01 L 518.81 470.24 L 433.34 555.76 C 426.09 563.02 415.70 566.19 405.63 564.23 L 193.44 522.94 C 189.12 522.10 187.79 516.58 191.24 513.86 L 278.40 445.01 Z" fill="url(#SVGID_13_)" fill-rule="evenodd" group-id="2,13" node-id="305" stroke="none" target-height="121.17999" target-width="331.02002" target-x="187.79" target-y="445.01"></path></g></g><g node-id="349"><path d="M 526.32 201.01 C 509.78 200.83 497.43 214.95 496.93 232.19 C 496.41 250.13 508.54 265.18 530.39 269.90 C 513.42 286.61 483.72 301.32 440.71 311.84 C 438.49 312.38 437.13 314.63 437.67 316.86 C 438.21 319.09 440.45 320.45 442.67 319.91 C 490.47 308.22 522.99 291.18 540.50 271.23 C 582.52 273.35 628.30 234.00 678.35 154.06 C 679.57 152.12 678.98 149.55 677.05 148.33 C 675.12 147.11 672.56 147.69 671.35 149.64 C 625.21 223.33 583.56 260.84 546.83 262.91 C 549.84 258.26 552.10 253.47 553.60 248.59 C 561.05 224.35 546.52 201.01 526.32 201.01 Z M 526.27 209.32 C 540.60 209.32 551.59 226.96 545.69 246.13 C 543.97 251.73 541.05 257.24 536.91 262.59 C 535.82 262.46 534.74 262.29 533.66 262.09 C 514.66 258.55 504.79 246.69 505.20 232.43 C 505.57 219.44 514.54 209.19 526.27 209.32 Z" fill="url(#SVGID_14_)" fill-rule="evenodd" group-id="3" node-id="311" stroke="none" target-height="173.34001" target-width="242.44" target-x="437.13" target-y="147.11"></path><path d="M 526.32 201.01 C 509.78 200.83 497.43 214.95 496.93 232.19 C 496.41 250.13 508.54 265.18 530.39 269.90 C 513.42 286.61 483.72 301.32 440.71 311.84 C 438.49 312.38 437.13 314.63 437.67 316.86 C 438.21 319.09 440.45 320.45 442.67 319.91 C 490.47 308.22 522.99 291.18 540.50 271.23 C 582.52 273.35 628.30 234.00 678.35 154.06 C 679.57 152.12 678.98 149.55 677.05 148.33 C 675.12 147.11 672.56 147.69 671.35 149.64 C 625.21 223.33 583.56 260.84 546.83 262.91 C 549.84 258.26 552.10 253.47 553.60 248.59 C 561.05 224.35 546.52 201.01 526.32 201.01 Z M 526.27 209.32 C 540.60 209.32 551.59 226.96 545.69 246.13 C 543.97 251.73 541.05 257.24 536.91 262.59 C 535.82 262.46 534.74 262.29 533.66 262.09 C 514.66 258.55 504.79 246.69 505.20 232.43 C 505.57 219.44 514.54 209.19 526.27 209.32 Z" fill="url(#SVGID_15_)" fill-rule="evenodd" group-id="3" node-id="313" stroke="none" target-height="173.34001" target-width="242.44" target-x="437.13" target-y="147.11"></path></g><g node-id="350"><path d="M 653.12 344.38 C 622.75 361.26 629.38 377.30 628.75 390.97 C 628.32 400.08 626.49 406.28 623.28 409.58 C 664.11 393.83 682.23 375.39 677.65 354.25 C 675.20 342.91 673.35 337.41 671.27 335.37 C 671.03 335.15 672.55 323.82 672.31 323.68 C 672.36 322.34 670.99 322.08 670.49 323.35 C 669.22 326.25 666.74 335.42 666.57 335.51 C 662.87 337.39 659.88 340.93 653.12 344.38 Z" fill="url(#SVGID_16_)" fill-rule="evenodd" group-id="4" node-id="318" stroke="none" target-height="87.50229" target-width="59.475098" target-x="622.7519" target-y="322.07883"></path></g><g node-id="351"><path d="M 342.49 268.75 C 315.00 264.86 311.53 278.30 304.57 286.73 C 299.93 292.34 295.80 295.42 292.15 295.97 C 325.80 305.65 346.22 302.62 353.43 286.91 C 357.29 278.48 358.75 274.07 358.39 271.76 C 358.36 271.50 364.75 264.99 364.66 264.79 C 365.34 263.95 364.59 263.14 363.66 263.69 C 361.45 264.94 355.47 269.60 355.31 269.57 C 352.07 269.00 348.47 269.81 342.49 268.75 Z" fill="url(#SVGID_17_)" fill-rule="evenodd" group-id="5" node-id="323" stroke="none" target-height="42.5094" target-width="73.18262" target-x="292.15433" target-y="263.1379"></path></g><g node-id="352"><path d="M 793.92 272.12 C 794.15 272.54 794.48 272.86 794.90 273.10 L 804.58 278.56 C 804.68 278.62 804.77 278.68 804.86 278.75 C 804.95 278.82 805.04 278.89 805.12 278.97 C 805.20 279.05 805.28 279.13 805.35 279.22 C 805.42 279.31 805.48 279.40 805.54 279.50 C 805.60 279.60 805.65 279.70 805.69 279.80 C 805.73 279.90 805.77 280.01 805.80 280.12 C 805.83 280.23 805.85 280.34 805.87 280.45 C 805.89 280.56 805.89 280.68 805.89 280.79 C 805.89 280.90 805.88 281.02 805.87 281.13 C 805.86 281.24 805.83 281.35 805.80 281.46 C 805.77 281.57 805.73 281.68 805.69 281.78 C 805.65 281.88 805.60 281.99 805.54 282.08 C 805.48 282.17 805.42 282.27 805.35 282.36 C 805.28 282.45 805.21 282.53 805.12 282.61 C 805.04 282.69 804.95 282.76 804.86 282.83 C 804.77 282.90 804.67 282.96 804.58 283.02 L 794.90 288.48 C 794.48 288.71 794.16 289.04 793.92 289.46 L 788.46 299.14 C 788.40 299.24 788.34 299.33 788.27 299.42 C 788.20 299.51 788.13 299.60 788.05 299.68 C 787.97 299.76 787.89 299.84 787.80 299.91 C 787.71 299.98 787.62 300.04 787.52 300.10 C 787.42 300.16 787.32 300.21 787.22 300.25 C 787.12 300.29 787.01 300.33 786.90 300.36 C 786.79 300.39 786.68 300.41 786.57 300.43 C 786.46 300.44 786.34 300.45 786.23 300.45 C 786.12 300.45 786.00 300.44 785.89 300.43 C 785.78 300.42 785.67 300.39 785.56 300.36 C 785.45 300.33 785.34 300.29 785.24 300.25 C 785.14 300.21 785.03 300.16 784.94 300.10 C 784.84 300.04 784.75 299.98 784.66 299.91 C 784.57 299.84 784.49 299.77 784.41 299.68 C 784.33 299.60 784.26 299.51 784.19 299.42 C 784.12 299.33 784.06 299.23 784.00 299.14 L 778.54 289.46 C 778.31 289.04 777.98 288.72 777.56 288.48 L 767.88 283.02 C 767.78 282.96 767.69 282.90 767.60 282.83 C 767.51 282.76 767.42 282.69 767.34 282.61 C 767.26 282.53 767.18 282.45 767.11 282.36 C 767.04 282.27 766.98 282.18 766.92 282.08 C 766.86 281.98 766.81 281.88 766.77 281.78 C 766.73 281.68 766.69 281.57 766.66 281.46 C 766.63 281.35 766.61 281.24 766.59 281.13 C 766.58 281.02 766.57 280.90 766.57 280.79 C 766.57 280.68 766.58 280.56 766.59 280.45 C 766.60 280.34 766.63 280.23 766.66 280.12 C 766.69 280.01 766.73 279.90 766.77 279.80 C 766.81 279.70 766.86 279.59 766.92 279.50 C 766.98 279.41 767.04 279.31 767.11 279.22 C 767.18 279.13 767.25 279.05 767.34 278.97 C 767.42 278.89 767.51 278.82 767.60 278.75 C 767.69 278.68 767.79 278.62 767.88 278.56 L 777.56 273.10 C 777.98 272.87 778.30 272.54 778.54 272.12 L 784.00 262.44 C 784.06 262.34 784.12 262.25 784.19 262.16 C 784.26 262.07 784.33 261.98 784.41 261.90 C 784.49 261.82 784.57 261.74 784.66 261.67 C 784.75 261.60 784.84 261.54 784.94 261.48 C 785.04 261.42 785.14 261.37 785.24 261.33 C 785.34 261.29 785.45 261.25 785.56 261.22 C 785.67 261.19 785.78 261.17 785.89 261.15 C 786.00 261.14 786.12 261.13 786.23 261.13 C 786.34 261.13 786.46 261.14 786.57 261.15 C 786.68 261.16 786.79 261.19 786.90 261.22 C 787.01 261.25 787.12 261.29 787.22 261.33 C 787.32 261.37 787.43 261.42 787.52 261.48 C 787.62 261.54 787.71 261.60 787.80 261.67 C 787.89 261.74 787.97 261.81 788.05 261.90 C 788.13 261.98 788.20 262.07 788.27 262.16 C 788.34 262.25 788.40 262.35 788.46 262.44 L 793.92 272.12 Z" fill="#d8d8d8" fill-rule="nonzero" group-id="6" node-id="328" stroke="none" target-height="39.320007" target-width="39.32007" target-x="766.57" target-y="261.13"></path><path d="M 793.92 272.12 C 794.15 272.54 794.48 272.86 794.90 273.10 L 804.58 278.56 C 804.68 278.62 804.77 278.68 804.86 278.75 C 804.95 278.82 805.04 278.89 805.12 278.97 C 805.20 279.05 805.28 279.13 805.35 279.22 C 805.42 279.31 805.48 279.40 805.54 279.50 C 805.60 279.60 805.65 279.70 805.69 279.80 C 805.73 279.90 805.77 280.01 805.80 280.12 C 805.83 280.23 805.85 280.34 805.87 280.45 C 805.89 280.56 805.89 280.68 805.89 280.79 C 805.89 280.90 805.88 281.02 805.87 281.13 C 805.86 281.24 805.83 281.35 805.80 281.46 C 805.77 281.57 805.73 281.68 805.69 281.78 C 805.65 281.88 805.60 281.99 805.54 282.08 C 805.48 282.17 805.42 282.27 805.35 282.36 C 805.28 282.45 805.21 282.53 805.12 282.61 C 805.04 282.69 804.95 282.76 804.86 282.83 C 804.77 282.90 804.67 282.96 804.58 283.02 L 794.90 288.48 C 794.48 288.71 794.16 289.04 793.92 289.46 L 788.46 299.14 C 788.40 299.24 788.34 299.33 788.27 299.42 C 788.20 299.51 788.13 299.60 788.05 299.68 C 787.97 299.76 787.89 299.84 787.80 299.91 C 787.71 299.98 787.62 300.04 787.52 300.10 C 787.42 300.16 787.32 300.21 787.22 300.25 C 787.12 300.29 787.01 300.33 786.90 300.36 C 786.79 300.39 786.68 300.41 786.57 300.43 C 786.46 300.44 786.34 300.45 786.23 300.45 C 786.12 300.45 786.00 300.44 785.89 300.43 C 785.78 300.42 785.67 300.39 785.56 300.36 C 785.45 300.33 785.34 300.29 785.24 300.25 C 785.14 300.21 785.03 300.16 784.94 300.10 C 784.84 300.04 784.75 299.98 784.66 299.91 C 784.57 299.84 784.49 299.77 784.41 299.68 C 784.33 299.60 784.26 299.51 784.19 299.42 C 784.12 299.33 784.06 299.23 784.00 299.14 L 778.54 289.46 C 778.31 289.04 777.98 288.72 777.56 288.48 L 767.88 283.02 C 767.78 282.96 767.69 282.90 767.60 282.83 C 767.51 282.76 767.42 282.69 767.34 282.61 C 767.26 282.53 767.18 282.45 767.11 282.36 C 767.04 282.27 766.98 282.18 766.92 282.08 C 766.86 281.98 766.81 281.88 766.77 281.78 C 766.73 281.68 766.69 281.57 766.66 281.46 C 766.63 281.35 766.61 281.24 766.59 281.13 C 766.58 281.02 766.57 280.90 766.57 280.79 C 766.57 280.68 766.58 280.56 766.59 280.45 C 766.60 280.34 766.63 280.23 766.66 280.12 C 766.69 280.01 766.73 279.90 766.77 279.80 C 766.81 279.70 766.86 279.59 766.92 279.50 C 766.98 279.41 767.04 279.31 767.11 279.22 C 767.18 279.13 767.25 279.05 767.34 278.97 C 767.42 278.89 767.51 278.82 767.60 278.75 C 767.69 278.68 767.79 278.62 767.88 278.56 L 777.56 273.10 C 777.98 272.87 778.30 272.54 778.54 272.12 L 784.00 262.44 C 784.06 262.34 784.12 262.25 784.19 262.16 C 784.26 262.07 784.33 261.98 784.41 261.90 C 784.49 261.82 784.57 261.74 784.66 261.67 C 784.75 261.60 784.84 261.54 784.94 261.48 C 785.04 261.42 785.14 261.37 785.24 261.33 C 785.34 261.29 785.45 261.25 785.56 261.22 C 785.67 261.19 785.78 261.17 785.89 261.15 C 786.00 261.14 786.12 261.13 786.23 261.13 C 786.34 261.13 786.46 261.14 786.57 261.15 C 786.68 261.16 786.79 261.19 786.90 261.22 C 787.01 261.25 787.12 261.29 787.22 261.33 C 787.32 261.37 787.43 261.42 787.52 261.48 C 787.62 261.54 787.71 261.60 787.80 261.67 C 787.89 261.74 787.97 261.81 788.05 261.90 C 788.13 261.98 788.20 262.07 788.27 262.16 C 788.34 262.25 788.40 262.35 788.46 262.44 L 793.92 272.12 Z" fill="url(#SVGID_18_)" fill-rule="nonzero" group-id="6" node-id="330" stroke="none" target-height="39.320007" target-width="39.32007" target-x="766.57" target-y="261.13"></path><path d="M 793.92 272.12 C 794.15 272.54 794.48 272.86 794.90 273.10 L 804.58 278.56 C 804.68 278.62 804.77 278.68 804.86 278.75 C 804.95 278.82 805.04 278.89 805.12 278.97 C 805.20 279.05 805.28 279.13 805.35 279.22 C 805.42 279.31 805.48 279.40 805.54 279.50 C 805.60 279.60 805.65 279.70 805.69 279.80 C 805.73 279.90 805.77 280.01 805.80 280.12 C 805.83 280.23 805.85 280.34 805.87 280.45 C 805.89 280.56 805.89 280.68 805.89 280.79 C 805.89 280.90 805.88 281.02 805.87 281.13 C 805.86 281.24 805.83 281.35 805.80 281.46 C 805.77 281.57 805.73 281.68 805.69 281.78 C 805.65 281.88 805.60 281.99 805.54 282.08 C 805.48 282.17 805.42 282.27 805.35 282.36 C 805.28 282.45 805.21 282.53 805.12 282.61 C 805.04 282.69 804.95 282.76 804.86 282.83 C 804.77 282.90 804.67 282.96 804.58 283.02 L 794.90 288.48 C 794.48 288.71 794.16 289.04 793.92 289.46 L 788.46 299.14 C 788.40 299.24 788.34 299.33 788.27 299.42 C 788.20 299.51 788.13 299.60 788.05 299.68 C 787.97 299.76 787.89 299.84 787.80 299.91 C 787.71 299.98 787.62 300.04 787.52 300.10 C 787.42 300.16 787.32 300.21 787.22 300.25 C 787.12 300.29 787.01 300.33 786.90 300.36 C 786.79 300.39 786.68 300.41 786.57 300.43 C 786.46 300.44 786.34 300.45 786.23 300.45 C 786.12 300.45 786.00 300.44 785.89 300.43 C 785.78 300.42 785.67 300.39 785.56 300.36 C 785.45 300.33 785.34 300.29 785.24 300.25 C 785.14 300.21 785.03 300.16 784.94 300.10 C 784.84 300.04 784.75 299.98 784.66 299.91 C 784.57 299.84 784.49 299.77 784.41 299.68 C 784.33 299.60 784.26 299.51 784.19 299.42 C 784.12 299.33 784.06 299.23 784.00 299.14 L 778.54 289.46 C 778.31 289.04 777.98 288.72 777.56 288.48 L 767.88 283.02 C 767.78 282.96 767.69 282.90 767.60 282.83 C 767.51 282.76 767.42 282.69 767.34 282.61 C 767.26 282.53 767.18 282.45 767.11 282.36 C 767.04 282.27 766.98 282.18 766.92 282.08 C 766.86 281.98 766.81 281.88 766.77 281.78 C 766.73 281.68 766.69 281.57 766.66 281.46 C 766.63 281.35 766.61 281.24 766.59 281.13 C 766.58 281.02 766.57 280.90 766.57 280.79 C 766.57 280.68 766.58 280.56 766.59 280.45 C 766.60 280.34 766.63 280.23 766.66 280.12 C 766.69 280.01 766.73 279.90 766.77 279.80 C 766.81 279.70 766.86 279.59 766.92 279.50 C 766.98 279.41 767.04 279.31 767.11 279.22 C 767.18 279.13 767.25 279.05 767.34 278.97 C 767.42 278.89 767.51 278.82 767.60 278.75 C 767.69 278.68 767.79 278.62 767.88 278.56 L 777.56 273.10 C 777.98 272.87 778.30 272.54 778.54 272.12 L 784.00 262.44 C 784.06 262.34 784.12 262.25 784.19 262.16 C 784.26 262.07 784.33 261.98 784.41 261.90 C 784.49 261.82 784.57 261.74 784.66 261.67 C 784.75 261.60 784.84 261.54 784.94 261.48 C 785.04 261.42 785.14 261.37 785.24 261.33 C 785.34 261.29 785.45 261.25 785.56 261.22 C 785.67 261.19 785.78 261.17 785.89 261.15 C 786.00 261.14 786.12 261.13 786.23 261.13 C 786.34 261.13 786.46 261.14 786.57 261.15 C 786.68 261.16 786.79 261.19 786.90 261.22 C 787.01 261.25 787.12 261.29 787.22 261.33 C 787.32 261.37 787.43 261.42 787.52 261.48 C 787.62 261.54 787.71 261.60 787.80 261.67 C 787.89 261.74 787.97 261.81 788.05 261.90 C 788.13 261.98 788.20 262.07 788.27 262.16 C 788.34 262.25 788.40 262.35 788.46 262.44 L 793.92 272.12 Z" fill="url(#SVGID_19_)" fill-rule="nonzero" group-id="6" node-id="332" stroke="none" target-height="39.320007" target-width="39.32007" target-x="766.57" target-y="261.13"></path><path d="M 793.92 272.12 C 794.15 272.54 794.48 272.86 794.90 273.10 L 804.58 278.56 C 804.68 278.62 804.77 278.68 804.86 278.75 C 804.95 278.82 805.04 278.89 805.12 278.97 C 805.20 279.05 805.28 279.13 805.35 279.22 C 805.42 279.31 805.48 279.40 805.54 279.50 C 805.60 279.60 805.65 279.70 805.69 279.80 C 805.73 279.90 805.77 280.01 805.80 280.12 C 805.83 280.23 805.85 280.34 805.87 280.45 C 805.89 280.56 805.89 280.68 805.89 280.79 C 805.89 280.90 805.88 281.02 805.87 281.13 C 805.86 281.24 805.83 281.35 805.80 281.46 C 805.77 281.57 805.73 281.68 805.69 281.78 C 805.65 281.88 805.60 281.99 805.54 282.08 C 805.48 282.17 805.42 282.27 805.35 282.36 C 805.28 282.45 805.21 282.53 805.12 282.61 C 805.04 282.69 804.95 282.76 804.86 282.83 C 804.77 282.90 804.67 282.96 804.58 283.02 L 794.90 288.48 C 794.48 288.71 794.16 289.04 793.92 289.46 L 788.46 299.14 C 788.40 299.24 788.34 299.33 788.27 299.42 C 788.20 299.51 788.13 299.60 788.05 299.68 C 787.97 299.76 787.89 299.84 787.80 299.91 C 787.71 299.98 787.62 300.04 787.52 300.10 C 787.42 300.16 787.32 300.21 787.22 300.25 C 787.12 300.29 787.01 300.33 786.90 300.36 C 786.79 300.39 786.68 300.41 786.57 300.43 C 786.46 300.44 786.34 300.45 786.23 300.45 C 786.12 300.45 786.00 300.44 785.89 300.43 C 785.78 300.42 785.67 300.39 785.56 300.36 C 785.45 300.33 785.34 300.29 785.24 300.25 C 785.14 300.21 785.03 300.16 784.94 300.10 C 784.84 300.04 784.75 299.98 784.66 299.91 C 784.57 299.84 784.49 299.77 784.41 299.68 C 784.33 299.60 784.26 299.51 784.19 299.42 C 784.12 299.33 784.06 299.23 784.00 299.14 L 778.54 289.46 C 778.31 289.04 777.98 288.72 777.56 288.48 L 767.88 283.02 C 767.78 282.96 767.69 282.90 767.60 282.83 C 767.51 282.76 767.42 282.69 767.34 282.61 C 767.26 282.53 767.18 282.45 767.11 282.36 C 767.04 282.27 766.98 282.18 766.92 282.08 C 766.86 281.98 766.81 281.88 766.77 281.78 C 766.73 281.68 766.69 281.57 766.66 281.46 C 766.63 281.35 766.61 281.24 766.59 281.13 C 766.58 281.02 766.57 280.90 766.57 280.79 C 766.57 280.68 766.58 280.56 766.59 280.45 C 766.60 280.34 766.63 280.23 766.66 280.12 C 766.69 280.01 766.73 279.90 766.77 279.80 C 766.81 279.70 766.86 279.59 766.92 279.50 C 766.98 279.41 767.04 279.31 767.11 279.22 C 767.18 279.13 767.25 279.05 767.34 278.97 C 767.42 278.89 767.51 278.82 767.60 278.75 C 767.69 278.68 767.79 278.62 767.88 278.56 L 777.56 273.10 C 777.98 272.87 778.30 272.54 778.54 272.12 L 784.00 262.44 C 784.06 262.34 784.12 262.25 784.19 262.16 C 784.26 262.07 784.33 261.98 784.41 261.90 C 784.49 261.82 784.57 261.74 784.66 261.67 C 784.75 261.60 784.84 261.54 784.94 261.48 C 785.04 261.42 785.14 261.37 785.24 261.33 C 785.34 261.29 785.45 261.25 785.56 261.22 C 785.67 261.19 785.78 261.17 785.89 261.15 C 786.00 261.14 786.12 261.13 786.23 261.13 C 786.34 261.13 786.46 261.14 786.57 261.15 C 786.68 261.16 786.79 261.19 786.90 261.22 C 787.01 261.25 787.12 261.29 787.22 261.33 C 787.32 261.37 787.43 261.42 787.52 261.48 C 787.62 261.54 787.71 261.60 787.80 261.67 C 787.89 261.74 787.97 261.81 788.05 261.90 C 788.13 261.98 788.20 262.07 788.27 262.16 C 788.34 262.25 788.40 262.35 788.46 262.44 L 793.92 272.12 Z" fill="url(#SVGID_20_)" fill-rule="nonzero" group-id="6" node-id="334" stroke="none" target-height="39.320007" target-width="39.32007" target-x="766.57" target-y="261.13"></path></g><g node-id="353"><path d="M 224.05 376.46 C 224.28 376.88 224.61 377.20 225.03 377.44 L 230.63 380.60 C 230.73 380.66 230.82 380.72 230.91 380.79 C 231.00 380.86 231.09 380.93 231.17 381.01 C 231.25 381.09 231.33 381.17 231.40 381.26 C 231.47 381.35 231.53 381.44 231.59 381.54 C 231.65 381.64 231.70 381.74 231.74 381.84 C 231.78 381.94 231.82 382.05 231.85 382.16 C 231.88 382.27 231.90 382.38 231.92 382.49 C 231.93 382.60 231.94 382.72 231.94 382.83 C 231.94 382.94 231.93 383.06 231.92 383.17 C 231.91 383.28 231.88 383.39 231.85 383.50 C 231.82 383.61 231.78 383.72 231.74 383.82 C 231.70 383.92 231.65 384.03 231.59 384.12 C 231.53 384.22 231.47 384.31 231.40 384.40 C 231.33 384.49 231.26 384.57 231.17 384.65 C 231.09 384.73 231.00 384.80 230.91 384.87 C 230.82 384.94 230.72 385.00 230.63 385.06 L 225.03 388.22 C 224.61 388.45 224.29 388.78 224.05 389.20 L 220.89 394.80 C 220.83 394.90 220.77 394.99 220.70 395.08 C 220.63 395.17 220.56 395.26 220.48 395.34 C 220.40 395.42 220.32 395.50 220.23 395.57 C 220.14 395.64 220.05 395.70 219.95 395.76 C 219.85 395.82 219.75 395.87 219.65 395.91 C 219.55 395.95 219.44 395.99 219.33 396.02 C 219.22 396.05 219.11 396.07 219.00 396.09 C 218.89 396.11 218.77 396.11 218.66 396.11 C 218.55 396.11 218.43 396.10 218.32 396.09 C 218.21 396.08 218.10 396.05 217.99 396.02 C 217.88 395.99 217.77 395.95 217.67 395.91 C 217.57 395.87 217.46 395.82 217.37 395.76 C 217.27 395.70 217.18 395.64 217.09 395.57 C 217.00 395.50 216.92 395.43 216.84 395.34 C 216.76 395.26 216.69 395.17 216.62 395.08 C 216.55 394.99 216.49 394.89 216.43 394.80 L 213.27 389.20 C 213.04 388.78 212.71 388.46 212.29 388.22 L 206.69 385.06 C 206.59 385.00 206.50 384.94 206.41 384.87 C 206.32 384.80 206.23 384.73 206.15 384.65 C 206.07 384.57 205.99 384.49 205.92 384.40 C 205.85 384.31 205.79 384.22 205.73 384.12 C 205.67 384.02 205.62 383.92 205.58 383.82 C 205.54 383.72 205.50 383.61 205.47 383.50 C 205.44 383.39 205.42 383.28 205.40 383.17 C 205.39 383.06 205.38 382.94 205.38 382.83 C 205.38 382.72 205.39 382.60 205.40 382.49 C 205.41 382.38 205.44 382.27 205.47 382.16 C 205.50 382.05 205.54 381.94 205.58 381.84 C 205.62 381.74 205.67 381.63 205.73 381.54 C 205.79 381.44 205.85 381.35 205.92 381.26 C 205.99 381.17 206.06 381.09 206.15 381.01 C 206.23 380.93 206.32 380.86 206.41 380.79 C 206.50 380.72 206.60 380.66 206.69 380.60 L 212.29 377.44 C 212.71 377.21 213.03 376.88 213.27 376.46 L 216.43 370.86 C 216.49 370.76 216.55 370.67 216.62 370.58 C 216.69 370.49 216.76 370.40 216.84 370.32 C 216.92 370.24 217.00 370.16 217.09 370.09 C 217.18 370.02 217.27 369.96 217.37 369.90 C 217.47 369.84 217.57 369.79 217.67 369.75 C 217.77 369.71 217.88 369.67 217.99 369.64 C 218.10 369.61 218.21 369.59 218.32 369.57 C 218.43 369.55 218.55 369.55 218.66 369.55 C 218.77 369.55 218.89 369.56 219.00 369.57 C 219.11 369.58 219.22 369.61 219.33 369.64 C 219.44 369.67 219.55 369.71 219.65 369.75 C 219.75 369.79 219.86 369.84 219.95 369.90 C 220.05 369.96 220.14 370.02 220.23 370.09 C 220.32 370.16 220.40 370.23 220.48 370.32 C 220.56 370.41 220.63 370.49 220.70 370.58 C 220.77 370.67 220.83 370.77 220.89 370.86 L 224.05 376.46 Z" fill="#d8d8d8" fill-rule="nonzero" group-id="7" node-id="339" stroke="none" target-height="26.560028" target-width="26.559967" target-x="205.38002" target-y="369.54996"></path><path d="M 224.05 376.46 C 224.28 376.88 224.61 377.20 225.03 377.44 L 230.63 380.60 C 230.73 380.66 230.82 380.72 230.91 380.79 C 231.00 380.86 231.09 380.93 231.17 381.01 C 231.25 381.09 231.33 381.17 231.40 381.26 C 231.47 381.35 231.53 381.44 231.59 381.54 C 231.65 381.64 231.70 381.74 231.74 381.84 C 231.78 381.94 231.82 382.05 231.85 382.16 C 231.88 382.27 231.90 382.38 231.92 382.49 C 231.93 382.60 231.94 382.72 231.94 382.83 C 231.94 382.94 231.93 383.06 231.92 383.17 C 231.91 383.28 231.88 383.39 231.85 383.50 C 231.82 383.61 231.78 383.72 231.74 383.82 C 231.70 383.92 231.65 384.03 231.59 384.12 C 231.53 384.22 231.47 384.31 231.40 384.40 C 231.33 384.49 231.26 384.57 231.17 384.65 C 231.09 384.73 231.00 384.80 230.91 384.87 C 230.82 384.94 230.72 385.00 230.63 385.06 L 225.03 388.22 C 224.61 388.45 224.29 388.78 224.05 389.20 L 220.89 394.80 C 220.83 394.90 220.77 394.99 220.70 395.08 C 220.63 395.17 220.56 395.26 220.48 395.34 C 220.40 395.42 220.32 395.50 220.23 395.57 C 220.14 395.64 220.05 395.70 219.95 395.76 C 219.85 395.82 219.75 395.87 219.65 395.91 C 219.55 395.95 219.44 395.99 219.33 396.02 C 219.22 396.05 219.11 396.07 219.00 396.09 C 218.89 396.11 218.77 396.11 218.66 396.11 C 218.55 396.11 218.43 396.10 218.32 396.09 C 218.21 396.08 218.10 396.05 217.99 396.02 C 217.88 395.99 217.77 395.95 217.67 395.91 C 217.57 395.87 217.46 395.82 217.37 395.76 C 217.27 395.70 217.18 395.64 217.09 395.57 C 217.00 395.50 216.92 395.43 216.84 395.34 C 216.76 395.26 216.69 395.17 216.62 395.08 C 216.55 394.99 216.49 394.89 216.43 394.80 L 213.27 389.20 C 213.04 388.78 212.71 388.46 212.29 388.22 L 206.69 385.06 C 206.59 385.00 206.50 384.94 206.41 384.87 C 206.32 384.80 206.23 384.73 206.15 384.65 C 206.07 384.57 205.99 384.49 205.92 384.40 C 205.85 384.31 205.79 384.22 205.73 384.12 C 205.67 384.02 205.62 383.92 205.58 383.82 C 205.54 383.72 205.50 383.61 205.47 383.50 C 205.44 383.39 205.42 383.28 205.40 383.17 C 205.39 383.06 205.38 382.94 205.38 382.83 C 205.38 382.72 205.39 382.60 205.40 382.49 C 205.41 382.38 205.44 382.27 205.47 382.16 C 205.50 382.05 205.54 381.94 205.58 381.84 C 205.62 381.74 205.67 381.63 205.73 381.54 C 205.79 381.44 205.85 381.35 205.92 381.26 C 205.99 381.17 206.06 381.09 206.15 381.01 C 206.23 380.93 206.32 380.86 206.41 380.79 C 206.50 380.72 206.60 380.66 206.69 380.60 L 212.29 377.44 C 212.71 377.21 213.03 376.88 213.27 376.46 L 216.43 370.86 C 216.49 370.76 216.55 370.67 216.62 370.58 C 216.69 370.49 216.76 370.40 216.84 370.32 C 216.92 370.24 217.00 370.16 217.09 370.09 C 217.18 370.02 217.27 369.96 217.37 369.90 C 217.47 369.84 217.57 369.79 217.67 369.75 C 217.77 369.71 217.88 369.67 217.99 369.64 C 218.10 369.61 218.21 369.59 218.32 369.57 C 218.43 369.55 218.55 369.55 218.66 369.55 C 218.77 369.55 218.89 369.56 219.00 369.57 C 219.11 369.58 219.22 369.61 219.33 369.64 C 219.44 369.67 219.55 369.71 219.65 369.75 C 219.75 369.79 219.86 369.84 219.95 369.90 C 220.05 369.96 220.14 370.02 220.23 370.09 C 220.32 370.16 220.40 370.23 220.48 370.32 C 220.56 370.41 220.63 370.49 220.70 370.58 C 220.77 370.67 220.83 370.77 220.89 370.86 L 224.05 376.46 Z" fill="url(#SVGID_21_)" fill-rule="nonzero" group-id="7" node-id="341" stroke="none" target-height="26.560028" target-width="26.559967" target-x="205.38002" target-y="369.54996"></path><path d="M 224.05 376.46 C 224.28 376.88 224.61 377.20 225.03 377.44 L 230.63 380.60 C 230.73 380.66 230.82 380.72 230.91 380.79 C 231.00 380.86 231.09 380.93 231.17 381.01 C 231.25 381.09 231.33 381.17 231.40 381.26 C 231.47 381.35 231.53 381.44 231.59 381.54 C 231.65 381.64 231.70 381.74 231.74 381.84 C 231.78 381.94 231.82 382.05 231.85 382.16 C 231.88 382.27 231.90 382.38 231.92 382.49 C 231.93 382.60 231.94 382.72 231.94 382.83 C 231.94 382.94 231.93 383.06 231.92 383.17 C 231.91 383.28 231.88 383.39 231.85 383.50 C 231.82 383.61 231.78 383.72 231.74 383.82 C 231.70 383.92 231.65 384.03 231.59 384.12 C 231.53 384.22 231.47 384.31 231.40 384.40 C 231.33 384.49 231.26 384.57 231.17 384.65 C 231.09 384.73 231.00 384.80 230.91 384.87 C 230.82 384.94 230.72 385.00 230.63 385.06 L 225.03 388.22 C 224.61 388.45 224.29 388.78 224.05 389.20 L 220.89 394.80 C 220.83 394.90 220.77 394.99 220.70 395.08 C 220.63 395.17 220.56 395.26 220.48 395.34 C 220.40 395.42 220.32 395.50 220.23 395.57 C 220.14 395.64 220.05 395.70 219.95 395.76 C 219.85 395.82 219.75 395.87 219.65 395.91 C 219.55 395.95 219.44 395.99 219.33 396.02 C 219.22 396.05 219.11 396.07 219.00 396.09 C 218.89 396.11 218.77 396.11 218.66 396.11 C 218.55 396.11 218.43 396.10 218.32 396.09 C 218.21 396.08 218.10 396.05 217.99 396.02 C 217.88 395.99 217.77 395.95 217.67 395.91 C 217.57 395.87 217.46 395.82 217.37 395.76 C 217.27 395.70 217.18 395.64 217.09 395.57 C 217.00 395.50 216.92 395.43 216.84 395.34 C 216.76 395.26 216.69 395.17 216.62 395.08 C 216.55 394.99 216.49 394.89 216.43 394.80 L 213.27 389.20 C 213.04 388.78 212.71 388.46 212.29 388.22 L 206.69 385.06 C 206.59 385.00 206.50 384.94 206.41 384.87 C 206.32 384.80 206.23 384.73 206.15 384.65 C 206.07 384.57 205.99 384.49 205.92 384.40 C 205.85 384.31 205.79 384.22 205.73 384.12 C 205.67 384.02 205.62 383.92 205.58 383.82 C 205.54 383.72 205.50 383.61 205.47 383.50 C 205.44 383.39 205.42 383.28 205.40 383.17 C 205.39 383.06 205.38 382.94 205.38 382.83 C 205.38 382.72 205.39 382.60 205.40 382.49 C 205.41 382.38 205.44 382.27 205.47 382.16 C 205.50 382.05 205.54 381.94 205.58 381.84 C 205.62 381.74 205.67 381.63 205.73 381.54 C 205.79 381.44 205.85 381.35 205.92 381.26 C 205.99 381.17 206.06 381.09 206.15 381.01 C 206.23 380.93 206.32 380.86 206.41 380.79 C 206.50 380.72 206.60 380.66 206.69 380.60 L 212.29 377.44 C 212.71 377.21 213.03 376.88 213.27 376.46 L 216.43 370.86 C 216.49 370.76 216.55 370.67 216.62 370.58 C 216.69 370.49 216.76 370.40 216.84 370.32 C 216.92 370.24 217.00 370.16 217.09 370.09 C 217.18 370.02 217.27 369.96 217.37 369.90 C 217.47 369.84 217.57 369.79 217.67 369.75 C 217.77 369.71 217.88 369.67 217.99 369.64 C 218.10 369.61 218.21 369.59 218.32 369.57 C 218.43 369.55 218.55 369.55 218.66 369.55 C 218.77 369.55 218.89 369.56 219.00 369.57 C 219.11 369.58 219.22 369.61 219.33 369.64 C 219.44 369.67 219.55 369.71 219.65 369.75 C 219.75 369.79 219.86 369.84 219.95 369.90 C 220.05 369.96 220.14 370.02 220.23 370.09 C 220.32 370.16 220.40 370.23 220.48 370.32 C 220.56 370.41 220.63 370.49 220.70 370.58 C 220.77 370.67 220.83 370.77 220.89 370.86 L 224.05 376.46 Z" fill="url(#SVGID_22_)" fill-rule="nonzero" group-id="7" node-id="343" stroke="none" target-height="26.560028" target-width="26.559967" target-x="205.38002" target-y="369.54996"></path><path d="M 224.05 376.46 C 224.28 376.88 224.61 377.20 225.03 377.44 L 230.63 380.60 C 230.73 380.66 230.82 380.72 230.91 380.79 C 231.00 380.86 231.09 380.93 231.17 381.01 C 231.25 381.09 231.33 381.17 231.40 381.26 C 231.47 381.35 231.53 381.44 231.59 381.54 C 231.65 381.64 231.70 381.74 231.74 381.84 C 231.78 381.94 231.82 382.05 231.85 382.16 C 231.88 382.27 231.90 382.38 231.92 382.49 C 231.93 382.60 231.94 382.72 231.94 382.83 C 231.94 382.94 231.93 383.06 231.92 383.17 C 231.91 383.28 231.88 383.39 231.85 383.50 C 231.82 383.61 231.78 383.72 231.74 383.82 C 231.70 383.92 231.65 384.03 231.59 384.12 C 231.53 384.22 231.47 384.31 231.40 384.40 C 231.33 384.49 231.26 384.57 231.17 384.65 C 231.09 384.73 231.00 384.80 230.91 384.87 C 230.82 384.94 230.72 385.00 230.63 385.06 L 225.03 388.22 C 224.61 388.45 224.29 388.78 224.05 389.20 L 220.89 394.80 C 220.83 394.90 220.77 394.99 220.70 395.08 C 220.63 395.17 220.56 395.26 220.48 395.34 C 220.40 395.42 220.32 395.50 220.23 395.57 C 220.14 395.64 220.05 395.70 219.95 395.76 C 219.85 395.82 219.75 395.87 219.65 395.91 C 219.55 395.95 219.44 395.99 219.33 396.02 C 219.22 396.05 219.11 396.07 219.00 396.09 C 218.89 396.11 218.77 396.11 218.66 396.11 C 218.55 396.11 218.43 396.10 218.32 396.09 C 218.21 396.08 218.10 396.05 217.99 396.02 C 217.88 395.99 217.77 395.95 217.67 395.91 C 217.57 395.87 217.46 395.82 217.37 395.76 C 217.27 395.70 217.18 395.64 217.09 395.57 C 217.00 395.50 216.92 395.43 216.84 395.34 C 216.76 395.26 216.69 395.17 216.62 395.08 C 216.55 394.99 216.49 394.89 216.43 394.80 L 213.27 389.20 C 213.04 388.78 212.71 388.46 212.29 388.22 L 206.69 385.06 C 206.59 385.00 206.50 384.94 206.41 384.87 C 206.32 384.80 206.23 384.73 206.15 384.65 C 206.07 384.57 205.99 384.49 205.92 384.40 C 205.85 384.31 205.79 384.22 205.73 384.12 C 205.67 384.02 205.62 383.92 205.58 383.82 C 205.54 383.72 205.50 383.61 205.47 383.50 C 205.44 383.39 205.42 383.28 205.40 383.17 C 205.39 383.06 205.38 382.94 205.38 382.83 C 205.38 382.72 205.39 382.60 205.40 382.49 C 205.41 382.38 205.44 382.27 205.47 382.16 C 205.50 382.05 205.54 381.94 205.58 381.84 C 205.62 381.74 205.67 381.63 205.73 381.54 C 205.79 381.44 205.85 381.35 205.92 381.26 C 205.99 381.17 206.06 381.09 206.15 381.01 C 206.23 380.93 206.32 380.86 206.41 380.79 C 206.50 380.72 206.60 380.66 206.69 380.60 L 212.29 377.44 C 212.71 377.21 213.03 376.88 213.27 376.46 L 216.43 370.86 C 216.49 370.76 216.55 370.67 216.62 370.58 C 216.69 370.49 216.76 370.40 216.84 370.32 C 216.92 370.24 217.00 370.16 217.09 370.09 C 217.18 370.02 217.27 369.96 217.37 369.90 C 217.47 369.84 217.57 369.79 217.67 369.75 C 217.77 369.71 217.88 369.67 217.99 369.64 C 218.10 369.61 218.21 369.59 218.32 369.57 C 218.43 369.55 218.55 369.55 218.66 369.55 C 218.77 369.55 218.89 369.56 219.00 369.57 C 219.11 369.58 219.22 369.61 219.33 369.64 C 219.44 369.67 219.55 369.71 219.65 369.75 C 219.75 369.79 219.86 369.84 219.95 369.90 C 220.05 369.96 220.14 370.02 220.23 370.09 C 220.32 370.16 220.40 370.23 220.48 370.32 C 220.56 370.41 220.63 370.49 220.70 370.58 C 220.77 370.67 220.83 370.77 220.89 370.86 L 224.05 376.46 Z" fill="url(#SVGID_23_)" fill-rule="nonzero" group-id="7" node-id="345" stroke="none" target-height="26.560028" target-width="26.559967" target-x="205.38002" target-y="369.54996"></path></g></svg>
\ No newline at end of file
diff --git a/src/assets/icons/res-success.svg b/src/assets/icons/res-success.svg
new file mode 100644
index 00000000..e376cbcc
--- /dev/null
+++ b/src/assets/icons/res-success.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 490 272"><defs><path id="a" d="M0 .113h141.08v117.88H0z"/><path id="c" d="M.5.39h277.53v16.268H.5z"/><path id="e" d="M0 0h84.1v88.533H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#E7F3FE" fill-opacity=".4" d="M57.845 265.902S-38.205 90.287 33.692 49.309c57.363-32.693 107.68 24.52 169.068-15.325 79.197-51.405 139.236-16.99 182.149 46.997 32.203 48.018 49.26 79.08 65.413 116.47 25.158 58.234-28.178 71.516-28.178 71.516z"/><path fill="#E4EDF9" d="M430.251 227.732c-3.276-8.55-5.723-17.626-8.395-27.213-1.802-6.459-4.706-13.687-11.003-15.723-6.124-1.982-12.72 2.124-16.487 7.415-3.767 5.29-5.666 11.707-8.888 17.357-5.839 10.242-16.185 14.534-24.734 5.53-12.212-12.861-17.708-30.392-25.452-46.08-5.622-11.388-10.327-24.72-17.41-35.216-10.801-16.006-25.612-29.653-45.308-29.653-12.483 1.922-23.484 13.157-30.928 27.197-7.445 14.04-11.788 30.739-15.489 47.396-6.73 30.294-11.661 61.292-16.584 92.247l248.49-2.944c-.988.012-7.08-8.262-8.248-9.409-9.54-9.38-15.266-19.69-19.564-30.904"/><path fill="#83AFFC" d="M382.222 242.388c-.482 9.805-10.904 26.946-20.482 26.451-9.579-.494-14.685-18.436-14.203-28.241s10.683-58.867 20.262-58.373c9.577.494 14.906 50.358 14.423 60.163"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".867" d="m367.512 188.639-5.265 79.142"/><path fill="#FFC957" d="M360.186 240.42c-2.185 4.888-3.847 10.018-4.853 15.36-.51 2.71-.83 5.645.372 8.116 1.315 2.698 4.233 4.271 7.151 4.76 7.13 1.192 14.261-3.255 18.44-9.26 4.179-6.003 5.99-13.342 7.65-20.504 1.308-5.64 2.594-11.363 5.057-16.618 1.058-2.253 7.244-10.95 4.317-13.206-4.003-3.205-15.592.281-23.019 8.54-6.117 6.801-11.38 14.454-15.115 22.812"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".867" d="M363.3 268.85s8.636-34.663 29.482-54.544"/><path fill="#2A8EF2" d="M411.258 232.763c-.756 1.325-2.174 2.23-3.46 2.938-1.586.874-3.275 1.643-4.907 2.386-2.096.954-4.265 1.94-6.266 3.17-1.46.898-2.755 1.91-3.843 2.995 1.719-3.82 3.726-7.154 6.092-10.134 3.113-3.923 6.31-5.909 9.504-5.909q.11 0 .221.004c.988.027 1.757.266 2.286.71 1.084.914 1.041 2.67.373 3.84m4.212 21.723c-1.259.864-2.928 1.083-4.395 1.184-1.808.124-3.663.11-5.456.1-2.303-.015-4.683-.03-7.02.237-1.705.198-3.313.562-4.764 1.079 3.21-2.683 6.469-4.815 9.898-6.487 4.51-2.199 8.253-2.648 11.128-1.336q.1.046.197.094c.878.43 1.465.96 1.748 1.57.579 1.255-.224 2.795-1.336 3.559m-8.37 11.134c-1.062-.14-2.015-.788-2.805-1.406-.974-.76-1.905-1.609-2.805-2.43-1.156-1.054-2.351-2.144-3.663-3.072a14.8 14.8 0 0 0-2.94-1.626c2.947.117 5.646.532 8.204 1.253 3.364.951 5.476 2.427 6.28 4.391q.028.068.053.136c.23.614.266 1.146.108 1.58-.328.892-1.493 1.298-2.432 1.174"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M383.306 268.85s.098-20.824 25.27-38.502"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M383.306 268.85s7.662-17.112 28.429-17.112"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M394.888 257.088s4.091-.312 12.635 6.414"/><g transform="translate(23.953 151.673)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#E4EDF9" d="M141.08 117.994c-5.85-22.441-11.734-44.893-18.613-66.626-3.88-12.256-8.16-24.464-14.104-34.267C102.417 7.297 94.54.063 86.633.113 74.45 2.506 66.59 14.713 61.436 28.232c-3.38 8.865-5.02 19.604-7.41 28.973-3.295 12.905-5.022 26.942-11.35 38.235-4.429 7.904-11.239 5.888-15.828-1.214-2.533-3.919-4.32-8.58-7.155-12.159-2.836-3.577-7.307-5.908-10.907-3.653-3.7 2.318-4.808 8.183-5.306 13.328-.74 7.637-1.387 14.855-2.597 21.774A107 107 0 0 1 0 117.994z" mask="url(#b)"/></g><path fill="#FFC957" d="M112.942 238.999c-3.617-4.277-8.194-7.967-9.638-13.364-1.055-3.943-.223-8.116.19-12.183.41-4.068.266-8.563-2.3-11.695-2.114-2.578-5.454-3.698-8.667-4.406-3.212-.709-6.565-1.156-9.416-2.832-4.63-2.721-3.706-7.35-6.193-11.41-2.787-4.556-9.276-10.368-14.837-7.343-5.89 3.205-4.957 12.933-1.04 17.23 2.6 2.848 5.927 5.582 6.31 9.464.575 5.843-5.955 11.104-4.16 16.682 1.328 4.119 6.392 5.534 8.893 9.034 2.474 3.462 1.976 8.312.519 12.336-1.457 4.023-3.752 7.744-4.657 11.933-1.855 8.574 4.706 14.498 12.182 16.41 6.87 1.756 21.686.927 21.686.927 5.288-1.896 11.15-6.658 14.057-11.861 2.196-3.931 2.5-8.915.798-13.097-.877-2.154-2.218-4.041-3.727-5.825"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" d="M67.863 184.03s26.102 40.247 28.94 84.937"/><path fill="#97BDFF" d="M46.49 238.162c.361-.337.888-.517 1.564-.539l.152-.002c2.186 0 4.374 1.502 6.505 4.468 1.62 2.254 2.994 4.777 4.17 7.666a14.7 14.7 0 0 0-2.631-2.265c-1.37-.93-2.854-1.677-4.289-2.398-1.117-.563-2.273-1.143-3.359-1.804-.88-.537-1.85-1.22-2.368-2.223-.457-.885-.486-2.214.255-2.903m-5.429 18.349c.206-.434.637-.808 1.28-1.113q.072-.036.144-.067c2.106-.93 4.847-.613 8.151.947 2.51 1.185 4.898 2.699 7.248 4.6a16.3 16.3 0 0 0-3.488-.764c-1.712-.19-3.456-.18-5.142-.17-1.314.009-2.672.018-3.997-.07-1.074-.07-2.296-.227-3.218-.84-.814-.541-1.402-1.634-.978-2.523"/><path fill="#97BDFF" d="M47.97 266.097c-.108-.308-.083-.685.072-1.12l.037-.098c.544-1.392 1.974-2.439 4.252-3.113 1.731-.512 3.558-.805 5.552-.889a10 10 0 0 0-1.989 1.153c-.889.658-1.697 1.432-2.48 2.18-.609.58-1.24 1.183-1.9 1.722-.534.437-1.178.898-1.898.997-.635.087-1.424-.2-1.646-.832"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M65.867 268.967s-.073-15.86-18.961-29.324"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M65.867 268.967s-5.917-12.134-21.955-12.134"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M57.883 260.879s-2.908-.197-8.981 4.043"/><g transform="translate(83.874 86.4)"><rect width="238.632" height="178.133" x="16.82" fill="#91B3FA" rx="6"/><g transform="translate(0 167.467)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><path fill="#91B3FA" d="M267.259 16.658H9.167c-3.625 0-6.564-1.731-6.564-3.867V8.125h271.22v4.666c0 2.136-2.939 3.867-6.564 3.867" mask="url(#d)"/></g><path fill="#FDFDFD" d="M24.179 160h224.966V8.533H24.179z"/><path fill="#527EE9" d="m111.432 168.533 3.614 5.334h50.848l3.356-5.334z"/><path fill="#527EE9" d="M16.82 169.6H254.4v-1.067H16.82z"/></g><path fill="#FFF1D6" d="M302.159 266.667h-3.831l1.426-5.334h3.83z"/><path fill="#001E48" d="m298.623 264.533 2.177.689 2.021-.689 1.814 4.267h-16.82l6.324-2.133z"/><path fill="#FFF1D6" d="M340.751 266.667h3.831l-1.426-5.334h-3.83z"/><path fill="#001E48" d="m344.288 264.533-2.178.689-2.02-.689-1.815 4.267h16.82l-6.324-2.133z"/><path fill="#FFF1D6" d="m323.557 164.267 1.685-4.807 5.691-.511c1.047-.129 1.976.567 2.077 1.552.1.987-.668 1.89-1.715 2.018z"/><path fill="#FFF1D6" d="m321.063 159.837 3.042 4.43 5.76-1.172-6.456-9.495-1.24.817a3.886 3.886 0 0 0-1.106 5.42"/><path fill="#E7F3FE" d="m325.867 157.867 18.715-20.054-9.862-2.346-11.163 17.724zm-34.054-6.4-17.721-21.64 7.416-.807 12.615 17.771z"/><path fill="#E7F3FE" d="M337.618 137.268c.979 2.135 3.48 3.06 5.585 2.066 2.104-.996 3.017-3.533 2.036-5.669s-3.48-3.06-5.585-2.065c-2.105.994-3.017 3.532-2.036 5.668"/><path fill="#E7F3FE" d="m338.893 138.667 5.69-6.154-19.865-23.896a4.672 4.672 0 0 0-7.103-.579c-2.05 2.043-1.848 9.264.433 11.032z"/><path fill="#F9EDD4" d="m305.686 110.23 8.342.703 1.12-13.163-8.342-.703z"/><path fill="#E7F3FE" d="M277.022 123.742c-2.317.138-4.07 1.917-3.915 3.974s2.16 3.613 4.477 3.475 4.07-1.916 3.914-3.974c-.154-2.057-2.16-3.612-4.476-3.475"/><path fill="#E7F3FE" d="m274.995 124.39 5.433 5.089 21.192-10.614c2.578-1.381 2.455-8.319.741-10.618-1.714-2.3-5.12-2.538-7.21-.504z"/><path fill="#E7F3FE" d="m320.947 155.53 2.488-44.116c.584-2.356-.982-4.703-3.355-5.028l-20.386-.748c-2.373-.327-4.499 1.512-4.554 3.94l-4.171 53.622z"/><path fill="#1A55B5" d="m301.13 155.733 4.556 14.96-2.025 92.774h-8.123l-4.57-100.002.624-7.732z"/><path fill="#527EE9" d="m301.481 155.733 4.572 18.37h3.29l29.447 89.364h6.844L324.9 167.859l-3.981-12.126z"/><path fill="#1661F7" d="m304.77 106.667 6.173.224-2.511 3.665v29.192l-3.62 7.452-3.33-8.98 4.638-27.902z"/><path fill="#1A55B5" d="M300.433 85.218c-.48-.538-.922-1.11-1.308-1.719-.774-1.178-1.304-2.574-1.237-3.989.076-1.385.704-2.838 1.845-3.71a4 4 0 0 1 1.476-.712 3.3 3.3 0 0 0-.761.464c-1.099.896-1.523 2.347-1.611 3.627-.181 2.706.863 5.277 2.816 7.02-.008.033-.012.069-.02.104a11 11 0 0 1-1.2-1.085m20.966 1.857c-.203-1.976-.95-3.895-2.218-5.398-1.173-1.39-2.765-2.43-4.512-2.988-.859-.275-1.67-.423-2.55-.333-1.089.112-2.204.23-3.242-.223-1.463-.634-2.512-1.876-3.832-2.68a4.8 4.8 0 0 0-.994-.453l.002-.004c-1.4-.579-3.22-.387-4.534.513-.66.433-1.169 1.063-1.536 1.743-.36.682-.615 1.435-.682 2.218-.135 1.559.296 3.135 1.133 4.46.772 1.188 1.835 2.236 3.098 2.919-.052.32-.094.644-.11.975-.269 5.424 3.997 10.034 9.529 10.298 3.873.185 7.593-1.91 9.384-5.284.92-1.732 1.267-3.775 1.064-5.763"/><path fill="#FFF1D6" d="M308.687 83.2c-4.387-.064-6.085 3.625-6.085 3.625l-.243 1.299-.194 1.152v.16l-.02-.036-.544 3.214c-.748 4.432 2.073 8.83 6.49 9.649 4.475.827 8.746-2.174 9.502-6.65l.664-3.938v-.008s1.25-7.719-9.57-8.466"/><path fill="#1A55B5" d="M310.943 82.552c1.078.165 2.16.46 3.174.857.76.299 1.492.672 2.11 1.211 2.013 1.756.22 5.52-.473 7.482-.169.48-.367 1.05-.065 1.46.327.444 1.053.364 1.476.01.424-.352.645-.883.929-1.355s.708-.934 1.258-.97l-.32-8.91c-.003-.065-5.608-.187-6.038-.202-.869-.029-2.051.417-2.051.417"/><g transform="translate(179.537 121.6)"><mask id="f" fill="#fff"><use xlink:href="#e"/></mask><path fill="#07D1BD" d="M63.706 0c1.05 0 2.1 1.062 2.1 2.124v7.083c0 1.063-1.05 2.125-2.1 2.125h-.7c-1.05 0-2.1-1.062-2.1-2.125V2.124c0-1.062 1.05-2.124 2.1-2.124zm13.655 5.666.348.355c.7.707.7 2.124 0 2.833l-4.9 5.31c-.7.71-2.1.71-2.8 0l-.35-.353c-.7-.708-.7-2.124 0-2.833l4.9-5.31c.701-.71 2.1-.71 2.8 0zm4.2 9.208c1.05 0 2.1.708 2.449 1.77v.709c.35 1.062-.35 2.124-1.75 2.48l-7 1.415c-1.05.355-2.1-.354-2.45-1.77v-.71c-.35-1.062.349-2.124 1.75-2.477zM56.766 33.32c-1.4-1.062-3.15-.707-4.201.709L36.112 55.986l-9.8-9.917c-1.4-1.062-3.501-1.062-4.551 0-1.05 1.417-1.05 3.542 0 4.604l12.252 12.396c.35.708 1.4 1.062 2.1 1.062 1.05 0 2.1-.354 2.8-1.418L57.467 37.57c1.05-1.415.698-3.186-.7-4.248zM39.554 8.5c21.703 0 39.556 18.061 39.556 40.018 0 21.956-17.853 40.016-39.556 40.016S0 70.473 0 48.517s17.853-40.02 39.554-40.02z" mask="url(#f)"/></g><path stroke="#A4AAB9" stroke-linecap="square" d="M1 269.472h488"/></g></svg>
\ No newline at end of file
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 79d98e4d..2b625760 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -1,12 +1,12 @@
<template>
<el-select
v-if="type === 'select'"
- v-model="selectedValue"
+ v-model="modelValue"
:placeholder="placeholder"
:disabled="disabled"
clearable
:style="style"
- @change="handleChange"
+ v-bind="moreProps"
>
<el-option
v-for="option in options"
@@ -15,13 +15,22 @@
:value="option.value"
/>
</el-select>
-
+ <el-select-v2
+ v-if="type === 'selectV2'"
+ v-model="modelValue"
+ :options="options"
+ :placeholder="placeholder"
+ :disabled="disabled"
+ clearable
+ v-bind="moreProps"
+ :style="style"
+ />
<el-radio-group
v-else-if="type === 'radio'"
- v-model="selectedValue"
+ v-model="modelValue as string | number"
:disabled="disabled"
+ v-bind="moreProps"
:style="style"
- @change="handleChange"
>
<el-radio v-for="option in options" :key="option.value" :value="option.value">
{{ option.label }}
@@ -30,10 +39,10 @@
<el-checkbox-group
v-else-if="type === 'checkbox'"
- v-model="selectedValue"
+ v-model="modelValue as string[] | number[]"
:disabled="disabled"
+ v-bind="moreProps"
:style="style"
- @change="handleChange"
>
<el-checkbox v-for="option in options" :key="option.value" :value="option.value">
{{ option.label }}
@@ -51,14 +60,10 @@ const props = defineProps({
type: String,
required: true,
},
- modelValue: {
- type: [String, Number, Array],
- required: false,
- },
type: {
type: String,
default: "select",
- validator: (value: string) => ["select", "radio", "checkbox"].includes(value),
+ validator: (value: string) => ["select", "radio", "checkbox", "selectV2"].includes(value),
},
placeholder: {
type: String,
@@ -76,23 +81,27 @@ const props = defineProps({
};
},
},
+ moreProps: {
+ type: Object,
+ default: () => {
+ return {};
+ },
+ },
});
-
-const emit = defineEmits(["update:modelValue"]);
-
+const modelValue = defineModel<string | number | any[] | undefined>();
const options = ref<Array<{ label: string; value: string | number }>>([]);
const selectedValue = ref<any>(
- typeof props.modelValue === "string" || typeof props.modelValue === "number"
- ? props.modelValue
- : Array.isArray(props.modelValue)
- ? props.modelValue
+ typeof modelValue.value === "string" || typeof modelValue.value === "number"
+ ? modelValue.value
+ : Array.isArray(modelValue.value)
+ ? modelValue.value
: undefined
);
// 监听 modelValue 和 options 的变化
watch(
- [() => props.modelValue, () => options.value],
+ [() => modelValue.value, () => options.value],
([newValue, newOptions]) => {
if (newOptions.length > 0 && newValue !== undefined) {
if (props.type === "checkbox") {
@@ -110,11 +119,6 @@ watch(
{ immediate: true }
);
-// 监听 selectedValue 的变化并触发 update:modelValue
-function handleChange(val: any) {
- emit("update:modelValue", val);
-}
-
// 获取字典数据
onMounted(async () => {
await dictStore.loadDictItems(props.code);
diff --git a/src/components/Draft/Index.vue b/src/components/Draft/Index.vue
new file mode 100644
index 00000000..4fed7425
--- /dev/null
+++ b/src/components/Draft/Index.vue
@@ -0,0 +1,137 @@
+<!-- 草稿模块 -->
+<template>
+ <el-popover placement="top-start" :width="450" trigger="hover" @show="handleGetAllDraftData">
+ <template #reference>
+ <el-button type="info" icon="Files" text bg @click="handleDraftTable()">草稿</el-button>
+ </template>
+ <el-table :data="draftData" size="small">
+ <el-table-column property="name" label="草稿名称" show-overflow-tooltip />
+ <el-table-column width="130" property="date" label="创建时间" />
+ <el-table-column width="130" label="使用草稿">
+ <template #default="scope">
+ <el-button size="small" type="primary" @click="handleUseDraft(scope.row)">使用</el-button>
+ <el-button size="small" type="info" text bg @click="handleDeleteDraft(scope.row)">
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-popover>
+ <el-tooltip content="" placement="top">
+ <template #content>
+ 您的草稿只保存在这台电脑的当前浏览器里。
+ <br />
+ 更换电脑或浏览器后将无法查看之前的草稿。
+ </template>
+ <el-button type="info" text bg icon="Notification" @click="handleDraftTable()">
+ 暂存为草稿
+ </el-button>
+ </el-tooltip>
+</template>
+
+<script setup lang="ts">
+import { db, DraftTable } from "@/utils/db";
+import { cloneDeep } from "lodash-es";
+
+defineOptions({
+ name: "Draft",
+});
+
+const model = defineModel<object>();
+
+const props = defineProps({
+ module: {
+ type: String,
+ default: "",
+ },
+});
+
+// ---------------------------------------------------------------------
+// 草稿模块
+function handleDraftTable() {
+ ElMessageBox.prompt("给草稿取一个名字", "暂存为草稿", {
+ confirmButtonText: "保存",
+ cancelButtonText: "取消",
+ inputPattern: /\S/,
+ inputErrorMessage: "请输入",
+ beforeClose: (action, instance, done) => {
+ if (action === "cancel") return done();
+ const value = instance.inputValue;
+ db.getDraftByName(value, props.module).then((d) => {
+ if (d) {
+ ElMessageBox.confirm("已存在同名草稿，要替换它吗？", "提醒", {
+ confirmButtonText: "替换为新内容",
+ cancelButtonText: "再想想",
+ type: "warning",
+ })
+ .then(() => {
+ db.updateDraft<any>(d.id as number, cloneDeep(model.value), true);
+ ElMessage({
+ type: "success",
+ grouping: true,
+ message: `草稿已保存`,
+ });
+ done();
+ })
+ .catch(() => {});
+ } else {
+ db.addDraft<any>(props.module, value, cloneDeep(model.value), "", true);
+ ElMessage({
+ type: "success",
+ grouping: true,
+ message: `草稿已保存`,
+ });
+ done();
+ }
+ });
+ },
+ })
+ .then(() => {})
+ .catch(() => {
+ ElMessage({
+ type: "info",
+ message: "取消了暂存",
+ });
+ });
+}
+
+const draftData = ref<DraftTable<any>[]>();
+/** 获取所有草稿数据 */
+function handleGetAllDraftData() {
+ db.getAllDraft<any>(props.module, true).then((d: DraftTable<any>[]) => {
+ draftData.value = d;
+ });
+}
+handleGetAllDraftData();
+
+/** 使用草稿数据 */
+function handleUseDraft(row: DraftTable<any>) {
+ model.value = row.data;
+ ElMessage({
+ type: "success",
+ grouping: true,
+ message: `草稿已加载`,
+ });
+}
+
+function handleDeleteDraft(row: DraftTable<any>) {
+ ElMessageBox.confirm(`确定要删除“${row.name}”草稿吗?`, "提醒", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ customStyle: {
+ width: "300px",
+ },
+ type: "warning",
+ }).then(() => {
+ db.deleteDraftById(row.id as number);
+ ElMessage({
+ type: "success",
+ message: `草稿已删除`,
+ grouping: true,
+ });
+ });
+}
+// ---------------------------------------------------------------------
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/Form/HelpText.vue b/src/components/Form/HelpText.vue
new file mode 100644
index 00000000..45f4dd22
--- /dev/null
+++ b/src/components/Form/HelpText.vue
@@ -0,0 +1,46 @@
+<template>
+ <div class="flex items-center">
+ <span>{{ props.label }}</span>
+ <el-popover
+ :placement="props.placement"
+ :title="props.label"
+ :width="250"
+ trigger="hover"
+ :content="props.content"
+ effect="dark"
+ popper-style="font-size: 12px;"
+ >
+ <template #reference>
+ <el-icon
+ class="ml-3px hover:c-primary cursor-pointer font-size-16px"
+ color="var(--el-text-color-secondary)"
+ >
+ <QuestionFilled />
+ </el-icon>
+ </template>
+ </el-popover>
+ </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+ name: "HelpText",
+});
+
+const props = defineProps({
+ label: {
+ type: String,
+ default: "",
+ },
+ content: {
+ type: String,
+ default: "",
+ },
+ placement: {
+ type: String,
+ default: "top-start",
+ },
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/Result/Index.vue b/src/components/Result/Index.vue
new file mode 100644
index 00000000..71342171
--- /dev/null
+++ b/src/components/Result/Index.vue
@@ -0,0 +1,22 @@
+<template>
+ <el-card shadow="never">
+ <el-result title="404" sub-title="Sorry, request error">
+ <template #icon>
+ <el-image :src="ResSaccess" />
+ </template>
+ <template #extra>
+ <el-button type="primary">Back</el-button>
+ </template>
+ </el-result>
+ </el-card>
+</template>
+
+<script setup lang="ts">
+import ResSaccess from "@/assets/icons/res-success.svg";
+
+defineOptions({
+ name: "ResultIndex",
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 73916a09..62635a75 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -427,16 +427,46 @@ const refreshSelectedTag = (tag: TagView | null) => {
});
};
+const handleFormClose = ({ confirm = () => {}, cancel = () => {} }) => {
+ ElMessageBox.confirm("当前表单存在未保存的更改，关闭页面将导致数据丢失，是否确认关闭？", "提示", {
+ type: "warning",
+ confirmButtonText: "关闭",
+ })
+ .then(() => {
+ confirm();
+ })
+ .catch(() => {
+ cancel();
+ });
+};
+
+const handleClosePage = (tag: TagView, fun = () => {}) => {
+ // 如果是表单页面就给出提示，确认后再关闭
+ const regex = /\/edit\/[^/]+$/;
+ if (tag.path.endsWith("/add") || tag.path.endsWith("/edit") || regex.test(tag.path)) {
+ handleFormClose({
+ confirm: () => {
+ fun();
+ },
+ cancel: () => {},
+ });
+ } else {
+ fun();
+ }
+};
+
/**
* 关闭标签
*/
const closeSelectedTag = (tag: TagView | null) => {
if (!tag) return;
-
- tagsViewStore.delView(tag).then((result: any) => {
- if (tagsViewStore.isActive(tag)) {
- tagsViewStore.toLastView(result.visitedViews, tag);
- }
+ // 如果是表单页面就给出提示，确认后再关闭
+ handleClosePage(tag, () => {
+ tagsViewStore.delView(tag).then((result: any) => {
+ if (tagsViewStore.isActive(tag)) {
+ tagsViewStore.toLastView(result.visitedViews, tag);
+ }
+ });
});
};
@@ -553,6 +583,7 @@ useContextMenuManager();
padding: 0 var(--tags-container-padding);
overflow: hidden;
border-top: 1px solid var(--el-border-color-light);
+ border-bottom: 1px solid var(--el-border-color-light);
.tags-btn {
z-index: 3;
width: var(--tags-container-padding);
diff --git a/src/router/index.ts b/src/router/index.ts
index 2f156190..9b3df65d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -70,6 +70,12 @@ export const constantRoutes: RouteRecordRaw[] = [
component: () => import("@/views/demo/detail.vue"),
meta: { title: "详情页缓存", icon: "user", hidden: true, keepAlive: true },
},
+ {
+ path: "/result",
+ name: "Result",
+ component: () => import("@/views/result/Index.vue"),
+ meta: { title: "结果", icon: "bell", hidden: true, keepAlive: true },
+ },
],
},
];
diff --git a/src/store/modules/dict-store.ts b/src/store/modules/dict-store.ts
index 34d8acaf..f804623c 100644
--- a/src/store/modules/dict-store.ts
+++ b/src/store/modules/dict-store.ts
@@ -27,7 +27,10 @@ export const useDictStore = defineStore("dict", () => {
// 防止重复请求
if (!requestQueue[dictCode]) {
requestQueue[dictCode] = DictAPI.getDictItems(dictCode).then((data) => {
- cacheDictItems(dictCode, data);
+ cacheDictItems(
+ dictCode,
+ data.sort((e1, e2) => e1.sort - e2.sort)
+ );
Reflect.deleteProperty(requestQueue, dictCode);
});
}
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 1342f61e..52b063e5 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -12,6 +12,12 @@ interface ImportMetaEnv {
VITE_APP_API_URL: string;
/** 是否开启 Mock 服务 */
VITE_MOCK_DEV_SERVER: boolean;
+
+ /** 用户名 */
+ VITE_APP_USER_NAME: string;
+
+ /** 密码 */
+ VITE_APP_USER_PASSWORD: string;
}
interface ImportMeta {
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 6e08fd75..8b62b39a 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -105,5 +105,12 @@ declare global {
/** 错误信息 */
messageList: Array<string>;
}
+
+ interface ResultPageParams {
+ title: string;
+ subTitle: string;
+ type: "error" | "primary" | "success" | "warning" | "info";
+ backUrl: string;
+ }
}
export {};
diff --git a/src/utils/db.ts b/src/utils/db.ts
new file mode 100644
index 00000000..ee92d952
--- /dev/null
+++ b/src/utils/db.ts
@@ -0,0 +1,157 @@
+import Dexie from "dexie";
+import * as CryptoJS from "crypto-js";
+
+import { useUserStoreHook } from "@/store/modules/user-store";
+import dayjs from "dayjs";
+
+// 定义实体类
+interface DraftTable<T> {
+ id?: number; // 主键，自增
+ user: string; // 当前登录用户名
+ module: string; // 草稿所属功能模块
+ name: string; // 草稿名称
+ remarks: string;
+ data: T;
+ date?: string;
+}
+
+class MyDatabase extends Dexie {
+ // 声明表的类型
+ draft!: Dexie.Table<DraftTable<any>, number>; // <Entity, PrimaryKey>
+
+ SECRET_KEY = "f47ac10b-58cc-4372-a567-0e02b2c3d479"; // 建议从环境变量或安全方式获取
+ constructor() {
+ super("MyDatabase"); // 数据库名称
+ this.version(1).stores({
+ // 草稿类型表
+ draft: "++id, user, module, name, date", // 定义索引字段
+ });
+ }
+
+ encryptData(data: any): string {
+ const jsonString = typeof data === "string" ? data : JSON.stringify(data);
+ return CryptoJS.AES.encrypt(jsonString, this.SECRET_KEY).toString();
+ }
+
+ decryptData(cipherText: string): any {
+ const bytes = CryptoJS.AES.decrypt(cipherText, this.SECRET_KEY);
+ const plaintext = bytes.toString(CryptoJS.enc.Utf8);
+ if (!plaintext) return null;
+ try {
+ return JSON.parse(plaintext);
+ } catch {
+ return plaintext; // 可能是普通字符串
+ }
+ }
+
+ /**
+ * 添加数据
+ * @param name 草稿名
+ * @param module 功能模块
+ * @param remarks 描述
+ * @param data 存储的数据
+ * @param encrypted 是否加密数据
+ * @returns
+ */
+ async addDraft<T>(
+ module: string,
+ name: string,
+ data: T,
+ remarks: string = "",
+ encrypted: boolean = false
+ ): Promise<number> {
+ const userStore = useUserStoreHook();
+ const encryptedData = this.encryptData(data);
+ return await this.draft.add({
+ user: userStore.userInfo.username || "",
+ name,
+ module,
+ remarks,
+ data: encrypted ? encryptedData : data,
+ date: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ });
+ }
+
+ /**
+ *
+ * @param id
+ * @returns
+ */
+ async getDraftById<T>(id: number, decrypt: boolean = false): Promise<DraftTable<T> | undefined> {
+ const record = await this.draft.get(id);
+ if (!record) return undefined;
+ if (decrypt) {
+ record.data = this.decryptData(record.data);
+ }
+ return record;
+ }
+
+ /**
+ * 根据名称获取数据
+ * @param name
+ * @param decrypt
+ * @returns
+ */
+ async getDraftByName<T>(
+ name: string,
+ module: string,
+ decrypt: boolean = false
+ ): Promise<DraftTable<T> | undefined> {
+ const userStore = useUserStoreHook();
+ const record = await this.draft
+ .where("name")
+ .equals(name)
+ .filter((item) => item.module === module && item.user === userStore.userInfo.username)
+ .first();
+ if (!record) return undefined;
+ if (decrypt) {
+ record.data = this.decryptData(record.data);
+ }
+ return record;
+ }
+
+ /**
+ * 获取所有数据
+ * @param module 功能模块
+ * @param decrypt 是否解密数据
+ * @returns
+ */
+ async getAllDraft<T>(module: string, decrypt: boolean = false): Promise<DraftTable<T>[]> {
+ const userStore = useUserStoreHook();
+ const records = await this.draft
+ .where("module")
+ .equals(module)
+ .filter((item) => item.user === userStore.userInfo.username)
+ .toArray();
+ return decrypt
+ ? records.map((r) => {
+ r.data = this.decryptData(r.data);
+ return r;
+ })
+ : records;
+ }
+
+ async updateDraft<T>(id: number, data: T, encrypted: boolean = false): Promise<boolean> {
+ const record = await this.draft.get(id);
+ if (!record) return false;
+
+ // 准备要更新的字段
+ const updatedCount = await this.draft.update(id, {
+ data: encrypted ? this.encryptData(data) : data,
+ date: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ });
+ return updatedCount > 0;
+ }
+
+ async deleteDraftById(id: number): Promise<boolean> {
+ const record = await this.draft.get(id);
+ if (!record) return false;
+ await this.draft.delete(id); // 删除操作无返回值
+ const exists = await this.draft.get(id); // 再次查询确认是否删除
+ return !exists; // 如果不存在则说明删除成功
+ }
+}
+
+// 实例化数据库
+const db = new MyDatabase();
+export { db, type DraftTable };
diff --git a/src/utils/page.ts b/src/utils/page.ts
new file mode 100644
index 00000000..18647d35
--- /dev/null
+++ b/src/utils/page.ts
@@ -0,0 +1,13 @@
+import { useTagsViewStore } from "@/store";
+
+export function closeCurrentFormPage() {
+ const tagsViewStore = useTagsViewStore();
+ ElMessageBox.confirm("当前表单存在未保存的更改，关闭页面将导致数据丢失，是否确认关闭？", "提示", {
+ type: "warning",
+ confirmButtonText: "关闭",
+ })
+ .then(() => {
+ tagsViewStore.closeCurrentView();
+ })
+ .catch(() => {});
+}
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 3da75575..78bef398 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -134,8 +134,8 @@ const captchaBase64 = ref();
const rememberMe = AuthStorage.getRememberMe();
const loginFormData = ref<LoginFormData>({
- username: "admin",
- password: "123456",
+ username: import.meta.env.VITE_APP_USER_NAME || "",
+ password: import.meta.env.VITE_APP_USER_PASSWORD || "",
captchaKey: "",
captchaCode: "",
rememberMe,
diff --git a/src/views/result/Index.vue b/src/views/result/Index.vue
new file mode 100644
index 00000000..22a5204b
--- /dev/null
+++ b/src/views/result/Index.vue
@@ -0,0 +1,44 @@
+<template>
+ <div class="app-container h-full">
+ <el-card shadow="never" class="w900px h-full">
+ <el-result :title="params.title" :sub-title="params.subTitle">
+ <template #icon>
+ <el-image :src="ResSaccess" style="width: 500px" />
+ </template>
+ <template #extra>
+ <el-button type="primary" round @click="closeCurrentFormPage()">返回</el-button>
+ </template>
+ </el-result>
+ </el-card>
+ </div>
+</template>
+
+<script setup lang="ts">
+import ResSaccess from "@/assets/icons/res-success.svg";
+import { useTagsViewStore } from "@/store";
+import { useRoute } from "vue-router";
+
+defineOptions({
+ name: "Result",
+});
+const tagsViewStore = useTagsViewStore();
+const route = useRoute();
+const params = ref<ResultPageParams>({
+ title: "完成",
+ subTitle: "操作成功",
+ type: "success",
+ backUrl: "",
+});
+
+function closeCurrentFormPage() {
+ tagsViewStore.closeCurrentView();
+}
+onMounted(() => {
+ if (Object.keys(route.params).length > 0) {
+ params.value = route.params;
+ console.log(params.value);
+ }
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/vehicle/vehicle-info/add.vue b/src/views/vehicle/vehicle-info/add.vue
new file mode 100644
index 00000000..1401ad7c
--- /dev/null
+++ b/src/views/vehicle/vehicle-info/add.vue
@@ -0,0 +1,397 @@
+<template>
+ <div class="app-container">
+ <el-card shadow="never" class="w900px">
+ <el-form
+ ref="dataFormRef"
+ :model="formData"
+ :rules="rules"
+ :label-width="labelWidth"
+ flex
+ flex-wrap
+ >
+ <div class="h24px wfull"></div>
+ <!-- 1. 车辆身份标识类（唯一性、法律性） -->
+ <el-form-item label="车辆唯一编号" prop="vehicleId" class="w50%">
+ <el-input
+ v-model="formData.vehicleId"
+ placeholder="请输入（内部系统编号）"
+ maxlength="30"
+ show-word-limit
+ />
+ </el-form-item>
+
+ <el-form-item label="车辆识别代号" prop="vin" class="w50%">
+ <template #label>
+ <HelpText
+ label="车辆识别代号"
+ content="车辆识别代号，又称为车辆识别号、车架号、车号、VIN等。"
+ />
+ </template>
+ <el-input
+ v-model="formData.vin"
+ placeholder="请输入（车架号）"
+ maxlength="17"
+ show-word-limit
+ />
+ </el-form-item>
+
+ <el-form-item label="车牌号" prop="licensePlate" class="w50%">
+ <el-input
+ v-model="formData.licensePlate"
+ placeholder="请输入"
+ maxlength="8"
+ show-word-limit
+ />
+ </el-form-item>
+
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 2. 车辆基本信息（品牌型号） -->
+ <el-form-item label="车辆品牌" prop="brand" class="w50%">
+ <Dict
+ v-model="formData.brand"
+ code="vehicle_brand"
+ type="selectV2"
+ :more-props="{
+ 'allow-create': true,
+ 'default-first-option': true,
+ filterable: true,
+ clearable: true,
+ 'reserve-keyword': false,
+ }"
+ />
+ </el-form-item>
+
+ <el-form-item label="" prop="series" class="w50%">
+ <template #label>
+ <HelpText
+ label="车系"
+ content="同一品牌下，共享平台、设计和技术的一类车型的统称。例如：丰田凯美瑞、本田CR-V、宝马3系。"
+ />
+ </template>
+ <el-input v-model="formData.series" placeholder="请输入" maxlength="30" show-word-limit />
+ </el-form-item>
+
+ <el-form-item label="" prop="model" class="w50%">
+ <template #label>
+ <HelpText
+ label="车型"
+ content="车系中具体的一款配置或版本，区分动力、配置和价格。例如：凯美瑞 2.5L 豪华版、CR-V 1.5T 两驱舒适型。"
+ />
+ </template>
+ <el-input v-model="formData.model" placeholder="请输入" maxlength="50" show-word-limit />
+ </el-form-item>
+
+ <el-form-item label="车身颜色" prop="color" class="w50%">
+ <Dict v-model="formData.color" code="vehicle_color" />
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 3. 动力系统信息 -->
+ <el-form-item label="燃料类型" prop="fuelType" class="w50%">
+ <Dict v-model="formData.fuelType" code="vehicle_fuel_type" />
+ </el-form-item>
+
+ <el-form-item label="发动机型号" prop="engineModel" class="w50%">
+ <el-input v-model="formData.engineModel" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="发动机号" prop="engineNumber" class="w50%">
+ <el-input v-model="formData.engineNumber" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="排量" prop="displacement" class="w50%">
+ <el-input-number
+ v-model="formData.displacement"
+ placeholder="请输入"
+ :min="0"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>L</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="功率" prop="power" class="w50%">
+ <el-input-number
+ v-model="formData.power"
+ :min="0"
+ placeholder="功率"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>kW</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="变速箱类型" prop="gearboxType" class="w50%">
+ <Dict v-model="formData.gearboxType" code="vehicle_gearbox_type" />
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 5. 使用参数 -->
+ <el-form-item label="核定载客数" prop="seats" class="w50%">
+ <el-input-number
+ v-model="formData.seats"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>人</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="核定载质量" prop="tonnage" class="w50%">
+ <el-input-number
+ v-model="formData.tonnage"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>吨</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 4. 注册与购置信息（时间 + 价格） -->
+ <el-form-item label="购置日期" prop="purchaseDate" class="w50%">
+ <el-date-picker
+ v-model="formData.purchaseDate"
+ class="!wfull"
+ type="date"
+ placeholder="购置日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-form-item label="购置价格" prop="purchasePrice" class="w50%">
+ <el-input-number
+ v-model="formData.purchasePrice"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>元</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="购自单位/个人" prop="purchaseFrom" class="w50%">
+ <el-input v-model="formData.purchaseFrom" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="注册日期" prop="registrationDate" class="w50%">
+ <el-date-picker
+ v-model="formData.registrationDate"
+ class="!wfull"
+ type="date"
+ placeholder="注册日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-form-item label="首次上牌日期" prop="firstRegistrationDate" class="w50%">
+ <el-date-picker
+ v-model="formData.firstRegistrationDate"
+ class="!wfull"
+ type="date"
+ placeholder="首次上牌日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 6. 状态与管理 -->
+ <el-form-item label="车辆状态" prop="status" class="w50%">
+ <Dict v-model="formData.status" code="vehicle_status" />
+ </el-form-item>
+
+ <el-form-item label="所属部门ID" prop="ownerDeptId" class="w50%">
+ <el-tree-select
+ v-model="formData.ownerDeptId"
+ placeholder="请选择"
+ :data="deptOptions"
+ filterable
+ check-strictly
+ :render-after-expand="false"
+ />
+ </el-form-item>
+
+ <el-form-item label="当前驾驶人" prop="currentDriverId" class="w50%">
+ <el-input v-model="formData.currentDriverId" placeholder="请输入" />
+ </el-form-item>
+
+ <!-- <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+
+ <el-form-item label="创建时间" prop="createdAt" class="w50%">
+ <el-date-picker
+ v-model="formData.createdAt"
+ type="datetime"
+ placeholder="创建时间"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!wfull"
+ />
+ </el-form-item>
+
+ <el-form-item label="更新时间" prop="updatedAt" class="w50%">
+ <el-date-picker
+ v-model="formData.updatedAt"
+ type="datetime"
+ placeholder="更新时间"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!wfull"
+ />
+ </el-form-item>
+
+ <el-form-item label="扩展字段1" prop="extendedField1" class="w50%">
+ <el-input v-model="formData.extendedField1" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="扩展字段2" prop="extendedField2" class="w50%">
+ <el-input v-model="formData.extendedField2" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="扩展字段3" prop="extendedField3" class="w50%">
+ <el-input v-model="formData.extendedField3" placeholder="请输入" />
+ </el-form-item> -->
+ </el-form>
+
+ <el-form
+ ref="dataFormRef"
+ :model="formData"
+ :rules="rules"
+ :label-width="labelWidth"
+ flex
+ flex-wrap
+ >
+ <div class="h24px wfull"></div>
+ </el-form>
+
+ <template #footer>
+ <div class="footer flex flex-justify-between">
+ <div>
+ <Draft v-model="formData" module="vehicle-info"></Draft>
+ </div>
+ <div>
+ <el-button
+ :disabled="loading"
+ type="info"
+ text
+ bg
+ @click="handleCloseCurrentFormPage()"
+ >
+ 关闭
+ </el-button>
+ <el-button :loading="loading" type="primary" @click="handleSubmit()">保存</el-button>
+ </div>
+ </div>
+ </template>
+ </el-card>
+ </div>
+</template>
+
+<script setup lang="ts">
+import VehicleInfoAPI, { VehicleInfoForm } from "@/apijson/vehicle/vehicle-info-apijson";
+import HelpText from "@/components/Form/HelpText.vue";
+import Draft from "@/components/Draft/Index.vue";
+import DeptAPI from "@/api/system/dept-api";
+import { closeCurrentFormPage } from "@/utils/page";
+import { useTagsViewStore } from "@/store";
+
+defineOptions({
+ name: "VehicleInfoAdd",
+});
+
+const dataFormRef = ref();
+const loading = ref(false);
+// 车辆基本信息表单数据
+const formData = ref<VehicleInfoForm>({});
+const labelWidth = ref(150);
+
+// 车辆基本信息表单校验规则
+const rules = reactive({
+ vehicleId: [{ required: true, message: "请输入", trigger: "blur" }],
+ licensePlate: [{ required: true, message: "请输入", trigger: "blur" }],
+ vin: [{ required: true, message: "请输入", trigger: "blur" }],
+ brand: [{ required: true, message: "请输入", trigger: "blur" }],
+ model: [{ required: true, message: "请输入", trigger: "blur" }],
+ seats: [{ required: true, message: "请输入", trigger: "blur" }],
+ purchaseDate: [{ required: true, message: "请输入", trigger: "blur" }],
+ purchasePrice: [{ required: true, message: "请输入", trigger: "blur" }],
+ fuelType: [{ required: true, message: "请输入", trigger: "blur" }],
+ status: [{ required: true, message: "请输入", trigger: "blur" }],
+});
+
+const tagsViewStore = useTagsViewStore();
+/** 提交车辆基本信息表单 */
+function handleSubmit() {
+ dataFormRef.value.validate((valid: any) => {
+ if (valid) {
+ loading.value = true;
+ VehicleInfoAPI.create(formData.value)
+ .then(() => {
+ ElMessage.success("新增成功");
+ tagsViewStore.closeCurrentView();
+ // router.replace({
+ // name: "Result",
+ // params: {
+ // type: "success",
+ // title: "完成",
+ // subTitle: "操作成功！",
+ // backUrl: "/vehicle/vehicle-info",
+ // },
+ // });
+ })
+ .finally(() => (loading.value = false));
+ }
+ });
+}
+
+function handleCloseCurrentFormPage() {
+ closeCurrentFormPage();
+}
+
+// ---------------------------------------------------------------------
+// 部门下拉数据源
+const deptOptions = ref<OptionType[]>();
+
+/** 初始化部门模块 */
+async function initDeptModule() {
+ try {
+ // 加载部门下拉数据源
+ deptOptions.value = await DeptAPI.getOptions();
+ } catch (error: any) {
+ ElMessage.error(error.message);
+ }
+}
+
+// ---------------------------------------------------------------------
+function handleBeforeunload(event: BeforeUnloadEvent) {
+ // 显示确认对话框
+ event.preventDefault();
+ event.returnValue = "";
+}
+onMounted(() => {
+ window.addEventListener("beforeunload", handleBeforeunload);
+
+ initDeptModule();
+});
+onUnmounted(() => {
+ window.removeEventListener("beforeunload", handleBeforeunload);
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/vehicle/vehicle-info/edit.vue b/src/views/vehicle/vehicle-info/edit.vue
new file mode 100644
index 00000000..fae3afe8
--- /dev/null
+++ b/src/views/vehicle/vehicle-info/edit.vue
@@ -0,0 +1,455 @@
+<template>
+ <div class="app-container">
+ <el-card v-if="loading" shadow="never" class="w900px !hfull !overflow-hidden">
+ <el-skeleton animated>
+ <template #template>
+ <div v-for="value in 5" :key="value" class="mb-30px">
+ <div class="flex gap-30px !h30px mb-15px">
+ <div class="flex flex-1 gap-15px">
+ <el-skeleton-item class="!hfull !w30%" />
+ <el-skeleton-item class="!hfull !w-auto% flex-1" />
+ </div>
+ <div class="flex flex-1 gap-15px">
+ <el-skeleton-item class="!hfull !w30%" />
+ <el-skeleton-item class="!hfull !w-auto% flex-1" />
+ </div>
+ </div>
+ <div class="flex gap-30px !h30px mb-15px">
+ <div class="flex flex-1 gap-15px">
+ <el-skeleton-item class="!hfull !w30%" />
+ <el-skeleton-item class="!hfull !w-auto% flex-1" />
+ </div>
+ <div class="flex flex-1 gap-15px">
+ <el-skeleton-item class="!hfull !w30%" />
+ <el-skeleton-item class="!hfull !w-auto% flex-1" />
+ </div>
+ </div>
+ <div class="flex gap-30px !h30px mb-15px">
+ <div class="flex flex-1 gap-15px">
+ <el-skeleton-item class="!hfull !w30%" />
+ <el-skeleton-item class="!hfull !w-auto% flex-1" />
+ </div>
+ <div class="flex-1"></div>
+ </div>
+ </div>
+ </template>
+ </el-skeleton>
+ </el-card>
+ <el-card v-else-if="!loading && !formData.vehicleId" shadow="never" class="w900px h700px">
+ <el-empty description="信息未找到" :image="EmptyImg" :image-size="300">
+ <el-button type="primary" @click="handleCloseCurrentEmptyFormPage">关闭</el-button>
+ </el-empty>
+ </el-card>
+ <el-card v-else shadow="never" class="w900px">
+ <el-form
+ ref="dataFormRef"
+ :model="formData"
+ :rules="rules"
+ :label-width="labelWidth"
+ flex
+ flex-wrap
+ :disabled="submitLoading"
+ >
+ <div class="h24px wfull"></div>
+ <!-- 1. 车辆身份标识类（唯一性、法律性） -->
+ <el-form-item label="车辆唯一编号" prop="vehicleId" class="w50%">
+ <el-input
+ v-model="formData.vehicleId"
+ placeholder="请输入（内部系统编号）"
+ maxlength="30"
+ show-word-limit
+ disabled
+ />
+ </el-form-item>
+
+ <el-form-item label="车辆识别代号" prop="vin" class="w50%">
+ <template #label>
+ <HelpText
+ label="车辆识别代号"
+ content="车辆识别代号，又称为车辆识别号、车架号、车号、VIN等。"
+ disabled
+ />
+ </template>
+ <el-input
+ v-model="formData.vin"
+ placeholder="请输入（车架号）"
+ maxlength="17"
+ show-word-limit
+ />
+ </el-form-item>
+ <el-form-item label="车牌号" prop="licensePlate" class="w50%">
+ <el-input
+ v-model="formData.licensePlate"
+ placeholder="请输入"
+ maxlength="8"
+ show-word-limit
+ />
+ </el-form-item>
+
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 2. 车辆基本信息（品牌型号） -->
+ <el-form-item label="车辆品牌" prop="brand" class="w50%">
+ <Dict
+ v-model="formData.brand"
+ code="vehicle_brand"
+ type="selectV2"
+ :more-props="{
+ 'allow-create': true,
+ 'default-first-option': true,
+ filterable: true,
+ clearable: true,
+ 'reserve-keyword': false,
+ }"
+ />
+ </el-form-item>
+
+ <el-form-item label="" prop="series" class="w50%">
+ <template #label>
+ <HelpText
+ label="车系"
+ content="同一品牌下，共享平台、设计和技术的一类车型的统称。例如：丰田凯美瑞、本田CR-V、宝马3系。"
+ />
+ </template>
+ <el-input v-model="formData.series" placeholder="请输入" maxlength="30" show-word-limit />
+ </el-form-item>
+
+ <el-form-item label="" prop="model" class="w50%">
+ <template #label>
+ <HelpText
+ label="车型"
+ content="车系中具体的一款配置或版本，区分动力、配置和价格。例如：凯美瑞 2.5L 豪华版、CR-V 1.5T 两驱舒适型。"
+ />
+ </template>
+ <el-input v-model="formData.model" placeholder="请输入" maxlength="50" show-word-limit />
+ </el-form-item>
+
+ <el-form-item label="车身颜色" prop="color" class="w50%">
+ <Dict v-model="formData.color" code="vehicle_color" />
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 3. 动力系统信息 -->
+ <el-form-item label="燃料类型" prop="fuelType" class="w50%">
+ <Dict v-model="formData.fuelType" code="vehicle_fuel_type" />
+ </el-form-item>
+
+ <el-form-item label="发动机型号" prop="engineModel" class="w50%">
+ <el-input v-model="formData.engineModel" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="发动机号" prop="engineNumber" class="w50%">
+ <el-input v-model="formData.engineNumber" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="排量" prop="displacement" class="w50%">
+ <el-input-number
+ v-model="formData.displacement"
+ placeholder="请输入"
+ :min="0"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>L</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="功率" prop="power" class="w50%">
+ <el-input-number
+ v-model="formData.power"
+ :min="0"
+ placeholder="功率"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>kW</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="变速箱类型" prop="gearboxType" class="w50%">
+ <Dict v-model="formData.gearboxType" code="vehicle_gearbox_type" />
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 5. 使用参数 -->
+ <el-form-item label="核定载客数" prop="seats" class="w50%">
+ <el-input-number
+ v-model="formData.seats"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>人</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="核定载质量" prop="tonnage" class="w50%">
+ <el-input-number
+ v-model="formData.tonnage"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>吨</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 4. 注册与购置信息（时间 + 价格） -->
+ <el-form-item label="购置日期" prop="purchaseDate" class="w50%">
+ <el-date-picker
+ v-model="formData.purchaseDate"
+ class="!wfull"
+ type="date"
+ placeholder="购置日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-form-item label="购置价格" prop="purchasePrice" class="w50%">
+ <el-input-number
+ v-model="formData.purchasePrice"
+ :min="0"
+ placeholder="请输入"
+ controls-position="right"
+ align="left"
+ class="!wfull"
+ >
+ <template #suffix>
+ <span>元</span>
+ </template>
+ </el-input-number>
+ </el-form-item>
+
+ <el-form-item label="购自单位/个人" prop="purchaseFrom" class="w50%">
+ <el-input v-model="formData.purchaseFrom" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="注册日期" prop="registrationDate" class="w50%">
+ <el-date-picker
+ v-model="formData.registrationDate"
+ class="!wfull"
+ type="date"
+ placeholder="注册日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-form-item label="首次上牌日期" prop="firstRegistrationDate" class="w50%">
+ <el-date-picker
+ v-model="formData.firstRegistrationDate"
+ class="!wfull"
+ type="date"
+ placeholder="首次上牌日期"
+ value-format="YYYY-MM-DD"
+ />
+ </el-form-item>
+
+ <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+ <!-- 6. 状态与管理 -->
+ <el-form-item label="车辆状态" prop="status" class="w50%">
+ <Dict v-model="formData.status" code="vehicle_status" />
+ </el-form-item>
+
+ <el-form-item label="所属部门" prop="ownerDeptId" class="w50%">
+ <el-tree-select
+ v-model="formData.ownerDeptId"
+ placeholder="请选择"
+ :data="deptOptions"
+ filterable
+ check-strictly
+ :render-after-expand="false"
+ />
+ </el-form-item>
+
+ <el-form-item label="当前驾驶人" prop="currentDriverId" class="w50%">
+ <el-input v-model="formData.currentDriverId" placeholder="请输入" />
+ </el-form-item>
+
+ <!-- <el-divider border-style="dotted" style="margin: 6px 0 24px"></el-divider>
+
+ <el-form-item label="创建时间" prop="createdAt" class="w50%">
+ <el-date-picker
+ v-model="formData.createdAt"
+ type="datetime"
+ placeholder="创建时间"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!wfull"
+ />
+ </el-form-item>
+
+ <el-form-item label="更新时间" prop="updatedAt" class="w50%">
+ <el-date-picker
+ v-model="formData.updatedAt"
+ type="datetime"
+ placeholder="更新时间"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ class="!wfull"
+ />
+ </el-form-item>
+
+ <el-form-item label="扩展字段1" prop="extendedField1" class="w50%">
+ <el-input v-model="formData.extendedField1" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="扩展字段2" prop="extendedField2" class="w50%">
+ <el-input v-model="formData.extendedField2" placeholder="请输入" />
+ </el-form-item>
+
+ <el-form-item label="扩展字段3" prop="extendedField3" class="w50%">
+ <el-input v-model="formData.extendedField3" placeholder="请输入" />
+ </el-form-item> -->
+ </el-form>
+
+ <el-form
+ ref="dataFormRef"
+ :model="formData"
+ :rules="rules"
+ :label-width="labelWidth"
+ flex
+ flex-wrap
+ >
+ <div class="h24px wfull"></div>
+ </el-form>
+
+ <template #footer>
+ <div class="footer text-align-right" :style="{ paddingLeft: `${labelWidth}px` }">
+ <el-button :loading="loading" type="info" text bg @click="handleCloseCurrentFormPage()">
+ 关闭
+ </el-button>
+ <el-button :loading="loading" type="primary" @click="handleSubmit()">保存</el-button>
+ </div>
+ </template>
+ </el-card>
+ </div>
+</template>
+
+<script setup lang="ts">
+import VehicleInfoAPI, { VehicleInfoForm } from "@/apijson/vehicle/vehicle-info-apijson";
+import HelpText from "@/components/Form/HelpText.vue";
+import DeptAPI from "@/api/system/dept-api";
+import { closeCurrentFormPage } from "@/utils/page";
+import { useTagsViewStore } from "@/store";
+import EmptyImg from "@/assets/icons/empty02.svg";
+
+defineOptions({
+ name: "VehicleInfoEdit",
+});
+
+const dataFormRef = ref();
+const loading = ref(false);
+const submitLoading = ref(false);
+// 车辆基本信息表单数据
+const formData = ref<VehicleInfoForm>({});
+const labelWidth = ref(150);
+
+// 车辆基本信息表单校验规则
+const rules = reactive({
+ vehicleId: [{ required: true, message: "请输入", trigger: "blur" }],
+ licensePlate: [{ required: true, message: "请输入", trigger: "blur" }],
+ vin: [{ required: true, message: "请输入", trigger: "blur" }],
+ brand: [{ required: true, message: "请输入", trigger: "blur" }],
+ model: [{ required: true, message: "请输入", trigger: "blur" }],
+ seats: [{ required: true, message: "请输入", trigger: "blur" }],
+ purchaseDate: [{ required: true, message: "请输入", trigger: "blur" }],
+ purchasePrice: [{ required: true, message: "请输入", trigger: "blur" }],
+ fuelType: [{ required: true, message: "请输入", trigger: "blur" }],
+ status: [{ required: true, message: "请输入", trigger: "blur" }],
+});
+
+const tagsViewStore = useTagsViewStore();
+/** 提交车辆基本信息表单 */
+function handleSubmit() {
+ dataFormRef.value.validate((valid: any) => {
+ if (valid) {
+ submitLoading.value = true;
+ const id = formData.value.id as number;
+ if (id) {
+ VehicleInfoAPI.update(id.toString(), formData.value)
+ .then(() => {
+ ElMessage.success("修改成功");
+ tagsViewStore.closeCurrentView();
+ })
+ .finally(() => (submitLoading.value = false));
+ }
+ }
+ });
+}
+
+/**
+ * 关闭当前表单页面
+ */
+function handleCloseCurrentFormPage() {
+ closeCurrentFormPage();
+}
+/**
+ * 关闭当前空表单页面
+ */
+function handleCloseCurrentEmptyFormPage() {
+ tagsViewStore.closeCurrentView();
+}
+
+// ---------------------------------------------------------------------
+// 部门下拉数据源
+const deptOptions = ref<OptionType[]>();
+
+/** 初始化部门模块 */
+async function initDeptModule() {
+ try {
+ // 加载部门下拉数据源
+ deptOptions.value = await DeptAPI.getOptions();
+ } catch (error: any) {
+ ElMessage.error(error.message);
+ }
+}
+/** 打开车辆基本信息弹窗 */
+function handleGetFormData(id: number) {
+ loading.value = true;
+ VehicleInfoAPI.getFormData(id)
+ .then((data) => {
+ if (data.list.length > 0) {
+ data.list[0].purchasePrice = Number(data.list[0].purchasePrice);
+ data.list[0].seats = Number(data.list[0].seats);
+ data.list[0].displacement = Number(data.list[0].displacement);
+ formData.value = data.list[0];
+ }
+ })
+ .finally(() => (loading.value = false));
+}
+const route = useRoute();
+function init() {
+ const id = route.params.id;
+ if (id !== undefined && id !== null) {
+ handleGetFormData(Number(id));
+ } else {
+ closeCurrentFormPage();
+ }
+}
+init();
+// ---------------------------------------------------------------------
+function handleBeforeunload(event: BeforeUnloadEvent) {
+ // 显示确认对话框
+ event.preventDefault();
+ event.returnValue = "";
+}
+onMounted(() => {
+ window.addEventListener("beforeunload", handleBeforeunload);
+
+ initDeptModule();
+});
+onUnmounted(() => {
+ window.removeEventListener("beforeunload", handleBeforeunload);
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/vehicle/vehicle-info/index.vue b/src/views/vehicle/vehicle-info/index.vue
index b12fc342..24a5d6ce 100644
--- a/src/views/vehicle/vehicle-info/index.vue
+++ b/src/views/vehicle/vehicle-info/index.vue
@@ -30,7 +30,7 @@
v-hasPerm="['vehicle:vehicle-info:add']"
type="success"
icon="plus"
- @click="handleOpenDialog()"
+ @click="handleOpenAdd()"
>
新增
</el-button>
@@ -215,7 +215,7 @@
min-width="150"
align="center"
/>
- <el-table-column fixed="right" label="操作" width="220">
+ <el-table-column fixed="right" label="操作" width="220" class-name="operation_cell">
<template #default="scope">
<el-button
v-hasPerm="['vehicle:vehicle-info:edit']"
@@ -223,13 +223,13 @@
size="small"
link
icon="edit"
- @click="handleOpenDialog(scope.row.id)"
+ @click="handleOpenEdit(scope.row.id)"
>
编辑
</el-button>
<el-button
v-hasPerm="['vehicle:vehicle-info:delete']"
- type="danger"
+ type="primary"
size="small"
link
icon="delete"
@@ -237,6 +237,18 @@
>
删除
</el-button>
+ <el-dropdown class="mt4px">
+ <el-button type="primary" size="small" link icon="ArrowDownBold">更多</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item icon="Postcard">行驶证</el-dropdown-item>
+ <el-dropdown-item icon="DocumentChecked">年检合格证</el-dropdown-item>
+ <el-dropdown-item icon="DocumentAdd">保险单</el-dropdown-item>
+
+ <!-- <el-dropdown-item divided>Action 5</el-dropdown-item> -->
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
</template>
</el-table-column>
</el-table>
@@ -249,162 +261,6 @@
@pagination="handlePagerQuery()"
/>
</el-card>
-
- <!-- 车辆基本信息表单弹窗 -->
- <el-dialog
- v-model="dialog.visible"
- :title="dialog.title"
- width="500px"
- @close="handleCloseDialog"
- >
- <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
- <el-form-item label="车辆唯一编号（内部系统编号）" prop="vehicleId">
- <el-input v-model="formData.vehicleId" placeholder="车辆唯一编号（内部系统编号）" />
- </el-form-item>
-
- <el-form-item label="车牌号" prop="licensePlate">
- <el-input v-model="formData.licensePlate" placeholder="车牌号" />
- </el-form-item>
-
- <el-form-item label="车辆识别代号(VIN)" prop="vin">
- <el-input v-model="formData.vin" placeholder="车辆识别代号(VIN)" />
- </el-form-item>
-
- <el-form-item label="品牌" prop="brand">
- <el-input v-model="formData.brand" placeholder="品牌" />
- </el-form-item>
-
- <el-form-item label="车型" prop="model">
- <el-input v-model="formData.model" placeholder="车型" />
- </el-form-item>
-
- <el-form-item label="车系" prop="series">
- <el-input v-model="formData.series" placeholder="车系" />
- </el-form-item>
-
- <el-form-item label="发动机型号" prop="engineModel">
- <el-input v-model="formData.engineModel" placeholder="发动机型号" />
- </el-form-item>
-
- <el-form-item label="发动机号" prop="engineNumber">
- <el-input v-model="formData.engineNumber" placeholder="发动机号" />
- </el-form-item>
-
- <el-form-item label="购置日期" prop="purchaseDate">
- <el-date-picker
- v-model="formData.purchaseDate"
- class="!w-[240px]"
- type="date"
- placeholder="购置日期"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
-
- <el-form-item label="购置价格" prop="purchasePrice">
- <el-input v-model="formData.purchasePrice" placeholder="购置价格" />
- </el-form-item>
-
- <el-form-item label="购自单位/个人" prop="purchaseFrom">
- <el-input v-model="formData.purchaseFrom" placeholder="购自单位/个人" />
- </el-form-item>
-
- <el-form-item label="注册日期" prop="registrationDate">
- <el-date-picker
- v-model="formData.registrationDate"
- class="!w-[240px]"
- type="date"
- placeholder="注册日期"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
-
- <el-form-item label="首次上牌日期" prop="firstRegistrationDate">
- <el-date-picker
- v-model="formData.firstRegistrationDate"
- class="!w-[240px]"
- type="date"
- placeholder="首次上牌日期"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
-
- <el-form-item label="燃料类型" prop="fuelType">
- <Dict v-model="formData.fuelType" code="vehicle_fuel_type" />
- </el-form-item>
-
- <el-form-item label="排量(L)" prop="displacement">
- <el-input-number v-model="formData.displacement" placeholder="排量(L)" />
- </el-form-item>
-
- <el-form-item label="功率(kW)" prop="power">
- <el-input-number v-model="formData.power" placeholder="功率(kW)" />
- </el-form-item>
-
- <el-form-item label="核定载客数" prop="seats">
- <el-input-number v-model="formData.seats" placeholder="核定载客数" />
- </el-form-item>
-
- <el-form-item label="核定载质量(吨)" prop="tonnage">
- <el-input v-model="formData.tonnage" type="number" placeholder="核定载质量(吨)" />
- </el-form-item>
-
- <el-form-item label="颜色" prop="color">
- <el-input v-model="formData.color" placeholder="颜色" />
- </el-form-item>
-
- <el-form-item label="变速箱类型" prop="gearboxType">
- <Dict v-model="formData.gearboxType" code="vehicle_gearbox_type" />
- </el-form-item>
-
- <el-form-item label="车辆状态" prop="status">
- <Dict v-model="formData.status" code="vehicle_status" />
- </el-form-item>
-
- <el-form-item label="所属部门ID（无外键约束）" prop="ownerDeptId">
- <el-input v-model="formData.ownerDeptId" placeholder="所属部门ID（无外键约束）" />
- </el-form-item>
-
- <el-form-item label="当前驾驶人ID（无外键约束）" prop="currentDriverId">
- <el-input v-model="formData.currentDriverId" placeholder="当前驾驶人ID（无外键约束）" />
- </el-form-item>
-
- <el-form-item label="创建时间" prop="createdAt">
- <el-date-picker
- v-model="formData.createdAt"
- type="datetime"
- placeholder="创建时间"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </el-form-item>
-
- <el-form-item label="更新时间" prop="updatedAt">
- <el-date-picker
- v-model="formData.updatedAt"
- type="datetime"
- placeholder="更新时间"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </el-form-item>
-
- <el-form-item label="扩展字段1" prop="extendedField1">
- <el-input v-model="formData.extendedField1" placeholder="扩展字段1" />
- </el-form-item>
-
- <el-form-item label="扩展字段2" prop="extendedField2">
- <el-input v-model="formData.extendedField2" placeholder="扩展字段2" />
- </el-form-item>
-
- <el-form-item label="扩展字段3" prop="extendedField3">
- <el-input v-model="formData.extendedField3" placeholder="扩展字段3" />
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="handleSubmit()">确定</el-button>
- <el-button @click="handleCloseDialog()">取消</el-button>
- </div>
- </template>
- </el-dialog>
</div>
</template>
@@ -416,13 +272,12 @@ defineOptions({
import VehicleInfoAPI, {
VehicleInfoPageVO,
- VehicleInfoForm,
VehicleInfoPageQuery,
} from "@/apijson/vehicle/vehicle-info-apijson";
+import router from "@/router";
// import VehicleInfoAPI, { VehicleInfoPageVO, VehicleInfoForm, VehicleInfoPageQuery } from "@/api/vehicle/vehicle-info-api";
const queryFormRef = ref();
-const dataFormRef = ref();
const loading = ref(false);
const removeIds = ref<number[]>([]);
@@ -436,27 +291,6 @@ const queryParams = reactive<VehicleInfoPageQuery>({
// 车辆基本信息表格数据
const pageData = ref<VehicleInfoPageVO[]>([]);
-// 弹窗
-const dialog = reactive({
- title: "",
- visible: false,
-});
-
-// 车辆基本信息表单数据
-const formData = reactive<VehicleInfoForm>({});
-
-// 车辆基本信息表单校验规则
-const rules = reactive({
- vehicleId: [{ required: true, message: "请输入车辆唯一编号（内部系统编号）", trigger: "blur" }],
- licensePlate: [{ required: true, message: "请输入车牌号", trigger: "blur" }],
- vin: [{ required: true, message: "请输入车辆识别代号(VIN)", trigger: "blur" }],
- brand: [{ required: true, message: "请输入品牌", trigger: "blur" }],
- model: [{ required: true, message: "请输入车型", trigger: "blur" }],
- purchaseDate: [{ required: true, message: "请输入购置日期", trigger: "blur" }],
- fuelType: [{ required: true, message: "请输入燃料类型", trigger: "blur" }],
- status: [{ required: true, message: "请输入车辆状态", trigger: "blur" }],
-});
-
/** 查询车辆基本信息 */
function handlePagerQuery() {
loading.value = true;
@@ -487,56 +321,6 @@ function handleSelectionChange(selection: any) {
removeIds.value = selection.map((item: any) => item.id);
}
-/** 打开车辆基本信息弹窗 */
-function handleOpenDialog(id?: number) {
- dialog.visible = true;
- if (id) {
- dialog.title = "修改车辆基本信息";
- VehicleInfoAPI.getFormData(id).then((data) => {
- if (data.list.length > 0) {
- Object.assign(formData, data.list[0]);
- }
- });
- } else {
- dialog.title = "新增车辆基本信息";
- }
-}
-
-/** 提交车辆基本信息表单 */
-function handleSubmit() {
- dataFormRef.value.validate((valid: any) => {
- if (valid) {
- loading.value = true;
- const id = formData.id;
- if (id) {
- VehicleInfoAPI.update(id, formData)
- .then(() => {
- ElMessage.success("修改成功");
- handleCloseDialog();
- handleResetQuery();
- })
- .finally(() => (loading.value = false));
- } else {
- VehicleInfoAPI.create(formData)
- .then(() => {
- ElMessage.success("新增成功");
- handleCloseDialog();
- handleResetQuery();
- })
- .finally(() => (loading.value = false));
- }
- }
- });
-}
-
-/** 关闭车辆基本信息弹窗 */
-function handleCloseDialog() {
- dialog.visible = false;
- dataFormRef.value.resetFields();
- dataFormRef.value.clearValidate();
- formData.id = undefined;
-}
-
/** 删除车辆基本信息 */
function handleDelete(id?: number) {
const ids = [id || removeIds.value].join(",");
@@ -565,7 +349,20 @@ function handleDelete(id?: number) {
);
}
+function handleOpenAdd() {
+ router.push("/vehicle/vehicle-info/add");
+}
+function handleOpenEdit(id?: number) {
+ router.push(`/vehicle/vehicle-info/edit/${id}`);
+}
+
onMounted(() => {
handleQuery();
});
</script>
+
+<style lang="scss" scoped>
+.el-button + .el-dropdown {
+ margin-left: 12px;
+}
+</style>
diff --git a/svgo/icons/res-success.svg b/svgo/icons/res-success.svg
new file mode 100644
index 00000000..e376cbcc
--- /dev/null
+++ b/svgo/icons/res-success.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 490 272"><defs><path id="a" d="M0 .113h141.08v117.88H0z"/><path id="c" d="M.5.39h277.53v16.268H.5z"/><path id="e" d="M0 0h84.1v88.533H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#E7F3FE" fill-opacity=".4" d="M57.845 265.902S-38.205 90.287 33.692 49.309c57.363-32.693 107.68 24.52 169.068-15.325 79.197-51.405 139.236-16.99 182.149 46.997 32.203 48.018 49.26 79.08 65.413 116.47 25.158 58.234-28.178 71.516-28.178 71.516z"/><path fill="#E4EDF9" d="M430.251 227.732c-3.276-8.55-5.723-17.626-8.395-27.213-1.802-6.459-4.706-13.687-11.003-15.723-6.124-1.982-12.72 2.124-16.487 7.415-3.767 5.29-5.666 11.707-8.888 17.357-5.839 10.242-16.185 14.534-24.734 5.53-12.212-12.861-17.708-30.392-25.452-46.08-5.622-11.388-10.327-24.72-17.41-35.216-10.801-16.006-25.612-29.653-45.308-29.653-12.483 1.922-23.484 13.157-30.928 27.197-7.445 14.04-11.788 30.739-15.489 47.396-6.73 30.294-11.661 61.292-16.584 92.247l248.49-2.944c-.988.012-7.08-8.262-8.248-9.409-9.54-9.38-15.266-19.69-19.564-30.904"/><path fill="#83AFFC" d="M382.222 242.388c-.482 9.805-10.904 26.946-20.482 26.451-9.579-.494-14.685-18.436-14.203-28.241s10.683-58.867 20.262-58.373c9.577.494 14.906 50.358 14.423 60.163"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".867" d="m367.512 188.639-5.265 79.142"/><path fill="#FFC957" d="M360.186 240.42c-2.185 4.888-3.847 10.018-4.853 15.36-.51 2.71-.83 5.645.372 8.116 1.315 2.698 4.233 4.271 7.151 4.76 7.13 1.192 14.261-3.255 18.44-9.26 4.179-6.003 5.99-13.342 7.65-20.504 1.308-5.64 2.594-11.363 5.057-16.618 1.058-2.253 7.244-10.95 4.317-13.206-4.003-3.205-15.592.281-23.019 8.54-6.117 6.801-11.38 14.454-15.115 22.812"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".867" d="M363.3 268.85s8.636-34.663 29.482-54.544"/><path fill="#2A8EF2" d="M411.258 232.763c-.756 1.325-2.174 2.23-3.46 2.938-1.586.874-3.275 1.643-4.907 2.386-2.096.954-4.265 1.94-6.266 3.17-1.46.898-2.755 1.91-3.843 2.995 1.719-3.82 3.726-7.154 6.092-10.134 3.113-3.923 6.31-5.909 9.504-5.909q.11 0 .221.004c.988.027 1.757.266 2.286.71 1.084.914 1.041 2.67.373 3.84m4.212 21.723c-1.259.864-2.928 1.083-4.395 1.184-1.808.124-3.663.11-5.456.1-2.303-.015-4.683-.03-7.02.237-1.705.198-3.313.562-4.764 1.079 3.21-2.683 6.469-4.815 9.898-6.487 4.51-2.199 8.253-2.648 11.128-1.336q.1.046.197.094c.878.43 1.465.96 1.748 1.57.579 1.255-.224 2.795-1.336 3.559m-8.37 11.134c-1.062-.14-2.015-.788-2.805-1.406-.974-.76-1.905-1.609-2.805-2.43-1.156-1.054-2.351-2.144-3.663-3.072a14.8 14.8 0 0 0-2.94-1.626c2.947.117 5.646.532 8.204 1.253 3.364.951 5.476 2.427 6.28 4.391q.028.068.053.136c.23.614.266 1.146.108 1.58-.328.892-1.493 1.298-2.432 1.174"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M383.306 268.85s.098-20.824 25.27-38.502"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M383.306 268.85s7.662-17.112 28.429-17.112"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M394.888 257.088s4.091-.312 12.635 6.414"/><g transform="translate(23.953 151.673)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><path fill="#E4EDF9" d="M141.08 117.994c-5.85-22.441-11.734-44.893-18.613-66.626-3.88-12.256-8.16-24.464-14.104-34.267C102.417 7.297 94.54.063 86.633.113 74.45 2.506 66.59 14.713 61.436 28.232c-3.38 8.865-5.02 19.604-7.41 28.973-3.295 12.905-5.022 26.942-11.35 38.235-4.429 7.904-11.239 5.888-15.828-1.214-2.533-3.919-4.32-8.58-7.155-12.159-2.836-3.577-7.307-5.908-10.907-3.653-3.7 2.318-4.808 8.183-5.306 13.328-.74 7.637-1.387 14.855-2.597 21.774A107 107 0 0 1 0 117.994z" mask="url(#b)"/></g><path fill="#FFC957" d="M112.942 238.999c-3.617-4.277-8.194-7.967-9.638-13.364-1.055-3.943-.223-8.116.19-12.183.41-4.068.266-8.563-2.3-11.695-2.114-2.578-5.454-3.698-8.667-4.406-3.212-.709-6.565-1.156-9.416-2.832-4.63-2.721-3.706-7.35-6.193-11.41-2.787-4.556-9.276-10.368-14.837-7.343-5.89 3.205-4.957 12.933-1.04 17.23 2.6 2.848 5.927 5.582 6.31 9.464.575 5.843-5.955 11.104-4.16 16.682 1.328 4.119 6.392 5.534 8.893 9.034 2.474 3.462 1.976 8.312.519 12.336-1.457 4.023-3.752 7.744-4.657 11.933-1.855 8.574 4.706 14.498 12.182 16.41 6.87 1.756 21.686.927 21.686.927 5.288-1.896 11.15-6.658 14.057-11.861 2.196-3.931 2.5-8.915.798-13.097-.877-2.154-2.218-4.041-3.727-5.825"/><path stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" d="M67.863 184.03s26.102 40.247 28.94 84.937"/><path fill="#97BDFF" d="M46.49 238.162c.361-.337.888-.517 1.564-.539l.152-.002c2.186 0 4.374 1.502 6.505 4.468 1.62 2.254 2.994 4.777 4.17 7.666a14.7 14.7 0 0 0-2.631-2.265c-1.37-.93-2.854-1.677-4.289-2.398-1.117-.563-2.273-1.143-3.359-1.804-.88-.537-1.85-1.22-2.368-2.223-.457-.885-.486-2.214.255-2.903m-5.429 18.349c.206-.434.637-.808 1.28-1.113q.072-.036.144-.067c2.106-.93 4.847-.613 8.151.947 2.51 1.185 4.898 2.699 7.248 4.6a16.3 16.3 0 0 0-3.488-.764c-1.712-.19-3.456-.18-5.142-.17-1.314.009-2.672.018-3.997-.07-1.074-.07-2.296-.227-3.218-.84-.814-.541-1.402-1.634-.978-2.523"/><path fill="#97BDFF" d="M47.97 266.097c-.108-.308-.083-.685.072-1.12l.037-.098c.544-1.392 1.974-2.439 4.252-3.113 1.731-.512 3.558-.805 5.552-.889a10 10 0 0 0-1.989 1.153c-.889.658-1.697 1.432-2.48 2.18-.609.58-1.24 1.183-1.9 1.722-.534.437-1.178.898-1.898.997-.635.087-1.424-.2-1.646-.832"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M65.867 268.967s-.073-15.86-18.961-29.324"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M65.867 268.967s-5.917-12.134-21.955-12.134"/><path stroke="#001E48" stroke-linecap="round" stroke-linejoin="round" stroke-width=".78" d="M57.883 260.879s-2.908-.197-8.981 4.043"/><g transform="translate(83.874 86.4)"><rect width="238.632" height="178.133" x="16.82" fill="#91B3FA" rx="6"/><g transform="translate(0 167.467)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><path fill="#91B3FA" d="M267.259 16.658H9.167c-3.625 0-6.564-1.731-6.564-3.867V8.125h271.22v4.666c0 2.136-2.939 3.867-6.564 3.867" mask="url(#d)"/></g><path fill="#FDFDFD" d="M24.179 160h224.966V8.533H24.179z"/><path fill="#527EE9" d="m111.432 168.533 3.614 5.334h50.848l3.356-5.334z"/><path fill="#527EE9" d="M16.82 169.6H254.4v-1.067H16.82z"/></g><path fill="#FFF1D6" d="M302.159 266.667h-3.831l1.426-5.334h3.83z"/><path fill="#001E48" d="m298.623 264.533 2.177.689 2.021-.689 1.814 4.267h-16.82l6.324-2.133z"/><path fill="#FFF1D6" d="M340.751 266.667h3.831l-1.426-5.334h-3.83z"/><path fill="#001E48" d="m344.288 264.533-2.178.689-2.02-.689-1.815 4.267h16.82l-6.324-2.133z"/><path fill="#FFF1D6" d="m323.557 164.267 1.685-4.807 5.691-.511c1.047-.129 1.976.567 2.077 1.552.1.987-.668 1.89-1.715 2.018z"/><path fill="#FFF1D6" d="m321.063 159.837 3.042 4.43 5.76-1.172-6.456-9.495-1.24.817a3.886 3.886 0 0 0-1.106 5.42"/><path fill="#E7F3FE" d="m325.867 157.867 18.715-20.054-9.862-2.346-11.163 17.724zm-34.054-6.4-17.721-21.64 7.416-.807 12.615 17.771z"/><path fill="#E7F3FE" d="M337.618 137.268c.979 2.135 3.48 3.06 5.585 2.066 2.104-.996 3.017-3.533 2.036-5.669s-3.48-3.06-5.585-2.065c-2.105.994-3.017 3.532-2.036 5.668"/><path fill="#E7F3FE" d="m338.893 138.667 5.69-6.154-19.865-23.896a4.672 4.672 0 0 0-7.103-.579c-2.05 2.043-1.848 9.264.433 11.032z"/><path fill="#F9EDD4" d="m305.686 110.23 8.342.703 1.12-13.163-8.342-.703z"/><path fill="#E7F3FE" d="M277.022 123.742c-2.317.138-4.07 1.917-3.915 3.974s2.16 3.613 4.477 3.475 4.07-1.916 3.914-3.974c-.154-2.057-2.16-3.612-4.476-3.475"/><path fill="#E7F3FE" d="m274.995 124.39 5.433 5.089 21.192-10.614c2.578-1.381 2.455-8.319.741-10.618-1.714-2.3-5.12-2.538-7.21-.504z"/><path fill="#E7F3FE" d="m320.947 155.53 2.488-44.116c.584-2.356-.982-4.703-3.355-5.028l-20.386-.748c-2.373-.327-4.499 1.512-4.554 3.94l-4.171 53.622z"/><path fill="#1A55B5" d="m301.13 155.733 4.556 14.96-2.025 92.774h-8.123l-4.57-100.002.624-7.732z"/><path fill="#527EE9" d="m301.481 155.733 4.572 18.37h3.29l29.447 89.364h6.844L324.9 167.859l-3.981-12.126z"/><path fill="#1661F7" d="m304.77 106.667 6.173.224-2.511 3.665v29.192l-3.62 7.452-3.33-8.98 4.638-27.902z"/><path fill="#1A55B5" d="M300.433 85.218c-.48-.538-.922-1.11-1.308-1.719-.774-1.178-1.304-2.574-1.237-3.989.076-1.385.704-2.838 1.845-3.71a4 4 0 0 1 1.476-.712 3.3 3.3 0 0 0-.761.464c-1.099.896-1.523 2.347-1.611 3.627-.181 2.706.863 5.277 2.816 7.02-.008.033-.012.069-.02.104a11 11 0 0 1-1.2-1.085m20.966 1.857c-.203-1.976-.95-3.895-2.218-5.398-1.173-1.39-2.765-2.43-4.512-2.988-.859-.275-1.67-.423-2.55-.333-1.089.112-2.204.23-3.242-.223-1.463-.634-2.512-1.876-3.832-2.68a4.8 4.8 0 0 0-.994-.453l.002-.004c-1.4-.579-3.22-.387-4.534.513-.66.433-1.169 1.063-1.536 1.743-.36.682-.615 1.435-.682 2.218-.135 1.559.296 3.135 1.133 4.46.772 1.188 1.835 2.236 3.098 2.919-.052.32-.094.644-.11.975-.269 5.424 3.997 10.034 9.529 10.298 3.873.185 7.593-1.91 9.384-5.284.92-1.732 1.267-3.775 1.064-5.763"/><path fill="#FFF1D6" d="M308.687 83.2c-4.387-.064-6.085 3.625-6.085 3.625l-.243 1.299-.194 1.152v.16l-.02-.036-.544 3.214c-.748 4.432 2.073 8.83 6.49 9.649 4.475.827 8.746-2.174 9.502-6.65l.664-3.938v-.008s1.25-7.719-9.57-8.466"/><path fill="#1A55B5" d="M310.943 82.552c1.078.165 2.16.46 3.174.857.76.299 1.492.672 2.11 1.211 2.013 1.756.22 5.52-.473 7.482-.169.48-.367 1.05-.065 1.46.327.444 1.053.364 1.476.01.424-.352.645-.883.929-1.355s.708-.934 1.258-.97l-.32-8.91c-.003-.065-5.608-.187-6.038-.202-.869-.029-2.051.417-2.051.417"/><g transform="translate(179.537 121.6)"><mask id="f" fill="#fff"><use xlink:href="#e"/></mask><path fill="#07D1BD" d="M63.706 0c1.05 0 2.1 1.062 2.1 2.124v7.083c0 1.063-1.05 2.125-2.1 2.125h-.7c-1.05 0-2.1-1.062-2.1-2.125V2.124c0-1.062 1.05-2.124 2.1-2.124zm13.655 5.666.348.355c.7.707.7 2.124 0 2.833l-4.9 5.31c-.7.71-2.1.71-2.8 0l-.35-.353c-.7-.708-.7-2.124 0-2.833l4.9-5.31c.701-.71 2.1-.71 2.8 0zm4.2 9.208c1.05 0 2.1.708 2.449 1.77v.709c.35 1.062-.35 2.124-1.75 2.48l-7 1.415c-1.05.355-2.1-.354-2.45-1.77v-.71c-.35-1.062.349-2.124 1.75-2.477zM56.766 33.32c-1.4-1.062-3.15-.707-4.201.709L36.112 55.986l-9.8-9.917c-1.4-1.062-3.501-1.062-4.551 0-1.05 1.417-1.05 3.542 0 4.604l12.252 12.396c.35.708 1.4 1.062 2.1 1.062 1.05 0 2.1-.354 2.8-1.418L57.467 37.57c1.05-1.415.698-3.186-.7-4.248zM39.554 8.5c21.703 0 39.556 18.061 39.556 40.018 0 21.956-17.853 40.016-39.556 40.016S0 70.473 0 48.517s17.853-40.02 39.554-40.02z" mask="url(#f)"/></g><path stroke="#A4AAB9" stroke-linecap="square" d="M1 269.472h488"/></g></svg>
\ No newline at end of file
diff --git a/svgo/svgo.config.cjs b/svgo/svgo.config.cjs
index fdf6d82d..0a233e08 100644
--- a/svgo/svgo.config.cjs
+++ b/svgo/svgo.config.cjs
@@ -16,12 +16,12 @@ module.exports = {
removeHeight: true,
},
},
- {
- name: "removeAttrs",
- params: {
- attrs: "(fill|stroke)", // 移除所有 fill 和 stroke 属性
- },
- },
+ // {
+ // name: "removeAttrs",
+ // params: {
+ // attrs: "(fill|stroke)", // 移除所有 fill 和 stroke 属性
+ // },
+ // },
// 显式添加或配置常用插件
"removeDoctype", // 移除 <!DOCTYPE> 声明
"removeXMLProcInst", // 移除 XML 处理指令
@@ -30,7 +30,7 @@ module.exports = {
"removeTitle", // 移除 <title> 元素
"removeDesc", // 移除 <desc> 元素（描述）
"removeUselessDefs", // 移除无用的 <defs> 内容
- "removeXMLNS", // 移除 xmlns 属性（如果不需要）
+ // "removeXMLNS", // 移除 xmlns 属性（如果不需要）
"removeEditorsNSData", // 移除编辑器生成的无用数据（如 Adobe Illustrator 的元数据）
"cleanupNumericValues", // 清理数值，如将 1.000 改为 1
"convertColors", // 将颜色值转换为最短形式（如 #ff0000 -> #f00）
--
Gitee
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svgo/svgo.config.cjs b/svgo/svgo.config.cjs
new file mode 100644
index 00000000..fdf6d82d
--- /dev/null
+++ b/svgo/svgo.config.cjs
@@ -0,0 +1,47 @@
+// svgo.config.cjs
+module.exports = {
+ plugins: [
+ // 预设：包含一组常用的默认优化插件
+ "preset-default",
+
+ // 移除或自定义默认预设中的特定插件行为
+ {
+ name: "removeViewBox",
+ active: false, // 如果你的项目需要保留 viewBox，可以禁用此插件
+ },
+ {
+ name: "removeDimensions",
+ params: {
+ removeWidth: true,
+ removeHeight: true,
+ },
+ },
+ {
+ name: "removeAttrs",
+ params: {
+ attrs: "(fill|stroke)", // 移除所有 fill 和 stroke 属性
+ },
+ },
+ // 显式添加或配置常用插件
+ "removeDoctype", // 移除 声明
+ "removeXMLProcInst", // 移除 XML 处理指令
+ "removeComments", // 移除注释
+ "removeMetadata", // 移除
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+