|
|
5b0a423804
|
修改大屏baseurl
|
2025-06-03 16:36:32 +08:00 |
|
|
|
7b850d3208
|
修复报错
|
2025-06-03 14:07:23 +08:00 |
|
|
|
c2e2b0808c
|
头部样式、梁大屏相关
|
2025-06-03 13:45:04 +08:00 |
|
|
|
03e49946c1
|
鞍钢需求
|
2025-05-21 10:59:40 +08:00 |
|
|
|
02051759ae
|
版本更新
|
2025-05-13 15:56:20 +08:00 |
|
|
|
971f74a4f9
|
修复安全帽bug
|
2025-04-16 14:33:28 +08:00 |
|
|
|
1275fcd343
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2025-04-14 10:11:20 +08:00 |
|
|
|
f503f3eaff
|
中水北方需求
|
2025-04-14 10:11:10 +08:00 |
|
|
|
dc3965d429
|
flx：修改配置冲突
|
2025-04-12 10:58:22 +08:00 |
|
|
|
2b5bdaf3be
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2025-04-12 10:57:00 +08:00 |
|
|
|
f8c187e2d1
|
flx:提交中新建版配置指挥部大屏
|
2025-04-12 10:56:21 +08:00 |
|
|
|
da60872d01
|
劳务 人员列表样式重构
|
2025-04-12 09:14:18 +08:00 |
|
|
|
f6ce55acbc
|
修复水平位移沉降监测bug
|
2025-04-08 15:01:10 +08:00 |
|
|
|
bd499046e8
|
盾构机模块
|
2025-04-02 19:05:24 +08:00 |
|
|
|
11c8b2cd28
|
盾构机模块
|
2025-04-02 18:49:37 +08:00 |
|
|
|
bb97a23e1e
|
劳务管理添加模块
|
2025-01-14 19:01:27 +08:00 |
|
|
|
e12ae0bfed
|
2025-1-14 车辆超速记录-sn补充
|
2025-01-14 10:11:59 +08:00 |
|
|
|
5664161860
|
2025-1-14 车辆超速记录-sn补充
|
2025-01-14 09:35:29 +08:00 |
|
|
|
4cef89a1bf
|
flx:合并
|
2024-12-30 09:54:18 +08:00 |
|
|
|
456a256ee4
|
flx:合并冲突
|
2024-12-30 09:54:03 +08:00 |
|
|
|
f4fb5a65f5
|
添加菜单配置，修复bug
|
2024-12-30 09:34:23 +08:00 |
|
|
|
c8796dfd5b
|
中水北方配置，智能安全帽人员选择更改为树形
|
2024-12-16 09:21:22 +08:00 |
|
|
|
db3df202db
|
flx：提交嘉兴王江泾公用码头
|
2024-12-06 09:12:47 +08:00 |
|
|
|
c7eefe2ac3
|
flx:修改国维科技配置
|
2024-11-23 15:46:22 +08:00 |
|
|
|
5a47782eb7
|
flx:修改中新建配置
|
2024-11-22 10:52:45 +08:00 |
|
|
|
d519a97342
|
flx:提交中新建电力集团配置
|
2024-11-20 11:10:57 +08:00 |
|
|
|
d16a7c77a8
|
2024-11-15 去除中铁十一局相同路由-新分支
|
2024-11-15 17:07:33 +08:00 |
|
|
|
792baf0429
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-11-15 16:03:12 +08:00 |
|
|
|
8886d8308b
|
2024-11-15 汽车吊-履带吊
|
2024-11-15 16:03:04 +08:00 |
|
|
|
f9417f5e85
|
flx:修改鄱湖美湾滚动加载
|
2024-11-15 13:53:37 +08:00 |
|
|
|
23de1bfb89
|
flx:提交国维科技配置
|
2024-11-14 14:34:18 +08:00 |
|
|
|
3e10f6e04c
|
2024-11-13 补充路由
|
2024-11-13 17:06:39 +08:00 |
|
|
|
0194f5b983
|
2024-11-13 中铁十一局修改
|
2024-11-13 16:12:08 +08:00 |
|
|
|
7c65b49bdd
|
2024-11-13 履带吊 汽车吊
|
2024-11-13 14:57:42 +08:00 |
|
|
|
2894b1187e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-11-09 15:41:08 +08:00 |
|
|
|
49cadcc3bb
|
塔吊、起重机 视频配置通过接口获取；质量安全添加已撤销状态
|
2024-11-09 15:39:04 +08:00 |
|
|
|
0816714f75
|
2024-11-6 车辆测试-文案修改
|
2024-11-06 17:17:34 +08:00 |
|
|
|
db65a9f458
|
2024-11-6 车辆测速-文案修改
|
2024-11-06 17:10:25 +08:00 |
|
|
|
57055359f4
|
flx:提交现场大屏
|
2024-10-31 19:08:20 +08:00 |
|
|
|
39f060abfb
|
2024-10-31 安全教育-api补齐调用
|
2024-10-31 10:53:51 +08:00 |
|
|
|
05b94e1b85
|
2024-10-31 安立路项目大屏配置
|
2024-10-31 10:27:38 +08:00 |
|
|
|
7704980132
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-10-30 17:22:38 +08:00 |
|
|
|
83cd1c2025
|
2024-10-30 双碳管理
|
2024-10-30 17:22:25 +08:00 |
|
|
|
6016927937
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-10-26 10:45:18 +08:00 |
|
|
|
a94e8b526c
|
flx：提交新能源智慧基建管理平台配置
|
2024-10-26 10:44:43 +08:00 |
|
|
|
535627dc7f
|
智能安全帽 报警消息模块添加分页功能
|
2024-10-26 09:26:00 +08:00 |
|
|
|
f20414829f
|
flx: 删除压缩包
|
2024-10-25 10:47:30 +08:00 |
|
|
|
5a0e953334
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-10-24 17:54:22 +08:00 |
|
|
|
d013d17725
|
flx：提交鄱湖美湾userId登录
|
2024-10-24 17:48:37 +08:00 |
|
|
|
fd6a573639
|
中铁十一局 水位 安全帽-分页
|
2024-10-22 18:43:58 +08:00 |
|
|
|
5b269fd1f7
|
2024-10-22 鄱湖美湾医疗、医美产业-添加二级菜单
|
2024-10-22 16:46:14 +08:00 |
|
|
|
49e0981a5b
|
对齐铁十一局
|
2024-10-21 11:25:07 +08:00 |
|
|
|
2287a9c867
|
flx:提交中铁配置
|
2024-10-18 17:51:30 +08:00 |
|
|
|
b5c5af6cd7
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-10-18 17:33:38 +08:00 |
|
|
|
6693852ee3
|
2024-10-17 对其shenzhen-dev环境
|
2024-10-17 17:30:15 +08:00 |
|
|
|
0056ca5464
|
2024-10-17 第二版本
|
2024-10-17 17:28:00 +08:00 |
|
|
|
5c5022edb9
|
测度 中铁 大屏mars-3d
|
2024-10-15 15:36:21 +08:00 |
|
|
|
237c8c0277
|
flx：修改样式问题
|
2024-10-11 15:32:42 +08:00 |
|
|
|
86a75980d1
|
优化 智能安全帽 获取人员最新位置接口更换
|
2024-10-09 14:51:10 +08:00 |
|
|
|
cd9680389a
|
中水北方 配置更改
|
2024-10-09 14:34:44 +08:00 |
|
|
|
b203e6c415
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-10-09 11:01:28 +08:00 |
|
|
|
aae818d9c8
|
userId免登录 sn存储
|
2024-09-30 09:12:09 +08:00 |
|
|
|
829d3f1ad2
|
flx: 提交视频监控 默认播放不了
|
2024-09-26 16:48:18 +08:00 |
|
|
|
625db9ed3f
|
flx:提交
|
2024-09-26 14:42:33 +08:00 |
|
|
|
49828737eb
|
flex:解决冲突
|
2024-09-24 14:49:13 +08:00 |
|
|
|
3622786c31
|
修复bug
|
2024-09-24 14:21:51 +08:00 |
|
|
|
ef050b8a9f
|
flx：提交武汉中铁配置
|
2024-09-23 15:15:35 +08:00 |
|
|
|
d3e0c333ca
|
智能设备页面 接口添加type
|
2024-09-20 15:35:13 +08:00 |
|
|
|
e9053b0d2f
|
木垒配置
|
2024-09-20 09:06:40 +08:00 |
|
|
|
cca26d9cc8
|
智能设备 报警信息 添加围栏名称
|
2024-09-19 17:32:55 +08:00 |
|
|
|
316ba663be
|
更新人员定位图标
|
2024-09-11 16:16:24 +08:00 |
|
|
|
379e9a7634
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-09-10 17:36:42 +08:00 |
|
|
|
1f1e4a48fe
|
flx:提交网城配置
|
2024-09-10 17:36:35 +08:00 |
|
|
|
3e833dd735
|
Merge branch 'jiayu-dev' into shenzhen-dev
|
2024-09-06 15:01:01 +08:00 |
|
|
|
d72c379038
|
按钮管理接口更改
|
2024-09-06 15:00:20 +08:00 |
|
|
|
77d6dd501d
|
flx：修改配置
|
2024-09-06 09:25:25 +08:00 |
|
|
|
aef467286f
|
flx：提交大屏水波球 总包柱状图自动滚动
|
2024-08-22 14:27:54 +08:00 |
|
|
|
2d6868a3e9
|
flx：提交大连金笔配置
|
2024-08-20 14:51:14 +08:00 |
|
|
|
e38e0e38ec
|
flx：提交视频比例
|
2024-08-11 13:55:57 +08:00 |
|
|
|
5af466db44
|
合并冲突
|
2024-08-09 16:47:35 +08:00 |
|
|
|
44d0c738f0
|
flx：提交四川网城 九柱配置
|
2024-08-09 16:37:07 +08:00 |
|
|
|
95ceef83a4
|
flx：提交四川网城
|
2024-08-07 18:33:50 +08:00 |
|
|
|
49763e5673
|
flx：修改报警
|
2024-08-02 15:28:04 +08:00 |
|
|
|
8c48d687cc
|
flx：提交应急增加报警音频
|
2024-08-02 14:46:11 +08:00 |
|
|
|
6d17568930
|
flx：修改指挥部大屏侧边跳转路由
|
2024-08-01 10:21:04 +08:00 |
|
|
|
8ade698bb2
|
flx：修改表单key重复引起的bug
|
2024-07-31 11:31:43 +08:00 |
|
|
|
e34ae2467a
|
flx：修改排序bug
|
2024-07-31 11:30:47 +08:00 |
|
|
|
79c6a59308
|
flx：优化进度渲染的效率
|
2024-07-31 11:29:17 +08:00 |
|
|
|
8471c36973
|
flx：修改百色监控
|
2024-07-29 19:04:02 +08:00 |
|
|
|
882b3e7a20
|
flx：修改月份参数
|
2024-07-29 19:03:37 +08:00 |
|
|
|
34b387da80
|
flx：修改指挥部大屏
|
2024-07-29 17:19:55 +08:00 |
|
|
|
9a5066648c
|
菜单修改为可配置
|
2024-07-27 15:45:16 +08:00 |
|
|
|
54aed72315
|
flx：修改侧边弹窗目录结构
|
2024-07-26 18:18:43 +08:00 |
|
|
|
0d94579acf
|
flx：修改百色塔吊样式问题
|
2024-07-25 15:48:10 +08:00 |
|
|
|
a6207cbcf9
|
flx:修改塔吊 工作情况的样式问题
|
2024-07-23 18:21:37 +08:00 |
|
jiayu
|
c6c531021b
|
添加包头化工配置
|
2024-07-18 16:11:01 +08:00 |
|
|
|
3d5c6e66e2
|
flx：修改现场大屏承包商
|
2024-07-17 10:33:38 +08:00 |
|
|
|
6191db0d2a
|
flx：修复大屏bug
|
2024-07-15 17:29:15 +08:00 |
|
|
|
f423dc8cee
|
flx：新增弹幕配置 视频轮播
|
2024-07-13 19:10:51 +08:00 |
|
|
|
8a63fe5469
|
flx：新增同济配置
|
2024-07-10 19:20:01 +08:00 |
|
|
|
5d4b8c7804
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-09 10:35:09 +08:00 |
|
|
|
78271db64b
|
flx：新增人员定位大屏跳转
|
2024-07-09 10:34:19 +08:00 |
|
|
|
edc808654e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-08 21:04:29 +08:00 |
|
|
|
530c64ebf0
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-08 19:03:14 +08:00 |
|
|
|
ced0beac6b
|
flx：新增人员定位大屏
|
2024-07-08 19:02:55 +08:00 |
|
kun
|
ebc48e22c2
|
fix: AI报警弹窗样式修改以及人员总览样式修改
|
2024-07-08 18:00:06 +08:00 |
|
kun
|
9aa0790e8b
|
fix: 修改环境
|
2024-07-08 14:46:11 +08:00 |
|
kun
|
ccf85d8e9b
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-07-08 14:38:01 +08:00 |
|
kun
|
24c8809090
|
feat: 对AI警报弹窗页面添加功能以及BUG修改
|
2024-07-08 14:37:58 +08:00 |
|
|
|
c8658c737d
|
flx：修复人员风险第一次不显示 文字提示弹窗太长导致页面宽度超出
|
2024-07-08 13:42:35 +08:00 |
|
Vce
|
0031b96c64
|
fix：取消指挥部大屏甘特图console输出
|
2024-07-05 23:37:57 +08:00 |
|
Vce
|
5b16c6327c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-07-05 23:29:02 +08:00 |
|
Vce
|
d48b876537
|
fix：修改指挥部大屏项目总览BUG
|
2024-07-05 23:28:40 +08:00 |
|
|
|
5cde2918a9
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-05 23:23:51 +08:00 |
|
|
|
38cb6555a3
|
flx：修改指挥部大屏总览显示问题 新增分页 注销海康插件
|
2024-07-05 23:23:08 +08:00 |
|
Vce
|
ee3696dd60
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-07-05 21:25:15 +08:00 |
|
Vce
|
26649347e0
|
fix:修改指挥部大屏bug
|
2024-07-05 21:01:33 +08:00 |
|
|
|
5917a1a011
|
flx：新增分页
|
2024-07-05 19:48:09 +08:00 |
|
|
|
eb0dea64ce
|
flx：弹窗新增分页
|
2024-07-05 19:44:27 +08:00 |
|
|
|
cf7c0d9446
|
Merge branch 'kun_dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-05 19:14:52 +08:00 |
|
|
|
676a3345d5
|
flx：提交指挥部大屏分页
|
2024-07-05 19:14:33 +08:00 |
|
kun
|
d57e93fe56
|
fix: 修改冲突以及合并代码
|
2024-07-05 19:13:18 +08:00 |
|
kun
|
d6350419f2
|
feat: 添加人员总览弹窗以及AI预警页面修改
|
2024-07-05 19:10:28 +08:00 |
|
|
|
b4140dd6a4
|
flx：冲突 修改现场大屏bug
|
2024-07-05 18:58:53 +08:00 |
|
|
|
d1b59ad8a5
|
flx：指挥部大屏修改分页
|
2024-07-05 18:11:05 +08:00 |
|
Vce
|
337b754730
|
fix:修改指挥部大屏Bug
|
2024-07-05 18:00:15 +08:00 |
|
|
|
c5fc8746bc
|
Merge branch 'cjw-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-05 15:59:29 +08:00 |
|
|
|
1d22698048
|
flx：修改现场大屏总包单位轮播 危险特殊作业增加轮播
|
2024-07-05 15:59:01 +08:00 |
|
Vce
|
18a096c551
|
feat:完成指挥部大屏安全教育和和项目总览弹窗开发
|
2024-07-05 15:30:26 +08:00 |
|
|
|
7fa5e78047
|
Merge branch 'cjw-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-05 14:16:02 +08:00 |
|
|
|
01d8b3f70e
|
flx：修复演示大屏样式bug
|
2024-07-05 11:54:28 +08:00 |
|
Vce
|
e8b9db8c66
|
feat：完成指挥部大屏危险特殊作业和质量管理两个弹窗开发
|
2024-07-04 19:08:36 +08:00 |
|
Vce
|
bbbbc93e53
|
feat:完成现场大屏左上角承包商信息轮播开发
|
2024-07-04 19:02:48 +08:00 |
|
Vce
|
0eb25e1b55
|
fix:修改指挥部大屏劳务实名制和添加安全评分
|
2024-07-03 16:57:56 +08:00 |
|
|
|
11b9613874
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-07-03 09:46:52 +08:00 |
|
|
|
51d415b78e
|
flx：演示大屏 雨量监测 今日报警统计新加两个
|
2024-07-03 09:46:30 +08:00 |
|
Vce
|
608302251d
|
fix:修改跳转路径
|
2024-07-02 21:00:04 +08:00 |
|
Vce
|
84c3f223d8
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-07-02 19:14:47 +08:00 |
|
Vce
|
2b457b9b70
|
fix:根据需求修改现场大屏承包商信息管理、修改AI预警接口、修改特殊作业接口、添加劳务实名制自动滚动、、修改应急记录接口
|
2024-07-02 18:47:33 +08:00 |
|
|
|
9c7280041e
|
flx：修复指挥部大屏影响进度因素图片异常问题
|
2024-07-02 16:38:10 +08:00 |
|
|
|
b3b46a9122
|
flx：冲突
|
2024-07-02 16:31:15 +08:00 |
|
|
|
09c0b80eb1
|
flx：修改指挥部大屏影响进度因素图片多张显示
|
2024-07-02 16:30:01 +08:00 |
|
Vce
|
c143cc6075
|
fix：修改指挥部大屏目录样式
|
2024-07-02 11:38:27 +08:00 |
|
Vce
|
20528ccbcd
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-07-02 00:00:50 +08:00 |
|
Vce
|
277ff3e2d9
|
fix:添加指挥部大屏的目录
|
2024-07-01 23:55:53 +08:00 |
|
|
|
5dc2be65f9
|
flx：修改指挥部大屏分数
|
2024-07-01 21:50:35 +08:00 |
|
|
|
604d664902
|
flx：修改安全评分月度表 参数
|
2024-07-01 19:44:30 +08:00 |
|
|
|
e15c8c9e0e
|
flx：月度评分综合表 新增单模块得分和扣分
|
2024-07-01 19:07:58 +08:00 |
|
|
|
7074de9ad7
|
flx：对接完善雨量监测接口
|
2024-07-01 17:36:16 +08:00 |
|
|
|
abfca52c18
|
flx：修改指挥部大屏人员风险展示 和应急首次未调用问题
|
2024-07-01 16:31:01 +08:00 |
|
kun
|
73ae858af9
|
feat: 雨量监测页面添加以及部分接口对接
|
2024-06-29 18:26:20 +08:00 |
|
kun
|
ad4b56defc
|
fix: AI预警样式调整
|
2024-06-28 20:02:20 +08:00 |
|
kun
|
8200b1203c
|
fix: AI预警-今日告警弹窗样式BUG修改
|
2024-06-28 20:00:33 +08:00 |
|
kun
|
ebd2b1c0ca
|
fix: 代码合并以及冲突解决
|
2024-06-28 17:50:45 +08:00 |
|
kun
|
cc562868ef
|
feat: 重庆南岸项目页面添加以及代码合并
|
2024-06-28 17:50:25 +08:00 |
|
|
|
691cb3c106
|
flx：修改配置
|
2024-06-28 17:20:00 +08:00 |
|
|
|
c1b3bc15a3
|
flx：冲突
|
2024-06-28 17:18:54 +08:00 |
|
|
|
afa9a66c5a
|
flx：修改指挥部大屏样式
|
2024-06-28 17:17:18 +08:00 |
|
kun
|
06a534e4c5
|
fix: 新项目环境添加
|
2024-06-27 18:41:42 +08:00 |
|
kun
|
f88685355c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-27 15:21:21 +08:00 |
|
kun
|
2e933dcce3
|
fix: 冲突解决以及代码合并
|
2024-06-27 15:21:20 +08:00 |
|
kun
|
ef17d7df89
|
feat: 外墙脚手架功能开发
|
2024-06-27 15:20:04 +08:00 |
|
|
|
95e9468c82
|
flx：修改乌丹样式问题
|
2024-06-27 15:20:02 +08:00 |
|
|
|
1dc40fbb53
|
flx：提交乌丹项目 临边防护页面 大屏的消息提示集中处理
|
2024-06-27 15:04:48 +08:00 |
|
|
|
cc7fc0d7b8
|
flx：修改现场大屏样式
|
2024-06-26 10:01:05 +08:00 |
|
|
|
30ab53c652
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-25 22:02:08 +08:00 |
|
|
|
d2212f45b0
|
flx：隐藏项目后台
|
2024-06-25 22:01:24 +08:00 |
|
kun
|
17b8dad36e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 21:00:20 +08:00 |
|
kun
|
de610ef2b9
|
fix: 跳转链接修改
|
2024-06-25 21:00:19 +08:00 |
|
Vce
|
7662c014c8
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 16:53:43 +08:00 |
|
Vce
|
68aa41f75d
|
fix:修改总览大屏和项目看板的各企业本周数据统计自动切换时间为10秒
|
2024-06-25 16:53:40 +08:00 |
|
kun
|
fc6b1fe40f
|
fix: 合并代码以及解决冲突
|
2024-06-25 16:41:00 +08:00 |
|
kun
|
78d303370d
|
fix: 环境添加
|
2024-06-25 16:40:33 +08:00 |
|
Vce
|
814e53ad9e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 14:58:00 +08:00 |
|
Vce
|
530682cffb
|
fix:修改现场大屏标题以及特殊作业echaarts图颜色
|
2024-06-25 14:57:54 +08:00 |
|
|
|
d5e56c3a3b
|
flx：修改登录权限判断 修改看板样式问题
|
2024-06-25 10:37:48 +08:00 |
|
|
|
69843e72c7
|
flx：现场大屏样式修改
|
2024-06-24 23:33:49 +08:00 |
|
|
|
1dcda2bd7e
|
flx：修改指挥部大屏 项目看板样式问题
|
2024-06-24 22:37:07 +08:00 |
|
|
|
168a793600
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-24 17:49:41 +08:00 |
|
|
|
832587181e
|
flx：修改指挥部大屏文字
|
2024-06-24 17:12:04 +08:00 |
|
|
|
031c32d6f7
|
flx：新增指挥部大屏安全风险隐患总数
|
2024-06-24 17:08:30 +08:00 |
|
|
|
db07f825c3
|
flx：修改人员风险样式问题
|
2024-06-24 16:19:39 +08:00 |
|
|
|
354b197ae5
|
flx：调整总览大屏样式遮挡
|
2024-06-24 15:22:10 +08:00 |
|
|
|
ef179d8ae7
|
flx：修改总览大屏样式问题 指挥部大屏显示问题
|
2024-06-24 14:27:58 +08:00 |
|
Vce
|
7adf5b84cb
|
fix：修改现场大屏距离完工还剩多少天的字段
|
2024-06-24 13:54:58 +08:00 |
|
|
|
2695f1efd0
|
flx：修改指挥部大屏样式问题
|
2024-06-21 18:47:03 +08:00 |
|
Vce
|
75527d96e4
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-21 18:21:42 +08:00 |
|
Vce
|
3ffaade9ad
|
fix：修改现场大屏劳务实名制字段
|
2024-06-21 17:32:05 +08:00 |
|
|
|
cb90879199
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-20 23:20:04 +08:00 |
|
|
|
0541c84536
|
flx：修改项目看板风险颜色
|
2024-06-20 23:19:37 +08:00 |
|
Vce
|
0e4e286388
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-20 18:54:14 +08:00 |
|
Vce
|
b582ebdb89
|
fix:修改现场大屏安全待办以及质量待办样式
|
2024-06-20 18:53:44 +08:00 |
|
|
|
3a474d2c92
|
flx：修改看板 总览 雷达图字体超出省略号
|
2024-06-20 18:51:02 +08:00 |
|
|
|
0d3d4241b7
|
flx：调整项目总览 项目看板 指挥部大屏 样式问题
|
2024-06-20 17:41:09 +08:00 |
|
|
|
535a0981b4
|
flx：调整总览大屏 项目看板轮播图样式问题
|
2024-06-20 16:08:49 +08:00 |
|
|
|
a4ccb44511
|
flx：修改项目看板 总览大屏样式问题
|
2024-06-20 15:28:59 +08:00 |
|
|
|
66aedd6eed
|
flx：冲突
|
2024-06-20 10:20:08 +08:00 |
|
|
|
81e524c0dc
|
flx:冲突
|
2024-06-20 10:17:40 +08:00 |
|
|
|
f579491e4a
|
flx：修改项目大屏和总览大屏样式问题
|
2024-06-20 10:15:24 +08:00 |
|
Vce
|
cb98b23f45
|
fix:判断现场大屏雄本地与鞍钢正式和测试环境的项目Sn判断
|
2024-06-20 10:06:08 +08:00 |
|
Vce
|
7b933c75f8
|
fix：现场大屏所有接口暂时写死projectSn，部署时需根据环境来切换相应的projectSn，已在切换环境的地方做好注释说明
|
2024-06-20 00:37:29 +08:00 |
|
Vce
|
5d8fc0f44e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-20 00:36:26 +08:00 |
|
Vce
|
c6c84b7f4f
|
fix:现场大屏所有接口暂时写死projectSn，部署时需根据环境来切换相应的projectSn
|
2024-06-20 00:36:07 +08:00 |
|
|
|
0f60a72dd5
|
flx:冲突
|
2024-06-19 23:55:50 +08:00 |
|
|
|
b302fe4ddc
|
flx：冲突
|
2024-06-19 23:55:08 +08:00 |
|
|
|
bc0eb11742
|
flx：config配置
|
2024-06-19 23:52:06 +08:00 |
|
|
|
9fb652a257
|
flx：冲突
|
2024-06-19 23:37:50 +08:00 |
|
|
|
66a5a51037
|
flx：上传指挥部大屏风险
|
2024-06-19 23:35:19 +08:00 |
|
|
|
9a8b432645
|
flx冲突
|
2024-06-19 22:26:55 +08:00 |
|
|
|
9f3dff0d17
|
flx：配置冲突
|
2024-06-19 22:26:09 +08:00 |
|
|
|
0ebf0ab9a4
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 22:25:00 +08:00 |
|
|
|
4f99277a9f
|
flx：提交总览大屏和项目看板
|
2024-06-19 22:24:42 +08:00 |
|
|
|
63ef13545a
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 21:15:39 +08:00 |
|
Vce
|
52d7a7fdd2
|
fix：修改现场大屏只能由供应商登录
|
2024-06-19 21:13:25 +08:00 |
|
|
|
b0b20c81d6
|
flx：冲突
|
2024-06-19 20:33:56 +08:00 |
|
Vce
|
a278b720e5
|
fix:修改现场大屏登录是显示账号类型不匹配
|
2024-06-19 20:23:36 +08:00 |
|
Vce
|
53307b21cc
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-19 20:22:09 +08:00 |
|
Vce
|
cfd89da956
|
feat:完成现场大屏接口对接
|
2024-06-19 20:21:25 +08:00 |
|
|
|
ceda7e5fbf
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 19:38:02 +08:00 |
|
|
|
d430f578c4
|
flx：提交指挥部大屏风险开发
|
2024-06-19 19:36:55 +08:00 |
|
kun
|
39beca0a58
|
fix: 中科佳成项目跳转问题修改
|
2024-06-19 10:03:51 +08:00 |
|
kun
|
b93a9a68e1
|
fix: 中科佳成环境添加
|
2024-06-18 20:17:48 +08:00 |
|
kun
|
619f551237
|
fix: 合并代码以及冲突解决
|
2024-06-18 18:28:49 +08:00 |
|
kun
|
86020fcf89
|
feat: 中科佳成项目环境添加
|
2024-06-18 18:28:17 +08:00 |
|
|
|
53df39f602
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-18 15:53:42 +08:00 |
|
|
|
25dc5c976d
|
flx：对接总览大屏和项目看板
|
2024-06-18 15:53:02 +08:00 |
|
kun
|
138fd5d63a
|
feat: 重庆南岸项目环境添加
|
2024-06-17 18:50:14 +08:00 |
|
kun
|
1e7dbb6019
|
fix: 解决冲突以及合并代码
|
2024-06-17 18:35:49 +08:00 |
|
kun
|
f1950be1ea
|
fix: 合并代码
|
2024-06-17 18:32:48 +08:00 |
|
|
|
72e16b2d43
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-17 18:17:10 +08:00 |
|
|
|
b81ae01ab6
|
flx：对接总览大屏 审批数据汇总 数据看板 审批数据汇总和进度概况轮询
|
2024-06-17 18:16:19 +08:00 |
|
Vce
|
823140d855
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-15 20:32:41 +08:00 |
|
Vce
|
fb286c173f
|
feat:完成现场大屏中上部分安全教育接口对接
fix:调整左下部分特殊作业情况、中上部分安全教育、中下左部分劳务实名制、中下右部分质量待办、右上部分应急记录、右下部分安全待办的细节样式
|
2024-06-15 20:31:54 +08:00 |
|
|
|
ac9ba34758
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-15 17:59:55 +08:00 |
|
|
|
255fdd1d6e
|
flx：调整指挥部大屏样式
|
2024-06-15 17:58:41 +08:00 |
|
|
|
1cb144c1a6
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-15 17:16:03 +08:00 |
|
|
|
cabb608193
|
feat：新增指挥部大屏雷达图展示
|
2024-06-15 17:09:21 +08:00 |
|
Vce
|
9872ca236e
|
fix调整现场大屏中责任单位的样式及布局
|
2024-06-15 11:25:04 +08:00 |
|
|
|
74c403ecee
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-15 10:08:56 +08:00 |
|
|
|
f65de23079
|
flx：调整总览大屏样式问题
|
2024-06-15 10:08:38 +08:00 |
|
Vce
|
2a17e2347f
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-15 09:47:00 +08:00 |
|
Vce
|
fbe97c4393
|
fix：调整现场大屏样式以及添加责任单位字段
|
2024-06-15 09:46:11 +08:00 |
|
|
|
7138d5d032
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-14 20:06:36 +08:00 |
|
|
|
89b0298466
|
flx：提交总览大屏数据接口
|
2024-06-14 20:06:07 +08:00 |
|
kun
|
bcc5ef2314
|
feat: 鞍钢集团项目大屏接口对接以及页面修改
|
2024-06-14 16:22:42 +08:00 |
|
|
|
6181bc06c6
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-14 15:23:27 +08:00 |
|
|
|
f8296aa429
|
flx：绑定总览大屏接口
|
2024-06-14 15:23:11 +08:00 |
|
kun
|
549eafbb43
|
feat: 项目看板部分接口对接以及视频配置组件接口对接
|
2024-06-14 15:06:30 +08:00 |
|
Vce
|
500cc54d92
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 22:00:30 +08:00 |
|
Vce
|
b6cb6bb904
|
feat:完成现场大屏中上部分安全教育静态页面开发
fix:优化现场大屏左上部分承包商项目信息布局、优化现场大屏左下部分特殊作业情况嵌套环形图、调整现场大屏中下右部分质量待办、右上部分应急记录以及右下部分安全待办
|
2024-06-13 21:57:10 +08:00 |
|
kun
|
2f54c80e97
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 20:35:30 +08:00 |
|
kun
|
d173148ca6
|
fix: 代码合并
|
2024-06-13 20:35:28 +08:00 |
|
|
|
f34fe9bfa5
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-13 18:41:52 +08:00 |
|
|
|
f899a097d6
|
flx：冲突
|
2024-06-13 18:40:46 +08:00 |
|
|
|
3f461a201f
|
feat：添加总览大屏
|
2024-06-13 18:39:41 +08:00 |
|
kun
|
2055f6f3ef
|
fix: echarts图依赖安装
|
2024-06-13 17:15:24 +08:00 |
|
kun
|
200c73e983
|
fix: 鞍钢集团项目看板页面修改
|
2024-06-13 17:08:56 +08:00 |
|
|
|
b9ec4d0511
|
flx：解决冲突 新增项目总览大屏
|
2024-06-13 16:57:27 +08:00 |
|
kun
|
d93bf70c07
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 16:53:33 +08:00 |
|
kun
|
2ee5827a20
|
feat: 鞍钢集团项目看板内容页面添加以及合并代码
|
2024-06-13 16:53:31 +08:00 |
|
|
|
bbc8d8a08c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-13 16:52:42 +08:00 |
|
|
|
39e1f27b60
|
flx:冲突
|
2024-06-13 16:50:59 +08:00 |
|
|
|
1f0f4e7a5f
|
flx：冲突
|
2024-06-13 16:48:21 +08:00 |
|
Vce
|
f1a9d62f25
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 16:36:04 +08:00 |
|
Vce
|
c0eb6cd8f0
|
fix：按照客户需求修改指挥部大屏中下部分隐患检查推送不显示超期状态
|
2024-06-13 16:35:53 +08:00 |
|
Vce
|
6002913671
|
feat:完成现场大屏中下右部分质量待办、右上部分应急记录以及右下部分安全待办部分的静态页面开发
|
2024-06-13 16:33:10 +08:00 |
|
|
|
770887684f
|
flx：冲突
|
2024-06-13 13:39:57 +08:00 |
|
|
|
d74e071378
|
flx：冲突
|
2024-06-13 13:37:00 +08:00 |
|
|
|
c45a95a204
|
1
|
2024-06-13 12:01:20 +08:00 |
|
Vce
|
d74641e980
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 11:36:19 +08:00 |
|
Vce
|
6209420a28
|
fix:修改指挥部大屏中下部分隐患检查推送中超期数据只显示超期未整改的
|
2024-06-13 11:35:58 +08:00 |
|
Vce
|
8b6780a373
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 11:30:11 +08:00 |
|
Vce
|
ea373fa41f
|
feat:完成现场大屏中下左边部分劳务实名制静态页面开发
|
2024-06-13 11:29:46 +08:00 |
|
kun
|
427d46ca37
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 11:19:42 +08:00 |
|
kun
|
0d09b54695
|
fix: 项目看板安全教育修改以及代码合并
|
2024-06-13 11:19:41 +08:00 |
|
Vce
|
35fd369831
|
fix:修改指挥部大屏右下角特殊作业统计分析显示作业数量
|
2024-06-13 00:38:18 +08:00 |
|
Vce
|
d2a0173388
|
fix:修改指挥部大屏中下部分”隐患检查推送“显示超期状态
|
2024-06-13 00:31:11 +08:00 |
|
Vce
|
0950addcae
|
fix：解决冲突Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 22:38:28 +08:00 |
|
Vce
|
c908c79e55
|
feat:添加现场大屏整体框架，完成现场大屏承包商项目信息、AI报警情况以及特殊作业情况的静态页面绘画
|
2024-06-12 22:11:48 +08:00 |
|
|
|
173f4be04d
|
提交大屏总览
|
2024-06-12 19:20:02 +08:00 |
|
|
|
e02871104e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-12 18:48:12 +08:00 |
|
kun
|
e64d92cc64
|
feat: 项目看板大屏页面添加
|
2024-06-12 18:15:09 +08:00 |
|
kun
|
6202602cbe
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 17:31:56 +08:00 |
|
kun
|
093c339fd1
|
fix: BUG修改
|
2024-06-12 17:31:54 +08:00 |
|
Vce
|
809e3a1f34
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 16:41:20 +08:00 |
|
Vce
|
2736ef511c
|
修改指挥部大屏的中下部分“隐患检查推送”为定时30S获取一次，获取实时的隐患状态并修改显示消息通知格式以及指挥部大屏右下“特殊作业统计分析”修改为堆叠图
|
2024-06-12 16:41:15 +08:00 |
|
kun
|
ae490f9489
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 11:29:39 +08:00 |
|
kun
|
e0026e8f60
|
fix: BUG修改
|
2024-06-12 11:29:37 +08:00 |
|
|
|
3059dfeda5
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-06 17:02:54 +08:00 |
|
|
|
18847896db
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-06 17:01:17 +08:00 |
|
|
|
73897ae1eb
|
修改报警
|
2024-06-06 17:00:17 +08:00 |
|
kun
|
d78ce42578
|
fix: 冲突解决以及BUG修改
|
2024-06-06 09:26:02 +08:00 |
|
kun
|
a42f0385cb
|
fix: BUG修改
|
2024-06-06 09:25:34 +08:00 |
|
Vce
|
f434c4652b
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-06 00:20:34 +08:00 |
|
Vce
|
85f3c8575e
|
修改水波图
|
2024-06-06 00:19:28 +08:00 |
|
|
|
59a17d392d
|
flx：冲突
|
2024-06-05 22:48:37 +08:00 |
|
|
|
b6cfe00059
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-05 22:46:54 +08:00 |
|
|
|
f5e57324d3
|
无感刷新
|
2024-06-05 22:46:23 +08:00 |
|
|
|
d8026508e2
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-05 20:08:22 +08:00 |
|
|
|
29cbdcfc6b
|
无感刷新
|
2024-06-05 18:31:26 +08:00 |
|
kun
|
d1d8ebd656
|
fix: BUG修改
|
2024-06-05 15:58:24 +08:00 |
|
kun
|
0367457730
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-05 15:21:58 +08:00 |
|
kun
|
c342e06707
|
fix: BUG修改
|
2024-06-05 15:21:57 +08:00 |
|
Vce
|
89307c3e69
|
修改bug
|
2024-06-05 14:47:05 +08:00 |
|
Vce
|
7c82f0abb0
|
增加安全评分根据分值修改背景光晕颜色
|
2024-06-05 14:41:13 +08:00 |
|
Vce
|
0763058759
|
添加判断
|
2024-06-04 23:02:08 +08:00 |
|
Vce
|
ca1a598607
|
修改柱状图hover显示
|
2024-06-04 22:23:06 +08:00 |
|
Vce
|
99c597d136
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-04 22:06:57 +08:00 |
|
Vce
|
ee8a6c4dcc
|
调整安全评分样式
|
2024-06-04 22:06:29 +08:00 |
|
Vce
|
07c5b67467
|
修改bug
|
2024-06-04 22:06:05 +08:00 |
|
Vce
|
449c8612f1
|
添加安全评分背景颜色
|
2024-06-04 21:45:21 +08:00 |
|
|
|
e23394d58e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 21:38:16 +08:00 |
|
kun
|
93ae5c4037
|
fix: 冲突解决
|
2024-06-04 21:32:17 +08:00 |
|
kun
|
d80216cd61
|
fix: BUG修改
|
2024-06-04 21:31:55 +08:00 |
|
|
|
215c26fd76
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 20:14:56 +08:00 |
|
|
|
e1b002cc17
|
提交大屏应急弹窗
|
2024-06-04 20:13:38 +08:00 |
|
|
|
efc4fffade
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 19:59:27 +08:00 |
|
|
|
d1776b131e
|
1
|
2024-06-04 19:59:18 +08:00 |
|
|
|
fb6b8bddae
|
提交大屏警告
|
2024-06-04 19:16:37 +08:00 |
|
|
|
c272e3473c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 10:01:27 +08:00 |
|
|
|
609b1b0318
|
修改细节问题
|
2024-06-04 10:00:55 +08:00 |
|
Vce
|
e51077ac92
|
修改责任单位隐患整改率统计
|
2024-06-04 00:21:58 +08:00 |
|
Vce
|
8973095146
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-03 22:20:59 +08:00 |
|
Vce
|
359e45cb24
|
修改安全评分静态数据
|
2024-06-03 22:20:56 +08:00 |
|
|
|
3093d981f4
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-03 21:12:26 +08:00 |
|
|
|
101ec12fa4
|
修改
|
2024-06-03 21:12:01 +08:00 |
|
Vce
|
8fd9c4a98c
|
修改细节样式
|
2024-06-03 19:50:16 +08:00 |
|
|
|
e8a4b8fd15
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-03 19:24:16 +08:00 |
|
|
|
a89a11f5d3
|
1
|
2024-06-03 19:23:40 +08:00 |
|
Vce
|
e5691bea65
|
修改细节
|
2024-06-03 19:11:33 +08:00 |
|
|
|
cfec531dca
|
1
|
2024-06-03 19:08:58 +08:00 |
|
|
|
2c65a19e2f
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-03 18:57:27 +08:00 |
|
Vce
|
02da83ec2d
|
调整细节样式
|
2024-06-03 18:56:13 +08:00 |
|
Vce
|
42dabe5320
|
修改bug
|
2024-06-03 18:51:35 +08:00 |
|
|
|
983f53a944
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-03 18:48:52 +08:00 |
|
|
|
8edff95f9b
|
1
|
2024-06-03 18:47:58 +08:00 |
|
Vce
|
e7cf73b051
|
调整细节样式
|
2024-06-03 18:42:51 +08:00 |
|
Vce
|
2131fd52df
|
添加暂无数据
|
2024-06-03 18:38:57 +08:00 |
|
Vce
|
8a1b5ef989
|
添加暂无数据显示
|
2024-06-03 18:30:37 +08:00 |
|
Vce
|
c505496a6f
|
修改传参
|
2024-06-03 18:26:44 +08:00 |
|
|
|
9b873862fa
|
1
|
2024-06-03 18:05:26 +08:00 |
|
|
|
1b9b12fdb4
|
1
|
2024-06-03 18:03:01 +08:00 |
|
|
|
ffdbcaea6c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-03 17:53:25 +08:00 |
|
|
|
01cc615d49
|
1
|
2024-06-03 17:52:59 +08:00 |
|
Vce
|
bdf80f3b83
|
对接隐患检查推送接口以及修改bug
|
2024-06-03 17:50:55 +08:00 |
|
|
|
c7a46f4765
|
flx:冲突
|
2024-06-03 16:56:53 +08:00 |
|
|
|
6b6af7efe9
|
提交大屏
|
2024-06-03 16:55:51 +08:00 |
|
Vce
|
335b6642a2
|
对接左边接口
|
2024-06-03 16:46:14 +08:00 |
|
|
|
375c04f7f2
|
提交
|
2024-06-03 14:58:23 +08:00 |
|
|
|
945e8622b1
|
flx:冲突
|
2024-06-03 14:58:00 +08:00 |
|
|
|
bc65cf2aa3
|
提交
|
2024-06-03 14:55:24 +08:00 |
|
Vce
|
bc6146abaf
|
调整样式
|
2024-06-03 14:17:09 +08:00 |
|
Vce
|
1cd412f169
|
暂存代码
|
2024-06-03 13:45:16 +08:00 |
|
Vce
|
1a50532e2c
|
环境标识
|
2024-06-03 11:18:13 +08:00 |
|
Vce
|
6549157e5f
|
package-lock.json
|
2024-06-03 00:03:14 +08:00 |
|
Vce
|
afb7fc2f2a
|
Merge branch 'bjxz-rain' into shenzhen-dev
|
2024-06-02 23:21:27 +08:00 |
|
|
|
d1604ab52a
|
提交大屏
|
2024-06-02 22:53:14 +08:00 |
|
Vce
|
b65839dc8c
|
修改指挥部大屏
|
2024-06-02 22:37:06 +08:00 |
|
Vce
|
9617a78233
|
修改指挥部大屏页面
|
2024-06-02 22:08:23 +08:00 |
|
Vce
|
6ca443b835
|
修改人员定位数据显示
|
2024-05-31 16:29:40 +08:00 |
|
|
|
08134f2f82
|
修改
|
2024-05-29 10:51:30 +08:00 |
|
Vce
|
c1738a8b33
|
添加围栏关联区域
|
2024-05-25 23:59:27 +08:00 |
|
kun
|
04f22c0aca
|
fix: BUG修改
|
2024-05-23 13:54:17 +08:00 |
|
kun
|
b95136ae36
|
fix: BUG修改
|
2024-05-18 20:26:24 +08:00 |
|
kun
|
8420debd27
|
fix: BUG修改
|
2024-05-18 18:06:20 +08:00 |
|
kun
|
f1222b510c
|
fix: BUG修改
|
2024-05-16 09:53:36 +08:00 |
|
kun
|
f2ac1a6a00
|
fix: BUG修改
|
2024-05-16 09:11:52 +08:00 |
|
kun
|
bad1b86f35
|
fix: BUG修改
|
2024-05-15 15:43:34 +08:00 |
|
kun
|
89f2dc7935
|
fix: BUG修改
|
2024-05-14 20:13:54 +08:00 |
|
kun
|
536756657a
|
Merge branch 'bjxz-rain' into shenzhen-dev
|
2024-05-14 11:36:39 +08:00 |
|
Vce
|
e824f8bffc
|
flx：修改安全隐患文字超出
|
2024-05-14 11:28:39 +08:00 |
|
kun
|
b5da2c9fe0
|
fix: BUG修改
|
2024-05-14 09:33:47 +08:00 |
|
Vce
|
17f4d21cba
|
flx：修复bug
|
2024-05-13 20:46:26 +08:00 |
|
Vce
|
619588e27f
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-Rain
|
2024-05-13 14:59:00 +08:00 |
|
Vce
|
7d3b8c2425
|
flx: bug修复
|
2024-05-13 14:57:32 +08:00 |
|
Vce
|
7c1d7f41c4
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-05-13 11:58:19 +08:00 |
|
Vce
|
23b099a17b
|
修改指挥部大屏安全教育智能分析有数据但不显示的bug
|
2024-05-13 11:58:16 +08:00 |
|
kun
|
3bba6b1ba8
|
fix: 冲突解决
|
2024-05-13 11:44:53 +08:00 |
|
kun
|
fd376320cd
|
fix: BUG修改
|
2024-05-13 11:44:23 +08:00 |
|
Vce
|
b419461185
|
Merge branch 'dev-Rain' into shenzhen-dev
|
2024-05-13 02:39:47 +08:00 |
|
Vce
|
012ac4048f
|
更换接口以及调整样式
|
2024-05-13 02:00:37 +08:00 |
|
Vce
|
d69541caad
|
fix：修复bug
|
2024-05-13 01:17:34 +08:00 |
|
kun
|
87698ed89c
|
fix: BUG修改
|
2024-05-13 00:53:00 +08:00 |
|
Vce
|
e3be724729
|
fix: 冲突解决
|
2024-05-12 18:03:50 +08:00 |
|
Vce
|
2c08d6eca0
|
fix: BUG修改
|
2024-05-12 18:02:27 +08:00 |
|
kun
|
4c71583301
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-05-12 17:54:34 +08:00 |
|
kun
|
dfa7bfd580
|
fix: BUG修改
|
2024-05-12 17:54:33 +08:00 |
|
Vce
|
ef35e21b3e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-05-12 17:44:07 +08:00 |
|
Vce
|
269a6840d6
|
调整centerTop安全评分弹窗和centerBottom底部滚动速度
|
2024-05-12 17:43:36 +08:00 |
|
kun
|
ff976e1817
|
fix: BUG修改
|
2024-05-12 17:06:37 +08:00 |
|
kun
|
fdba33e4dc
|
Merge branch 'dev-Rain' into shenzhen-dev
|
2024-05-12 09:37:47 +08:00 |
|
Vce
|
62d105281e
|
隐患智能分析 显示暂无
|
2024-05-12 09:11:26 +08:00 |
|
Vce
|
4fea6474fb
|
修改ai报警上方无数据不显示
|
2024-05-12 08:31:00 +08:00 |
|
Vce
|
37450d0558
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-05-12 01:56:03 +08:00 |
|
Vce
|
7a45df231f
|
对接指挥部大屏centerTop
|
2024-05-12 01:52:37 +08:00 |
|
kun
|
7d16a1786b
|
fix: BUG修改
|
2024-05-12 00:30:12 +08:00 |
|
kun
|
d984f715f8
|
Merge branch 'dev-Rain' into shenzhen-dev
|
2024-05-11 21:44:48 +08:00 |
|
kun
|
d86d25b681
|
fix: BUG修改
|
2024-05-11 21:43:15 +08:00 |
|
kun
|
1e651700d4
|
fix: BUG修改
|
2024-05-11 21:26:48 +08:00 |
|
kun
|
68cde83997
|
fix: BUG修改
|
2024-05-11 21:21:47 +08:00 |
|
Vce
|
78d05bea05
|
数据大屏右侧
|
2024-05-11 20:50:20 +08:00 |
|
kun
|
7a986d8ae7
|
fix: BUG修改
|
2024-05-11 19:15:44 +08:00 |
|
kun
|
e8d91ddef6
|
fix: BUG修改
|
2024-05-11 15:11:04 +08:00 |
|
kun
|
41d148a0d3
|
fix: 冲突解决以及BUG修改
|
2024-05-11 11:17:19 +08:00 |
|
Vce
|
1e0d3bfa3a
|
修改右侧
|
2024-05-11 11:10:48 +08:00 |
|
kun
|
8e8a177e53
|
fix: BUG修改
|
2024-05-11 11:07:32 +08:00 |
|
kun
|
1186b1804a
|
fix: BUG修改
|
2024-05-11 02:51:04 +08:00 |
|
kun
|
ec424858c7
|
fix: BUG修改
|
2024-05-11 02:49:17 +08:00 |
|
|
|
2f5c27657a
|
1
|
2024-05-10 23:01:33 +08:00 |
|
kun
|
6c78be10b7
|
fix: BUG修改
|
2024-05-10 20:33:26 +08:00 |
|
kun
|
1ee154e05d
|
fix: BUG修改
|
2024-05-09 00:55:59 +08:00 |
|
Vce
|
26846e6d7b
|
fix:修改合肥启程临边不显示问题，以及为视频监控增加新字段判断
|
2024-05-05 01:44:26 +08:00 |
|
Vce
|
f327cd90c9
|
dev:添加鞍钢最新地址
|
2024-05-04 16:39:48 +08:00 |
|
Vce
|
f444a0284a
|
dev:添加环境
|
2024-04-28 16:58:51 +08:00 |
|
Vce
|
670d3429db
|
dev:指挥部大屏
|
2024-04-28 16:54:51 +08:00 |
|
Vce
|
c65093d484
|
dev:指挥部大屏
|
2024-04-28 16:48:53 +08:00 |
|
Vce
|
779b8684b0
|
dev:指挥部大屏
|
2024-04-28 01:15:21 +08:00 |
|
Vce
|
ac30afc740
|
dev:指挥部大屏
|
2024-04-27 22:50:10 +08:00 |
|
kun
|
64b4e67a55
|
fix: BUG修改
|
2024-04-27 19:34:59 +08:00 |
|
kun
|
aecd03ac09
|
feat: 页面新增以及BUG修改
|
2024-04-27 18:46:11 +08:00 |
|
Vce
|
eade95241c
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-04-27 13:44:03 +08:00 |
|
kun
|
ac4fe32f7f
|
fix: BUG修改
|
2024-04-27 13:41:36 +08:00 |
|
Vce
|
7abfa01a06
|
dev:调整指挥部大屏布局
|
2024-04-27 13:41:13 +08:00 |
|
Vce
|
c67c9878d0
|
dev:指挥部
|
2024-04-27 09:47:16 +08:00 |
|
Vce
|
f80be897bf
|
dev:指挥部大屏
|
2024-04-26 18:06:30 +08:00 |
|
Vce
|
0f4372aede
|
fix:修改BUG
|
2024-04-25 23:33:56 +08:00 |
|
Vce
|
bfda6c9df2
|
调整中海臻如府项目菜单栏显示
|
2024-04-25 09:29:27 +08:00 |
|
Vce
|
f3ba4b8588
|
dev:调整中海臻如府项目
|
2024-04-25 09:24:35 +08:00 |
|
Vce
|
ac9936d9c3
|
dev调整指挥部大屏页面
|
2024-04-25 09:09:34 +08:00 |
|
Vce
|
c5afb17159
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-04-24 16:14:09 +08:00 |
|
Vce
|
adeb11e813
|
dev:中海臻如府项目
|
2024-04-24 16:13:44 +08:00 |
|
Vce
|
9837a5490e
|
保存环境
|
2024-04-23 21:38:16 +08:00 |
|
Vce
|
4e579861db
|
fix:修改BUG
|
2024-04-23 21:32:59 +08:00 |
|
Vce
|
68df403552
|
fix:修改BUG
|
2024-04-23 21:31:22 +08:00 |
|
Vce
|
da7cf2ed43
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-04-23 21:30:51 +08:00 |
|
kun
|
0c6406afd1
|
fix: BUG修改
|
2024-04-23 21:24:09 +08:00 |
|
Vce
|
7e0bfa9ad8
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-04-23 20:21:21 +08:00 |
|
Vce
|
24c2d5b23f
|
dev: 部署中水北方大屏
|
2024-04-23 20:20:12 +08:00 |
|
Vce
|
5455f82997
|
dev:开发指挥部大屏页面左边
|
2024-04-22 23:02:06 +08:00 |
|
Vce
|
2d601bd506
|
dev: 开发指挥部大屏架子
|
2024-04-21 14:15:04 +08:00 |
|
kun
|
6c55db1a23
|
fix: 解决冲突
|
2024-04-21 09:55:11 +08:00 |
|
kun
|
d5434a5509
|
fix: BUG修改
|
2024-04-21 09:54:47 +08:00 |
|
Vce
|
0163cbf5c4
|
fix: 修改特殊情况二级菜单遮住标题栏以及安全帽模块的页面高度异常
|
2024-04-20 19:39:03 +08:00 |
|
Vce
|
1d3427d1f0
|
开发指挥部大屏
|
2024-04-20 17:26:03 +08:00 |
|
kun
|
465704dbe1
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-04-18 21:00:43 +08:00 |
|
kun
|
f724e40049
|
fix: BUG修改
|
2024-04-18 21:00:41 +08:00 |
|
Vce
|
0edc5ff500
|
修改首页针对鞍钢项目显示问题显示
|
2024-04-18 20:08:20 +08:00 |
|
Vce
|
c23af29edf
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-04-18 18:42:31 +08:00 |
|
Vce
|
ea48d19626
|
fix:根据客户需求修改ai预警页面
|
2024-04-18 18:40:01 +08:00 |
|
kun
|
adb5971047
|
fix: BUG修改
|
2024-04-18 14:25:13 +08:00 |
|
kun
|
100bce0a97
|
fix: 冲突解决
|
2024-04-18 14:24:17 +08:00 |
|
kun
|
45ef08137c
|
fix: BUG修改
|
2024-04-18 14:24:00 +08:00 |
|
Vce
|
3233e1a683
|
重新添加苏立信大屏项目
|
2024-04-18 14:21:23 +08:00 |
|
Vce
|
ab94f49734
|
增加江苏苏立信大屏
|
2024-04-18 13:03:07 +08:00 |
|
kun
|
bcc80ee075
|
fix: 冲突解决
|
2024-04-17 21:57:30 +08:00 |
|
kun
|
881baac20e
|
fix: BUG修改
|
2024-04-17 21:57:06 +08:00 |
|
Vce
|
78751f9e7e
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-04-17 21:07:38 +08:00 |
|
Vce
|
8b04115780
|
fix::修改BUG
|
2024-04-17 21:06:58 +08:00 |
|
Vce
|
079a4734e6
|
根据客户需求修改首页及ai预警页面
|
2024-04-17 21:05:05 +08:00 |
|
kun
|
760e30013c
|
fix: BUG修改
|
2024-04-17 20:53:12 +08:00 |
|
kun
|
1e01f882c9
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-04-17 20:52:01 +08:00 |
|
kun
|
878206f4f6
|
fix: BUG修改
|
2024-04-17 20:52:00 +08:00 |
|
Vce
|
4d058f865b
|
fix:修改视频管理显示两个暂无数据问题
|
2024-04-17 00:00:40 +08:00 |
|
Vce
|
e3df48e1de
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-04-16 23:48:54 +08:00 |
|
Vce
|
b7473d9dab
|
fix:修改合肥启程--乌丹首页显示异常问题（临时解决方案）
|
2024-04-16 23:47:58 +08:00 |
|
kun
|
c9d6446308
|
fix: BUG修改
|
2024-04-16 23:17:46 +08:00 |
|
Vce
|
983078520d
|
add: 增加标准版安全帽地图展开功能
|
2024-04-15 12:36:09 +08:00 |
|
Vce
|
67c3cec8f4
|
增加鞍钢集团大屏无感刷新
|
2024-04-13 11:08:23 +08:00 |
|
kun
|
386d714c3e
|
fix: BUG修改
|
2024-04-10 18:12:14 +08:00 |
|
kun
|
e8a62defc5
|
fix: BUG修改
|
2024-04-10 16:51:06 +08:00 |
|
kun
|
1922205b6e
|
fix: BUG修改
|
2024-04-10 14:22:06 +08:00 |
|
kun
|
131cabd70a
|
fix: BUG修改
|
2024-04-10 12:02:07 +08:00 |
|
kun
|
7fc6510391
|
fix: BUG修改
|
2024-04-10 11:32:16 +08:00 |
|
kun
|
a2f4fb1f43
|
fix: BUG修改
|
2024-04-09 22:02:41 +08:00 |
|
kun
|
3c55d8bdfc
|
fix: BUG修改
|
2024-04-09 21:16:36 +08:00 |
|
kun
|
bc78543744
|
fix: BUG修改
|
2024-04-09 20:58:48 +08:00 |
|
kun
|
8dd86dd72c
|
fix: BUG修改
|
2024-04-09 19:37:40 +08:00 |
|
kun
|
941bda3f8f
|
fix: BUG修改
|
2024-04-09 17:46:42 +08:00 |
|
kun
|
9fd68116a2
|
fix: BUG修改
|
2024-04-09 17:31:12 +08:00 |
|
kun
|
8c7e68e975
|
fix: BUG修改
|
2024-04-08 14:24:05 +08:00 |
|
kun
|
d8c9b5062f
|
fix: BUG修改
|
2024-04-07 18:23:46 +08:00 |
|
Vce
|
b3eecfda5b
|
fix: 修改劳务管理弹窗列表
|
2024-04-06 14:14:34 +08:00 |
|
Vce
|
c4e54711fc
|
fix: 修改agjt劳务管理和视频监控bug
|
2024-04-06 12:31:44 +08:00 |
|
Vce
|
4cb5fc9250
|
fix: 修改跳转后台bug
|
2024-04-05 18:04:41 +08:00 |
|
Vce
|
d0df4b9330
|
合并分支且修改跳转后台问题
|
2024-04-05 18:03:56 +08:00 |
|
Vce
|
9cfac25c3a
|
打包鞍钢集团项目
|
2024-04-05 17:42:04 +08:00 |
|
kun
|
ebae47d39c
|
fix: BUG修改
|
2024-04-02 10:07:31 +08:00 |
|
kun
|
b6357fd005
|
fix: BUG修改
|
2024-04-01 19:00:31 +08:00 |
|
kun
|
dc64b62520
|
fix: BUG修改
|
2024-04-01 18:54:18 +08:00 |
|
kun
|
5c4b8c4068
|
fix: BUG修改
|
2024-04-01 16:28:40 +08:00 |
|
kun
|
f007144d33
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-04-01 16:01:30 +08:00 |
|
Vce
|
7a9ac68823
|
添加鞍山项目
|
2024-04-01 15:03:53 +08:00 |
|
kun
|
1bd62d87d5
|
fix: BUG修改
|
2024-03-31 10:20:46 +08:00 |
|
Vce
|
dfe940feb7
|
fix: 修改hfqc的大屏页面
|
2024-03-30 20:38:43 +08:00 |
|
Vce
|
87bb410c27
|
fix: 修改hfqc二级菜单距离显示
|
2024-03-30 13:44:37 +08:00 |
|
Vce
|
4729c072a1
|
fix: 修改hfqc二级菜单距离显示
|
2024-03-30 12:12:52 +08:00 |
|
Vce
|
910b287ced
|
修改安全帽页面
|
2024-03-30 11:18:21 +08:00 |
|
Vce
|
5dafeb0f03
|
fix: 修改hfqc页面布局
|
2024-03-30 10:25:50 +08:00 |
|
Vce
|
3fe788fd08
|
添加合肥起程项目
|
2024-03-30 09:02:56 +08:00 |
|
Vce
|
caacd541cf
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-03-29 17:05:21 +08:00 |
|
Vce
|
6cbe45dc1a
|
fix: 隐藏高支模页面电量字段
|
2024-03-29 17:00:59 +08:00 |
|
kun
|
30d8304cd2
|
fix: BUG修改
|
2024-03-28 11:30:42 +08:00 |
|
Vce
|
76e4aa563d
|
fix: 修改AI告警查询参数
|
2024-03-26 20:14:39 +08:00 |
|
Vce
|
f7609c88a3
|
fix: 修改机械设备定位报警信息列表报警时间字段
|
2024-03-26 17:44:10 +08:00 |
|
Vce
|
94b66ac5ca
|
fix: 修改智能安全帽报警事件字段
|
2024-03-26 16:46:56 +08:00 |
|
Vce
|
2cc24bda61
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-03-25 20:58:44 +08:00 |
|
kun
|
af3e4871d5
|
fix: BUG修改
|
2024-03-25 20:57:41 +08:00 |
|
Vce
|
3a2a5be782
|
Merge branch 'shenzhen-dev' into cjw-dev
|
2024-03-25 20:24:48 +08:00 |
|
Vce
|
c2f92108b7
|
fix: 解决智能安全帽图片异常
|
2024-03-25 20:24:02 +08:00 |
|
Vce
|
a1c3eddc6f
|
Fix: 修改演示平台机械设备智能安全帽模块
|
2024-03-25 20:11:36 +08:00 |
|
Vce
|
6082499024
|
fix: 修改fyyk页面显示问题
|
2024-03-25 18:19:07 +08:00 |
|
kun
|
cf991171e6
|
fix: BUG修改
|
2024-03-25 11:47:22 +08:00 |
|
kun
|
8cea1162bd
|
fix: BUG修改
|
2024-03-22 13:51:57 +08:00 |
|
vce
|
c072d563b7
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-03-21 20:37:04 +08:00 |
|
vce
|
4cf6a0a2e3
|
fix: 修改智能安全帽和机械设备定位模块bug
|
2024-03-21 20:36:28 +08:00 |
|
kun
|
7c5532cea5
|
fix: BUG修改
|
2024-03-18 19:35:39 +08:00 |
|
kun
|
82c42f3d76
|
fix: BUG修改
|
2024-03-18 19:29:52 +08:00 |
|
kun
|
abed7685a7
|
fix: BUG修改
|
2024-03-18 19:27:25 +08:00 |
|
vce
|
bdf00040b6
|
Merge remote-tracking branch 'origin/kun_dev' into cjw-dev
|
2024-03-18 11:38:38 +08:00 |
|
vce
|
0b4dc75c58
|
fix: 修改bug
|
2024-03-18 11:37:58 +08:00 |
|
vce
|
c61da352d8
|
Merge remote-tracking branch 'origin/shenzhen-dev' into cjw-dev
|
2024-03-18 10:50:27 +08:00 |
|
kun
|
502fd719e1
|
fix: BUG修改
|
2024-03-18 10:38:57 +08:00 |
|
kun
|
87a8f41875
|
fix: 布局修改
|
2024-03-18 09:52:59 +08:00 |
|
kun
|
fd0b305808
|
fix: BUG修改
|
2024-03-18 09:15:35 +08:00 |
|
kun
|
62fd39395c
|
feat: 车辆管理和烟感监测功能新增以及BUG修改
|
2024-03-16 14:49:41 +08:00 |
|
kun
|
36e5fd27fa
|
fix: BUG修改
|
2024-03-15 09:40:30 +08:00 |
|
kun
|
ea0d34aaa6
|
fix: 解决冲突
|
2024-03-15 09:31:19 +08:00 |
|
kun
|
39a41832c6
|
fix: BUG修改
|
2024-03-12 14:25:16 +08:00 |
|
kun
|
934a0431cb
|
fix: BUG修改
|
2024-03-04 18:46:55 +08:00 |
|
kun
|
02e16ad534
|
fix: BUG修改
|
2024-02-23 16:07:24 +08:00 |
|
kun
|
69404eb005
|
fix: BUG修改
|
2024-02-22 17:35:57 +08:00 |
|
kun
|
e5c5c53904
|
fix: BUG修改
|
2024-02-22 11:51:46 +08:00 |
|
kun
|
0dace7ad08
|
fix: BUG修改
|
2024-02-21 18:52:31 +08:00 |
|
kun
|
e02242e068
|
feat: 高支模监测以及高边坡监测接口对接以及BUG修改
|
2024-02-19 18:00:23 +08:00 |
|
kun
|
64b9d194eb
|
fix: BUG修改
|
2024-02-18 19:11:34 +08:00 |
|
kun
|
261a56213a
|
feat: 代码合并
|
2024-02-18 11:10:55 +08:00 |
|
cjp
|
541758b452
|
fix: BUG修改
|
2024-02-03 17:56:28 +08:00 |
|
cjp
|
b37c89688d
|
fix: 试验机、拌合站接口对接
|
2024-01-30 18:15:58 +08:00 |
|
cjp
|
dc10fda17d
|
fix: 地磅、卸料平台对接
|
2024-01-27 09:15:23 +08:00 |
|
cjp
|
cae1478d6f
|
fix: 地磅对接，路面摊铺、压实静态；切换路由BUG修复
|
2024-01-25 16:32:33 +08:00 |
|
cjp
|
ddec7cfb29
|
fix: 智能张拉、压浆静态开发；甘特图优化；质量大屏对接，临边防护对接、有毒气体对接。
|
2024-01-17 15:59:48 +08:00 |
|
cjp
|
176fd75b95
|
fix: 标养室、用水监测对接。新增宁波项目
|
2024-01-08 10:08:51 +08:00 |
|
cjp
|
8b574c4528
|
fix: 龙门吊接口对接
|
2023-12-28 18:15:42 +08:00 |
|
cjp
|
9679950f06
|
fix： 标准版提交
|
2023-12-08 18:34:22 +08:00 |
|
cjp
|
6dcf01bb62
|
fix: 添加视频萤石云播放，解决部分问题项
|
2023-12-02 11:45:46 +08:00 |
|
cjp
|
26f91e1f7d
|
fix: 抗压抗折一体机、沥青拌合站、水稳拌合站前端页面开发，车辆定位模块开发+对接完成
|
2023-11-24 17:09:02 +08:00 |
|
kun
|
1aaa013028
|
fix: BUG修改
|
2023-11-16 11:27:23 +08:00 |
|
kun
|
1b1aa61b08
|
fix: BUG修改
|
2023-11-16 11:25:21 +08:00 |
|
cjp
|
7d1dfd0bde
|
fix: BUG修改
|
2023-11-14 09:37:21 +08:00 |
|
cjp
|
80b2de671f
|
fix: 进度大屏静态开发以及接口对接、测试完成
|
2023-11-13 10:04:05 +08:00 |
|
cjp
|
f8f39589bb
|
fix: 万能试验机静态；安全管理接口对接；用电管理对接
|
2023-11-04 15:20:50 +08:00 |
|
cjp
|
319fb36792
|
fix: 编写挂篮监测、压力试验机前端设计。
|
2023-10-30 14:36:10 +08:00 |
|
cjp
|
05e35ffcb7
|
fix: 大型机械——架桥机前端静态设计，AI预警类别枚举改为接口获取
|
2023-10-23 17:52:14 +08:00 |
|
cjp
|
7dba8854f2
|
fix: 解决二级标题无法高亮问题，编写标准版和沈阳合盈定制版菜单栏
|
2023-10-23 09:54:37 +08:00 |
|
cjp
|
41bf46ebcc
|
fix: 对接AI预警接口
|
2023-10-21 15:27:13 +08:00 |
|
cjp
|
b74cc54a43
|
fix: 学习强国修改最大值
|
2023-10-20 13:54:21 +08:00 |
|
cjp
|
955d5e1418
|
fix: 工程概况里程碑样式调整
|
2023-10-19 18:06:08 +08:00 |
|
cjp
|
88767a5cd1
|
fix: 智慧党建对接、测试完成。
|
2023-10-19 17:55:31 +08:00 |
|
cjp
|
16cc7eaa1f
|
fix: 修改里程碑BUG
|
2023-10-18 18:19:39 +08:00 |
|
cjp
|
ba533ba31e
|
fix: 微调里程碑样式
|
2023-10-18 18:09:36 +08:00 |
|
cjp
|
18afe5f16a
|
fix: 解决工程概况问题项，解决视频列表播放问题
|
2023-10-18 17:58:53 +08:00 |
|
cjp
|
121a359419
|
fix: 对接工程概况接口
|
2023-10-17 18:13:53 +08:00 |
|
cjp
|
45a0b6ff6f
|
fix: 对接工程概览，项目信息接口
|
2023-10-16 16:14:37 +08:00 |
|
cjp
|
d97289697f
|
fix: 编写龙门吊页面
|
2023-10-13 17:50:08 +08:00 |
|
cjp
|
f0aba8f3cb
|
fix: 编写污水监测页面
|
2023-10-12 18:07:19 +08:00 |
|
cjp
|
f022763926
|
fix: 编写大型机器——卸料平台页面
|
2023-10-09 17:50:29 +08:00 |
|
cjp
|
4ae6066fcf
|
fix: 编写混凝土测温页面，以及点位弹窗。
|
2023-10-08 18:18:31 +08:00 |
|
cjp
|
3b6e3b20f0
|
fix: 编写用水监测、用电监测。
|
2023-09-28 15:27:46 +08:00 |
|
袁晶琳
|
7005014266
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
新增大屏-混凝土拌合站页面
See merge request !23
|
2023-09-28 15:03:03 +08:00 |
|
jxj_yjl
|
65d12512b8
|
新增大屏-混凝土拌合站页面
|
2023-09-28 15:02:13 +08:00 |
|
cjp
|
9c510bb6bc
|
fix: 编写安全教育页面
|
2023-09-27 09:25:07 +08:00 |
|
袁晶琳
|
815840329d
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
隧道定位页面大屏接口对接
See merge request !22
|
2023-09-25 13:35:00 +08:00 |
|
jxj_yjl
|
02aa20f1c4
|
隧道定位页面大屏接口对接
|
2023-09-25 13:33:47 +08:00 |
|
cjp
|
6a25e23f40
|
fix: 编写基坑监测、高支模监测，高边坡监测，烟感监测页面
|
2023-09-23 16:18:27 +08:00 |
|
cjp
|
8ab9a1d352
|
fix: 解决冲突
|
2023-09-20 09:37:06 +08:00 |
|
cjp
|
f27eaafe3d
|
fix: 解决冲突；Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
|
2023-09-20 09:34:05 +08:00 |
|
袁晶琳
|
c32064fa90
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
新建隧道大屏
See merge request !21
|
2023-09-20 09:27:09 +08:00 |
|
jxj_yjl
|
4531212930
|
新建隧道大屏
|
2023-09-20 09:26:38 +08:00 |
|
cjp
|
b59220924c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into dev-cjp
|
2023-09-20 09:25:02 +08:00 |
|
cjp
|
946cc4de29
|
fix: 新建待开发页面路由
|
2023-09-20 09:24:45 +08:00 |
|
袁晶琳
|
9d28f6252c
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
顶部左上角标题图片添加
See merge request !20
|
2023-09-19 18:48:02 +08:00 |
|
jxj_yjl
|
632b912abc
|
顶部左上角标题图片添加
|
2023-09-19 18:47:23 +08:00 |
|
cjp
|
14b7cb5896
|
fix: 编写基坑监测页面
|
2023-09-19 18:40:38 +08:00 |
|
cjp
|
72487bbe04
|
fix: 完成有毒气体监测页面静态，调整优化AI预警，地磅管理，标养室。
|
2023-09-15 17:40:49 +08:00 |
|
cjp
|
6c62ea7cd7
|
fix: 编写临边防护页面
|
2023-09-13 17:09:45 +08:00 |
|
cjp
|
1674d97e51
|
fix: AI预警，地磅管理页面调整，温度计优化。
|
2023-09-13 11:08:38 +08:00 |
|
cjp
|
72ff136b83
|
fix: 调整弹窗，标养室检测页面静态完成
|
2023-09-12 10:14:05 +08:00 |
|
cjp
|
5dc419d39f
|
fix: 完成智慧党建页面及其弹窗（6个）
|
2023-09-09 17:02:19 +08:00 |
|
chenjingpeng
|
7a2deeb334
|
fix: 编写智慧党建页面
|
2023-09-08 18:02:03 +08:00 |
|
袁晶琳
|
e98cb326d1
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏整体页面调整
See merge request !19
|
2023-09-08 16:55:31 +08:00 |
|
jxj_yjl
|
984c2668a3
|
大屏整体页面调整
|
2023-09-08 16:53:53 +08:00 |
|
袁晶琳
|
3f30387882
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
调整大屏顶部标题栏
See merge request !18
|
2023-09-08 10:00:52 +08:00 |
|
jxj_yjl
|
ea7ae93cf9
|
调整大屏顶部标题栏
|
2023-09-08 09:59:15 +08:00 |
|
chenjingpeng
|
fc7bf35111
|
fix: 测试提交
|
2023-09-08 09:19:19 +08:00 |
|
cjp
|
df60bc3976
|
fix: 编写地磅管理页面
|
2023-09-07 18:55:51 +08:00 |
|
袁晶琳
|
b3dedd304c
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
综合管理-工程概况页面布局
See merge request !15
|
2023-09-07 11:28:07 +08:00 |
|
jxj_yjl
|
005f95e8c7
|
综合管理-工程概况页面布局
|
2023-09-07 11:27:21 +08:00 |
|
cjp
|
6d4e4a58fc
|
fix： 编写AI预警页面
|
2023-09-06 17:20:23 +08:00 |
|
cjp
|
28b05cc0a8
|
fix: 同步代码，并解决冲突
|
2023-09-06 14:05:12 +08:00 |
|
袁晶琳
|
03831e7407
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
新建综合管理-工程概况/智慧党建页面
See merge request !14
|
2023-09-06 11:29:09 +08:00 |
|
jxj_yjl
|
72bd743d95
|
新建综合管理-工程概况/智慧党建页面
|
2023-09-06 11:28:22 +08:00 |
|
袁晶琳
|
6475a1b85b
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
安全管理页面样式布局提交
See merge request !13
|
2023-09-06 10:36:00 +08:00 |
|
jxj_yjl
|
a456a7b0b0
|
安全管理页面样式布局提交
|
2023-09-06 10:34:27 +08:00 |
|
袁晶琳
|
247a8f86a0
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
统一标题调整
See merge request !12
|
2023-09-05 14:56:24 +08:00 |
|
jxj_yjl
|
8705ff6022
|
统一标题调整
|
2023-09-05 14:55:58 +08:00 |
|
袁晶琳
|
cebadc084e
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
标题封装
See merge request !11
|
2023-09-05 14:40:07 +08:00 |
|
jxj_yjl
|
cee35ab6d3
|
标题
|
2023-09-05 14:38:58 +08:00 |
|
jxj_yjl
|
0064f8362e
|
大屏标题组件封装
|
2023-09-05 14:35:22 +08:00 |
|
袁晶琳
|
0025e26c27
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
大屏可视化页面自动适配调整
See merge request !10
|
2023-09-05 10:37:34 +08:00 |
|
jxj_yjl
|
665b6a49f1
|
大屏可视化页面自动适配调整
|
2023-09-05 10:36:23 +08:00 |
|
袁晶琳
|
7d699ddae5
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
七参数页面调整提交
See merge request !8
|
2023-09-04 14:44:55 +08:00 |
|
jxj_yjl
|
b244ea805e
|
七参数页面调整提交
|
2023-09-04 14:43:33 +08:00 |
|
袁晶琳
|
492a99ba1c
|
Merge branch 'yjl_dev' into 'shenzhen-dev'
扬尘噪声页面：晴雨表图片显示修复，大屏其他页面调整
See merge request !6
|
2023-08-10 15:27:52 +08:00 |
|
jxj_yjl
|
31f1fe1ecf
|
扬尘噪声页面：晴雨表图片显示修复，大屏其他页面调整
|
2023-08-10 15:26:14 +08:00 |
|
