Commit Graph

644 Commits

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