|
|
47764a8901
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-15 16:34:49 +08:00 |
|
|
|
225fe83623
|
攀枝花煤业，资源中心、培训练习
|
2023-12-15 16:34:41 +08:00 |
|
|
|
7a0cc6b0a5
|
新增淮海水利交接资料、验收、项目评价查询
|
2023-12-15 16:33:27 +08:00 |
|
|
|
596563008f
|
AI识别算法开发
|
2023-12-15 16:04:03 +08:00 |
|
|
|
ce4c6f7702
|
ETM设备维保人员培训管理下的,认证管理
|
2023-12-15 15:05:53 +08:00 |
|
|
|
b85f2cf66b
|
视频 监控 抓拍记录
|
2023-12-15 14:43:23 +08:00 |
|
zhaofei06
|
4f3efed995
|
feat:投标单位查询、投标澄清查询
|
2023-12-15 14:33:51 +08:00 |
|
|
|
6a09aadf93
|
包名修改,前段部分内容修改,重点修改,etm设备知识管理模块下-通用零部件展示,知识内容管理
|
2023-12-15 11:22:13 +08:00 |
|
|
|
3d9875abe8
|
视频 监控 抓拍记录
|
2023-12-14 17:10:14 +08:00 |
|
zhaofei06
|
04b1c71a98
|
feat:开标评审查询、邀标单位查询、投标单位查询
|
2023-12-14 17:01:52 +08:00 |
|
|
|
3c4ac5ff9d
|
Merge pull request '修改hh项目进度汇报' (#10) from zhoumingxiu into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/10
|
2023-12-14 16:39:01 +08:00 |
|
|
|
14722c4c4b
|
修改hh项目进度汇报
|
2023-12-14 16:38:03 +08:00 |
|
|
|
38e3e63220
|
页面修改 视频设备
|
2023-12-14 16:13:30 +08:00 |
|
|
|
5617d2efb3
|
新增hh项目进度汇报
|
2023-12-14 15:47:01 +08:00 |
|
|
|
2e33a2a4cb
|
ETM设备资料查询下的,设备拓扑图
|
2023-12-14 12:09:52 +08:00 |
|
|
|
3eee604736
|
页面修改 重点区域 工作人员监测
|
2023-12-14 10:35:10 +08:00 |
|
|
|
81bfcb2983
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-14 10:32:08 +08:00 |
|
|
|
5d7b9157e6
|
feat: 清空默认账号密码
|
2023-12-14 10:32:01 +08:00 |
|
|
|
6ed11e3f24
|
AI识别算法开发
|
2023-12-14 10:31:49 +08:00 |
|
|
|
07ceade975
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-14 10:21:07 +08:00 |
|
|
|
4a6cbdb302
|
页面修改 重点区域 工作人员监测
|
2023-12-14 10:20:55 +08:00 |
|
|
|
9d7c7f5568
|
ETM设备资料查询目录下的,设备分级管理,设备生命周期管理
|
2023-12-14 09:48:03 +08:00 |
|
|
|
894646b35b
|
feat: 9280淮海水利首页跳转
|
2023-12-14 08:54:25 +08:00 |
|
|
|
0122d09427
|
切换端口 强制 重新登录
|
2023-12-13 18:18:43 +08:00 |
|
|
|
7bff6c115d
|
AI识别算法开发
|
2023-12-13 16:56:58 +08:00 |
|
|
|
ca9ab0ba9f
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-13 16:16:23 +08:00 |
|
|
|
bee9fc20ac
|
pzhmy作业SOP数据，维修人员考核数据
|
2023-12-13 16:16:03 +08:00 |
|
zhaofei06
|
5918b13444
|
feat:项目计划管理、项目资金计划管理、招标策划、招标计划
|
2023-12-13 15:51:42 +08:00 |
|
|
|
966898089c
|
feat: 淮海水利项目综合管控升级改造项目 首页
|
2023-12-13 15:22:41 +08:00 |
|
|
|
1ddc615282
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-13 15:10:13 +08:00 |
|
|
|
b5bd59366c
|
ETM设备作业SOP数据->作业SOP文件管理,文件下载图表修改
ETM设备知识管理模块->设备原理展示,通用零部件展示,设备信息显示,设备图纸管理,知识内容管理
ETM设备维保人员培训管理->培训管理,培训任务管理,权限管理
|
2023-12-13 15:10:03 +08:00 |
|
|
|
6dcfa408aa
|
feat: 管仲远程视频监控管理项目 首页
|
2023-12-13 15:07:23 +08:00 |
|
|
|
758ab0fac0
|
feat:管仲远程视频监控管理项目 首页
|
2023-12-13 14:38:12 +08:00 |
|
|
|
ab5b4fddad
|
feat:管仲远程视频监控管理项目 首页
|
2023-12-13 13:51:37 +08:00 |
|
|
|
a7ece0bbf7
|
feat: 管仲远程视频监控管理项目 首页9290
|
2023-12-13 11:09:36 +08:00 |
|
|
|
ad0e0800e9
|
feat: 管仲远程视频监控管理项目 首页
|
2023-12-13 10:16:00 +08:00 |
|
zhaofei06
|
73dfb1c063
|
feat:minio文件上传和项目立项申请
|
2023-12-13 09:22:19 +08:00 |
|
|
|
efeb1c06fb
|
fix: bug
|
2023-12-12 17:55:33 +08:00 |
|
|
|
72f7fa63b8
|
feat: 攀枝花煤业智慧矿山ETM设备知识管理平台项目 首页
|
2023-12-12 17:43:14 +08:00 |
|
|
|
30c9c7b591
|
Merge remote-tracking branch 'origin/main'
|
2023-12-12 17:17:45 +08:00 |
|
|
|
9de4a2f2ea
|
AI识别算法开发
|
2023-12-12 17:17:35 +08:00 |
|
|
|
19c264481d
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-12 16:50:28 +08:00 |
|
|
|
209e47bce9
|
攀枝花煤业，设备知识管理，人员培训数据
|
2023-12-12 16:50:13 +08:00 |
|
|
|
94b99fb270
|
AI识别算法开发
|
2023-12-12 16:46:45 +08:00 |
|
|
|
587663ee2b
|
feat: 管仲远程视频监控管理项目 淮海水利项目综合管控升级改造 登陆
|
2023-12-12 15:29:20 +08:00 |
|
|
|
0e218467ee
|
工地视频AI识别算法开发
|
2023-12-11 17:28:31 +08:00 |
|
|
|
c3ab55adc2
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-11 16:02:51 +08:00 |
|
|
|
ab658096ac
|
ETM设备作业SOP数据->[作业SOP查询,作业工时管理,作业质量管理,验收管理,PC端远程指导,作业SOP文件管理]
|
2023-12-11 16:02:36 +08:00 |
|
|
|
5b73d593e7
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-11 15:51:16 +08:00 |
|
|
|
3d486ffc31
|
pzhmy基础信息。设备资料查询
|
2023-12-11 15:50:56 +08:00 |
|
|
|
8a32bcd055
|
feat: 攀枝花煤业智慧矿山ETM设备知识管理平台 登录页
|
2023-12-11 14:33:20 +08:00 |
|
|
|
948a06958e
|
feat: WMS及产线数据管理系统项目 登陆修改
|
2023-12-08 17:40:08 +08:00 |
|
|
|
f4edd45837
|
修改销售订单物流
|
2023-12-08 17:22:50 +08:00 |
|
|
|
15c9566a29
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-08 15:32:18 +08:00 |
|
|
|
2e06ba98c5
|
客户管理，统计报表，功能预留
|
2023-12-08 15:32:01 +08:00 |
|
|
|
c3c6b55127
|
feat: 库存信息修改
|
2023-12-08 14:37:08 +08:00 |
|
|
|
2ba69c9524
|
新增销售发票信息
|
2023-12-08 10:03:30 +08:00 |
|
|
|
607c0abc68
|
feath:WMS及产线数据管理系统项目 登陆
|
2023-12-07 17:50:05 +08:00 |
|
|
|
8f76462783
|
feth:WMS及产线数据管理系统项目 登陆
|
2023-12-07 17:45:49 +08:00 |
|
|
|
dca013ca79
|
feat: 采购订单物流信息
|
2023-12-07 17:10:48 +08:00 |
|
|
|
2265ba0bc0
|
Merge pull request '新增销售订单物流信息' (#5) from zhoumingxiu into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/5
|
2023-12-07 16:43:03 +08:00 |
|
|
|
fb50d8e6f8
|
新增销售订单物流信息
|
2023-12-07 16:39:41 +08:00 |
|
|
|
cf7a8e8e2c
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-07 15:56:10 +08:00 |
|
|
|
9c4c81369a
|
原平台接口对接->销售订单接口->地磅状态信息接口
生产统计管理->生产统计,残次品计量
|
2023-12-07 15:55:59 +08:00 |
|
|
|
5256e43614
|
wms内部领料，客户来料加工
|
2023-12-07 15:46:53 +08:00 |
|
|
|
fcaed095ae
|
fix: BUG
|
2023-12-06 17:56:59 +08:00 |
|
|
|
7f89132818
|
feat: 采购订单信息接口
|
2023-12-06 17:27:13 +08:00 |
|
|
|
474b2fb1a6
|
Merge pull request '新增销售订单信息' (#4) from zhoumingxiu into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/4
|
2023-12-06 17:15:33 +08:00 |
|
|
|
0d215ca2f1
|
新增销售订单信息
|
2023-12-06 17:13:20 +08:00 |
|
|
|
78b091b2c4
|
feat:WMS及产线数据管理系统项目登陆以及首页研发
|
2023-12-06 17:02:53 +08:00 |
|
|
|
9dd61c2a19
|
Merge pull request 'wms产品出库计量，车辆出厂重量确定' (#3) from feature_day_1206 into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/3
|
2023-12-06 16:59:42 +08:00 |
|
|
|
b0a355cb1a
|
wms产品出库计量，车辆出厂重量确定
|
2023-12-06 16:56:42 +08:00 |
|
|
|
375221ece1
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-06 14:56:58 +08:00 |
|
|
|
e6d347d450
|
原平台接口对接->设备接口
原平台接口对接->销售订单接口->地磅重量信息接口,地磅车辆信息接口
|
2023-12-06 14:56:47 +08:00 |
|
|
|
ec6f08dc7e
|
fix: BUG 404
|
2023-12-06 13:23:26 +08:00 |
|
|
|
e9b3fc99df
|
feat:首页跳转
|
2023-12-05 10:20:42 +08:00 |
|
zhaofei06
|
d059daa79e
|
fix:删除页面按钮权限
|
2023-12-05 09:48:23 +08:00 |
|
|
|
cf0c94c7fc
|
feat:首页跳转
|
2023-12-05 09:32:36 +08:00 |
|
|
|
5ec9430c5f
|
feat: 首页跳转
|
2023-12-05 09:25:31 +08:00 |
|
zhaofei06
|
6af1ddb47d
|
feat:设备硬件、维保项目和费用管理
|
2023-12-05 09:06:53 +08:00 |
|
|
|
79c067b60a
|
维保
|
2023-12-05 07:24:57 +08:00 |
|
|
|
46e2bc23ae
|
维保
|
2023-12-04 19:30:50 +08:00 |
|
|
|
1e0e126938
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-04 18:17:29 +08:00 |
|
|
|
c870a75c68
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-04 18:03:41 +08:00 |
|
|
|
a53d0d367a
|
预警中心->报警信息处理
|
2023-12-04 18:03:31 +08:00 |
|
|
|
31bf9bb81c
|
维保
|
2023-12-04 17:48:53 +08:00 |
|
|
|
595158e987
|
fix: 设备运动轨迹修改
|
2023-12-04 17:44:35 +08:00 |
|
|
|
9328e65853
|
删除多余代码
|
2023-12-04 17:33:04 +08:00 |
|
|
|
fd08a9632e
|
Merge remote-tracking branch 'origin/main'
|
2023-12-04 17:22:46 +08:00 |
|
|
|
6deffbbcba
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-04 17:20:29 +08:00 |
|
|
|
7996f56995
|
报警设置
|
2023-12-04 17:20:16 +08:00 |
|
|
|
70b8ec0e69
|
Merge remote-tracking branch 'origin/main'
|
2023-12-04 17:19:42 +08:00 |
|
|
|
964de93e8a
|
维度分析
|
2023-12-04 17:18:37 +08:00 |
|
|
|
df0b1bf613
|
Merge remote-tracking branch 'origin/main'
|
2023-12-04 17:14:37 +08:00 |
|
|
|
08d7cb3d41
|
工程机械数字服务平台设备管理9210-设备数据模块开发
|
2023-12-04 17:14:22 +08:00 |
|
|
|
ba3574c13a
|
Merge pull request '新增-报表中心' (#2) from zhoumingxiu into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/2
|
2023-12-04 16:42:34 +08:00 |
|
|
|
d79e12e52b
|
新增-报表中心
|
2023-12-04 16:39:17 +08:00 |
|
|
|
6ab0f6e153
|
feat: 去除大屏图标 错了回退这里
|
2023-12-04 16:36:13 +08:00 |
|
|
|
e0bdea1f67
|
feat: 设备信息首页调整
|
2023-12-04 16:30:40 +08:00 |
|
|
|
c568a3d68d
|
feat: 设备运动轨迹
|
2023-12-04 16:17:26 +08:00 |
|
|
|
dd8271bd24
|
feat: 设备管理，维修保养记录
|
2023-12-04 15:42:47 +08:00 |
|
|
|
5abfb48715
|
feat: 工程机械数字服务平台登录页和数据分析
|
2023-12-04 15:21:01 +08:00 |
|
|
|
4cb0f914bf
|
Merge remote-tracking branch 'origin/main'
|
2023-12-04 15:15:05 +08:00 |
|
|
|
9dbfcf6cc1
|
feat: 工程机械数字服务平台设备管理-加油记录
|
2023-12-04 15:14:50 +08:00 |
|
|
|
5df7a7f961
|
Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
|
2023-12-04 15:01:28 +08:00 |
|
|
|
759d63a99e
|
预警中心->周期预警查询,怠机报警信息
|
2023-12-04 15:01:15 +08:00 |
|
|
|
20172a3b5a
|
Merge pull request '设备效率分析' (#1) from feature_day_1204 into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/1
|
2023-12-04 14:42:24 +08:00 |
|
|
|
b4ede6ac92
|
设备效率分析
|
2023-12-04 14:39:38 +08:00 |
|
|
|
8c61c7dbca
|
feat:工程机械数字服务平台设备管理 首页研发
|
2023-12-04 13:59:01 +08:00 |
|
|
|
79e15717a7
|
feat: 根据端口号修改首页名称
|
2023-11-29 10:17:38 +08:00 |
|
|
|
8fb78e2428
|
fix: BUG
|
2023-11-29 09:47:24 +08:00 |
|
|
|
5ca72436bd
|
feat: 地图更换为一致的key
|
2023-11-29 09:27:01 +08:00 |
|
|
|
667edf5fde
|
feath:修改大屏地图警报信息
|
2023-11-29 09:03:05 +08:00 |
|
|
|
a51ceacab0
|
feath:修改Navbar路径
|
2023-11-28 17:43:27 +08:00 |
|
|
|
f5c89ede08
|
feat:石坪桥大屏研发
|
2023-11-28 17:37:51 +08:00 |
|
|
|
26a3bec787
|
style: 大屏阴影
|
2023-11-28 17:28:31 +08:00 |
|
|
|
141e313fae
|
fix: bug
|
2023-11-28 17:18:39 +08:00 |
|
|
|
41b303f73c
|
fix: Bug
|
2023-11-28 17:08:07 +08:00 |
|
|
|
6131efe6e9
|
feat: 九龙坡大屏
|
2023-11-28 14:20:52 +08:00 |
|
|
|
5846d7834e
|
feath:小区全景监控地图的地图报警研发以及设备地图调整
|
2023-11-27 17:18:34 +08:00 |
|
|
|
b97d3078b4
|
feat: 九龙坡城管数据一张图首页
|
2023-11-27 15:04:30 +08:00 |
|
|
|
8bf91369aa
|
1111
|
2023-11-25 00:20:23 +08:00 |
|
|
|
a4ca08b289
|
feat: 危险场景智能监管一个bug
|
2023-11-24 18:11:23 +08:00 |
|
|
|
954977a93f
|
feat: 危险场景智能监管
|
2023-11-24 18:09:01 +08:00 |
|
|
|
978396fcb7
|
车辆进出
|
2023-11-24 16:58:21 +08:00 |
|
|
|
aa762fe91b
|
Merge branch 'feature_day_1124' into 'main'
路面状况管理，环保安全管理，市容环境管理
See merge request likehai/ytr-god!45
|
2023-11-24 16:54:14 +08:00 |
|
|
|
2270b79463
|
路面状况管理，环保安全管理，市容环境管理
|
2023-11-24 16:52:31 +08:00 |
|
|
|
2357122f44
|
feath:登陆修改，首页跳转和设备地图研发
|
2023-11-24 16:48:29 +08:00 |
|
|
|
f671e40629
|
Merge branch 'feature_day_112301' into 'main'
公众诉求数据，城市视频数据，违章占道数据
See merge request likehai/ytr-god!44
|
2023-11-23 17:09:39 +08:00 |
|
|
|
6f4f4f543a
|
公众诉求数据，城市视频数据，违章占道数据
|
2023-11-23 17:08:33 +08:00 |
|
|
|
9abcd0695c
|
feat 九龙坡登录页
|
2023-11-23 14:41:19 +08:00 |
|
|
|
6037d5da37
|
修改九龙坡区中心点坐标
|
2023-11-23 10:47:55 +08:00 |
|
|
|
52a1100bcb
|
Merge branch 'feature_map_loading' into 'main'
修改地图的搜索显示方式
See merge request likehai/ytr-god!43
|
2023-11-23 10:34:00 +08:00 |
|
|
|
f255ab8460
|
修改地图的搜索显示方式
|
2023-11-23 10:31:40 +08:00 |
|
|
|
3c1f8c0024
|
Merge branch 'feature_day_1122' into 'main'
路灯信息，智慧井盖，智慧安防
See merge request likehai/ytr-god!42
|
2023-11-23 09:24:23 +08:00 |
|
|
|
7384c83e7e
|
修改文件的加载方式
|
2023-11-23 09:21:03 +08:00 |
|
|
|
4629210ca9
|
路灯信息，智慧井盖，智慧安防
|
2023-11-22 17:37:52 +08:00 |
|
|
|
dae3fdc211
|
修改高德地图的配置
|
2023-11-22 17:00:48 +08:00 |
|
|
|
83c5b77eef
|
地图搜索功能
|
2023-11-22 09:14:40 +08:00 |
|
|
|
40ec600459
|
事件数据，停车信息，地理信息数据
|
2023-11-21 18:25:07 +08:00 |
|
|
|
499b96ca13
|
Merge branch 'feature_day_1120' into 'main'
九龙坡区管理机构、人员信息、设备信息
See merge request likehai/ytr-god!38
|
2023-11-20 17:06:10 +08:00 |
|
|
|
25b098d42c
|
九龙坡区管理机构、人员信息、设备信息
|
2023-11-20 17:04:07 +08:00 |
|
|
|
64ae7bab4a
|
作业视频信息问题修改
|
2023-11-20 09:45:49 +08:00 |
|
|
|
ee38c525b7
|
feat: 重庆银钢大屏视频循环和删除片头
|
2023-11-20 09:23:20 +08:00 |
|
|
|
7462bfec0d
|
feat: 顶部标签title 重刷问题的修复 需要时可回退
|
2023-11-20 09:23:20 +08:00 |
|
|
|
82677307c9
|
修改权限
|
2023-11-17 17:48:30 +08:00 |
|
|
|
bd26ba2e28
|
作业视频信息
|
2023-11-17 10:41:19 +08:00 |
|
|
|
d2e7f12cae
|
Merge branch 'feature_day_1116' into 'main'
作业图片信息
See merge request likehai/ytr-god!35
|
2023-11-16 16:55:57 +08:00 |
|
|
|
6237c9f6e0
|
作业图片信息
|
2023-11-16 16:54:06 +08:00 |
|
|
|
cc941dc2d4
|
农机作业时间，农机作业面积
|
2023-11-16 14:23:48 +08:00 |
|
|
|
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 |
|
