黄星淮
|
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 |
|
hejunjie
|
7ada743f9b
|
fix: 修改自测bug
|
9 months ago |
|
黄星淮
|
dae6901bad
|
Merge branch 'feature-0712' into 'dev'
Feature 0712
See merge request project/water/shuili-vue!144
|
9 months ago |
|
hejunjie
|
4f90138c17
|
feat: 合并线上代码
|
9 months ago |
|
hejunjie
|
9497105476
|
feat: 完成维修养护模块
|
9 months ago |
caoqi
|
8b1307e7d2
|
feat: 不改变内网服务器配置
|
9 months ago |
|
caoqi
|
2fe83c3519
|
feat:~
|
9 months ago |
|
caoqi
|
9418da9631
|
feat: 更新sdk到2.1.1，支持超图服务token
|
9 months ago |
|
黄星淮
|
1fe421aa56
|
Merge branch 'fix-ditu' into 'master'
fix: 调整配置图层名称长度
See merge request project/water/shuili-vue!143
|
9 months ago |
|
hxh
|
ce935715c5
|
fix: 调整配置图层名称长度
|
9 months ago |
|
caoqi
|
190fac48b3
|
feat: 配置图层限制提示语修改
|
9 months ago |
|
caoqi
|
ed3a527c3d
|
feat: 将图层名称最大长度改为不超过100个字符
|
9 months ago |
|
黄星淮
|
027b5d13b7
|
Merge branch 'release-sy-v1.0.0' into 'dev'
Release sy v1.0.0
See merge request project/water/shuili-vue!142
|
9 months ago |
|
hxh
|
9596b4dcb6
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
7992a8ba40
|
feat: 修改登陆逻辑
|
9 months ago |
panyuyi
|
88ba686472
|
fix: 修改样式问题
|
9 months ago |
|
hxh
|
e18c2a2524
|
Merge branch 'fix-ditu'
|
9 months ago |
|
panyuyi
|
cf72a270c6
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
9 months ago |
|
panyuyi
|
bb56a80f83
|
feat: 维修养护模块
|
9 months ago |
 zth
|
ee3cce9c7a
|
Merge remote-tracking branch 'origin/master'
|
9 months ago |
|
zth
|
f88952c711
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
|
9 months ago |
|
caoqi
|
51000e5ca9
|
fix: 超图地图服务字段查询
|
9 months ago |
|
caoqi
|
7552abe8f5
|
Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0
|
9 months ago |
|
caoqi
|
770ca64919
|
feat: 修改图层名称正则
|
9 months ago |
|
panyuyi
|
40713aa8d4
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
10 months ago |
|
panyuyi
|
cc7464c2f0
|
fix:维修养护模块
|
10 months ago |
|
caoqi
|
1238ff6ed7
|
feat: 图层配置添加token
|
10 months ago |
|
caoqi
|
2c3b69a16b
|
feat: 增加删除场景接口
|
10 months ago |
|
panyuyi
|
b99ef6f2c4
|
fix: 修复bug
|
10 months ago |
|
panyuyi
|
33a777042b
|
fix: 修改轨迹问题
|
10 months ago |
|
潘裕艺
|
70516b8349
|
Merge branch 'release-sy-v1.0.0' into 'dev'
Release sy v1.0.0
See merge request project/water/shuili-vue!141
|
10 months ago |
|
panyuyi
|
77a89daf4a
|
fix: 修复bug
|
10 months ago |
