xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121 Commits 4 Branches 0 Tags
6738104534d55cc16d367a9331c2bab81534eff8
Commit Graph

80 Commits

Author SHA1 Message Date
Timer
6738104534 bug 2026-04-16 01:13:03 +08:00
Rue Ji
e5da30098f Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng 2026-04-14 20:13:49 +08:00
Rue Ji
65c2a978b8 feat(main_JS_Company): 重构主配置与企业模块数据加载逻辑 2026-04-14 20:13:47 +08:00
Timer
5c576ddfcb bug 2026-04-09 14:16:18 +08:00
Timer
f89ab0f90d bug 2026-04-09 09:09:00 +08:00
Timer
78ec2cbe85 Merge branch 'deng' into deng-release 2026-04-08 19:17:05 +08:00
Rue Ji
3c9ba8a7f5 feat(process): 优化工艺列表初始化与测点值异步获取 2026-04-08 01:11:01 +08:00
Timer
abdd3b7add Merge branch 'deng' into deng-release 2026-04-05 23:21:52 +08:00
Timer
ebe3148a58 bug 2026-04-05 23:21:30 +08:00
Rue Ji
6d5c8bfd65 fix(file): 优化文件上传及预览逻辑，完善当前用户信息设置 2026-04-05 22:36:07 +08:00
Timer
0c8b530339 bug 2026-04-05 22:16:12 +08:00
Rue Ji
784ac30847 style(webapp): 注释和调整前端页面部分元素及代码 2026-04-04 01:22:16 +08:00
Timer
b0e2e58d93 Merge branch 'deng' into deng-release 
# Conflicts:
#	src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java
 2026-04-04 01:18:42 +08:00
Timer
785654a510 bug liucheng 2026-04-04 01:17:13 +08:00
Rue Ji
dafda57a0e refactor(mpont): 优化测点查询及前端图表渲染逻辑 
- 优化数据库查询测点逻辑，优先通过unitId和测点编码查询，失败后通过测点编码模糊查询
- 统一调整AJAX请求格式，规范URL拼接及回调函数编写
- 修正前端JS代码中数据解析方式，使用严格的空字符串判断
- 规范DOM选择器对应代码格式，采用双引号替换单引号
- 重构echart饼图组件配置，提升代码可读性和维护性
- 移除注释的旧版echart图表函数，精简前端代码
- 优化echart折线图、柱状图渲染，统一异步请求与数据展示流程
- 新增多点柱状图（工业生活污水流量7天日趋势）异步数据加载和渐变色样式配置
- 修复部分变量声明和函数命名规范，提升代码一致性
 2026-04-04 00:51:33 +08:00
Timer
fadbe2b59f bug 2026-04-01 08:58:11 +08:00
Rue Ji
c11112b066 fix: 修复维护计划详情空指针异常并更新GIS页面数据 2026-03-31 15:49:36 +08:00
Timer
596b2a68bf bug 2026-03-27 23:46:04 +08:00
Rue Ji
5bacfa37d4 fix: 修复jobList.jsp中companyId变量初始化顺序问题 2026-03-26 23:15:14 +08:00
Rue Ji
a5ac9fb038 fix: 修复嵌套模态框输入框焦点问题并增强功能 
修复Bootstrap嵌套模态框中输入框无法获得焦点的问题，通过禁用enforceFocus实现
为文件删除函数添加index参数以支持精确删除
在任务列表中添加SafetyJobInside模块的查看支持
为巡检内容返回数据添加contentsDetail字段
在设备归属选择列表中添加搜索功能并调整姓名列宽度
 2026-03-26 20:07:10 +08:00
Timer
1cd6750710 bug 2026-03-26 01:47:35 +08:00
Timer
b745bb8482 bug 2026-03-26 01:14:31 +08:00
Timer
9a9dc780e4 Merge branch 'deng' into deng-release 2026-03-26 00:48:29 +08:00
Rue Ji
7048001c0c feat(visual): 优化GIS页面UI并整合实时数据加载 2026-03-26 00:28:34 +08:00
Timer
44b6bf04d5 Merge branch 'deng' into deng-release 2026-03-25 21:05:48 +08:00
Rue Ji
e50422d7a7 feat: 为污水列表和监控页面添加流量曲线和界面优化 2026-03-25 01:03:20 +08:00
Timer
9895757c92 Merge branch 'deng' into deng-release 2026-03-23 21:42:59 +08:00
Rue Ji
9a9a743945 首页样式重新设计 2026-03-22 22:36:01 +08:00
Timer
6de1aabe80 bug fixed 所属部门 2026-03-17 00:53:23 +08:00
Timer
3ea3e0a9af bug fixed 2026-03-17 00:04:44 +08:00
Timer
5e52e1db7c Merge branch 'deng' into deng-release 2026-03-12 01:45:42 +08:00
Rue Ji
acd1967b1f 管道GIS展示 2026-03-12 01:43:29 +08:00
Timer
1c8f1f98d5 Merge branch 'deng' into deng-release 2026-03-12 01:13:27 +08:00
Timer
3da9c9afb5 业务流程类别bug bak 2026-03-12 01:02:22 +08:00
Rue Ji
a187b11c33 大屏泥处理 2026-03-12 00:30:18 +08:00
Rue Ji
7fbf63ed66 Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng 2026-03-12 00:17:41 +08:00
Rue Ji
0d641d8d4f 大屏逻辑更新、首页更新、 2026-03-12 00:17:39 +08:00
Timer
0200e883d7 业务流程类别bug 2026-03-11 23:13:18 +08:00
Timer
4ca5d82ac0 巡检点bug 2026-03-11 00:13:43 +08:00
Timer
e3582cb6ae Merge remote-tracking branch 'origin/deng' into deng 2026-03-10 22:14:30 +08:00
Timer
a8f246c026 异常上报bug+KPI测量点详情反显bug 2026-03-10 22:14:10 +08:00
Rue Ji
a821565077 a 2026-03-10 21:57:11 +08:00
Rue Ji
1798d7c841 管道展示 2026-03-10 21:51:19 +08:00
Rue Ji
2a8318599a 水厂大屏数据ES查询 2026-03-10 00:49:24 +08:00
Rue Ji
d1c8ae0b5a 水厂大屏 2026-03-08 23:53:47 +08:00
Rue Ji
4b7e269c3a 水厂大屏数据 2026-03-08 23:52:11 +08:00
Timer
2c1a99269f 管道统计数据 2026-03-08 19:57:26 +08:00
Timer
0b265d817b 维修工单 2026-03-08 19:00:58 +08:00
Timer
7fd0768e8a workorderAchievement 2026-03-08 17:45:38 +08:00
Timer
debeec23da 1 2026-03-08 17:41:53 +08:00