Commit Graph

168 Commits

Author SHA1 Message Date
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
GYYM
74c03a2358 字段调整 2024-11-08 13:09:06 +08:00
GYYM
50bebf451d 计划设备列表列宽微调 2024-11-08 09:30:41 +08:00
GYYM
6a1fa6458e 二级弹出框尺寸调整 2024-11-08 09:21:18 +08:00
760eb7c993 微调样子 2024-11-07 21:05:59 +08:00
ecb8404383 微调 2024-11-07 20:57:11 +08:00
f20cc42583 微调 2024-11-07 20:57:00 +08:00
GYYM
b28bcaaab7 测试 2024-11-07 20:55:11 +08:00
GYYM
9804baf8a3 检测首页增加不同入口的默认选择状态和禁止选择状态 2024-11-07 20:41:32 +08:00
sjl
4695a82b38 微调时间控件 2024-11-07 19:40:01 +08:00
sjl
9929ea74b4 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-07 19:25:57 +08:00
sjl
f72b5300be 微调 2024-11-07 19:25:45 +08:00
caozehui
e4b1f05037 被检设备批量导入功能、ImportExcel组件微调 2024-11-07 19:24:29 +08:00
sjl
4b32e1f215 微调 2024-11-07 16:17:33 +08:00
sjl
53d616ee49 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-07 15:54:38 +08:00
caozehui
17c9330f32 微调 2024-11-07 15:54:01 +08:00
sjl
88e3ffe33b Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/views/machine/device/index.vue
2024-11-07 15:14:50 +08:00
sjl
0ca2baa44a 微调 2024-11-07 15:13:53 +08:00
caozehui
f08f45fb9c 微调 2024-11-07 15:12:44 +08:00
GYYM
1ec486a42d 增加检测计划功能 2024-11-07 13:22:51 +08:00
sjl
4fc0781e05 TimeControl微调 2024-11-07 11:29:28 +08:00
sjl
9de2c874f0 时间控件 2024-11-07 10:24:33 +08:00
dc7e9d40e7 微调 2024-11-06 21:15:49 +08:00
sjl
07ccde9f59 微调 2024-11-06 21:07:44 +08:00
sjl
6abac988c7 被检设备 2024-11-06 20:31:07 +08:00
caozehui
ea254245c7 微调 2024-11-06 10:35:54 +08:00
d7518e41e4 微调 2024-11-06 09:46:54 +08:00
sjl
51f408ce7a 电能质量字典界面 2024-11-06 08:45:51 +08:00
caozehui
29bc14d3e1 Merge remote-tracking branch 'origin/master' 2024-11-05 15:38:56 +08:00
caozehui
c4c10ab9b4 微调 2024-11-05 15:38:34 +08:00
sjl
1f22234b45 指标字典 2024-11-05 14:15:56 +08:00
64ae879aee 微调 2024-11-05 11:43:27 +08:00
sjl
7f8aeebb1e 微调 2024-11-05 11:23:38 +08:00
sjl
c0fcba6a25 指标字典 2024-11-04 18:43:24 +08:00
sjl
9a9807230d 更新代码 2024-11-04 09:58:00 +08:00
sjl
15b6f3de36 微调 2024-10 2024-11-01 16:27:04 +08:00
caozehui
9b5a8c005e Merge remote-tracking branch 'origin/master' 2024-11-01 15:52:18 +08:00
caozehui
faed8ced25 微调 2024-11-01 15:51:46 +08:00
sjl
d398b317aa frontend/.env.development 2024-11-01 15:29:16 +08:00
sjl
0e871df27b 更新代码 2024-11-01 15:27:36 +08:00