Commit Graph

972 Commits

Author SHA1 Message Date
贾同学
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