Commit Graph

907 Commits

Author SHA1 Message Date
GYYM
d673fc8685 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-20 21:29:28 +08:00
sjl
55383cf501 检测脚本 2024-11-20 15:13:50 +08:00
caozehui
c46a55e9c4 微调 2024-11-20 13:53:31 +08:00
GYYM
f51fe8433b Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-20 11:23:55 +08:00
GYYM
fdc7639887 使用真登录功能前拉取报错,提交代码 2024-11-20 11:22:05 +08:00
caozehui
efb6b2598a Merge remote-tracking branch 'origin/master' 2024-11-20 11:04:27 +08:00
sjl
f6595f784a 微调 2024-11-20 11:02:50 +08:00
GYYM
963c0f5713 数据查询、报告生成流程界面框架绘制 2024-11-19 19:34:00 +08:00
sjl
543662a2ac 通用配置 2024-11-19 16:30:03 +08:00
caozehui
17b68cbc95 微调 2024-11-19 16:01:35 +08:00
GYYM
dd527a4994 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-18 22:05:18 +08:00
GYYM
977a998767 检测过程流程展示页面框架绘制 2024-11-18 22:04:59 +08:00
sjl
a57ebbcc62 菜单管理 2024-11-18 16:02:19 +08:00
sjl
5cdbee88b4 微调 2024-11-18 09:02:57 +08:00
sjl
a8eaccc53e 微调 2024-11-15 16:31:48 +08:00
sjl
413c14083b Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-15 16:31:38 +08:00
a86e6d4009 微调 2024-11-15 13:47:07 +08:00
sjl
d4b2ac1f01 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-15 09:38:53 +08:00
sjl
43b67f2e1a 微调 2024-11-15 09:38:25 +08:00
GYYM
563285eb77 树控件样式微调 2024-11-15 09:34:43 +08:00
GYYM
815d34f817 进度条微调 2024-11-15 09:13:23 +08:00
GYYM
36b03efd0a 样式微调 2024-11-14 21:03:51 +08:00
sjl
fddbb8c9dc 解决冲突 2024-11-14 20:49:21 +08:00
sjl
4f6c6cf943 # frontend/src/views/machine/device/components/devicePopup.vue
#	frontend/src/views/machine/device/index.vue
2024-11-14 20:37:54 +08:00
sjl
5fd97ebe72 微调 2024-11-14 20:36:54 +08:00
91eea8cc8a 微调 2024-11-14 19:33:33 +08:00
sjl
534cc0ab76 微调 2024-11-14 19:24:36 +08:00
GYYM
7efaa253a2 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/plan/autoTest/components/tree.vue
2024-11-14 18:47:15 +08:00
GYYM
a3051c0ea4 微调 2024-11-14 18:40:58 +08:00
7033c3cdc6 微调 2024-11-14 18:39:13 +08:00
sjl
1ee1b05fca 微调 2024-11-14 18:36:00 +08:00
sjl
702d1bb699 # frontend/src/views/home/components/table.vue
#	frontend/src/views/home/tabs/dashboard.vue
#	frontend/src/views/system/dictionary/dictTree/index.vue
2024-11-14 18:30:53 +08:00
sjl
87fe66da3e 微调 2024-11-14 18:26:34 +08:00
12201e065f 微调 2024-11-14 18:13:28 +08:00
95f54fb674 review代码调整代码 2024-11-14 11:47:42 +08:00
GYYM
8f89252d8b 调整检测首页布局;根据不同的功能,实现不同的表格展示 2024-11-14 11:45:25 +08:00
sjl
65cb7826d3 解决冲突 frontend/src/api/index.ts 2024-11-14 11:36:25 +08:00
sjl
39cbe0ff35 角色管理 2024-11-14 11:34:25 +08:00
fc248a5ed2 review代码调整代码 2024-11-14 11:17:22 +08:00
GYYM
abc6db7f18 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/plan/planList/index.vue
2024-11-13 19:04:30 +08:00
GYYM
86e7705985 检测首页、主页、数据展示界面样式修改 2024-11-13 18:58:53 +08:00
21441a64ad 检测计划列表操作按钮调整,超过3个按钮时,调整为更多下拉 2024-11-13 15:24:42 +08:00
GYYM
328696eb55 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/home/components/tree.vue
2024-11-12 20:39:16 +08:00
GYYM
6a5c783419 修改检测入口、预检测、正式检测页面 2024-11-12 20:35:12 +08:00
sjl
44e7598b68 用户管理 2024-11-12 18:56:33 +08:00
sjl
4b5498ad49 frontend/src/views/authority/role/components/permissionUnit.vue 2024-11-11 15:41:28 +08:00
sjl
0797ea046f 微调 2024-11-11 15:40:49 +08:00
caozehui
bf8c6a1d00 微调 2024-11-11 15:38:40 +08:00
sjl
f05369556c frontend/src/views/authority/role/components/permissionUnit.vue 2024-11-11 11:10:26 +08:00
sjl
3526432052 微调 2024-11-11 11:09:20 +08:00