Commits · develop · frontend / yqlh-dataEase

05 Dec, 2023 2 commits
- 合并分支 'develop' 到 'master' · 7ab7c56e
```
关于修改

查看合并请求 !40
```
  付振洋 committed Dec 05, 2023
  7ab7c56e Browse Files
- 关于修改 · d95c30a3
  呼呼啦啦 committed Dec 05, 2023
  
  d95c30a3 Browse Files
04 Dec, 2023 6 commits
- 合并分支 'feat/updata' 到 'master' · abf12160
```
冲突解决

查看合并请求 !39
```
  付振洋 committed Dec 04, 2023
  abf12160 Browse Files
- 冲突解决 · 89beee83
  呼呼啦啦 committed Dec 04, 2023
  
  89beee83 Browse Files
- 合并分支 'feat/updata' 到 'master' · 87ad0647
```
Feat/updata

查看合并请求 !38
```
  付振洋 committed Dec 04, 2023
  87ad0647 Browse Files
- 合并分支 'dataEase源码(勿删)' 到 'feat/updata' · 4bcc10a5
```
升级到1.18.12

查看合并请求 !37
```
  付振洋 committed Dec 04, 2023
  4bcc10a5 Browse Files
- Merge branch 'feat/updata' into 'dataEase源码(勿删)' · 27e47122
```
# Conflicts:
#   src/components/canvas/customComponent/UserView.vue
#   src/lang/en.js
#   src/lang/tw.js
#   src/lang/zh.js
#   src/views/chart/group/Group.vue
#   src/views/chart/view/ChartEdit.vue
```
  付振洋 committed Dec 04, 2023
  27e47122 Browse Files
- 升级到1.18.12 · 74bb62a4
  呼呼啦啦 committed Dec 04, 2023
  
  74bb62a4 Browse Files
29 Nov, 2023 3 commits
- 合并分支 'develop_cd' 到 'master' · 3cb8a57b
```
Develop cd

查看合并请求 !35
```
  晁文轩 committed Nov 29, 2023
  3cb8a57b Browse Files
- Merge remote-tracking branch 'origin/master' into develop_cd · 3ea3b0a2
  cwx committed Nov 29, 2023
  
  3ea3b0a2 Browse Files
- 高德地图文字描述 · 31287ce9
  cwx committed Nov 29, 2023
  
  31287ce9 Browse Files
14 Nov, 2023 4 commits
- 合并分支 'develop_cd' 到 'master' · b6f6f8cd
```
Develop cd

查看合并请求 !34
```
  饶艳婷 committed Nov 14, 2023
  b6f6f8cd Browse Files
- Merge remote-tracking branch 'origin/master' into develop_cd · 18583dd7
  cwx committed Nov 14, 2023
  
  18583dd7 Browse Files
- 地图icon修改 · 397be544
  cwx committed Nov 14, 2023
  
  397be544 Browse Files
- Merge remote-tracking branch 'origin/develop' into feature/cwx · 8e87fb5d
  cwx committed Nov 14, 2023
  
  8e87fb5d Browse Files
02 Nov, 2023 1 commit
- 区块地图 · 5650020c
  cwx committed Nov 02, 2023
  
  5650020c Browse Files
31 Oct, 2023 1 commit
- 高德地图插件 · dcae35ac
  cwx committed Oct 31, 2023
  
  dcae35ac Browse Files
27 Oct, 2023 2 commits
- 合并分支 'develop' 到 'master' · 66b63af6
```
Develop

查看合并请求 !33
```
  饶艳婷 committed Oct 27, 2023
  66b63af6 Browse Files
- 合并分支 'feature/1.18.11-test' 到 'develop' · 5df9659d
```
Feature/1.18.11 test

查看合并请求 !32
```
  饶艳婷 committed Oct 27, 2023
  5df9659d Browse Files
18 Oct, 2023 3 commits
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into… · 621bbde4
```
Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/1.18.11-test
```
  Tippi.Rao committed Oct 18, 2023
  621bbde4 Browse Files
- Merge branch 'dataEase源码(勿删)' of… · fd972767
```
Merge branch 'dataEase源码(勿删)' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/1.18.11-test
```
  Tippi.Rao committed Oct 18, 2023
  fd972767 Browse Files
- 升级到 1.18.11 · a374e454
  Tippi.Rao committed Oct 18, 2023
  
  a374e454 Browse Files
05 Sep, 2023 4 commits
- 合并分支 'feature/Tippi' 到 'develop' · 9fa5cbd5
```
ip 修改

查看合并请求 !31
```
  饶艳婷 committed Sep 05, 2023
  9fa5cbd5 Browse Files
- ip 修改 · d1d18633
  Tippi.Rao committed Sep 05, 2023
  
  d1d18633 Browse Files
- 合并分支 'feature/Tippi' 到 'develop' · a1674f4e
```
Feature/tippi

查看合并请求 !30
```
  杨翔 committed Sep 05, 2023
  a1674f4e Browse Files
- 修改后端 ip · bd4b70fb
  Tippi.Rao committed Sep 05, 2023
  
  bd4b70fb Browse Files
21 Aug, 2023 1 commit
- 更换threejs 模型 · 9dbb44c1
  Tippi.Rao committed Aug 21, 2023
  
  9dbb44c1 Browse Files
16 Aug, 2023 6 commits
- 合并分支 'feature/hyl' 到 'develop' · ca01b1cd
```
Feature/hyl

查看合并请求 !29
```
  饶艳婷 committed Aug 16, 2023
  ca01b1cd Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/hyl · f9c49a54
```
# Conflicts:
#	src/views/chart/chart/util.js
#	src/views/chart/components/ChartComponentG2.vue
```
  韩艳丽 committed Aug 16, 2023
  f9c49a54 Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/hyl · 3477a437
```
# Conflicts:
#	src/lang/en.js
#	src/lang/tw.js
#	src/lang/zh.js
#	src/views/chart/components/ChartComponentG2.vue
```
  韩艳丽 committed Aug 16, 2023
  3477a437 Browse Files
- 合并分支 'feature/branch_cxr' 到 'develop' · bb25b9df
```
Feature/branch cxr

查看合并请求 !28
```
  饶艳婷 committed Aug 16, 2023
  bb25b9df Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_cxr · 39b37a75
```
# Conflicts:
#	src/views/chart/components/ChartComponentG2.vue
#	yarn.lock
```
  ChenXiHi committed Aug 16, 2023
  39b37a75 Browse Files
- 点击建筑 · 55249ef4
  ChenXiHi committed Aug 16, 2023
  
  55249ef4 Browse Files
15 Aug, 2023 1 commit
- float · f74c8e57
  韩艳丽 committed Aug 15, 2023
  
  f74c8e57 Browse Files
11 Aug, 2023 1 commit
- 漂浮地图 · 7f442311
  韩艳丽 committed Aug 11, 2023
  
  7f442311 Browse Files
09 Aug, 2023 5 commits
- 合并分支 'feature/Tippi' 到 'develop' · 5438fc4f
```
添加 influxdb 数据库名字

查看合并请求 !27
```
  饶艳婷 committed Aug 09, 2023
  5438fc4f Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/Tippi · 5722d343
  Tippi.Rao committed Aug 09, 2023
  
  5722d343 Browse Files
- 合并分支 'feature/branch_wm' 到 'develop' · 072214a7
```
扫光城市数据写死mock

查看合并请求 !26
```
  饶艳婷 committed Aug 09, 2023
  072214a7 Browse Files
- 添加 influxdb 数据库名字 · 9f820f6d
  Tippi.Rao committed Aug 09, 2023
  
  9f820f6d Browse Files
- 提 · 6f258752
  wangmin committed Aug 09, 2023
  
  6f258752 Browse Files