Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
08d1bd74 by 杨威
Options

代码合并

2 parents 5a3563fb 40810a1c
Inline Side-by-side
Showing 12 changed files with 199 additions and 49 deletions
...@@ -305,16 +305,16 @@ ol, ul { list-style:none; } ...@@ -305,16 +305,16 @@ ol, ul { list-style:none; }
305 } 305 }
306 //实预测转换按钮样式 306 //实预测转换按钮样式
307 /deep/.el-radio-button__inner { 307 /deep/.el-radio-button__inner {
308 border: 1px solid #00cacd!important; 308 border: 1px solid #3fa2e1!important;
309 color: #00cacd; 309 color: #3fa2e1;
310 } 310 }
311 /deep/.el-radio-button__inner:hover { 311 /deep/.el-radio-button__inner:hover {
312 color: #00cacd; 312 color: #3fa2e1;
313 } 313 }
314 /deep/.is-active .el-radio-button__inner { 314 /deep/.is-active .el-radio-button__inner {
315 color: #fff; 315 color: #fff;
316 } 316 }
317 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { 317 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
318 background-color: #00cacd; 318 background-color: #3fa2e1;
319 border-color: #00cacd; 319 border-color: #3fa2e1;
320 } 320 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
39 <span class="qsztFont" style="color: red; ">临</span> 39 <span class="qsztFont" style="color: red; ">临</span>
40 </span> 40 </span>
41 <span class="qsztImg" v-if="item.qszt=='1'" > 41 <span class="qsztImg" v-if="item.qszt=='1'" >
42 <span class="qsztFont" style="color: #00FF00; ">正</span> 42 <span class="qsztFont" style="color: #1AD6E1; ">正</span>
43 </span> 43 </span>
44 <span class="qsztImg" v-if="item.qszt=='2'" > 44 <span class="qsztImg" v-if="item.qszt=='2'" >
45 <span class="qsztFont" style="color: blue; ">现</span> 45 <span class="qsztFont" style="color: #45AEFD; ">现</span>
46 </span> 46 </span>
47 </template> 47 </template>
48 48
......
...@@ -19,7 +19,16 @@ ...@@ -19,7 +19,16 @@
19 export default { 19 export default {
20 name:"", 20 name:"",
21 components:{}, 21 components:{},
22 props:{}, 22 props:{
23 bsm: {
24 type: String,
25 default: "",
26 },
27 type: {
28 type: String,
29 default: "",
30 },
31 },
23 data(){ 32 data(){
24 insertCss(` 33 insertCss(`
25 .g6-tooltip { 34 .g6-tooltip {
...@@ -189,8 +198,8 @@ export default { ...@@ -189,8 +198,8 @@ export default {
189 getLshsData(){ 198 getLshsData(){
190 let _this = this; 199 let _this = this;
191 const data = { 200 const data = {
192 "bsm": this.$store.state.zdbsm, 201 "bsm": this.bsm,
193 "type": "zd" 202 "type": this.type
194 }; 203 };
195 getLshs(data).then((res)=>{ 204 getLshs(data).then((res)=>{
196 if(res.code===200){ 205 if(res.code===200){
......
...@@ -58,17 +58,17 @@ ...@@ -58,17 +58,17 @@
58 </div> 58 </div>
59 <div class="xlgz"> 59 <div class="xlgz">
60 <span> 60 <span>
61 样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”) 61 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
62 <br/> 62 <br/>
63 样例2：11301室<span>（1单元13层01室）</span>([单元号][层号][室号后缀]) 63 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
64 <br/> 64 <br/>
65 样例3：101<span>(1层01室)</span>([层号]) 65 样例3：11<span>(1层01室)</span>([层号])
66 <br/> 66 <br/>
67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符]，勾选“层号之前增加分隔符”) 67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
68 <br/> 68 <br/>
69 样例5：1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符]) 69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
70 <br/> 70 <br/>
71 样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”) 71 样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
72 </span> 72 </span>
73 </div> 73 </div>
74 </div> 74 </div>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 action="/api/tx/excelGeo/import" 12 action="/api/tx/excelGeo/import"
13 :data="sxdrData" 13 :data="sxdrData"
14 :on-success="uploadSuccess" 14 :on-success="uploadSuccess"
15 :on-error="uploadError"
15 :show-file-list="false" 16 :show-file-list="false"
16 multiple 17 multiple
17 > 18 >
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
135 top: 18px; 136 top: 18px;
136 } 137 }
137 } 138 }
138 139
139 140
140 ul { 141 ul {
141 margin-top: 20px; 142 margin-top: 20px;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> 5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
6 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
7 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 7 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
8 8
9 </el-tabs> 9 </el-tabs>
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
27 isDisabled:false, 27 isDisabled:false,
28 activeName: "dzxx", 28 activeName: "dzxx",
29 dzJbxxVisble:true, 29 dzJbxxVisble:true,
30 lshsVisible:false,
31 type:'dz',
30 fjclVisible:false 32 fjclVisible:false
31 }; 33 };
32 }, 34 },
......
1 <template> 1 <template>
2 <div class="lshs-content"> 2 <div class="lshs-content">
3 <Lshs></Lshs> 3 <Lshs :type="type" :bsm="bsm"></Lshs>
4 </div> 4 </div>
5 </template> 5 </template>
6 6
...@@ -11,7 +11,16 @@ ...@@ -11,7 +11,16 @@
11 export default { 11 export default {
12 name:"", 12 name:"",
13 components:{Lshs}, 13 components:{Lshs},
14 props:{}, 14 props:{
15 bsm: {
16 type: String,
17 default: "",
18 },
19 type: {
20 type: String,
21 default: "",
22 },
23 },
15 data(){ 24 data(){
16 return { 25 return {
17 data : {} 26 data : {}
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx> 10 <jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx>
11 </el-tab-pane> 11 </el-tab-pane>
12 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> 12 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
13 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> 13 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
14 <el-tab-pane label="附件材料" name="fjcl"> 14 <el-tab-pane label="附件材料" name="fjcl">
15 <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 15 <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
16 </el-tabs> 16 </el-tabs>
...@@ -42,6 +42,7 @@ export default { ...@@ -42,6 +42,7 @@ export default {
42 djbVisible:false, 42 djbVisible:false,
43 lshsVisible:false, 43 lshsVisible:false,
44 fjclVisible:false, 44 fjclVisible:false,
45 type:'zd'
45 }; 46 };
46 }, 47 },
47 methods: { 48 methods: {
......
1 <template> 1 <template>
2 <div class="lshs-content"> 2 <div class="lshs-content">
3 <Lshs></Lshs> 3 <Lshs :type="type" :bsm="bsm"></Lshs>
4 </div> 4 </div>
5 </template> 5 </template>
6 6
...@@ -11,7 +11,16 @@ ...@@ -11,7 +11,16 @@
11 export default { 11 export default {
12 name:"", 12 name:"",
13 components:{Lshs}, 13 components:{Lshs},
14 props:{}, 14 props:{
15 bsm: {
16 type: String,
17 default: "",
18 },
19 type: {
20 type: String,
21 default: "",
22 },
23 },
15 data(){ 24 data(){
16 return { 25 return {
17 data : {} 26 data : {}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane> 5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
7 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> 7 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
8 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 8 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
9 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 9 <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
10 </el-tabs> 10 </el-tabs>
11 </div> 11 </div>
...@@ -31,6 +31,8 @@ export default { ...@@ -31,6 +31,8 @@ export default {
31 activeName: "zrzxx", 31 activeName: "zrzxx",
32 lpbLoad:false, //默认不加载楼盘表组件 32 lpbLoad:false, //默认不加载楼盘表组件
33 yzgyLoad:false, 33 yzgyLoad:false,
34 lshsVisible:false,
35 type:'zrz',
34 }; 36 };
35 }, 37 },
36 methods: { 38 methods: {
...@@ -52,6 +54,9 @@ export default { ...@@ -52,6 +54,9 @@ export default {
52 if(!this.yzgyLoad){ 54 if(!this.yzgyLoad){
53 this.yzgyLoad = tab.name == 'yzgy' ? true : false 55 this.yzgyLoad = tab.name == 'yzgy' ? true : false
54 } 56 }
57 if(tab.name === 'lshs'){
58 this.lshsVisible = true;
59 }
55 }, 60 },
56 }, 61 },
57 created() {}, 62 created() {},
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 <tr height="30"> 17 <tr height="30">
18 <td colspan="2" align="center">逻辑幢号</td> 18 <td colspan="2" align="center">逻辑幢号</td>
19 <td colspan="4"> 19 <td colspan="4">
20 <el-input v-model="form.ljzh"></el-input> 20 <input class="formInput" ref="ljzh" @blur="inputBlur($event)" v-model="form.ljzh" />
21 </td> 21 </td>
22 <td colspan="2" align="center">自然幢号</td> 22 <td colspan="2" align="center">自然幢号</td>
23 <td colspan="4"> 23 <td colspan="4">
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
25 </td> 25 </td>
26 </tr> 26 </tr>
27 <tr height="30"> 27 <tr height="30">
28 <td colspan="2" align="center">逻辑幢名称</td> 28 <td colspan="2" align="center">逻辑幢名称</td>
29 <td colspan="4"> 29 <td colspan="4">
30 <el-input v-model="form.ljzmc"></el-input> 30 <input class="formInput" ref="ljzmc" @blur="inputBlur($event)" v-model="form.ljzmc" />
31 </td> 31 </td>
32 <td colspan="2" align="center">建筑物状态</td> 32 <td colspan="2" align="center">建筑物状态</td>
33 <td colspan="4"> 33 <td colspan="4">
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 </td> 137 </td>
138 <td colspan="9"> 138 <td colspan="9">
139 <el-select-tree style="width:100%" 139 <el-select-tree style="width:100%"
140 ref="yt" 140 ref="fwjg"
141 v-if="show" 141 v-if="show"
142 :default-expand-all="defaultExpandAll" 142 :default-expand-all="defaultExpandAll"
143 :multiple="multiple" 143 :multiple="multiple"
...@@ -214,6 +214,8 @@ export default { ...@@ -214,6 +214,8 @@ export default {
214 label: 'mc' 214 label: 'mc'
215 }, 215 },
216 216
217 rules:[],
218
217 form: { 219 form: {
218 zrzbsm: "", 220 zrzbsm: "",
219 ljzh: "", //逻辑幢号 221 ljzh: "", //逻辑幢号
...@@ -253,6 +255,16 @@ export default { ...@@ -253,6 +255,16 @@ export default {
253 }; 255 };
254 }, 256 },
255 methods: { 257 methods: {
258
259 inputBlur(e){
260 if(e.target.value!=''){
261 e.target.style.border=""
262 }else{
263 e.target.style.border="1px solid red";
264 e.target.style.boxSizing = 'border-box';
265 }
266 },
267
256 addYtInfo() { 268 addYtInfo() {
257 this.form.ytList.push({ 269 this.form.ytList.push({
258 glbsm: "", 270 glbsm: "",
...@@ -330,30 +342,85 @@ export default { ...@@ -330,30 +342,85 @@ export default {
330 } 342 }
331 }, 343 },
332 onSave(data, bsm) { 344 onSave(data, bsm) {
345
346 this.rules=[
347 {
348 data:this.form.ljzh,
349 name:'自然幢号',
350 dom:this.$refs.ljzh,
351 rule: /^\s*$/g, //非空
352 },
353 {
354 data:this.form.ljzmc,
355 name:'不动产单元号',
356 dom:this.$refs.ljzmc,
357 rule: /^\s*$/g, //非空
358 },
359 ];
360 this.form.ytList.forEach((item,index)=>{
361 this.rules.push(
362 {
363 data:item.fwytzdbsm,
364 name:'用途',
365 dom:this.$refs.yt[index],
366 rule: /^\s*$/g, //非空
367 },
368 )
369 });
370 this.form.fwjgList.forEach((item,index)=>{
371 this.rules.push(
372 {
373 data:item.fwjgzdbsm,
374 name:'房屋结构',
375 dom:this.$refs.fwjg[index],
376 rule: /^\s*$/g, //非空
377 },
378 )
379 });
380
333 //自然幢标识码 381 //自然幢标识码
334 this.form.zrzbsm = bsm; 382 this.form.zrzbsm = bsm;
335 if(this.ljzbsm == ''){ 383 let flag = true;
336 insertLjzInfo(this.form).then((res) => { 384 this.rules.forEach(item=>{
337 if (res.code === 200) { 385 if(item.rule.test(item.data) || item.data == null){
338 this.$message.success("保存成功"); 386 if(item.dom.$el){
339 //更新树结构数据 387 item.dom.$el.style.border = '1px solid red';
340 console.log(this); 388 item.dom.$el.style.boxSizing = 'border-box';
341 this.$parent.$parent.getLpbMenuTree(bsm);
342 //关闭弹框
343 this.$parent.$parent.closeDaialog();
344 }else{ 389 }else{
345 this.$message.error(res.message); 390 item.dom.style.border = '1px solid red';
391 item.dom.style.boxSizing = 'border-box';
346 } 392 }
347 }); 393 flag = false;
348 }else{ 394 return false
349 //逻辑幢更新接口调用 TODO 395 }
350 console.log('保存'); 396 })
351 updateQjLjz(this.form).then((res)=>{ 397 this.$nextTick(()=>{
352 if(res.code === 200){ 398 if (flag && this.$refs.qlxzModule.getRulesResult()) {
353 this.$message.success("修改成功") 399 if(this.ljzbsm == ''){
400 insertLjzInfo(this.form).then((res) => {
401 if (res.code === 200) {
402 this.$message.success("保存成功");
403 //更新树结构数据
404 console.log(this);
405 this.$parent.$parent.getLpbMenuTree(bsm);
406 //关闭弹框
407 this.$parent.$parent.closeDaialog();
408 }else{
409 this.$message.error(res.message);
410 }
411 });
412 }else{
413 //逻辑幢更新接口调用 TODO
414 console.log('保存');
415 updateQjLjz(this.form).then((res)=>{
416 if(res.code === 200){
417 this.$message.success("修改成功")
418 }
419 })
420 }
354 } 421 }
355 }) 422 })
356 } 423
357 }, 424 },
358 onSubmit() { 425 onSubmit() {
359 // console.log(this.form); 426 // console.log(this.form);
...@@ -411,6 +478,40 @@ export default { ...@@ -411,6 +478,40 @@ export default {
411 this.form.zrzh = this.$store.state.zrzh; 478 this.form.zrzh = this.$store.state.zrzh;
412 }, 479 },
413 watch:{ 480 watch:{
481
482 "form.ljzh":function (val) {
483 if (val != '') {
484 this.$refs.ljzh.style.border = '';
485 }
486 },
487
488 "form.ljzmc":function (val) {
489 if (val != '') {
490 this.$refs.ljzmc.style.border = '';
491 }
492 },
493
494 "form.ytList": {
495 handler : function (newVal, oldVal) {
496 newVal.forEach((item,ind)=>{
497 if(item.fwytzdbsm != ''){
498 this.$refs.yt[ind].$el.style.border=""
499 }
500 })
501 },
502 deep:true
503 },
504 "form.fwjgList": {
505 handler : function (newVal, oldVal) {
506 newVal.forEach((item,ind)=>{
507 if(item.fwjgzdbsm != ''){
508 this.$refs.fwjg[ind].$el.style.border=""
509 }
510 })
511 },
512 deep:true
513 },
514
414 ljzbsm: { 515 ljzbsm: {
415 handler: function (item) { 516 handler: function (item) {
416 console.log(item,'item'); 517 console.log(item,'item');
...@@ -453,6 +554,7 @@ export default { ...@@ -453,6 +554,7 @@ export default {
453 //bgcolor:#F1F4FC; 554 //bgcolor:#F1F4FC;
454 background-color: #fff; 555 background-color: #fff;
455 width: 8.33%; 556 width: 8.33%;
557 height: 36px
456 } 558 }
457 559
458 .el-select { 560 .el-select {
......
1 <template> 1 <template>
2 <div class="">历史回溯</div> 2 <div class="">
3 <Lshs :type="type" :bsm="bsm"></Lshs>
4 </div>
3 </template> 5 </template>
4 6
5 <script> 7 <script>
8 import Lshs from '@components/lshs/index';
6 export default { 9 export default {
7 name:"", 10 name:"",
8 components:{}, 11 components:{Lshs},
9 props:{}, 12 props:{
13 bsm: {
14 type: String,
15 default: "",
16 },
17 type: {
18 type: String,
19 default: "",
20 },
21 },
10 data(){ 22 data(){
11 return { 23 return {
12 } 24 }
......