Commits · 250d1f40406afbf595b1d7da5a52089b06b98124 · civil / civil-front · GitLab

01 Jul, 2021 14 commits
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 250d1f40
  苏咏卓 committed Jul 01, 2021
  
  250d1f40 Browse Files
- 更新 · f88d7d37
  苏咏卓 committed Jul 01, 2021
  
  f88d7d37 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · fdbf4b1f
  李耀琨 committed Jul 01, 2021
  
  fdbf4b1f Browse Files
- 111 · a03dfc9f
  李耀琨 committed Jul 01, 2021
  
  a03dfc9f Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 5ec49455
  苏咏卓 committed Jul 01, 2021
  
  5ec49455 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · 89a89f17
  李耀琨 committed Jul 01, 2021
  
  89a89f17 Browse Files
- 页面柱形图更新区域全部显示 · 75e55cdf
  苏咏卓 committed Jul 01, 2021
  
  75e55cdf Browse Files
- 改首页 · 18157489
  李耀琨 committed Jul 01, 2021
  
  18157489 Browse Files
- 样式更新 · 34fc85b7
  苏咏卓 committed Jul 01, 2021
  
  34fc85b7 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · ac6c9856
  苏咏卓 committed Jul 01, 2021
  
  ac6c9856 Browse Files
- 更新 · 47f6923e
  苏咏卓 committed Jul 01, 2021
  
  47f6923e Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · eb5a28dc
  李耀琨 committed Jul 01, 2021
  
  eb5a28dc Browse Files
- 更新无数据提示 · 1a36b90a
  李耀琨 committed Jul 01, 2021
  
  1a36b90a Browse Files
- 更新 · f1a8322a
  苏咏卓 committed Jul 01, 2021
  
  f1a8322a Browse Files
30 Jun, 2021 25 commits
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 37e33ace
```
# Conflicts:
#	.env.development
```
  苏咏卓 committed Jun 30, 2021
  37e33ace Browse Files
- hh · 6741c33a
  李耀琨 committed Jun 30, 2021
  
  6741c33a Browse Files
- 提示 · b071e960
  苏咏卓 committed Jun 30, 2021
  
  b071e960 Browse Files
- 更新 · 23479b9e
  苏咏卓 committed Jun 30, 2021
  
  23479b9e Browse Files
- 完成查询，修改区域柱形图显示 · 94def35b
  苏咏卓 committed Jun 30, 2021
  
  94def35b Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · a9b2b9ec
  苏咏卓 committed Jun 30, 2021
  
  a9b2b9ec Browse Files
- 完成区县查询 · b0bcb0ba
  苏咏卓 committed Jun 30, 2021
  
  b0bcb0ba Browse Files
- u · e046ecde
  huangzhijia committed Jun 30, 2021
  
  e046ecde Browse Files
- 地图区县获取数据 · 34064ad6
  苏咏卓 committed Jun 30, 2021
  
  34064ad6 Browse Files
- 返回首页，首页app二维码下载 · 5fc3fd9b
  苏咏卓 committed Jun 30, 2021
  
  5fc3fd9b Browse Files
- 更改样式 · da2d8b47
  苏咏卓 committed Jun 30, 2021
  
  da2d8b47 Browse Files
- 更改样式 · 260182a7
  苏咏卓 committed Jun 30, 2021
  
  260182a7 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 6639902d
  苏咏卓 committed Jun 30, 2021
  
  6639902d Browse Files
- 去掉导航 · 778f6e48
  李耀琨 committed Jun 30, 2021
  
  778f6e48 Browse Files
- 更改饼图样式颜色 · 65b62f2a
  苏咏卓 committed Jun 30, 2021
  
  65b62f2a Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 94261d8b
```
# Conflicts:
#	src/views/unified/tapSwitch/marriage.vue
#	src/views/unified/tapSwitch/mechanism.vue
#	src/views/unified/tapSwitch/population.vue
#	src/views/unified/tapSwitch/socialAssistance.vue
#	src/views/unified/tapSwitch/socialOrganization.vue
#	src/views/unified/tapSwitch/subsidies.vue
```
  苏咏卓 committed Jun 30, 2021
  94261d8b Browse Files
- 页面更新 · 304b0435
  苏咏卓 committed Jun 30, 2021
  
  304b0435 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · b9639bdb
```
# Conflicts:
#	src/views/unified/tapSwitch/childWelfare.vue
#	src/views/unified/tapSwitch/provide.vue
```
  李耀琨 committed Jun 30, 2021
  b9639bdb Browse Files
- 页面广西 · 2a15e973
  李耀琨 committed Jun 30, 2021
  
  2a15e973 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · febb6153
```
# Conflicts:
#	src/views/unified/tapSwitch/marriage.vue
```
  苏咏卓 committed Jun 30, 2021
  febb6153 Browse Files
- 写死数据 · e96ca514
  苏咏卓 committed Jun 30, 2021
  
  e96ca514 Browse Files
- 年份选择 · fe4104d1
  李耀琨 committed Jun 30, 2021
  
  fe4104d1 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · ffa7be60
```
# Conflicts:
#	.env.development
#	src/views/unified/tapSwitch/population.vue
```
  苏咏卓 committed Jun 30, 2021
  ffa7be60 Browse Files
- 写死假数据 · c5f1f9c8
  苏咏卓 committed Jun 30, 2021
  
  c5f1f9c8 Browse Files
- 优化ui · e35d6c3b
  李耀琨 committed Jun 30, 2021
  
  e35d6c3b Browse Files
29 Jun, 2021 1 commit
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · d690c688
  李耀琨 committed Jun 29, 2021
  
  d690c688 Browse Files