Commits · 22a2d544bbe68ccea2fcc6508dafb5c72322d952 · 任超 / js.CadastralSystem

11 Jan, 2021 16 commits
- 户表单的验证 · 22a2d544
  22a2d544 Browse Files
  
  zhaoqian committed 2021-01-11 17:24:03 +0800
- Merge remote-tracking branch 'origin/master' · abd57533
  abd57533 Browse Files
  
  zhaoqian committed 2021-01-11 17:01:19 +0800
- 权利人表单获取数据问题 · 7fcdce48
  7fcdce48 Browse Files
  
  zhaoqian committed 2021-01-11 17:01:14 +0800
- Merge remote-tracking branch 'origin/master' into master · f58c6956
  f58c6956 Browse Files
  
  杨威 committed 2021-01-11 16:59:16 +0800
- 比例尺代码 · f69cc5d9
  f69cc5d9 Browse Files
  
  杨威 committed 2021-01-11 16:58:50 +0800
- Merge remote-tracking branch 'origin/master' · f9bc58d5
  f9bc58d5 Browse Files
  
  zhaoqian committed 2021-01-11 16:47:44 +0800
- 根据户的不动产单元号去查询户的分割！ · 1c10a3b6
  1c10a3b6 Browse Files
  
  zhaoqian committed 2021-01-11 16:47:28 +0800
- 右下角定位样式及缓冲区分析结果样式及分析数据展示 · 9d482ccf
  9d482ccf Browse Files
  
  杨威 committed 2021-01-11 16:40:54 +0800
- 批量不动产单元号生成提示信息 · 54cba80d
  54cba80d Browse Files
  
  zhaoqian committed 2021-01-11 15:36:29 +0800
- 表单居右显示 · f1f69f24
  f1f69f24 Browse Files
  
  zhaoqian committed 2021-01-11 15:26:38 +0800
- Merge remote-tracking branch 'origin/master' · d1130ceb
  d1130ceb Browse Files
  
  zhaoqian committed 2021-01-11 14:38:55 +0800
- 添加字段 · 4184e3d2
  4184e3d2 Browse Files
  
  zhaoqian committed 2021-01-11 14:38:49 +0800
- feat(qlr):共有方式条件禁用 · eafe3d8e
  eafe3d8e Browse Files
  
  weimo934 committed 2021-01-11 14:37:53 +0800
- Merge remote-tracking branch 'origin/master' into master · 70a8f15b
  70a8f15b Browse Files
  
  杨威 committed 2021-01-11 10:20:32 +0800
- 修改测试中的问题 · e11430a8
  e11430a8 Browse Files
  
  杨威 committed 2021-01-11 10:20:07 +0800
- 权利性质校验完善 · 3d63876f
  3d63876f Browse Files
  
  杨威 committed 2021-01-11 09:48:59 +0800
08 Jan, 2021 19 commits
- Merge remote-tracking branch 'origin/master' · 22eeaff5
  22eeaff5 Browse Files
  
  zhaoqian committed 2021-01-08 17:27:58 +0800
- 权利人 · 96510145
  96510145 Browse File
  
  zhaoqian committed 2021-01-08 17:27:46 +0800
- feat():重新落宗选择宗地和宗地分割合并分开 · 71390c9a
  71390c9a
  
  weimo934 committed 2021-01-08 17:05:14 +0800
- Merge remote-tracking branch 'origin/master' into master · 9cb84c04 ...
  9cb84c04 Browse Files
```
# Conflicts:
#	src/assets/iconfont/demo_index.html
#	src/assets/iconfont/iconfont.css
#	src/assets/iconfont/iconfont.eot
#	src/assets/iconfont/iconfont.js
#	src/assets/iconfont/iconfont.json
#	src/assets/iconfont/iconfont.svg
#	src/assets/iconfont/iconfont.ttf
#	src/assets/iconfont/iconfont.woff
#	src/assets/iconfont/iconfont.woff2
#	src/components/map/ChangeMap.vue
#	src/views/systemTX/map.vue
#	src/views/systemTX/mapWeight/mapTools.vue
#	src/views/systemTX/mapWeight/sideTools.vue
```
  杨威 committed 2021-01-08 16:55:01 +0800
- 权利人默认共有方式 · 4671ce6f
  4671ce6f
  
  zhaoqian committed 2021-01-08 15:56:54 +0800
- 权利人 · 549d30e8
  549d30e8 Browse Files
  
  zhaoqian committed 2021-01-08 15:38:37 +0800
- Merge remote-tracking branch 'origin/master' · 88f248f0
  88f248f0 Browse Files
  
  zhaoqian committed 2021-01-08 15:34:53 +0800
- 户表单的验证 · 046250b0
  046250b0 Browse File
  
  zhaoqian committed 2021-01-08 15:34:48 +0800
- 宗地分割权利人名称显示 · 11e812e3
  11e812e3 Browse Files
  
  杨威 committed 2021-01-08 15:24:30 +0800
- 新建自然幢时隐藏构筑物 · c26ea73b
  c26ea73b
  
  杨威 committed 2021-01-08 14:18:33 +0800
- 宗地分割后的各个宗地的面积分摊表数据更新 · 63b5ec48
  63b5ec48 Browse Files
  
  杨威 committed 2021-01-08 14:06:06 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 677059bc
  677059bc Browse Files
  
  杨威 committed 2021-01-08 14:04:58 +0800
- 重新落宗选择宗地的数据展示宗地下自然幢数量 · c6fa2036
  c6fa2036 Browse File
  
  杨威 committed 2021-01-08 14:04:51 +0800
- Merge remote-tracking branch 'origin/master' · 7be848a8
  7be848a8 Browse Files
  
  zhaoqian committed 2021-01-08 14:00:38 +0800
- 权利人，范围属性变更目录树问题 · 22a64998
  22a64998 Browse File
  
  zhaoqian committed 2021-01-08 14:00:31 +0800
- 分割后的宗地切换时更新面积分摊表数据 · d099a117
  d099a117
  
  杨威 committed 2021-01-08 13:41:26 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · ec5ce720
  ec5ce720 Browse Files
  
  杨威 committed 2021-01-08 13:37:56 +0800
- 户重新落宗修改 · 4910876d
  4910876d Browse File
  
  杨威 committed 2021-01-08 13:37:45 +0800
- feat(cxlz):户重新落宗添加自然幢数量 · 235b39d4
  235b39d4 Browse Files
  
  weimo934 committed 2021-01-08 11:30:21 +0800
07 Jan, 2021 5 commits
- feat():自然幢权利人修改 · a6f55c3c
  a6f55c3c Browse File
  
  weimo934 committed 2021-01-07 19:01:31 +0800
- feat(fg):多幢分割选择列表添加自然幢数量 · 891b5ef5
  891b5ef5 Browse Files
  
  weimo934 committed 2021-01-07 17:36:10 +0800
- Merge remote-tracking branch 'origin/master' · 4313cbea ...
  4313cbea Browse Files
```
# Conflicts:
#	src/views/zrz/lpb/bjlp/ljz/index.vue
```
  weimo934 committed 2021-01-07 17:27:19 +0800
- feat(ljz):面积长度限制 · aa4b2372
  aa4b2372
  
  weimo934 committed 2021-01-07 17:25:10 +0800
- 户表单的验证 · f0bcb4de
  f0bcb4de Browse Files
  
  zhaoqian committed 2021-01-07 17:01:10 +0800