643 Commits

Author SHA1 Message Date
sjl
5de539f61c Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client 2025-10-17 11:34:15 +08:00
sjl
9a25e41d4f 微调 2025-10-17 11:33:52 +08:00
贾同学
c73b13f83a UPDATE: 删除权限 2025-10-17 09:47:40 +08:00
956262401b 提交额外资源 2025-10-16 20:19:22 +08:00
12af3c74f2 提交额外资源 2025-10-16 20:18:20 +08:00
9b02fea0c0 提交额外资源 2025-10-16 20:17:38 +08:00
7dac2b8c7d 升级electron egg脚手架版本 2025-10-16 20:14:55 +08:00
sjl
c04be0264a 微调 2025-10-16 15:05:44 +08:00
贾同学
13c5baa74f UPDATE: 优化bug 2025-10-16 13:12:47 +08:00
sjl
0ae3047240 微调 2025-10-16 10:44:19 +08:00
sjl
7d6dc55a76 预检测出错 2025-10-16 09:36:43 +08:00
sjl
321b6c5465 预检测10552拦截 2025-10-15 18:50:23 +08:00
sjl
d050dbc6e7 Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client
# Conflicts:
#	package.json
2025-10-15 15:23:34 +08:00
sjl
3b2f6b2517 1 2025-10-15 15:21:51 +08:00
sjl
45a010b3a4 微调 2025-10-15 15:20:07 +08:00
081a77ac4c 升级electron egg脚手架版本 2025-10-15 14:12:24 +08:00
sjl
ca8f173394 10550处理 2025-10-15 13:33:40 +08:00
caozehui
2e377bcca2 Merge remote-tracking branch 'origin/master' 2025-10-15 09:59:26 +08:00
caozehui
2a8757c9f1 微调 2025-10-15 09:59:10 +08:00
sjl
35f21b7140 去除日志,表格宽度 2025-10-15 08:49:11 +08:00
贾同学
b0ca84c8fd UPDATE: 优化 2025-10-15 08:45:37 +08:00
sjl
045acfa061 计划默认不勾选闪变 2025-10-14 20:54:35 +08:00
贾同学
55ff45f9a9 ADD: 模块激活流程 2025-10-14 19:00:47 +08:00
sjl
7afccb58fd 正式检测重复初始化 2025-10-14 18:41:36 +08:00
sjl
11c6704f11 闪变 2025-10-14 11:40:39 +08:00
sjl
97d1f08bbe 正式检测闪变 2025-10-13 13:56:37 +08:00
sjl
7d0053eb71 被检设备监测点台账线路号占满不可新增 2025-10-11 14:12:15 +08:00
贾同学
666fb22c49 UPDATE: 优化客户端桌面窗口内容自适应 2025-10-10 15:29:54 +08:00
贾同学
b319a89501 UPDATE: 处理控制台警告问题 2025-10-10 13:23:40 +08:00
贾同学
8e0b3be438 Merge remote-tracking branch 'origin/master' 2025-10-10 08:24:55 +08:00
sjl
b0d92de738 微调 2025-10-09 15:51:45 +08:00
sjl
92b3e25989 冲突 2025-10-09 15:49:29 +08:00
sjl
43c75c96a7 录波数据 2025-10-09 15:47:00 +08:00
贾同学
da0aa0cd0f UPDATE: 调整超时时间到1200秒 2025-10-09 14:34:45 +08:00
贾同学
b0c88b9df2 UPDATE: 优化; 2025-09-30 08:42:45 +08:00
caozehui
7c0ec5844a 微调 2025-09-29 14:49:29 +08:00
贾同学
a4a64ef0f9 UPDATE: 优化; 2025-09-29 09:47:53 +08:00
贾同学
58bb25500e UPDATE: 优化; 2025-09-25 14:40:45 +08:00
贾同学
3d73c34343 Merge remote-tracking branch 'origin/master' 2025-09-25 11:17:15 +08:00
贾同学
f74fedc213 UPDATE: 优化; 2025-09-25 11:16:57 +08:00
sjl
8ea49f9609 预检测实时数据对齐失败展示 2025-09-25 10:11:15 +08:00
caozehui
9ee71d29d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/views/home/components/table.vue
2025-09-25 08:54:05 +08:00
caozehui
039a67c35a 微调 2025-09-25 08:53:32 +08:00
sjl
e17749d47e Merge branch 'master' of http://192.168.1.125:3000/root/pqs-9100_client 2025-09-25 08:53:28 +08:00
sjl
21c859c8f1 微调 2025-09-25 08:51:40 +08:00
贾同学
4fe239c86f UPDATE: 1、子计划管理,筛选条件改成搜索、设备厂家、是否分配;
2、重复导入子计划时,增量被检设备并删除未检设备;
        3、优化删除子计划后,刷新主计划信息;
2025-09-25 08:49:15 +08:00
ab62e56bbb 微调 2025-09-25 08:39:06 +08:00
5730b9c5cf 比对模式的检测报告生成和下载 2025-09-23 16:14:03 +08:00
贾同学
d4992db198 UPDATE: 优化批量导入提示; 2025-09-23 15:15:20 +08:00
sjl
5ccd1709a5 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-23 11:14:44 +08:00
sjl
b48c1e0d78 微调 2025-09-23 11:14:34 +08:00
贾同学
fcdbbce7a9 UPDATE: 1、测试项改成检测项;
2、检测项勾选闪变添加提示;
        3、检测项由误差体系反推为下拉框让用户多选,默认全选;
        4、修改检测计划有子计划后部分字段不可编辑;
2025-09-23 10:55:07 +08:00
sjl
d08194bfd8 相序校验拦截错误 2025-09-23 08:39:15 +08:00
贾同学
55f579ef64 UPDATE: 优化 2025-09-22 16:16:45 +08:00
sjl
783e1c080b 预检测,正式检测,数据查询能处理只有录波的情况 2025-09-22 15:51:58 +08:00
guanj
44cdb3273c 微调 2025-09-22 15:37:28 +08:00
guanj
dbc21cdbfa 修改通道配对布局 2025-09-22 15:26:13 +08:00
sjl
24d83cfd39 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-22 09:17:17 +08:00
sjl
b213b721bb 微调 2025-09-22 09:17:10 +08:00
caozehui
4ae42408c3 微调 2025-09-22 09:16:35 +08:00
贾同学
a9156f0954 UPDATE: 异步导出检测数据逻辑。 2025-09-19 16:18:10 +08:00
sjl
3e7509cd44 预检测重复初始化拦截 2025-09-19 11:20:06 +08:00
sjl
24becb82e1 比对式误差切换和删除零时表 2025-09-19 09:31:02 +08:00
sjl
6608587edd 预检测处理错误 2025-09-18 14:11:50 +08:00
sjl
5ad8cdecba 重新计算 2025-09-18 10:06:24 +08:00
贾同学
6b4cca1ef7 Merge remote-tracking branch 'origin/master' 2025-09-17 16:28:17 +08:00
贾同学
dea0844829 UPDATE: 根据计划的状态调按钮显示还是隐藏。 2025-09-17 16:27:46 +08:00
sjl
bbd438d23f 修复比对式一键检测 2025-09-17 15:42:05 +08:00
sjl
c88128b63b 1.被检设备监测点新增是否参与检测
2.调整通道配对只显示绑定和参与检测的通道数
2025-09-17 14:08:58 +08:00
sjl
95c68942ed 数据查询树替换接口联调 2025-09-17 08:46:26 +08:00
贾同学
5db685baca UPDATE: 修改计划数据源选择逻辑。 2025-09-16 14:42:02 +08:00
贾同学
fa710efea4 Merge remote-tracking branch 'origin/master' 2025-09-16 14:37:53 +08:00
贾同学
d0c3e1d9bd UPDATE: 修改计划数据源选择逻辑。 2025-09-16 14:37:17 +08:00
caozehui
589ddd38f3 微调 2025-09-16 13:47:40 +08:00
sjl
47d1500296 模拟式报告生成不弹框 2025-09-16 13:34:22 +08:00
sjl
4a8f8bff6a 预检测新增录波 2025-09-15 14:59:54 +08:00
贾同学
2b9b87a3db UPDATE: 布局样式优化。 2025-09-15 14:58:12 +08:00
贾同学
b241128105 Merge remote-tracking branch 'origin/master' 2025-09-15 10:56:13 +08:00
贾同学
226e3271ee UPDATE: 及格改成符合,添加无法比较。 2025-09-15 10:55:38 +08:00
sjl
1c253fd713 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-15 10:43:53 +08:00
sjl
ed81d3d398 比对式报告生成显示检测中设备 2025-09-15 10:43:42 +08:00
贾同学
09b54a29ab ADD: 报告生成选择检测数据源并更新监测点结果。 2025-09-15 10:38:14 +08:00
贾同学
b27615baaf ADD: 1、报告生成选择界面流程。 2025-09-12 16:34:27 +08:00
sjl
c735e7a5bb 数据查询检测次数默认最后一次 2025-09-12 16:09:41 +08:00
sjl
c78f591baf 实时数据过了录波状态处理和进度条 2025-09-12 13:35:29 +08:00
贾同学
cfd8b072dd ADD: 修改数据合并逻辑,新增 event-source-polyfill包,实现长连接通信,展示合并进度 2025-09-11 11:03:14 +08:00
sjl
d18e34d2c9 比对模式没有检测次数,数据操作可查看检测中设备 2025-09-10 14:20:42 +08:00
sjl
53813795db 调整正式检测录波状态 2025-09-10 09:28:04 +08:00
sjl
8c3098e19a Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-09 20:54:32 +08:00
sjl
780a446aed 正式检测录波数据查询 2025-09-09 20:54:22 +08:00
贾同学
375f01a6ab UPDATE: 完善检修计划项目负责人和项目成员逻辑。 2025-09-09 10:25:53 +08:00
sjl
48aab7c1e9 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-09 09:14:52 +08:00
sjl
d7cfe665e2 录波数据查询 2025-09-09 09:14:42 +08:00
贾同学
237c23bb70 UPDATE: 完善检修计划项目负责人和项目成员逻辑。 2025-09-08 16:23:19 +08:00
guanj
4cd6302ee0 修改 通道配对样式 2025-09-08 16:01:04 +08:00
caozehui
6a75709774 微调 2025-09-08 14:55:25 +08:00
贾同学
629dff1256 ADD: 检修计划添加项目负责人和项目成员 2025-09-08 10:21:54 +08:00
贾同学
6d6d03c03c UPDATE: 优化高度 2025-09-05 09:09:18 +08:00
贾同学
6122f53c8e UPDATE: 检测计划选择数据源逻辑改成主计划默认全选,子计划勾选校验 2025-09-05 08:57:39 +08:00
贾同学
5a7eea1052 UPDATE: 优化选择被检设备组件 2025-09-04 19:39:20 +08:00
贾同学
25f3570c18 UPDATE: 替换新增比对检测计划时,可选择的标准设备接口;优化选择被检设备组件 2025-09-04 11:12:29 +08:00
贾同学
74e015bd12 UPDATE: 重构检修计划选择被检设备组件,并处理对应数据逻辑 2025-09-03 20:44:32 +08:00
caozehui
da6a72807b 微调 2025-09-03 08:38:13 +08:00
贾同学
bb7ebaea45 UPDATE: 比对被检设备提交校验监测点信息 2025-09-02 11:03:39 +08:00
sjl
ae51b590af Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-01 14:53:44 +08:00
sjl
2ec3102eff 新建检测计划时,检测项下拉框要和误差体系里配置的要一致 2025-09-01 14:53:30 +08:00
贾同学
f5f7d259a9 ADD: 是否下载检测报告选择 2025-09-01 09:36:32 +08:00
guanj
4364f88526 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-09-01 08:36:25 +08:00
guanj
0f5e21a06c 微调 2025-09-01 08:36:18 +08:00
贾同学
ddbaf5651a UPDATE: 勾选被检设备下载检测结果数据等 2025-08-29 15:09:05 +08:00
贾同学
a847419ab5 Merge remote-tracking branch 'origin/master' 2025-08-29 11:35:05 +08:00
贾同学
d5fb41cbab ADD: 检测计划添加导入标识字段以及逻辑 2025-08-29 11:34:55 +08:00
guanj
25e7b754b7 修改 正式检测结果 2025-08-29 11:12:57 +08:00
贾同学
a32ca3c849 ADD:数据合并按钮操作 2025-08-29 09:54:19 +08:00
caozehui
6e979c5dcb 微调 2025-08-28 16:29:00 +08:00
caozehui
8b578d4d8b 微调 2025-08-28 10:37:50 +08:00
贾同学
52fcdbfe1e ADD:导入子计划元数据二次确认提示 2025-08-27 20:21:55 +08:00
guanj
4559a7b5e2 修改检测查询页面空白问题 2025-08-27 16:32:29 +08:00
guanj
567201563d 修改预检测实时数据详情展示 2025-08-27 14:55:00 +08:00
guanj
772707ac42 修改比对式检测页面 2025-08-27 11:17:13 +08:00
guanj
4a6db824ba 修改通道配置页面 2025-08-26 20:52:24 +08:00
guanj
8b4c22e959 微调 2025-08-26 18:29:14 +08:00
caozehui
d7f1224df4 微调 2025-08-26 15:39:58 +08:00
贾同学
ac4e0e2077 UPDATE:优化子计划增删tab展示数据刷新问题 2025-08-26 15:28:01 +08:00
guanj
56a6f199c0 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-26 15:16:25 +08:00
guanj
0abb765b32 修改查看 模拟式 页面展示 2025-08-26 15:16:18 +08:00
贾同学
4f8fdb83d1 ADD:检测计划添加检测配置相关 2025-08-26 11:13:23 +08:00
caozehui
300b220de2 微调 2025-08-26 10:58:29 +08:00
guanj
825d2cc46a Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-26 10:37:24 +08:00
guanj
95b602e6d4 修改检测数据查询展示页面 2025-08-26 10:37:13 +08:00
贾同学
a7b5bbf0bf Merge remote-tracking branch 'origin/master' 2025-08-25 14:53:06 +08:00
贾同学
dfbba11aae ADD:ICD添加检测是否两个开关字段 2025-08-25 14:39:59 +08:00
guanj
5cf39e8aa8 联调检测结果查询弹框 2025-08-25 11:35:38 +08:00
贾同学
a19a20ddd8 ADD:导入检测计划检测结果; 2025-08-25 11:02:07 +08:00
guanj
0985cc5d7c 修改正式监测返回结果 2025-08-22 16:21:57 +08:00
guanj
2be0be681e Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-22 15:34:07 +08:00
guanj
dd9ca8f956 联调 正式检测结果页面 2025-08-22 15:33:57 +08:00
贾同学
5cd60d9a32 ADD:导出检测计划检测结果; 2025-08-22 09:04:09 +08:00
guanj
959ae1dee9 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-21 13:15:14 +08:00
guanj
d2d1490e9b 修改正式检测推送逻辑 2025-08-21 13:14:59 +08:00
caozehui
7bcd88c3a7 微调 2025-08-21 10:42:09 +08:00
guanj
8e3368bd29 修改正式检测逻辑 2025-08-21 09:33:13 +08:00
guanj
bc03ba88f0 修改样式 2025-08-20 20:05:07 +08:00
guanj
2aee4b281d 联调正式检测 2025-08-20 20:02:22 +08:00
贾同学
26647222e2 UPDATE:优化v-auth指令逻辑 2025-08-20 10:15:09 +08:00
贾同学
a2db45cace ADD:添加按钮权限 2025-08-20 08:51:01 +08:00
caozehui
d761c0449b 微调 2025-08-19 19:16:20 +08:00
caozehui
dc6a346fd4 微调 2025-08-19 09:37:42 +08:00
贾同学
e938c6b3d9 UPDATE:修改编辑计划按钮判断是否为主计划逻辑 2025-08-18 16:28:29 +08:00
caozehui
c9fef2a9d7 微调 2025-08-18 08:30:03 +08:00
sjl
9319dd06c5 首页判断被检设备下绑定监测点 2025-08-15 16:22:58 +08:00
贾同学
7b96ce84fc ADD:添加导出子计划元信息和导入检修计划按钮逻辑 2025-08-15 16:03:42 +08:00
sjl
b105ff890c 标准 2025-08-15 08:43:42 +08:00
sjl
61b87304e6 数模没有标准设备 2025-08-15 08:37:35 +08:00
sjl
83c8dc5f19 调整开始检测接口 2025-08-14 15:02:58 +08:00
贾同学
b1ddf540ca UPDATE:1.完善主计划导入被检设备逻辑;2.完善新增编辑子计划逻辑。 2025-08-13 20:34:08 +08:00
sjl
0025895696 预检测描述 2025-08-13 15:52:48 +08:00
sjl
1ec8cce63e 实时数据对齐,修改成标准对应被检 2025-08-13 10:06:55 +08:00
贾同学
865d52c135 Merge remote-tracking branch 'origin/master' 2025-08-12 20:43:11 +08:00
贾同学
ce8607af36 UPDATE:优化完善新增编辑检测计划绑定被检设备 2025-08-12 20:42:48 +08:00
sjl
4e8a6300dd 预检测 2025-08-12 20:17:37 +08:00
919e81da8b 前端优化调整 2025-08-12 10:26:30 +08:00
caozehui
18cb6dbde8 微调 2025-08-12 08:34:09 +08:00
6d405d16ed 前端优化调整 2025-08-11 16:30:53 +08:00
sjl
77d2176812 接口调整 2025-08-11 15:59:29 +08:00
c85eac3888 前端优化调整 2025-08-11 11:14:20 +08:00
sjl
27d2d82fcd 去除协议校验 2025-08-08 15:27:17 +08:00
sjl
ecbc3c30c8 1 2025-08-08 13:24:19 +08:00
sjl
0a65efd235 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/home/components/compareTestPopup.vue
#	frontend/src/views/home/components/testPopup.vue
2025-08-08 13:21:42 +08:00
sjl
5cd8fea60c 预见测 2025-08-08 13:18:01 +08:00
caozehui
3d1b4eb7c6 微调 2025-08-07 16:08:36 +08:00
ec1330bdb8 前端优化调整 2025-08-07 15:44:17 +08:00
caozehui
e66bcdb293 正式检测userPageId参数 2025-08-07 15:29:49 +08:00
sjl
88f1876ef0 通道配对 2025-08-07 15:17:04 +08:00
sjl
fdc1fd6fbd Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-07 14:44:04 +08:00
sjl
022d80f30e 实时数据对齐 2025-08-07 14:43:56 +08:00
f59f287b63 前端优化调整 2025-08-07 08:55:28 +08:00
6e573cc597 前端优化调整 2025-08-07 08:47:56 +08:00
d2f92ecde4 前端优化调整 2025-08-06 19:53:22 +08:00
sjl
b2a6a1de4e websocket 2025-08-06 15:28:17 +08:00
sjl
f374df79a6 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/utils/webSocketClient.ts
2025-08-06 15:21:17 +08:00
sjl
154eb9f79c 1 2025-08-06 15:19:27 +08:00
sjl
d0724cb7f6 预检测 2025-08-06 15:18:27 +08:00
d6d63523a3 websocket优化 2025-08-06 13:33:09 +08:00
sjl
83998f88ac Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-08-05 10:37:48 +08:00
sjl
9c5e54507b 通道配对,预检测界面 2025-08-05 10:37:40 +08:00
caozehui
15689b5284 Merge branch 'qr_branch'
# Conflicts:
#	frontend/src/views/machine/device/index.vue
2025-07-31 09:47:40 +08:00
caozehui
00893d2d1f 微调 2025-07-31 09:40:12 +08:00
sjl
0079f7415e 检测计划列表编辑 2025-07-29 18:35:46 +08:00
327801d040 出厂检测报告改造 2025-07-24 16:30:19 +08:00
sjl
6e22c01dd8 通道配对 2025-07-24 08:29:03 +08:00
sjl
bccb4b1f17 被检设备监测点 2025-07-22 16:12:08 +08:00
sjl
1f37cc567c 首页隐藏子计划,计划列表子计划设备管理 2025-07-22 14:56:58 +08:00
sjl
f81503091d Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-07-21 13:48:07 +08:00
sjl
e29f25653e 比对检测计划 2025-07-21 13:47:56 +08:00
caozehui
9e8e44b886 二楼检测项为空问题 2025-07-18 14:33:12 +08:00
caozehui
6e10b0c645 二楼检测项为空问题 2025-07-14 15:02:07 +08:00
sjl
c8f3b4eddc tab监测点框高度 2025-07-09 20:58:52 +08:00
sjl
cc848b1ffb 标准设备,比对模式被检设备 2025-07-09 20:12:40 +08:00
sjl
d2f0382bd9 新增场景切换 2025-07-01 14:58:11 +08:00
sjl
9fecf0ce3f 用户管理去除时间查询 2025-07-01 10:47:59 +08:00
sjl
290586d0ff 全局误差小数位4-6位 2025-06-30 10:06:19 +08:00
sjl
ddc45af223 优化计划弹框 2025-06-27 10:57:57 +08:00
sjl
0e6f123306 新增计划初始化 2025-06-27 10:53:56 +08:00
sjl
7b93363b23 通用配置误差保留小数位 2025-06-27 09:01:06 +08:00
caozehui
2fd0dcb8a3 微调 2025-06-27 08:40:27 +08:00
caozehui
86ee05f8af 微调 2025-06-26 14:01:04 +08:00
caozehui
38814b9f44 手动检测根据检测内容不同动态决定是否进行初始化操作 2025-06-26 13:17:11 +08:00
caozehui
fb5d13671d Merge remote-tracking branch 'origin/master' 2025-06-25 09:22:14 +08:00
caozehui
310a769092 微调 2025-06-25 09:21:58 +08:00
sjl
8c63edabdc 楼下场景不用报告模版 2025-06-24 11:03:55 +08:00
caozehui
5363625a2f 微调 2025-06-24 09:22:36 +08:00
efcd6e1cfe 临时提交(自动检测步骤) 2025-06-23 13:19:38 +08:00
acc4d0ca67 被检设备表格增加IP字段 2025-06-20 14:58:28 +08:00
772f38feca 代码提交 2025-06-20 12:11:57 +08:00
sjl
1eb141e559 新增检测计划默认显示,为空判断 2025-06-11 16:01:23 +08:00
caozehui
16b446bf20 微调 2025-06-04 22:15:37 +08:00
sjl
bc0de34c15 预检测不显示温度框 2025-06-04 16:38:02 +08:00
sjl
15f2c1ee41 用户,角色超级管理员不可编辑 2025-05-29 10:49:26 +08:00
sjl
81a944062a Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-05-29 10:15:10 +08:00
sjl
3c19b05f4b 间谐波次数,IP地址 2025-05-29 10:15:03 +08:00
caozehui
c1f53cdc69 微调 2025-05-27 09:07:59 +08:00
sjl
6ef2a6049b 系数校准二次确认,输入框长度限值 2025-05-26 15:36:06 +08:00
caozehui
9989cc98cb 微调 2025-05-26 14:41:06 +08:00
caozehui
e192158deb 微调 2025-05-23 10:15:05 +08:00
caozehui
2e5d551e5d 添加脚本与ICD检验时出现10500错误 2025-05-22 18:43:33 +08:00
caozehui
4622eb36d9 ABC三项可以分开单独展示部分相的数据 2025-05-22 08:45:55 +08:00
caozehui
9c53b7c18e 微调 2025-05-21 15:29:39 +08:00
caozehui
7b3805060f 微调 2025-05-19 09:15:48 +08:00
caozehui
629600bc00 归档前如果设备没有生成报告则自动生成报告 2025-05-16 10:33:43 +08:00
caozehui
8b144b63fc 批量生成报告 2025-05-15 16:08:35 +08:00
caozehui
098ab3a41d 省级平台在正式检测时增加温度、相对湿度参数 2025-05-15 08:57:24 +08:00
caozehui
2a53f577aa 检测计划新增数据处理原则字段、全局配置中移除数据处理原则字段 2025-05-14 08:58:21 +08:00
caozehui
f8b7c224b7 检测计划数据源字段显示bug、脚本大项启用/禁用功能 2025-05-12 15:57:19 +08:00
caozehui
f0b3bdd37c 预检测出现连接超时错误提示 2025-05-12 14:38:25 +08:00
caozehui
bb35eb749b 不合格项复检bug 2025-05-09 08:51:54 +08:00
caozehui
b3750d6a7f 微调 2025-05-06 15:22:26 +08:00
caozehui
33ebb91ab6 微调 2025-05-06 15:14:58 +08:00
sjl
3e00f2fee7 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-05-06 11:00:23 +08:00
sjl
68e9856641 省级平台不展示系数校准 2025-05-06 11:00:12 +08:00
caozehui
51b2e80493 微调 2025-05-06 10:19:41 +08:00
sjl
cf77572f41 设备类型报告模版只在楼下厂家展示 2025-05-06 10:08:57 +08:00
GGJ
fe6524404c 微调 2025-04-29 10:47:25 +08:00
caozehui
ccda7218f4 检测计划数据源字段调整、绑定设备样式调整 2025-04-28 09:18:52 +08:00
caozehui
ddd0e6a22b (间)谐波含有率可以为小数 2025-04-27 16:11:48 +08:00
caozehui
ed85453de1 误差体系切换时-生成报告 2025-04-25 14:32:17 +08:00
caozehui
04939606fc 间谐波电流、间谐波电流复制bug,tooltip位置调整 2025-04-24 16:16:04 +08:00
caozehui
2df455b667 暂态设定幅值最大为180% 2025-04-24 10:18:27 +08:00
caozehui
8fb214d7a7 微调 2025-04-23 15:28:35 +08:00
caozehui
4f2c8a8016 微调 2025-04-23 10:45:46 +08:00
caozehui
c2974dbe0d 微调 2025-04-22 15:52:03 +08:00
caozehui
3891e5459a 误差体系修改 2025-04-22 14:21:24 +08:00
caozehui
9ed47ac5bc 检测结果数据显示问题 2025-04-22 14:12:07 +08:00
caozehui
114fcd140d 微调 2025-04-22 13:49:59 +08:00
caozehui
19a30894f8 微调 2025-04-21 09:11:31 +08:00
caozehui
2134fea518 微调 2025-04-21 09:10:24 +08:00
caozehui
82f495ce3b 调整窗口大小 2025-04-18 13:42:48 +08:00
caozehui
f2ecff54a3 微调 2025-04-18 11:07:04 +08:00
caozehui
f56004ac15 微调 2025-04-17 14:47:32 +08:00
caozehui
5303c47248 微调 2025-04-17 10:21:38 +08:00
GGJ
37731592f7 微调 2025-04-16 10:17:37 +08:00
caozehui
c9e41e0c82 日志导出csv、报告模板编辑框样式调整 2025-04-15 09:45:00 +08:00
caozehui
4a80a88e6e 微调 2025-04-14 19:51:06 +08:00
caozehui
30b219e14d 微调 2025-04-14 14:43:29 +08:00
caozehui
ecec9adeea icd校验 2025-04-14 13:22:46 +08:00
caozehui
1853152138 日志分页查询及展示 2025-04-11 14:34:56 +08:00
GGJ
5619413f37 修改点击使能默认够选通道使能,修改暂态使能持续时间保持一致 2025-04-10 11:11:23 +08:00
caozehui
5b736bc475 微调 2025-04-10 10:50:53 +08:00
caozehui
2aa37c3fe3 微调 2025-04-09 20:42:17 +08:00
caozehui
4e0cb72f32 微调 2025-04-09 20:06:08 +08:00
caozehui
ce74ec4db7 bug修复 2025-04-09 19:30:00 +08:00
caozehui
9938306884 微调 2025-04-09 14:30:00 +08:00
caozehui
ef63fcf807 bug修复 2025-04-08 09:51:35 +08:00
caozehui
08cffa4256 bug修复 2025-04-08 09:43:12 +08:00
caozehui
e1a740f8bf 文件大小提示 2025-03-31 18:54:13 +08:00
caozehui
56d035253b 微调 2025-03-31 13:22:57 +08:00
caozehui
e7348107d0 解决forge库在桌面端无法使用的问题 2025-03-28 09:38:59 +08:00
caozehui
ea38b4eb21 微调 2025-03-28 09:31:46 +08:00
GGJ
67ef976739 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-27 18:34:51 +08:00
GGJ
60145ec4f7 修改参考设定值添加单位 2025-03-27 18:34:40 +08:00
caozehui
81600ddc69 引入获取是否自动生成报告接口 2025-03-27 16:20:16 +08:00
caozehui
e0941d628b 引入获取是否自动生成报告接口 2025-03-27 15:54:27 +08:00
caozehui
760dcbf723 微调 2025-03-27 14:59:01 +08:00
caozehui
b75ecb8c66 微调 2025-03-26 15:42:40 +08:00
caozehui
39f4cfa670 微调 2025-03-25 15:49:32 +08:00
caozehui
862251b83c 微调 2025-03-25 15:08:25 +08:00
caozehui
312490ce59 微调 2025-03-24 19:56:11 +08:00
caozehui
d7df999cf2 登录接口加密传输登录信息 2025-03-24 19:22:56 +08:00
caozehui
e0b1b5907b 微调 2025-03-24 15:41:53 +08:00
sjl
f06ca03881 微调 2025-03-24 14:59:45 +08:00
caozehui
a9b80ed33c 微调 2025-03-24 10:46:16 +08:00
sjl
834230b26a 报告模版 2025-03-24 08:56:08 +08:00
caozehui
403ddbfb6e 微调 2025-03-20 19:42:46 +08:00
caozehui
ffb44ea909 微调 2025-03-20 16:31:15 +08:00
sjl
b729e4efa1 微调 2025-03-19 13:30:11 +08:00
sjl
962c286fd5 主题切换 2025-03-19 10:26:41 +08:00
caozehui
c215f51554 微调 2025-03-18 19:38:27 +08:00
GGJ
859c85b427 检测脚本添加 额定电压 额定电流字段 2025-03-18 16:28:22 +08:00
sjl
5fe637e84f 微调 2025-03-17 16:03:53 +08:00
sjl
5f68071c77 微调颜色 2025-03-17 15:55:30 +08:00
caozehui
1675a5af31 微调 2025-03-17 14:33:19 +08:00
caozehui
ec1d09dbd0 微调 2025-03-17 13:30:00 +08:00
caozehui
eda7b516f6 微调 2025-03-17 13:24:35 +08:00
sjl
630eb48d28 微调 2025-03-17 13:17:12 +08:00
caozehui
0d2f8a7788 微调 2025-03-14 16:30:45 +08:00
GGJ
230c68f454 修改他不删除后编辑检测监本还存在问题 2025-03-14 16:23:27 +08:00
GGJ
68934060e6 修改参考设定值0不显示 2025-03-14 16:10:00 +08:00
GGJ
846e7514b7 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-14 15:03:45 +08:00
GGJ
410cfb0f7a 检测脚本添加额定电压、额定电流 修改bug 2025-03-14 15:03:36 +08:00
caozehui
c892410b07 微调 2025-03-14 14:45:39 +08:00
sjl
7caa4a5303 微调 2025-03-14 12:27:04 +08:00
sjl
c17efbf9f6 微调 2025-03-14 12:13:34 +08:00
c46abeecf5 websocket代码提交 2025-03-14 11:35:55 +08:00
caozehui
0947097932 微调 2025-03-14 11:23:49 +08:00
caozehui
50fc02d4eb 微调 2025-03-13 14:40:33 +08:00
caozehui
a122e9e1b3 微调 2025-03-12 15:01:58 +08:00
sjl
d7cfcc7855 微调 2025-03-12 11:17:12 +08:00
sjl
05948aebf5 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-12 09:53:01 +08:00
sjl
cca214aaf7 程控源 2025-03-12 09:52:52 +08:00
caozehui
0111954c5e 微调 2025-03-11 19:07:47 +08:00
sjl
ce31499964 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-11 18:58:39 +08:00
sjl
059864d193 微调 2025-03-11 18:58:26 +08:00
caozehui
6d2fb4dde8 微调 2025-03-11 18:29:09 +08:00
caozehui
49059d9c59 微调 2025-03-11 18:19:18 +08:00
caozehui
d2f7041988 微调 2025-03-11 18:10:10 +08:00
caozehui
f94372d20b 微调 2025-03-11 16:13:03 +08:00
sjl
9af98b034f 微调 2025-03-11 14:16:21 +08:00
sjl
341b8df5a9 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-11 11:31:02 +08:00
sjl
7470f697bd 微调 2025-03-11 11:30:52 +08:00
caozehui
c058b99a0d 微调 2025-03-11 11:30:10 +08:00
caozehui
d5eed13f38 测试项为1条时也展示出来 2025-03-11 11:04:02 +08:00
caozehui
c27ee88182 微调 2025-03-10 20:14:35 +08:00
sjl
e2559ffa65 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-10 20:00:03 +08:00
sjl
a0bd32453c 微调 2025-03-10 19:59:55 +08:00
sjl
54e7a91841 微调 2025-03-10 19:58:53 +08:00
caozehui
042f6eef51 脚本切换 2025-03-10 19:53:52 +08:00
GGJ
c9857326c6 修改 检测脚本参考值 2025-03-10 16:11:08 +08:00
GGJ
9c4e0094f9 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-10 16:00:15 +08:00
GGJ
781b27af51 修改间谐波值 2025-03-10 16:00:07 +08:00
caozehui
37e257afc8 Loading加载效果 2025-03-10 11:39:10 +08:00
GGJ
4d4fdd6190 修改测试bug 2025-03-10 11:18:32 +08:00
caozehui
0fd2d8252d 微调 2025-03-10 10:50:53 +08:00
caozehui
3cf5019880 源程控-时间展示 2025-03-10 10:10:32 +08:00
caozehui
258d3d692f 源参数默认展开 2025-03-10 10:09:15 +08:00
caozehui
667ed3bcc0 微调 2025-03-08 18:27:10 +08:00
caozehui
a882189022 微调 2025-03-08 18:13:16 +08:00
caozehui
686e009243 微调 2025-03-08 18:07:47 +08:00
caozehui
30d5f3390c Merge branch 'release' 2025-03-08 18:06:50 +08:00
caozehui
3398b414ca 微调 2025-03-08 16:56:57 +08:00
caozehui
b6a2c42feb Merge remote-tracking branch 'origin/release' into release
# Conflicts:
#	frontend/src/views/machine/controlSource/index.vue
2025-03-08 16:05:56 +08:00
caozehui
cb5a9050f2 微调 2025-03-08 16:04:43 +08:00
caozehui
661b27abd0 微调 2025-03-08 16:04:08 +08:00
caozehui
59a24c9ea2 Merge branch 'release' 2025-03-08 16:02:09 +08:00
caozehui
6cf5da5d48 微调 2025-03-08 16:01:41 +08:00
caozehui
537f5e2f4c Merge branch 'release'
# Conflicts:
#	frontend/src/views/machine/controlSource/index.vue
2025-03-08 14:39:20 +08:00
caozehui
70531a0729 微调 2025-03-08 14:36:48 +08:00
caozehui
ded15e5c8b 微调 2025-03-08 10:50:39 +08:00
caozehui
3021f7e4d3 微调 2025-03-08 10:49:42 +08:00
caozehui
876d9cfa00 微调 2025-03-08 10:48:25 +08:00
caozehui
8f28825162 微调 2025-03-08 10:47:19 +08:00
caozehui
0e6612f6bd 微调 2025-03-08 10:15:11 +08:00
caozehui
39183fde5d 微调 2025-03-07 16:26:14 +08:00
caozehui
b967419cb1 微调 2025-03-07 15:43:36 +08:00
sjl
0712698638 微调 2025-03-07 14:44:12 +08:00
sjl
d3a74e830f 微调 2025-03-07 14:00:20 +08:00
sjl
f68da773ab 微调 2025-03-07 13:17:11 +08:00
sjl
8db814dba4 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-03-07 10:17:14 +08:00
sjl
7dcff99de5 微调 2025-03-07 10:17:06 +08:00
caozehui
97100dfa63 复制-二次弹窗确认 2025-03-07 09:02:19 +08:00
caozehui
d41707fcf9 微调 2025-03-06 15:50:45 +08:00
sjl
2377916f29 微调 2025-03-05 11:19:16 +08:00
caozehui
be2f40715a 微调 2025-03-05 10:42:25 +08:00
sjl
489c0882ac 微调 2025-03-05 09:32:13 +08:00
sjl
492db88b45 检测脚本查看隐藏显示 2025-03-04 16:01:34 +08:00
caozehui
3b198eb4ed 微调 2025-03-04 14:12:50 +08:00
caozehui
5efc27d4b6 微调 2025-03-04 10:28:09 +08:00
sjl
ec9f270d04 检测脚本详情查看 2025-03-04 09:35:41 +08:00
caozehui
afd2d467f3 微调 2025-03-03 13:33:17 +08:00
caozehui
ff0798450d 微调 2025-03-03 13:29:48 +08:00
caozehui
fbefc70368 微调 2025-03-03 13:25:19 +08:00
caozehui
faa0bc54a6 不合格项复检 2025-03-03 11:35:12 +08:00
caozehui
bf5f4eab77 Merge branch 'master' into dev 2025-02-28 15:38:08 +08:00
GGJ
188456c970 添加查看页面 2025-02-28 13:58:15 +08:00
caozehui
c06334e96f Merge branch 'master' into dev
# Conflicts:
#	frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
2025-02-28 09:03:05 +08:00
GGJ
82e8bf2e0b 优化检测脚本样式 2025-02-28 09:00:15 +08:00
GGJ
30382fb34d 添加一键重算功能 2025-02-27 16:24:13 +08:00
GGJ
c7e5ee0862 优化检测脚本页面 2025-02-27 15:09:09 +08:00
caozehui
d6ac63586b 合并master分支 2025-02-27 14:45:22 +08:00
caozehui
e0fd42199f 微调 2025-02-27 14:34:47 +08:00
caozehui
d9e3168484 Merge branch 'master' into dev
# Conflicts:
#	frontend/src/views/home/components/test.vue
#	frontend/src/views/home/components/testPopup.vue
2025-02-27 13:52:17 +08:00
caozehui
dc7e91ca66 微调 2025-02-27 10:07:41 +08:00
caozehui
692358d278 微调 2025-02-27 08:48:13 +08:00
GGJ
3750031d6b Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-02-27 08:42:37 +08:00
GGJ
0bae200241 优化检测脚本页面
录入检测脚本
2025-02-27 08:41:33 +08:00
sjl
61bd1a0d6a 微调 2025-02-26 19:49:23 +08:00
sjl
37cf3dfdd7 测试 2025-02-26 19:44:27 +08:00
caozehui
8be96ca64e 微调 2025-02-26 19:31:34 +08:00
sjl
d225391248 日志测试 2025-02-26 19:20:02 +08:00
sjl
f2fd0b078e 日志测试 2025-02-26 19:05:56 +08:00
caozehui
f71963ea3b 微调 2025-02-26 19:02:43 +08:00
sjl
6a635246bb 日志测试 2025-02-26 19:00:37 +08:00
caozehui
d338ca6b25 微调 2025-02-26 18:55:50 +08:00
caozehui
193c3b963c 微调 2025-02-26 18:07:57 +08:00
sjl
cad4965b1b 微调 2025-02-26 16:23:27 +08:00
caozehui
79306d846f 微调 2025-02-26 15:58:16 +08:00
caozehui
f4ea510c5d 测试1 2025-02-26 15:56:03 +08:00
sjl
07cc26fa8d 微调 2025-02-26 13:58:56 +08:00
sjl
f87e268242 微调 2025-02-26 13:57:42 +08:00
caozehui
1aeceffe0b 测试1 2025-02-26 13:57:07 +08:00
caozehui
fc97087767 测试1 2025-02-26 13:22:01 +08:00
sjl
61be97b04b Merge branch 'dev' of http://192.168.1.22:3000/frontend/pqs-9100_client into dev 2025-02-26 11:40:41 +08:00
sjl
934162875c 微调 2025-02-26 11:40:31 +08:00
caozehui
4b3991099a 微调 2025-02-26 11:25:20 +08:00
caozehui
b14a961c1a 微调 2025-02-26 11:13:28 +08:00
sjl
cbe41d80ce 合并frontend/src/views/home/components/testPopup.vue 2025-02-26 10:54:43 +08:00
sjl
28203f2621 微调 2025-02-26 10:52:39 +08:00
caozehui
b8492dfbe6 微调 2025-02-26 10:42:01 +08:00
caozehui
15faac8079 正式检测-移除重新检测按钮 2025-02-26 10:05:43 +08:00
caozehui
ad850ca4ee 微调 2025-02-26 10:00:44 +08:00
caozehui
6c05c6e06e 微调 2025-02-26 09:14:27 +08:00
caozehui
8b2cda80b1 微调 2025-02-25 16:37:59 +08:00
caozehui
3f7756b417 微调 2025-02-25 16:18:22 +08:00
caozehui
5004e319b6 微调 2025-02-25 15:11:23 +08:00
caozehui
19035f2dc9 微调 2025-02-25 15:03:45 +08:00
caozehui
9d8a5c76b2 微调 2025-02-25 14:52:06 +08:00
caozehui
6300eb2f43 微调 2025-02-25 14:13:59 +08:00
sjl
da58ffb621 微调 2025-02-25 14:01:07 +08:00
sjl
1500fafb92 微调 2025-02-25 14:00:40 +08:00
sjl
df53eea432 微调 2025-02-25 13:53:47 +08:00
sjl
cc1771c208 微调 2025-02-25 13:52:57 +08:00
caozehui
5e881c0804 微调 2025-02-25 13:48:44 +08:00
caozehui
5666e01ae0 微调 2025-02-25 13:47:33 +08:00
caozehui
4acec8a2d6 微调 2025-02-25 13:46:01 +08:00
sjl
426a511099 微调 2025-02-25 11:20:19 +08:00
caozehui
89303b44ae 微调 2025-02-25 11:00:04 +08:00
caozehui
ffb82066bb 正式检测设备连接超时,停止检测 2025-02-25 10:46:12 +08:00
caozehui
f46b8c0a56 微调 2025-02-25 10:29:29 +08:00
caozehui
280289af37 手动检测功能修改、一键检测功能修改(均未完成) 2025-02-25 10:17:33 +08:00
GGJ
a0c7f79302 修改检测脚本闪变编辑逻辑 2025-02-25 08:58:03 +08:00
GGJ
bd1eecc106 优化检测脚本页面 2025-02-24 16:45:39 +08:00
sjl
1a23bcb510 检测计划未检下拉框不可编辑 2025-02-24 16:30:52 +08:00
sjl
942c28d3bd 微调 2025-02-24 08:54:22 +08:00
GGJ
034b31ba47 联调检测脚本 2025-02-24 08:38:54 +08:00
sjl
7a76c2da8a 微调 2025-02-21 14:57:52 +08:00
caozehui
1a9d8e8606 检测通道数量微调 2025-02-21 09:05:06 +08:00
GGJ
14583d919d 联调检测脚本修改功能 2025-02-20 16:39:15 +08:00
caozehui
629fd174e4 微调 2025-02-20 15:01:15 +08:00
sjl
9080fe06a4 角标对齐 2025-02-20 10:21:36 +08:00
sjl
0e183bb5c1 检测源删除 2025-02-20 10:10:28 +08:00
GGJ
8caf856d2d 联调检测脚本页面 2025-02-19 16:54:54 +08:00
caozehui
d28669e6b0 正式检测-时间显示调整 2025-02-19 13:17:19 +08:00
700884d01a websocket代码提交 2025-02-19 11:28:52 +08:00
c06bd9fa24 websocket代码提交 2025-02-19 11:00:09 +08:00
GGJ
ce92a1d645 联调 新增检测脚本 2025-02-18 16:36:54 +08:00
caozehui
4f622da52c 调整检测计划导入、导出功能适应二楼装备 2025-02-18 15:58:38 +08:00
7d3e86a5fc websocket代码提交 2025-02-18 14:59:13 +08:00
sjl
c66d181b98 检测计划取消勾选 2025-02-18 09:00:23 +08:00
GGJ
f860630bfb 修改检测脚本新增页面路由权限 2025-02-18 08:51:20 +08:00
caozehui
6db4d79839 调整 2025-02-18 08:48:59 +08:00
GGJ
e2924d5e57 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/machine/testScript/components/testScriptPopup.vue
#	frontend/src/views/machine/testScript/index.vue
2025-02-17 16:46:20 +08:00
GGJ
92b9a82f21 修改检测脚本页面 2025-02-17 16:44:02 +08:00
sjl
c3f89ca1f8 微调 2025-02-17 16:32:02 +08:00
sjl
8c435c91dd Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-02-17 16:29:06 +08:00
sjl
6e6cfa5be0 微调 2025-02-17 16:28:59 +08:00
caozehui
ea203d0ccc 调整统计分析功能 2025-02-17 16:26:23 +08:00
caozehui
370cd52774 调整静态路由 2025-02-17 13:37:27 +08:00
caozehui
942bae3045 微调 2025-02-17 11:30:56 +08:00
caozehui
356548c8fb 显示时间 2025-02-17 10:16:48 +08:00
GGJ
5c012c2bc9 修改 检测脚本新增页面 2025-02-17 09:00:27 +08:00
GGJ
9c9b8015a0 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-02-17 08:40:19 +08:00
GGJ
bba0ced7f9 修改 测试脚本页面 2025-02-17 08:39:18 +08:00
caozehui
e8de7b56d9 微调 2025-02-14 16:22:45 +08:00
caozehui
95022f62a8 数据分析 2025-02-14 13:30:50 +08:00
sjl
1d918f3335 微调 2025-02-14 11:44:19 +08:00
caozehui
f992637ad2 微调 2025-02-14 10:59:21 +08:00
caozehui
40f18bbdf8 微调 2025-02-14 10:39:00 +08:00
caozehui
3bb9cec08a 微调 2025-02-14 10:31:16 +08:00
caozehui
6842260f59 微调 2025-02-14 09:57:26 +08:00
sjl
305c30d725 微调 2025-02-14 09:16:07 +08:00
caozehui
e799dd2f08 移除headers中的Refresh-Token,添加Is-Refresh-Token 2025-02-13 21:02:34 +08:00
GGJ
1e83172e9a 修改检测脚本页面 2025-02-13 16:15:26 +08:00
sjl
475d236b7e 微调 2025-02-13 15:40:13 +08:00
sjl
ddeb84fcfe 微调 2025-02-11 14:25:12 +08:00
sjl
b3aeebb7c7 icd管理 2025-02-11 11:26:50 +08:00
sjl
b11f4839f4 微调 2025-02-11 10:59:41 +08:00
sjl
4adc28a055 设备类型 2025-02-11 10:40:34 +08:00
sjl
e46e9e1d3a 设备类型CRUD 2025-02-11 10:32:09 +08:00
sjl
4fcb26bbde Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-02-11 10:31:57 +08:00
caozehui
6bd0e891fa 改为12通道 2025-02-11 09:10:50 +08:00
sjl
15f1308557 设备类型 2025-02-10 16:35:14 +08:00
caozehui
9689197db9 微调 2025-02-10 15:41:59 +08:00
caozehui
4ad490657f 微调 2025-02-10 15:16:13 +08:00
caozehui
9f8f8244e3 微调 2025-02-08 15:36:56 +08:00
sjl
9206be2562 登录失效 2025-02-07 14:28:15 +08:00
caozehui
6065fd1f67 双token(未做完) 2025-02-07 10:39:30 +08:00
sjl
c16560a0ca 微调 2025-01-23 10:05:47 +08:00
caozehui
440cfe1ac5 源未开启外联机错误弹窗出现2次 2025-01-23 09:33:00 +08:00
sjl
1ad1a0198e 微调 2025-01-22 16:28:09 +08:00
caozehui
b603ac9bdb 源未开启外联机错误 2025-01-22 14:31:53 +08:00
caozehui
68aa4c409b 三项不平衡原始数据表头修改 2025-01-22 14:03:50 +08:00
sjl
f22b4e7fb8 微调 2025-01-22 12:09:32 +08:00
caozehui
400328d5fa 引入导出原始数据接口 2025-01-21 14:52:44 +08:00
caozehui
cce3e6861a 查看结果弹窗-通道下拉框 2025-01-21 11:06:22 +08:00
sjl
55368ce9b8 微调 2025-01-21 09:05:35 +08:00
caozehui
c6ef54f7d3 正式检测-预检测阶段错误码处理、频率、三项电压不平衡表头修改 2025-01-20 15:24:29 +08:00
GGJ
6f97c48226 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-17 15:06:58 +08:00
GGJ
5f45bc98fb 修改 WebSocket 关闭浏览器心跳问题 2025-01-17 15:06:44 +08:00
sjl
5738594be2 微调 2025-01-17 14:57:17 +08:00
sjl
ce47831992 socket连接不上处理 2025-01-17 09:59:23 +08:00
634c2d84fc Merge remote-tracking branch 'origin/master' 2025-01-17 09:35:58 +08:00
70855c5a21 websocket代码提交 2025-01-17 09:35:44 +08:00
sjl
b1e5e70411 微调 2025-01-17 09:25:52 +08:00
sjl
bf2e3219fc Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-17 09:15:58 +08:00
sjl
2f5aeb9ffc 微调 2025-01-17 09:15:52 +08:00
9e8ed310fc websocket代码提交 2025-01-17 09:14:19 +08:00
07a5e32579 批量导入被检设备 2025-01-16 19:45:48 +08:00
sjl
fe1bb04922 微调 2025-01-16 16:32:06 +08:00
a75e964adc 正式检测代码提交 2025-01-16 15:57:29 +08:00
sjl
87d22032e6 微调 2025-01-16 15:43:58 +08:00
sjl
55ae64b3e1 微调 2025-01-16 14:24:55 +08:00
caozehui
891c6d8e93 检测结果查看,相角类的放在最后展示 2025-01-16 10:00:49 +08:00
caozehui
ba7747dfe9 暂停时间过长页面效果 2025-01-16 08:51:47 +08:00
b148c04059 正式检测代码提交 2025-01-15 21:08:07 +08:00
sjl
4e179d61b5 微调 2025-01-15 20:37:58 +08:00
sjl
b23ee84543 微调 2025-01-15 20:32:14 +08:00
sjl
d02f85cea5 微调 2025-01-15 20:23:05 +08:00
ab02f8f1b3 正式检测代码提交 2025-01-15 19:27:33 +08:00
8fc1d1ffc9 微调报告 2025-01-15 18:01:12 +08:00
caozehui
44b1da94c1 二楼使用设备导入导出 2025-01-15 16:02:04 +08:00
sjl
c2b63a7a3f 微调 2025-01-15 13:46:11 +08:00
sjl
56619c9140 微调 2025-01-15 13:26:05 +08:00
caozehui
99bbb5434d 切换通道左侧树问题、点击左侧树测试项类别清空、点击左侧树赋值ScriptType 2025-01-15 10:49:28 +08:00
GGJ
40c9c5fdad 修改打包后svg无法显示问题 2025-01-15 10:29:19 +08:00
caozehui
3ea2c93e43 T相显示为检测名称 2025-01-15 10:14:33 +08:00
sjl
6369c8ee63 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-15 09:36:12 +08:00
sjl
da4bbf1e2c 微调 2025-01-15 09:36:04 +08:00
sjl
14e5535fd8 微调 2025-01-15 09:35:36 +08:00
caozehui
4e53bb3b27 10552错误重新检测、相序校验25003错误 2025-01-15 09:33:07 +08:00
GGJ
e793fdbe42 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-15 09:07:23 +08:00
GGJ
0e41a5b9f1 修改tab刷新位置问题 2025-01-15 09:07:12 +08:00
caozehui
ac9dfd1669 测试小项日志展示 2025-01-15 08:59:47 +08:00
caozehui
72eb3e189b 暂停页面效果调整 2025-01-15 08:53:45 +08:00
GGJ
0cace11975 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-15 08:42:59 +08:00
GGJ
b8e502b168 修改页面缓存 2025-01-15 08:42:41 +08:00
caozehui
15502d0107 暂停页面效果调整 2025-01-14 21:07:52 +08:00
GGJ
cb4e4646bd Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-14 19:26:29 +08:00
GGJ
93ce1b4994 修改登录页样式 2025-01-14 19:26:22 +08:00
sjl
1c452b5574 微调 2025-01-14 19:05:08 +08:00
caozehui
876c06ef54 暂停页面效果调整 2025-01-14 18:58:13 +08:00
sjl
37d65a944d 微调 2025-01-14 16:24:29 +08:00
caozehui
7bc9321c86 Merge remote-tracking branch 'origin/master' 2025-01-14 16:22:05 +08:00
caozehui
ee564dccb6 暂停正式检测 2025-01-14 16:21:50 +08:00
GGJ
cdbb386c7c Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-14 16:19:51 +08:00
GGJ
325ade7cdc 修改样式 2025-01-14 16:19:15 +08:00
caozehui
fcd8c1a0dd 修复数据查询弹窗,左侧切换,检测项目切换时,数据错误 2025-01-14 16:16:30 +08:00
sjl
fa1cb02a51 微调 2025-01-14 16:03:37 +08:00
caozehui
40fe12cd96 相别名称修改,数据查询弹窗,数据为空时处理 2025-01-14 15:34:35 +08:00
sjl
d83c04dc8b Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-14 15:14:44 +08:00
sjl
23b2974597 微调 2025-01-14 15:14:37 +08:00
caozehui
f5e78316ef 被检测设备-模式字段隐藏 2025-01-14 14:40:35 +08:00
caozehui
cc2020f3d6 暂停调整 2025-01-14 14:17:05 +08:00
sjl
26cda335c5 微调 2025-01-14 11:43:35 +08:00
caozehui
171533cef0 调整优先级 2025-01-14 10:36:42 +08:00
sjl
69de6dd7a3 设备名称 2025-01-14 10:03:44 +08:00
sjl
9039ed4bdc Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-13 23:17:31 +08:00
sjl
131d3b7018 微调 2025-01-13 23:17:24 +08:00
caozehui
454aabdc97 右上角错误提示 2025-01-13 22:59:03 +08:00
caozehui
089c97d859 微调 2025-01-13 22:53:38 +08:00
caozehui
9ff5423368 完善归档接口 2025-01-13 22:50:55 +08:00
sjl
f29d6e8d88 归档 2025-01-13 22:47:15 +08:00
sjl
5199ee2db0 微调 2025-01-13 22:42:14 +08:00
caozehui
6de9e22b4c 谐波次数切换时,原始数据显示为T项NaN问题 2025-01-13 22:05:46 +08:00
caozehui
52968d9aaa 调整检测结果,可筛选测试项 2025-01-13 21:50:24 +08:00
sjl
b584142f5e 微调 2025-01-13 21:38:52 +08:00
sjl
edea30a406 刷新 2025-01-13 21:26:12 +08:00
sjl
1f3024eb91 刷新饼图 2025-01-13 21:06:24 +08:00
8b9abba74b 微调 2025-01-13 20:19:04 +08:00
sjl
4dec1392f7 设备类型接口 2025-01-13 19:28:51 +08:00
sjl
e54cbfbc0a 设备icd 2025-01-13 18:32:42 +08:00
caozehui
505cd93446 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/api/device/device/index.ts
2025-01-13 18:21:24 +08:00
caozehui
f3ee11ebab 引入归档接口 2025-01-13 18:20:35 +08:00
sjl
45295ef898 微调 2025-01-13 18:13:55 +08:00
sjl
0635dda6a0 微调 2025-01-13 18:12:36 +08:00
caozehui
f58f7b97e5 展示单位调整 2025-01-13 15:03:24 +08:00
caozehui
7556f0e5bc 原始数据导出按钮、返回左侧树形列表接口调整 2025-01-13 14:22:54 +08:00
caozehui
17fe29cb1b 谐波次数、弹窗位置 2025-01-13 13:57:24 +08:00
caozehui
4bb4eb80d9 报告生成 2025-01-13 09:59:05 +08:00
ae1507e775 添加下载 2025-01-13 09:35:41 +08:00
sjl
85d8a57bf7 微调 2025-01-13 08:56:13 +08:00
caozehui
42cf23a516 微调 2025-01-10 14:19:29 +08:00
caozehui
858cf75b46 处理右侧原始数据表格行数错误问题 2025-01-10 14:15:07 +08:00
caozehui
de8a392d2c 处理源未知异常、检测结果最大误差回显 2025-01-10 13:49:09 +08:00
caozehui
b614767b2d 处理装置配置异常 2025-01-10 11:03:29 +08:00
caozehui
5ebb8549bf 调整优先级 2025-01-10 10:47:08 +08:00
caozehui
ead1feb379 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/views/home/components/test.vue
2025-01-10 09:36:00 +08:00
caozehui
1474c15bd9 放开数据异常按钮弹窗 2025-01-10 09:34:22 +08:00
caozehui
f24f87dcc8 放开数据异常按钮弹窗 2025-01-10 09:20:32 +08:00
caozehui
d416f46b3a 微调 2025-01-10 09:15:59 +08:00
352df35205 正式检测代码提交 2025-01-09 20:02:34 +08:00
caozehui
e5f201515e 引入暂停、继续检测接口 2025-01-09 16:27:05 +08:00
caozehui
40520a7d30 修改正式检测结果展示错误 2025-01-09 15:49:32 +08:00
caozehui
cffbfe1380 预检测失败处理、正式检测-只检测某一个大项,日志bug 2025-01-09 14:45:43 +08:00
caozehui
839777ea4d 微调 2025-01-09 14:18:50 +08:00
sjl
5be1d22115 微调 2025-01-09 13:56:56 +08:00
caozehui
80d1912fd5 微调 2025-01-09 11:13:34 +08:00
caozehui
b94e0323d9 微调 2025-01-08 21:02:36 +08:00
caozehui
90f4e53e9f 微调 2025-01-08 20:57:11 +08:00
caozehui
7ebad7d6b9 微调 2025-01-08 19:11:34 +08:00
caozehui
34534a1dbf 微调 2025-01-08 18:52:17 +08:00
645fac0681 正式检测代码提交 2025-01-08 15:15:49 +08:00
0a23700403 正式检测代码提交 2025-01-08 15:15:25 +08:00
caozehui
c00f8843c0 微调 2025-01-08 14:48:19 +08:00
caozehui
8869974471 Merge remote-tracking branch 'origin/master' 2025-01-08 14:34:52 +08:00
caozehui
8125d60105 微调 2025-01-08 14:33:47 +08:00
sjl
5a32d5b7a8 系数校准多装置按行展示 2025-01-08 11:40:12 +08:00
caozehui
a1d113562b 微调 2025-01-08 11:02:16 +08:00
caozehui
4a7535e4f5 微调 2025-01-08 10:01:56 +08:00
caozehui
de5548bbbd 微调 2025-01-08 09:46:47 +08:00
caozehui
87c46e8477 微调 2025-01-07 20:24:44 +08:00
caozehui
edda224847 微调 2025-01-07 19:47:38 +08:00
caozehui
5ac6bbf04b 微调 2025-01-07 19:03:00 +08:00
caozehui
b0a5329937 微调 2025-01-07 17:44:25 +08:00
caozehui
7a0626413d 微调 2025-01-07 17:34:15 +08:00
fe04ad1573 正式检测代码提交 2025-01-07 16:27:51 +08:00
caozehui
689cc39bbc 返回结果 2025-01-07 14:54:44 +08:00
caozehui
ba0c577514 修改检测结果弹窗框 2025-01-07 11:19:33 +08:00
caozehui
a629907196 微调 2025-01-07 09:46:35 +08:00
caozehui
bf60bcfe12 微调 2025-01-07 09:01:10 +08:00
caozehui
27eb9a7d93 右侧表格1 2025-01-06 19:20:36 +08:00
caozehui
336ee843cc 微调 2025-01-06 14:50:36 +08:00
sjl
9eac101794 系数校准不合格提示 2025-01-06 14:27:57 +08:00
sjl
085fcc62aa Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2025-01-06 14:07:28 +08:00
sjl
99e6abbcfd 微调 2025-01-06 14:07:21 +08:00
a4b96066e0 样式调整 2025-01-06 14:02:22 +08:00
sjl
c4e2da8d67 主界面,系数校准界面调整 2025-01-06 09:21:24 +08:00
caozehui
1be15ee849 修改右侧表格结构 2025-01-06 08:51:14 +08:00
caozehui
99bc54349b 微调 2025-01-05 14:52:37 +08:00
caozehui
bf823ddff0 微调 2025-01-04 16:33:23 +08:00
caozehui
23e72f38a6 微调 2025-01-04 14:09:01 +08:00
caozehui
2d993b2f73 存在已经初始化步骤,重新检测 2025-01-04 10:49:05 +08:00
9703d35a3a 正式检测代码提交 2025-01-04 09:58:39 +08:00
caozehui
d10a7a4884 微调 2025-01-03 18:57:35 +08:00
caozehui
938b9054d3 微调 2025-01-03 11:27:36 +08:00
777 changed files with 106316 additions and 18223 deletions

3
.gitignore vendored
View File

@@ -7,5 +7,6 @@ package-lock.json
data/
.vscode/launch.json
public/electron/
public/dist/
pnpm-lock.yaml
CLAUDE.md
/public/dist/

View File

@@ -1,112 +0,0 @@
import axios, { AxiosInstance, AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse } from "axios";
import { showFullScreenLoading, tryHideFullScreenLoading } from "@/components/Loading/fullScreen";
import { LOGIN_URL } from "@/config";
import { ElMessage } from "element-plus";
import { ResultData } from "@/api/interface";
import { ResultEnum } from "@/enums/httpEnum";
import { checkStatus } from "./helper/checkStatus";
import { useUserStore } from "@/stores/modules/user";
import router from "@/routers";
export interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
loading?: boolean;
}
const config = {
// 默认地址请求地址,可在 .env.** 文件中修改
baseURL: import.meta.env.VITE_API_URL as string,
// 设置超时时间
timeout: ResultEnum.TIMEOUT as number,
// 跨域时候允许携带凭证
withCredentials: true,
// post请求指定数据类型以及编码
headers: { 'Content-Type': 'application/json;charset=utf-8' }
};
class RequestHttp {
service: AxiosInstance;
public constructor(config: AxiosRequestConfig) {
// 创建实例
this.service = axios.create(config);
/**
* @description 请求拦截器
* 客户端发送请求 -> [请求拦截器] -> 服务器
* token校验(JWT) : 接受服务器返回的 token,存储到 vuex/pinia/本地储存当中
*/
this.service.interceptors.request.use(
(config: CustomAxiosRequestConfig) => {
const userStore = useUserStore();
// 当前请求不需要显示 loading在 api 服务中通过指定的第三个参数: { loading: false } 来控制
config.loading ?? (config.loading = true);
config.loading && showFullScreenLoading();
if (config.headers && typeof config.headers.set === "function") {
config.headers.set("x-access-token", userStore.token);
}
return config;
},
(error: AxiosError) => {
return Promise.reject(error);
}
);
/**
* @description 响应拦截器
* 服务器换返回信息 -> [拦截统一处理] -> 客户端JS获取到信息
*/
this.service.interceptors.response.use(
(response: AxiosResponse) => {
const { data } = response;
const userStore = useUserStore();
tryHideFullScreenLoading();
// 登陆失效
if (data.code == ResultEnum.OVERDUE) {
userStore.setToken("");
router.replace(LOGIN_URL);
ElMessage.error(data.message);
return Promise.reject(data);
}
// 全局错误信息拦截(防止下载文件的时候返回数据流,没有 code 直接报错)
if (data.code && data.code !== ResultEnum.SUCCESS) {
ElMessage.error(data.message);
return Promise.reject(data);
}
// 成功请求(在页面上除非特殊情况,否则不用处理失败逻辑)
return data;
},
async (error: AxiosError) => {
const { response } = error;
tryHideFullScreenLoading();
// 请求超时 && 网络错误单独判断,没有 response
if (error.message.indexOf("timeout") !== -1) ElMessage.error("请求超时!请您稍后重试");
if (error.message.indexOf("Network Error") !== -1) ElMessage.error("网络错误!请您稍后重试");
// 根据服务器响应的错误状态码,做不同的处理
if (response) checkStatus(response.status);
// 服务器结果都没有返回(可能服务器错误可能客户端断网),断网处理:可以跳转到断网页面
if (!window.navigator.onLine) router.replace("/500");
return Promise.reject(error);
}
);
}
/**
* @description 常用请求方法封装
*/
get<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
return this.service.get(url, { params, ..._object });
}
post<T>(url: string, params?: object | string, _object = {}): Promise<ResultData<T>> {
return this.service.post(url, params, _object);
}
put<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
return this.service.put(url, params, _object);
}
delete<T>(url: string, params?: any, _object = {}): Promise<ResultData<T>> {
return this.service.delete(url, { params, ..._object });
}
download(url: string, params?: object, _object = {}): Promise<BlobPart> {
return this.service.post(url, params, { ..._object, responseType: "blob" });
}
}
export default new RequestHttp(config);

6
.npmrc
View File

@@ -2,3 +2,9 @@ registry=https://registry.npmmirror.com/
disturl=https://registry.npmmirror.com/-/binary/node
electron_mirror=https://npmmirror.com/mirrors/electron/
electron-builder-binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
# 屏蔽警告配置
legacy-peer-deps=true
audit=false
fund=false
loglevel=error

View File

@@ -1,5 +1,8 @@
{
"cSpell.words": [
"Analyse",
"CHNFACTOR",
"CHNPACTOR",
"Chns",
"Combox",
"Datasource",
@@ -14,6 +17,7 @@
"Pids",
"plandata",
"PQDIF",
"Preinvestment",
"resourcedata",
"resourcename",
"rmark",

View File

@@ -1,61 +0,0 @@
#### 项目简介
#### 常用命令
```shell
# 运行项目
npm run dev
# 仅运行前端
npm run dev-frontend
# 仅运行后端
npm run dev-electron
# 预发布模式环境变量为prod请先移动资源
npm run start
# 移动前端静态资源
npm run rd
# 移动资源,可配置
npm run move
# 代码加密
npm run encrypt
# 清除加密的代码
npm run clean
# 生成logo
npm run icon
# 打包 windows版
npm run build-w (调整为64位)
npm run build-w-32 (32位)
npm run build-w-64 (64位)
npm run build-w-arm64 (arm64)
# 打包 windows 免安装版)
# ee > v2.2.1
npm run build-wz (调整为64位)
npm run build-wz-32 (32位)
npm run build-wz-64 (64位)
npm run build-wz-arm64 (arm64)
# 打包 mac版
npm run build-m
npm run build-m-arm64 (m1芯片架构)
# 打包 linux版
# ee > v2.2.1
npm run build-l (默认64位 deb包)
npm run build-l-32 (32位 deb包)
npm run build-l-64 (64位 deb包)
npm run build-l-arm64 (64位 deb包 arm64)
npm run build-l-armv7l (64位 deb包 armv7l)
npm run build-lr-64 (64位 rpm包)
npm run build-lp-64 (64位 pacman包)
```

104
build/clean-and-build.bat Normal file
View File

@@ -0,0 +1,104 @@
@echo off
chcp 65001 >nul
echo ========================================
echo 清理并重新打包
echo ========================================
echo.
echo [1/5] 结束所有相关进程...
echo 正在停止 NPQS9100...
taskkill /F /IM NPQS9100.exe 2>nul
echo 正在停止 MySQL...
taskkill /F /IM mysqld.exe 2>nul
timeout /t 2 /nobreak >nul
REM 验证 MySQL 是否真的停止了
tasklist | find /I "mysqld.exe" >nul 2>&1
if %errorlevel% equ 0 (
echo ! MySQL 进程还在运行,再次尝试...
taskkill /F /IM mysqld.exe 2>nul
timeout /t 2 /nobreak >nul
REM 再次验证
tasklist | find /I "mysqld.exe" >nul 2>&1
if %errorlevel% equ 0 (
echo ! MySQL 进程仍在运行,使用强制方法...
REM 找出所有 mysqld.exe 的 PID 并逐个杀死
for /f "tokens=2" %%a in ('tasklist ^| find /I "mysqld.exe"') do (
echo 强制结束 PID: %%a
taskkill /F /PID %%a 2>nul
)
timeout /t 2 /nobreak >nul
)
)
REM 最终验证
tasklist | find /I "mysqld.exe" >nul 2>&1
if %errorlevel% equ 0 (
echo ✗ 警告MySQL 进程可能仍在运行
echo 请手动运行 build\extraResources\mysql\kill-running-port.bat
pause
) else (
echo ✓ MySQL 已完全停止
)
echo 正在停止 Java...
taskkill /F /IM java.exe 2>nul
taskkill /F /IM javaw.exe 2>nul
echo ✓ 所有进程已结束
timeout /t 2 /nobreak >nul
echo.
echo [2/5] 删除 out 目录...
cd /d "%~dp0.."
if exist out (
rmdir /s /q out 2>nul
if exist out (
echo ✗ 删除失败,请手动删除 out 目录
pause
exit /b 1
) else (
echo ✓ out 目录已删除
)
) else (
echo ✓ out 目录不存在
)
echo.
echo [3/5] 构建前端代码...
call npm run build-frontend
if %errorlevel% neq 0 (
echo ✗ 前端构建失败
pause
exit /b 1
)
echo ✓ 前端代码构建完成
echo.
echo [4/5] 构建 electron 代码...
call npm run build-electron
if %errorlevel% neq 0 (
echo ✗ electron 构建失败
pause
exit /b 1
)
echo ✓ electron 代码构建完成
echo.
echo [5/5] 打包 Windows 版本(包含代码加密)...
call npm run build-w
if %errorlevel% neq 0 (
echo ✗ 打包失败
pause
exit /b 1
)
echo.
echo ========================================
echo ✓ 打包完成!
echo 输出目录: out\win-unpacked\
echo ========================================
echo.
pause

View File

@@ -1 +0,0 @@
chrome应用商店ctx文件解压后放置在此目录中打包时会将资源加入安装包内。

10
build/extraResources/java/.gitignore vendored Normal file
View File

@@ -0,0 +1,10 @@
# 自动生成的配置文件
application.yml
# 运行时端口记录
.running-port
# 日志文件
logs/
*.log

View File

@@ -0,0 +1,74 @@
==========================================
NPQS9100 Java 后端服务说明
==========================================
一、目录结构
----------------------------------------
entrance.jar - Spring Boot 应用程序
application.yml - 应用配置文件(自动生成)
application.yml.template - 配置模板
kill-java-port.bat - 智能清理Java端口占用紧急用
.running-port - 运行时端口记录(自动生成,勿删除)
二、自动管理
----------------------------------------
正常情况下Java 后端服务由主应用自动管理:
- 应用启动时自动启动 Java 服务
- 应用关闭时自动停止 Java 服务
- 无需手动操作
三、端口智能管理
----------------------------------------
- Java 服务默认使用端口18092
- 如果 18092 被占用自动尝试18093, 18094, ...
- 启动成功后会记录实际端口到 .running-port 文件
- kill-java-port.bat 会自动识别正确的端口进行清理
四、手动清理工具
----------------------------------------
如果应用异常退出Java 进程可能残留,导致:
- 端口被占用,无法再次启动
- 可以运行 kill-java-port.bat 清理残留进程
使用方法:
1. 双击运行kill-java-port.bat
2. 脚本会自动识别实际使用的端口
3. 清理完成后即可重新启动应用
五、安全说明
----------------------------------------
⚠️ 进程停止安全性:
- 应用自动停止时,只会停止应用自己启动的 Java 进程
- 通过进程引用精确停止,不会影响其他 Java 应用
- kill-java-port.bat 只清理占用特定端口的进程
- 完全不会影响您电脑上的其他 Java 程序
⭐ 端口冲突处理:
- 如果您的电脑上有其他应用占用了 18092 端口
- 本应用会自动切换到其他端口18093, 18094...
- kill-java-port.bat 会自动识别实际端口,精确清理
六、常见问题
----------------------------------------
Q: Java 服务无法启动?
A: 运行 kill-java-port.bat 清理残留进程
Q: 端口被占用怎么办?
A: 应用会自动切换端口,无需手动处理
Q: 如何查看 Java 日志?
A: 启动应用后,日志窗口会实时显示 Java 输出
Q: 配置文件在哪里?
A: application.yml 由应用自动生成,请勿手动修改
==========================================
南京灿能电气自动化有限公司
2025
==========================================

View File

@@ -0,0 +1,116 @@
server:
port: 18092
spring:
application:
name: entrance
datasource:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:{{MYSQL_PORT}}/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: {{MYSQL_PASSWORD}}
#初始化建立物理连接的个数、最小、最大连接数
initial-size: 5
min-idle: 5
max-active: 50
#获取连接最大等待时间,单位毫秒
max-wait: 60000
#链接保持空间而不被驱逐的最长时间,单位毫秒
min-evictable-idle-time-millis: 300000
validation-query: select 1
test-while-idle: true
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
#mybatis配置信息
mybatis-plus:
mapper-locations: classpath*:com/njcn/**/mapping/*.xml
#别名扫描
type-aliases-package: com.njcn.gather.system.dictionary.pojo.po,com.njcn.gather.machine.pojo.po
configuration:
#驼峰命名
map-underscore-to-camel-case: true
#配置sql日志输出
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#关闭日志输出
# log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
global-config:
db-config:
#指定主键生成策略
id-type: assign_uuid
socket:
source:
ip: 127.0.0.1
port: 62000
device:
ip: 127.0.0.1
port: 61000
webSocket:
port: 7777
#源参数下发,暂态数据默认值
Dip:
#暂态前时间s
fPreTime: 2f
#写入时间s
fRampIn: 0.001f
#写出时间s
fRampOut: 0.001f
#暂态后时间s
fAfterTime: 3f
Flicker:
waveFluType: CPM
waveType: SQU
fDutyCycle: 50f
log:
homeDir: {{APP_DATA_PATH}}\logs
commonLevel: info
report:
template: {{APP_DATA_PATH}}\template
reportDir: {{APP_DATA_PATH}}\report
data:
homeDir: {{APP_DATA_PATH}}\data
qr:
cloud: http://pqmcc.com:18082/api/file
dev:
name: njcn
password: Pqs@12345678
port: 21
path: /etc/qrc.bin
gcDev:
name: root
password: Pqs@12345678
port: 21
path: /emmc/qrc.bin
db:
type: mysql
# 比对录波需要的配置,晚点再做优化
# 系统配置
power-quality:
# 文件读取配置
reading:
encoding: GBK # 文件编码(支持中文)
# 计算参数
calculation:
sampling:
default-rate: 256 # 默认采样率(每周波采样点数)
harmonic-times: 50 # 谐波次数
ib-add: false # 电流基波叠加标志
uharm-add: false # 电压谐波叠加标志
# 激活配置
activate:
private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"

Binary file not shown.

View File

@@ -0,0 +1,115 @@
@echo off
chcp 65001 >nul
color 0E
title 清理NPQS9100 Java端口占用
cls
echo ==========================================
echo 清理 NPQS9100 Java 端口占用
echo ==========================================
echo.
REM 获取Java目录脚本所在目录
set JAVA_HOME=%~dp0
cd /d "%JAVA_HOME%"
REM 读取实际运行的端口
set PORT_FILE=.running-port
set JAVA_PORT=
if exist "%PORT_FILE%" (
set /p JAVA_PORT=<"%PORT_FILE%"
echo [√] 检测到运行记录:端口 %JAVA_PORT%
echo.
) else (
echo [!] 未找到运行记录文件,使用默认端口 18092
echo.
set JAVA_PORT=18092
)
echo [1] 检查端口 %JAVA_PORT% 占用情况...
echo.
REM 查找占用该端口的连接
netstat -ano | findstr ":%JAVA_PORT%" > "%TEMP%\java_port.txt"
if %errorlevel% equ 0 (
echo 发现以下端口 %JAVA_PORT% 连接:
echo ----------------------------------------
type "%TEMP%\java_port.txt"
echo ----------------------------------------
echo.
echo [2] 提取进程ID并结束进程...
echo.
REM 提取所有LISTENING状态的PID
for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%JAVA_PORT%" ^| findstr "LISTENING"') do (
if not "%%a"=="0" (
echo 正在结束进程 PID: %%a
taskkill /F /PID %%a 2>nul
if errorlevel 1 (
echo [失败] 无法结束进程 %%a
) else (
echo [成功] 已结束进程 %%a
)
)
)
REM 如果还有其他状态的连接,也尝试结束
for /f "tokens=5" %%a in ('netstat -ano ^| findstr ":%JAVA_PORT%" ^| findstr /V "LISTENING"') do (
if not "%%a"=="0" (
echo 正在结束进程 PID: %%a
taskkill /F /PID %%a 2>nul
if errorlevel 1 (
echo [已结束或无权限] 进程 %%a
) else (
echo [成功] 已结束进程 %%a
)
)
)
echo.
echo [3] 清理完成
REM 等待2秒让进程完全释放
timeout /t 2 /nobreak >nul
echo.
echo [4] 再次检查端口 %JAVA_PORT%...
netstat -ano | findstr ":%JAVA_PORT%"
if errorlevel 1 (
echo [√] 端口 %JAVA_PORT% 已完全释放
REM 删除端口记录文件
if exist "%PORT_FILE%" (
del "%PORT_FILE%"
echo [√] 已清理端口记录文件
)
) else (
echo [!] 仍有连接存在可能是TIME_WAIT状态会自动释放
)
) else (
echo [√] 没有发现占用端口 %JAVA_PORT% 的进程
REM 删除端口记录文件
if exist "%PORT_FILE%" (
del "%PORT_FILE%"
echo [√] 已清理端口记录文件
)
)
REM 清理临时文件
if exist "%TEMP%\java_port.txt" del "%TEMP%\java_port.txt"
echo.
echo ==========================================
echo 清理完成
echo ==========================================
echo.
echo 说明:
echo - 此脚本只清理 NPQS9100 应用使用的 Java 端口
echo - 不会影响您电脑上的其他 Java 应用
echo.
pause

View File

@@ -0,0 +1,27 @@
OPENJDK ASSEMBLY EXCEPTION
The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
only ("GPL2"), with the following clarification and special exception.
Linking this OpenJDK Code statically or dynamically with other code
is making a combined work based on this library. Thus, the terms
and conditions of GPL2 cover the whole combination.
As a special exception, Oracle gives you permission to link this
OpenJDK Code with certain code licensed by Oracle as indicated at
http://openjdk.java.net/legal/exception-modules-2007-05-08.html
("Designated Exception Modules") to produce an executable,
regardless of the license terms of the Designated Exception Modules,
and to copy and distribute the resulting executable under GPL2,
provided that the Designated Exception Modules continue to be
governed by the licenses under which they were offered by Oracle.
As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
to build an executable that includes those portions of necessary code that
Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
with the Classpath exception). If you modify or add to the OpenJDK code,
that new GPL2 code may still be combined with Designated Exception Modules
if the new code is made subject to this exception by its copyright holder.

View File

@@ -0,0 +1,47 @@
The copyrights in this software and any visual or audio work distributed with
the software belong to Azul Systems, Inc. and those included in all other notice
files either listed in the readme file or contained in any other included notice
files with this distribution. All rights are reserved. Installation of this
software and any Azul software bundled with or derived from this software is
licensed only in accordance with these terms.
Provided you have not received the software directly from Azul and have already
agreed to the terms of a separate license agreement, by installing, using or
distributing this software you, on your own behalf and on behalf of your
employer or principal, agree to be bound by these terms. If you do not agree to
any of these terms, you may not use, copy, transmit, distribute nor install this
software.
The software is developed and owned by Azul and/or any of its affiliates,
subsidiaries or respective suppliers and licensors. The software also includes
certain software components and materials ("Open Source Materials") of third
parties ("Third Party Licensors") licensed under certain licenses ("Open Source
Licenses").
Nothing in this Agreement limits your rights under, or grants you rights that
supersede the terms and conditions of any applicable Open Source Licenses.
You must review the Open Source Licenses located at
http://www.azul.com/license/zulu_third_party_licenses.html
to understand your rights under them. In the event that no such third party
license agreements exist, the restrictions contained in this Agreement shall
apply.
With respect to the Open Source Licenses the following shall apply:
1) You hereby acknowledge and agree that you will be licensing any Open Source
Materials directly from the applicable Third Party Licensors including the
right to use such Third Party Materials in connection with the software
2) In the event of any inconsistencies or conflicting provisions of the Open
Source Licenses and the provisions of this Agreement, the provisions of the
Open Source Licenses shall prevail.
THIS SOFTWARE IS PROVIDED BY AZUL "AS-IS" AND WITHOUT EXPRESS OR IMPLIED
WARRANTIES, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL AZUL
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICE, LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION,
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY WHETHER IN CONTRACT, STRICT
LIABILITY OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -0,0 +1,347 @@
The GNU General Public License (GPL)
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your freedom to share
and change it. By contrast, the GNU General Public License is intended to
guarantee your freedom to share and change free software--to make sure the
software is free for all its users. This General Public License applies to
most of the Free Software Foundation's software and to any other program whose
authors commit to using it. (Some other Free Software Foundation software is
covered by the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not price. Our
General Public Licenses are designed to make sure that you have the freedom to
distribute copies of free software (and charge for this service if you wish),
that you receive source code or can get it if you want it, that you can change
the software or use pieces of it in new free programs; and that you know you
can do these things.
To protect your rights, we need to make restrictions that forbid anyone to deny
you these rights or to ask you to surrender the rights. These restrictions
translate to certain responsibilities for you if you distribute copies of the
software, or if you modify it.
For example, if you distribute copies of such a program, whether gratis or for
a fee, you must give the recipients all the rights that you have. You must
make sure that they, too, receive or can get the source code. And you must
show them these terms so they know their rights.
We protect your rights with two steps: (1) copyright the software, and (2)
offer you this license which gives you legal permission to copy, distribute
and/or modify the software.
Also, for each author's protection and ours, we want to make certain that
everyone understands that there is no warranty for this free software. If the
software is modified by someone else and passed on, we want its recipients to
know that what they have is not the original, so that any problems introduced
by others will not reflect on the original authors' reputations.
Finally, any free program is threatened constantly by software patents. We
wish to avoid the danger that redistributors of a free program will
individually obtain patent licenses, in effect making the program proprietary.
To prevent this, we have made it clear that any patent must be licensed for
everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and modification
follow.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains a notice
placed by the copyright holder saying it may be distributed under the terms of
this General Public License. The "Program", below, refers to any such program
or work, and a "work based on the Program" means either the Program or any
derivative work under copyright law: that is to say, a work containing the
Program or a portion of it, either verbatim or with modifications and/or
translated into another language. (Hereinafter, translation is included
without limitation in the term "modification".) Each licensee is addressed as
"you".
Activities other than copying, distribution and modification are not covered by
this License; they are outside its scope. The act of running the Program is
not restricted, and the output from the Program is covered only if its contents
constitute a work based on the Program (independent of having been made by
running the Program). Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's source code as
you receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice and
disclaimer of warranty; keep intact all the notices that refer to this License
and to the absence of any warranty; and give any other recipients of the
Program a copy of this License along with the Program.
You may charge a fee for the physical act of transferring a copy, and you may
at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion of it, thus
forming a work based on the Program, and copy and distribute such modifications
or work under the terms of Section 1 above, provided that you also meet all of
these conditions:
a) You must cause the modified files to carry prominent notices stating
that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in whole or
in part contains or is derived from the Program or any part thereof, to be
licensed as a whole at no charge to all third parties under the terms of
this License.
c) If the modified program normally reads commands interactively when run,
you must cause it, when started running for such interactive use in the
most ordinary way, to print or display an announcement including an
appropriate copyright notice and a notice that there is no warranty (or
else, saying that you provide a warranty) and that users may redistribute
the program under these conditions, and telling the user how to view a copy
of this License. (Exception: if the Program itself is interactive but does
not normally print such an announcement, your work based on the Program is
not required to print an announcement.)
These requirements apply to the modified work as a whole. If identifiable
sections of that work are not derived from the Program, and can be reasonably
considered independent and separate works in themselves, then this License, and
its terms, do not apply to those sections when you distribute them as separate
works. But when you distribute the same sections as part of a whole which is a
work based on the Program, the distribution of the whole must be on the terms
of this License, whose permissions for other licensees extend to the entire
whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest your
rights to work written entirely by you; rather, the intent is to exercise the
right to control the distribution of derivative or collective works based on
the Program.
In addition, mere aggregation of another work not based on the Program with the
Program (or with a work based on the Program) on a volume of a storage or
distribution medium does not bring the other work under the scope of this
License.
3. You may copy and distribute the Program (or a work based on it, under
Section 2) in object code or executable form under the terms of Sections 1 and
2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable source
code, which must be distributed under the terms of Sections 1 and 2 above
on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three years, to
give any third party, for a charge no more than your cost of physically
performing source distribution, a complete machine-readable copy of the
corresponding source code, to be distributed under the terms of Sections 1
and 2 above on a medium customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer to
distribute corresponding source code. (This alternative is allowed only
for noncommercial distribution and only if you received the program in
object code or executable form with such an offer, in accord with
Subsection b above.)
The source code for a work means the preferred form of the work for making
modifications to it. For an executable work, complete source code means all
the source code for all modules it contains, plus any associated interface
definition files, plus the scripts used to control compilation and installation
of the executable. However, as a special exception, the source code
distributed need not include anything that is normally distributed (in either
source or binary form) with the major components (compiler, kernel, and so on)
of the operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the source
code from the same place counts as distribution of the source code, even though
third parties are not compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program except as
expressly provided under this License. Any attempt otherwise to copy, modify,
sublicense or distribute the Program is void, and will automatically terminate
your rights under this License. However, parties who have received copies, or
rights, from you under this License will not have their licenses terminated so
long as such parties remain in full compliance.
5. You are not required to accept this License, since you have not signed it.
However, nothing else grants you permission to modify or distribute the Program
or its derivative works. These actions are prohibited by law if you do not
accept this License. Therefore, by modifying or distributing the Program (or
any work based on the Program), you indicate your acceptance of this License to
do so, and all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the Program),
the recipient automatically receives a license from the original licensor to
copy, distribute or modify the Program subject to these terms and conditions.
You may not impose any further restrictions on the recipients' exercise of the
rights granted herein. You are not responsible for enforcing compliance by
third parties to this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues), conditions
are imposed on you (whether by court order, agreement or otherwise) that
contradict the conditions of this License, they do not excuse you from the
conditions of this License. If you cannot distribute so as to satisfy
simultaneously your obligations under this License and any other pertinent
obligations, then as a consequence you may not distribute the Program at all.
For example, if a patent license would not permit royalty-free redistribution
of the Program by all those who receive copies directly or indirectly through
you, then the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply and
the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any patents or
other property right claims or to contest validity of any such claims; this
section has the sole purpose of protecting the integrity of the free software
distribution system, which is implemented by public license practices. Many
people have made generous contributions to the wide range of software
distributed through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing to
distribute software through any other system and a licensee cannot impose that
choice.
This section is intended to make thoroughly clear what is believed to be a
consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in certain
countries either by patents or by copyrighted interfaces, the original
copyright holder who places the Program under this License may add an explicit
geographical distribution limitation excluding those countries, so that
distribution is permitted only in or among countries not thus excluded. In
such case, this License incorporates the limitation as if written in the body
of this License.
9. The Free Software Foundation may publish revised and/or new versions of the
General Public License from time to time. Such new versions will be similar in
spirit to the present version, but may differ in detail to address new problems
or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any later
version", you have the option of following the terms and conditions either of
that version or of any later version published by the Free Software Foundation.
If the Program does not specify a version number of this License, you may
choose any version ever published by the Free Software Foundation.
10. If you wish to incorporate parts of the Program into other free programs
whose distribution conditions are different, write to the author to ask for
permission. For software which is copyrighted by the Free Software Foundation,
write to the Free Software Foundation; we sometimes make exceptions for this.
Our decision will be guided by the two goals of preserving the free status of
all derivatives of our free software and of promoting the sharing and reuse of
software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest possible
use to the public, the best way to achieve this is to make it free software
which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest to attach
them to the start of each source file to most effectively convey the exclusion
of warranty; and each file should have at least the "copyright" line and a
pointer to where the full notice is found.
One line to give the program's name and a brief idea of what it does.
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option)
any later version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this when it
starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free
software, and you are welcome to redistribute it under certain conditions;
type 'show c' for details.
The hypothetical commands 'show w' and 'show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may be
called something other than 'show w' and 'show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your school,
if any, to sign a "copyright disclaimer" for the program, if necessary. Here
is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
'Gnomovision' (which makes passes at compilers) written by James Hacker.
signature of Ty Coon, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General Public
License instead of this License.
"CLASSPATH" EXCEPTION TO THE GPL
Certain source files distributed by Oracle America and/or its affiliates are
subject to the following clarification and special exception to the GPL, but
only where Oracle has expressly included in the particular source file's header
the words "Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the LICENSE file that accompanied this code."
Linking this library statically or dynamically with other modules is making
a combined work based on this library. Thus, the terms and conditions of
the GNU General Public License cover the whole combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules,
and to copy and distribute the resulting executable under terms of your
choice, provided that you also meet, for each linked independent module,
the terms and conditions of the license of that module. An independent
module is a module which is not derived from or based on this library. If
you modify this library, you may extend this exception to your version of
the library, but you are not obligated to do so. If you do not wish to do
so, delete this exception statement from your version.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,21 @@
<!doctype html>
<html>
<head>
<title>
Welcome to Azul Zulu Builds of OpenJDK, the open Java(TM) platform from Azul.
</title>
</head>
<body>
<h2>Welcome to Azul Zulu Builds of OpenJDK, the open Java<sup><small>&trade;</small></sup> platform from Azul<sup><small>&reg;</small></sup></h2>
<p>The Azul Zulu environment includes the Java&trade; runtime, compiler, and tools. It provides complete runtime support for Java applications.
<p>To read more about Azul products visit <a href="https://www.azul.com/products/?r=zulu">Azul website</a>.</p>
<h3>Reference Documentation</h3>
<p>See the <a href="https://docs.azul.com/core/?r=zulu">Azul Zulu Builds of OpenJDK documentation</a> for more information on Azul Zulu installation, operation, and troubleshooting.
<p>See the <a href="https://docs.azul.com/core/zulu-openjdk/release-notes.html?r=zulu">Release Notes</a> for release details on Azul Zulu versions and system requirements.
<hr>
<small>
Copyright &copy; 2014-2025 <a href="https://www.azul.com/?r=zulu">Azul Systems</a>. All rights reserved.
</small>
<p>
</body>
</html>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More