Commits · 6741c33ab503dcd8d7773d32f67c063fecf084d2 · civil / civil-front · GitLab

30 Jun, 2021 23 commits
- hh · 6741c33a
  李耀琨 committed Jun 30, 2021
  
  6741c33a 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 4 commits
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · d690c688
  李耀琨 committed Jun 29, 2021
  
  d690c688 Browse Files
- 完成首页优化ui · 11bf3b7a
  李耀琨 committed Jun 29, 2021
  
  11bf3b7a Browse Files
- 完成地图，查询 · f50a57d6
  苏咏卓 committed Jun 29, 2021
  
  f50a57d6 Browse Files
- 更新地图 · 0ed15335
  苏咏卓 committed Jun 29, 2021
  
  0ed15335 Browse Files
28 Jun, 2021 5 commits
- 接口对接 · cedaec7b
  苏咏卓 committed Jun 28, 2021
  
  cedaec7b Browse Files
- 接口对接 · 946b4f93
  苏咏卓 committed Jun 28, 2021
  
  946b4f93 Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · ad4435a8
```
# Conflicts:
#	src/views/unified/tapSwitch/mechanism.vue
```
  苏咏卓 committed Jun 28, 2021
  ad4435a8 Browse Files
- 接口对接 · 349c9fbf
  苏咏卓 committed Jun 28, 2021
  
  349c9fbf Browse Files
- 更新 · 046603a7
  李耀琨 committed Jun 28, 2021
  
  046603a7 Browse Files
27 Jun, 2021 4 commits
- 完成基本页面，对接人口专题接口 · f089c18a
  苏咏卓 committed Jun 27, 2021
  
  f089c18a Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 05700735
  苏咏卓 committed Jun 27, 2021
  
  05700735 Browse Files
- 更新 · ac3eea97
  苏咏卓 committed Jun 27, 2021
  
  ac3eea97 Browse Files
- 两项补贴 · b39f448d
  李耀琨 committed Jun 27, 2021
  
  b39f448d Browse Files
26 Jun, 2021 4 commits
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master · d09d7c3f
  李耀琨 committed Jun 26, 2021
  
  d09d7c3f Browse Files
- 画好人口机构专题图表 · 3d75d8bf
  李耀琨 committed Jun 26, 2021
  
  3d75d8bf Browse Files
- 社会救助页面 · 816196ef
  苏咏卓 committed Jun 26, 2021
  
  816196ef Browse Files
- Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front · 8d3e5942
  苏咏卓 committed Jun 26, 2021
  
  8d3e5942 Browse Files