Commits · 3e6b5f1592187e68fea27e3d7f2f2faf49d3586b · 任超 / js.CadastralSystem · GitLab

09 Dec, 2020 11 commits
- Merge remote-tracking branch 'origin/master' · 3e6b5f15
  3e6b5f15 Browse Files
  
  zhaoqian committed 2020-12-09 16:15:47 +0800
- 户编辑页面调整 · 0f9daf12
  0f9daf12
  
  zhaoqian committed 2020-12-09 16:15:36 +0800
- Merge remote-tracking branch 'origin/master' into master · d6ec1003
  d6ec1003 Browse Files
  
  杨威 committed 2020-12-09 16:13:19 +0800
- gis定位功实现刷新页面左侧菜单跟着刷新 · 93e929f8
  93e929f8
  
  杨威 committed 2020-12-09 16:12:18 +0800
- bsm错误 · 9c0ce83f
  9c0ce83f Browse Files
  
  zhaoqian committed 2020-12-09 15:51:02 +0800
- 权属状态禁用状态 · 1dc67837
  1dc67837 Browse Files
  
  zhaoqian committed 2020-12-09 15:43:48 +0800
- 实测预测数据不复现 · 8ac44502
  8ac44502 Browse Files
  
  zhaoqian committed 2020-12-09 15:42:14 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · ba92d878
  ba92d878 Browse Files
  
  杨威 committed 2020-12-09 15:25:19 +0800
- 楼盘表户左右合并 · 95424509
  95424509
  
  杨威 committed 2020-12-09 15:25:09 +0800
- Merge remote-tracking branch 'origin/master' into master · 6f4675db
  6f4675db Browse Files
  
  杨威 committed 2020-12-09 14:37:49 +0800
- 文件导出模板下载 · 36e2bd77
  36e2bd77
  
  杨威 committed 2020-12-09 14:37:12 +0800
08 Dec, 2020 29 commits
- Merge remote-tracking branch 'origin/master' · 1b0d010a
  1b0d010a Browse Files
  
  zhaoqian committed 2020-12-08 20:00:37 +0800
- hbj页面 · ac695d2a
  ac695d2a
  
  zhaoqian committed 2020-12-08 20:00:20 +0800
- Merge remote-tracking branch 'origin/master' · 0a3a38d6
  0a3a38d6 Browse Files
  
  weimo934 committed 2020-12-08 19:23:05 +0800
- fix(hbj):迁移户表单按钮及功能 · 220f0aab
  220f0aab
  
  weimo934 committed 2020-12-08 19:22:54 +0800
- 变更模块下的宗地分割页面重绘 · fb67cc55
  fb67cc55 Browse Files
  
  杨威 committed 2020-12-08 19:20:13 +0800
- 户编辑修改 · 1ce5b014
  1ce5b014 Browse Files
  
  杨威 committed 2020-12-08 17:52:43 +0800
- Merge remote-tracking branch 'origin/master' · 8aa76ec9
  8aa76ec9 Browse Files
  
  weimo934 committed 2020-12-08 17:42:59 +0800
- feat(hbj):添加户选项卡 · 99fb18d1
  99fb18d1 Browse Files
  
  weimo934 committed 2020-12-08 17:42:46 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 17ddc62b
  17ddc62b Browse Files
  
  杨威 committed 2020-12-08 16:16:42 +0800
- 楼盘表默认加载预测类型数据 · a05edcc3
  a05edcc3 Browse Files
  
  杨威 committed 2020-12-08 16:16:14 +0800
- Merge remote-tracking branch 'origin/master' · f6b4106f
  f6b4106f Browse Files
  
  zhaoqian committed 2020-12-08 15:19:59 +0800
- 实测预测数据不复现 · 2cb34c31
  2cb34c31 Browse Files
  
  zhaoqian committed 2020-12-08 15:19:51 +0800
- 取消数据请求的loading · db6f3d57
  db6f3d57 Browse Files
  
  杨威 committed 2020-12-08 15:13:51 +0800
- Merge remote-tracking branch 'origin/master' into master · b7acbe79 ...
  b7acbe79
```
# Conflicts:
#	src/views/zd/zddcb/index.vue
```
  杨威 committed 2020-12-08 15:04:57 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 09e91025
  09e91025 Browse Files
  
  杨威 committed 2020-12-08 15:01:24 +0800
- 添加导出图形的二级菜单 · d53c1fa9
  d53c1fa9 Browse Files
  
  杨威 committed 2020-12-08 15:01:12 +0800
- Merge remote-tracking branch 'origin/master' · 5264cb68
  5264cb68 Browse Files
  
  zhaoqian committed 2020-12-08 14:45:45 +0800
- 历史回溯，样式调整 · 4f6f3235
  4f6f3235 Browse Files
  
  zhaoqian committed 2020-12-08 14:45:35 +0800
- Merge remote-tracking branch 'origin/master' · ef92b346
  ef92b346 Browse Files
  
  weimo934 committed 2020-12-08 14:45:20 +0800
- fix(qlxz):日期控件验证 · 8ee23bee
  8ee23bee
  
  weimo934 committed 2020-12-08 14:45:08 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 22996745
  22996745 Browse Files
  
  杨威 committed 2020-12-08 14:33:17 +0800
- 优化楼盘表渲染,户权属状态图标click冒泡处理 · 29e92088
  29e92088
  
  杨威 committed 2020-12-08 14:32:53 +0800
- Merge remote-tracking branch 'origin/master' · d2b91f8e
  d2b91f8e
  
  weimo934 committed 2020-12-08 14:26:23 +0800
- :to(qlxz):起始时间结束时间验证, · 5871b1ea
  5871b1ea
  
  weimo934 committed 2020-12-08 14:26:09 +0800
- 面积分摊表/界址点/界址线/附件材料样式调整 · 80e074a9
  80e074a9
  
  杨威 committed 2020-12-08 11:35:35 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 86dc3fcc
  86dc3fcc Browse Files
  
  杨威 committed 2020-12-08 09:53:13 +0800
- Merge remote-tracking branch 'origin/master' · 0c707bb8
  0c707bb8 Browse Files
  
  zhaoqian committed 2020-12-08 09:36:19 +0800
- 前端容积率说明字段 · 5ec68da2
  5ec68da2 Browse Files
  
  zhaoqian committed 2020-12-08 09:36:08 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 09d5079e
  09d5079e Browse Files
  
  杨威 committed 2020-12-08 09:34:00 +0800