黄星淮
|
dea522f11e
|
Merge branch 'release-sy-v1.0.0' into 'dev'
fix: 修复巡查周期数值错误
See merge request project/water/shuili-vue!164
|
4 months ago |
|
hxh
|
9af00188b7
|
fix: 修复巡查周期数值错误
|
4 months ago |
|
黄星淮
|
d7a43d73b5
|
fix：修改ng配置
|
4 months ago |
潘裕艺
|
cb78c14f22
|
Merge branch 'release-sy-v1.0.0-dev-merge' into 'dev'
Release sy v1.0.0 dev merge
See merge request project/water/shuili-vue!163
|
5 months ago |
|
panyuyi
|
b6fe6f5818
|
Merge branch 'release-sy-v1.0.0' into release-sy-v1.0.0-dev-merge
|
5 months ago |
|
panyuyi
|
f6cc3bd2b2
|
Merge branch 'dev' into release-sy-v1.0.0-dev-merge
|
5 months ago |
|
hxh
|
efc3d74103
|
Merge branch 'master' into release-sy-v1.0.0
|
6 months ago |
|
hxh
|
c0364d2434
|
fix: 修复文件上传
|
6 months ago |
|
panyuyi
|
a62ad1f026
|
feat: 添加新svg图标
|
6 months ago |
|
panyuyi
|
f3eb6bb3e1
|
fix: 修改样式问题
|
6 months ago |
|
panyuyi
|
45b9881155
|
fix: 修复bug
|
6 months ago |
|
panyuyi
|
95e68e7465
|
fix: 修改样式问题
|
6 months ago |
|
panyuyi
|
10c2dc21fc
|
fix: 修改/deep/为::v-deep
|
6 months ago |
|
潘裕艺
|
6cfd86a5d6
|
Merge branch 'release-sy-v1.0.0-reservoir' into 'release-sy-v1.0.0'
Release sy v1.0.0 reservoir
See merge request project/water/shuili-vue!161
|
6 months ago |
|
panyuyi
|
811c23a44e
|
fix: 修改地图交互
|
6 months ago |
|
panyuyi
|
f50451fcb8
|
feat: 水库第一版需求
|
6 months ago |
|
黄星淮
|
082fc51b31
|
Merge branch 'release-sy-v1.0.0' into 'master'
fix: 修复动物防治提醒时间选择错误问题
See merge request project/water/shuili-vue!159
|
7 months ago |
|
黄星淮
|
61314367ad
|
Merge branch 'release-sy-v1.0.0' into 'dev'
fix: 修复动物防治提醒时间选择错误问题
See merge request project/water/shuili-vue!158
|
7 months ago |
|
panyuyi
|
886d60f8fe
|
fix: 修复动物防治提醒时间选择错误问题
|
7 months ago |
|
黄星淮
|
eab7ecb37d
|
Merge branch 'release-sy-v1.0.0' into 'master'
Release sy v1.0.0
See merge request project/water/shuili-vue!157
|
7 months ago |
|
黄星淮
|
fb5fd7a918
|
Merge branch 'release-sy-v1.0.0' into 'dev'
feat: 修改登出逻辑
See merge request project/water/shuili-vue!156
|
7 months ago |
|
hxh
|
2faef49418
|
feat: 修改登出逻辑
|
7 months ago |
|
潘裕艺
|
3f414cd183
|
Merge branch 'release-sy-v1.0.0' into 'dev'
Release sy v1.0.0
See merge request project/water/shuili-vue!155
|
9 months ago |
|
panyuyi
|
87f16e982e
|
fix: 修复引擎sdk绘制问题
|
9 months ago |
chenhaojie
|
23623a7eda
|
fix: 去除无效代码
|
9 months ago |
|
chenhaojie
|
b6b8cebf95
|
fix: 补充绘制
|
9 months ago |
|
chenhaojie
|
da4704e1e3
|
fix: 修改地图的绘制方式
|
9 months ago |
|
hxh
|
06411a4fff
|
Merge remote-tracking branch 'origin/hotfix-sy-v1.0.0-20240715' into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
03a4f7d5c1
|
Merge remote-tracking branch 'origin/feature-0712' into release-sy-v1.0.0
|
9 months ago |
|
黄星淮
|
354ae50a6a
|
Merge branch 'feature-0712' into 'dev'
fix: 堤防工程规模改为堤防级别
See merge request project/water/shuili-vue!154
|
9 months ago |
hejunjie
|
f27b44ae02
|
fix: 堤防工程规模改为堤防级别
|
9 months ago |
|
黄星淮
|
07a09ad1e9
|
Merge branch 'feature-0712' into 'dev'
feat: 修复第二轮bug，计划添加搜索条件
See merge request project/water/shuili-vue!153
|
9 months ago |
|
hejunjie
|
400c116e00
|
feat: 修复第二轮bug，计划添加搜索条件
|
9 months ago |
|
黄星淮
|
94d78555fb
|
Merge branch 'feature-0712' into 'dev'
fix: 修复第二轮提测回归bug
See merge request project/water/shuili-vue!152
|
9 months ago |
|
hejunjie
|
a03e28c7fa
|
fix: 修复第二轮提测回归bug
|
9 months ago |
|
黄星淮
|
a1ac0d49da
|
Merge branch 'feature-0712' into 'dev'
Feature 0712
See merge request project/water/shuili-vue!151
|
9 months ago |
|
hejunjie
|
a52611d3b5
|
feat: 详情添加点击文件预览功能
|
9 months ago |
|
hejunjie
|
8f5d1f0323
|
fix: 修复第二轮提测bug
|
9 months ago |
|
黄星淮
|
8fe677a3e0
|
Merge branch 'revert-2dabb817' into 'dev'
Revert "fix: 行政区划过滤掉第一层数据"
See merge request project/water/shuili-vue!150
|
9 months ago |
|
黄星淮
|
6e0a158c81
|
Revert "fix: 行政区划过滤掉第一层数据"
This reverts commit 2dabb8177d
|
9 months ago |
|
黄星淮
|
d189c8000b
|
Merge branch 'feature-0712' into 'dev'
fix: 修改水闸巡查按钮权限，解决2次提测问题
See merge request project/water/shuili-vue!149
|
9 months ago |
|
hejunjie
|
8f2c2c2f25
|
fix: 修改水闸巡查按钮权限，解决2次提测问题
|
9 months ago |
|
黄星淮
|
a328103dd9
|
Merge branch 'feature-dike-enginerring' into 'dev'
feat: 水闸工程巡查完成
See merge request project/water/shuili-vue!148
|
9 months ago |
|
hejunjie
|
d69d4e4a57
|
feat: 水闸工程巡查完成
|
9 months ago |
|
黄星淮
|
9e1c60c98f
|
Merge branch 'feature-0712' into 'dev'
fix: 行政区划过滤掉第一层数据
See merge request project/water/shuili-vue!147
|
9 months ago |
|
hejunjie
|
2dabb8177d
|
fix: 行政区划过滤掉第一层数据
|
9 months ago |
|
黄星淮
|
3dfc3f3131
|
Merge branch 'feature-0712' into 'dev'
fix: 修改第一轮测试bug
See merge request project/water/shuili-vue!146
|
9 months ago |
|
hejunjie
|
99acd3dadc
|
fix: 修改第一轮测试bug
|
9 months ago |
|
黄星淮
|
795e1b6ca1
|
Merge branch 'feature-0712' into 'dev'
Feature 0712
See merge request project/water/shuili-vue!145
|
9 months ago |
|
hejunjie
|
aa069921ea
|
feat: 添加按钮权限
|
9 months ago |
