From 1b0f414ba1017c56681091f16dafbf90815f0e0c Mon Sep 17 00:00:00 2001 From: lixiaolong <702156524@qq.com> Date: Tue, 28 Jul 2026 16:26:07 +0800 Subject: [PATCH 1/8] feat: migrate frontend to Vue 3 --- .env.development | 30 +- .env.production | 9 +- .env.staging | 7 +- .github/FUNDING.yml | 1 + .gitignore | 3 - README.md | 126 +- bin/build.bat | 12 + bin/package.bat | 12 + bin/run-web.bat | 12 + index.html | 2 +- package.json | 50 +- pnpm-lock.yaml | 5965 +++++++++++++++++ pnpm-workspace.yaml | 6 + src/api/device/flow.js | 140 +- src/api/login.js | 9 + src/api/system/dept.js | 9 + src/api/system/menu.js | 9 + src/api/system/notice.js | 37 +- src/api/system/user.js | 2 +- src/assets/icons/svg/bell.svg | 1 + src/assets/icons/svg/enter.svg | 1 + src/assets/icons/svg/language.svg | 2 +- src/assets/icons/svg/more-up.svg | 1 + src/assets/icons/svg/size.svg | 2 +- src/assets/styles/btn.scss | 2 +- src/assets/styles/index.scss | 15 +- src/assets/styles/legacy-layout.scss | 6 + src/assets/styles/sidebar.scss | 2 + src/assets/styles/variables.module.scss | 572 +- src/components/Breadcrumb/index.vue | 2 +- src/components/Crontab/day.vue | 2 +- src/components/Crontab/hour.vue | 6 +- src/components/Crontab/index.vue | 74 +- src/components/Crontab/min.vue | 2 +- src/components/Crontab/month.vue | 2 +- src/components/Crontab/result.vue | 376 +- src/components/Crontab/second.vue | 2 +- src/components/Crontab/week.vue | 2 +- src/components/Crontab/year.vue | 34 +- src/components/DictTag/index.vue | 29 +- src/components/Editor/index.vue | 99 +- src/components/ExcelImportDialog/index.vue | 137 + src/components/FileUpload/index.vue | 464 +- src/components/Hamburger/index.vue | 2 +- src/components/HeaderSearch/index.vue | 225 +- src/components/IconSelect/index.vue | 10 +- src/components/IconSelect/requireIcons.js | 6 +- src/components/ImagePreview/index.vue | 34 +- src/components/ImageUpload/index.vue | 176 +- src/components/Pagination/index.vue | 7 +- src/components/RightToolbar/index.vue | 179 +- src/components/RuoYi/Doc/index.vue | 2 +- src/components/RuoYi/Git/index.vue | 2 +- src/components/Screenfull/index.vue | 4 +- src/components/SizeSelect/index.vue | 20 +- src/components/SvgIcon/index.vue | 43 +- src/components/SvgIcon/svgicon.js | 14 +- src/components/TableSearch/index.vue | 138 +- src/components/TreePanel/index.vue | 756 +++ src/components/iFrame/index.vue | 8 +- src/directive/common/copyText.js | 57 +- src/directive/permission/hasPermi.js | 3 +- src/directive/permission/hasRole.js | 3 +- src/layout/components/AppMain.vue | 7 +- src/layout/components/Copyright/index.vue | 31 + .../components/HeaderNotice/DetailView.vue | 326 + src/layout/components/HeaderNotice/index.vue | 184 + src/layout/components/IframeToggle/index.vue | 14 +- src/layout/components/InnerLink/index.vue | 17 +- src/layout/components/Navbar.vue | 482 +- src/layout/components/Settings/index.vue | 145 +- src/layout/components/Sidebar/Link.vue | 27 +- src/layout/components/Sidebar/Logo.vue | 26 +- src/layout/components/Sidebar/SidebarItem.vue | 12 +- src/layout/components/Sidebar/index.vue | 34 +- src/layout/components/TagsView/index.vue | 2 +- src/layout/components/TopBar/index.vue | 99 + src/layout/components/TopNav/index.vue | 220 + src/layout/index.vue | 27 +- src/main.js | 25 +- src/permission.js | 154 +- src/plugins/auth.js | 8 +- src/plugins/cache.js | 4 +- src/plugins/download.js | 28 +- src/plugins/modal.js | 6 +- src/plugins/tab.js | 144 +- src/plugins/websocket.js | 3 +- src/router/index.js | 21 +- src/settings.js | 34 +- src/store/index.js | 2 +- src/store/modules/app.js | 4 +- src/store/modules/dict.js | 20 +- src/store/modules/flow.js | 44 +- src/store/modules/lock.js | 27 + src/store/modules/permission.js | 35 +- src/store/modules/settings.js | 13 +- src/store/modules/tagsView.js | 44 + src/store/modules/user.js | 20 + src/utils/dict.js | 12 +- src/utils/dynamicTitle.js | 7 +- src/utils/flow.js | 832 +-- src/utils/generator/drawingDefault.js | 37 + src/utils/generator/html.js | 4 +- src/utils/index.js | 814 +-- src/utils/passwordRule.js | 73 + src/utils/permission.js | 4 +- src/utils/request.js | 305 +- src/utils/ruoyi.js | 150 +- src/utils/scroll-to.js | 6 +- src/utils/theme.js | 75 +- src/utils/validate.js | 7 +- .../corpusManger/speech_synthesis/index.vue | 8 +- src/views/device/console/index.vue | 7 + src/views/device/profile/index.vue | 1016 +-- .../components/DexHand/LeftTopHand.vue | 4 +- src/views/device/terminal/index.vue | 632 +- src/views/error/401.vue | 10 +- .../flow/components/FormItemRecursive.vue | 440 +- src/views/flow/components/NodeState.vue | 352 +- src/views/flow/components/NodeTitle.vue | 542 +- src/views/flow/components/OuterNode.vue | 84 +- src/views/flow/components/TestRun.vue | 290 +- src/views/flow/config.js | 1588 ++--- src/views/flow/index.vue | 1912 +++--- src/views/flow/nodes/common/endNode.vue | 490 +- src/views/flow/nodes/common/serviceNode.vue | 288 +- src/views/flow/nodes/common/startNode.js | 406 +- src/views/flow/nodes/common/startNode.vue | 314 +- src/views/flow/nodes/function/httpNode.js | 426 +- src/views/flow/nodes/function/httpNode.vue | 282 +- src/views/flow/nodes/function/loop.js | 586 +- src/views/flow/nodes/function/loop.vue | 232 +- src/views/flow/nodes/function/sdAgent.js | 426 +- src/views/flow/nodes/function/sdAgent.vue | 248 +- src/views/flow/nodes/function/sleep.js | 426 +- src/views/flow/nodes/function/sleep.vue | 250 +- src/views/flow/nodes/function/stopLoop.js | 382 +- src/views/flow/nodes/function/stopLoop.vue | 392 +- src/views/flow/nodes/function/subEnd.js | 372 +- src/views/flow/nodes/function/subStart.js | 370 +- src/views/flow/nodes/function/switch.js | 636 +- src/views/flow/nodes/function/switch.vue | 1284 ++-- src/views/index.vue | 11 +- src/views/lock.vue | 374 ++ src/views/login.vue | 475 +- src/views/monitor/cache/index.vue | 34 +- src/views/monitor/cache/list.vue | 74 +- src/views/monitor/druid/index.vue | 4 +- src/views/monitor/job/detail.vue | 217 + src/views/monitor/job/index.vue | 240 +- src/views/monitor/job/log.vue | 130 +- src/views/monitor/logininfor/index.vue | 94 +- src/views/monitor/online/index.vue | 46 +- src/views/monitor/operlog/detail.vue | 152 + src/views/monitor/operlog/index.vue | 148 +- src/views/monitor/server/index.vue | 16 +- src/views/redirect/index.vue | 6 +- src/views/register.vue | 66 +- src/views/system/config/index.vue | 118 +- src/views/system/dept/index.vue | 163 +- src/views/system/dict/data.vue | 148 +- src/views/system/dict/detail.vue | 202 + src/views/system/dict/index.vue | 766 +-- src/views/system/menu/index.vue | 969 +-- src/views/system/notice/ReadUsers.vue | 118 + src/views/system/notice/index.vue | 132 +- src/views/system/post/index.vue | 114 +- src/views/system/role/authUser.vue | 76 +- src/views/system/role/index.vue | 1177 ++-- src/views/system/role/selectUser.vue | 62 +- src/views/system/user/authRole.vue | 83 +- src/views/system/user/index.vue | 1006 ++- src/views/system/user/profile/index.vue | 33 +- src/views/system/user/profile/resetPwd.vue | 57 +- src/views/system/user/profile/userAvatar.vue | 70 +- src/views/system/user/profile/userInfo.vue | 32 +- src/views/system/user/view.vue | 175 + src/views/test/configs/Run.vue | 344 +- src/views/test/configs/index.vue | 1392 ++-- src/views/test/detect/index.vue | 954 +-- src/views/test/history/index.vue | 7 + src/views/test/log/index.vue | 900 +-- src/views/tool/build/CodeTypeDialog.vue | 2 +- src/views/tool/build/DraggableItem.vue | 4 +- src/views/tool/build/RightPanel.vue | 26 +- src/views/tool/build/index.vue | 17 +- src/views/tool/gen/basicInfoForm.vue | 4 +- src/views/tool/gen/createTable.vue | 28 +- src/views/tool/gen/editTable.vue | 108 +- src/views/tool/gen/genInfoForm.vue | 66 +- src/views/tool/gen/importTable.vue | 56 +- src/views/tool/gen/index.vue | 171 +- src/views/tool/swagger/index.vue | 2 +- vite.config.js | 169 +- vite/plugins/auto-import.js | 20 +- vite/plugins/compression.js | 46 +- vite/plugins/index.js | 49 +- vite/plugins/setup-extend.js | 2 +- vite/plugins/svg-icon.js | 10 +- 199 files changed, 25475 insertions(+), 15765 deletions(-) create mode 100644 .github/FUNDING.yml create mode 100644 bin/build.bat create mode 100644 bin/package.bat create mode 100644 bin/run-web.bat create mode 100644 pnpm-lock.yaml create mode 100644 pnpm-workspace.yaml create mode 100644 src/assets/icons/svg/bell.svg create mode 100644 src/assets/icons/svg/enter.svg create mode 100644 src/assets/icons/svg/more-up.svg create mode 100644 src/assets/styles/legacy-layout.scss create mode 100644 src/components/ExcelImportDialog/index.vue create mode 100644 src/components/TreePanel/index.vue create mode 100644 src/layout/components/Copyright/index.vue create mode 100644 src/layout/components/HeaderNotice/DetailView.vue create mode 100644 src/layout/components/HeaderNotice/index.vue create mode 100644 src/layout/components/TopBar/index.vue create mode 100644 src/layout/components/TopNav/index.vue create mode 100644 src/store/modules/lock.js create mode 100644 src/utils/generator/drawingDefault.js create mode 100644 src/utils/passwordRule.js create mode 100644 src/views/device/console/index.vue create mode 100644 src/views/lock.vue create mode 100644 src/views/monitor/job/detail.vue create mode 100644 src/views/monitor/operlog/detail.vue create mode 100644 src/views/system/dict/detail.vue create mode 100644 src/views/system/notice/ReadUsers.vue create mode 100644 src/views/system/user/view.vue create mode 100644 src/views/test/history/index.vue diff --git a/.env.development b/.env.development index 00b76f7..ab0a6cc 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,14 @@ -# 页面标题 -VITE_APP_TITLE = 招商车研AI测评机器人模拟测试平台 - -# 开发环境配置 -VITE_APP_ENV = 'development' - -# 招商车研物联网平台/开发环境 -VITE_APP_BASE_API = '/dev-api' - -VITE_API_URL = http://192.168.0.222:13080 -VITE_WS_URL = ws://192.168.0.222:13080/ws - -# explanation -VITE_INSPECTION_TYPE = "inspection" - -VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" \ No newline at end of file +# 页面标题 +VITE_APP_TITLE = 招商车研物联网平台管理系统 + +# 开发环境配置 +VITE_APP_ENV = 'development' + +# 招商车研物联网平台/开发环境 +VITE_APP_BASE_API = '/dev-api' + +VITE_API_URL = http://localhost:13080 +VITE_WS_URL = ws://localhost:13080/ws +VITE_PORT = 80 +VITE_INSPECTION_TYPE = "inspection" +VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" diff --git a/.env.production b/.env.production index 4ce673e..e225bbc 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 智能座舱测评AI机器人 +VITE_APP_TITLE = 招商车研物联网平台管理系统 # 生产环境配置 VITE_APP_ENV = 'production' @@ -10,13 +10,8 @@ VITE_APP_BASE_API = '/prod-api' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip -#node-red 服务地址 VITE_NODE_RED_URL = 'http://10.148.108.59:13080' - VITE_API_URL = http://192.168.28.10:13080 VITE_WS_URL = ws://192.168.0.201:13080/ws - -# explanation VITE_INSPECTION_TYPE = "inspection" - -VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" \ No newline at end of file +VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" diff --git a/.env.staging b/.env.staging index 66d8d56..95b7291 100644 --- a/.env.staging +++ b/.env.staging @@ -4,10 +4,13 @@ VITE_APP_TITLE = 招商车研物联网平台管理系统 # 生产环境配置 VITE_APP_ENV = 'staging' -# 招商车研物联网平台管理系统/生产环境 +# 招商车研物联网平台/测试环境 VITE_APP_BASE_API = '/stage-api' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip + VITE_API_URL = http://10.148.121.100:13080 -VITE_WS_URL = ws://192.168.0.201:13080/ws \ No newline at end of file +VITE_WS_URL = ws://192.168.0.201:13080/ws +VITE_INSPECTION_TYPE = "inspection" +VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..fbcab77 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html diff --git a/.gitignore b/.gitignore index 57a04df..78a752d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,6 @@ selenium-debug.log *.njsproj *.sln *.local -.history package-lock.json yarn.lock -bin/ -pnpm-lock.yaml diff --git a/README.md b/README.md index 5e715c1..c8ef97e 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,103 @@ +# CMVR IoT 管理控制台 -## 前端运行 +招商车研物联网平台 Vue 3 管理端。项目以 RuoYi-Vue3 3.9.2 为新版基础框架，完整迁移原 `cmvr-iot-ui` 的业务页面、API、机器人模型和运行配置，并连接 `RuoYi-Vue-master` 中的 Spring Boot 4 后端。 + +旧前端仅作为迁移来源，不参与本项目构建。 + +## 功能范围 + +- 系统管理：用户、角色、部门、岗位、菜单、字典、参数、通知和文件。 +- 系统监控：在线用户、操作日志、登录日志、缓存、服务、Quartz 和 Druid。 +- 设备管理：设备注册、终端、机器人、相机、机械臂、灵巧手、机器人头部、麦克风、扬声器和电机。 +- 测试平台：测试项目、任务配置、任务编排、检测项、任务实例和执行流程。 +- 智能巡检：机器人、地图、点位、任务、执行实例、巡检结果、告警和驾驶舱。 +- 交互评价：语音交互、触控交互、评价指标、方案、项目和语料。 +- 智能座舱：车机界面、车辆配置、功能配置、流程编辑和执行评价。 +- 语料与媒体：语料管理、音频上传、图片预览、视频播放和 WebSocket 实时消息。 +- 开发工具：代码生成、表单构建和 Knife4j 接口文档。 + +## 技术栈 + +| 组件 | 版本 | +| --- | --- | +| Vue | 3.5.26 | +| Vite | 6.4.1 | +| Element Plus | 2.13.1 | +| Pinia | 3.0.4 | +| Vue Router | 4.6.4 | +| 可视化 | ECharts、LogicFlow、Three.js、Monaco Editor、XGPlayer | + +## 环境要求 + +- Node.js 20 LTS +- pnpm 10 +- 后端 `RuoYi-Vue-master/cmvr-iot-admin` + +## 开发运行 + +先启动后端，确认 `http://localhost:13080` 可以访问，然后执行： ```bash -# 安装依赖 -yarn --registry=https://registry.npmmirror.com - -# 启动服务 -yarn dev - -# 构建测试环境 yarn build:stage -# 构建生产环境 yarn build:prod -# 前端访问地址 http://localhost:80 +pnpm install +pnpm dev ``` -## 内置功能 +默认地址： + +- 前端：`http://localhost:80` +- 后端：`http://localhost:13080` +- Knife4j：`http://localhost:13080/doc.html` + +开发配置位于 `.env.development`： + +```dotenv +VITE_APP_TITLE=招商车研物联网平台管理系统 +VITE_APP_BASE_API=/dev-api +VITE_API_URL=http://localhost:13080 +VITE_WS_URL=ws://localhost:13080/ws +VITE_PORT=80 +``` + +## 构建 + +```bash +pnpm build:dev +pnpm build:stage +pnpm build:prod +pnpm preview +``` + +生产构建输出到 `dist`。部署时需要由 Nginx 或网关转发 `/prod-api`，并支持 `/ws` WebSocket、文件上传和媒体请求。 + +## 目录说明 + +```text +public/models 机器人 URDF 和网格模型 +public/inspection 巡检机械臂模型 +src/adapters URDF/Xacro 模型适配 +src/api REST API 封装 +src/components 公共及业务组件 +src/router 公共路由和隐藏业务路由 +src/store Pinia 状态管理 +src/views/device 设备管理与设备控制 +src/views/test 测试业务 +src/views/flow 流程编排 +src/views/inspection 智能巡检 +src/views/evaluate 评价管理 +src/views/vi 语音交互 +src/views/is 智能座舱 +src/views/corpusManger 语料管理 +``` + +业务菜单由后端 `/getRouters` 动态返回。数据库菜单中的 `component` 必须与 `src/views` 下的实际页面路径一致，权限字符必须与后端控制器保持一致。 + +## 配置说明 + +- `.env.development`：本地开发地址。 +- `.env.staging`：测试环境地址。 +- `.env.production`：生产环境地址、Node-RED 和 MinIO。 +- `vite.config.js`：代理、端口、Monaco 和构建分包。 +- `src/settings.js`：布局、页签和版权配置。 + +生产密码、访问密钥和内部网络配置应通过部署环境注入，不要提交新的敏感信息。 -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -10. 登录日志：系统登录日志记录查询包含登录异常。 -11. 在线用户：当前系统中活跃用户状态监控。 -12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 -13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 -14. 系统接口：根据业务代码自动生成相关的api接口文档。 -15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 -16. 缓存监控：对系统的缓存信息查询，命令统计等。 -17. 在线构建器：拖动表单元素生成相应的HTML代码。 -18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 diff --git a/bin/build.bat b/bin/build.bat new file mode 100644 index 0000000..ecbb454 --- /dev/null +++ b/bin/build.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] Weḅdistļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn build:prod + +pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat new file mode 100644 index 0000000..f5b24e0 --- /dev/null +++ b/bin/package.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] װWeḅnode_modulesļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn --registry=https://registry.npmmirror.com + +pause \ No newline at end of file diff --git a/bin/run-web.bat b/bin/run-web.bat new file mode 100644 index 0000000..d2fe397 --- /dev/null +++ b/bin/run-web.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] ʹ Vite Web ̡ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn dev + +pause \ No newline at end of file diff --git a/index.html b/index.html index ceebf89..17457d3 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - 招商车研物联网平台管理系统 + %VITE_APP_TITLE% + \ No newline at end of file diff --git a/src/components/Crontab/day.vue b/src/components/Crontab/day.vue index 8f67324..39263f5 100644 --- a/src/components/Crontab/day.vue +++ b/src/components/Crontab/day.vue @@ -171,4 +171,4 @@ function onRadioChange() { .el-select, .el-select--small { width: 18.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue index c6f9a13..db77835 100644 --- a/src/components/Crontab/hour.vue +++ b/src/components/Crontab/hour.vue @@ -78,10 +78,10 @@ watch(() => props.cron.hour, value => changeRadioValue(value)) watch([radioValue, cycleTotal, averageTotal, checkboxString], () => onRadioChange()) function changeRadioValue(value) { if (props.cron.min === '*') { - emit('update', 'min', '0', 'hour'); + emit('update', 'min', '0', 'hour') } if (props.cron.second === '*') { - emit('update', 'second', '0', 'hour'); + emit('update', 'second', '0', 'hour') } if (value === '*') { radioValue.value = 1 @@ -130,4 +130,4 @@ function onRadioChange() { .el-select, .el-select--small { width: 18.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue index ef0fe97..cbb41ab 100644 --- a/src/components/Crontab/index.vue +++ b/src/components/Crontab/index.vue @@ -70,42 +70,46 @@

时间表达式

- - + + + + - - - - - - - - + + + + + + + + + +
{{item}}Cron 表达式
{{item}}Cron 表达式
- {{crontabValueObj.second}} - {{crontabValueObj.second}} - - {{crontabValueObj.min}} - {{crontabValueObj.min}} - - {{crontabValueObj.hour}} - {{crontabValueObj.hour}} - - {{crontabValueObj.day}} - {{crontabValueObj.day}} - - {{crontabValueObj.month}} - {{crontabValueObj.month}} - - {{crontabValueObj.week}} - {{crontabValueObj.week}} - - {{crontabValueObj.year}} - {{crontabValueObj.year}} - - {{crontabValueString}} - {{crontabValueString}} -
+ {{crontabValueObj.second}} + {{crontabValueObj.second}} + + {{crontabValueObj.min}} + {{crontabValueObj.min}} + + {{crontabValueObj.hour}} + {{crontabValueObj.hour}} + + {{crontabValueObj.day}} + {{crontabValueObj.day}} + + {{crontabValueObj.month}} + {{crontabValueObj.month}} + + {{crontabValueObj.week}} + {{crontabValueObj.week}} + + {{crontabValueObj.year}} + {{crontabValueObj.year}} + + {{crontabValueString}} + {{crontabValueString}} +
@@ -306,4 +310,4 @@ onMounted(() => { height: 10em; overflow-y: auto; } - + \ No newline at end of file diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue index 21de620..65f0946 100644 --- a/src/components/Crontab/min.vue +++ b/src/components/Crontab/min.vue @@ -123,4 +123,4 @@ function onRadioChange() { .el-select, .el-select--small { width: 19.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue index 45e9d0f..e561ba4 100644 --- a/src/components/Crontab/month.vue +++ b/src/components/Crontab/month.vue @@ -138,4 +138,4 @@ function onRadioChange() { .el-select, .el-select--small { width: 18.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/result.vue b/src/components/Crontab/result.vue index 0c18922..cbb49ba 100644 --- a/src/components/Crontab/result.vue +++ b/src/components/Crontab/result.vue @@ -26,289 +26,289 @@ watch(() => props.ex, () => expressionChange()) // 表达式值变化时，开始去计算结果 function expressionChange() { // 计算开始-隐藏结果 - isShow.value = false; + isShow.value = false // 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年] - let ruleArr = props.ex.split(' '); + let ruleArr = props.ex.split(' ') // 用于记录进入循环的次数 - let nums = 0; + let nums = 0 // 用于暂时存符号时间规则结果的数组 - let resultArr = []; + let resultArr = [] // 获取当前时间精确至[年、月、日、时、分、秒] - let nTime = new Date(); - let nYear = nTime.getFullYear(); - let nMonth = nTime.getMonth() + 1; - let nDay = nTime.getDate(); - let nHour = nTime.getHours(); - let nMin = nTime.getMinutes(); - let nSecond = nTime.getSeconds(); + let nTime = new Date() + let nYear = nTime.getFullYear() + let nMonth = nTime.getMonth() + 1 + let nDay = nTime.getDate() + let nHour = nTime.getHours() + let nMin = nTime.getMinutes() + let nSecond = nTime.getSeconds() // 根据规则获取到近100年可能年数组、月数组等等 - getSecondArr(ruleArr[0]); - getMinArr(ruleArr[1]); - getHourArr(ruleArr[2]); - getDayArr(ruleArr[3]); - getMonthArr(ruleArr[4]); - getWeekArr(ruleArr[5]); - getYearArr(ruleArr[6], nYear); + getSecondArr(ruleArr[0]) + getMinArr(ruleArr[1]) + getHourArr(ruleArr[2]) + getDayArr(ruleArr[3]) + getMonthArr(ruleArr[4]) + getWeekArr(ruleArr[5]) + getYearArr(ruleArr[6], nYear) // 将获取到的数组赋值-方便使用 - let sDate = dateArr.value[0]; - let mDate = dateArr.value[1]; - let hDate = dateArr.value[2]; - let DDate = dateArr.value[3]; - let MDate = dateArr.value[4]; - let YDate = dateArr.value[5]; + let sDate = dateArr.value[0] + let mDate = dateArr.value[1] + let hDate = dateArr.value[2] + let DDate = dateArr.value[3] + let MDate = dateArr.value[4] + let YDate = dateArr.value[5] // 获取当前时间在数组中的索引 - let sIdx = getIndex(sDate, nSecond); - let mIdx = getIndex(mDate, nMin); - let hIdx = getIndex(hDate, nHour); - let DIdx = getIndex(DDate, nDay); - let MIdx = getIndex(MDate, nMonth); - let YIdx = getIndex(YDate, nYear); + let sIdx = getIndex(sDate, nSecond) + let mIdx = getIndex(mDate, nMin) + let hIdx = getIndex(hDate, nHour) + let DIdx = getIndex(DDate, nDay) + let MIdx = getIndex(MDate, nMonth) + let YIdx = getIndex(YDate, nYear) // 重置月日时分秒的函数(后面用的比较多) const resetSecond = function () { - sIdx = 0; + sIdx = 0 nSecond = sDate[sIdx] } const resetMin = function () { - mIdx = 0; + mIdx = 0 nMin = mDate[mIdx] - resetSecond(); + resetSecond() } const resetHour = function () { - hIdx = 0; + hIdx = 0 nHour = hDate[hIdx] - resetMin(); + resetMin() } const resetDay = function () { - DIdx = 0; + DIdx = 0 nDay = DDate[DIdx] - resetHour(); + resetHour() } const resetMonth = function () { - MIdx = 0; + MIdx = 0 nMonth = MDate[MIdx] - resetDay(); + resetDay() } // 如果当前年份不为数组中当前值 if (nYear !== YDate[YIdx]) { - resetMonth(); + resetMonth() } // 如果当前月份不为数组中当前值 if (nMonth !== MDate[MIdx]) { - resetDay(); + resetDay() } // 如果当前“日”不为数组中当前值 if (nDay !== DDate[DIdx]) { - resetHour(); + resetHour() } // 如果当前“时”不为数组中当前值 if (nHour !== hDate[hIdx]) { - resetMin(); + resetMin() } // 如果当前“分”不为数组中当前值 if (nMin !== mDate[mIdx]) { - resetSecond(); + resetSecond() } // 循环年份数组 goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) { - let YY = YDate[Yi]; + let YY = YDate[Yi] // 如果到达最大值时 if (nMonth > MDate[MDate.length - 1]) { - resetMonth(); - continue; + resetMonth() + continue } // 循环月份数组 goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) { // 赋值、方便后面运算 let MM = MDate[Mi]; - MM = MM < 10 ? '0' + MM : MM; + MM = MM < 10 ? '0' + MM : MM // 如果到达最大值时 if (nDay > DDate[DDate.length - 1]) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue; + continue } // 循环日期数组 goDay: for (let Di = DIdx; Di < DDate.length; Di++) { // 赋值、方便后面运算 - let DD = DDate[Di]; - let thisDD = DD < 10 ? '0' + DD : DD; + let DD = DDate[Di] + let thisDD = DD < 10 ? '0' + DD : DD // 如果到达最大值时 if (nHour > hDate[hDate.length - 1]) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue; + continue } // 判断日期的合法性，不合法的话也是跳出当前循环 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && dayRule.value !== 'workDay' && dayRule.value !== 'lastWeek' && dayRule.value !== 'lastDay') { - resetDay(); - continue goMonth; + resetDay() + continue goMonth } // 如果日期规则中有值时 if (dayRule.value === 'lastDay') { // 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } } else if (dayRule.value === 'workDay') { // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } // 获取达到条件的日期是星期X - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week') // 当星期日时 if (thisWeek === 1) { // 先找下一个日，并判断是否为月底 - DD++; - thisDD = DD < 10 ? '0' + DD : DD; + DD++ + thisDD = DD < 10 ? '0' + DD : DD // 判断下一日已经不是合法日期 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD -= 3; + DD -= 3 } } else if (thisWeek === 7) { // 当星期6时只需判断不是1号就可进行操作 if (dayRuleSup.value !== 1) { - DD--; + DD-- } else { - DD += 2; + DD += 2 } } } else if (dayRule.value === 'weekDay') { // 如果指定了是星期几 // 获取当前日期是属于星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week') // 校验当前星期是否在星期池（dayRuleSup）中 if (dayRuleSup.value.indexOf(thisWeek) < 0) { // 如果到达最大值时 if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue; + continue } } else if (dayRule.value === 'assWeek') { // 如果指定了是第几周的星期几 // 获取每月1号是属于星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week') if (dayRuleSup.value[1] >= thisWeek) { - DD = (dayRuleSup.value[0] - 1) * 7 + dayRuleSup.value[1] - thisWeek + 1; + DD = (dayRuleSup.value[0] - 1) * 7 + dayRuleSup.value[1] - thisWeek + 1 } else { - DD = dayRuleSup.value[0] * 7 + dayRuleSup.value[1] - thisWeek + 1; + DD = dayRuleSup.value[0] * 7 + dayRuleSup.value[1] - thisWeek + 1 } } else if (dayRule.value === 'lastWeek') { // 如果指定了每月最后一个星期几 // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { - DD--; - thisDD = DD < 10 ? '0' + DD : DD; + DD-- + thisDD = DD < 10 ? '0' + DD : DD } } // 获取月末最后一天是星期几 - let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); + let thisWeek = formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week') // 找到要求中最近的那个星期几 if (dayRuleSup.value < thisWeek) { - DD -= thisWeek - dayRuleSup.value; + DD -= thisWeek - dayRuleSup.value } else if (dayRuleSup.value > thisWeek) { DD -= 7 - (dayRuleSup.value - thisWeek) } } // 判断时间值是否小于10置换成“05”这种格式 - DD = DD < 10 ? '0' + DD : DD; + DD = DD < 10 ? '0' + DD : DD // 循环“时”数组 goHour: for (let hi = hIdx; hi < hDate.length; hi++) { let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi] // 如果到达最大值时 if (nMin > mDate[mDate.length - 1]) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue; + continue } // 循环"分"数组 goMin: for (let mi = mIdx; mi < mDate.length; mi++) { - let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]; + let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi] // 如果到达最大值时 if (nSecond > sDate[sDate.length - 1]) { - resetSecond(); + resetSecond() if (mi === mDate.length - 1) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue goHour; + continue goHour } - continue; + continue } // 循环"秒"数组 goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) { - let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si]; + let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si] // 添加当前时间（时间合法性在日期循环时已经判断） if (MM !== '00' && DD !== '00') { resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss) - nums++; + nums++ } // 如果条数满了就退出循环 - if (nums === 5) break goYear; + if (nums === 5) break goYear // 如果到达最大值时 if (si === sDate.length - 1) { - resetSecond(); + resetSecond() if (mi === mDate.length - 1) { - resetMin(); + resetMin() if (hi === hDate.length - 1) { - resetHour(); + resetHour() if (Di === DDate.length - 1) { - resetDay(); + resetDay() if (Mi === MDate.length - 1) { - resetMonth(); - continue goYear; + resetMonth() + continue goYear } - continue goMonth; + continue goMonth } - continue goDay; + continue goDay } - continue goHour; + continue goHour } - continue goMin; + continue goMin } } //goSecond } //goMin @@ -318,31 +318,31 @@ function expressionChange() { } // 判断100年内的结果条数 if (resultArr.length === 0) { - resultList.value = ['没有达到条件的结果！']; + resultList.value = ['没有达到条件的结果！'] } else { - resultList.value = resultArr; + resultList.value = resultArr if (resultArr.length !== 5) { resultList.value.push('最近100年内只有上面' + resultArr.length + '条结果！') } } // 计算完成-显示结果 - isShow.value = true; + isShow.value = true } // 用于计算某位数字在数组中的索引 function getIndex(arr, value) { if (value <= arr[0] || value > arr[arr.length - 1]) { - return 0; + return 0 } else { for (let i = 0; i < arr.length - 1; i++) { if (value > arr[i] && value <= arr[i + 1]) { - return i + 1; + return i + 1 } } } } // 获取"年"数组 function getYearArr(rule, year) { - dateArr.value[5] = getOrderArr(year, year + 100); + dateArr.value[5] = getOrderArr(year, year + 100) if (rule !== undefined) { if (rule.indexOf('-') >= 0) { dateArr.value[5] = getCycleArr(rule, year + 100, false) @@ -355,7 +355,7 @@ function getYearArr(rule, year) { } // 获取"月"数组 function getMonthArr(rule) { - dateArr.value[4] = getOrderArr(1, 12); + dateArr.value[4] = getOrderArr(1, 12) if (rule.indexOf('-') >= 0) { dateArr.value[4] = getCycleArr(rule, 12, false) } else if (rule.indexOf('/') >= 0) { @@ -369,58 +369,58 @@ function getWeekArr(rule) { // 只有当日期规则的两个值均为“”时则表达日期是有选项的 if (dayRule.value === '' && dayRuleSup.value === '') { if (rule.indexOf('-') >= 0) { - dayRule.value = 'weekDay'; + dayRule.value = 'weekDay' dayRuleSup.value = getCycleArr(rule, 7, false) } else if (rule.indexOf('#') >= 0) { - dayRule.value = 'assWeek'; - let matchRule = rule.match(/[0-9]{1}/g); - dayRuleSup.value = [Number(matchRule[1]), Number(matchRule[0])]; - dateArr.value[3] = [1]; + dayRule.value = 'assWeek' + let matchRule = rule.match(/[0-9]{1}/g) + dayRuleSup.value = [Number(matchRule[1]), Number(matchRule[0])] + dateArr.value[3] = [1] if (dayRuleSup.value[1] === 7) { - dayRuleSup.value[1] = 0; + dayRuleSup.value[1] = 0 } } else if (rule.indexOf('L') >= 0) { - dayRule.value = 'lastWeek'; - dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]); - dateArr.value[3] = [31]; + dayRule.value = 'lastWeek' + dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]) + dateArr.value[3] = [31] if (dayRuleSup.value === 7) { - dayRuleSup.value = 0; + dayRuleSup.value = 0 } } else if (rule !== '*' && rule !== '?') { - dayRule.value = 'weekDay'; + dayRule.value = 'weekDay' dayRuleSup.value = getAssignArr(rule) } } } // 获取"日"数组-少量为日期规则 function getDayArr(rule) { - dateArr.value[3] = getOrderArr(1, 31); - dayRule.value = ''; - dayRuleSup.value = ''; + dateArr.value[3] = getOrderArr(1, 31) + dayRule.value = '' + dayRuleSup.value = '' if (rule.indexOf('-') >= 0) { dateArr.value[3] = getCycleArr(rule, 31, false) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule.indexOf('/') >= 0) { dateArr.value[3] = getAverageArr(rule, 31) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule.indexOf('W') >= 0) { - dayRule.value = 'workDay'; - dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]); - dateArr.value[3] = [dayRuleSup.value]; + dayRule.value = 'workDay' + dayRuleSup.value = Number(rule.match(/[0-9]{1,2}/g)[0]) + dateArr.value[3] = [dayRuleSup.value] } else if (rule.indexOf('L') >= 0) { - dayRule.value = 'lastDay'; - dayRuleSup.value = 'null'; - dateArr.value[3] = [31]; + dayRule.value = 'lastDay' + dayRuleSup.value = 'null' + dateArr.value[3] = [31] } else if (rule !== '*' && rule !== '?') { dateArr.value[3] = getAssignArr(rule) - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } else if (rule === '*') { - dayRuleSup.value = 'null'; + dayRuleSup.value = 'null' } } // 获取"时"数组 function getHourArr(rule) { - dateArr.value[2] = getOrderArr(0, 23); + dateArr.value[2] = getOrderArr(0, 23) if (rule.indexOf('-') >= 0) { dateArr.value[2] = getCycleArr(rule, 24, true) } else if (rule.indexOf('/') >= 0) { @@ -431,7 +431,7 @@ function getHourArr(rule) { } // 获取"分"数组 function getMinArr(rule) { - dateArr.value[1] = getOrderArr(0, 59); + dateArr.value[1] = getOrderArr(0, 59) if (rule.indexOf('-') >= 0) { dateArr.value[1] = getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { @@ -442,7 +442,7 @@ function getMinArr(rule) { } // 获取"秒"数组 function getSecondArr(rule) { - dateArr.value[0] = getOrderArr(0, 59); + dateArr.value[0] = getOrderArr(0, 59) if (rule.indexOf('-') >= 0) { dateArr.value[0] = getCycleArr(rule, 60, true) } else if (rule.indexOf('/') >= 0) { @@ -453,88 +453,88 @@ function getSecondArr(rule) { } // 根据传进来的min-max返回一个顺序的数组 function getOrderArr(min, max) { - let arr = []; + let arr = [] for (let i = min; i <= max; i++) { - arr.push(i); + arr.push(i) } - return arr; + return arr } // 根据规则中指定的零散值返回一个数组 function getAssignArr(rule) { - let arr = []; - let assiginArr = rule.split(','); + let arr = [] + let assiginArr = rule.split(',') for (let i = 0; i < assiginArr.length; i++) { arr[i] = Number(assiginArr[i]) } arr.sort(compare) - return arr; + return arr } // 根据一定算术规则计算返回一个数组 function getAverageArr(rule, limit) { - let arr = []; - let agArr = rule.split('/'); - let min = Number(agArr[0]); - let step = Number(agArr[1]); + let arr = [] + let agArr = rule.split('/') + let min = Number(agArr[0]) + let step = Number(agArr[1]) while (min <= limit) { - arr.push(min); - min += step; + arr.push(min) + min += step } - return arr; + return arr } // 根据规则返回一个具有周期性的数组 function getCycleArr(rule, limit, status) { // status--表示是否从0开始（则从1开始） - let arr = []; - let cycleArr = rule.split('-'); - let min = Number(cycleArr[0]); - let max = Number(cycleArr[1]); + let arr = [] + let cycleArr = rule.split('-') + let min = Number(cycleArr[0]) + let max = Number(cycleArr[1]) if (min > max) { - max += limit; + max += limit } for (let i = min; i <= max; i++) { - let add = 0; + let add = 0 if (status === false && i % limit === 0) { - add = limit; + add = limit } arr.push(Math.round(i % limit + add)) } arr.sort(compare) - return arr; + return arr } // 比较数字大小（用于Array.sort） function compare(value1, value2) { if (value2 - value1 > 0) { - return -1; + return -1 } else { - return 1; + return 1 } } // 格式化日期格式如：2017-9-19 18:04:33 function formatDate(value, type) { // 计算日期相关值 - let time = typeof value == 'number' ? new Date(value) : value; - let Y = time.getFullYear(); - let M = time.getMonth() + 1; - let D = time.getDate(); - let h = time.getHours(); - let m = time.getMinutes(); - let s = time.getSeconds(); - let week = time.getDay(); + let time = typeof value == 'number' ? new Date(value) : value + let Y = time.getFullYear() + let M = time.getMonth() + 1 + let D = time.getDate() + let h = time.getHours() + let m = time.getMinutes() + let s = time.getSeconds() + let week = time.getDay() // 如果传递了type的话 if (type === undefined) { - return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); + return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s) } else if (type === 'week') { // 在quartz中 1为星期日 - return week + 1; + return week + 1 } } // 检查日期是否存在 function checkDate(value) { - let time = new Date(value); + let time = new Date(value) let format = formatDate(time) - return value === format; + return value === format } onMounted(() => { expressionChange() }) - + \ No newline at end of file diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue index 1a47424..15e47a0 100644 --- a/src/components/Crontab/second.vue +++ b/src/components/Crontab/second.vue @@ -125,4 +125,4 @@ function onRadioChange() { .el-select, .el-select--small { width: 18.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/week.vue b/src/components/Crontab/week.vue index 669d781..e59da22 100644 --- a/src/components/Crontab/week.vue +++ b/src/components/Crontab/week.vue @@ -194,4 +194,4 @@ function onRadioChange() { .el-select.multiselect, .el-select--small.multiselect { width: 17.8rem; } - + \ No newline at end of file diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue index 3a47aec..14758ba 100644 --- a/src/components/Crontab/year.vue +++ b/src/components/Crontab/year.vue @@ -61,22 +61,24 @@ const props = defineProps({ } } }) -const fullYear = ref(0) -const maxFullYear = ref(0) + +const fullYear = Number(new Date().getFullYear()) +const maxFullYear = fullYear + 10 const radioValue = ref(1) -const cycle01 = ref(0) -const cycle02 = ref(0) -const average01 = ref(0) +const cycle01 = ref(fullYear) +const cycle02 = ref(fullYear + 1) +const average01 = ref(fullYear) const average02 = ref(1) const checkboxList = ref([]) -const checkCopy = ref([]) +const checkCopy = ref([fullYear]) + const cycleTotal = computed(() => { - cycle01.value = props.check(cycle01.value, fullYear.value, maxFullYear.value - 1) - cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear.value) + cycle01.value = props.check(cycle01.value, fullYear, maxFullYear - 1) + cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear) return cycle01.value + '-' + cycle02.value }) const averageTotal = computed(() => { - average01.value = props.check(average01.value, fullYear.value, maxFullYear.value - 1) + average01.value = props.check(average01.value, fullYear, maxFullYear - 1) average02.value = props.check(average02.value, 1, 10) return average01.value + '/' + average02.value }) @@ -97,8 +99,8 @@ function changeRadioValue(value) { radioValue.value = 3 } else if (value.indexOf("/") > -1) { const indexArr = value.split('/') - average01.value = Number(indexArr[1]) - average02.value = Number(indexArr[0]) + average01.value = Number(indexArr[0]) + average02.value = Number(indexArr[1]) radioValue.value = 4 } else { checkboxList.value = [...new Set(value.split(',').map(item => Number(item)))] @@ -129,14 +131,6 @@ function onRadioChange() { break } } -onMounted(() => { - fullYear.value = Number(new Date().getFullYear()) - maxFullYear.value = fullYear.value + 10 - cycle01.value = fullYear.value - cycle02.value = cycle01.value + 1 - average01.value = fullYear.value - checkCopy.value = [fullYear.value] -}) + \ No newline at end of file diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index 19e24e4..ce86940 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 6823883..8651c74 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -133,59 +133,27 @@ /> - - - - - {{ form.jobLogId }} - {{ form.jobName }} - - - {{ form.jobGroup }} - {{ form.createTime }} - - - {{ form.invokeTarget }} - - - {{ form.jobMessage }} - - - -
正常
-
失败
- - - - {{ form.exceptionInfo }} - - - - - + diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 09c5642..86f9f0b 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -125,21 +125,21 @@ diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index 9481959..fee70fe 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -58,52 +58,52 @@ diff --git a/src/views/monitor/operlog/detail.vue b/src/views/monitor/operlog/detail.vue new file mode 100644 index 0000000..6ebc593 --- /dev/null +++ b/src/views/monitor/operlog/detail.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index 3f2ea94..9648905 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -135,7 +135,7 @@ @@ -148,72 +148,29 @@ @pagination="getList" /> - - - - - - {{ form.title }} / {{ typeFormat(form) }} - {{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }} - - - {{ form.operUrl }} - {{ form.requestMethod }} - - - {{ form.method }} - - - {{ form.operParam }} - - - {{ form.jsonResult }} - - - -
正常
-
失败
- - - - {{ form.costTime }}毫秒 - - - {{ parseTime(form.operTime) }} - - - {{ form.errorMsg }} - - - - - + diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue index a1178b1..60ff80c 100644 --- a/src/views/monitor/server/index.vue +++ b/src/views/monitor/server/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 983764f..1e64264 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -1,420 +1,346 @@ - - - + + + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index d6ed77f..9bc0ee8 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,461 +1,508 @@ - - - + + + diff --git a/src/views/system/notice/ReadUsers.vue b/src/views/system/notice/ReadUsers.vue new file mode 100644 index 0000000..7590bef --- /dev/null +++ b/src/views/system/notice/ReadUsers.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index b009d7c..7541a48 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -71,12 +71,11 @@ - + + + + + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 045ed41..316e0d7 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -145,20 +145,20 @@ diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 5bc3404..6848eb4 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -92,19 +92,19 @@ diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 02e8048..c191194 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -1,593 +1,584 @@ - - - + + + diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue index 6e61b4c..58b621a 100644 --- a/src/views/system/role/selectUser.vue +++ b/src/views/system/role/selectUser.vue @@ -61,21 +61,21 @@ diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index 7555cac..28b40e7 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -23,7 +23,7 @@ {{ (pageNum - 1) * pageSize + scope.$index + 1 }} - + @@ -46,71 +46,78 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9cd3e8d..6528964 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,547 +1,459 @@ - - - + + + diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue index 5851f05..dfb4a66 100644 --- a/src/views/system/user/profile/index.vue +++ b/src/views/system/user/profile/index.vue @@ -48,7 +48,7 @@ 基本资料 - + @@ -63,25 +63,32 @@ diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue index b484755..e454938 100644 --- a/src/views/system/user/profile/resetPwd.vue +++ b/src/views/system/user/profile/resetPwd.vue @@ -1,59 +1,60 @@ diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue index 3dbc40c..64d2c94 100644 --- a/src/views/system/user/profile/userAvatar.vue +++ b/src/views/system/user/profile/userAvatar.vue @@ -59,17 +59,17 @@ @@ -177,4 +177,4 @@ function closeDialog() { line-height: 110px; border-radius: 50%; } - + \ No newline at end of file diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue index 2737fe1..9fcc09b 100644 --- a/src/views/system/user/profile/userInfo.vue +++ b/src/views/system/user/profile/userInfo.vue @@ -23,45 +23,45 @@ diff --git a/src/views/system/user/view.vue b/src/views/system/user/view.vue new file mode 100644 index 0000000..593a163 --- /dev/null +++ b/src/views/system/user/view.vue @@ -0,0 +1,175 @@ + + + diff --git a/src/views/test/configs/Run.vue b/src/views/test/configs/Run.vue index a5a0c07..3040369 100644 --- a/src/views/test/configs/Run.vue +++ b/src/views/test/configs/Run.vue @@ -1,172 +1,172 @@ - - + + diff --git a/src/views/test/configs/index.vue b/src/views/test/configs/index.vue index 5d18a44..f70efe7 100644 --- a/src/views/test/configs/index.vue +++ b/src/views/test/configs/index.vue @@ -1,696 +1,696 @@ - - - - - + + + + + diff --git a/src/views/test/detect/index.vue b/src/views/test/detect/index.vue index 9357367..836d697 100644 --- a/src/views/test/detect/index.vue +++ b/src/views/test/detect/index.vue @@ -1,477 +1,477 @@ - - - + + + diff --git a/src/views/test/history/index.vue b/src/views/test/history/index.vue new file mode 100644 index 0000000..89f19c4 --- /dev/null +++ b/src/views/test/history/index.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/views/test/log/index.vue b/src/views/test/log/index.vue index 7859d10..9af113e 100644 --- a/src/views/test/log/index.vue +++ b/src/views/test/log/index.vue @@ -1,450 +1,450 @@ - - - + + + diff --git a/src/views/tool/build/CodeTypeDialog.vue b/src/views/tool/build/CodeTypeDialog.vue index b322c69..de0beb7 100644 --- a/src/views/tool/build/CodeTypeDialog.vue +++ b/src/views/tool/build/CodeTypeDialog.vue @@ -68,4 +68,4 @@ function handelConfirm() { onClose() }) } - + \ No newline at end of file diff --git a/src/views/tool/build/DraggableItem.vue b/src/views/tool/build/DraggableItem.vue index d345ae5..9ae2354 100644 --- a/src/views/tool/build/DraggableItem.vue +++ b/src/views/tool/build/DraggableItem.vue @@ -25,7 +25,7 @@ + \ No newline at end of file diff --git a/src/views/tool/build/RightPanel.vue b/src/views/tool/build/RightPanel.vue index 48e3087..5fe80fb 100644 --- a/src/views/tool/build/RightPanel.vue +++ b/src/views/tool/build/RightPanel.vue @@ -427,28 +427,16 @@ - - 较大 - - - 默认 - - - 较小 - + + + - - 左对齐 - - - 右对齐 - - - 顶部对齐 - + + + @@ -915,4 +903,4 @@ function tagChange(tagIcon) { font-size: 14px; padding-right: 8px; } - + \ No newline at end of file diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue index e630740..64a9317 100644 --- a/src/views/tool/build/index.vue +++ b/src/views/tool/build/index.vue @@ -102,7 +102,7 @@ import beautifier from 'js-beautify' import logo from '@/assets/logo/logo.png' import { inputComponents, selectComponents, layoutComponents, formConf as formConfData } from '@/utils/generator/config' import { beautifierConf } from '@/utils/index' -import drawingDefalut from '@/utils/generator/drawingDefalut' +import { drawingDefaultValue, initDrawingDefaultValue, cleanDrawingDefaultValue } from '@/utils/generator/drawingDefault' import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html' import { makeUpJs } from '@/utils/generator/js' import { makeUpCss } from '@/utils/generator/css' @@ -113,14 +113,16 @@ import RightPanel from './RightPanel' import CodeTypeDialog from './CodeTypeDialog' import { onMounted, watch } from 'vue' -const drawingList = ref(drawingDefalut) +initDrawingDefaultValue() + +const drawingList = ref(drawingDefaultValue) const { proxy } = getCurrentInstance() const dialogVisible = ref(false) const showFileName = ref(false) const operationType = ref('') const idGlobal = ref(100) -const activeData = ref(drawingDefalut[0]) -const activeId = ref(drawingDefalut[0].formId) +const activeData = ref(drawingDefaultValue[0]) +const activeId = ref(drawingDefaultValue[0].formId) const generateConf = ref(null) const formData = ref({}) const formConf = ref(formConfData) @@ -145,6 +147,7 @@ function empty() { proxy.$modal.confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(() => { idGlobal.value = 100 drawingList.value = [] + cleanDrawingDefaultValue() } ) } @@ -292,8 +295,9 @@ watch(activeId, (val) => { oldActiveId = val }, { immediate: true }) +let clipboard = null onMounted(() => { - const clipboard = new ClipboardJS('#copyNode', { + clipboard = new ClipboardJS('#copyNode', { text: trigger => { const codeStr = generateCode() ElNotification({ title: '成功', message: '代码已复制到剪切板，可粘贴。', type: 'success' }) @@ -304,6 +308,9 @@ onMounted(() => { proxy.$modal.msgError('代码复制失败') }) }) +onUnmounted(() => { + clipboard.destroy() +}) \ No newline at end of file diff --git a/src/views/device/register/components/LogicFlow/IPlayer/config.ts b/src/views/device/register/components/VueFlow/IPlayer/config.ts similarity index 100% rename from src/views/device/register/components/LogicFlow/IPlayer/config.ts rename to src/views/device/register/components/VueFlow/IPlayer/config.ts diff --git a/src/views/device/register/components/LogicFlow/IPlayer/index.vue b/src/views/device/register/components/VueFlow/IPlayer/index.vue similarity index 100% rename from src/views/device/register/components/LogicFlow/IPlayer/index.vue rename to src/views/device/register/components/VueFlow/IPlayer/index.vue diff --git a/src/views/device/register/components/VueFlow/RuntimeGroup.vue b/src/views/device/register/components/VueFlow/RuntimeGroup.vue new file mode 100644 index 0000000..dca777e --- /dev/null +++ b/src/views/device/register/components/VueFlow/RuntimeGroup.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/device/register/components/VueFlow/RuntimeNode.vue b/src/views/device/register/components/VueFlow/RuntimeNode.vue new file mode 100644 index 0000000..6ab3e75 --- /dev/null +++ b/src/views/device/register/components/VueFlow/RuntimeNode.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/views/device/register/components/LogicFlow/customFlow.vue b/src/views/device/register/components/VueFlow/customFlow.vue similarity index 100% rename from src/views/device/register/components/LogicFlow/customFlow.vue rename to src/views/device/register/components/VueFlow/customFlow.vue diff --git a/src/views/device/register/components/VueFlow/index.vue b/src/views/device/register/components/VueFlow/index.vue new file mode 100644 index 0000000..9ae8f5d --- /dev/null +++ b/src/views/device/register/components/VueFlow/index.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/flow/components/NodeState.vue b/src/views/flow/components/NodeState.vue index 201e671..5d3b5b4 100644 --- a/src/views/flow/components/NodeState.vue +++ b/src/views/flow/components/NodeState.vue @@ -86,7 +86,7 @@ const showState = ref('NORMAL') watch(() => props.state, (newVal) => { showState.value = newVal; -}); +}, { immediate: true }); const closePopover = () => { showState.value = 'NORMAL'; diff --git a/src/views/flow/components/NodeTitle.vue b/src/views/flow/components/NodeTitle.vue index 82022b3..50f32f3 100644 --- a/src/views/flow/components/NodeTitle.vue +++ b/src/views/flow/components/NodeTitle.vue @@ -150,14 +150,14 @@ const execute = () => { } const handleInputFocus = (e) => { - // 阻止事件冒泡到 LogicFlow + // 阻止事件冒泡到流程画布 e.stopPropagation() e.preventDefault() } const handleInputKeydown = (e) => { - // 阻止事件冒泡到 Logic Flow 节点，避免被其事件拦截 + // 阻止事件冒泡到流程节点，避免被画布快捷键拦截 e.stopPropagation(); // 可选：明确放行 Ctrl+V（增强兼容性） if ((e.ctrlKey || e.metaKey) && e.key === "v") { diff --git a/src/views/flow/config.js b/src/views/flow/config.js index 68ce3a3..02cb59b 100644 --- a/src/views/flow/config.js +++ b/src/views/flow/config.js @@ -1,8 +1,3 @@ -import { Group, SelectionSelect } from "@logicflow/extension"; -import { registerCommon } from "./nodes/common/index"; - -import { registerFunction } from './nodes/function' - import cameraSvg from './icon/camera.svg' import videoSvg from './icon/video.svg' import loopSvg from './icon/loop.svg' @@ -19,66 +14,6 @@ import audioSvg from './icon/audio.svg' import touchSvg from './icon/touch.svg' import expressionSvg from './icon/expression.svg' -import { v4 as randomUUID } from 'uuid' - -export const lfConfig = { - idGenerator: () => { - // 生成标准UUID并移除连字符 - // return crypto.randomUUID().replace(/-/g, ''); - return randomUUID().replace(/-/g, '') - }, - background: { - backgroundColor: "#f6f8fa", - }, - grid: false, - plugins: [Group, SelectionSelect], - animation: true, - adjustEdgeStartAndEnd: false, - // multipleSelectKey: "ctrl", - // disabledTools: ["multipleSelect"], - partial: true, - // group: { - // foldable: true, // 启用折叠功能 - // foldSize: 30, // 折叠后显示的图标尺寸 - // }, - edgeType: "bezier", - zoomConfig: { - min: 0.05, // 最小缩放比例（支持更小值，如 0.01，但不建议过小） - max: 3, // 最大缩放比例（可自定义） - step: 0.1 // 每次滚轮缩放的步长（默认 0.1） - }, - style: { - anchor: { - show: true, // 强制全局锚点显示 - hoverOn: false, - visibility: "visible", - fill: "#FF5722", // 实心绿色 - stroke: "#FF5722", // 边框同色 - strokeWidth: 0, // 消除边框 - r: 7, // 锚点半径 - hover: { fill: "#FF5722" }, // 禁用悬停变色 - }, - anchorLine: { - stroke: "#FF5722", - strokeWidth: 2, - strokeDasharray: "3,2", - }, - bezier: { - stroke: "#FF5722", - strokeWidth: 2, - arrow: false, // 关闭箭头显示 - animation: true, // 开启动画效果 - animationSpeed: 3, - }, - }, -}; - -// 注册自定义节点 -export const registerCustomizeNode = (lf) => { - registerCommon(lf) - registerFunction(lf) -}; - const deviceOptions = () => { return [{ value: 'cam1', diff --git a/src/views/flow/index.vue b/src/views/flow/index.vue index 910ba7d..3910859 100644 --- a/src/views/flow/index.vue +++ b/src/views/flow/index.vue @@ -71,12 +71,45 @@