苑宏博
|
aa36147bf5
|
Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet
|
2024-04-23 19:18:55 +08:00 |
|
|
|
26ba0f7922
|
feat(biz,meta,material): biz：新增 od 弹框、预警图片 od；meta：新增人脸碰撞模型组件、扫描组件、termial 组件；material：新增中心连接物料
|
2024-04-23 18:10:13 +08:00 |
|
苑宏博
|
8d1d7bfa1c
|
fix: 视频播放添加 图片od
|
2024-04-23 18:10:03 +08:00 |
|
苑宏博
|
b14cb22285
|
fix: 解决冲突
|
2024-04-23 17:24:02 +08:00 |
|
江志雄
|
91315d4a9f
|
Merge branch 'hongbo/file-cabinet' into 'develop'
feat: 预警记录 图片od
See merge request web-project/zhst-lambo!19
|
2024-04-23 17:20:17 +08:00 |
|
苑宏博
|
8b5bbea837
|
fix: 解决冲突
|
2024-04-23 17:10:43 +08:00 |
|
江志雄
|
c4fe25f89b
|
Merge branch 'develop-cy' into 'develop'
【中心对接】 优化ws实现代码(从ahokks引入改为使用原生代码)；ts校验不通过,暂时用ts-nocheck；
See merge request web-project/zhst-lambo!18
|
2024-04-23 16:15:07 +08:00 |
|
江志雄
|
641ae6e7e1
|
Merge branch 'hb/big-image' into 'develop'
feat: 添加 按钮列表 ButtonList
See merge request web-project/zhst-lambo!16
|
2024-04-23 16:13:16 +08:00 |
|
苑宏博
|
8b99b57dfa
|
fix: 预警记录大图添加od
|
2024-04-23 16:06:50 +08:00 |
|
苑宏博
|
9c96671e4e
|
fix: 预警记录添加od
|
2024-04-23 15:15:41 +08:00 |
|
苑宏博
|
b2e5941eb9
|
fix: 修改组件名过长
|
2024-04-22 15:52:38 +08:00 |
|
chaiying
|
868ede50eb
|
fix: ts校验不通过,暂时用ts-nocheck
|
2024-04-22 15:44:52 +08:00 |
|
苑宏博
|
efee26019a
|
fix: 修改组件名
|
2024-04-22 15:25:15 +08:00 |
|
苑宏博
|
63ba67b779
|
fix: 移出lodash
|
2024-04-22 14:11:42 +08:00 |
|
苑宏博
|
240fd2730f
|
Merge remote-tracking branch 'remotes/origin/develop' into hb/big-image
|
2024-04-22 12:14:46 +08:00 |
|
苑宏博
|
e4a73f5ec1
|
fix: 优化按钮排序传参
|
2024-04-22 12:12:17 +08:00 |
|
苑宏博
|
f6c2290738
|
fix: 更新 lodash 引用
|
2024-04-22 11:12:08 +08:00 |
|
chaiying
|
ecd528c71a
|
🐞 fix: 添加ignore
|
2024-04-22 11:07:35 +08:00 |
|
chaiying
|
fc681c510c
|
🦄 refactor: 优化ws实现代码(从ahokks引入改为使用原生代码)；
|
2024-04-22 10:57:45 +08:00 |
|
YuanHongbo
|
90b1d8df18
|
fix: 解决冲突
|
2024-04-21 18:57:43 +08:00 |
|
YuanHongbo
|
89fbf3e416
|
fix: 解决冲突
|
2024-04-21 18:50:19 +08:00 |
|
YuanHongbo
|
718d348d91
|
fix: 测试视频播放
|
2024-04-21 18:43:20 +08:00 |
|
YuanHongbo
|
feb2ef7db1
|
fix: 优化预警记录 od 添加容错 img.onerror
|
2024-04-21 17:07:26 +08:00 |
|
YuanHongbo
|
93f0670ded
|
fix: 优化预警记录 od
|
2024-04-21 15:43:25 +08:00 |
|
YuanHongbo
|
e25180d3ee
|
fix: 预警记录添加 od
|
2024-04-20 16:47:10 +08:00 |
|
YuanHongbo
|
a3aefaf499
|
fix: 完善大图 buttonList
|
2024-04-20 15:36:36 +08:00 |
|
江志雄
|
f2cc70c785
|
Merge branch 'develop-cy' into 'develop'
🦄 refactor: 【CenterLink】完善中心对接模块物料；
See merge request web-project/zhst-lambo!15
|
2024-04-19 17:02:53 +08:00 |
|
chaiying
|
5ff6f9a8f0
|
🦄 refactor: 【CenterLink】完善中心对接模块物料；
|
2024-04-19 16:54:47 +08:00 |
|
江志雄
|
c2516e7141
|
Merge branch 'develop-cy' into 'develop'
✨ feat:更改中心连接模块样式&逻辑；【明天和后端在7环境试一下能不能收到ip和token&拿到的日志文件怎么处理】
See merge request web-project/zhst-lambo!14
|
2024-04-18 19:50:58 +08:00 |
|
chaiying
|
e722bb90a8
|
✨ feat:更改中心连接模块样式&逻辑；【明天和后端在7环境试一下能不能收到ip和token&拿到的日志文件怎么处理】
|
2024-04-18 19:23:59 +08:00 |
|
|
|
03d7b8dcbf
|
Merge branch 'develop' of http://10.0.0.88/web-project/zhst-lambo into develop
|
2024-04-18 14:56:54 +08:00 |
|
|
|
c1c90fc76f
|
fix(biz,meta): 修改大图组件,boxSelectTree组件
|
2024-04-18 14:54:43 +08:00 |
|
刘汉华
|
334f3a30e5
|
Merge branch 'develop-cy' into 'develop'
✨ feat: 【中心对接】中心对接模块写入物料库
See merge request web-project/zhst-lambo!13
|
2024-04-18 13:34:28 +08:00 |
|
chaiying
|
60f913c5a5
|
✨ feat: 【中心对接】中心对接模块写入物料库
|
2024-04-17 14:22:48 +08:00 |
|
YuanHongbo
|
4230353aea
|
fix: 解决冲突
|
2024-04-17 14:10:54 +08:00 |
|
|
|
baab5ce1a0
|
fix: 修改打包命令
|
2024-04-17 11:13:44 +08:00 |
|
|
|
ed78f749e8
|
fix: 修改打包命令
|
2024-04-17 10:38:31 +08:00 |
|
|
|
6465abf12a
|
fix: 修改打包命令
|
2024-04-17 10:15:10 +08:00 |
|
|
|
388d52eaf7
|
fix: 修改镜像源
|
2024-04-17 09:56:12 +08:00 |
|
|
|
a762756bfc
|
fix: 修改打包命令
|
2024-04-17 09:54:45 +08:00 |
|
|
|
431b43b8f1
|
fix: 修改源
|
2024-04-17 09:47:21 +08:00 |
|
|
|
8866db8058
|
feat(meta,material): 修改物料库算法编辑新增箭头选择,元组件新增图片标记组件
|
2024-04-16 17:37:36 +08:00 |
|
|
|
d6fab922a9
|
Merge branch 'develop' of http://10.0.0.88/web-project/zhst-lambo into develop
|
2024-04-16 11:53:32 +08:00 |
|
刘汉华
|
8df51b18e9
|
Merge branch 'develop-cy' into 'develop'
✨ feat: 【批量/单个算法配置组件】AlgorithmConfig根据type类型展示不同的title【盒子列表、点位列表】；【穿梭框组件】Transfer组件样式修改；
See merge request web-project/zhst-lambo!12
|
2024-04-10 16:30:03 +08:00 |
|
chaiying
|
28771b0bd2
|
✨ feat: 【Transfer组件】已选择的范围样式修改：添加滚动以及超出页面部分做隐藏
|
2024-04-10 16:24:12 +08:00 |
|
chaiying
|
8366383350
|
✨ feat:【algorithmConfig组件】更改AlgorithmConfigProps，增加title字段，algorithmTableDataSource的类型字段新增模板Id、算法启用状态、算法id、算法名称、算法配置等字段；
|
2024-04-10 15:03:53 +08:00 |
|
chaiying
|
794d9cb805
|
✨ feat: 【批量/单个算法配置组件】AlgorithmConfig根据type类型展示不同的title【盒子列表、点位列表】
|
2024-04-10 14:26:48 +08:00 |
|
YuanHongbo
|
911ae99e27
|
fix: 修改变量名字
|
2024-04-09 19:48:19 +08:00 |
|
YuanHongbo
|
37794c50f3
|
Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet
|
2024-04-09 19:44:56 +08:00 |
|
|
|
ddc9ea1cb5
|
feat: 优化图片预览组件
|
2024-04-08 16:45:03 +08:00 |
|
