Commits · a9de72a5ab65df3f8c8a4f56657e8e94f512b998 · 任超 / js.CadastralSystem · GitLab

01 Dec, 2020 17 commits
- Merge remote-tracking branch 'origin/master' into master · a9de72a5 ...
  a9de72a5 Browse Files
```
# Conflicts:
#	src/views/zd/jzd/index.vue
```
  杨威 committed 2020-12-01 16:26:35 +0800
- 范围属性变更成功后跳转参数修改 · 5dca44b4
  5dca44b4 Browse Files
  
  杨威 committed 2020-12-01 16:18:41 +0800
- 宗地表单样式调整 · b163ba99
  b163ba99 Browse Files
  
  杨威 committed 2020-12-01 16:15:32 +0800
- 左侧树结构判断权属状态显示宗地权属类型 · 48634864
  48634864
  
  杨威 committed 2020-12-01 16:14:16 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 42489761
  42489761 Browse Files
  
  杨威 committed 2020-12-01 15:41:56 +0800
- 解决IE浏览器上宗地路由跳转问题 · 07f0b312
  07f0b312 Browse Files
  
  杨威 committed 2020-12-01 15:41:45 +0800
- Merge remote-tracking branch 'origin/master' · 2986383b
  2986383b Browse Files
  
  weimo934 committed 2020-12-01 15:36:24 +0800
- feat(jzd,jzx):界址点、线保存后重新加载 · b037b29a
  b037b29a
  
  weimo934 committed 2020-12-01 15:36:11 +0800
- Merge remote-tracking branch 'origin/master' into master · f0fcba17 ...
  f0fcba17
```
# Conflicts:
#	src/components/lineTree/lineItem.vue
#	src/components/lineTree/lineTree.vue
```
  杨威 committed 2020-12-01 15:19:49 +0800
- gis前端工具条等功能实现 · 0ed2b73f
  0ed2b73f
  
  杨威 committed 2020-12-01 15:10:19 +0800
- Merge remote-tracking branch 'origin/master' · c0d9c30c
  c0d9c30c Browse Files
  
  zhaoqian committed 2020-12-01 11:57:35 +0800
- G6部分整合 · e5b0ff8a
  e5b0ff8a
  
  zhaoqian committed 2020-12-01 11:57:27 +0800
- feat(moveH):调整样式 · 8a077920
  8a077920
  
  weimo934 committed 2020-12-01 11:25:34 +0800
- feat(lpb):修改实预测字段 · f7946a36
  f7946a36 Browse Files
  
  weimo934 committed 2020-12-01 11:21:06 +0800
- 合并代码 · 41929038
  41929038 Browse Files
  
  杨威 committed 2020-12-01 10:40:20 +0800
- 添加和删除层功能 · 6c9308ed
  6c9308ed Browse Files
  
  杨威 committed 2020-12-01 10:37:46 +0800
- feat(lpbContent):上下左右移动户联调接口 · e488f5f0
  e488f5f0 Browse Files
  
  weimo934 committed 2020-12-01 10:27:45 +0800
30 Nov, 2020 23 commits
- 宗地自然幢删除代码修改 · 29473d18
  29473d18 Browse Files
  
  焦泽平 committed 2020-11-30 18:16:23 +0800
- 删除debugger · 43a753c0
  43a753c0 Browse Files
  
  杨威 committed 2020-11-30 17:29:37 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 8eb294d3
  8eb294d3 Browse Files
  
  杨威 committed 2020-11-30 17:26:03 +0800
- 实预测类型切换时，清除选中状态和数据 · 83b3844e
  83b3844e Browse Files
  
  杨威 committed 2020-11-30 17:25:31 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 4cb5f1a8
  4cb5f1a8 Browse Files
  
  焦泽平 committed 2020-11-30 16:48:21 +0800
- Merge remote-tracking branch 'origin/master' · 5e61439b ...
  5e61439b Browse Files
```
# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
```
  weimo934 committed 2020-11-30 16:47:17 +0800
- 层右键菜单 · 808b8c7f
  808b8c7f Browse Files
  
  焦泽平 committed 2020-11-30 16:46:29 +0800
- feat(*):、宗地分割宗地合并自然幢、户重新落宗选择宗地,添加功能：权属状态=1 or 权属状态=2 · 867c6bbc
  867c6bbc
  
  weimo934 committed 2020-11-30 16:45:00 +0800
- 全局修改不可编辑input框背景色 · 2dd00fd9
  2dd00fd9 Browse Files
  
  杨威 committed 2020-11-30 16:39:16 +0800
- 自然幢表单样式调整, · 353f34d3
  353f34d3 Browse Files
  
  杨威 committed 2020-11-30 16:33:04 +0800
- 范围属性变更办理增加二次提醒 · 9965f665
  9965f665 Browse Files
  
  杨威 committed 2020-11-30 15:16:08 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 76b5450e
  76b5450e Browse Files
  
  杨威 committed 2020-11-30 15:10:53 +0800
- 宗地右键菜单根据权属状态判断是否可以添加定着物 · 8d1a55a2
  8d1a55a2 Browse Files
  
  杨威 committed 2020-11-30 15:10:40 +0800
- Merge remote-tracking branch 'origin/master' · cd1d73e7
  cd1d73e7 Browse Files
  
  weimo934 committed 2020-11-30 14:45:57 +0800
- fix(Home):连续新建宗地重新加载左侧目录树 · aa4ac7f8
  aa4ac7f8
  
  weimo934 committed 2020-11-30 14:45:45 +0800
- 删除增加二次提醒，删除成功后，页面跳转到首页 · ad511cad
  ad511cad Browse Files
  
  杨威 committed 2020-11-30 14:42:02 +0800
- 全局修改elm表格的表头颜色 · c9646189
  c9646189 Browse Files
  
  杨威 committed 2020-11-30 14:34:29 +0800
- feat(create):重置数据 · 4d12d7cc
  4d12d7cc Browse Files
  
  weimo934 committed 2020-11-30 14:29:52 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · d3ce1069
  d3ce1069 Browse Files
  
  杨威 committed 2020-11-30 14:11:57 +0800
- 首页样式调整 · 8458ee59
  8458ee59
  
  杨威 committed 2020-11-30 14:11:51 +0800
- 连续新建宗地时，宗地信息不更新bug · f5fa2fa1
  f5fa2fa1 Browse Files
  
  杨威 committed 2020-11-30 14:10:56 +0800
- 多幢右键菜单删除功能 · c6be2030
  c6be2030 Browse Files
  
  杨威 committed 2020-11-30 14:09:56 +0800
- 更正：列表点击办理，增加二次提醒：是否确定更正该宗地\自然幢\多幢 · 15a09fff
  15a09fff Browse Files
  
  杨威 committed 2020-11-30 14:08:54 +0800