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

03 Dec, 2020 4 commits
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · ffe684e2
  ffe684e2 Browse File
  
  杨威 committed 2020-12-03 09:08:19 +0800
- 宗地下新建自然幢dzbsm字段传值修改 · 98fe80fa
  98fe80fa Browse File
  
  杨威 committed 2020-12-03 09:07:20 +0800
- Merge remote-tracking branch 'origin/master' into master · b588a832
  b588a832 Browse Files
  
  杨威 committed 2020-12-03 08:58:44 +0800
- 行政区、地籍区、地籍子区覆盖判断 · ca888098
  ca888098 Browse File
  
  杨威 committed 2020-12-03 08:58:06 +0800
02 Dec, 2020 13 commits
- Merge remote-tracking branch 'origin/master' · 6b6b617c
  6b6b617c Browse Files
  
  weimo934 committed 2020-12-02 17:48:39 +0800
- feat(fg,fjcl):修改分割.附件材料bug · 171e741b
  171e741b Browse File
  
  weimo934 committed 2020-12-02 17:48:00 +0800
- Merge remote-tracking branch 'origin/master' · 10ff3d16
  10ff3d16 Browse Files
  
  zhaoqian committed 2020-12-02 17:20:44 +0800
- glbsm · a47f6c04
  a47f6c04 Browse File
  
  zhaoqian committed 2020-12-02 17:20:39 +0800
- 楼盘表右侧选择图例类型时默认展开图例 · 0ec82dee
  0ec82dee Browse Files
  
  杨威 committed 2020-12-02 17:18:55 +0800
- 左侧树结构收缩样式修改 · 033bf6fe
  033bf6fe Browse File
  
  杨威 committed 2020-12-02 16:53:05 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · d8068b07
  d8068b07 Browse Files
  
  杨威 committed 2020-12-02 15:11:52 +0800
- 首页样式调整，左侧树结构收起的样式修改 · 7fdad9b3
  7fdad9b3 Browse File
  
  杨威 committed 2020-12-02 15:11:38 +0800
- Merge remote-tracking branch 'origin/master' · 69a5ae2b
  69a5ae2b Browse Files
  
  weimo934 committed 2020-12-02 13:46:15 +0800
- fix(fg):修改分割后宗地回填数据 · 4d77cfd8
  4d77cfd8 Browse Files
  
  weimo934 committed 2020-12-02 13:46:02 +0800
- 新增arcgis依赖，babel-polyfill转码 · 344b9c49
  344b9c49 Browse Files
  
  杨威 committed 2020-12-02 10:42:07 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem into master · 6306e097 ...
  6306e097 Browse File
```
 Conflicts:
	src/components/lineTree/lineTree.vue
	src/views/zd/zddcb/index.vue
```
  杨威 committed 2020-12-02 09:21:58 +0800
- gis前端excel上传图形功能 · f43aad33
  f43aad33 Browse Files
  
  杨威 committed 2020-12-02 09:10:47 +0800
01 Dec, 2020 23 commits
- 自然幢信息保存前判断自然幢号和不动产单元号的前19位是否和宗地代码一致 · 8778a3e1
  8778a3e1
  
  杨威 committed 2020-12-01 20:00:19 +0800
- 不动产单元号表单输入框最大位数限制 · c02dda54
  c02dda54 Browse File
  
  杨威 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 Browse Files
  
  杨威 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 File
  
  weimo934 committed 2020-12-01 16:57:57 +0800
- 宗地代码/自然幢号/不动产单元号表单输入框最大位数限制 · 20745797
  20745797 Browse Files
  
  杨威 committed 2020-12-01 16:47:05 +0800
- Merge remote-tracking branch 'origin/master' into master · a9de72a5 ...
  a9de72a5
```
# 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 Browse Files
  
  杨威 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 Browse File
```
# Conflicts:
#	src/components/lineTree/lineItem.vue
#	src/components/lineTree/lineTree.vue
```
  杨威 committed 2020-12-01 15:19:49 +0800
- gis前端工具条等功能实现 · 0ed2b73f
  0ed2b73f Browse File
  
  杨威 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 Browse Files
  
  zhaoqian committed 2020-12-01 11:57:27 +0800
- feat(moveH):调整样式 · 8a077920
  8a077920 Browse Files
  
  weimo934 committed 2020-12-01 11:25:34 +0800