Commits · ca01b1cd82d83c3613ada0c9dde9865c4ff42dbb · frontend / yqlh-dataEase · GitLab

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 6 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
- 扫光数据写死mock · 8b5ff296
  wangmin committed Aug 09, 2023
  
  8b5ff296 Browse Files
04 Aug, 2023 2 commits
- 合并分支 'feature/Tippi' 到 'develop' · 1e7ba384
```
仪表盘只显示登录用户的数据

查看合并请求 !25
```
  王敏 committed Aug 04, 2023
  1e7ba384 Browse Files
- 仪表盘只显示登录用户的数据 · 3ac4156f
  Tippi.Rao committed Aug 04, 2023
  
  3ac4156f Browse Files
27 Jul, 2023 3 commits
- 合并分支 'feature/Tippi' 到 'develop' · 9e5cf430
```
Feature/tippi

查看合并请求 !24
```
  王敏 committed Jul 27, 2023
  9e5cf430 Browse Files
- Merge branch 'dataEase源码(勿删)' of… · 4afcfe65
```
Merge branch 'dataEase源码(勿删)' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/Tippi
```
  Tippi.Rao committed Jul 27, 2023
  4afcfe65 Browse Files
- 源码更新 · a752cff5
  Tippi.Rao committed Jul 27, 2023
  
  a752cff5 Browse Files
25 Jul, 2023 12 commits
- 合并分支 'feature/branch_wm' 到 'develop' · b878bc44
```
Feature/branch wm

查看合并请求 !23
```
  王敏 committed Jul 25, 2023
  b878bc44 Browse Files
- 提 · 6f9d487e
  wangmin committed Jul 25, 2023
  
  6f9d487e Browse Files
- 亮度一些修改 · 414ba1a0
  wangmin committed Jul 25, 2023
  
  414ba1a0 Browse Files
- 合并分支 'feature/hyl' 到 'develop' · 29a59e1f
```
Feature/hyl

查看合并请求 !22
```
  饶艳婷 committed Jul 25, 2023
  29a59e1f Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/hyl · f262b416
  韩艳丽 committed Jul 25, 2023
  
  f262b416 Browse Files
- sizeSelect 参数修改 · 4732f43b
  韩艳丽 committed Jul 25, 2023
  
  4732f43b Browse Files
- Merge remote-tracking branch 'origin/develop' into feature/branch_wm · 3657aa33
  wangmin committed Jul 25, 2023
  
  3657aa33 Browse Files
- 提 · 9a98fc82
  wangmin committed Jul 25, 2023
  
  9a98fc82 Browse Files
- 合并分支 'feature/Tippi' 到 'develop' · 210752f8
```
Feature/tippi

查看合并请求 !21
```
  付振洋 committed Jul 25, 2023
  210752f8 Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/Tippi · a7cf06ed
  Tippi.Rao committed Jul 25, 2023
  
  a7cf06ed Browse Files
- 加注释 · a7b74892
  Tippi.Rao committed Jul 25, 2023
  
  a7b74892 Browse Files
- 数据源修改 · 01742e65
  Tippi.Rao committed Jul 25, 2023
  
  01742e65 Browse Files
24 Jul, 2023 9 commits
- 颜色从配置里读取 · d635e21a
  Tippi.Rao committed Jul 24, 2023
  
  d635e21a Browse Files
- 新增neo4j图片 · 48a57de3
  呼呼啦啦 committed Jul 24, 2023
  
  48a57de3 Browse Files
- 合并分支 'feature/branch_cxr' 到 'develop' · 6b45eba7
```
Feature/branch cxr

查看合并请求 !20
```
  王敏 committed Jul 24, 2023
  6b45eba7 Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_cxr · 1bcb647c
```
# Conflicts:
#	src/views/chart/components/ChartComponentG2.vue
```
  ChenXiHi committed Jul 24, 2023
  1bcb647c Browse Files
- 桑基图 · ba943737
  ChenXiHi committed Jul 24, 2023
  
  ba943737 Browse Files
- 合并分支 'feature/branch_wm' 到 'develop' · 046b1ef9
```
城市亮度图修改

查看合并请求 !19
```
  王敏 committed Jul 24, 2023
  046b1ef9 Browse Files
- 城市亮度图修改 · 2b0cb9d7
  wangmin committed Jul 24, 2023
  
  2b0cb9d7 Browse Files
- 合并分支 'feature/branch_yx' 到 'develop' · 1b9879aa
```
Feature/branch yx

查看合并请求 !18
```
  饶艳婷 committed Jul 24, 2023
  1b9879aa Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_yx · 1d6a2903
  杨翔 committed Jul 24, 2023
  
  1d6a2903 Browse Files