Commit Graph

107 Commits

Author SHA1 Message Date
28822b45d8 fix(tsconfig): 修改ts提示 2024-06-12 13:47:28 +08:00
012aaacb66 fix(tsconfig): 修改ts提示 2024-06-12 12:04:23 +08:00
ec3938a2cf fix(tsconfig): 修改ts提示 2024-06-12 11:35:34 +08:00
ce6a719bc2 feat(zhst/biz): 添加大图组件v2 2024-06-11 20:25:25 +08:00
ed4918c6a2 feat(zhst/biz): 修复一些ts报错 2024-06-06 13:37:45 +08:00
27958367ff feat(zhst/biz): 修复一些ts报错 2024-06-06 12:00:12 +08:00
03433e3108 feat(zhst/biz): 新增树面板2.0 2024-06-06 11:31:37 +08:00
5f15108949 feat(zhst/biz): 新增树面板2.0 2024-06-05 18:14:15 +08:00
3af900f998 Merge branch 'develop' into feat/selectTreev2 2024-06-05 11:32:21 +08:00
357a4c677a feat(zhst/meta): 全量迁移antd5.17.4 2024-06-05 11:17:48 +08:00
a129d39168 feat(zhst/biz): treePanel添加 2024-06-04 16:01:30 +08:00
15536f32c8 fix(ts): 添加ts配置 2024-06-03 16:36:59 +08:00
46e6d0b4d0 feat(zhst/biz,zhst/meta): 穿梭框完成,新增meta组件 2024-05-31 16:22:09 +08:00
c65756bbb2 feat(zhst/map,zhst/biz): map完善文档,biz修改boxSelectTree的文档格式 2024-05-30 10:34:04 +08:00
da3c1714c5 feat(@zhst/biz): 树组件支持tag面板、优化filter传参、优化option传参、废弃之前的定制化方案 2024-05-23 15:14:17 +08:00
570f183382 feat(biz无限滚动组件): 添加屏幕自适应撑开 2024-05-21 10:37:47 +08:00
2310cac125 Merge branch 'develop'
# Conflicts:
#	deploy/build.sh
2024-05-15 09:18:11 +08:00
59f0924c66 fix(all): zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree 2024-05-14 11:24:21 +08:00
江志雄
72db5f1273 Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 边框颜色主题色,实时监控窗口有图片和选中,预警记录文字溢出

See merge request web-project/zhst-lambo!27
2024-05-13 10:27:13 +08:00
苑宏博
64d38943f7 fix: 代码优化 2024-05-13 09:57:44 +08:00
苑宏博
6eb14f8eef fix: 边框颜色主题色,实时监控窗口有图片和选中,预警记录文字溢出 2024-05-11 11:56:24 +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
苑宏博
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
207e734e73 feat(zhst/biz): 优化树选择 2024-05-06 10:14:26 +08:00
aea6e2ec4c feat(zhst/biz): 新增无限滚动列表组件 2024-04-28 19:44:36 +08:00
苑宏博
7b09934be8 fix: 视频显示od框,修复预警记录无法查看大图 2024-04-28 11:23:26 +08:00
c9abef2676 fix(meta\biz): 视频添加od, 查看大图点击失效修复 2024-04-26 19:34:28 +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
苑宏博
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
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