|
|
37c34eb785
|
Merge branch 'develop' into feat/cropper-upgrade
# Conflicts:
# packages/meta/src/cropperImage/CropperImage.tsx
# packages/meta/src/cropperImage/demo/basic.tsx
|
2024-05-14 14:01:51 +08:00 |
|
|
|
d80cab2407
|
Merge branch 'develop' into feat/cropper-upgrade
# Conflicts:
# packages/meta/src/cropperImage/CropperImage.tsx
# packages/meta/src/cropperImage/demo/basic.tsx
|
2024-05-14 11:27:13 +08:00 |
|
|
|
59f0924c66
|
fix(all): zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree
|
2024-05-14 11:24:21 +08:00 |
|
|
|
0f0644495a
|
fix(zhst/meta): 修改圈选重新渲染,透出重新绘制方法
|
2024-05-13 19:36:45 +08:00 |
|
|
|
457fa88dcc
|
Merge branch 'develop' into feat/cropper-upgrade
|
2024-05-13 10:51:47 +08:00 |
|
|
|
3083ef7865
|
fix(deploy.build): 修改打包命令
|
2024-05-13 10:37:12 +08:00 |
|
|
|
5f806dadba
|
fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出
|
2024-05-13 10:33:49 +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 |
|
|
|
066cd46614
|
feat(zhst/meta-cropperImage): 修改框
|
2024-05-11 18:22:01 +08:00 |
|
|
|
b4d001475a
|
fix: 修改 cropperImage 渲染问题
|
2024-05-11 18:18:35 +08:00 |
|
|
|
defd87dfc7
|
fix(zhst/meta-cropperImage): cropperImage 透出矩形坐标
|
2024-05-11 17:17:36 +08:00 |
|
苑宏博
|
6eb14f8eef
|
fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出
|
2024-05-11 11:56:24 +08:00 |
|
|
|
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 |
|
