Commit Graph

182 Commits

Author SHA1 Message Date
f9fd6389c4 fix: zhst/biz 优化实时监控布局 2024-05-11 10:08:38 +08:00
江志雄
9f49dfe9b4 Merge branch 'hongbo/file-cabinet' into 'develop'
fix: fix: 优化实时监控布局

See merge request web-project/zhst-lambo!26
2024-05-11 09:59:52 +08:00
苑宏博
93bc21a29a fix: 优化实时监控布局 2024-05-11 09:46:33 +08:00
苑宏博
faf0a5682e fix: 预警记录渲染卡顿 2024-05-10 17:42:07 +08:00
5f2873c152 fix: zhst/slave 修改logOut方法 2024-05-10 13:58:55 +08:00
3f92df816c fix(zhst/biz): 实时监控预警记录添加滚动条 2024-05-10 13:54:36 +08:00
江志雄
0144f5cc33 Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 实时监控 预警记录添加滚动条

See merge request web-project/zhst-lambo!25
2024-05-10 13:49:31 +08:00
苑宏博
a4ff47ea1a fix: 预警记录 图片移出 2024-05-10 11:59:04 +08:00
苑宏博
68e7ac2642 fix: 引包路径 2024-05-10 11:48:46 +08:00
苑宏博
8486837339 fix: 预警记录 查看大图 pxtorem 2024-05-10 11:42:49 +08:00
苑宏博
9ed531d9da fix: 删除无用引入 2024-05-10 11:13:19 +08:00
苑宏博
ac9e098c0c Merge remote-tracking branch 'remotes/origin/develop' into hongbo/file-cabinet 2024-05-10 11:09:20 +08:00
苑宏博
15a46122e8 fix: 实时监控 预警记录添加滚动条 2024-05-10 11:07:58 +08:00
1e1ac401e5 feat(all): 拆除内联样式、request优化 2024-05-10 10:17:47 +08:00
a47aa0c431 feat(zhst/func): 添加pxtoRem方法 2024-05-09 11:56:51 +08:00
9d4eab8c9e merge 2024-05-06 10:15:27 +08:00
207e734e73 feat(zhst/biz): 优化树选择 2024-05-06 10:14:26 +08:00
江志雄
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