Commit Graph

121 Commits

Author SHA1 Message Date
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
江志雄
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
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
刘汉华
334f3a30e5 Merge branch 'develop-cy' into 'develop'
 feat: 【中心对接】中心对接模块写入物料库

See merge request web-project/zhst-lambo!13
2024-04-18 13:34:28 +08:00
chaiying
60f913c5a5 feat: 【中心对接】中心对接模块写入物料库 2024-04-17 14:22:48 +08:00
baab5ce1a0 fix: 修改打包命令 2024-04-17 11:13:44 +08:00
ed78f749e8 fix: 修改打包命令 2024-04-17 10:38:31 +08:00
6465abf12a fix: 修改打包命令 2024-04-17 10:15:10 +08:00
388d52eaf7 fix: 修改镜像源 2024-04-17 09:56:12 +08:00
a762756bfc fix: 修改打包命令 2024-04-17 09:54:45 +08:00
431b43b8f1 fix: 修改源 2024-04-17 09:47:21 +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
刘汉华
8df51b18e9 Merge branch 'develop-cy' into 'develop'
 feat: 【批量/单个算法配置组件】AlgorithmConfig根据type类型展示不同的title【盒子列表、点位列表】;【穿梭框组件】Transfer组件样式修改;

See merge request web-project/zhst-lambo!12
2024-04-10 16:30:03 +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
0ea53caade fix: 删除lock文件 2024-04-07 16:39:09 +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
江志雄
e59b290559 Merge branch 'develop-lf' into 'develop'
完善地图组件与示例,抛出mapConfig定制化参数传入,完善API说明

See merge request web-project/zhst-lambo!10
2024-03-26 17:51:00 +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