Commit Graph

Select branches

Hide Pull Requests

develop-business-css

develop-framework

main-framework

#2

#3

#4

#5

#6

#7

#8

Mono Color

• 10900e3e52 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css develop-business-css limengnan 2026-01-15 17:27:30 +0800
• 80d707f992 修改x6 limengnan 2026-01-15 17:27:26 +0800
• 3fef4ea822 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css wanxiaoli 2026-01-15 14:56:53 +0800
• dfab9ae5d0 修改 wanxiaoli 2026-01-15 14:56:32 +0800
• 2269796070 分析设计添加新增模拟分析历史模拟分析 limengnan 2026-01-15 08:47:44 +0800
• b47a65bdc8 修改x6 limengnan 2026-01-13 17:39:09 +0800
• bd7292ccbe Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2026-01-13 15:11:45 +0800
• f7238eaf63 添加分析设计页面 limengnan 2026-01-13 15:11:39 +0800
• 8dce0a5a7f python调用 wanxiaoli 2026-01-09 10:42:16 +0800
• b86d8abd07 Fix compilation errors and update models wanxiaoli 2026-01-05 17:21:25 +0800
• c6ae4c7d3c 提交内容 wanxiaoli 2026-01-05 17:07:42 +0800
• f3c4056c1e 修改了启动模式 zhengsl 2026-01-05 16:52:03 +0800
• 9be237c53e 添加更新 wanxiaoli 2026-01-05 15:18:21 +0800
• a4a8ed9535 修改批量修改 limengnan 2026-01-04 08:30:06 +0800
• 6c85a844dd Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-31 09:11:13 +0800
• 8dba8c07d4 修改初始化条件 limengnan 2025-12-31 09:11:08 +0800
• 43caa9d021 事件接口批量保存 wanxiaoli 2025-12-30 18:02:41 +0800
• 921e657524 追加修改 limengnan 2025-12-26 17:29:11 +0800
• 4b9fbb8a7f Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-26 17:27:19 +0800
• 0ec2f3ea1a 修改场景代码 limengnan 2025-12-26 17:27:12 +0800
• 5c8792e883 场景创建返回标识 wanxiaoli 2025-12-26 17:20:27 +0800
• a9b5057d9d Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-26 11:33:54 +0800
• 64f1b0dae7 新增场景模块 limengnan 2025-12-26 11:33:50 +0800
• 56ffbbe268 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css wanxiaoli 2025-12-26 11:29:46 +0800
• 6c75359b52 场景表添加算法类型 wanxiaoli 2025-12-26 11:29:38 +0800
• 731f5fadad 整理项目模块，数据管理，算法管理图标 limengnan 2025-12-25 14:24:35 +0800
• 033579d549 修改登录页面 limengnan 2025-12-25 14:04:16 +0800
• 9475db4619 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-25 13:45:26 +0800
• 7c2409c627 添加算法模块，更换logo limengnan 2025-12-25 13:45:21 +0800
• 516961c323 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css wanxiaoli 2025-12-25 09:32:00 +0800
• 9915158530 算法修改 wanxiaoli 2025-12-25 09:31:47 +0800
• 4aca24a8c1 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-25 09:22:15 +0800
• 33509c14af 修改设备样式 limengnan 2025-12-25 09:22:09 +0800
• b8b122980f 设备、临界数据根据设备类型做导入 wanxiaoli 2025-12-25 09:16:29 +0800
• 8c277528cb Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-24 17:14:24 +0800
• 88dcd945e6 前端修改idbug limengnan 2025-12-24 17:14:19 +0800
• c88aae3f48 分页 wanxiaoli 2025-12-24 17:12:39 +0800
• 0c64c11b58 提交新修改 wanxiaoli 2025-12-24 16:40:13 +0800
• 8262b7c054 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-24 16:36:20 +0800
• 46a5554a8e 新增临界数据管理 limengnan 2025-12-24 16:36:15 +0800
• 6e5376836d Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css wanxiaoli 2025-12-24 15:46:45 +0800
• 02375f3b03 添加创建人 wanxiaoli 2025-12-24 15:46:21 +0800
• db11179d81 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-24 13:33:11 +0800
• 5a920b96c1 添加物料模块 limengnan 2025-12-24 13:33:05 +0800
• 4d40414e82 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css wanxiaoli 2025-12-24 12:36:20 +0800
• 7bb9d657f9 基础类修改 wanxiaoli 2025-12-24 12:35:13 +0800
• 0adfdf748d Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css limengnan 2025-12-23 14:54:03 +0800
• bad8cd11d5 添加项目模块 limengnan 2025-12-23 14:53:57 +0800
• 200222165a 代码更新 wanxiaoli 2025-12-23 14:42:05 +0800
• 5fbdb08f67 添加创建人 wanxiaoli 2025-12-19 12:08:07 +0800
• 7499a6e295 细化接口方法、注释等 wanxiaoli 2025-12-18 17:16:24 +0800
• 719f02becd 修改 wanxiaoli 2025-12-17 17:52:12 +0800
• d6406f325a 提交功能规划文档 wanxiaoli 2025-12-17 17:43:50 +0800
• 74a43d99a6 提交业务系统更新 wanxiaoli 2025-12-17 17:09:58 +0800
• 17c177a341 增加了css项目业务类的增删改查方法 wanxiaoli 2025-12-17 17:08:51 +0800
• 28810ecff3 添加了前端frontend代码 zhengsl 2025-11-21 13:06:11 +0800
• 0f50e2ccd1 Merge remote-tracking branch 'origin/main-framework' into develop-business-css zhengsl 2025-11-21 11:31:39 +0800
• aec6f41b25 Merge pull request 'develop-framework' (#8) from develop-framework into main-framework main-framework zhengsl 2025-11-21 10:29:51 +0800
• 30642e95c0 修改了忽略文件 develop-framework zhengsl 2025-11-21 10:24:05 +0800
• 4b94be1b4a chore: stop tracking generated assets per .gitignore (static/ and business-css/target) zhengsl 2025-11-21 10:18:55 +0800
• e8f1f576bf Merge framework directory from develop-business-css into develop-framework zhengsl 2025-11-21 10:07:17 +0800
• 507cc6a6d2 整理和前后端端代码及框架 zhengsl 2025-11-21 10:04:00 +0800
• f2e6cc67f3 测试提交 zhengsl 2025-11-20 16:42:09 +0800
• 6fba87f156 Merge remote-tracking branch 'origin/main-framework' into develop-business-css zhengsl 2025-11-12 18:15:45 +0800
• 4bae2b7c03 修改了一个告警错误 zhengsl 2025-11-12 18:14:38 +0800
• 3ae1e7b1f9 Merge pull request 'develop-framework' (#7) from develop-framework into main-framework zhengsl 2025-11-12 17:41:02 +0800
• 3a8b721d7c fix：初始化代码 limengnan 2025-11-10 11:41:42 +0800
• a79f0bd0d3 fix：修改sass运行警告问题 limengnan 2025-11-10 10:59:46 +0800
• 63d41e11a6 增加了分析模拟系统模块框架 zhengsl 2025-11-09 22:55:49 +0800
• 48bca56d15 Merge remote-tracking branch 'origin/main-framework' into develop-business-css zhengsl 2025-11-09 22:06:32 +0800
• 0f23ed2024 Merge pull request 'develop-framework' (#6) from develop-framework into main-framework zhengsl 2025-11-09 22:05:32 +0800
• a80ddcd2eb Merge branch 'main-framework' into develop-framework zhengsl 2025-11-09 22:00:34 +0800
• d962eadafc 更新了数据库连接frameworkdb2023 zhengsl 2025-11-09 21:57:40 +0800
• fc4d5fc2cd 增加了从main-framework分支同步脚本 zhengsl 2025-11-09 21:48:30 +0800
• 16549de421 Merge branch 'main-framework' into develop-business-css zhengsl 2025-11-09 21:43:52 +0800
• d790992125 Merge pull request '增加了数据库初始化脚本处理' (#4) from develop-framework into main-framework zhengsl 2025-11-09 20:43:08 +0800
• 9397ba32b6 增加了数据库初始化脚本处理 zhengsl 2025-11-09 20:41:38 +0800
• a14bdfd804 Merge pull request 'docs：测试从开发分支合并到主分支' (#3) from develop-framework into main-framework zhengsl 2025-11-09 18:59:12 +0800
• 64929f620c docs：测试提交 zhengsl 2025-11-09 18:51:58 +0800
• 3079ca2a44 Merge pull request 'develop-framework' (#2) from develop-framework into main-framework zhengsl 2025-11-09 18:38:11 +0800
• 6dee0c43e8 Merge branch 'main-framework' into develop-framework zhengsl 2025-11-09 18:29:31 +0800
• 1d93c13d62 Merge branch 'develop-framework' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-framework zhengsl 2025-11-09 16:34:18 +0800
• 353324515a docs：修改了develop-framework 分支 Git 操作指南 ProjectFrameWork2025 2025-11-09 16:25:49 +0800
• b8a2635707 docs：添加了开发分支GIT操作指南 ProjectFrameWork2025 2025-11-09 16:25:49 +0800
• 96d29aff64 更新了git忽略文件 ProjectFrameWork2025 2025-11-09 16:13:16 +0800
• 745a270db1 更新了框架开发，并进行了文档整合 ProjectFrameWork2025 2025-11-09 16:11:35 +0800
• 4a16886686 清理了develop-framework ProjectFrameWork2025 2025-11-09 15:42:55 +0800
• 478b5deaba 清理main-framework项目 ProjectFrameWork2025 2025-11-09 15:39:10 +0800
• dbc4804610 提交main分支 ProjectFrameWork2025 2025-11-09 15:33:38 +0800
• 4dadab0990 chore(main-framework): remove non-framework dirs and keep aggregator for framework ProjectFrameWork2025 2025-11-09 15:31:59 +0800
• afdfcf29a1 重新整合了项目结构 ProjectFrameWork2025 2025-11-09 14:54:47 +0800
• 93bd427608 merge: resolve root pom conflict by adopting aggregator parent ProjectFrameWork2025 2025-11-09 14:48:33 +0800
• ca90144a53 chore(repo): initialize monorepo (framework + business-css + docs) ProjectFrameWork2025 2025-11-09 14:47:10 +0800
• e5031ed8bb 修正路径错误 localuser 2025-11-08 21:46:55 +0800
• 38b171657c Merge branch 'main' of http://121.37.111.42:3000/ThbTech/ProjectFrameWork2025 localuser 2025-11-08 21:04:23 +0800
• abf51a7c96 修改了前后端的代码，集成打包配置。 localuser 2025-11-08 21:04:11 +0800
• d89b94bb0c 更新前端 limengnan 2025-11-08 13:31:33 +0800
• 54c279d20c 合并冲突 limengnan 2025-11-08 11:37:30 +0800
• 20625f7e9a 添加前端 limengnan 2025-11-08 11:32:46 +0800
• 33e88eabd6 添加了前端代码 localuser 2025-11-08 11:21:31 +0800