Commit Graph

87 Commits

Author SHA1 Message Date
sjl
43b67f2e1a 微调 2024-11-15 09:38:25 +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
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
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
86e7705985 检测首页、主页、数据展示界面样式修改 2024-11-13 18:58:53 +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
b28bcaaab7 测试 2024-11-07 20:55:11 +08:00
GYYM
9804baf8a3 检测首页增加不同入口的默认选择状态和禁止选择状态 2024-11-07 20:41:32 +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
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
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
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-11-01 16:27:04 +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
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
546696d86a dictData未拆分 2024-10-31 19:48:38 +08:00
b207bc0e68 字典类型 CRUD 2024-10-31 14:53:29 +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