Commits · 9482cd1bdc8751a371755a77e8bfc963ca2506b2 · 任超 / js.CadastralSystem · GitLab

15 Dec, 2020 31 commits
- Merge remote-tracking branch 'origin/master' · 9482cd1b
  9482cd1b
  
  weimo934 committed 2020-12-15 19:16:08 +0800
- feat(sxdr):属性导入加载数据 · 6b97ec38
  6b97ec38
  
  weimo934 committed 2020-12-15 19:15:56 +0800
- 多幢合并 · 1eb03185
  1eb03185
  
  杨威 committed 2020-12-15 18:55:57 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 431f8adf
  431f8adf Browse Files
  
  杨威 committed 2020-12-15 18:55:42 +0800
- 批量户添加删除样式修改 · 26430a11
  26430a11 Browse Files
  
  zhaoqian committed 2020-12-15 16:58:11 +0800
- 去掉逻辑幢的不动产单元号输入框 · db8b5b92
  db8b5b92 Browse Files
  
  zhaoqian committed 2020-12-15 16:24:31 +0800
- 默认不展开 · e44d8319
  e44d8319
  
  zhaoqian committed 2020-12-15 16:15:00 +0800
- 数据不重复加载 · c680230a
  c680230a Browse Files
  
  zhaoqian committed 2020-12-15 16:09:58 +0800
- 宗地国名经济 · 4168bcde
  4168bcde Browse Files
  
  zhaoqian committed 2020-12-15 15:42:21 +0800
- Merge remote-tracking branch 'origin/master' · 5a95f8e7 ...
  5a95f8e7 Browse Files
```
# Conflicts:
#	src/views/zd/zddcb/index.vue
```
  zhaoqian committed 2020-12-15 15:40:16 +0800
- 现有问题修改 · ee7a9031
  ee7a9031 Browse Files
  
  zhaoqian committed 2020-12-15 15:38:37 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · c59d4cf1
  c59d4cf1
  
  杨威 committed 2020-12-15 15:26:11 +0800
- feat(fg):更改多幢分割选择列表 · 4a16a083
  4a16a083
  
  weimo934 committed 2020-12-15 15:24:57 +0800
- feat(sxdr):属性导入 · aa4e2e55
  aa4e2e55 Browse Files
  
  weimo934 committed 2020-12-15 14:21:59 +0800
- Merge remote-tracking branch 'origin/master' · 08c74968 ...
  08c74968 Browse Files
```
# Conflicts:
#	src/views/zd/zddcb/index.vue
```
  weimo934 committed 2020-12-15 14:09:43 +0800
- feat(fxdr):属性导入 · d078f4cd
  d078f4cd
  
  weimo934 committed 2020-12-15 14:06:47 +0800
- gis前端工具条等功能实现 · 9aa4e12e
  9aa4e12e
  
  杨威 committed 2020-12-15 14:02:24 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 2d24799b
  2d24799b Browse Files
  
  杨威 committed 2020-12-15 13:56:19 +0800
- 弹框统一样式(头部信息居左显示) · e484a9c9
  e484a9c9
  
  杨威 committed 2020-12-15 13:56:05 +0800
- Merge remote-tracking branch 'origin/master' into master · 1f374220
  1f374220 Browse Files
  
  杨威 committed 2020-12-15 13:55:28 +0800
- gis重叠分析功能实现 · 4cd04f02
  4cd04f02
  
  杨威 committed 2020-12-15 13:54:20 +0800
- Merge remote-tracking branch 'origin/master' · b266090b
  b266090b Browse Files
  
  zhaoqian committed 2020-12-15 11:29:46 +0800
- 目录树点击事件调整！ · 69815c61
  69815c61
  
  zhaoqian committed 2020-12-15 11:29:37 +0800
- 自然幢表单校验完善 · 89c35c2d
  89c35c2d
  
  杨威 committed 2020-12-15 11:18:25 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · d77eef37
  d77eef37 Browse Files
  
  杨威 committed 2020-12-15 10:45:23 +0800
- 业主共有页面样式修改 · 9696a1a5
  9696a1a5
  
  杨威 committed 2020-12-15 10:45:12 +0800
- Merge remote-tracking branch 'origin/master' · 729e5226
  729e5226 Browse Files
  
  zhaoqian committed 2020-12-15 10:26:58 +0800
- 目录树调整 · 8c1570b9
  8c1570b9
  
  zhaoqian committed 2020-12-15 10:26:49 +0800
- 自然幢表单校验完善 · dce31912
  dce31912 Browse Files
  
  杨威 committed 2020-12-15 10:26:25 +0800
- 新建自然幢流程完善 · 8575e9f2
  8575e9f2
  
  杨威 committed 2020-12-15 10:25:36 +0800
- 宗地表单校验完善 · dc0f5a29
  dc0f5a29 Browse Files
  
  杨威 committed 2020-12-15 10:08:19 +0800
14 Dec, 2020 9 commits
- Merge remote-tracking branch 'origin/master' · aa47701f
  aa47701f Browse Files
  
  weimo934 committed 2020-12-14 20:01:43 +0800
- Merge remote-tracking branch 'origin/master' · 3b430fe8
  3b430fe8 Browse Files
  
  weimo934 committed 2020-12-14 20:01:39 +0800
- 多幢分割 · 82f389eb
  82f389eb Browse Files
  
  杨威 committed 2020-12-14 20:01:31 +0800
- refactor(fjcl):文件上传修改 · 9acbfe0d
  9acbfe0d
  
  weimo934 committed 2020-12-14 20:01:27 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · c6db7701
  c6db7701 Browse Files
  
  杨威 committed 2020-12-14 19:52:40 +0800
- 代码优化 · e25043c9
  e25043c9 Browse Files
  
  杨威 committed 2020-12-14 19:52:19 +0800
- fix(hb):宗地合并选择bug · b12f6345
  b12f6345 Browse Files
  
  weimo934 committed 2020-12-14 17:58:56 +0800
- Merge remote-tracking branch 'origin/master' · 78454381
  78454381 Browse Files
  
  zhaoqian committed 2020-12-14 16:30:06 +0800
- 实测预测数据不复现 · ee62af3c
  ee62af3c Browse Files
  
  zhaoqian committed 2020-12-14 16:30:01 +0800