Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
08c74968 by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents d078f4cd 9aa4e12e
Expand all
Inline Side-by-side
Showing 19 changed files with 404 additions and 226 deletions
...@@ -23,7 +23,15 @@ ...@@ -23,7 +23,15 @@
23 "color": "#f50325", 23 "color": "#f50325",
24 "width": 1 24 "width": 1
25 } 25 }
26 },
27 "importSymbol": {
28 "type": "simple-fill",
29 "color": [ 245,3, 37, 0.4 ],
30 "style": "none",
31 "outline": {
32 "color": "#006cff",
33 "width": 2
34 }
26 } 35 }
27
28 } 36 }
29 } 37 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -284,6 +284,7 @@ ...@@ -284,6 +284,7 @@
284 type="date" 284 type="date"
285 value-format="yyyy-MM-dd" 285 value-format="yyyy-MM-dd"
286 placeholder="选择日期" 286 placeholder="选择日期"
287 @blur="inputBlur($event,true)"
287 @input="startTime(index,childIndex)" 288 @input="startTime(index,childIndex)"
288 > 289 >
289 </el-date-picker> 290 </el-date-picker>
...@@ -332,6 +333,7 @@ ...@@ -332,6 +333,7 @@
332 value-format="yyyy-MM-dd" 333 value-format="yyyy-MM-dd"
333 :picker-options="childItem.pickerEnd" 334 :picker-options="childItem.pickerEnd"
334 placeholder="选择日期" 335 placeholder="选择日期"
336 @blur="inputBlur($event,true)"
335 @input="endTime(index,childIndex)" 337 @input="endTime(index,childIndex)"
336 > 338 >
337 </el-date-picker> 339 </el-date-picker>
...@@ -429,7 +431,6 @@ export default { ...@@ -429,7 +431,6 @@ export default {
429 }, 431 },
430 created() {}, 432 created() {},
431 mounted(){ 433 mounted(){
432 console.log(this.formData,'formData');
433 }, 434 },
434 methods: { 435 methods: {
435 startTime(index,childIndex){ 436 startTime(index,childIndex){
...@@ -452,7 +453,6 @@ export default { ...@@ -452,7 +453,6 @@ export default {
452 } 453 }
453 }, 454 },
454 sumTime(index,childIndex,syqx,e){ 455 sumTime(index,childIndex,syqx,e){
455 console.log(e,'eeee');
456 this.$refs.syqx.forEach((item,index)=>{ 456 this.$refs.syqx.forEach((item,index)=>{
457 if(item.value == syqx){ 457 if(item.value == syqx){
458 this.$refs.tdsyjssj[index].$el.style.border="" 458 this.$refs.tdsyjssj[index].$el.style.border=""
...@@ -567,13 +567,10 @@ export default { ...@@ -567,13 +567,10 @@ export default {
567 }); 567 });
568 }, 568 },
569 getQlxzDataList() { 569 getQlxzDataList() {
570 console.log(this.countList,'this.countList');
571 return this.countList; 570 return this.countList;
572 }, 571 },
573 getRules(){ 572 getRules(){
574 let rules = []; 573 let rules = [];
575 console.log(this.$refs.tdsyqssj,'this.$refs.qlxzdm');
576 console.log(this.countList,'this.countList');
577 let temp = 0; 574 let temp = 0;
578 this.countList.forEach((item,index)=>{ 575 this.countList.forEach((item,index)=>{
579 rules.push({ 576 rules.push({
...@@ -599,9 +596,6 @@ export default { ...@@ -599,9 +596,6 @@ export default {
599 rule: /^\s*$/g, //非空 596 rule: /^\s*$/g, //非空
600 }, 597 },
601 ) 598 )
602 if (ind == item.list.length-1) {
603 temp += item.list.length;
604 }
605 if(this.hasSyqx){ 599 if(this.hasSyqx){
606 rules.push( 600 rules.push(
607 { 601 {
...@@ -613,6 +607,9 @@ export default { ...@@ -613,6 +607,9 @@ export default {
613 } 607 }
614 ) 608 )
615 } 609 }
610 if (ind == item.list.length-1) {
611 temp += item.list.length;
612 }
616 }) 613 })
617 }) 614 })
618 this.rulesResult = true; 615 this.rulesResult = true;
...@@ -664,6 +661,18 @@ export default { ...@@ -664,6 +661,18 @@ export default {
664 661
665 // }, 662 // },
666 }, 663 },
664 watch:{
665 countList: {
666 handler : function (newVal, oldVal) {
667 newVal.forEach((item,ind)=>{
668 if(item.qlxzdm != ''){
669 this.$refs.qlxzdm[ind].$el.style.border=""
670 }
671 })
672 },
673 deep:true
674 } ,
675 }
667 }; 676 };
668 </script> 677 </script>
669 <style lang="less"> 678 <style lang="less">
......
...@@ -175,31 +175,35 @@ export default { ...@@ -175,31 +175,35 @@ export default {
175 // 左键双击事件 175 // 左键双击事件
176 dbclick(item) { 176 dbclick(item) {
177 clearTimeout(this.time); 177 clearTimeout(this.time);
178 if(item.type == 'zd' || item.type == 'zrz' ||item.type == 'dz'){ 178 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
179 if (item.type == 'zd') {
180 this.$store.state.zdbsm = item.bsm;
179 this.$router.push({ 181 this.$router.push({
180 path: '/'+item.type, 182 path: '/'+item.type,
183 query:{
184 source: 2,
185 bsm:item.bsm
186 }
187 });
188 }else if(item.type == 'zrz'){
189 this.$store.state.zrzbsm = item.bsm;
190 this.$router.push({
191 path: '/'+item.type,
192 query:{
193 source: 2,
194 bsm:item.bsm
195 }
196 });
197 }else if(item.type == 'dz'){
198 this.$store.state.dzbsm = item.bsm;
199 this.$router.push({
200 path: '/'+item.type,
181 query:{ 201 query:{
182 source: 2, 202 source: 2,
183 bsm:item.bsm 203 bsm:item.bsm
184 } 204 }
185 }); 205 });
186 } 206 }
187 // if (item.type == 'zd') {
188 // this.$router.push({
189 // path: '/zd',
190 // query:{
191 // source: 2,
192 // bsm:item.bsm
193 // }
194 // });
195 // }else if(item.type == 'zrz'){
196 // this.$router.push({
197 // path: '/zrz',
198 // query:{
199 // bsm:item.bsm
200 // }
201 // });
202 // }
203 }, 207 },
204 closeMenu() { 208 closeMenu() {
205 this.$emit("changeVisible", false); 209 this.$emit("changeVisible", false);
......
...@@ -101,7 +101,8 @@ ...@@ -101,7 +101,8 @@
101 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除</li> 101 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除</li>
102 </ul> 102 </ul>
103 103
104 <el-dialog title="导入图形" :visible.sync="improtDialog"> 104 <!--@close="closeImportDialog"-->
105 <el-dialog title="导入图形" :modal="false" :close-on-click-modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
105 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 106 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
106 </el-dialog> 107 </el-dialog>
107 <!-- 添加定着物弹框 --> 108 <!-- 添加定着物弹框 -->
...@@ -263,6 +264,8 @@ export default { ...@@ -263,6 +264,8 @@ export default {
263 this.$store.state.zdbsm = this.zdData.zdbsm; 264 this.$store.state.zdbsm = this.zdData.zdbsm;
264 if(this.zdData.type == 'dz'){ 265 if(this.zdData.type == 'dz'){
265 this.$store.state.dzbsm = this.zdData.bsm; 266 this.$store.state.dzbsm = this.zdData.bsm;
267 }else{
268 this.$store.state.dzbsm = '';
266 } 269 }
267 }, 270 },
268 //关闭添加定着物弹框 271 //关闭添加定着物弹框
...@@ -439,6 +442,7 @@ export default { ...@@ -439,6 +442,7 @@ export default {
439 }else { 442 }else {
440 BSM = this.zdData.bsm; 443 BSM = this.zdData.bsm;
441 } 444 }
445 //当确定导入图形是 跳转到图形界面
442 this.queryGeoByBsm(BSM,type,function (features){ 446 this.queryGeoByBsm(BSM,type,function (features){
443 if(features && features.length > 0){ 447 if(features && features.length > 0){
444 if(features[0].geometry){ 448 if(features[0].geometry){
...@@ -447,6 +451,7 @@ export default { ...@@ -447,6 +451,7 @@ export default {
447 cancelButtonText: '取消', 451 cancelButtonText: '取消',
448 type: 'warning' 452 type: 'warning'
449 }).then(() => { 453 }).then(() => {
454 self.postionToMap();
450 self.improtDialog = true; 455 self.improtDialog = true;
451 self.currentClickZdGeo = features[0]; 456 self.currentClickZdGeo = features[0];
452 }).catch(() => { 457 }).catch(() => {
...@@ -456,11 +461,13 @@ export default { ...@@ -456,11 +461,13 @@ export default {
456 }); 461 });
457 }); 462 });
458 }else { 463 }else {
464 self.postionToMap();
459 self.currentClickZdGeo = features[0]; 465 self.currentClickZdGeo = features[0];
460 self.improtDialog = true; 466 self.improtDialog = true;
461 } 467 }
462 468
463 }else{ 469 }else{
470 self.postionToMap();
464 self.currentClickZdGeo = null; 471 self.currentClickZdGeo = null;
465 self.improtDialog = true; 472 self.improtDialog = true;
466 } 473 }
...@@ -509,7 +516,6 @@ export default { ...@@ -509,7 +516,6 @@ export default {
509 }).then(res => { 516 }).then(res => {
510 debugger 517 debugger
511 });*/ 518 });*/
512
513 }else{ 519 }else{
514 self.$message.warning("暂无空间信息!!!!"); 520 self.$message.warning("暂无空间信息!!!!");
515 } 521 }
...@@ -583,6 +589,7 @@ export default { ...@@ -583,6 +589,7 @@ export default {
583 //关闭图形弹框 589 //关闭图形弹框
584 closeImportDialog(){ 590 closeImportDialog(){
585 this.improtDialog = false; 591 this.improtDialog = false;
592 this.clearOverLayer();
586 } 593 }
587 594
588 }, 595 },
...@@ -731,4 +738,8 @@ export default { ...@@ -731,4 +738,8 @@ export default {
731 center; 738 center;
732 background-size: contain; 739 background-size: contain;
733 } 740 }
741 /deep/ .importDialog{
742 margin-top: 120px!important;
743 margin-left: 291px;
744 }
734 </style> 745 </style>
......
...@@ -38,19 +38,18 @@ ...@@ -38,19 +38,18 @@
38 esriMap 38 esriMap
39 ]) => { 39 ]) => {
40 var map = new esriMap({ 40 var map = new esriMap({
41 basemap:"hybrid" 41 basemap:"osm"
42 }); 42 });
43 //108.95 34.27 43 //108.95 34.27
44 var view = new MapView({ 44 var view = new MapView({
45 container: self.viewId, 45 container: self.viewId,
46 map: map, 46 map: map,
47 zoom:10, 47 zoom:10,
48 zoom:10, 48 center: [-0.154133333770497,0.6138183594020817],
49 center: [-0.154133333770497,0.6138183594020817], 49 spatialReference: {
50 spatialReference: { 50 wkid: 102100
51 wkid: 102100 51 }
52 } 52 });
53 });
54 maps[self.viewId] = view; 53 maps[self.viewId] = view;
55 if(self.afterLoaderFunction && typeof self.afterLoaderFunction == 'function'){ 54 if(self.afterLoaderFunction && typeof self.afterLoaderFunction == 'function'){
56 self.afterLoaderFunction(view); 55 self.afterLoaderFunction(view);
......
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
24 identifyParameters.tolerance = tolerance ? tolerance : 3; 24 identifyParameters.tolerance = tolerance ? tolerance : 3;
25 identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent; 25 identifyParameters.mapExtent = mapExtent ? mapExtent : geometry.extent;
26 identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false; 26 identifyParameters.returnGeometry = returnGeometry ? returnGeometry : false;
27 //identifyParameters.returnFieldName = false; 27 //identifyParameters.returnFieldName = true;
28 identifyParameters.spatialReference = geometry.spatialReference; 28 identifyParameters.spatialReference = geometry.spatialReference;
29 identifyTask.execute(identifyParameters).then(result => { 29 identifyTask.execute(identifyParameters).then(result => {
30 if(callBackFunction && typeof callBackFunction == 'function'){ 30 if(callBackFunction && typeof callBackFunction == 'function'){
......
...@@ -22,20 +22,29 @@ export default { ...@@ -22,20 +22,29 @@ export default {
22 var featureLayer = new FeatureLayer({ 22 var featureLayer = new FeatureLayer({
23 url:url 23 url:url
24 }) 24 })
25 var geo = null; 25 var saveGraphics = [];
26 if(graphic.geometry.type == 'point'){ 26 if(!Array.isArray(graphic)){
27 geo = new Point(graphic.geometry); 27 graphic = [graphic];
28 }else if(graphic.geometry.type == 'polyline'){ 28 }
29 geo = new Polyline(graphic.geometry); 29 for(var i = 0;i < graphic.length;i++){
30 }else if(graphic.geometry.type == 'polygon'){ 30 var geo = null;
31 geo = new Polygon(graphic.geometry); 31 if(!graphic[i].geometry){
32 geo = null;
33 }else if(graphic[i].geometry.type == 'point'){
34 geo = new Point(graphic[i].geometry);
35 }else if(graphic[i].geometry.type == 'polyline'){
36 geo = new Polyline(graphic[i].geometry);
37 }else if(graphic[i].geometry.type == 'polygon'){
38 geo = new Polygon(graphic[i].geometry);
39 }
40 var saveGraphic = new Graphic({
41 attributes:graphic[i].attributes,
42 geometry:geo
43 });
44 saveGraphics.push(saveGraphic);
32 } 45 }
33 var saveGraphic = new Graphic({
34 attributes:graphic.attributes,
35 geometry:geo
36 });
37 featureLayer.applyEdits({ 46 featureLayer.applyEdits({
38 addFeatures:[saveGraphic] 47 addFeatures:saveGraphics
39 }).then(function (res){ 48 }).then(function (res){
40 if(callBackFunction && typeof callBackFunction == 'function'){ 49 if(callBackFunction && typeof callBackFunction == 'function'){
41 callBackFunction(res); 50 callBackFunction(res);
...@@ -62,20 +71,30 @@ export default { ...@@ -62,20 +71,30 @@ export default {
62 var featureLayer = new FeatureLayer({ 71 var featureLayer = new FeatureLayer({
63 url:url 72 url:url
64 }) 73 })
65 var geo = null; 74 var updGraphics = [];
66 if(graphic.geometry.type == 'point'){ 75 if(!Array.isArray(graphic)){
67 geo = new Point(graphic.geometry); 76 graphic = [graphic];
68 }else if(graphic.geometry.type == 'polyline'){ 77 }
69 geo = new Polyline(graphic.geometry); 78 for(var i = 0;i < graphic.length;i++){
70 }else if(graphic.geometry.type == 'polygon'){ 79 var geo = null;
71 geo = new Polygon(graphic.geometry); 80 if(!graphic[i].geometry){
81 geo = new Polygon();
82 }else if(graphic[i].geometry.type == 'point'){
83 geo = new Point(graphic[i].geometry);
84 }else if(graphic[i].geometry.type == 'polyline'){
85 geo = new Polyline(graphic[i].geometry);
86 }else if(graphic[i].geometry.type == 'polygon'){
87 geo = new Polygon(graphic[i].geometry);
88 }
89 var updGraphic = new Graphic({
90 attributes:graphic[i].attributes,
91 geometry:geo
92 });
93 updGraphics.push(updGraphic);
72 } 94 }
73 var updGraphic = new Graphic({ 95
74 attributes:graphic.attributes,
75 geometry:geo
76 });
77 featureLayer.applyEdits({ 96 featureLayer.applyEdits({
78 updateFeatures:[updGraphic] 97 updateFeatures:updGraphics
79 }).then(function (res){ 98 }).then(function (res){
80 if(callBackFunction && typeof callBackFunction == 'function'){ 99 if(callBackFunction && typeof callBackFunction == 'function'){
81 callBackFunction(res); 100 callBackFunction(res);
...@@ -102,21 +121,31 @@ export default { ...@@ -102,21 +121,31 @@ export default {
102 var featureLayer = new FeatureLayer({ 121 var featureLayer = new FeatureLayer({
103 url:url 122 url:url
104 }) 123 })
105 var geo = null; 124 var delGraphics = [];
106 if(graphic.geometry.type == 'point'){ 125 if(!Array.isArray(graphic)){
107 geo = new Point(graphic.geometry); 126 graphic = [graphic];
108 }else if(graphic.geometry.type == 'polyline'){ 127 }
109 geo = new Polyline(graphic.geometry); 128 for(var i = 0;i < graphic.length;i++){
110 }else if(graphic.geometry.type == 'polygon'){ 129 var geo = null;
111 geo = new Polygon(graphic.geometry); 130 if(!graphic[i].geometry){
131 geo = null;
132 }else if(graphic[i].geometry.type == 'point'){
133 geo = new Point(graphic[i].geometry);
134 }else if(graphic[i].geometry.type == 'polyline'){
135 geo = new Polyline(graphic[i].geometry);
136 }else if(graphic[i].geometry.type == 'polygon'){
137 geo = new Polygon(graphic[i].geometry);
138 }
139 var delGraphic = new Graphic({
140 attributes:graphic[i].attributes,
141 geometry:geo
142 });
143 delGraphics.push(delGraphic);
112 } 144 }
113 var delGraphic = new Graphic({ 145
114 attributes:graphic.attributes,
115 geometry:geo
116 });
117 146
118 featureLayer.applyEdits({ 147 featureLayer.applyEdits({
119 deleteFeatures:[delGraphic] 148 deleteFeatures:delGraphics
120 }).then(function (res){ 149 }).then(function (res){
121 if(callBackFunction && typeof callBackFunction == 'function'){ 150 if(callBackFunction && typeof callBackFunction == 'function'){
122 callBackFunction(res); 151 callBackFunction(res);
......
...@@ -28,7 +28,7 @@ export default{ ...@@ -28,7 +28,7 @@ export default{
28 where += " and "; 28 where += " and ";
29 } 29 }
30 if(Array.isArray(parames[i].value)){ 30 if(Array.isArray(parames[i].value)){
31 where += parames[i].name + " in (" + parames[i].value.toString + ")"; 31 where += parames[i].name + " in (" + parames[i].value.toString() + ")";
32 }else if(typeof parames[i].value == 'number'){ 32 }else if(typeof parames[i].value == 'number'){
33 where += parames[i].name + " =" + parames[i].value ; 33 where += parames[i].name + " =" + parames[i].value ;
34 }else{ 34 }else{
......
...@@ -169,6 +169,8 @@ export default { ...@@ -169,6 +169,8 @@ export default {
169 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm); 169 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
170 }else if(newPath == "/dz"){ 170 }else if(newPath == "/dz"){
171 this.getRightTreeByDzbsm(this.$store.state.dzbsm); 171 this.getRightTreeByDzbsm(this.$store.state.dzbsm);
172 }else if(newPath == "/h"){
173 this.getRightTreeByHbsm(this.$store.state.hbsm);
172 } else if(newPath == "/viewMap"){ 174 } else if(newPath == "/viewMap"){
173 this.isMap = true; 175 this.isMap = true;
174 if(this.$route.query.type == "zd"){ 176 if(this.$route.query.type == "zd"){
...@@ -329,6 +331,14 @@ export default { ...@@ -329,6 +331,14 @@ export default {
329 }); 331 });
330 }, 332 },
331 333
334 getRightTreeByHbsm(bsm) {
335 getTreeByBsm(bsm,"h").then((res) => {
336 if (res.success) {
337 this.pd = res.result;
338 }
339 });
340 },
341
332 sortNavigation(data, selectId) { 342 sortNavigation(data, selectId) {
333 let headTop = this.headTop; 343 let headTop = this.headTop;
334 data.forEach((item, index) => { 344 data.forEach((item, index) => {
......
...@@ -290,8 +290,9 @@ export default { ...@@ -290,8 +290,9 @@ export default {
290 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 290 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
291 this.$refs['ruleForm1'].validate((valid) => { 291 this.$refs['ruleForm1'].validate((valid) => {
292 if (valid) { 292 if (valid) {
293 this.ruleForm1.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : ''; 293
294 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : ''; 294 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
295 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
295 insertZrzjbxx(this.ruleForm1) 296 insertZrzjbxx(this.ruleForm1)
296 .then((res) => { 297 .then((res) => {
297 if (res.code == "200") { 298 if (res.code == "200") {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 :data="tableData" 6 :data="tableData"
7 :height="tableHeight" 7 :height="tableHeight"
8 :row-class-name="tableRowClassName" 8 :row-class-name="tableRowClassName"
9 @row-dblclick="doubleClick"
9 > 10 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 11 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 12 </el-table-column>
...@@ -81,6 +82,9 @@ ...@@ -81,6 +82,9 @@
81 methods: { 82 methods: {
82 onSubmit() { 83 onSubmit() {
83 }, 84 },
85 doubleClick(row, column, event){
86 this.handleClick(row);
87 },
84 tableRowClassName({row, rowIndex}) { 88 tableRowClassName({row, rowIndex}) {
85 if (rowIndex % 2 !== 0) { 89 if (rowIndex % 2 !== 0) {
86 return "even-row"; 90 return "even-row";
......
...@@ -76,15 +76,20 @@ export default { ...@@ -76,15 +76,20 @@ export default {
76 }, 76 },
77 mixins:[mapLayerManager,findTask], 77 mixins:[mapLayerManager,findTask],
78 mounted(){ 78 mounted(){
79 var query = this.$route.query; 79
80 if(query && JSON.stringify(query) != "{}"){ 80 var query = this.$route.query
81 //self.addGeoByBsm(query.bsm,query.type,self.viewId); 81 var self = this;
82 if(query.type == 'zd'){ 82 setTimeout(function () {
83 this.getRightTree(query.bsm) 83 if(query && JSON.stringify(query) != "{}"){
84 }else if(query.type == 'zrz'){ 84 //self.addGeoByBsm(query.bsm,query.type,self.viewId);
85 this.getRightTreeByZrzbsm(query.bsm); 85 if(query.type == 'zd'){
86 self.getRightTree(query.bsm)
87 }else if(query.type == 'zrz'){
88 self.getRightTreeByZrzbsm(query.bsm);
89 }
86 } 90 }
87 } 91 },500);
92
88 93
89 }, 94 },
90 methods:{ 95 methods:{
...@@ -93,9 +98,9 @@ export default { ...@@ -93,9 +98,9 @@ export default {
93 var view = maps[this.viewId]; 98 var view = maps[this.viewId];
94 view.ui.remove('zoom'); 99 view.ui.remove('zoom');
95 loadModules([ 100 loadModules([
96 "esri/layers/MapImageLayer", 101 "esri/layers/MapImageLayer"
97 ]).then(([ 102 ]).then(([
98 MapImageLayer, 103 MapImageLayer
99 ])=>{ 104 ])=>{
100 var mapImageLayer = new MapImageLayer({ 105 var mapImageLayer = new MapImageLayer({
101 url:self.layerUrl, 106 url:self.layerUrl,
...@@ -137,9 +142,11 @@ export default { ...@@ -137,9 +142,11 @@ export default {
137 }, 142 },
138 //图层选择事件 143 //图层选择事件
139 selectLayerChange(){ 144 selectLayerChange(){
145 debugger
140 var self = this; 146 var self = this;
147 this.features = [];
141 var layerAndResult = this.results.filter(function (item) { 148 var layerAndResult = this.results.filter(function (item) {
142 return item.layerId = self.selectResLayerId; 149 return item.layerId == self.selectResLayerId;
143 }) 150 })
144 if(layerAndResult){ 151 if(layerAndResult){
145 this.features = layerAndResult[0].features; 152 this.features = layerAndResult[0].features;
......
...@@ -79,12 +79,12 @@ export default { ...@@ -79,12 +79,12 @@ export default {
79 return; 79 return;
80 } 80 }
81 for(var i = 0;i < searchResult.length;i++){ 81 for(var i = 0;i < searchResult.length;i++){
82 var layer = view.map.findLayerById("searchResult"+searchResult.layerName); 82 var layer = view.map.findLayerById("searchResult"+searchResult[i].layerId);
83 if(layer){ 83 if(layer){
84 layer.removeAll(); 84 layer.removeAll();
85 }else{ 85 }else{
86 layer = new GraphicsLayer({ 86 layer = new GraphicsLayer({
87 id:"searchResult"+searchResult.layerName 87 id:"searchResult"+searchResult[i].layerId
88 }) 88 })
89 view.map.add(layer); 89 view.map.add(layer);
90 } 90 }
......
...@@ -627,7 +627,6 @@ export default { ...@@ -627,7 +627,6 @@ export default {
627 updateZDxx(formData) { 627 updateZDxx(formData) {
628 //获取权利性质数据 628 //获取权利性质数据
629 this.formData.list = this.$refs.qlxzModule.getQlxzDataList(); 629 this.formData.list = this.$refs.qlxzModule.getQlxzDataList();
630 this.$refs.qlxzModule.getRules();
631 console.log(this.$refs.qlxzModule.getRulesResult(),'this.$refs.qlxzModule.getRules()'); 630 console.log(this.$refs.qlxzModule.getRulesResult(),'this.$refs.qlxzModule.getRules()');
632 //判断容密高是否为区间值，如果是区间值，则将输入框的值赋予 631 //判断容密高是否为区间值，如果是区间值，则将输入框的值赋予
633 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl; 632 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
...@@ -689,14 +688,8 @@ export default { ...@@ -689,14 +688,8 @@ export default {
689 rule: /^\s*$/g, //非空 688 rule: /^\s*$/g, //非空
690 }, 689 },
691 ] 690 ]
692 //判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
693 if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
694 this.$message({
695 message: '宗地代码或不动产单元号有误，请核对后再试一次',
696 type: "warning",
697 });
698 }else{
699 // console.log(this.rules,'rules'); 691 // console.log(this.rules,'rules');
692 this.$refs.qlxzModule.getRules();
700 let flag = true; 693 let flag = true;
701 this.rules.forEach(item=>{ 694 this.rules.forEach(item=>{
702 if(item.rule.test(item.data) || item.data == null){ 695 if(item.rule.test(item.data) || item.data == null){
...@@ -717,47 +710,55 @@ export default { ...@@ -717,47 +710,55 @@ export default {
717 } 710 }
718 }) 711 })
719 this.$nextTick(()=>{ 712 this.$nextTick(()=>{
720 if(flag){ 713 if(flag && this.$refs.qlxzModule.getRulesResult()){
721 //宗地面积处理 714 //宗地面积处理
722 // console.log(this.formData.zdmj,'this.formData.zdmj'); 715 // console.log(this.formData.zdmj,'this.formData.zdmj');
723 // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') 716 // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'')
724 updateQjZdjbxx(this.formData) 717 //判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
725 .then((res) => { 718 if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
726 if (res.code == 200) { 719 this.$message({
727 console.log(res); 720 message: '宗地代码或不动产单元号有误，请核对后再试一次',
728 this.$message({ 721 type: "warning",
729 message: '保存成功', 722 });
730 type: "success", 723 }else{
731 }); 724 updateQjZdjbxx(this.formData)
732 // 保存成功再次查询 725 .then((res) => {
733 this.getZdjbxxData(this.$store.state.zdbsm); 726 if (res.code == 200) {
734 } else { 727 console.log(res);
735 this.$message({ 728 this.$message({
736 message: res.message, 729 message: '保存成功',
737 type: "warning", 730 type: "success",
738 }); 731 });
739 } 732 // 保存成功再次查询
740 }) 733 this.getZdjbxxData(this.$store.state.zdbsm);
741 .catch((error) => {}); 734 } else {
742 //保存到空间库里面 735 this.$message({
743 var self = this; 736 message: res.message,
744 for(var key in this.geoAttributes){ 737 type: "warning",
745 if(key == "BSM"){ 738 });
746 self.geoAttributes[key] = this.$store.state.zdbsm 739 }
747 }else if(key == 'QLSDFS'){
748 var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
749 var qlsdfs = qlsdfsList.filter(item => {
750 return item.bsm == value;
751 }) 740 })
752 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:""; 741 .catch((error) => {});
753 }else { 742 //保存到空间库里面
754 var formKay = key.toLowerCase(); 743 var self = this;
755 self.geoAttributes[key] = self.formData[formKay]; 744 for(var key in this.geoAttributes){
745 if(key == "BSM"){
746 self.geoAttributes[key] = this.$store.state.zdbsm
747 }else if(key == 'QLSDFS'){
748 var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
749 var qlsdfs = qlsdfsList.filter(item => {
750 return item.bsm == value;
751 })
752 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
753 }else {
754 var formKay = key.toLowerCase();
755 self.geoAttributes[key] = self.formData[formKay];
756 }
756 } 757 }
758 self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
759 console.log("属性保存完成!!");
760 });
757 } 761 }
758 self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
759 console.log("属性保存完成!!");
760 });
761 }else{ 762 }else{
762 this.$message({ 763 this.$message({
763 // message: item.name+'不能为空', 764 // message: item.name+'不能为空',
...@@ -767,11 +768,6 @@ export default { ...@@ -767,11 +768,6 @@ export default {
767 } 768 }
768 }) 769 })
769 770
770
771 }
772
773
774
775 }, 771 },
776 inputBlur(e){ 772 inputBlur(e){
777 if(e.target.value!=''){ 773 if(e.target.value!=''){
...@@ -886,6 +882,17 @@ export default { ...@@ -886,6 +882,17 @@ export default {
886 this.getZdjbxxData(val) 882 this.getZdjbxxData(val)
887 this.curZdbsm = val; 883 this.curZdbsm = val;
888 }, 884 },
885 "formData.bdcdyh":function (val) {
886 if (val != '') {
887 this.$refs.bdcdyh.style.border = '';
888 }
889 },
890 "formData.zddm":function (val) {
891 if (val != '') {
892 this.$refs.zddm.style.border = '';
893 }
894 }
895 },
889 "$store.state.sxdrType": function (val) { 896 "$store.state.sxdrType": function (val) {
890 debugger 897 debugger
891 this.$message.success(val); 898 this.$message.success(val);
...@@ -893,7 +900,6 @@ export default { ...@@ -893,7 +900,6 @@ export default {
893 this.getZdjbxxData(this.$store.state.zdbsm) 900 this.getZdjbxxData(this.$store.state.zdbsm)
894 } 901 }
895 }, 902 },
896 },
897 }; 903 };
898 </script> 904 </script>
899 <style lang="less" scoped> 905 <style lang="less" scoped>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div ref="lpb" class="content_box"> 2 <div ref="lpb" class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy></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></lshs></el-tab-pane>
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
28 return { 28 return {
29 activeName: "zrzxx", 29 activeName: "zrzxx",
30 lpbLoad:false, //默认不加载楼盘表组件 30 lpbLoad:false, //默认不加载楼盘表组件
31 yzgyLoad:false,
31 }; 32 };
32 }, 33 },
33 methods: { 34 methods: {
...@@ -35,6 +36,9 @@ export default { ...@@ -35,6 +36,9 @@ export default {
35 if(!this.lpbLoad){ 36 if(!this.lpbLoad){
36 this.lpbLoad = tab.name == 'lpb' ? true : false 37 this.lpbLoad = tab.name == 'lpb' ? true : false
37 } 38 }
39 if(!this.yzgyLoad){
40 this.yzgyLoad = tab.name == 'yzgy' ? true : false
41 }
38 }, 42 },
39 }, 43 },
40 created() {}, 44 created() {},
......
1 <template> 1 <template>
2 <div class=""> 2 <div class="main" ref="mainBox">
3 <div class="main"> 3 <table border="1">
4 <table border="1"> 4 <tr>
5 <tr> 5 <td colspan="3">宗地代码</td>
6 <td colspan="3">宗地代码</td> 6 <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td>
7 <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td> 7 </tr>
8 </tr> 8 <tr>
9 <tr> 9 <td colspan="3">建筑物区分所有权业主共有部分权利人</td>
10 <td colspan="3">建筑物区分所有权业主共有部分权利人</td> 10 <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td>
11 <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td> 11 </tr>
12 </tr> 12 </table>
13 </table> 13 <table border="1">
14 <table border="1"> 14 <tr>
15 <tr> 15 <td>
16 <td> 16 <el-button
17 <el-button 17 type="primary"
18 type="primary" 18 class="changeBtn outAdd addMinus"
19 class="changeBtn outAdd addMinus" 19 @click="addRow"
20 @click="addRow" 20 >+</el-button
21 >+</el-button 21 >
22 > 22 </td>
23 </td> 23 <td>建(构)筑物编号</td>
24 <td>建(构)筑物编号</td> 24 <td>建(构)筑物数量</td>
25 <td>建(构)筑物数量</td> 25 <td>建(构)筑物面积(㎡)</td>
26 <td>建(构)筑物面积(㎡)</td> 26 <td>占地面积(㎡)</td>
27 <td>占地面积(㎡)</td> 27 <td>分摊土地面积(㎡)</td>
28 <td>分摊土地面积(㎡)</td> 28 <td>附记</td>
29 <td>附记</td> 29 </tr>
30 </tr> 30 <tr v-for="(item,i) in Data.list" :key="i">
31 <tr v-for="(item,i) in Data.list" :key="i"> 31 <td>
32 <td> 32 <el-button
33 <el-button 33 type="primary"
34 type="primary" 34 class="changeBtn outMinus addMinus"
35 class="changeBtn outMinus addMinus" 35 @click="delRow(i)"
36 @click="delRow(i)" 36 >-</el-button
37 >-</el-button 37 >
38 > 38 </td>
39 </td> 39 <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
40 <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td> 40 <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
41 <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td> 41 <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
42 <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td> 42 <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
43 <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td> 43 <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
44 <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td> 44 <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td>
45 <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td> 45 </tr>
46 </tr> 46 <!-- <tr>
47 <!-- <tr> 47 <td>统计</td>
48 <td>统计</td> 48 <td>{{sumTdsyqsyqmj}}</td>
49 <td>{{sumTdsyqsyqmj}}</td> 49 <td>{{sumDydytdmj}}</td>
50 <td>{{sumDydytdmj}}</td> 50 <td>{{sumFttdmj}}</td>
51 <td>{{sumFttdmj}}</td> 51 <td>{{sumFttdmj}}</td>
52 <td>{{sumFttdmj}}</td> 52 <td>{{sumFttdmj}}</td>
53 <td>{{sumFttdmj}}</td> 53 <td>{{sumFttdmj}}</td>
54 <td>{{sumFttdmj}}</td> 54 </tr>-->
55 </tr>--> 55 </table>
56 </table> 56 <!-- <div class="pers">
57 <div class="pers"> 57 <el-button @click="save" type="primary">保存</el-button>
58 <el-button @click="save" type="primary">保存</el-button> 58 </div> -->
59 </div> 59 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
60 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
60 </div> 61 </div>
61 </div> 62 </div>
62 </template> 63 </template>
...@@ -83,7 +84,8 @@ ...@@ -83,7 +84,8 @@
83 fttdmj: '', //分摊土地面积 84 fttdmj: '', //分摊土地面积
84 fj: '' 85 fj: ''
85 }] 86 }]
86 } 87 },
88 mainBoxWidth:0
87 } 89 }
88 }, 90 },
89 91
...@@ -127,10 +129,12 @@ ...@@ -127,10 +129,12 @@
127 console.log("create init...") 129 console.log("create init...")
128 }, 130 },
129 mounted() { 131 mounted() {
130 console.log("mounted init...") 132 // console.log(this.$refs.mainBox.clientWidth,"this.$refs.mainBox.clientWidth")
131 this.Data.glbsm = this.$store.state.zrzbsm 133 this.Data.glbsm = this.$store.state.zrzbsm
132 this.zddm = this.$store.state.zddm 134 this.zddm = this.$store.state.zddm
133 this.getData(this.Data.glbsm) 135 this.$nextTick(() => {
136 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
137 })
134 }, 138 },
135 watch: { 139 watch: {
136 "$store.state.zdbsm": function (bsm) { 140 "$store.state.zdbsm": function (bsm) {
...@@ -147,7 +151,7 @@ ...@@ -147,7 +151,7 @@
147 box-sizing: border-box; 151 box-sizing: border-box;
148 padding: 18px; 152 padding: 18px;
149 height: auto; 153 height: auto;
150 width: 80%; 154 width: 100%;
151 } 155 }
152 156
153 table { 157 table {
...@@ -186,4 +190,22 @@ ...@@ -186,4 +190,22 @@
186 .dzwsl { 190 .dzwsl {
187 width: 200px; 191 width: 200px;
188 } 192 }
193 .header-button {
194 height: 50px;
195 position: fixed;
196 bottom: 0;
197 right: 0;
198 text-align: center;
199 background-color: #ffffff;
200 .saveBtn {
201 background-color: #00CACD;
202 border-color: #00CACD;
203 padding: 10px 30px;
204 margin-top: 8px;
205 }
206 .saveBtn:hover {
207 background-color: rgba(0, 202, 205, .8);
208 border-color: rgba(0, 202, 205, .8);
209 }
210 }
189 </style> 211 </style>
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" ref="mainBox">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule" :bsm="bsm" :qszt="form.qszt"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="bsm" :qszt="form.qszt"></Qlr>
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <tr> 43 <tr>
44 <td colspan="2" >房屋性质<i class="requisite">*</i></td> 44 <td colspan="2" >房屋性质<i class="requisite">*</i></td>
45 <td colspan="4" > 45 <td colspan="4" >
46 <el-select class="formSelect" ref="fwxz" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" > 46 <el-select class="formSelect" ref="fwxz" :disabled="form.qszt!='0'" v-model="form.fwxzbsm" placeholder="请选择" >
47 <el-option 47 <el-option
48 v-for="item in $store.state.fwxzOptions" 48 v-for="item in $store.state.fwxzOptions"
49 :key="item.bsm" 49 :key="item.bsm"
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
156 <td colspan="3" > 156 <td colspan="3" >
157 <el-select-tree style="width:100%" 157 <el-select-tree style="width:100%"
158 ref="ghyt" 158 ref="ghyt"
159 @blur="inputBlur($event)"
160 v-if="show" 159 v-if="show"
161 :default-expand-all="defaultExpandAll" 160 :default-expand-all="defaultExpandAll"
162 :multiple="multiple" 161 :multiple="multiple"
...@@ -173,7 +172,6 @@ ...@@ -173,7 +172,6 @@
173 <td colspan="4" > 172 <td colspan="4" >
174 <el-select-tree style="width:100%" 173 <el-select-tree style="width:100%"
175 ref="yt" 174 ref="yt"
176 @blur="inputBlur($event)"
177 v-if="show" 175 v-if="show"
178 :default-expand-all="defaultExpandAll" 176 :default-expand-all="defaultExpandAll"
179 :multiple="multiple" 177 :multiple="multiple"
...@@ -198,7 +196,7 @@ ...@@ -198,7 +196,7 @@
198 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span> 196 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
199 </td> 197 </td>
200 <td colspan="9" > 198 <td colspan="9" >
201 <el-select class="persent78" ref="fwjg" @blur="inputBlur($event)" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > 199 <el-select class="persent78" ref="fwjg" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
202 <el-option 200 <el-option
203 v-for="item in $store.state.jgOptions" 201 v-for="item in $store.state.jgOptions"
204 :key="item.bsm" 202 :key="item.bsm"
...@@ -266,10 +264,11 @@ ...@@ -266,10 +264,11 @@
266 </tr> 264 </tr>
267 265
268 </table> 266 </table>
269 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 267 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
270 <el-button type="success" @click="onSave">保存</el-button> 268 <el-button type="primary" class="saveBtn" @click="onSave">保存</el-button>
271 <el-button type="primary" @click="onSubmit">提交</el-button> 269 <el-button type="primary" @click="onSubmit">提交</el-button>
272 <el-button type="primary" @click="registerCall">登记调用</el-button> 270 <el-button type="primary" @click="registerCall">登记调用</el-button>
271 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
273 </div> 272 </div>
274 </div> 273 </div>
275 </div> 274 </div>
...@@ -398,6 +397,7 @@ ...@@ -398,6 +397,7 @@
398 BSM:"", 397 BSM:"",
399 }, 398 },
400 rules:[], 399 rules:[],
400 mainBoxWidth:0,
401 } 401 }
402 }, 402 },
403 methods: { 403 methods: {
...@@ -491,13 +491,13 @@ ...@@ -491,13 +491,13 @@
491 this.form.fwytList.forEach((item,index)=>{ 491 this.form.fwytList.forEach((item,index)=>{
492 this.rules.push( 492 this.rules.push(
493 { 493 {
494 data:this.form.fwytList[index].ghyt, 494 data:item.fwytzdbsm,
495 name:'规划用途', 495 name:'规划用途',
496 dom:this.$refs.ghyt[index], 496 dom:this.$refs.ghyt[index],
497 rule: /^\s*$/g, //非空 497 rule: /^\s*$/g, //非空
498 }, 498 },
499 { 499 {
500 data:this.form.fwytList[index].yt, 500 data:item.fwytzdbsm,
501 name:'用途', 501 name:'用途',
502 dom:this.$refs.yt[index], 502 dom:this.$refs.yt[index],
503 rule: /^\s*$/g, //非空 503 rule: /^\s*$/g, //非空
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
507 this.form.fwjgList.forEach((item,index)=>{ 507 this.form.fwjgList.forEach((item,index)=>{
508 this.rules.push( 508 this.rules.push(
509 { 509 {
510 data:this.form.fwjgList[index].fwjg, 510 data:item.fwjgzdbsm,
511 name:'房屋结构', 511 name:'房屋结构',
512 dom:this.$refs.fwjg[index], 512 dom:this.$refs.fwjg[index],
513 rule: /^\s*$/g, //非空 513 rule: /^\s*$/g, //非空
...@@ -519,7 +519,6 @@ ...@@ -519,7 +519,6 @@
519 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 519 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
520 this.$refs.qlxzModule.getRules(); 520 this.$refs.qlxzModule.getRules();
521 let flag = true; 521 let flag = true;
522 console.log(this.rules,'this.rules');
523 this.rules.forEach(item=>{ 522 this.rules.forEach(item=>{
524 if(item.rule.test(item.data) || item.data == null){ 523 if(item.rule.test(item.data) || item.data == null){
525 if(item.dom.$el){ 524 if(item.dom.$el){
...@@ -534,7 +533,7 @@ ...@@ -534,7 +533,7 @@
534 } 533 }
535 }) 534 })
536 this.$nextTick(()=>{ 535 this.$nextTick(()=>{
537 if (flag) { 536 if (flag && this.$refs.qlxzModule.getRulesResult()) {
538 if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){ 537 if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){
539 this.$message({ 538 this.$message({
540 message: '自然幢号或不动产单元号有误，请核对后再试一次', 539 message: '自然幢号或不动产单元号有误，请核对后再试一次',
...@@ -542,15 +541,15 @@ ...@@ -542,15 +541,15 @@
542 }); 541 });
543 }else{ 542 }else{
544 saveZrzInfo(this.form).then((res)=>{ 543 saveZrzInfo(this.form).then((res)=>{
545 if(res.code===200){ 544 if(res.code===200){
546 this.$message.success("保存完成！") 545 this.$message.success("保存完成！")
547 }else { 546 }else {
548 this.$message({ 547 this.$message({
549 message: res.message, 548 message: res.message,
550 type: "warning", 549 type: "warning",
551 }); 550 });
552 } 551 }
553 this.loading=false; 552 this.loading=false;
554 }) 553 })
555 this.loading=false; 554 this.loading=false;
556 555
...@@ -718,7 +717,11 @@ ...@@ -718,7 +717,11 @@
718 this.getZrzDetailByBsm(this.$route.query.bsm) 717 this.getZrzDetailByBsm(this.$route.query.bsm)
719 } 718 }
720 }, 719 },
721 mounted() {}, 720 mounted() {
721 this.$nextTick(() => {
722 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
723 })
724 },
722 computed: { 725 computed: {
723 zrzbsm() { 726 zrzbsm() {
724 return this.$store.state.zdbsm; 727 return this.$store.state.zdbsm;
...@@ -727,7 +730,46 @@ ...@@ -727,7 +730,46 @@
727 watch:{ 730 watch:{
728 zrzbsm:function (val) { 731 zrzbsm:function (val) {
729 this.reload() 732 this.reload()
730 } 733 },
734 "form.bdcdyh":function (val) {
735 if (val != '') {
736 this.$refs.bdcdyh.style.border = '';
737 }
738 },
739 "form.zrzh":function (val) {
740 if (val != '') {
741 this.$refs.zrzh.style.border = '';
742 }
743 },
744 "form.fwxzbsm":{
745 handler:function (val) {
746 if (val != '') {
747 this.$refs.fwxz.$el.style.border = '';
748 }
749 },
750 immediate:false
751 },
752 "form.fwytList": {
753 handler : function (newVal, oldVal) {
754 newVal.forEach((item,ind)=>{
755 if(item.fwytzdbsm != ''){
756 this.$refs.ghyt[ind].$el.style.border=""
757 this.$refs.yt[ind].$el.style.border=""
758 }
759 })
760 },
761 deep:true
762 },
763 "form.fwjgList": {
764 handler : function (newVal, oldVal) {
765 newVal.forEach((item,ind)=>{
766 if(item.fwjgzdbsm != ''){
767 this.$refs.fwjg[ind].$el.style.border=""
768 }
769 })
770 },
771 deep:true
772 },
731 } 773 }
732 } 774 }
733 </script> 775 </script>
...@@ -739,6 +781,7 @@ ...@@ -739,6 +781,7 @@
739 .formMenu { 781 .formMenu {
740 width: 100%; 782 width: 100%;
741 margin: 0 auto; 783 margin: 0 auto;
784 margin-bottom: 50px;
742 } 785 }
743 .zrzTable { 786 .zrzTable {
744 margin: 10px 0; 787 margin: 10px 0;
...@@ -792,5 +835,26 @@ ...@@ -792,5 +835,26 @@
792 width: 100%; 835 width: 100%;
793 } 836 }
794 } 837 }
838 .header-button {
839 height: 50px;
840 position: fixed;
841 bottom: 0;
842 right: 6px;
843 text-align: center;
844 background-color: #ffffff;
845 .el-button{
846 padding: 10px 30px;
847 margin-top: 8px;
848 cursor: pointer;
849 }
850 .saveBtn {
851 background-color: #00CACD;
852 border-color: #00CACD;
853 }
854 .saveBtn:hover {
855 background-color: rgba(0, 202, 205, .8);
856 border-color: rgba(0, 202, 205, .8);
857 }
858 }
795 } 859 }
796 </style> 860 </style>
......