|
|
dd6ff1d2be
|
feat(@zhst/map): 添加popup功能
|
2024-05-24 18:03:43 +08:00 |
|
|
|
23706fabf9
|
feat(@zhst/map): 添加marker功能
|
2024-05-23 18:14:32 +08:00 |
|
|
|
2e753a7259
|
feat(map): 工具箱完成
|
2024-05-21 19:07:15 +08:00 |
|
|
|
e3e3c05ae0
|
feat(map地图): 初始化地图配置,引入相关js文件作为参考
|
2024-05-21 10:42:01 +08:00 |
|
江志雄
|
1f6c7ccb18
|
Merge branch 'develop' into 'master'
fix(reqeust,func): zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法
See merge request web-project/zhst-lambo!29
|
2024-05-17 11:50:49 +08:00 |
|
|
|
b2dbace653
|
fix(reqeust,func): zhst/request 修改重新登录问题,zhst/func 添加指定路由跳转方法
|
2024-05-17 11:49:47 +08:00 |
|
江志雄
|
3b9d13d9b9
|
Merge branch 'develop' into 'master'
fix(zhst/meta、zhst/biz、zhst/material): 修改图片标注组件
See merge request web-project/zhst-lambo!28
|
2024-05-17 09:57:09 +08:00 |
|
|
|
8215fa5e4f
|
Merge branch 'master' into develop
|
2024-05-17 09:17:40 +08:00 |
|
戴炜
|
f09b77e689
|
只有master分支触发打包
|
2024-05-17 09:16:01 +08:00 |
|
|
|
a65d6e062d
|
fix conflict
|
2024-05-16 18:13:40 +08:00 |
|
|
|
fe321d1c3b
|
fix conflict
|
2024-05-16 18:12:04 +08:00 |
|
|
|
b3a18efa8f
|
fix conflict
|
2024-05-16 18:04:34 +08:00 |
|
|
|
8dc81e1743
|
fix(zhst/meta、zhst/biz、zhst/material): 修改图片标注组件
|
2024-05-16 18:02:10 +08:00 |
|
戴炜
|
6b7dc33bce
|
打包使用带git的镜像
|
2024-05-16 14:50:10 +08:00 |
|
|
|
5fe34f8b87
|
fix: 添加首页
|
2024-05-15 11:18:44 +08:00 |
|
|
|
f766136844
|
fix: 删除md中的ts语法
|
2024-05-15 09:38:31 +08:00 |
|
|
|
2310cac125
|
Merge branch 'develop'
# Conflicts:
# deploy/build.sh
|
2024-05-15 09:18:11 +08:00 |
|
戴炜
|
eb72f16e3a
|
gitlab-ci修改
|
2024-05-14 17:52:05 +08:00 |
|
江志雄
|
1f6d3cd5d7
|
Update build.sh
|
2024-05-14 17:12:18 +08:00 |
|
|
|
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 |
|
江志雄
|
511471e5c5
|
Update .npmrc
|
2024-05-14 11:36:25 +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 |
|
