Commits · f262b41643d4084d2950253bfc819c1e0b980830 · frontend / yqlh-dataEase · GitLab

25 Jul, 2023 6 commits
- 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
- 合并分支 '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 20 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
- add: 3d柱图修改颜色 · cdc91980
  杨翔 committed Jul 24, 2023
  
  cdc91980 Browse Files
- 合并分支 'feature/branch_wm' 到 'develop' · 082f854f
```
城市亮度图修改

查看合并请求 !17
```
  王敏 committed Jul 24, 2023
  082f854f Browse Files
- 城市亮度图修改 · 9284d221
  wangmin committed Jul 24, 2023
  
  9284d221 Browse Files
- 合并分支 'feature/branch_yx' 到 'develop' · cadf1c96
```
Feature/branch yx

查看合并请求 !16
```
  饶艳婷 committed Jul 24, 2023
  cadf1c96 Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_yx · 265a2405
  杨翔 committed Jul 24, 2023
  
  265a2405 Browse Files
- add: 3d柱图添加数据 · 42da6701
  杨翔 committed Jul 24, 2023
  
  42da6701 Browse Files
- 合并分支 'feature/Tippi' 到 'develop' · 9ec90d0c
```
head 图表名字修改

查看合并请求 !15
```
  饶艳婷 committed Jul 24, 2023
  9ec90d0c Browse Files
- head 图表名字修改 · 30355f16
  Tippi.Rao committed Jul 24, 2023
  
  30355f16 Browse Files
- 合并分支 'feature/branch_wm' 到 'develop' · 3e1eac7a
```
Feature/branch wm

查看合并请求 !14
```
  王敏 committed Jul 24, 2023
  3e1eac7a Browse Files
- 亮度一些修改 · 470d2f54
  wangmin committed Jul 24, 2023
  
  470d2f54 Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_yx · cfb626e5
```
 Conflicts:
	src/views/chart/chart/util.js
	src/views/chart/components/ChartComponentG2.vue
```
  杨翔 committed Jul 24, 2023
  cfb626e5 Browse Files
21 Jul, 2023 10 commits
- Merge remote-tracking branch 'origin/develop' into feature/branch_wm · 0fdb1978
  wangmin committed Jul 21, 2023
  
  0fdb1978 Browse Files
- 合并分支 'feature/Tippi' 到 'develop' · 59d2e673
```
Feature/tippi

查看合并请求 !12
```
  王敏 committed Jul 21, 2023
  59d2e673 Browse Files
- 删除无用代码 · a62beb4e
  Tippi.Rao committed Jul 21, 2023
  
  a62beb4e Browse Files
- 桑基图 · 0cc6d2ac
  ChenXiHi committed Jul 21, 2023
  
  0cc6d2ac Browse Files
- Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/Tippi · 131b6d77
  Tippi.Rao committed Jul 21, 2023
  
  131b6d77 Browse Files
- 图标和首页修改 · 726aaec6
  Tippi.Rao committed Jul 21, 2023
  
  726aaec6 Browse Files
- add: 3d柱图添加 · 82f28ac5
  杨翔 committed Jul 21, 2023
  
  82f28ac5 Browse Files
- 桑基图 · ae938620
  ChenXiHi committed Jul 21, 2023
  
  ae938620 Browse Files
- 桑基图 · 0d20a199
  ChenXiHi committed Jul 21, 2023
  
  0d20a199 Browse Files
- 合并分支 'feature/branch_wm' 到 'develop' · 53471fe9
```
城市亮度图初始mock

查看合并请求 !11
```
  陈曦冉 committed Jul 21, 2023
  53471fe9 Browse Files
20 Jul, 2023 4 commits
- Merge remote-tracking branch 'origin/develop' into feature/branch_wm · 72314be8
  wangmin committed Jul 20, 2023
  
  72314be8 Browse Files
- 合并分支 'feature/fzy' 到 'develop' · 1c7fe47a
```
Feature/fzy

查看合并请求 !10
```
  王敏 committed Jul 20, 2023
  1c7fe47a Browse Files
- 城市亮度图初始mock · 16560a82
  wangmin committed Jul 20, 2023
  
  16560a82 Browse Files
- Merge remote-tracking branch 'origin/develop' into feature/fzy · e99bcc5f
```
合并
```
  呼呼啦啦 committed Jul 20, 2023
  e99bcc5f Browse Files