|
|
1e9c7ca99b
|
fix: Bug
|
2023-11-16 09:20:50 +08:00 |
|
|
|
cb47078c79
|
Merge branch 'feature_day_1115' into 'main'
农机作业参数上传
See merge request likehai/ytr-god!34
|
2023-11-15 16:44:31 +08:00 |
|
|
|
cee49f6729
|
农机作业参数上传
|
2023-11-15 16:42:47 +08:00 |
|
|
|
0028a8f8a1
|
fix: Bug
|
2023-11-15 16:42:18 +08:00 |
|
|
|
7ad9e6d1b0
|
安全套件
|
2023-11-15 16:36:16 +08:00 |
|
|
|
e72f0fad83
|
农机运行开始时间
|
2023-11-15 11:12:50 +08:00 |
|
|
|
b780bd49c8
|
fix: BUG
|
2023-11-15 09:28:02 +08:00 |
|
|
|
31461c4d36
|
fix: BUG
|
2023-11-15 09:28:02 +08:00 |
|
|
|
c3cf7d80d0
|
北斗定位信息
|
2023-11-15 09:14:08 +08:00 |
|
|
|
f0b2178cbe
|
Merge remote-tracking branch 'origin/main'
|
2023-11-14 17:12:21 +08:00 |
|
|
|
e32a8b0503
|
自动驾驶套件
|
2023-11-14 17:12:12 +08:00 |
|
|
|
2fa48debe8
|
Merge branch 'feature_day_1114' into 'main'
农机运行状态/农机运行功率
See merge request likehai/ytr-god!33
|
2023-11-14 17:11:48 +08:00 |
|
|
|
4d7282d61c
|
农机运行状态/农机运行功率
|
2023-11-14 17:10:28 +08:00 |
|
|
|
a8500639e1
|
feat: 重庆银钢科技数字农机管理平台大屏
|
2023-11-14 15:22:30 +08:00 |
|
|
|
1a9a6a42e0
|
北斗定位信息
|
2023-11-14 11:12:36 +08:00 |
|
|
|
5f6264df91
|
feat: 重庆钢银首页
|
2023-11-14 10:30:58 +08:00 |
|
|
|
e25d7b7c3e
|
feat： 重庆银钢登录页
|
2023-11-14 10:29:37 +08:00 |
|
|
|
3c9bf18566
|
Merge branch 'feature_day_1113' into 'main'
HTTP协议对接
See merge request likehai/ytr-god!32
|
2023-11-13 17:29:13 +08:00 |
|
|
|
2f16f44dac
|
HTTP协议对接
|
2023-11-13 17:28:23 +08:00 |
|
|
|
251c49dc12
|
自动驾驶套件
|
2023-11-13 17:21:34 +08:00 |
|
|
|
bbbe0a3895
|
表格中单元格合并
|
2023-11-13 17:02:54 +08:00 |
|
|
|
8fe5f2b0be
|
数字农机编码管理
|
2023-11-13 16:09:36 +08:00 |
|
|
|
3cec371963
|
数字农机编码规则
|
2023-11-13 14:14:47 +08:00 |
|
|
|
03a7808c68
|
工业园区数据平台对接中心
|
2023-11-10 18:42:34 +08:00 |
|
|
|
f50785e059
|
Merge remote-tracking branch 'origin/main'
|
2023-11-10 17:18:00 +08:00 |
|
|
|
e473bd4162
|
车间公厕管理
|
2023-11-10 17:17:07 +08:00 |
|
|
|
2ffb796625
|
Merge branch 'feature_day_1110' into 'main'
照明报警管理、维护管理
See merge request likehai/ytr-god!29
|
2023-11-10 17:04:41 +08:00 |
|
|
|
9f26337b48
|
照明报警管理、维护管理
|
2023-11-10 17:02:59 +08:00 |
|
|
|
76d503e94e
|
fix： Bug
|
2023-11-10 17:02:44 +08:00 |
|
|
|
69ca122d14
|
feat: 工业园区数据看板
|
2023-11-10 15:10:42 +08:00 |
|
|
|
e0fd963950
|
feat: 工业园区安全生产综合服务监测大屏的细微调整
|
2023-11-10 09:30:04 +08:00 |
|
|
|
71702e0b94
|
feat: 配置大屏跳转
|
2023-11-09 17:28:08 +08:00 |
|
|
|
1c5cf4162e
|
Merge branch 'feature_big_screen'
|
2023-11-09 17:24:35 +08:00 |
|
|
|
a5f3ddd9c5
|
大屏的开发
|
2023-11-09 17:19:07 +08:00 |
|
|
|
8a26c53a66
|
车间公厕管理
|
2023-11-09 17:04:59 +08:00 |
|
|
|
4732a9f1d1
|
Merge branch 'feature_day_1109' into 'main'
照明数据分析、故障检测
See merge request likehai/ytr-god!27
|
2023-11-09 16:42:10 +08:00 |
|
|
|
151859037b
|
照明数据分析、故障检测
|
2023-11-09 16:40:29 +08:00 |
|
|
|
b8bc6de5ea
|
照明智能控制
|
2023-11-09 14:32:02 +08:00 |
|
|
|
0b166e0d4a
|
feat： 文字修改
|
2023-11-09 12:46:38 +08:00 |
|
|
|
c0dd68e029
|
fix: Bug
|
2023-11-09 12:46:38 +08:00 |
|
|
|
36abf0dbaa
|
车间公厕管理
|
2023-11-09 11:26:48 +08:00 |
|
|
|
b609177bf2
|
feat: 智慧生活服务保障中心大屏
|
2023-11-09 11:10:25 +08:00 |
|
zhaofei06
|
b44438a05f
|
Merge remote-tracking branch 'origin/main'
|
2023-11-09 09:30:02 +08:00 |
|
zhaofei06
|
b0c4eef7b7
|
fix:预警看板表格样式修改
|
2023-11-09 09:28:39 +08:00 |
|
|
|
1b019ecffa
|
feat: 两个大屏
|
2023-11-09 09:27:56 +08:00 |
|
|
|
8bda410da9
|
feat: 大屏时间修改&工业园区首页
|
2023-11-09 09:27:56 +08:00 |
|
|
|
6abbb4b65f
|
bug
|
2023-11-08 18:16:26 +08:00 |
|
|
|
ed15e9c356
|
车间公厕管理
|
2023-11-08 18:06:34 +08:00 |
|
|
|
ad1c679c22
|
Merge branch 'feature_day_1107' into 'main'
设备、工序、部门能耗分析
See merge request likehai/ytr-god!26
|
2023-11-08 17:12:36 +08:00 |
|
|
|
468b879fbb
|
灯具信息管理
|
2023-11-08 17:10:56 +08:00 |
|
|
|
ea60df9d4f
|
后台指向接口
|
2023-11-08 16:25:51 +08:00 |
|
|
|
a82e900ce4
|
设备、工序、部门能耗分析
|
2023-11-08 16:10:51 +08:00 |
|
zhaofei06
|
f4449b6217
|
feat:巡检工单制定、派发；预警看板页面
|
2023-11-08 16:07:28 +08:00 |
|
zhaofei06
|
54d4bede4a
|
feat:巡检工单制定、派发；预警看板
|
2023-11-08 16:04:21 +08:00 |
|
|
|
765db7c5dd
|
feat: 工业园区登录页&首页
|
2023-11-08 10:46:00 +08:00 |
|
|
|
1c9e3522d9
|
flowabale
|
2023-11-08 10:44:27 +08:00 |
|
|
|
f26d33fb4c
|
fix: Bug
|
2023-11-08 09:35:39 +08:00 |
|
|
|
1583800c4e
|
fix: Bug
|
2023-11-08 09:24:10 +08:00 |
|
|
|
878191ffe5
|
feat： 对企业作业平台的单独处理
|
2023-11-08 09:16:06 +08:00 |
|
|
|
d900df3811
|
Merge branch 'feature_day_1107' into 'main'
设备能耗情况
See merge request likehai/ytr-god!25
|
2023-11-07 17:58:18 +08:00 |
|
|
|
729c28106f
|
设备能耗情况
|
2023-11-07 17:45:43 +08:00 |
|
|
|
41837cb994
|
生产作业数据统计分析
|
2023-11-07 17:43:15 +08:00 |
|
|
|
c88be91126
|
feat: 大屏数据与样式调整
|
2023-11-07 11:09:12 +08:00 |
|
|
|
b3cd2441d9
|
feat: 企业作业综合可视化首页
|
2023-11-07 10:45:58 +08:00 |
|
|
|
2d5b579129
|
按钮没权限问题修改
|
2023-11-07 09:31:14 +08:00 |
|
|
|
307d3169d5
|
Merge branch 'feature_week_46' into 'main'
设备管理
See merge request likehai/ytr-god!24
|
2023-11-06 17:34:10 +08:00 |
|
|
|
ca76b1454c
|
减少日志
|
2023-11-06 17:33:04 +08:00 |
|
|
|
1d11f2bc84
|
生产作业数据统计分析
|
2023-11-06 17:32:54 +08:00 |
|
|
|
4c2e5b715a
|
设备管理
|
2023-11-06 17:31:55 +08:00 |
|
|
|
bbab6d3c76
|
feat: 登录页和大屏
|
2023-11-06 17:28:15 +08:00 |
|
|
|
c4e89e751d
|
工作许可申请提交工作流管理
|
2023-11-02 17:36:53 +08:00 |
|
|
|
5352099e59
|
Merge remote-tracking branch 'origin/main'
|
2023-11-01 17:37:55 +08:00 |
|
|
|
5dd23675f9
|
作业过程安全监管
|
2023-11-01 17:37:44 +08:00 |
|
|
|
0d0fa0951e
|
特殊作业验收、特殊作业归档
|
2023-11-01 16:46:33 +08:00 |
|
|
|
0ec56f9ad3
|
作业过程安全监管
|
2023-10-31 17:42:24 +08:00 |
|
|
|
d559b9de05
|
Merge branch 'feature_week_44' into 'main'
特殊作业清单、特殊作业申请
See merge request likehai/ytr-god!21
|
2023-10-31 17:29:30 +08:00 |
|
|
|
bac427f280
|
特殊作业清单、特殊作业申请
|
2023-10-31 17:28:19 +08:00 |
|
|
|
11027c0cb3
|
流程管理
|
2023-10-31 10:34:44 +08:00 |
|
|
|
97162028ab
|
工作许可报备/清单/申请
|
2023-10-30 18:20:11 +08:00 |
|
|
|
7e0e7cb2ce
|
野生动物 页面
|
2023-10-28 01:49:26 +08:00 |
|
|
|
b428789628
|
野生动物 页面
|
2023-10-27 18:57:06 +08:00 |
|
|
|
2c7e5527ac
|
花草植物
|
2023-10-27 17:37:54 +08:00 |
|
|
|
6737c5d456
|
修改视频弹出框位置
|
2023-10-27 17:05:49 +08:00 |
|
|
|
4a4b647dff
|
花草植物
|
2023-10-26 18:39:35 +08:00 |
|
|
|
20fcd28bb0
|
权限修改bug
|
2023-10-26 18:32:11 +08:00 |
|
|
|
be004e6825
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 18:31:26 +08:00 |
|
|
|
af436b0499
|
权限修改bug
|
2023-10-26 18:30:50 +08:00 |
|
|
|
6703f82d51
|
Merge branch 'feature_day_1026' into 'main'
火点坐标在地图上显示
See merge request likehai/ytr-god!18
|
2023-10-26 17:42:45 +08:00 |
|
|
|
b78a5db224
|
火点坐标在地图上显示
|
2023-10-26 17:41:56 +08:00 |
|
|
|
562fbadf19
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 17:30:44 +08:00 |
|
|
|
dbdcedf69f
|
花草植物
|
2023-10-26 17:29:14 +08:00 |
|
|
|
536a75942a
|
权限修改bug
|
2023-10-26 17:29:11 +08:00 |
|
|
|
f0ac99b95b
|
Merge branch 'feature_day_1026' into 'main'
生物多样性修改、视频地址不显示
See merge request likehai/ytr-god!17
|
2023-10-26 17:15:29 +08:00 |
|
|
|
5c76ad8f6a
|
生物多样性修改、视频地址不显示
|
2023-10-26 17:14:13 +08:00 |
|
|
|
8bb5bc5733
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 16:04:53 +08:00 |
|
|
|
c1af8fd92c
|
权限修改bug
|
2023-10-26 16:04:21 +08:00 |
|
|
|
bd603e8735
|
Merge branch 'feature_day_1026' into 'main'
火情处置追溯、监控设备管理
See merge request likehai/ytr-god!16
|
2023-10-26 14:42:38 +08:00 |
|
|
|
a4856fc756
|
火情处置追溯、监控设备管理
|
2023-10-26 14:32:01 +08:00 |
|
|
|
98464ca192
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 11:18:25 +08:00 |
|
|
|
eae826ee2d
|
fi: BUG
|
2023-10-26 11:17:35 +08:00 |
|
|
|
9ac7d48370
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 11:07:16 +08:00 |
|
|
|
19b2470d84
|
fix: bUg
|
2023-10-26 11:06:32 +08:00 |
|
|
|
ce2937eb69
|
Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai
|
2023-10-26 10:48:46 +08:00 |
|
|
|
90cf4fdf38
|
权限管理代码
|
2023-10-26 10:48:38 +08:00 |
|
|
|
b7509958c0
|
feat： 登录
|
2023-10-26 10:47:39 +08:00 |
|
|
|
35a0ef83bd
|
权限管理代码
|
2023-10-26 02:11:57 +08:00 |
|
|
|
361378885b
|
权限管理代码
|
2023-10-25 22:00:41 +08:00 |
|
|
|
f1ce6f2e57
|
山林安全巡查
|
2023-10-25 18:27:32 +08:00 |
|
|
|
40d5f4c1b3
|
Merge branch 'feature_day_1025' into 'main'
历史火情查看
See merge request likehai/ytr-god!15
|
2023-10-25 18:21:11 +08:00 |
|
|
|
fe6d92fdb1
|
历史火情查看
|
2023-10-25 18:20:14 +08:00 |
|
|
|
4896896343
|
Merge branch 'feature_day_1025' into 'main'
火情通知、火点定位、周边资源、火情发布
See merge request likehai/ytr-god!14
|
2023-10-25 17:33:32 +08:00 |
|
|
|
6b51bee0c3
|
火情通知、火点定位、周边资源、火情发布
|
2023-10-25 17:31:22 +08:00 |
|
|
|
3cd841eb00
|
feat: 首页数据修改与Logo标题修改
|
2023-10-25 15:10:32 +08:00 |
|
|
|
726824570d
|
feat: 大屏路由导航调整
|
2023-10-25 14:46:51 +08:00 |
|
|
|
32fa7937b4
|
feat： 大屏数据调整
|
2023-10-25 14:44:42 +08:00 |
|
|
|
4a39159ac0
|
feat: 大方县山林生态安全监控平台大屏
|
2023-10-25 14:36:00 +08:00 |
|
|
|
ba4fa74b93
|
feat: 山林安全登录页与首页
|
2023-10-25 11:31:28 +08:00 |
|
|
|
dbdfbc6e00
|
火情管理
|
2023-10-25 10:54:04 +08:00 |
|
|
|
85c884832d
|
山林安全巡查-值班管理
|
2023-10-25 10:06:51 +08:00 |
|
|
|
8a9912dac9
|
Merge branch 'feature_day_1024' into 'main'
视频管理、设备控制、火情识别
See merge request likehai/ytr-god!13
|
2023-10-24 18:49:22 +08:00 |
|
|
|
0ca5bcef2d
|
视频管理、设备控制、火情识别
|
2023-10-24 18:43:42 +08:00 |
|
|
|
e7caf789ec
|
市级地质灾害综合管理系统
|
2023-10-24 17:15:47 +08:00 |
|
|
|
8f01369a0e
|
物种迁徙信息
|
2023-10-24 14:12:00 +08:00 |
|
|
|
ed48612919
|
Merge branch 'feature_day_1023' into 'main'
环境因素数据
See merge request likehai/ytr-god!12
|
2023-10-24 10:19:00 +08:00 |
|
|
|
d97c56c119
|
环境因素数据
|
2023-10-24 10:17:04 +08:00 |
|
|
|
51161c3eec
|
启动异常更改
|
2023-10-24 09:31:41 +08:00 |
|
|
|
1dfbc9b4de
|
灾害事件信息
|
2023-10-23 17:52:02 +08:00 |
|
|
|
21fb8427bb
|
市级地质灾害综合管理系统
|
2023-10-23 17:29:36 +08:00 |
|
|
|
d38eb39f27
|
保护区信息
|
2023-10-23 15:47:21 +08:00 |
|
|
|
4563c11f8b
|
feat: 智能分析系统-实时展示
|
2023-10-23 14:51:27 +08:00 |
|
|
|
de1075a358
|
Merge branch 'feature_day_1020' into 'main'
物种基本信息
See merge request likehai/ytr-god!11
|
2023-10-20 18:52:57 +08:00 |
|
|
|
d112afeadd
|
物种基本信息
|
2023-10-20 18:52:02 +08:00 |
|
|
|
ab396acc62
|
feat: 大屏&人员统计报表分析&首页
|
2023-10-20 17:25:42 +08:00 |
|
|
|
7c1aa569c5
|
title
|
2023-10-20 09:42:50 +08:00 |
|
|
|
f2b33b62b1
|
智慧分析检测
|
2023-10-19 16:43:02 +08:00 |
|
|
|
f2abde0850
|
远程指挥调度
|
2023-10-19 10:15:44 +08:00 |
|
|
|
f6bc63a547
|
综合安全应用及数据管控系统
|
2023-10-18 18:40:49 +08:00 |
|
|
|
f93ad91c3f
|
Merge branch 'feature_week_god' into 'main'
生产监测预警信息、应急物资管理、登录背景页面修改
See merge request likehai/ytr-god!8
|
2023-10-18 17:53:57 +08:00 |
|
|
|
e8bfae5258
|
改边框
|
2023-10-18 17:52:44 +08:00 |
|
|
|
5749d77540
|
登录背景图片位置调整
|
2023-10-18 17:47:15 +08:00 |
|
|
|
6737b55b1b
|
应急物资管理
|
2023-10-18 17:46:31 +08:00 |
|
|
|
a07f22ec17
|
代码路侧车检页面修改 完善
|
2023-10-18 16:27:53 +08:00 |
|
|
|
573997abfd
|
生产监测预警信息
|
2023-10-18 14:48:05 +08:00 |
|
|
|
3d2ed15bd1
|
代码路侧车检页面修改 上传组件改成单个上传
|
2023-10-18 10:23:39 +08:00 |
|
|
|
414be7c618
|
代码路侧车检
|
2023-10-18 09:15:50 +08:00 |
|
|
|
e8a7409773
|
修改登录页面名称
|
2023-10-17 18:25:43 +08:00 |
|
|
|
368807e0ee
|
修改系统名称和网页标题
|
2023-10-17 18:23:35 +08:00 |
|
|
|
6f7b8b6c2d
|
Merge branch 'feature_week_42' into 'main'
人员流量分析
See merge request likehai/ytr-god!6
|
2023-10-17 17:50:37 +08:00 |
|
|
|
555987d2a7
|
历史人员流动分析
|
2023-10-17 17:48:59 +08:00 |
|
|
|
829d1ad3e1
|
Merge branch 'Lxz' into 'main'
车辆检测
See merge request likehai/ytr-god!5
|
2023-10-17 17:22:35 +08:00 |
|
|
|
7aa335cb41
|
车辆检测
|
2023-10-17 17:21:09 +08:00 |
|
|
|
033ca40527
|
人员流量分析
|
2023-10-17 16:47:26 +08:00 |
|
|
|
0c3ba98674
|
补充提交监控设备js
|
2023-10-17 15:56:45 +08:00 |
|
|
|
a7b2bd7095
|
Merge branch 'feature_week_ytr' into 'main'
人员流量、区域监控设备
See merge request likehai/ytr-god!3
|
2023-10-17 14:44:25 +08:00 |
|
|
|
73a236cf3b
|
人员流量、区域监控设备
|
2023-10-17 14:41:08 +08:00 |
|
|
|
266c95ccc8
|
增加项目 端口管理功能
|
2023-10-17 09:35:55 +08:00 |
|
|
|
d5bb2c199d
|
网页图标修改
|
2023-10-16 17:57:34 +08:00 |
|
|
|
9e9d85b288
|
ruoyi.js改为god.js
|
2023-10-16 17:01:36 +08:00 |
|
|
|
6f5a0311bb
|
ruoyi改为god,若依改为装备
|
2023-10-16 16:55:42 +08:00 |
|
|
|
55688a657a
|
初代代码
|
2023-10-16 11:22:19 +08:00 |
|
