|
|
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 |
|
|
|
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 |
|
苑宏博
|
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 |
|
chaiying
|
efc2fdad9b
|
📃 docs:【批量/单个算法配置】TimeTemplateTable模块暂时注释掉算力占用和配置路由栏目；
|
2024-04-30 15:29:05 +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 |
|
|
|
681a2009b3
|
feat(zhst/biz): biz: 视频播放首图添加od框
|
2024-04-24 12:19:13 +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 |
|
苑宏博
|
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 |
|
苑宏博
|
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 |
|
chaiying
|
5ff6f9a8f0
|
🦄 refactor: 【CenterLink】完善中心对接模块物料；
|
2024-04-19 16:54:47 +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 |
|
chaiying
|
60f913c5a5
|
✨ feat: 【中心对接】中心对接模块写入物料库
|
2024-04-17 14:22:48 +08:00 |
|
YuanHongbo
|
4230353aea
|
fix: 解决冲突
|
2024-04-17 14:10:54 +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 |
|
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 |
|
|
|
8b2902f7fa
|
feat: 优化图片预览组件
|
2024-04-08 16:40:58 +08:00 |
|
|
|
39a11cbed3
|
fix: 添加依赖包
|
2024-04-08 09:55:31 +08:00 |
|
|
|
c47d4ff80b
|
fix: 修改schema透出
|
2024-04-07 16:36:14 +08:00 |
|
|
|
35497d39ad
|
feat(升级包): request、slave
|
2024-04-07 11:52:34 +08:00 |
|
|
|
b433d5f182
|
fix: 修改打包文件
|
2024-03-27 11:39:19 +08:00 |
|
|
|
c4088792e8
|
fix: 优化 slave 跳转方法
|
2024-03-27 11:38:12 +08:00 |
|
江志雄
|
8eb6ad5fd7
|
Merge branch 'develop-lf' into 'develop'
fix: mapbox添加react导入
See merge request web-project/zhst-lambo!11
|
2024-03-27 10:56:01 +08:00 |
|
|
|
18d44be102
|
fix: 修改打包依赖
|
2024-03-27 10:24:53 +08:00 |
|
lifan
|
619cbffa1c
|
fix: mapbox添加react导入
|
2024-03-27 09:08:17 +08:00 |
|
|
|
4bbfce77c0
|
Merge branch 'feat/update_slave-20240324' into develop
|
2024-03-26 18:04:53 +08:00 |
|
|
|
ea867cd1ac
|
fix(biz): 添加 traansfer 组件 searchProps 透传
|
2024-03-26 18:04:26 +08:00 |
|
lifan
|
0a7a210322
|
fix: 合并代码
|
2024-03-25 17:27:24 +08:00 |
|
lifan
|
95bd78f3b1
|
Merge branch 'develop-lf' of http://gitlab.zhst-dev.com/web-project/zhst-lambo into develop-lf
|
2024-03-25 17:23:02 +08:00 |
|
lifan
|
0d2a8a232d
|
feat: 完善地图例子，抛出mapConfig定制化参数传入，完善API说明
|
2024-03-25 17:22:36 +08:00 |
|
lifan
|
6f65746373
|
feat: 完善地图组件
|
2024-03-25 17:13:42 +08:00 |
|
|
|
843df14b69
|
fix: 忽略所有上传
|
2024-03-24 13:53:42 +08:00 |
|
李帆
|
d370fed819
|
Merge branch 'develop' into 'develop-lf'
# Conflicts:
# packages/map/es/index.d.ts
# packages/map/es/index.js
# packages/map/lib/index.js
|
2024-03-22 17:56:14 +08:00 |
|
lifan
|
b2df3e3a7c
|
feat: map包v1
|
2024-03-22 17:39:53 +08:00 |
|
lifan
|
caf7869f15
|
feat: 优化iconfont组件库用户体验
|
2024-03-22 17:19:37 +08:00 |
|
|
|
f9ce7156b4
|
Merge branch 'develop' into jzx/add_slave_docs-20240322
|
2024-03-22 17:13:20 +08:00 |
|
|
|
51b793019d
|
fix: 修改物料登录组件
|
2024-03-22 17:12:38 +08:00 |
|
|
|
c0ede44b4d
|
fix: 新生成的lib、es包缓存
|
2024-03-22 13:43:40 +08:00 |
|
江志雄
|
eddd4c7afb
|
Merge branch 'develop-lf' into 'develop'
feat: 顺利打包并上传es与lib
See merge request web-project/zhst-lambo!8
|
2024-03-22 12:00:23 +08:00 |
|
