Commit Graph

215 Commits

Author SHA1 Message Date
江志雄
7f0fe45ca9 Merge branch 'develop-cy' into 'develop'
📃 docs:【批量/单个算法配置】TimeTemplateTable模块暂时注释掉算力占用和配置路由栏目;

See merge request web-project/zhst-lambo!24
2024-05-06 09:12:27 +08:00
chaiying
efc2fdad9b 📃 docs:【批量/单个算法配置】TimeTemplateTable模块暂时注释掉算力占用和配置路由栏目; 2024-04-30 15:29:05 +08:00
aea6e2ec4c feat(zhst/biz): 新增无限滚动列表组件 2024-04-28 19:44:36 +08:00
江志雄
57af643093 Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 视频显示od框,修复预警记录无法查看大图

See merge request web-project/zhst-lambo!23
2024-04-28 14:17:31 +08:00
苑宏博
7b09934be8 fix: 视频显示od框,修复预警记录无法查看大图 2024-04-28 11:23:26 +08:00
苑宏博
38fb02e322 Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet 2024-04-28 10:19:28 +08:00
c9abef2676 fix(meta\biz): 视频添加od, 查看大图点击失效修复 2024-04-26 19:34:28 +08:00
苑宏博
b6b61b6c54 fix: 删除无用引入 2024-04-25 19:26:26 +08:00
江志雄
1f3286e67d Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 在业务层控制窗口切换状态

See merge request web-project/zhst-lambo!22
2024-04-25 19:22:32 +08:00
苑宏博
b915d80dea fix: 优化属性名 2024-04-25 17:39:07 +08:00
67e59fffe8 fix(zhst/meta,zhst/biz): zhst/meta 大图圈选组件点击选不上 bug 修复,attach 遮挡底部框事件阻止修复 2024-04-25 17:28:24 +08:00
苑宏博
1f16e68272 Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet 2024-04-25 15:31:24 +08:00
苑宏博
786f1b280a fix: 在业务层控制窗口切换状态 2024-04-25 15:30:49 +08:00
da80151c37 fix(zhst/biz): 修复穿梭框溢出 2024-04-24 15:36:50 +08:00
681a2009b3 feat(zhst/biz): biz: 视频播放首图添加od框 2024-04-24 12:19:13 +08:00
刘汉华
a087d53d3f Merge branch 'hongbo/file-cabinet' into 'develop'
视频播放首图添加od框

See merge request web-project/zhst-lambo!21
2024-04-24 10:41:02 +08:00
苑宏博
ee93e674b0 fix: 解决冲突 2024-04-24 09:26:29 +08:00
苑宏博
65dfa30de1 fix: 删除debugger 2024-04-23 19:37:20 +08:00
苑宏博
2ed69cc1f2 fix: 优化代码变量名 2024-04-23 19:36:24 +08:00
苑宏博
94ca0181ec fix: 视频播放添加 图片od 优化代码 2024-04-23 19:34:10 +08:00
苑宏博
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