fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test

215 Commits

Author SHA1 Message Date
Fanzink
6815ac4cc4 '修改设备与PLC关联-新增-下拉框条数' 2023-09-12 12:44:54 +05:30
Fanzink
4ffbdaef8a '设备与PLC,设备获取所有' 2023-04-22 10:51:10 +05:30
Fanzink
b1ab1962b1 '厂务设备参数修改设备列表size,设备分析状态监控去掉默认产线工厂' 2023-04-18 09:48:13 +05:30
Fanzink
db47bffb18 '修改日期选择器样式文件index.css' 2023-03-30 11:28:14 +05:30
Fanzink
5afadfb1ce '数据分析bug修改2次' 2023-03-24 17:23:26 +05:30
Fanzink
e0d4e5327f '改数据分析bug' 2023-03-23 11:31:59 +05:30
Fanzink
3da95fed21 '修改数据分析/产品质量分析和产量分析' 2023-03-18 13:58:14 +05:30
Fanzink
683fc9169a '数据分析-产量分析,产品质量分析,设备产量时序图' 2023-03-14 15:24:30 +05:30
Fanzink
bc4cfdc990 'update' 2023-02-13 17:09:10 +08:00
Fanzink
0b5740d41c 'update' 2023-02-09 15:06:33 +08:00
Fanzink
41e680b55d 'update'' 2023-02-09 10:31:00 +08:00
Fanzink
28303e4c5f 'update' 2023-02-08 18:13:08 +08:00
Fanzink
bbe5e63075 'update' 2023-02-06 10:25:01 +08:00
Fanzink
f9d40b3790 '改bug' 2023-02-03 16:44:47 +08:00
Fanzink
8ec42773cd 'update' 2023-01-31 10:48:38 +08:00
Fanzink
2f4e9f31cd 'update新图标、新样式' 2023-01-17 16:20:28 +08:00
Fanzink
5798e5b6e0 '前后端内容修改、样式、中英文' 2023-01-13 16:54:26 +08:00
Fanzink
3265b4a580 '修改路由点击BUG,字段显示,按钮盒,基础样式' 2023-01-06 15:44:05 +08:00
Fanzink
a08af6774e '更改baseTable和content样式' 2022-12-16 20:48:44 +08:00
Fanzink
3c38763cf4 Merge branch 'develop' into fzq 2022-12-13 21:01:35 +08:00
Fanzink
23b7b85b39 'update' 2022-12-13 21:00:49 +08:00
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
4f39481693 update 基本完成设备状态时序图 2022-09-22 15:02:38 +08:00
5a45aead7c update 基本完成设备状态时序图的展示 2022-09-22 14:20:03 +08:00
31f496cc13 update 设备状态时序图产线工段关联 2022-09-22 13:25:41 +08:00
399589bb3b update 设备状态时序图 2022-09-22 11:28:27 +08:00
1ad64efe59 update 设备异常分析 2022-09-22 10:03:23 +08:00
b21d91c8da Merge pull request 'build: :新增自动构建发布脚本' (#2) from cicd into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2022-09-21 17:13:43 +08:00
a95a7a20d3 build: :新增自动构建发布脚本 2022-09-21 17:10:00 +08:00
7ed4a512bc update 数据分析-设备效率分析的echarts 2022-09-21 16:58:26 +08:00
9187d56f6c add 设备效率分析的图表 2022-09-21 15:30:51 +08:00
41cd01ecb0 update 设备状态时序图页面 2022-09-21 13:25:58 +08:00
f590d09671 update 设备异常分析的顶部头和表格头 2022-09-21 11:09:09 +08:00
5158d9a315 update 设备效率分析接口联调 2022-09-21 10:59:35 +08:00
cc5aa4d72f update 设备效率表格头信息 2022-09-21 10:34:40 +08:00
a03d1db029 update 设备效率分析头部 2022-09-21 10:15:53 +08:00
3999e4e589 init 数据分析“ 2022-09-20 15:59:45 +08:00
a0fef0454d Merge pull request 'lb' (#1) from lb into develop
Reviewed-on: #1
2022-09-20 14:53:16 +08:00
e532989ddf update vuecli proxy 2022-09-19 16:30:50 +08:00
10e454eb2a update 设备参数状态监控,将‘参数近期值’导向“获取设备的历史参数值”(暂未实现) 2022-09-08 15:47:08 +08:00
ce9c0f9d76 update 设备参数状态监控 2022-09-08 14:50:09 +08:00
a2423905fd add 设备当前状态页面 2022-09-08 10:46:41 +08:00
04dc0bcc49 update base-table add tooltip 2022-09-08 08:48:21 +08:00
1006ef0d6a init cell container 2022-09-07 15:10:05 +08:00
d9ff6226b3 update 产品新增-加工时间提示文字;实时数据的报错方式修改 2022-09-07 15:08:38 +08:00
08aa78fdb1 update 更新upload组件样式,更新列表的index 2022-09-07 15:04:37 +08:00
2d557c8196 update 菜单国际化 2022-09-05 12:21:06 +08:00
gtz
e020c1e174 '强制变更文件名' 2022-09-02 16:35:28 +08:00
gtz
e46c392e0f '强制变更文件名,ureport国际化文件置入' 2022-09-02 16:34:14 +08:00
076eaa5f2a update 基本完成国际化 2022-09-02 15:16:23 +08:00
12556886b9 update 2022-09-02 11:33:34 +08:00
744f288b70 update 到qualityInspectionCurrent 2022-09-02 10:59:44 +08:00
64ee3cb64e update 完成设备页面的国际化 2022-09-02 09:49:14 +08:00
268207b383 update template 2022-09-02 09:02:34 +08:00
b71a61191b update 基本完成template里的国际化 2022-09-02 09:00:22 +08:00
a438bcad2f update template part 2022-09-01 16:52:42 +08:00
5b37798a20 update 2022-09-01 15:45:13 +08:00
70303f3f06 update i18n 2022-09-01 15:01:25 +08:00
666059af6e update 基本完成按钮的权限限定 2022-09-01 13:24:00 +08:00
90a93e4f8b update permissions 2022-09-01 11:28:13 +08:00
803248ca22 add icons dialog 2022-09-01 10:18:06 +08:00
cfa1cca44a update table height 2022-09-01 09:30:44 +08:00
2df5897f3d update timeFilter 2022-09-01 09:19:14 +08:00
3668f92731 clean code 2022-09-01 09:04:45 +08:00
1b17b760ae update job-schedule 2022-09-01 08:57:10 +08:00
6e06159250 update calcTableHeight 2022-09-01 08:50:46 +08:00
3fe0d26d8f update table 2022-08-31 11:33:54 +08:00
c0900dba9c add 计算表格最大高度util 2022-08-31 11:21:35 +08:00
974079296b init i18n 2022-08-31 10:58:23 +08:00
1e78bbf6ee update 工段设备关联 2022-08-30 10:29:56 +08:00
e690c90d74 update 2022-08-29 17:02:16 +08:00
349870ce5d update 查询提示信息 2022-08-29 09:36:42 +08:00
96cea7cc0d clear files & update title 2022-08-26 11:07:57 +08:00
38afe6cbb9 update 路由隐藏 2022-08-25 13:53:28 +08:00
9df5f3b336 update“ 2022-08-24 16:29:59 +08:00
626e543fa5 update 质量实时 2022-08-23 15:07:17 +08:00
2e40570969 update 产线实时 2022-08-23 14:16:05 +08:00
70485d293c update 设备实时 2022-08-23 14:02:27 +08:00
6bbc0d3d08 update 2022-08-23 11:27:32 +08:00
8f124e06b1 add spanMethod to base-table 2022-08-23 11:11:51 +08:00
4297798d44 update realtimedata 2022-08-22 16:59:23 +08:00
9a22601f5b update BaseTable 2022-08-22 15:17:12 +08:00
69dda72fab init 厂务生产监控实时数据 2022-08-22 14:25:01 +08:00
0b4433dd80 update 基本完成报表“ 2022-08-22 11:26:57 +08:00
a30e2e1ae2 update report-detail 2022-08-22 10:28:58 +08:00
37df2abcc5 update 2022-08-19 17:02:38 +08:00
fef9bca0ae init reportSheet 2022-08-19 16:07:00 +08:00
197b4734d5 update 基本完成设备数采 2022-08-18 16:43:16 +08:00
dedcedec06 update 设备plc信息 2022-08-18 14:00:15 +08:00
93b401071a update 基本完成质量管理和基础资料 2022-08-18 10:49:27 +08:00
a15e78dcaf update attr-form 的逻辑,TODO:检查产品池和设备信息的编辑子表单 2022-08-17 17:02:58 +08:00
3c4af47e2d update 基本完成当前检测数据 2022-08-17 16:42:04 +08:00
686002a48e init charts 2022-08-17 16:00:02 +08:00
4cae583333 init base-detail-page 2022-08-17 13:55:30 +08:00
8aaaf2c7ad update 在线检测数据“ 2022-08-17 13:38:06 +08:00
56ab0220e2 add SmallTitle & 质量在线检测数据 2022-08-17 10:23:34 +08:00
8943eb56b3 update 质量检测信息记录 2022-08-17 10:22:59 +08:00
6063b664a6 update README 2022-08-16 16:47:46 +08:00
3e42b99996 update 基本完成设备信息的编辑和新增 2022-08-16 16:35:25 +08:00
f17fab4749 update 设备信息, 更新字段的验证规则 2022-08-16 16:21:35 +08:00
566c900a24 update dialog: 上传组件的格式和大小验证 2022-08-16 16:11:46 +08:00
8ad162aab6 update dialog: 多上传组件上传、下载和更新 2022-08-16 15:49:51 +08:00
3d851e4362 update dialog: 多上传组件上传成功 2022-08-16 15:01:33 +08:00
23e508916e update dialog: 多上传组件分流 2022-08-16 14:36:25 +08:00
535004719c add CKEditor & update dialog 2022-08-16 14:07:33 +08:00
51022a6e6d update 基本完成下载文件 2022-08-15 10:53:32 +08:00
b4e00bbca0 update 基本完成上传 2022-08-15 10:23:51 +08:00
a9265d6708 update 上传 2022-08-12 17:03:55 +08:00
302d1832df update 上传组件 2022-08-12 16:09:07 +08:00
00343fa5b9 init upload 2022-08-12 14:48:36 +08:00
d1dd52fe90 update 设备类型 2022-08-12 14:26:46 +08:00
04f19e82e3 update 设备分组和设备分组报警 2022-08-12 13:45:34 +08:00
19730bb635 update 2022-08-12 11:38:47 +08:00
ba44951b71 update 产线和产品 2022-08-12 09:01:44 +08:00
b3aba50b09 update 质量检测基础数据 2022-08-11 16:52:37 +08:00
3f2e8e8b9e update 产品属性表 2022-08-11 16:24:14 +08:00
db5b5091e1 update 完成厂务,优化dialog 2022-08-11 16:08:01 +08:00
0ef30e1985 update 一些视图,并且优化dialog 2022-08-11 15:31:06 +08:00
cd9beb120a update dialog 2022-08-11 14:28:06 +08:00
a1056abe80 update 2022-08-11 14:22:23 +08:00
0ddba21e1c add 添加dialog配置手册 2022-08-11 11:39:45 +08:00
535cb490b1 update subform 2022-08-11 11:18:31 +08:00
c1e152405d update 2022-08-10 17:01:51 +08:00
c435901f3b update 2022-08-10 16:49:42 +08:00
174e5efae5 update dialog 2022-08-10 16:32:27 +08:00
bc08dffda2 update 2022-08-10 15:54:41 +08:00
e91520e99d update scrollbar style 2022-08-10 15:28:19 +08:00
83fb096f6d update“ 2022-08-10 14:49:17 +08:00
90e34584ec hint DELETE接口需要加上application/json头 2022-08-10 14:12:23 +08:00
9653474e2f update 2022-08-10 13:42:46 +08:00
df3b11b6dd add common filter 2022-08-10 10:58:21 +08:00
ffd095b6b8 update 数据字典相关逻辑“ 2022-08-10 10:47:12 +08:00
559cffc5f0 update 数据字典缓存&add momentjs 2022-08-10 09:43:17 +08:00
cfec6ff3f5 finish 基本完成dialog“ 2022-08-09 16:54:45 +08:00
5d8f537d05 update 改版完成 2022-08-09 16:24:18 +08:00
669c8f90c6 update 对dialog进行改版之前 2022-08-09 16:16:34 +08:00
lb
2557026002 update 2022-08-09 10:39:33 +08:00
lb
0733660c2f update dialog 2022-08-09 09:45:59 +08:00
lb
32dd90969a update dialog 2022-08-08 17:02:57 +08:00
lb
a150905840 update dialog 2022-08-08 16:22:58 +08:00
lb
2911cf2a90 init general dialog 2022-08-08 16:22:42 +08:00
lb
e3849933d9 delete 批量删除 2022-08-08 15:19:32 +08:00
lb
c15671c496 update 产品属性、报表和质量模块的字段 2022-08-08 15:07:32 +08:00
lb
1e118a6d5d update 更新设备模块 2022-08-08 14:34:30 +08:00
lb
f415f30f9e update 更新厂务模块字段 2022-08-08 13:54:23 +08:00
lb
56bbc2497a update table 2022-08-08 13:47:56 +08:00
lb
06193447c8 update table configs 2022-08-08 13:18:17 +08:00
lb
1b760cb844 init dialog 2022-08-08 11:01:15 +08:00
lb
afc4577335 apply base-table in equipment.vue 2022-08-08 10:55:44 +08:00
lb
333da8433e update base-table 2022-08-08 10:54:23 +08:00
lb
65c4ce9d45 update base-table 2022-08-08 10:39:14 +08:00
lb
93912aa193 apply base-table 2022-08-05 17:19:31 +08:00
lb
374da7b1e9 add basetable 2022-08-05 16:03:38 +08:00
lb
43f33be189 udpate 2022-08-05 13:16:13 +08:00
lb
ee27a93181 update 生成的文件名 2022-08-05 10:57:16 +08:00
lb
8f802c5580 update PUT-POST 2022-08-05 09:35:05 +08:00
lb
cf28335d9e update 更新接口大小写,和rest格式 2022-08-05 09:25:15 +08:00
lb
4bd6ad1f47 update 2022-08-04 17:02:22 +08:00
lb
b79efe0a19 format 2022-08-04 16:25:49 +08:00
lb
ffad1a2643 update 2022-08-04 16:20:07 +08:00
lb
affea8af59 update axios response的解析 2022-08-04 16:15:52 +08:00
lb
8b060b8bf1 add prettierrc & 一些全局替换 2022-08-04 15:42:36 +08:00
lb
d4e7bda03b 替换hasPermission 2022-08-04 15:12:26 +08:00
lb
3df2939fb4 update list response 2022-08-04 14:41:47 +08:00
lb
d3752c4f40 update request.js & routes 2022-08-04 13:45:49 +08:00
lb
0566808861 add comments 2022-08-02 17:06:11 +08:00