panyuyi
|
255f0b1b7d
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
1 month ago |
panyuyi
|
00bb28c1d4
|
fix: 注释不要代码和修复水闸指标参数
|
1 month ago |
hejunjie
|
75eb213368
|
fix: 修改水闸概况统计接口
|
1 month ago |
hejunjie
|
b104939555
|
Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0
|
1 month ago |
hejunjie
|
2a1161b2ff
|
feat: 完成图例和视频样式
|
1 month ago |
panyuyi
|
66b506fadd
|
fix: 对得差不多了
|
1 month ago |
panyuyi
|
abf527c47c
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
1 month ago |
panyuyi
|
68030339d7
|
feat: 水库水闸堤防运行相关
|
1 month ago |
hxh
|
bd2de65b02
|
feat: 补充参数
|
1 month ago |
hejunjie
|
537f0f5e1b
|
feat: 合并线上代码
|
1 month ago |
hejunjie
|
c3e6ffee96
|
概况统计完成
|
1 month ago |
panyuyi
|
8e0da012be
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
1 month ago |
panyuyi
|
35a030255f
|
fix: 提交代码
|
1 month ago |
caoqi
|
e188a44eb5
|
feat: s3m图层加载定位兼容处理
|
2 months ago |
panyuyi
|
e377467882
|
fix: 修改参数
|
2 months ago |
panyuyi
|
31c50c1949
|
fix: 修改bug
|
2 months ago |
panyuyi
|
aba5c9af7a
|
fix: 修复bug
|
2 months ago |
panyuyi
|
d46b1bc4c4
|
fix: 修复Bug
|
2 months ago |
panyuyi
|
e8b0ec118d
|
fix: 修复Bug
|
2 months ago |
panyuyi
|
18907ee1ed
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
2 months ago |
panyuyi
|
98da322e80
|
fix: 添加081100参数处理逻辑
|
2 months ago |
caoqi
|
4b20b047f9
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
2 months ago |
caoqi
|
f152e6e9f4
|
fix: 修复变量未定义问题
|
2 months ago |
panyuyi
|
ed98a258a9
|
Merge branch 'master' into release-sy-v1.0.0
|
2 months ago |
panyuyi
|
7b330f12b0
|
fix: 恢复0.0005
|
2 months ago |
panyuyi
|
93e36c8902
|
Revert "feat: 处理拼接查询url"
This reverts commit 3f39e703d3 .
|
2 months ago |
panyuyi
|
1c0f8d3fa7
|
Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0
|
2 months ago |
panyuyi
|
63a9996f45
|
fix: 修改地图bufferDistance值
|
2 months ago |
zth
|
8e17527fe1
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
|
2 months ago |
zth
|
b48623a808
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
|
2 months ago |
caoqi
|
3f39e703d3
|
feat: 处理拼接查询url
|
2 months ago |
caoqi
|
a06aaa84e5
|
fix: 修改js逻辑
|
2 months ago |
caoqi
|
2eb5346690
|
feat: 去掉对LayerName的正则表达的校验
|
2 months ago |
caoqi
|
1351830b1a
|
feat: 修改placeHolder位置
|
2 months ago |
caoqi
|
587c4be2f5
|
feat: 修改检测服务名称的正则表达式
|
2 months ago |
caoqi
|
844c8c0e81
|
feat: ~
|
2 months ago |
caoqi
|
0222749d20
|
feat: 超图数据服务和地图服务不兼容时特殊处理
|
2 months ago |
zth
|
010e46d040
|
bug修改
|
2 months ago |
zth
|
795264c24b
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
# Conflicts:
# .env.production
# src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue
|
2 months ago |
zth
|
e7f35702bc
|
字段修改
|
2 months ago |
hxh
|
4fdbc02988
|
fix: 显示问题修复
|
2 months ago |
zth
|
11fc263932
|
字段修改
|
2 months ago |
hxh
|
a981e15a11
|
Merge branch 'master' into release-sy-v1.0.0
|
2 months ago |
hxh
|
7eb33e97c7
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili-vue
|
2 months ago |
panyuyi
|
01a33d86f4
|
fix: 修改水库树形展示名称
|
2 months ago |
zth
|
f9af337a82
|
Merge remote-tracking branch 'origin/master'
|
2 months ago |
zth
|
9a646ec1f9
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
# Conflicts:
# .env.production
# src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
# src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
# src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
# src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
# src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
# src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue
# src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
# src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
# src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue
# src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue
# src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
|
2 months ago |
zth
|
75bf3da987
|
bug修改
|
2 months ago |
panyuyi
|
240528970c
|
fix: 修复图片路径问题4
|
2 months ago |
panyuyi
|
ca5f882983
|
fix: 修复图片路径问题3
|
2 months ago |