09a5643c by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 5345a113 5fece3e9
1 import request from '@/plugin/axios'
2
3 /**
4 * 新增构筑物基本信息
5 */
6 export function insertGzwjbxx(data) {
7 return request({
8 url: '/system/qjGzw/insertQjGzw',
9 method: 'post',
10 data: data,
11 })
12 }
13
14 /**
15 * 生成不动产单元号
16 */
17 export function getBdcdyh(dpdm, dptype) {
18 return request({
19 url: '/system/generator/getBdcdyh',
20 method: 'get',
21 params: {
22 dpdm: dpdm,
23 dptype: dptype
24 }
25 })
26 }
27
28 /**
29 * 更新构筑物基本信息
30 */
31 export function updateGzwjbxx(data) {
32 return request({
33 url: '/system/qjGzw/updateQjGzw',
34 method: 'put',
35 data: data,
36 })
37 }
38
39 /**
40 * 获取构筑物基本信息
41 */
42 export function getQjGzwDetailInfo(data) {
43 return request({
44 url: '/system/qjGzw/getQjGzwDetailById',
45 method: 'get',
46 params: {
47 id: data
48 }
49 })
50 }
...\ No newline at end of file ...\ No newline at end of file

25.4 KB | W: | H:

25.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div class="search"> 10 <div class="search">
11 <el-button type="primary" @click="search">查询</el-button> 11 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> 12 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
13 <el-row :gutter="10" class="shop"> 13 <el-row :gutter="10" class="shop">
14 <el-col :span="4" class="inputtitle"> 14 <el-col :span="4" class="inputtitle">
15 宗地编码: 15 宗地编码:
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </div> 18 </div>
19 <div slot="footer" class="dialog_footer"> 19 <div slot="footer" class="dialog_footer">
20 <el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button> 20 <el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button>
21 <el-button size="small" @click="resetForm('ruleForm')">重置</el-button> 21 <el-button size="small" @click="resetForm('ruleForm')" icon="el-icon-refresh">重置</el-button>
22 <el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button> 22 <el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button>
23 </div> 23 </div>
24 </el-dialog> 24 </el-dialog>
......
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
196 placeholder="输入不动产单元号" 196 placeholder="输入不动产单元号"
197 ></el-input> 197 ></el-input>
198 </el-form-item> 198 </el-form-item>
199 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 199 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
200 <el-button type="warning" @click="reset">重置</el-button> 200 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
201 </el-form> 201 </el-form>
202 </el-col> 202 </el-col>
203 </el-row> 203 </el-row>
...@@ -294,8 +294,8 @@ ...@@ -294,8 +294,8 @@
294 placeholder="输入不动产单元号" 294 placeholder="输入不动产单元号"
295 ></el-input> 295 ></el-input>
296 </el-form-item> 296 </el-form-item>
297 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 297 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
298 <el-button type="warning" @click="reset">重置</el-button> 298 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
299 </el-form> 299 </el-form>
300 </el-col> 300 </el-col>
301 </el-row> 301 </el-row>
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 placeholder="输入不动产单元号" 30 placeholder="输入不动产单元号"
31 ></el-input> 31 ></el-input>
32 </el-form-item> 32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 33 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button> 34 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
35 </el-form> 35 </el-form>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
2 <div class="temp"> 2 <div class="temp">
3 <div class="qlxzAdd fl"> 3 <div class="qlxzAdd fl">
4 <span>权利性质</span> 4 <span>权利性质</span>
5 <i class="iconfont iconicon-test2" @click="handleClick(0, 'add')"></i> 5 <i class="iconfont iconicon-test2" v-if="formData.qszt=='0'" @click="handleClick(0, 'add')"></i>
6 <i class="iconfont iconicon-test2" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
6 </div> 7 </div>
7 <el-row 8 <el-row
8 class="qlxzModule fl" 9 class="qlxzModule fl"
...@@ -16,7 +17,8 @@ ...@@ -16,7 +17,8 @@
16 :key="childIndex + '1'" 17 :key="childIndex + '1'"
17 :class="childIndex > 0 ? 'childYT noTopBorder' : ''" 18 :class="childIndex > 0 ? 'childYT noTopBorder' : ''"
18 > 19 >
19 <i v-show="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i> 20 <i v-show="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i>
21 <i v-show="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" style="cursor: not-allowed;"></i>
20 <div 22 <div
21 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'" 23 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
22 v-if="items.isInside" 24 v-if="items.isInside"
...@@ -30,7 +32,8 @@ ...@@ -30,7 +32,8 @@
30 > 32 >
31 <template> 33 <template>
32 <span v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 40 + 'px'}">土地用途</span> 34 <span v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 40 + 'px'}">土地用途</span>
33 <i class="iconfont iconicon-test1" v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i> 35 <i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i>
36 <i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" style="cursor: not-allowed;"></i>
34 </template> 37 </template>
35 </el-col> 38 </el-col>
36 <el-col 39 <el-col
...@@ -39,7 +42,8 @@ ...@@ -39,7 +42,8 @@
39 :key="childIndex + '18'" 42 :key="childIndex + '18'"
40 :class="childIndex > 0 ? 'childYT' : ''" 43 :class="childIndex > 0 ? 'childYT' : ''"
41 > 44 >
42 <i class="iconfont iconicon-test" @click="handleInClick(index, childIndex, 'minus')"></i> 45 <i class="iconfont iconicon-test" v-if="formData.qszt=='0'" @click="handleInClick(index, childIndex, 'minus')"></i>
46 <i class="iconfont iconicon-test" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
43 </el-col> 47 </el-col>
44 <template v-if="hasSyqx"> 48 <template v-if="hasSyqx">
45 <el-col 49 <el-col
......
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
171 }, 171 },
172 // 右键点击事件 172 // 右键点击事件
173 openMenu(e, item,list) { 173 openMenu(e, item,list) {
174 console.log(list,'右键list'); 174 console.log(item,'右键list');
175 this.$emit("changeTop", e.pageY); 175 this.$emit("changeTop", e.pageY);
176 this.$emit("changeLeft", e.pageX); 176 this.$emit("changeLeft", e.pageX);
177 this.$emit("changeZdData",item); 177 this.$emit("changeZdData",item);
...@@ -200,7 +200,9 @@ export default { ...@@ -200,7 +200,9 @@ export default {
200 case 'ljz': 200 case 'ljz':
201 this.$emit("changeLpbVisible", true); 201 this.$emit("changeLpbVisible", true);
202 break; 202 break;
203 203 case 'gzw':
204 this.$emit("changeGzwVisible", true);
205 break;
204 default: 206 default:
205 break; 207 break;
206 } 208 }
...@@ -209,29 +211,25 @@ export default { ...@@ -209,29 +211,25 @@ export default {
209 dbclick(item,bsm) { 211 dbclick(item,bsm) {
210 clearTimeout(this.time); 212 clearTimeout(this.time);
211 this.$store.state.newZdbsm = bsm; 213 this.$store.state.newZdbsm = bsm;
212 //此处不要将$router移到if的外面,因为可能是双击行政区,就不知道去哪儿了 214 switch (item.type) {
213 if (item.type == 'zd') { 215 case 'zd':
214 this.$store.state.zdbsm = item.bsm; 216 this.$store.state.zdbsm = item.bsm;
215 this.$router.push({ 217 break;
216 path: '/'+item.type, 218 case 'zrz':
217 query:{ 219 this.$store.state.zrzbsm = item.bsm;
218 source: 2, 220 break;
219 bsm:item.bsm, 221 case 'dz':
220 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2' 222 this.$store.state.dzbsm = item.bsm;
221 } 223 break;
222 }); 224 case 'gzw':
223 }else if(item.type == 'zrz'){ 225 this.$store.state.gzwbsm = item.bsm;
224 this.$store.state.zrzbsm = item.bsm; 226 break;
225 this.$router.push({ 227
226 path: '/'+item.type, 228 default:
227 query:{ 229 break;
228 source: 2, 230 }
229 bsm:item.bsm, 231
230 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2' 232 if(item.type){
231 }
232 });
233 }else if(item.type == 'dz'){
234 this.$store.state.dzbsm = item.bsm;
235 this.$router.push({ 233 this.$router.push({
236 path: '/'+item.type, 234 path: '/'+item.type,
237 query:{ 235 query:{
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
45 @changeIsZD="changeIsZD" 45 @changeIsZD="changeIsZD"
46 @changeCreateVisible="changeCreateVisible" 46 @changeCreateVisible="changeCreateVisible"
47 @changeDzVisible="changeDzVisible" 47 @changeDzVisible="changeDzVisible"
48 @changeGzwVisible="changeGzwVisible"
48 :list="item.children" 49 :list="item.children"
49 :visible="visible" 50 :visible="visible"
50 :size="size" 51 :size="size"
...@@ -92,6 +93,14 @@ ...@@ -92,6 +93,14 @@
92 > 93 >
93 <li @click="openCreateDialog">新建宗地</li> 94 <li @click="openCreateDialog">新建宗地</li>
94 </ul> 95 </ul>
96 <!-- 构筑物删除 -->
97 <ul
98 v-show="gzwVisible"
99 :style="{ left: left + 'px', top: top + 'px' }"
100 class="contextmenu"
101 >
102 <li @click="deleteByBsm">删除</li>
103 </ul>
95 <ul 104 <ul
96 v-show="lpbvisible" 105 v-show="lpbvisible"
97 :style="{ left: lpbleft + 'px', top: lpbtop + 'px' }" 106 :style="{ left: lpbleft + 'px', top: lpbtop + 'px' }"
...@@ -171,6 +180,8 @@ export default { ...@@ -171,6 +180,8 @@ export default {
171 zdQszt:null, 180 zdQszt:null,
172 wkt:"PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]", 181 wkt:"PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]",
173 createZrz:false, 182 createZrz:false,
183 //构筑物
184 gzwVisible:false
174 }; 185 };
175 }, 186 },
176 watch: { 187 watch: {
...@@ -264,7 +275,11 @@ export default { ...@@ -264,7 +275,11 @@ export default {
264 }, 275 },
265 //多幢 276 //多幢
266 changeDzVisible(data){ 277 changeDzVisible(data){
267 this.dzVisible = data 278 this.dzVisible = data;
279 },
280 //构筑物
281 changeGzwVisible(data){
282 this.gzwVisible = data;
268 }, 283 },
269 //添加定着物 284 //添加定着物
270 openCreateDialog(type){ 285 openCreateDialog(type){
...@@ -388,6 +403,9 @@ export default { ...@@ -388,6 +403,9 @@ export default {
388 case 'zrz': 403 case 'zrz':
389 name = '自然幢' 404 name = '自然幢'
390 break; 405 break;
406 case 'gzw':
407 name = '构筑物'
408 break;
391 409
392 default: 410 default:
393 break; 411 break;
...@@ -640,10 +658,10 @@ export default { ...@@ -640,10 +658,10 @@ export default {
640 }, 658 },
641 659
642 //关闭图形弹框 660 //关闭图形弹框
643 closeImportDialog(){ 661 closeImportDialog(){
644 this.improtDialog = false; 662 this.improtDialog = false;
645 this.clearOverLayer(); 663 this.clearOverLayer();
646 } 664 }
647 665
648 }, 666 },
649 }; 667 };
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 </div> 61 </div>
62 <div class="shop"> 62 <div class="shop">
63 <el-button type="primary" @click="save">保存</el-button> 63 <el-button type="primary" @click="save">保存</el-button>
64 <el-button type="primary" @click="result">重置</el-button> 64 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
65 <el-button type="primary" @click="cancel">取消</el-button> 65 <el-button type="primary" @click="cancel">取消</el-button>
66 </div> 66 </div>
67 </el-dialog> 67 </el-dialog>
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
211 </div> 211 </div>
212 <div class="shop"> 212 <div class="shop">
213 <el-button type="primary" @click="save">保存</el-button> 213 <el-button type="primary" @click="save">保存</el-button>
214 <el-button type="primary" @click="reset">重置</el-button> 214 <el-button type="primary" @click="reset" icon="el-icon-refresh">重置</el-button>
215 <el-button type="primary" @click="cancel">取消</el-button> 215 <el-button type="primary" @click="cancel">取消</el-button>
216 </div> 216 </div>
217 </el-dialog> 217 </el-dialog>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </div> 74 </div>
75 <div class="shop"> 75 <div class="shop">
76 <el-button type="primary" @click="save">保存</el-button> 76 <el-button type="primary" @click="save">保存</el-button>
77 <el-button type="primary" @click="result">重置</el-button> 77 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
78 <el-button type="primary" @click="cancel">取消</el-button> 78 <el-button type="primary" @click="cancel">取消</el-button>
79 </div> 79 </div>
80 </el-dialog> 80 </el-dialog>
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 </div> 94 </div>
95 <div class="shop"> 95 <div class="shop">
96 <el-button type="primary" @click="save">保存</el-button> 96 <el-button type="primary" @click="save">保存</el-button>
97 <el-button type="primary" @click="result">重置</el-button> 97 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
98 <el-button type="primary" @click="close">取消</el-button> 98 <el-button type="primary" @click="close">取消</el-button>
99 </div> 99 </div>
100 </el-dialog> 100 </el-dialog>
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="search"> 3 <div class="search">
4 <el-button type="primary" @click="search">查询</el-button> 4 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
5 <el-button type="primary" @click="result">重置</el-button> 5 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
6 <el-row :gutter="10" class="shop"> 6 <el-row :gutter="10" class="shop">
7 <el-col :span="4" class="inputtitle"> 7 <el-col :span="4" class="inputtitle">
8 宗地编码: 8 宗地编码:
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 > 9 >
10 <div class="search"> 10 <div class="search">
11 <!-- <el-button type="primary" @click="search">查询</el-button> 11 <!-- <el-button type="primary" @click="search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> --> 12 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> -->
13 13
14 <el-row> 14 <el-row>
15 <el-col :span="24"> 15 <el-col :span="24">
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 placeholder="输入不动产单元号" 33 placeholder="输入不动产单元号"
34 ></el-input> 34 ></el-input>
35 </el-form-item> 35 </el-form-item>
36 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 36 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
37 <el-button type="warning" @click="reset">重置</el-button> 37 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
38 </el-form> 38 </el-form>
39 </el-col> 39 </el-col>
40 </el-row> 40 </el-row>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
29 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> 29 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
30 <el-button type="warning" @click="reset">重置</el-button> 30 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
31 <el-button 31 <el-button
32 type="primary" 32 type="primary"
33 @click="moreSearch" 33 @click="moreSearch"
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
74 <el-checkbox label="zd" name="type">宗地</el-checkbox> 74 <el-checkbox label="zd" name="type">宗地</el-checkbox>
75 <el-checkbox label="dz" name="type">多幢</el-checkbox> 75 <el-checkbox label="dz" name="type">多幢</el-checkbox>
76 <el-checkbox label="zrz" name="type">自然幢</el-checkbox> 76 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
77 <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
77 <el-checkbox label="h" name="type" v-show="type !== 'add'"></el-checkbox> 78 <el-checkbox label="h" name="type" v-show="type !== 'add'"></el-checkbox>
78 <!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox> 79 <!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
79 <el-checkbox label="lq" name="type">林权</el-checkbox> 80 <el-checkbox label="lq" name="type">林权</el-checkbox>
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 placeholder="输入不动产单元号" 30 placeholder="输入不动产单元号"
31 ></el-input> 31 ></el-input>
32 </el-form-item> 32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 33 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button> 34 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
35 </el-form> 35 </el-form>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......
...@@ -45,5 +45,9 @@ let bdcLxArray = [ ...@@ -45,5 +45,9 @@ let bdcLxArray = [
45 label: "多幢", 45 label: "多幢",
46 value: "dz", 46 value: "dz",
47 }, 47 },
48 {
49 label: "构筑物",
50 value: "gzw",
51 },
48 ]; 52 ];
49 createFilter("bdcLxFilter", bdcLxArray); 53 createFilter("bdcLxFilter", bdcLxArray);
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -77,6 +77,12 @@ const constantRoutes = [ ...@@ -77,6 +77,12 @@ const constantRoutes = [
77 component: () => import("@/views/systemH/index"), 77 component: () => import("@/views/systemH/index"),
78 }, 78 },
79 { 79 {
80 path: "/gzw",
81 name: "构筑物",
82 code: "1-7",
83 component: () => import("@/views/gzw/index"),
84 },
85 {
80 path: "/viewMap", 86 path: "/viewMap",
81 name: "地图", 87 name: "地图",
82 code: "0-6", 88 code: "0-6",
......
...@@ -41,6 +41,7 @@ const store = new Vuex.Store({ ...@@ -41,6 +41,7 @@ const store = new Vuex.Store({
41 jgOptions:[], 41 jgOptions:[],
42 gmjjhyflbsmList:[], 42 gmjjhyflbsmList:[],
43 fwytList:[], 43 fwytList:[],
44 gzwlxList:[],
44 //创建自然幢时需要用到的临时存储信息 45 //创建自然幢时需要用到的临时存储信息
45 zrzbsm: '', 46 zrzbsm: '',
46 zjlxList: [], 47 zjlxList: [],
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
33 <span>{{ item.name }}</span> 33 <span>{{ item.name }}</span>
34 </div> 34 </div>
35 35
36 <div class="top-items tuOrShu" > 36 <div class="top-items tuOrShu" >
37 <i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i> 37 <i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i>
38 <i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i> 38 <i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i>
39 </div> 39 </div>
40 </div> 40 </div>
41 <!-- <div class="header-bottom"> 41 <!-- <div class="header-bottom">
42 <Navigation ref="navigation"></Navigation> 42 <Navigation ref="navigation"></Navigation>
...@@ -226,6 +226,8 @@ export default { ...@@ -226,6 +226,8 @@ export default {
226 this.getRightTree(this.$store.state.zdbsm) 226 this.getRightTree(this.$store.state.zdbsm)
227 }else if(this.$route.path == '/dz'){ 227 }else if(this.$route.path == '/dz'){
228 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth) 228 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
229 }else if(this.$route.path == '/gzw'){
230 this.getTreeByBsm(this.$store.state.gzwbsm,'gzw',this.$route.query.auth)
229 }else{ 231 }else{
230 this.getTreeList(); 232 this.getTreeList();
231 } 233 }
...@@ -272,6 +274,7 @@ export default { ...@@ -272,6 +274,7 @@ export default {
272 s.hxList = s.hxList.length == 0 ?await this.getDicData("户型") : s.hxList; 274 s.hxList = s.hxList.length == 0 ?await this.getDicData("户型") : s.hxList;
273 s.hxjgList = s.hxjgList.length == 0 ?await this.getDicData("户型结构") : s.hxjgList; 275 s.hxjgList = s.hxjgList.length == 0 ?await this.getDicData("户型结构") : s.hxjgList;
274 s.fwjgList = s.fwjgList.length == 0 ?await this.getDicData("户型结构") : s.fwjgList; 276 s.fwjgList = s.fwjgList.length == 0 ?await this.getDicData("户型结构") : s.fwjgList;
277 s.gzwlxList = s.gzwlxList.length == 0 ?await this.getDicData("构(建)筑物类型") : s.gzwlxList;
275 278
276 s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions; 279 s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions;
277 s.cbOptions = s.cbOptions.length == 0 ?await this.getDicData("房屋产别") : s.cbOptions; 280 s.cbOptions = s.cbOptions.length == 0 ?await this.getDicData("房屋产别") : s.cbOptions;
......
1 <template>
2 <gzwInfo></gzwInfo>
3 </template>
4
5 <script>
6 import gzwInfo from './jbxx/index';
7 export default {
8 name: "index",
9 components:{
10 gzwInfo,
11 },
12 }
13 </script>
14
15 <style scoped>
16
17 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 <div class="log-search"> 3 <div class="log-search">
4 字典名称: 4 字典名称:
5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input> 5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
6 <el-button type="primary" @click="query">查询</el-button> 6 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
7 <el-button type="warning" @click="reset">重置</el-button> 7 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
8 </div> 8 </div>
9 <div class="log-detail"> 9 <div class="log-detail">
10 <div class="log-menu"> 10 <div class="log-menu">
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 value-format="yyyy-MM-dd HH:mm:ss" 19 value-format="yyyy-MM-dd HH:mm:ss"
20 :picker-options="pickerOptions"> 20 :picker-options="pickerOptions">
21 </el-date-picker> 21 </el-date-picker>
22 <el-button type="primary" @click="query">查询</el-button> 22 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
23 <el-button type="warning" @click="reset">重置</el-button> 23 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
24 <el-button type="info" @click="getError">错误日志</el-button> 24 <el-button type="info" @click="getError">错误日志</el-button>
25 </div> 25 </div>
26 26
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
25 placeholder="输入不动产单元号" 25 placeholder="输入不动产单元号"
26 ></el-input> 26 ></el-input>
27 </el-form-item> 27 </el-form-item>
28 <el-button type="primary" @click="search">查询</el-button> 28 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
29 <el-button type="warning" style="margin-left:10px" @click="result">重置</el-button> 29 <el-button type="warning" style="margin-left:10px" @click="result" icon="el-icon-refresh">重置</el-button>
30 </el-form> 30 </el-form>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-tab-pane label="宗地分割" name="zd"> 4 <el-tab-pane label="宗地分割" name="zd">
5 <div class="fg-tabs top20"> 5 <div class="fg-tabs top20">
6 <span class="tips">分割前宗地信息</span> 6 <span class="tips">分割前宗地信息</span>
7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 7 <el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
8 <div class="fgq"> 8 <div class="fgq">
9 <el-card class="data"> 9 <el-card class="data">
10 <div slot="header" class="clearfix"> 10 <div slot="header" class="clearfix">
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
181 <el-tab-pane label="多幢分割" name="dz"> 181 <el-tab-pane label="多幢分割" name="dz">
182 <div class="fg-tabs top20"> 182 <div class="fg-tabs top20">
183 <span class="tips">分割前多幢信息</span> 183 <span class="tips">分割前多幢信息</span>
184 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 184 <el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
185 <div class="fgq"> 185 <div class="fgq">
186 <el-card class="data"> 186 <el-card class="data">
187 <div slot="header" class="clearfix"> 187 <div slot="header" class="clearfix">
...@@ -1212,13 +1212,14 @@ ...@@ -1212,13 +1212,14 @@
1212 } 1212 }
1213 1213
1214 .cz, .xh { 1214 .cz, .xh {
1215 width: 100px; 1215 width: 80px;
1216 } 1216 }
1217 1217
1218 .xzq, .djq, .djzq { 1218 .xzq, .djq, .djzq {
1219 width: 150px; 1219 width: 150px;
1220 } 1220 }
1221 1221
1222
1222 .search { 1223 .search {
1223 color: #BBB !important; 1224 color: #BBB !important;
1224 } 1225 }
...@@ -1227,6 +1228,7 @@ ...@@ -1227,6 +1228,7 @@
1227 width: 210px; 1228 width: 210px;
1228 display: block; 1229 display: block;
1229 margin: 10px auto; 1230 margin: 10px auto;
1231 border: 1px solid #F2F2F2;
1230 } 1232 }
1231 /deep/ .el-select{ 1233 /deep/ .el-select{
1232 width: 100%; 1234 width: 100%;
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
22 placeholder="输入不动产单元号" 22 placeholder="输入不动产单元号"
23 ></el-input> 23 ></el-input>
24 </el-form-item> 24 </el-form-item>
25 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 25 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
26 <el-button type="warning" @click="reset">重置</el-button> 26 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
27 </el-form> 27 </el-form>
28 </el-col> 28 </el-col>
29 </el-row> 29 </el-row>
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
3 <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
4 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane> 3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane> 4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane> 6 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
8 </el-tabs> 7 </el-tabs>
9 </div>
10 </template> 8 </template>
11 9
12 <script> 10 <script>
......
...@@ -133,10 +133,18 @@ ...@@ -133,10 +133,18 @@
133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
134 </div> 134 </div>
135 </el-tab-pane> 135 </el-tab-pane>
136 <el-tab-pane class="eltabspane" v-if="!createZrz" label="构筑物" name="gzw"> 136 <el-tab-pane class="eltabspane" label="构筑物" name="gzw">
137 <el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
138 <el-form-item label="项目名称" class="w100" prop="xmmc">
139 <el-input
140 v-model="ruleForm4.xmmc"
141 placeholder="项目名称"
142 ></el-input>
143 </el-form-item>
144 </el-form>
137 <div class="handleBtn"> 145 <div class="handleBtn">
138 <el-button type="primary" class="w98 import">导入图形</el-button> 146 <el-button type="primary" class="w98 import">导入图形</el-button>
139 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> 147 <el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button>
140 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 148 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
141 </div> 149 </div>
142 </el-tab-pane> 150 </el-tab-pane>
...@@ -152,6 +160,7 @@ import { ...@@ -152,6 +160,7 @@ import {
152 import { insertQjZdjbxx } from "@api/zd"; 160 import { insertQjZdjbxx } from "@api/zd";
153 import { insertZrzjbxx } from "@api/zrz"; 161 import { insertZrzjbxx } from "@api/zrz";
154 import { insertDzjbxx } from "@api/dz"; 162 import { insertDzjbxx } from "@api/dz";
163 import { insertGzwjbxx } from "@api/gzw";
155 164
156 export default { 165 export default {
157 name: "", 166 name: "",
...@@ -199,6 +208,11 @@ export default { ...@@ -199,6 +208,11 @@ export default {
199 xmmc:'', 208 xmmc:'',
200 userbsm:'' 209 userbsm:''
201 }, 210 },
211 ruleForm4:{
212 zdzhbsm:'',
213 xmmc:'',
214 userbsm:''
215 },
202 rules: { 216 rules: {
203 xzqbsm: [ 217 xzqbsm: [
204 { required: true, message: '请选择行政区', trigger: 'change' } 218 { required: true, message: '请选择行政区', trigger: 'change' }
...@@ -229,6 +243,11 @@ export default { ...@@ -229,6 +243,11 @@ export default {
229 { required: true, message: '请输入项目名称', trigger: 'blur' }, 243 { required: true, message: '请输入项目名称', trigger: 'blur' },
230 ], 244 ],
231 }, 245 },
246 rules4: {
247 xmmc: [
248 { required: true, message: '请输入项目名称', trigger: 'blur' },
249 ],
250 },
232 syqlx: [ 251 syqlx: [
233 { 252 {
234 label: "国家所有", 253 label: "国家所有",
...@@ -341,6 +360,39 @@ export default { ...@@ -341,6 +360,39 @@ export default {
341 }); 360 });
342 361
343 }, 362 },
363 newGzw(){
364 this.$refs['ruleForm4'].validate((valid) => {
365 if (valid) {
366 if(1>0){
367 this.ruleForm4.zdzhbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
368 insertGzwjbxx(this.ruleForm4)
369 .then((res)=>{
370 if(res.code === 200){
371 //获取左侧树数据
372 this.getTreeByBsm(res.result.bsm,'gzw','0,1,2');
373 this.close();
374 this.$router.push({
375 path: '/gzw', query:{
376 source: 1,
377 bsm:res.result.bsm,
378 auth: '0,1,2'
379 }
380 });
381 }
382 })
383 }else {
384 this.close();
385 this.$router.push({
386 path: '/gzw', query:{
387 source: 1,
388 bsm:"12345678901234567890",
389 auth: '0,1,2'
390 }
391 });
392 }
393 }
394 })
395 },
344 newDz() { 396 newDz() {
345 //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 397 //todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
346 this.$refs['ruleForm2'].validate((valid) => { 398 this.$refs['ruleForm2'].validate((valid) => {
......
...@@ -152,6 +152,11 @@ ...@@ -152,6 +152,11 @@
152 this.$store.state.hbsm=row.glbsm 152 this.$store.state.hbsm=row.glbsm
153 this.getTreeByBsm(row.glbsm,'h','0,1,2'); 153 this.getTreeByBsm(row.glbsm,'h','0,1,2');
154 break; 154 break;
155 case "gzw":
156 this.$store.state.gzwbsm = row.glbsm;
157 this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
158 path = "/gzw";
159 break;
155 default: 160 default:
156 break; 161 break;
157 } 162 }
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane> 5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane> 6 <el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> 9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane> 10 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 </div> 12 <!-- </div> -->
13 </template> 13 </template>
14 14
15 <script> 15 <script>
...@@ -71,4 +71,22 @@ export default { ...@@ -71,4 +71,22 @@ export default {
71 watch: {}, 71 watch: {},
72 }; 72 };
73 </script> 73 </script>
74 <style scoped lang="less"></style> 74 <style scoped lang="less">
75 .el-tabs{
76 height: calc(100% - 50px);
77 /deep/.el-tabs__content{
78 height: 100%;
79 /deep/.el-tab-pane{
80 height: 100%;
81 }
82 background: #eaedf5;
83 padding: 0;
84 }
85 /deep/ .el-tabs__item {
86 height: 48px;
87 }
88 /deep/ .el-tabs__header{
89 background-color: #ffffff;
90 }
91 }
92 </style>
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
245 width: 100%; 245 width: 100%;
246 246
247 table { 247 table {
248 margin-top: 10px; 248 // margin-top: 10px;
249 background-color: #fff; 249 background-color: #fff;
250 font-size: 14px; 250 font-size: 14px;
251 width: 100%; 251 width: 100%;
......
...@@ -785,6 +785,10 @@ ...@@ -785,6 +785,10 @@
785 } 785 }
786 }) 786 })
787 .catch((error) => { 787 .catch((error) => {
788 this.$message({
789 message: error.message+",查看日志,联系管理员",
790 type: "error",
791 });
788 }); 792 });
789 //保存到空间库里面 793 //保存到空间库里面
790 var self = this; 794 var self = this;
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
241 </div> 241 </div>
242 <div class="btnGroup"> 242 <div class="btnGroup">
243 <el-button type="primary" @click="saveInfo">保存</el-button> 243 <el-button type="primary" @click="saveInfo">保存</el-button>
244 <el-button type="primary" @click="resetInfo">重置</el-button> 244 <el-button type="primary" @click="resetInfo" icon="el-icon-refresh">重置</el-button>
245 <el-button type="primary" @click="dialogVisible = false" 245 <el-button type="primary" @click="dialogVisible = false"
246 >取消</el-button 246 >取消</el-button
247 > 247 >
......