2860 Commits

Author	SHA1	Message	Date
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
shijing	d91db25ed6	fix:fmlogs打印传参更改	2024-10-29 13:54:28 +08:00
shijing	af24f1f4cf	feat：导航栏添加扫描按钮，扫描二维码查看打印详情	2024-10-29 10:15:46 +08:00
shijing	8e5f258d1a	fix:区别详情查看和扫码添加	2024-10-29 10:14:58 +08:00
shijing	c5e83d9581	fix:更正错别字，表头深色，修正错误数据引用	2024-10-29 10:14:17 +08:00
shijing	be8ee7b14b	fix:更改日志打印标记	2024-10-29 10:12:22 +08:00
caoqianming	27fd49a690	feat: xselect edit参数更改	2024-10-26 13:13:03 +08:00
caoqianming	177446d8c2	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-26 13:09:04 +08:00
caoqianming	fdd3604fc3	feat: 完善xselect封装	2024-10-26 13:08:45 +08:00
shijing	0a48dbecdd	fix:添加一个全局参数	2024-10-25 17:21:23 +08:00
shijing	642b94923f	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 17:20:12 +08:00
shijing	3349982650	fix:工段库存物料标签打印	2024-10-25 17:17:54 +08:00
shijing	f3f59c7888	feat:抽取物料标签打印并改动库存里的物料标签打印	2024-10-25 17:16:37 +08:00
caoqianming	7cd8ad4b0d	feat: 解除vue警告	2024-10-25 16:34:46 +08:00
caoqianming	b866d133e0	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 16:04:12 +08:00
caoqianming	875b47f111	feat: 添加scTableSelect	2024-10-25 16:03:52 +08:00
zty	19cc389066	feat:修改tkx大屏内容	2024-10-25 15:48:52 +08:00
zty	ab3b815832	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 15:34:35 +08:00
zty	6502325099	feat: 修改tkx大屏内容	2024-10-25 15:34:29 +08:00
caoqianming	9c12eea0f3	feat: 更新xselect以支持多选	2024-10-25 14:52:59 +08:00
caoqianming	f844379525	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 12:55:32 +08:00
caoqianming	31c6cc6a1f	feat: base 消除element警告	2024-10-25 12:55:18 +08:00
shijing	13ce3ccc83	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 11:15:18 +08:00
shijing	f53ab995fd	feat:日志添加车间库存并打印物料标签	2024-10-25 11:14:19 +08:00
shijing	f5860c42d5	feat:日志添加车间库存并打印物料标签	2024-10-25 11:13:28 +08:00
caoqianming	49f6158bf0	feat: 调整目录结构等	2024-10-25 10:37:50 +08:00
caoqianming	5f738446fb	feat: 添加xselect	2024-10-25 10:37:00 +08:00
caoqianming	0449684caf	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-25 09:34:27 +08:00
caoqianming	ebd9bfb7fa	feat: base sctable去除最后一列	2024-10-25 09:34:13 +08:00
shijing	9e4ceeec3f	fix:光芯过程自检过程抽检和外观检验权限变动	2024-10-24 17:25:59 +08:00
shijing	a9ca429667	feat:新增过程光芯自检，与光子抽离	2024-10-24 17:23:13 +08:00
shijing	472a871b90	feat:过程抽检添加打印	2024-10-24 17:22:41 +08:00
shijing	88fc695454	feat:工段交接记录新增时扫码添加物料	2024-10-24 17:21:37 +08:00
shijing	4acdc9f4cd	feat:工段交接记录打印	2024-10-24 17:20:42 +08:00
shijing	f02467a881	feat:车间入库记录打印	2024-10-24 17:19:53 +08:00
shijing	bd873b3b32	feat:车间库存物料标签打印	2024-10-24 17:18:48 +08:00
shijing	d07ff31f76	feat:日志打印	2024-10-24 17:18:15 +08:00
shijing	7956d72987	feat:任务分解打印	2024-10-24 17:17:31 +08:00
shijing	b56a06d5e6	feat:扫描组件	2024-10-24 17:16:44 +08:00
shijing	42760326b8	fix:日志打印	2024-10-24 17:15:53 +08:00
shijing	01500ad0b1	fix:库存出入库记录打印	2024-10-24 17:15:05 +08:00
shijing	06e52b6c5f	fix:A4打印	2024-10-24 17:14:09 +08:00
shijing	6d87291c90	Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web	2024-10-24 17:12:36 +08:00
shijing	403560ce9f	fix:库存物料标签打印	2024-10-24 17:12:32 +08:00