Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1091b4a8 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 065f0cec 69fab0fe
Inline Side-by-side
Showing 8 changed files with 101 additions and 62 deletions
...@@ -242,4 +242,10 @@ ol, ul { list-style:none; } ...@@ -242,4 +242,10 @@ ol, ul { list-style:none; }
242 } 242 }
243 .creat:hover:focus{ 243 .creat:hover:focus{
244 opacity: .8!important; 244 opacity: .8!important;
245 }
246 .iconfontEdit{
247 cursor: pointer;
248 }
249 .iconfontEdit:hover{
250 color: rgb(0, 108, 255);
245 } 251 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -177,6 +177,9 @@ export default { ...@@ -177,6 +177,9 @@ export default {
177 "$store.state.zdbsm": function(bsm) { 177 "$store.state.zdbsm": function(bsm) {
178 this.getRightTree(bsm); 178 this.getRightTree(bsm);
179 }, 179 },
180 "$store.state.zrzbsm": function(bsm) {
181 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
182 },
180 183
181 "$store.state.treeData":function (val) { 184 "$store.state.treeData":function (val) {
182 console.log(val,'val'); 185 console.log(val,'val');
...@@ -430,6 +433,8 @@ export default { ...@@ -430,6 +433,8 @@ export default {
430 width: 100%; 433 width: 100%;
431 height: 100vh; 434 height: 100vh;
432 position: relative; 435 position: relative;
436 min-width: 1500px;
437 overflow-x: auto;
433 .calcWidth{ 438 .calcWidth{
434 width: calc(100% - 300px); 439 width: calc(100% - 300px);
435 } 440 }
......
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button
17 >
18 <el-button type="text" size="small">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -37,7 +28,17 @@ ...@@ -37,7 +28,17 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
32 </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="办理" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit"></i>
40 </el-tooltip>
41 </template>
41 </el-table-column> 42 </el-table-column>
42 </el-table> 43 </el-table>
43 <div class="pagination"> 44 <div class="pagination">
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
61 return { 62 return {
62 total: 0, 63 total: 0,
63 pageNo: 1, 64 pageNo: 1,
64 pageSize: 10, 65 pageSize: 15,
65 qszt: ['1', '2'], 66 qszt: ['1', '2'],
66 queryData: {}, 67 queryData: {},
67 formData: { 68 formData: {
......
...@@ -64,13 +64,6 @@ ...@@ -64,13 +64,6 @@
64 <td class="zl">坐落</td> 64 <td class="zl">坐落</td>
65 <el-table-column type="index" width="80" align="center" label="序号"> 65 <el-table-column type="index" width="80" align="center" label="序号">
66 </el-table-column> 66 </el-table-column>
67 <el-table-column label="操作" width="100">
68 <template slot-scope="scope">
69 <el-button @click="xzzrz(scope.row)" type="text" size="small"
70 >选择
71 </el-button>
72 </template>
73 </el-table-column>
74 <el-table-column prop="zddm" align="left" label="宗地代码"> 67 <el-table-column prop="zddm" align="left" label="宗地代码">
75 </el-table-column> 68 </el-table-column>
76 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 69 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
...@@ -82,6 +75,16 @@ ...@@ -82,6 +75,16 @@
82 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 75 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
83 </el-table-column> 76 </el-table-column>
84 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 77 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
78 <el-table-column label="操作" align="center" width="100">
79 <template slot-scope="scope">
80 <el-tooltip class="item" effect="light" content="选择" placement="top">
81 <i class="iconfont iconbanli iconfontEdit" @click="xzzrz(scope.row)" style="padding:0 10px"></i>
82 </el-tooltip>
83 <!-- <el-button @click="xzzrz(scope.row)" type="text" size="small"
84 >选择
85 </el-button> -->
86 </template>
87 </el-table-column>
85 </el-table> 88 </el-table>
86 </div> 89 </div>
87 <span slot="footer" class="dialog-footer"> </span> 90 <span slot="footer" class="dialog-footer"> </span>
......
...@@ -9,14 +9,6 @@ ...@@ -9,14 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button>
17 <el-button type="text" size="small">定位</el-button>
18 </template>
19 </el-table-column>
20 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
21 </el-table-column> 13 </el-table-column>
22 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -41,7 +33,21 @@ ...@@ -41,7 +33,21 @@
41 {{ scope.row.addtime | timeFilter }} 33 {{ scope.row.addtime | timeFilter }}
42 </template> 34 </template>
43 </el-table-column> 35 </el-table-column>
44 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 36 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
37 </el-table-column> -->
38 <el-table-column label="操作" align="center" width="100">
39 <template slot-scope="scope">
40 <el-tooltip class="item" effect="light" content="办理" placement="top">
41 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
42 </el-tooltip>
43 <el-tooltip class="item" effect="light" content="定位" placement="top">
44 <i class="iconfont icondingwei iconfontEdit"></i>
45 </el-tooltip>
46 <!-- <el-button @click="handleClick(scope.row)" type="text" size="small"
47 >办理
48 </el-button>
49 <el-button type="text" size="small">定位</el-button> -->
50 </template>
45 </el-table-column> 51 </el-table-column>
46 </el-table> 52 </el-table>
47 <div class="pagination"> 53 <div class="pagination">
...@@ -72,7 +78,7 @@ export default { ...@@ -72,7 +78,7 @@ export default {
72 qszt: ['2'], 78 qszt: ['2'],
73 total: 0, 79 total: 0,
74 pageNo: 1, 80 pageNo: 1,
75 pageSize: 10, 81 pageSize: 15,
76 tableData: [], 82 tableData: [],
77 tableHeight: "100", 83 tableHeight: "100",
78 queryData: {}, 84 queryData: {},
...@@ -80,7 +86,7 @@ export default { ...@@ -80,7 +86,7 @@ export default {
80 }, 86 },
81 created() {}, 87 created() {},
82 mounted() { 88 mounted() {
83 this.getData({}); 89 this.getData({pageSize:this.pageSize});
84 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight'); 90 // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
85 this.$nextTick(() => { 91 this.$nextTick(() => {
86 this.tableHeight = 92 this.tableHeight =
......
...@@ -98,11 +98,10 @@ ...@@ -98,11 +98,10 @@
98 </el-tab-pane> 98 </el-tab-pane>
99 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 99 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
100 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline"> 100 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="demo-form-inline">
101 <el-form-item label="项目名称" prop="xmmc"> 101 <el-form-item label="项目名称" class="w100" prop="xmmc">
102 <el-input 102 <el-input
103 v-model="ruleForm1.xmmc" 103 v-model="ruleForm1.xmmc"
104 placeholder="项目名称" 104 placeholder="项目名称"
105 style="width:400px;"
106 ></el-input> 105 ></el-input>
107 </el-form-item> 106 </el-form-item>
108 </el-form> 107 </el-form>
...@@ -114,11 +113,10 @@ ...@@ -114,11 +113,10 @@
114 </el-tab-pane> 113 </el-tab-pane>
115 <el-tab-pane class="eltabspane" label="多幢" name="dz"> 114 <el-tab-pane class="eltabspane" label="多幢" name="dz">
116 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline"> 115 <el-form :inline="true" :rules="rules2" :model="ruleForm2" ref="ruleForm2" class="demo-form-inline">
117 <el-form-item label="项目名称" prop="xmmc"> 116 <el-form-item label="项目名称" class="w100" prop="xmmc">
118 <el-input 117 <el-input
119 v-model="ruleForm2.xmmc" 118 v-model="ruleForm2.xmmc"
120 placeholder="项目名称" 119 placeholder="项目名称"
121 style="width:400px;"
122 ></el-input> 120 ></el-input>
123 </el-form-item> 121 </el-form-item>
124 </el-form> 122 </el-form>
...@@ -243,9 +241,16 @@ export default { ...@@ -243,9 +241,16 @@ export default {
243 methods: { 241 methods: {
244 // 重置 242 // 重置
245 reset(){ 243 reset(){
246 this.$refs['ruleForm'].resetFields(); 244 debugger
247 this.$refs["ruleForm1"].resetFields(); 245 if(this.$refs['ruleForm']){
248 this.$refs["ruleForm2"].resetFields(); 246 this.$refs['ruleForm'].resetFields();
247 }
248 if(this.$refs["ruleForm1"]){
249 this.$refs["ruleForm1"].resetFields();
250 }
251 if (this.$refs["ruleForm2"]) {
252 this.$refs["ruleForm2"].resetFields();
253 }
249 }, 254 },
250 handleClick(tab, event) { 255 handleClick(tab, event) {
251 console.log(tab, event); 256 console.log(tab, event);
...@@ -290,7 +295,6 @@ export default { ...@@ -290,7 +295,6 @@ export default {
290 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : ''; 295 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
291 insertZrzjbxx(this.ruleForm1) 296 insertZrzjbxx(this.ruleForm1)
292 .then((res) => { 297 .then((res) => {
293 debugger
294 if (res.code == "200") { 298 if (res.code == "200") {
295 this.$message({ 299 this.$message({
296 message: "创建成功！", 300 message: "创建成功！",
...@@ -300,13 +304,13 @@ export default { ...@@ -300,13 +304,13 @@ export default {
300 this.$store.state.zdbsm=res.result.zdbsm; 304 this.$store.state.zdbsm=res.result.zdbsm;
301 this.$store.state.zrzbsm=res.result.bsm; 305 this.$store.state.zrzbsm=res.result.bsm;
302 this.$store.state.xmmc=res.result.xmmc; 306 this.$store.state.xmmc=res.result.xmmc;
307 this.close();
303 this.$router.push({ 308 this.$router.push({
304 path: '/zrz', query:{ 309 path: '/zrz', query:{
305 source: 1, 310 source: 1,
306 bsm:res.result.bsm 311 bsm:res.result.bsm
307 } 312 }
308 }); 313 });
309 this.close();
310 } else { 314 } else {
311 this.$message.error("创建失败！"); 315 this.$message.error("创建失败！");
312 } 316 }
...@@ -334,13 +338,13 @@ export default { ...@@ -334,13 +338,13 @@ export default {
334 this.$store.state.zdbsm=res.result.zdbsm; 338 this.$store.state.zdbsm=res.result.zdbsm;
335 this.$store.state.dzbsm=res.result.bsm; 339 this.$store.state.dzbsm=res.result.bsm;
336 this.$store.state.xmmc=res.result.xmmc; 340 this.$store.state.xmmc=res.result.xmmc;
341 this.close();
337 this.$router.push({ 342 this.$router.push({
338 path: '/dz', query:{ 343 path: '/dz', query:{
339 source: 1, 344 source: 1,
340 bsm:res.result.bsm 345 bsm:res.result.bsm
341 } 346 }
342 }); 347 });
343 this.close();
344 } else { 348 } else {
345 this.$message.error("创建失败！"); 349 this.$message.error("创建失败！");
346 } 350 }
...@@ -405,8 +409,8 @@ export default { ...@@ -405,8 +409,8 @@ export default {
405 } 409 }
406 }, 410 },
407 close() { 411 close() {
408 this.$emit("closeDialog");
409 this.reset(); 412 this.reset();
413 this.$emit("closeDialog");
410 }, 414 },
411 }, 415 },
412 computed: {}, 416 computed: {},
......
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >更正
16 </el-button
17 >
18 <el-button type="text" size="small">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
...@@ -37,7 +28,24 @@ ...@@ -37,7 +28,24 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人"> -->
32 <!-- </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="更正" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit"></i>
40 </el-tooltip>
41 </template>
42 <!-- <template slot-scope="scope">
43 <el-button @click="handleClick(scope.row)" type="text" size="small"
44 >更正
45 </el-button
46 >
47 <el-button type="text" size="small">定位</el-button>
48 </template> -->
41 </el-table-column> 49 </el-table-column>
42 </el-table> 50 </el-table>
43 <div class="pagination"> 51 <div class="pagination">
...@@ -63,7 +71,7 @@ ...@@ -63,7 +71,7 @@
63 qszt: ['1'], 71 qszt: ['1'],
64 total: 0, 72 total: 0,
65 pageNo: 1, 73 pageNo: 1,
66 pageSize: 10, 74 pageSize: 15,
67 formData: { 75 formData: {
68 user: "", 76 user: "",
69 region: "", 77 region: "",
......
...@@ -9,22 +9,13 @@ ...@@ -9,22 +9,13 @@
9 > 9 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 10 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 11 </el-table-column>
12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理
16 </el-button
17 >
18 <el-button type="text" size="small" @click="postionToMap(scope.row)">定位</el-button>
19 </template>
20 </el-table-column>
21 <el-table-column prop="bdcdyh" align="left" label="不动产单元号"> 12 <el-table-column prop="bdcdyh" align="left" label="不动产单元号">
22 </el-table-column> 13 </el-table-column>
23 <el-table-column prop="xmmc" align="left" width="150" label="项目名称"> 14 <el-table-column prop="xmmc" align="left" width="150" label="项目名称">
24 </el-table-column> 15 </el-table-column>
25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> 16 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
26 </el-table-column> 17 </el-table-column>
27 <el-table-column prop="dylx" align="left" width="120" label="类型"> 18 <el-table-column prop="dylx" align="left" width="100" label="类型">
28 <template slot-scope="scope"> 19 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}} 20 {{scope.row.dylx | bdcLxFilter}}
30 </template> 21 </template>
...@@ -37,7 +28,22 @@ ...@@ -37,7 +28,22 @@
37 {{scope.row.addtime | timeFilter}} 28 {{scope.row.addtime | timeFilter}}
38 </template> 29 </template>
39 </el-table-column> 30 </el-table-column>
40 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 31 <!-- <el-table-column prop="cjr" align="left" width="120" label="创建人">
32 </el-table-column> -->
33 <el-table-column label="操作" align="center" width="100">
34 <template slot-scope="scope">
35 <el-tooltip class="item" effect="light" content="办理" placement="top">
36 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
37 </el-tooltip>
38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
40 </el-tooltip>
41 <!-- <el-button type="text" size="small"
42 >办理
43 </el-button
44 >
45 <el-button type="text" size="small">定位</el-button> -->
46 </template>
41 </el-table-column> 47 </el-table-column>
42 </el-table> 48 </el-table>
43 <div class="pagination"> 49 <div class="pagination">
......