Commit Graph

195 Commits

Author SHA1 Message Date
2f2eaf4e20 Merge pull request 'fzq' (#14) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #14
2022-12-12 16:28:34 +08:00
Fanzink
a5a4f93328 'update' 2022-12-11 20:56:46 +08:00
Fanzink
f7938f30e2 'update' 2022-12-11 20:36:21 +08:00
Fanzink
d23cb260a4 '更新navbar' 2022-12-11 20:32:10 +08:00
Fanzink
e5eb49a7b6 Merge branch 'develop' into fzq 2022-12-02 16:20:45 +08:00
Fanzink
35d5d91c23 '样式修改-登录/中英文' 2022-12-02 16:19:14 +08:00
f3a7e38d13 Merge pull request 'lb' (#10) from lb into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #10
2022-11-25 11:06:50 +08:00
5d36eb676c update 小修改“ 2022-11-10 15:12:23 +08:00
14b933fb0c update 安灯检测盒 2022-11-02 13:34:11 +08:00
92f52ab553 update productLine 2022-10-28 14:50:09 +08:00
15210c2f12 update 2022-10-18 14:42:48 +08:00
8447b8f7ab Merge branch 'lb' of http://git.picaiba.com/mt-fe-group/mt-yd-ui into lb 2022-10-17 16:59:11 +08:00
ca7fda73e3 update i18n 2022-10-17 16:52:07 +08:00
1617bc347a Merge pull request 'update 数据分析' (#9) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2022-10-17 15:51:26 +08:00
lb
762861a922 update 数据分析 2022-10-14 14:03:00 +08:00
68c271618a Merge pull request 'lb' (#8) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #8
2022-10-09 16:58:40 +08:00
127347fab0 update 修改当前检测数据的图例配置 2022-10-09 16:57:02 +08:00
b9ac64ab13 update 2022-10-09 16:45:03 +08:00
089a6517d3 update 2022-10-09 13:16:55 +08:00
1047dd78ec update 2022-10-09 11:31:54 +08:00
5a08d8c1dd fix some bugs 2022-10-09 10:36:18 +08:00
d0f113513c fix' 设备信息编辑时提示'请输入正确的数值'的bug 2022-10-08 14:42:16 +08:00
ff11e1d3fb Merge pull request 'lb' (#7) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #7
2022-10-08 14:16:26 +08:00
b54298fe09 update 质量当前检测数据产线名字段 2022-10-08 09:57:01 +08:00
5b2de3fb27 update AddOrUpdateConfig文档 2022-10-08 09:45:00 +08:00
9c13434c48 update 设备信息 2022-10-08 08:55:17 +08:00
86d3f63178 update request.sj 2022-09-30 17:03:40 +08:00
3f43f0c979 update 设备信息新增编辑 2022-09-30 17:01:47 +08:00
ae8a3668c8 update 设备的工段绑定 2022-09-30 15:04:19 +08:00
d5af6a01f5 update 文件上传组件 2022-09-29 10:34:27 +08:00
0b54133132 update 字典管理值列表入口分离到操作列 2022-09-29 10:25:00 +08:00
246baa1768 update AttrForm详情时屏蔽操作列 2022-09-29 10:09:09 +08:00
37c0c445a3 Merge pull request 'lb' (#6) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #6
2022-09-29 09:38:36 +08:00
72f9793edf update 设备自动code 2022-09-29 09:31:43 +08:00
b7002fe17a Merge branch 'develop' into lb 2022-09-28 17:00:57 +08:00
1b670dc0ac update 设备分组报警 2022-09-28 14:24:26 +08:00
3907f5161e update 查询逻辑“ 2022-09-28 11:23:39 +08:00
d493b34a5f update table 索引“ 2022-09-28 10:58:29 +08:00
747247aed6 bug fix 2022-09-27 16:52:07 +08:00
1caf68592a update dialog 2022-09-27 15:59:35 +08:00
5d32750d87 update 实时数据“ 2022-09-27 15:52:03 +08:00
a0253cc235 add 设备历史参数 2022-09-27 15:32:38 +08:00
13df2016b9 update 实时数据刷新 2022-09-27 11:05:04 +08:00
749e503f75 Merge pull request 'lb' (#4) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2022-09-26 17:03:19 +08:00
1554562933 update 2022-09-26 17:01:15 +08:00
ea1c7de4ca update 2022-09-26 16:10:44 +08:00
9b0f724da2 update 报表几处国际化 2022-09-26 14:19:09 +08:00
f33d0c9048 Merge pull request 'lb' (#3) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2022-09-23 15:16:53 +08:00
4c9ce641fa Merge branch 'develop' into lb 2022-09-23 15:11:56 +08:00
31834662c9 update icon 2022-09-23 15:02:13 +08:00