diff --git a/code/web/task_schedule/src/layout/components/Aside.vue b/code/web/task_schedule/src/layout/components/Aside.vue index 0432919..f6833a4 100644 --- a/code/web/task_schedule/src/layout/components/Aside.vue +++ b/code/web/task_schedule/src/layout/components/Aside.vue @@ -78,14 +78,25 @@ // @ts-expect-error 之后再补充类型文件 import { hasOnlyChild } from "@/router/index.js"; import { useRoute, useRouter } from "vue-router"; +// import { useRoute, useRouter, type RouteRecordNormalized, type _RouteRecordBase } from "vue-router"; import { computed } from "vue"; +// declare interface SideBarRouteRecordNormalized extends RouteRecordNormalized +// { +// hidden?: boolean; +// } + +// declare interface SideBarRouteRecordSingleView extends _RouteRecordBase +// { + +// } + export default { name: "LayoutAside", setup() { const router = useRouter(); - const routes = router.getRoutes(); + const routes = router.getRoutes();// as SideBarRouteRecordNormalized[]; const currentPath = computed(() => { diff --git a/code/web/task_schedule/src/router/index.d.ts b/code/web/task_schedule/src/router/index.d.ts new file mode 100644 index 0000000..ff7c62f --- /dev/null +++ b/code/web/task_schedule/src/router/index.d.ts @@ -0,0 +1,20 @@ +/* + * @Author: Kane + * @Date: 2023-03-26 23:30:16 + * @LastEditors: Kane + * @FilePath: /task_schedule/src/router/index.d.ts + * @Description: + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ +import { type RouteRecordNormalized, type RouteRecordRaw } from "vue-router"; + +export declare interface SideBarRouteRecordNormalized extends RouteRecordNormalized +{ + hidden?: boolean; +} + +export declare let route: SideBarRouteRecordNormalized; + +// export declare interface SideBarRouteRecordRaw extends RouteRecordRaw +// {} diff --git a/code/web/task_schedule/tsconfig.json b/code/web/task_schedule/tsconfig.json index 50fc3d9..5db43a8 100644 --- a/code/web/task_schedule/tsconfig.json +++ b/code/web/task_schedule/tsconfig.json @@ -38,8 +38,7 @@ "src/**/*.tsx", "src/**/*.vue", "*.d.ts", - "src/router/index.ts", - "src/router/index.ts", + "src/router/index.d.ts", ], "exclude": [ "./node_modules", diff --git a/code/后端/desktop_archievement_backend/.prettierrc.js b/code/后端/desktop_archievement_backend/.prettierrc.js new file mode 100644 index 0000000..46338f6 --- /dev/null +++ b/code/后端/desktop_archievement_backend/.prettierrc.js @@ -0,0 +1,29 @@ +/* + * @Author: Kane + * @Date: 2023-03-26 21:08:27 + * @LastEditors: Kane + * @FilePath: /desktop_archievement_backend/.prettierrc.js + * @Description: + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ +module.exports = { + printWidth: 80, //单行长度 + tabWidth: 4, //缩进长度 + useTabs: false, //使用空格代替tab缩进 + semi: true, //句末使用分号 + singleQuote: false, //使用单引号 + quoteProps: 'as-needed', //仅在必需时为对象的key添加引号 + jsxSingleQuote: true, // jsx中使用单引号 + trailingComma: 'all', //多行时尽可能打印尾随逗号 + bracketSpacing: true, //在对象前后添加空格-eg: { foo: bar } + jsxBracketSameLine: true, //多属性html标签的‘>’折行放置 + arrowParens: 'always', //单参数箭头函数参数周围使用圆括号-eg: (x) => x + requirePragma: false, //无需顶部注释即可格式化 + insertPragma: false, //在已被preitter格式化的文件顶部加上标注 + proseWrap: 'preserve', //不知道怎么翻译 + htmlWhitespaceSensitivity: 'ignore', //对HTML全局空白不敏感 + vueIndentScriptAndStyle: false, //不对vue中的script及style标签缩进 + endOfLine: 'lf', //结束行形式 + embeddedLanguageFormatting: 'auto', //对引用代码进行格式化 + }; \ No newline at end of file diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/CpicXIMStaffInfo.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/CpicXIMStaffInfo.java index 19c88cd..6444568 100644 --- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/CpicXIMStaffInfo.java +++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/CpicXIMStaffInfo.java @@ -2,20 +2,20 @@ * @Author: Kane * @Date: 2022-12-15 14:08:28 * @LastEditors: Kane - * @LastEditTime: 2023-02-28 23:24:07 + * @LastEditTime: 2023-03-26 22:26:21 * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/utils/account/CpicXIMStaffInfo.java * @Description: 产险厦门分公司员工信息对象 - * - * Copyright (c) ${2022} by Kane, All Rights Reserved. + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. */ package com.cpic.xim.utils.account; +import com.fasterxml.jackson.annotation.JsonProperty; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import com.fasterxml.jackson.annotation.JsonProperty; /***************************************************** * 厦门太保员工信息 @@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; *****************************************************/ public class CpicXIMStaffInfo { + /***************************************************** * 查询员工信息 * @param uidOrCode p13账号或p09账号 diff --git a/文档/团队.xlsx b/文档/团队.xlsx index ad95bee..d79bd9d 100644 Binary files a/文档/团队.xlsx and b/文档/团队.xlsx differ