Commits · 4e676d3d3ba1212986f9667c5856ed2d341ca576 · 任超 / js.CadastralSystem · GitLab

02 Dec, 2020 4 commits
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 4e676d3d
  4e676d3d Browse Files
  
  焦泽平 committed 2020-12-02 09:26:19 +0800
- test · b8d49019
  b8d49019 Browse Files
  
  焦泽平 committed 2020-12-02 09:26:10 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem into master · 6306e097 ...
  6306e097
```
 Conflicts:
	src/components/lineTree/lineTree.vue
	src/views/zd/zddcb/index.vue
```
  杨威 committed 2020-12-02 09:21:58 +0800
- gis前端excel上传图形功能 · f43aad33
  f43aad33
  
  杨威 committed 2020-12-02 09:10:47 +0800
01 Dec, 2020 27 commits
- 自然幢信息保存前判断自然幢号和不动产单元号的前19位是否和宗地代码一致 · 8778a3e1
  8778a3e1 Browse Files
  
  杨威 committed 2020-12-01 20:00:19 +0800
- 不动产单元号表单输入框最大位数限制 · c02dda54
  c02dda54
  
  杨威 committed 2020-12-01 19:34:48 +0800
- 宗地表单保存前判断宗地代码和不动产单元号前14位是否和底盘代码一致 · e7218407
  e7218407 Browse Files
  
  杨威 committed 2020-12-01 19:33:11 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 05eb8c3b
  05eb8c3b Browse Files
  
  焦泽平 committed 2020-12-01 19:05:27 +0800
- 更正功能办理成功目录树表单刷新 · 10c3f5af
  10c3f5af Browse Files
  
  焦泽平 committed 2020-12-01 19:05:13 +0800
- 楼盘表双击户打开的户编辑弹框样式调整 · 2be0a4ef
  2be0a4ef
  
  杨威 committed 2020-12-01 17:33:21 +0800
- 户表单样式调整，增加宽度、高度 · 0abf3d46
  0abf3d46 Browse Files
  
  杨威 committed 2020-12-01 17:00:34 +0800
- Merge remote-tracking branch 'origin/master' · 82416799
  82416799 Browse Files
  
  weimo934 committed 2020-12-01 16:58:09 +0800
- feat(bjlp,lineTree):添加删除逻辑幢、幢单元 · 7cf9b4cb
  7cf9b4cb Browse Files
  
  weimo934 committed 2020-12-01 16:57:57 +0800
- 宗地代码/自然幢号/不动产单元号表单输入框最大位数限制 · 20745797
  20745797
  
  杨威 committed 2020-12-01 16:47:05 +0800
- 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 Browse Files
  
  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 Browse Files
  
  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 9 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