Commit Graph

150 Commits

Author SHA1 Message Date
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
f530c48228 微调 2024-11-01 15:17:18 +08:00
caozehui
22868b887b 微调 2024-11-01 14:25:25 +08:00
3b1b8d36e2 weitiao 2024-11-01 13:53:50 +08:00
GYYM
dd41ab4a29 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client 2024-11-01 13:50:34 +08:00
GYYM
d9d7a801c8 字段调整 2024-11-01 13:49:32 +08:00
caozehui
1c818c3fc4 字典数据前后端接口编写、调试 2024-11-01 13:46:54 +08:00
c875ab72fa 修改分页定义 2024-11-01 13:29:00 +08:00
caozehui
2c22998d4f Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	frontend/src/views/system/dictionary/data.vue
2024-11-01 09:12:11 +08:00
998b30d153 修改分页定义 2024-11-01 09:10:37 +08:00
caozehui
546696d86a dictData未拆分 2024-10-31 19:48:38 +08:00
b207bc0e68 字典类型 CRUD 2024-10-31 14:53:29 +08:00
sjl
b452636c37 微调 2024-10-31 10:18:17 +08:00
GYYM
6d61305278 微调 2024-10-31 09:19:10 +08:00
GYYM
387b13a809 Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts:
#	frontend/src/api/system/dictData.ts
#	frontend/src/views/authority/role/components/rolePopup.vue
2024-10-31 09:10:59 +08:00
GYYM
6c6d2fe566 与后端接口进行首次联调 2024-10-31 08:51:30 +08:00
sjl
20ff5a6239 微调 2024-10-30 19:16:38 +08:00
sjl
d2d4153114 微调下拉框,数据库字段 2024-10-30 19:07:41 +08:00
sjl
18b9ef9e51 解决dictData.ts冲突 2024-10-30 15:23:47 +08:00