3303 Commits

Author	SHA1	Message	Date
shijing	f162eb489b	fix:玻纤mlog生产设备可编辑	2025-03-12 13:29:39 +08:00
shijing	54ca3a49a8	fix:新增任务不要编号	2025-03-12 11:35:36 +08:00
shijing	d305d8a391	fix:玻纤采购入库编号问题	2025-03-12 11:34:31 +08:00
shijing	e3a810ebd4	fix:库存出入库去除编号，并默认当前日期	2025-03-12 09:35:47 +08:00
shijing	ffeac53e07	fix:文案改动	2025-03-11 17:15:11 +08:00
shijing	fdffd8a4ef	fix:车间出入库不要编号，默认登录人	2025-03-11 17:12:56 +08:00
shijing	f890ca086d	fix:加工前不良关联检验表	2025-03-11 17:12:08 +08:00
shijing	9b6e9cc438	fix:fmlogdetail添加扫码	2025-03-11 17:11:18 +08:00
shijing	e439a0d7c3	fix:过程检验关联检验表	2025-03-11 17:10:05 +08:00
shijing	fc10c2eee0	fix:过程检验关联检验表	2025-03-11 17:09:43 +08:00
shijing	43e5dff859	fix:光子生产执行中日志列表传参变动；添加返工和启用	2025-03-11 17:02:37 +08:00
shijing	0a0229cfab	fix：生产执行中车间库存变动，分为来料未完成&出料已完成（添加分批合批）	2025-03-11 16:54:53 +08:00
shijing	86921313d8	fix：交接表单变动，并添加分批合批功能（分批但拉出来了）	2025-03-11 16:53:02 +08:00
shijing	aacdd0b892	fix:光芯交接记录添加扫码	2025-03-11 16:51:41 +08:00
shijing	c0d336d85c	fix:光芯动态路由后各工序页面抽离（分为fmlog>index2和mlog>index）	2025-03-11 16:49:58 +08:00
shijing	a6008e4cdc	fix:光芯：生产执行中的任务列表传参变动，操作去掉分配	2025-03-11 16:48:41 +08:00
shijing	9faeaef554	fix:光芯动态路由下的生产执行页面变动	2025-03-11 16:46:33 +08:00
shijing	89b642561f	fix:工段根据路由方式显示隐藏标识	2025-03-11 16:44:00 +08:00
shijing	5647a3401f	fix:玻纤mlog不用选任务	2025-03-10 14:46:32 +08:00
shijing	4ac169266d	fix:原料检验去除switch的change方法	2025-03-10 11:10:59 +08:00
shijing	bcbca918e3	fix:生产领料时数量不可编辑	2025-03-10 11:04:11 +08:00
shijing	984c481df8	fix:工艺路线	2025-03-10 08:53:30 +08:00
shijing	6d0d40eef5	fix:wpm添加fmlog接口声明	2025-03-10 08:50:42 +08:00
shijing	145b55c90b	fix:半成品库添加采购入库	2025-03-10 08:47:57 +08:00
shijing	fcb0589a45	fix:光芯生产日志库存切分页面	2025-03-06 13:47:54 +08:00
shijing	fa2cf7cbff	fix:废品库不合格标记显示字段变更	2025-03-06 13:44:50 +08:00
shijing	20a50e17fc	fix:玻纤交接记录显示	2025-03-06 13:43:24 +08:00
shijing	a2b4387441	fix:光子mioitem列表执行人	2025-03-05 08:33:23 +08:00
shijing	9f7115ccca	fix:光芯：车间库存检验中不合格标记改为defect_name	2025-03-04 14:42:13 +08:00
shijing	2cf878d31a	fix:光芯：fmlog禁止编辑	2025-03-04 14:41:14 +08:00
shijing	0970366120	fix:任务详情中添加合格数量	2025-03-04 14:34:45 +08:00
shijing	41df10af82	fix:qct检验表类型只保留process和inm	2025-03-04 14:34:07 +08:00
shijing	e27d43f4cf	fix:任务中添加合格数量	2025-03-04 14:33:12 +08:00
shijing	cf2f307ed1	fix:去除无用文件	2025-03-04 14:32:37 +08:00
shijing	f53a237486	fix:修改追踪批次不对应问题	2025-03-04 14:30:31 +08:00
shijing	425bdcdfcb	fix:光芯检验管理添加操作项	2025-03-04 14:28:51 +08:00
shijing	cc640b4252	fix:工艺步骤放开追踪方式	2025-03-03 14:25:34 +08:00
shijing	b8a476da0f	fix:光芯成品和外观加到工序	2025-02-28 16:19:35 +08:00
shijing	bdaded3370	fix:光芯成品和外观加到工序	2025-02-28 16:18:28 +08:00
shijing	93f8474f76	fix:车间库存领料和入库	2025-02-27 17:50:35 +08:00
shijing	36987f5b2a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-27 16:03:20 +08:00
shijing	9cbdd25bac	fix:玻纤：设备、测点中数据采集相关设置	2025-02-27 16:03:17 +08:00
zty	b4daca4664	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-27 14:29:03 +08:00
zty	5f15f087f1	feat: enm/修改校正内容	2025-02-27 14:29:01 +08:00
shijing	f7cd216f7c	fix：检测项执行采集数据方法并填入数据	2025-02-27 14:26:20 +08:00
shijing	1c67395b24	fix:em接口声明执行采集数据方法	2025-02-27 13:32:01 +08:00
shijing	770edefcb9	fix:玻纤原料入库时form表单修改数字后没有删除原来的编码	2025-02-27 11:29:29 +08:00
shijing	20957213a4	fix:检测项的检验类型只保留过程检验和入厂检验	2025-02-27 11:09:23 +08:00
shijing	dd529e178e	fix:添加工艺路线时工艺步骤显示产品名称	2025-02-27 10:51:40 +08:00
shijing	5adfe9cd36	fix:玻纤物料产品中不显示辅助材料	2025-02-27 10:31:02 +08:00
shijing	a07781ad0f	fix:玻纤：route新增时添加输出物料的追踪方式	2025-02-27 09:47:22 +08:00
shijing	8ec44f1010	fix:玻纤：route新增时添加输出物料的追踪方式	2025-02-27 09:45:56 +08:00
shijing	8a2372410e	fix:玻纤生产领料和入库时，选中物料时，数量默认所有	2025-02-27 09:39:00 +08:00
shijing	562dcba22a	fix:玻纤返工和改版交接时，接收工段默认展示当前工段（葛工提），并可查询	2025-02-27 09:37:15 +08:00
shijing	e1430ec91a	fix:玻纤日志区别返工和正常	2025-02-26 15:40:59 +08:00
shijing	b83a58e5fd	fix:玻纤检验工序bw检测弹窗大一些	2025-02-26 15:39:30 +08:00
shijing	30d72e877f	fix:玻纤：日志结束时间恢复以前规则（不可大于当前时间）	2025-02-26 15:10:56 +08:00
shijing	155633b736	fix:交接选择更改批次后，新批次号改成必填项	2025-02-26 15:09:14 +08:00
shijing	db431e7379	fix:设备数据采集模拟	2025-02-26 15:06:17 +08:00
shijing	40bcad0275	fix:工艺路线指导文件在日志中查看	2025-02-26 13:46:45 +08:00
shijing	ca9c398241	fix:修改生产工序输出物料检测缺陷项不保存的问题	2025-02-26 13:45:52 +08:00
shijing	a4ee87d688	fix:玻纤：日志结束时间改成不能往前选可以往后选	2025-02-26 10:32:57 +08:00
shijing	016791b2aa	fix:光子：六车间中检可以撤回	2025-02-26 10:30:13 +08:00
shijing	a3f2e2c0b7	fix：检验时设备改成非必填；搜索框左移；只有检测项时关联缺陷项不判断	2025-02-26 10:29:32 +08:00
shijing	2f645882d5	fix:wpm.mlog.list添加查询条件with_mlogb	2025-02-25 17:46:25 +08:00
shijing	58ae8af50d	fix:检验工序检验调整	2025-02-25 17:40:28 +08:00
shijing	52456dc155	fix:添加工艺路线指导文件的查看	2025-02-25 17:39:58 +08:00
shijing	0ac03b4daf	fix:玻纤生产领料时领料数量为整数	2025-02-25 17:38:56 +08:00
shijing	d59116cc31	fix:关闭弹窗后列表刷新	2025-02-25 17:37:55 +08:00
shijing	9fbc9eb002	fix:玻纤采购入库时物料编号自动生成	2025-02-25 17:36:38 +08:00
shijing	797112f683	fix:生产执行页面传参变动	2025-02-25 17:33:39 +08:00
shijing	373fc37648	fix:mtask减少接口请求	2025-02-25 17:33:04 +08:00
shijing	59e5f391bd	fix:原料库添加物料存量展开	2025-02-25 17:31:52 +08:00
shijing	af2ae10c2f	fix:库存显示物料已到工序	2025-02-25 14:19:26 +08:00
shijing	8eaf38b040	fix:生产领料时选中物料数量不可编辑	2025-02-25 14:16:02 +08:00
shijing	c0c83a91c9	fix:工艺路线添加参考文献	2025-02-25 14:14:11 +08:00
shijing	71f7715b9e	fix:出入库详情中检验展示检验数量	2025-02-25 14:13:02 +08:00
shijing	656ba3bcfa	fix:打印地址调整	2025-02-25 14:11:50 +08:00
shijing	70c6660196	fix:新增返工日志	2025-02-24 17:54:46 +08:00
shijing	5320813c4b	fix:新增返工日志	2025-02-24 17:54:20 +08:00
shijing	724865e1d6	fix:	2025-02-24 17:49:07 +08:00
shijing	5bd096214c	fix:物料添加状态34返修完成品	2025-02-24 17:48:21 +08:00
shijing	527f44c443	fix:排板工段bw新增不要默认number	2025-02-24 13:42:13 +08:00
shijing	1674cb7d95	fix:玻纤原料入库和入库检验调整	2025-02-21 17:35:51 +08:00
shijing	e8cf10b2d4	fix：工艺路线展示抽屉宽度调整	2025-02-21 17:34:31 +08:00
shijing	9a370048ce	fix:检验添加批量操作	2025-02-21 17:33:47 +08:00
shijing	cbdc512cee	fix:system接口声明改动	2025-02-21 17:32:04 +08:00
shijing	db03953ce8	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-21 17:27:55 +08:00
shijing	1e4842b47e	fix:光子车间中检提交后列表刷新	2025-02-21 17:27:52 +08:00
zty	5e83bd7c24	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-21 15:30:19 +08:00
zty	7f73738a1c	feat: 修改计算中心 曲线图	2025-02-21 15:29:33 +08:00
shijing	cb884b054b	fix:光子六车间中检人员为六车间人员	2025-02-19 14:25:10 +08:00
shijing	64e6e2edb7	fix:玻纤交接人员筛选修正	2025-02-19 09:12:42 +08:00
shijing	d0509a8a4a	fix:光子车间中检	2025-02-19 09:11:50 +08:00
shijing	93ac96ddc2	fix:光子统计分析帮管综合统计列表调整	2025-02-19 09:11:01 +08:00
shijing	7564db1c48	fix:光子生产执行页面操作后的刷新问题处理	2025-02-19 09:08:57 +08:00
shijing	f0eb0708e7	fix:工艺路线新增时产品可以选择半成品	2025-02-18 09:30:45 +08:00
shijing	2a36b210b2	fix:输出日志详情操作列固定	2025-02-18 09:28:56 +08:00
shijing	539b911968	fix:coding#792	2025-02-17 16:33:13 +08:00
shijing	0bda185c4e	fix:coding#791	2025-02-17 16:32:45 +08:00
shijing	0d51f7c835	fix:车间库存添加检验和检验记录（当作中检）	2025-02-17 16:16:36 +08:00
shijing	62faabfbac	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-17 16:13:40 +08:00
shijing	a3c77fc0d7	fix:检验管理-性能检验放平	2025-02-17 16:13:37 +08:00
zty	369a759ba5	feat: fac_cal 修改校正测点 时间类型为日或天也显示校正	2025-02-17 15:36:52 +08:00
caoqianming	e3d24e7ccb	feat: mpointstat默认展示天3	2025-02-14 16:29:53 +08:00
caoqianming	e8833a78d4	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-14 16:28:21 +08:00
caoqianming	f42c300224	feat: mpointstat默认展示天2	2025-02-14 16:28:18 +08:00
shijing	5b169b9545	fix:6车间车间库存添加中间检验	2025-02-14 15:52:36 +08:00
shijing	d41ebfed13	fix:6车间车间库存添加中间检验	2025-02-14 15:52:18 +08:00
shijing	37929680b1	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-14 15:51:20 +08:00
shijing	8eaae70df3	fix:光子-统计分析-综合查询#coding767	2025-02-14 15:51:17 +08:00
caoqianming	aba0d54eab	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-14 15:24:36 +08:00
caoqianming	d3052c0dc7	feat: mpointstat默认展示天	2025-02-14 15:24:32 +08:00
shijing	7b047fe596	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-14 11:26:55 +08:00
shijing	afaa5e94bd	fix:入库检验没有wpr时不显示检验记录	2025-02-14 11:26:08 +08:00
caoqianming	e7afc81087	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-14 10:36:50 +08:00
caoqianming	1b5cbcdad0	feat: babylon和cesium懒加载及打包优化	2025-02-14 10:36:45 +08:00
shijing	51398f2df4	fix:日志form填写样式调整	2025-02-13 14:08:54 +08:00
shijing	0a2d892546	fix:车间库存中关联产品弹窗调宽	2025-02-13 11:06:51 +08:00
shijing	38aaf29056	fix:交接查看	2025-02-13 11:05:39 +08:00
shijing	ebad387933	fix:日志中的物料详情固定编号和编辑列，并固定检测项的宽度	2025-02-13 11:04:30 +08:00
shijing	adc8965199	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-13 11:02:30 +08:00
shijing	0ddb8ef9d9	fix:日志固定工艺路线	2025-02-13 11:02:27 +08:00
caoqianming	9558079588	fix: 登录页不默认账户密码	2025-02-13 10:26:38 +08:00
caoqianming	d8d6f29b93	feat: base 调整登录页背景图宽度	2025-02-13 10:23:10 +08:00
zty	9860158c8f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-12 17:34:43 +08:00
zty	77e8a1a211	feat: 增加测点字段	2025-02-12 17:34:40 +08:00
caoqianming	90143fa763	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-11 17:17:47 +08:00
caoqianming	5b7d906d44	feat: 部分页面调整	2025-02-11 17:17:40 +08:00
zty	f51655b416	feat: 修改生成日报和月报表	2025-02-11 14:26:08 +08:00
caoqianming	b52c990fb5	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-11 11:31:47 +08:00
caoqianming	f19911987d	feat: 原料入库显示是否检验	2025-02-11 11:31:44 +08:00
shijing	a819e4d4a3	fix:coding#787、2	2025-02-10 17:19:17 +08:00
shijing	bfb154dace	fix:coding#787、2	2025-02-10 17:18:39 +08:00
shijing	853048a473	fix:交接记录扫码后批次交接详情列表全部展示	2025-02-10 17:17:55 +08:00
shijing	0c7ce37ed8	fix:coding#786、2	2025-02-10 16:58:24 +08:00
shijing	97d2cb40b5	fix:coding#787、1	2025-02-10 16:57:26 +08:00
shijing	2e3857a9b9	fix:wprList去掉分页，page=0	2025-02-10 16:56:16 +08:00
shijing	f1ec1efa64	fix:减薄车间看板	2025-02-10 16:55:10 +08:00
shijing	89b64277f9	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-08 16:47:32 +08:00
shijing	a12c395405	fix:wpr打印标签更换成number，以及交接扫码处理	2025-02-08 16:47:29 +08:00
zty	91c1b9a0a4	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-08 15:39:44 +08:00
zty	a8e071d886	feat:修改生成日报表 enm_report/reportDay	2025-02-08 15:39:39 +08:00
shijing	f4ecb03144	fix:车间库存领料时扫码问题修正	2025-02-07 16:59:09 +08:00
shijing	f3aea5bf88	fix:扫码弹窗接收立即关闭参数	2025-02-07 16:58:31 +08:00
shijing	0fbd17810d	fix:采购入库时默认数量为1	2025-02-07 16:11:03 +08:00
shijing	8c7b900af0	fix:领料不合格不显示	2025-02-07 15:19:32 +08:00
shijing	37eeb45242	fix:根据交接物料限制交接工段	2025-02-07 15:16:30 +08:00
shijing	9a9be3857e	fix:wpm新增接口声明	2025-02-07 14:57:20 +08:00
shijing	e8449383c8	fix:bwcheck优化	2025-02-07 10:12:13 +08:00
shijing	8eeb78199c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-07 10:09:15 +08:00
shijing	9b0d63bcd6	fix:routepack编辑按钮显示	2025-02-07 10:09:11 +08:00
caoqianming	b53fd04088	feat: 证书状态查询	2025-02-06 11:54:04 +08:00
caoqianming	f550b1391d	feat: 在线考试详情页调整2	2025-02-06 09:03:57 +08:00
caoqianming	37f9c9fa3f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-05 17:54:39 +08:00
caoqianming	046d544872	feat: 在线考试详情页调整	2025-02-05 17:54:21 +08:00
shijing	423a390c4f	fix:玻纤交接改版	2025-02-05 16:57:47 +08:00
shijing	7eac479d9c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-05 16:55:44 +08:00
shijing	5788b746cd	fix:玻纤route中批次校验默认false	2025-02-05 16:55:40 +08:00
caoqianming	9a7dea317b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-02-05 15:50:22 +08:00
caoqianming	44db345ae7	feat: 证书管理增加状态展示	2025-02-05 15:50:10 +08:00
zty	5594b2c982	feat: tkx 修改质量报表	2025-01-26 11:26:22 +08:00
zty	e7b4df54ce	feat: tkx 修改质量 报表	2025-01-26 09:44:31 +08:00
zty	08b5c0550f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-24 17:17:09 +08:00
zty	1d837b9b0a	feat: 修改质量报表	2025-01-24 17:17:04 +08:00
shijing	3d273844bc	fix:排版添加跟随检验值	2025-01-24 16:32:00 +08:00
zty	2a75517a19	feat: fix 修改质量报表	2025-01-24 09:21:52 +08:00
zty	56334fc718	feat: 修改质量报表	2025-01-23 14:24:02 +08:00
shijing	ae3e6aa1ec	fix:曲阳更改ip地址	2025-01-23 09:54:58 +08:00
shijing	e7c983001b	fix:mlogb扫wpr码时，若以有该批次的使用数量显示更正	2025-01-22 16:46:15 +08:00
shijing	9399fd3b17	fix:交接批物料时修改	2025-01-22 16:33:18 +08:00
shijing	c4b28f8d5e	fix:打印接口	2025-01-22 14:34:35 +08:00
shijing	af13ba23af	fix:检验表中的检测项添加加入物料信息字段	2025-01-22 14:25:09 +08:00
shijing	e8508bfc67	fix:mlogbw输出物料检验	2025-01-22 09:42:05 +08:00
shijing	14170dbc56	fix:任务mtask添加删除	2025-01-22 09:18:06 +08:00
shijing	94ec97c7ef	fix:玻纤物料显示追踪方式	2025-01-21 15:34:08 +08:00
shijing	6efc502ccf	fix:工单处理调整	2025-01-21 15:33:05 +08:00
shijing	c5d6e6fcf7	fix:mlogbw样式调整	2025-01-21 11:07:06 +08:00
shijing	dfdecc01bd	fix:bug修复	2025-01-21 10:42:30 +08:00
shijing	24b4781f53	fix:mlogbw检测保存和编辑	2025-01-21 10:40:04 +08:00
shijing	397587bbeb	fix:玻纤原料入库检验	2025-01-20 17:37:18 +08:00
shijing	eff75a7c86	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-20 17:13:51 +08:00
shijing	53eb08d218	fix:缺陷项不合格分类去掉合格选择项	2025-01-20 17:13:48 +08:00
zty	a97abd2f2c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-17 17:32:45 +08:00
zty	29f7d0ecc4	feat:修改 enm/report	2025-01-17 17:32:40 +08:00
shijing	f16f649dc4	fix:库存交接时新增表单验证	2025-01-17 11:20:04 +08:00
shijing	f83983578f	fix:原料库添加类型和不合格标记	2025-01-17 11:02:02 +08:00
shijing	07e45047e4	fix:隐掉库存里的入库按钮	2025-01-17 09:36:37 +08:00
shijing	caf2f09c00	fix:检验记录与检验按钮只在批次追踪物料显示	2025-01-17 09:31:34 +08:00
shijing	ab987c0b8b	fix:wpr显示不合格标记	2025-01-17 09:23:58 +08:00
shijing	5d58d0c8fc	fix:日志详情里添加一个传参	2025-01-17 09:21:41 +08:00
shijing	3de4874cf4	fix:mlog中添加操作项	2025-01-17 09:20:19 +08:00
shijing	29c5eeb514	fix:车间库存领料时mioitem可删除	2025-01-17 09:13:30 +08:00
shijing	c99e2c8d1b	fix:交接记录可以更改批次号，以及解决扫码重复的情况	2025-01-17 09:12:23 +08:00
shijing	d3db926789	fix:原料库添加物料类型	2025-01-17 09:08:31 +08:00
shijing	23570fd84b	fix:日志中物料显示问题修正	2025-01-16 11:01:49 +08:00
shijing	b6b92fc451	fix:半成品添加图纸	2025-01-16 11:00:40 +08:00
shijing	ddcaae1bf9	fix:缺陷项去掉合格类型	2025-01-16 11:00:07 +08:00
shijing	8269c96159	fix:inmjs更新	2025-01-16 10:59:01 +08:00
shijing	cf8cb6726b	feat:添加操作项页面，操作项添加类型	2025-01-16 10:58:37 +08:00
shijing	29a9af5312	fix:车间库存检验记录	2025-01-15 15:52:51 +08:00
shijing	7831d87869	fix:mlogb中批次输入扫码（wm||wb）	2025-01-15 15:51:56 +08:00
shijing	6088b9c633	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-15 15:47:56 +08:00
shijing	e32c12b2da	fix:车间库存修改	2025-01-15 15:47:52 +08:00
zty	efd82972af	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-14 16:28:19 +08:00
zty	bf736966b6	feat: 修改 report 报表	2025-01-14 16:28:14 +08:00
shijing	88f1ea7af7	fix:玻纤日志改动	2025-01-14 14:16:36 +08:00
shijing	ddb82670ad	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-14 10:31:36 +08:00
shijing	70ca59a680	fix:mlogb和handoverb扫码添加	2025-01-14 10:31:33 +08:00
zty	5f116bed5f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-13 18:03:05 +08:00
zty	8d22019fd4	feat:修改班组排名	2025-01-13 18:03:02 +08:00
shijing	2dc9099409	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-13 16:48:53 +08:00
shijing	80f36a0e6f	fix:玻纤改动	2025-01-13 16:48:50 +08:00
zty	b31ae9403c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-13 11:30:40 +08:00
zty	b63b5c12db	feat：enm/bug fix	2025-01-13 11:30:37 +08:00
shijing	2a5183defd	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-13 09:12:14 +08:00
shijing	fe4e537ef8	fix:交接时物料选项工序展示；库存添加动态物料展示	2025-01-13 09:12:11 +08:00
zty	64c738acd2	feat: 修改 enm 报表	2025-01-10 17:32:01 +08:00
shijing	c1a4150080	fix:mlogb变动更新改动	2025-01-10 15:50:57 +08:00
shijing	49c3fdaae3	fix:bx日志相关改动	2025-01-10 15:23:17 +08:00
shijing	f01b1a6c9d	fix:mlogbw	2025-01-10 10:58:01 +08:00
shijing	f1c363ed23	fix:光芯日志输出物料编辑	2025-01-10 10:43:08 +08:00
shijing	4765754890	fix:日志详情输入无聊去掉加工前不良	2025-01-09 13:41:52 +08:00
shijing	2a282c5b63	fix:mlobw编辑时传参调整以及生产领料时物料标签的打印	2025-01-09 13:29:26 +08:00
shijing	faf6358eab	fix:mlogbdefectjiekoushengming	2025-01-09 11:35:24 +08:00
shijing	f93eb0fe89	fix:mlogbw提交	2025-01-09 10:52:11 +08:00
shijing	2dfc51b67d	fix:日志改动	2025-01-07 17:16:12 +08:00
shijing	4b02b7c00f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-07 16:11:05 +08:00
shijing	0ffabc4438	fix:采购入库检验调整	2025-01-07 16:11:02 +08:00
zty	84c05428be	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-07 14:19:22 +08:00
zty	95bba723b0	feat:修改车间工序单耗查询问题	2025-01-07 14:19:16 +08:00
shijing	251a96d083	fix:mio必填项提示	2025-01-07 11:29:01 +08:00
shijing	a42c674fcc	fix:领料添加mb	2025-01-07 11:28:21 +08:00
shijing	46372aa7ca	feat:接口声明（route中的辅料）	2025-01-07 11:03:25 +08:00
shijing	1fb2942e44	feat:route中添加辅料	2025-01-07 11:02:36 +08:00
shijing	295ed27bac	fix:玻纤日志相关调整	2025-01-07 09:47:06 +08:00
shijing	36a7c029b0	fix:mlogbw.js改动声明	2025-01-07 09:42:23 +08:00
shijing	81cf3eda13	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-07 09:40:58 +08:00
shijing	08872064c5	fix:bx交接页面调整	2025-01-07 09:40:54 +08:00
zty	97af55e294	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-06 17:39:20 +08:00
zty	b84d64b2f4	feat: 修改大屏内容和生产报告查询	2025-01-06 17:39:17 +08:00
shijing	d1215b6b05	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-06 14:58:04 +08:00
shijing	e75dfe67be	fix:交接记录查看时总计错误纠正	2025-01-06 14:58:00 +08:00
zty	fd770c2562	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-06 10:28:31 +08:00
zty	7fd709b7a6	feat: tkx/enm 修改班组 和 生产日报报表增加 目标值等功能	2025-01-06 10:28:28 +08:00
shijing	0877bd03d3	fix:动态产品接口声明	2025-01-06 09:10:41 +08:00
shijing	75f2906cf7	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-03 13:51:20 +08:00
shijing	400dfb27dd	fix:coding737	2025-01-03 13:51:17 +08:00
zty	553f2761bb	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-02 18:04:35 +08:00
zty	6584c82499	feat:修改班组得分	2025-01-02 18:04:30 +08:00
shijing	e3acce3f09	fix:mlogbw	2025-01-02 17:45:32 +08:00
shijing	eb025fbeb2	fix:库存交接记录检验改动	2025-01-02 17:21:52 +08:00
shijing	3f90ddf8f0	fix:玻纤日志改动物料标签改动	2025-01-02 17:17:04 +08:00
shijing	6824494817	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2025-01-02 17:15:26 +08:00
shijing	6102c682f9	fix:mlogbw接口声明	2025-01-02 17:15:23 +08:00
zty	ce9e15f83d	feat: 修改班组对比bug 和新增 生料工序	2025-01-02 16:22:00 +08:00
shijing	20328ab6ae	fix:bx日志详情及过程检验	2024-12-31 16:27:49 +08:00
shijing	ac7f5d7471	feat:添加bx入库检验	2024-12-31 16:26:51 +08:00
shijing	81889ef149	fix:inm添加接口声明	2024-12-31 16:25:41 +08:00
shijing	780a088642	fix:bx页面方法变动	2024-12-31 09:20:39 +08:00
shijing	beb6343180	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-31 09:18:54 +08:00
shijing	ec021374ca	fix:bx页面方法变动	2024-12-31 09:18:50 +08:00
zty	4bca9e4179	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 17:53:01 +08:00
zty	8f5c6d3c31	feat:修改生产报告内容	2024-12-30 17:52:56 +08:00
shijing	75b09a9ce1	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 16:11:58 +08:00
shijing	08a1d50c08	fix:coding737 3、合同金额字段加单位 （元）	2024-12-30 16:11:13 +08:00
zty	d34b781d9f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 15:20:41 +08:00
zty	fedbe82bbf	feat: 修改各个工段的里的 电量 分布电耗等名称	2024-12-30 15:19:47 +08:00
caoqianming	3df65b5a2b	feat:添加通过给定时间获取班年月日接口	2024-12-30 15:08:06 +08:00
caoqianming	d0b79ab921	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 15:04:44 +08:00
caoqianming	022d95e3d8	feat: 主要设备单号查询条件处理	2024-12-30 15:04:18 +08:00
zty	44fef5170d	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 14:07:06 +08:00
zty	574431ccb5	feat：修改水 压缩空气，电量的 时间范围选择	2024-12-30 14:07:03 +08:00
caoqianming	a55b5612a4	feat: 退出大屏	2024-12-30 14:05:39 +08:00
caoqianming	e0e043398f	feat: 生产报告图表优化	2024-12-30 13:55:59 +08:00
shijing	589d30de9b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 13:32:03 +08:00
shijing	2d4e3998a4	fix:coding#765	2024-12-30 13:31:59 +08:00
zty	f75d122ada	峰谷平增加时间段选择	2024-12-30 13:08:19 +08:00
zty	d734aab11f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 13:07:33 +08:00
zty	00fb81d95e	feat: 峰谷平增加时间段选择	2024-12-30 13:07:31 +08:00
shijing	620d0345f1	fixcoding764 水泥包装	2024-12-30 11:03:33 +08:00
zty	2c58eec472	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-30 10:59:59 +08:00
zty	e79c1b3519	feat: 修改水泥包装 和生料辅料生产报告配色	2024-12-30 10:59:56 +08:00
shijing	52d5b5e8ea	fix：coding图5修改生料辅料主要设备表单标题	2024-12-30 10:58:35 +08:00
shijing	70375a27ee	fix:coding752生料辅料工序班组月度对比删除成本列	2024-12-30 10:48:54 +08:00
shijing	d1b3aa901c	fix:coding763	2024-12-30 10:38:56 +08:00
shijing	6ea4eb4149	fix:修改提交错误	2024-12-30 10:12:24 +08:00
shijing	f1a031bcd7	1230	2024-12-30 10:07:31 +08:00
shijing	11d38f5508	fix:tkx电石渣工序班组月度对比修改	2024-12-30 09:59:16 +08:00
zty	59a991c49a	feat:大屏增加单位	2024-12-30 09:19:07 +08:00
zty	c9168a5b61	feat: 修改大屏 本月能源消耗改为本日	2024-12-30 09:14:43 +08:00
caoqianming	e8eb624661	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-28 23:52:12 +08:00
caoqianming	22fa90accf	feat: 目标配置列表显示年份	2024-12-28 23:52:09 +08:00
caoqianming	07b336e0c6	feat: 煤磨获取目标值错误	2024-12-28 12:43:08 +08:00
caoqianming	24e3a51c1f	feat: kwh更改	2024-12-28 11:55:21 +08:00
caoqianming	03c4e1f8da	feat: kwh修改	2024-12-28 10:28:31 +08:00
caoqianming	f84876d2e5	feat: 生料辅料工序本日数据添加上	2024-12-28 09:51:43 +08:00
caoqianming	6404fd33f1	feat: 样式调整	2024-12-27 20:15:55 +08:00
caoqianming	1747bc6a91	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 19:19:39 +08:00
caoqianming	03d41fc239	feat: report 报表的数据	2024-12-27 19:19:18 +08:00
zty	89bb16149f	feat: 修改能源流向图	2024-12-27 19:19:14 +08:00
caoqianming	2384a1ea71	feat: 计量设备添加工段运行	2024-12-27 18:32:28 +08:00
caoqianming	cd479c65e6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 18:05:36 +08:00
caoqianming	7fd3fa27fc	feat: mgroup 增加code展示	2024-12-27 18:05:14 +08:00
shijing	4bad854f10	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 18:04:23 +08:00
shijing	ac1bb62f81	fix:电石渣工序主要设备单耗计算公式初版	2024-12-27 18:04:19 +08:00
zty	7400a6d02c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 17:21:25 +08:00
zty	e006cf1855	feat:新增生料工序模块	2024-12-27 17:21:21 +08:00
shijing	a0a76308d4	fix:	2024-12-27 16:43:37 +08:00
shijing	c34846f3af	fix:tkx水泥包装工序生产报告页面调整	2024-12-27 16:41:37 +08:00
shijing	cdeff7a3f9	fix:tkx趋势图调整匹配六个工序	2024-12-27 16:40:44 +08:00
shijing	f862714b7b	fix:tkx水泥粉磨工序生产报告趋势图修正及页面调整	2024-12-27 15:28:16 +08:00
shijing	b437c645c6	fix:托克逊烧成工序生产报告趋势图修正及页面调整	2024-12-27 15:22:17 +08:00
shijing	d5fcdf20cd	fix:煤磨工序生产报告页面调整	2024-12-27 15:05:24 +08:00
zty	0fee5cf088	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 14:57:48 +08:00
zty	ffa8d11b67	feat: 增加 生料辅料工序	2024-12-27 14:57:45 +08:00
shijing	863795c285	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 14:55:20 +08:00
shijing	c68eeee2f8	fix:电石渣生产报告页面修改	2024-12-27 14:55:17 +08:00
zty	3ce895f9e5	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 14:00:21 +08:00
zty	4c39b66614	feat : 增加曲线图	2024-12-27 14:00:19 +08:00
shijing	dc42c40973	fix:托克逊生产报告图表坐标轴调整	2024-12-27 13:58:25 +08:00
zty	bd414e41ad	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 13:44:58 +08:00
zty	c7d5c96de9	feat: 修改 report	2024-12-27 13:44:54 +08:00
shijing	9e1b4e63c6	feat:计算中心添加大屏数据	2024-12-27 13:36:17 +08:00
shijing	b0ffdf0b18	fix:tkx大屏能源消耗图标颜色修改，本月能源数据可修改	2024-12-27 11:24:52 +08:00
zty	3b492e35b6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-27 09:15:18 +08:00
zty	3d2591e904	feat:水泥包装 增加昨日展示	2024-12-27 09:14:19 +08:00
shijing	8432b41a82	fix:检测表中的项目添加编辑	2024-12-26 17:10:12 +08:00
shijing	a8c948775e	fix:coding#741&&生产报告图表纠正	2024-12-26 16:25:35 +08:00
shijing	a2320580c1	fix:coding373、376	2024-12-26 13:30:40 +08:00
shijing	e133dc7cf8	fix:bx日志相关改动	2024-12-26 09:39:19 +08:00
shijing	2956be3702	fix:bx日志相关改动	2024-12-26 09:38:58 +08:00
shijing	9eeb26a8fd	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-26 09:36:20 +08:00
shijing	82af87ce9b	fix:能源流向图，展示所有类型测点值	2024-12-26 09:36:17 +08:00
caoqianming	4d708e7895	fix: 交接班日志时间查询修改	2024-12-26 09:24:52 +08:00
caoqianming	dff4b354e2	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-26 09:05:33 +08:00
caoqianming	d36f8111d4	feat: 棒管查询条件起止	2024-12-26 09:05:31 +08:00
shijing	34728670da	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-26 08:47:58 +08:00
shijing	bfb3693a3f	fix:移动端formitem样式调整	2024-12-26 08:47:55 +08:00
caoqianming	3bbe08f6d0	fix: 棒统计的时间选择错误	2024-12-25 18:16:16 +08:00
caoqianming	eeebe57fa4	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-25 18:08:26 +08:00
caoqianming	4ff97bc377	feat: 车间单耗分析说明添加完毕	2024-12-25 18:08:23 +08:00
shijing	40f35c5049	fix:能源流向更换背景图，添加测点类型图标	2024-12-25 17:48:21 +08:00
shijing	cd3039865f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-25 17:20:34 +08:00
shijing	047b75344b	fix:能源流向更换背景图，添加测点类型图标	2024-12-25 17:20:30 +08:00
zty	a0b1659f10	feat: 修改主要报表	2024-12-25 16:55:17 +08:00
caoqianming	e2595bf3c9	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-25 15:24:49 +08:00
caoqianming	bc343c6a96	feat: 计算系数的相关页面	2024-12-25 15:24:47 +08:00
shijing	0fb47feb55	fix:光芯减薄车间看板静态页面	2024-12-25 15:15:17 +08:00
shijing	dc65cf0a1b	fix:defect不合格项添加备注	2024-12-25 15:14:12 +08:00
shijing	5ef4d80a59	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-25 15:04:06 +08:00
shijing	bfba9b2e7c	fix:coding#732	2024-12-25 15:04:03 +08:00
caoqianming	654da126d4	feat: 增加计算系数	2024-12-25 14:55:25 +08:00
shijing	6fd9f94271	fix:岗位放开描述字段	2024-12-24 15:08:48 +08:00
shijing	5c43ebba31	fix:scEcharts组件完善	2024-12-24 14:41:29 +08:00
shijing	4d414f1fcf	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-24 14:10:28 +08:00
shijing	60d8ea8508	fix:qctDetail修正	2024-12-24 14:09:53 +08:00
zty	91fad99f5b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-24 09:30:50 +08:00
zty	1d9645fa45	feat:修改循环风机无数据	2024-12-24 09:30:47 +08:00
caoqianming	ec90ec5ecd	feat: 按托克逊要求修改页面	2024-12-23 14:40:36 +08:00
shijing	f3015f58bf	fix:一些小改动	2024-12-23 09:25:19 +08:00
shijing	93d207b7d4	fix:testitem添加字段	2024-12-20 16:51:10 +08:00
shijing	a9117da584	fix:testitem_form中去掉cate获取	2024-12-20 11:24:22 +08:00
shijing	f51f7affaf	fix:enum.js新增数据	2024-12-20 11:08:53 +08:00
shijing	6dac98b2a3	fix:scformtable添加序号隐藏	2024-12-20 10:47:15 +08:00
shijing	e825947de7	fix:检验表功能完善	2024-12-20 10:45:59 +08:00
shijing	94bd41c4f1	fix:qm检测表相关接口声明	2024-12-19 16:08:41 +08:00
shijing	0deb3a653c	fix:检测项列表展示修正	2024-12-19 16:07:44 +08:00
shijing	8664db52b7	fix:检验项修正	2024-12-19 15:55:13 +08:00
shijing	9018800f4f	fix:玻纤生产执行页面变更	2024-12-18 17:42:18 +08:00
shijing	d2821d5e98	fix:玻纤物料添加追踪方式	2024-12-18 15:09:43 +08:00
shijing	9bee6af2b1	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-18 13:44:51 +08:00
shijing	4afa8e8361	fix:工艺路线添加切分数量	2024-12-18 13:43:59 +08:00
zty	0a20102060	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-18 13:29:41 +08:00
zty	f3d84d165e	feat: 修改生成日报的运转率和运转时间	2024-12-18 13:29:37 +08:00
shijing	8b25da6bad	fix:能源流向图片地址纠正	2024-12-18 11:32:48 +08:00
shijing	c3eaa07d73	feat:添加不合格项#coding720	2024-12-18 11:25:23 +08:00
caoqianming	f231b2dc25	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-17 17:33:10 +08:00
caoqianming	299258925c	feat: process添加字段	2024-12-17 17:32:53 +08:00
zty	376b65364f	feat: 增加压缩空气报表	2024-12-17 17:21:07 +08:00
shijing	af45254d43	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-17 17:07:45 +08:00
shijing	368d106143	fix:能源流向图添加工业水，去掉图标	2024-12-17 17:07:42 +08:00
zty	1246966c58	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-17 16:22:33 +08:00
zty	fbda02f549	feat: 修改大屏内容和报表	2024-12-17 16:22:29 +08:00
shijing	e0a02ba014	fix:客户端可修改大屏标题	2024-12-17 15:43:37 +08:00
shijing	bb95b5228e	feat:白片抛检验审批	2024-12-17 14:30:38 +08:00
shijing	5c139f0b7c	fix:光芯生产执行恢复	2024-12-17 10:39:01 +08:00
shijing	ce57e0c5e1	fix:光芯生产执行恢复	2024-12-17 10:28:41 +08:00
shijing	b435f9ed10	fix:玻纤生产执行分离	2024-12-17 10:27:19 +08:00
shijing	25a2427138	fix:动态路由	2024-12-16 17:38:43 +08:00
shijing	82ee266d51	fix:menu	2024-12-16 15:57:26 +08:00
zty	421ae76ac6	feat:修改设备编号	2024-12-16 14:54:35 +08:00
shijing	da53ce0411	fix:10车间日志提交更新	2024-12-16 13:37:30 +08:00
shijing	139c24c9bc	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-16 11:31:46 +08:00
shijing	ba3ce6e30e	fix:system添加接口声明	2024-12-16 11:31:42 +08:00
caoqianming	1a6d53a685	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 18:14:57 +08:00
caoqianming	b3ca98680d	feat: 电石渣工序车间单耗异常填写	2024-12-13 18:14:37 +08:00
Li xia	bbc0603bdf	route生产二部权限替换	2024-12-13 17:41:16 +08:00
shijing	c43e670eb1	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 17:01:57 +08:00
shijing	9b4bdd2f96	fix：全场报表生产日报表、生产月报表表格改动	2024-12-13 17:01:53 +08:00
caoqianming	d14faabc46	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 16:13:48 +08:00
caoqianming	733d1bebb1	feat: base 优化menu展示	2024-12-13 16:13:23 +08:00
shijing	55f99058cf	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 15:42:30 +08:00
shijing	ece48faede	fix:厂级单耗	2024-12-13 15:42:26 +08:00
zty	5606d90eca	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 15:29:56 +08:00
zty	c336a6ef1e	feat:修改电量报表 按时间段查询	2024-12-13 15:29:53 +08:00
shijing	064860ed92	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-13 14:55:16 +08:00
shijing	8055fe7968	fix:pad端样式调整	2024-12-13 14:55:13 +08:00
caoqianming	fa475e8568	feat: base 功能管理页面调整以支持后端路由2	2024-12-13 13:43:46 +08:00
caoqianming	b0ad4e1a06	feat: base 功能管理页面调整以支持后端路由	2024-12-13 13:39:45 +08:00
shijing	42baf79b76	fix:工序type	2024-12-13 09:35:56 +08:00
shijing	1750e89138	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-12 17:36:30 +08:00
shijing	516085fa30	base:bx主题颜色变更	2024-12-12 17:36:26 +08:00
zty	a56d5cbf82	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-12 17:16:27 +08:00
zty	1f33764782	feat:能源流向图增加单位	2024-12-12 17:16:24 +08:00
shijing	fa9dea32ef	fix:清除移动端菜单边距	2024-12-12 17:15:00 +08:00
shijing	45f5166d95	fix:工序添加type	2024-12-12 16:40:39 +08:00
shijing	fd79baf73a	fix:检验项和检验表静态页面	2024-12-12 15:47:46 +08:00
shijing	24252a4995	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-12 15:47:14 +08:00
shijing	010298dd89	feat:废品库出库	2024-12-12 15:47:11 +08:00
zty	0c910a1783	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-12 14:56:12 +08:00
zty	1de408c64d	feat: 能源流向增加单位 和修改大屏	2024-12-12 14:56:09 +08:00
shijing	653f5b0282	fix:添加检验项、检验表页面路由	2024-12-12 14:05:36 +08:00
shijing	da221bbee4	fix:添加检验项、检验表页面路由	2024-12-12 13:46:17 +08:00
shijing	0cb85ee6dd	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-12 13:44:33 +08:00
shijing	256e2b5009	fix:bx放出排版规则	2024-12-12 13:44:30 +08:00
caoqianming	5d94b20320	feat: 优化测点表	2024-12-11 17:48:42 +08:00
caoqianming	a50794c2b7	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-11 17:47:04 +08:00
caoqianming	c8bde428a8	fix: team 编辑后未刷新	2024-12-11 17:46:37 +08:00
shijing	bb314a30a2	fix:物料清单成品添加图纸和图纸编号	2024-12-11 15:53:18 +08:00
shijing	69307c7590	fix:玻纤生产执行	2024-12-11 14:58:10 +08:00
shijing	e32d444e57	fix:玻纤工序变动	2024-12-11 14:56:50 +08:00
shijing	8bf82762bc	fix:玻纤工序变动	2024-12-11 14:56:28 +08:00
shijing	cce2c8e395	fix:玻纤工序变动	2024-12-11 10:12:25 +08:00
shijing	e03198aa43	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-11 10:09:38 +08:00
shijing	ba39e85698	fix:玻纤工段变动	2024-12-11 10:08:39 +08:00
zty	a4fa774ce2	feat: tkx 修改大屏增加电量报表和物料氨水消耗	2024-12-10 15:30:14 +08:00
shijing	d30376cd17	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-09 11:07:30 +08:00
shijing	5b3fa16bec	fix:光子综合查询库存修正	2024-12-09 11:05:13 +08:00
caoqianming	5b1f9db6d8	feat: mpoint添加筛选	2024-12-06 19:27:11 +08:00
caoqianming	8c5f6b6cec	feat: 停机日志页面调整	2024-12-06 19:23:48 +08:00
caoqianming	d0d41b6f59	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 19:22:22 +08:00
caoqianming	79debc4242	feat: 计算中心页面调整	2024-12-06 19:22:19 +08:00
shijing	8c070442c6	fix:流向图调整	2024-12-06 17:54:41 +08:00
shijing	9f2d1b9bf1	fix:流向图调整	2024-12-06 17:54:05 +08:00
shijing	d073270dbb	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 16:10:04 +08:00
shijing	02364cba7d	fix:流向图图片地址	2024-12-06 16:10:01 +08:00
caoqianming	9292cfe61d	feat: enstatvue 小调整	2024-12-06 15:37:08 +08:00
caoqianming	d7d1ab60de	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 15:36:37 +08:00
caoqianming	8443916320	feat: base query可替换order	2024-12-06 15:36:33 +08:00
shijing	856cd3dad1	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 15:34:06 +08:00
shijing	8f35a7f6b5	fix:coding#674页面数据	2024-12-06 15:34:03 +08:00
caoqianming	1c47d546b7	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 15:14:04 +08:00
caoqianming	497c57a186	feat: 增加计算聚合页面	2024-12-06 15:13:59 +08:00
zty	eca678139b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 15:06:41 +08:00
zty	bf581b872d	feat: 修改峰谷平的报表	2024-12-06 15:06:38 +08:00
shijing	3a59765b26	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 14:53:39 +08:00
shijing	09b5f89a0a	fix:coding#674页面数据	2024-12-06 14:53:36 +08:00
zty	2427752b2a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 14:27:07 +08:00
zty	47b225d7ab	feat: 增加峰谷平和 水报表	2024-12-06 14:25:27 +08:00
caoqianming	9398cab8b6	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 13:50:57 +08:00
caoqianming	20b52d4c3b	feat: 计算中心添加工段计算页面	2024-12-06 13:50:54 +08:00
shijing	53b892317a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 13:01:24 +08:00
shijing	cde58ee08f	fix:coding#674页面	2024-12-06 13:01:20 +08:00
caoqianming	2dd4661f44	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 11:53:59 +08:00
caoqianming	9b53a3428b	feat: 能管控制台设备提醒查询条件	2024-12-06 11:53:55 +08:00
shijing	3049f491a8	fix：报警事件页面以及处理改动	2024-12-06 11:16:15 +08:00
shijing	4e8f85f63a	fix:coding#673综合对比	2024-12-06 09:53:35 +08:00
shijing	b54b1733b9	fix:coding#673全厂报表	2024-12-06 09:48:42 +08:00
shijing	15292ee455	fix:coding#673能源报表	2024-12-06 09:39:09 +08:00
shijing	9c59ebbfc5	fix:coding#673水泥包装工序	2024-12-06 09:36:17 +08:00
shijing	5f58446d6d	fix:coding#673水泥粉磨工序	2024-12-06 09:34:56 +08:00
shijing	488ab287d4	fix:coding#673烧成工序	2024-12-06 09:22:23 +08:00
shijing	607546ba7d	fix:coding#673煤磨工序	2024-12-06 09:20:42 +08:00
shijing	d1ea1e49ac	fix:coding#673生料工序	2024-12-06 09:19:28 +08:00
shijing	b79a1ef671	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-06 09:15:03 +08:00
shijing	6598a4f845	fix:coding#673电石渣工序	2024-12-06 09:14:59 +08:00
caoqianming	a019b681ee	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-05 18:18:04 +08:00
caoqianming	5cb13722a4	feat: 排班规则页面	2024-12-05 18:17:59 +08:00
shijing	520004edb9	fix:coding#658能源监察报表填数	2024-12-05 17:48:31 +08:00
shijing	4909cadf77	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-05 17:19:17 +08:00
shijing	619e1ea535	fix:coding#658能源监察报表	2024-12-05 17:19:13 +08:00
caoqianming	345c73cf09	feat: 计算结果页面优化	2024-12-05 15:26:20 +08:00
caoqianming	5ec953ff2e	feat: base xtselect emit change	2024-12-05 15:21:56 +08:00
shijing	bc583ecb8d	fix:托克逊事件跳转	2024-12-05 11:23:43 +08:00
shijing	3105ac993d	fix:能源流向图辊压机计算	2024-12-05 10:24:57 +08:00
shijing	64fc587726	fix:能源图	2024-12-05 10:07:36 +08:00
shijing	4bcc78f789	fix:tkx大屏	2024-12-05 09:58:40 +08:00
shijing	16f1541e42	fix:能源流向图	2024-12-05 09:52:48 +08:00
shijing	91b8d3fc4a	fix:tkx大屏改动	2024-12-04 15:45:23 +08:00
shijing	578c69b599	fix:棒管统计字段/条件查询 修正	2024-12-04 13:48:34 +08:00
shijing	0d2a4a25ff	fix:棒管统计字段修正	2024-12-04 11:06:13 +08:00
shijing	84a8b8d1df	fix:统计分析棒管页面查询条件改动	2024-12-04 10:36:21 +08:00
shijing	54a46fe18c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-03 17:53:24 +08:00
shijing	085b4aa1c7	fix:统计分析棒管	2024-12-03 17:53:21 +08:00
zty	1d0bb09f10	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-03 17:45:14 +08:00
zty	93979953f6	feat: 修改tkx 检定设备	2024-12-03 17:45:09 +08:00
shijing	f2cfde2355	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-03 15:22:38 +08:00
shijing	96b6e63d03	fix:检验表单中设备列表获取修正	2024-12-03 15:22:34 +08:00
zty	f677082480	feat: tkx 检验设备临期提醒	2024-12-03 15:21:21 +08:00
zty	c667ac0994	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-12-03 11:44:53 +08:00
zty	4db4a87d99	feat: tkx 增加柱状图	2024-12-03 11:44:50 +08:00
shijing	148584b8aa	fix:日志中工段问题修改	2024-12-03 09:45:01 +08:00
shijing	048a8976db	fix:批次统计数据接口声明	2024-12-02 15:31:12 +08:00
shijing	2d52ae26c5	fix:棒管统计页面	2024-11-29 17:45:25 +08:00
shijing	3e3c34e49f	fix:coding#656form表单	2024-11-29 17:43:00 +08:00
shijing	5b676f7c4b	fix:coding#656	2024-11-29 17:42:37 +08:00
shijing	13d0d7d5f7	fix:coding#604	2024-11-29 14:16:50 +08:00
shijing	721ddd7b17	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-28 16:43:33 +08:00
shijing	0d9afd42e0	fix:fmlog改动，以及大屏改动	2024-11-28 16:43:30 +08:00
zty	6cb44c71ec	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-28 16:13:59 +08:00
zty	8c5e3498ab	feat：home/event 修改tkx 能源报警事件	2024-11-28 16:13:56 +08:00
shijing	ffc95890fa	fix:coding#594	2024-11-28 09:59:57 +08:00
shijing	96820cbb4f	fix:检验合格B类	2024-11-28 08:55:59 +08:00
shijing	fe312b455c	fix:coding#628	2024-11-27 17:14:08 +08:00
shijing	f079ad9144	fix:coding#608	2024-11-27 14:29:26 +08:00
shijing	208c0aee5c	fix:coding#560二、1性能检验改动	2024-11-27 14:28:27 +08:00
zty	52aa3b167b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-27 09:51:58 +08:00
zty	cdf271877d	feat:tkx 页面修改	2024-11-27 09:51:34 +08:00
shijing	29597f1348	#502coding：13、添加批次序号 预备用	2024-11-27 09:28:24 +08:00
shijing	cc1bc5c129	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-27 09:22:38 +08:00
shijing	cea727a691	fix:大屏动态获取公告	2024-11-27 09:22:35 +08:00
caoqianming	3b7458d683	feat: 外协和磨抛一次抛2	2024-11-26 22:31:27 +08:00
caoqianming	ae365ee383	feat: 外协和磨抛一次抛	2024-11-26 22:23:04 +08:00
caoqianming	03780360ac	feat: 设备取消是否删除的筛选	2024-11-26 17:51:03 +08:00
caoqianming	17dc188e25	fix: 车间入库时depts查询报错	2024-11-26 16:58:52 +08:00
zty	a9cb7c918b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-25 18:33:11 +08:00
zty	893f7a6cd7	fix : 修改 tkx 工序内容	2024-11-25 18:32:52 +08:00
shijing	63c7929ea3	feat:新增返工统计页面，车间库存检验统计	2024-11-25 17:24:10 +08:00
shijing	a4eeb13b2f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-25 10:25:08 +08:00
shijing	78d82b6f3f	fix:字段更正	2024-11-25 10:25:05 +08:00
caoqianming	eabdabcf3a	feat: mlog不再进行审计	2024-11-24 17:42:32 +08:00
caoqianming	4c003251c1	feat: base 修改xtui名称	2024-11-24 17:41:22 +08:00
shijing	61c03414c0	fix:article中form清空与复现	2024-11-22 17:24:32 +08:00
shijing	34d3099ed6	feat:添加公告视频列表页面	2024-11-22 15:46:41 +08:00
shijing	5c0f9acf2f	fix:gx获取工段用name查询	2024-11-22 11:32:47 +08:00
shijing	37eacdadfe	fix:光芯大屏更新	2024-11-22 11:21:17 +08:00
shijing	4e1a6901fd	fix:tool中修改格式化日期方法	2024-11-22 10:00:29 +08:00
shijing	b92937fb9b	fix:交接记录手动添加时多选物料	2024-11-22 09:59:32 +08:00
shijing	6a7975e6ce	fix:大屏更改	2024-11-21 13:28:28 +08:00
shijing	0752000f24	fix:coding交接变动	2024-11-21 13:27:54 +08:00
shijing	4d8bf81be3	fix:成品检验车间库存放开检验	2024-11-21 13:27:18 +08:00
shijing	6a50019343	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-21 13:24:42 +08:00
shijing	431fcf4bd8	fix:尺寸外观（成品）检验添加检验设备和备注	2024-11-21 13:24:38 +08:00
caoqianming	78053dac34	fix: 标记位置加载js报错的问题	2024-11-20 17:39:05 +08:00
caoqianming	fed5c23a28	fix: user处element升级导致的switch颜色处理	2024-11-20 15:52:10 +08:00
caoqianming	014da8f587	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-20 15:49:31 +08:00
caoqianming	5cefd84ded	feat: 设备管理is_deleted可查	2024-11-20 15:49:16 +08:00
shijing	05649491ab	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-19 16:31:22 +08:00
shijing	38c84fa1e9	fix:高echarts改动	2024-11-19 16:31:18 +08:00
caoqianming	e94d3194ef	feat: 成品检验依据子项确定抽检数等	2024-11-19 15:23:04 +08:00
caoqianming	1849fe6eef	feat: 修改xtSelect 的高度	2024-11-19 15:16:02 +08:00
caoqianming	7fe603dbc2	fix: scTable refresh问题	2024-11-15 18:51:51 +08:00
caoqianming	3376d9c5af	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-15 18:31:56 +08:00
caoqianming	234e5ca216	feat: mtask查看可用批次	2024-11-15 18:31:35 +08:00
shijing	231b306829	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-15 14:46:27 +08:00
shijing	4d21ef3a65	fix:大屏优化	2024-11-15 14:46:24 +08:00
caoqianming	cbd7ec9e8d	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-15 14:39:51 +08:00
caoqianming	04d4129f98	feat: 图标展示优化	2024-11-15 14:39:30 +08:00
zty	3b71931f3a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-15 14:07:54 +08:00
zty	cc5df7b2b3	feat:修改 tkx 计算系数 和 backup --delete	2024-11-15 14:07:50 +08:00
caoqianming	890a344082	feat: base 系统路由中dashboard函数获取	2024-11-15 09:27:56 +08:00
zty	b0d0df97be	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-14 17:45:08 +08:00
zty	b7a420c576	fix tkx bug	2024-11-14 17:44:54 +08:00
shijing	feeeaf423e	fix:光芯大屏更新视频公告	2024-11-14 11:23:08 +08:00
shijing	bfd3f5e7f9	fix:coding#502-2	2024-11-14 11:21:46 +08:00
shijing	6fd716d4ba	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-13 17:01:26 +08:00
shijing	07958e9a57	fix:车间库存添加状态筛选	2024-11-13 17:00:43 +08:00
shijing	95a81dbf8d	fix:光芯大屏更新	2024-11-13 16:59:41 +08:00
zty	e611c4597b	fix : 修改 tkx bug	2024-11-12 16:23:22 +08:00
shijing	58a3e9fe2d	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-08 10:28:07 +08:00
shijing	9f9ce29ee0	fix:gx大屏初步模板	2024-11-08 10:28:02 +08:00
zty	72d29e6758	fix: 修改能源流向图地址	2024-11-07 11:16:45 +08:00
shijing	fb79ad7943	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-07 11:09:47 +08:00
shijing	1b297de7bb	fix:物料选择查询条件添加mtaskx	2024-11-07 11:09:44 +08:00
shijing	ce3e4becc6	fix：能源流向放开	2024-11-07 11:08:00 +08:00
zty	48ce15857b	feat: 修改图标 x 轴 顺序问题	2024-11-07 10:27:52 +08:00
zty	1b5bd4255c	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-07 09:55:40 +08:00
zty	b2c8254976	feat: 修改大屏内容	2024-11-07 09:55:34 +08:00
caoqianming	be9da52571	fix: testx中xtSelect修改	2024-11-07 08:32:45 +08:00
zty	d190c47c3b	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-01 17:11:14 +08:00
zty	7d7eee19af	feat : index_enm 修改大屏内容	2024-11-01 17:11:11 +08:00
shijing	bab6467c25	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-01 14:35:58 +08:00
shijing	ddb83f7eb4	fix:流程图改动（抽出组件）	2024-11-01 14:35:53 +08:00
caoqianming	7b59a8ae3a	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-01 09:27:18 +08:00
caoqianming	f0aab1b9af	feat: 修改xtSelect名称	2024-11-01 09:26:50 +08:00
shijing	d7965ef170	fix:coding507	2024-11-01 09:26:17 +08:00
shijing	7cb112bde8	fix:出入库后页面库存刷新	2024-11-01 09:24:04 +08:00
shijing	b062b9f568	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-11-01 09:11:21 +08:00
shijing	6f717b03ec	fix:fmlog日志中编辑mlog时取消领料数量不能大于当前工段库存数的限制，且合格不合格禁用	2024-11-01 09:11:17 +08:00
zty	30e24fd8f5	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-31 11:28:27 +08:00
zty	0dd7648593	feat: 修改图表	2024-10-31 11:28:23 +08:00
shijing	9734d461cf	fix:交接页面按钮修正	2024-10-30 10:03:34 +08:00
shijing	f4fcc315bb	fix:小问题修正（过程抽检打印）	2024-10-30 09:05:57 +08:00
shijing	dabedbd432	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-30 09:04:04 +08:00
shijing	371316faea	fix:添加扫描按钮，并更换	2024-10-30 09:04:00 +08:00
zty	e8d28126ad	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-29 16:28:30 +08:00
zty	2ed4e5dc7a	feat:fac_cal 增加 计算中心折线图	2024-10-29 16:28:25 +08:00
shijing	6f476c2740	fix:日志中物料标签的打印	2024-10-29 15:29:03 +08:00
shijing	7ed39bb24a	fix:标签模板优化	2024-10-29 14:24:57 +08:00