5a95f8e7 by zhaoqian

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents ee7a9031 4a16a083
...@@ -208,3 +208,4 @@ export function registerCall(data) { ...@@ -208,3 +208,4 @@ export function registerCall(data) {
208 data:data 208 data:data
209 }) 209 })
210 } 210 }
211
......
...@@ -10,6 +10,10 @@ export function getSearchList(data) { ...@@ -10,6 +10,10 @@ export function getSearchList(data) {
10 }) 10 })
11 } 11 }
12 12
13 /**
14 * 宗地分割选择宗地列表
15 * @param data
16 */
13 export function zdlist(data) { 17 export function zdlist(data) {
14 return request({ 18 return request({
15 url: '/zd/qjZdjbxx/zdlist', 19 url: '/zd/qjZdjbxx/zdlist',
...@@ -17,3 +21,15 @@ export function zdlist(data) { ...@@ -17,3 +21,15 @@ export function zdlist(data) {
17 data:data 21 data:data
18 }) 22 })
19 } 23 }
24
25 /**
26 * 多幢分割选择多幢列表
27 * @param data
28 */
29 export function dzList(data) {
30 return request({
31 url:'/fw/qjDz/dzlist',
32 method:'post',
33 data:data
34 })
35 }
......
...@@ -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
......
1 <template>
2 <div>
3 <el-dialog
4 title="新增"
5 :visible.sync="isVisible"
6 width="70%"
7 @close="close"
8 :modal-append-to-body="false"
9 center>
10 <div class="search">
11 <el-row>
12 <el-col :span="24">
13 <el-form :inline="true" class="demo-form-inline">
14 <el-form-item label="宗地编码">
15 <el-input
16 v-model="queryData.zddm"
17 placeholder="输入宗地编码"
18 ></el-input>
19 </el-form-item>
20 <el-form-item label="不动产权证号">
21 <el-input
22 v-model="queryData.bdcqzh"
23 placeholder="输入不动产权证号"
24 ></el-input>
25 </el-form-item>
26 <el-form-item label="不动产单元号">
27 <el-input
28 maxlength="28"
29 v-model="queryData.bdcdyh"
30 placeholder="输入不动产单元号"
31 ></el-input>
32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button>
35 </el-form>
36 </el-col>
37 </el-row>
38 <el-row>
39 <el-col :span="24">
40 <el-form :inline="true" class="demo-form-inline">
41 <el-form-item label="权利人">
42 <el-input
43 v-model="queryData.qlrmc"
44 placeholder="输入权利人"
45 ></el-input>
46 </el-form-item>
47 <el-form-item label="坐落">
48 <el-input
49 v-model="queryData.zl"
50 placeholder="输入坐落"
51 ></el-input>
52 </el-form-item>
53 </el-form>
54 </el-col>
55 </el-row>
56 <div class="table-bode">
57 <table border="1">
58 <tr>
59 <td>序号</td>
60 <td>操作</td>
61 <td>宗地代码</td>
62 <td>不动产单元号</td>
63 <td>项目名称</td>
64 <td>不动产权证号</td>
65 <td>权利人</td>
66 <td>坐落</td>
67 </tr>
68 <tr v-if="Data.length==0">
69 <td colspan="8">
70 <span class="noData">暂无数据</span>
71 </td>
72 </tr>
73 <tr v-else v-for="(item,index) in Data" :key="index">
74 <td>{{index+1}}</td>
75 <td @click="addData(item)" class="xz">
76 <span>选择</span>
77 </td>
78 <td>{{item.zddm}}</td>
79 <td>{{item.bdcdyh}}</td>
80 <td>{{item.xmmc}}</td>
81 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlr}}</td>
83 <td>{{item.zl}}</td>
84 </tr>
85 </table>
86 </div>
87 </div>
88 <div class="page">
89 <el-pagination
90 background
91 layout="prev, pager, next,total"
92 :page-size="queryData.pageSize"
93 :total="total"
94 @current-change="currentChange"
95 >
96 </el-pagination>
97 </div>
98 </el-dialog>
99
100 </div>
101 </template>
102
103 <script>
104 import {dzList} from './../../api/search'
105
106 export default {
107 name: "zdQueryData",
108 data() {
109 return {
110 total: 1,
111 queryData: {
112 bdcdyh: "",
113 bdcqzh: "",
114 qlrmc: "",
115 xmmc: "",
116 zddm: "",
117 zl: "",
118 pageNo: 1,
119 pageSize: 10,
120 },
121 Data: [],
122 isVisible: false
123 }
124 },
125 props: {
126 centerDialogVisible: {
127 type: Boolean,
128 default: function () {
129 return false
130 }
131 },
132 isClose: {
133 type: Boolean,
134 default: false
135 }
136 },
137 mounted() {
138 this.getData(this.queryData)
139 },
140 created() {
141 },
142 methods: {
143 currentChange: function (val) {
144 this.queryData.pageNo = val;
145 this.getData(this.queryData);
146 },
147 reset: function () {
148 this.queryData = {
149 bdcdyh: "",
150 bdcqzh: "",
151 qlrmc: "",
152 xmmc: "",
153 zddm: "",
154 zl: "",
155 pageNo: 1,
156 pageSize: 10
157 };
158 this.getData(this.queryData)
159 },
160 getData: function (data) {
161 dzList(data).then(res => {
162 this.Data = res.result.records
163 this.total = res.result.total;
164 })
165 },
166 search: function () {
167 this.getData(this.queryData)
168 },
169 addData: function (val) {
170 this.$emit("getData", val)
171 if (this.isClose) {
172 this.close();
173 }
174 },
175 close: function () {
176 this.$emit('close')
177 this.reset();
178 }
179 },
180 watch: {
181 centerDialogVisible(val) {
182 this.isVisible = val
183 }
184 }
185 }
186 </script>
187
188 <style scoped lang="less">
189
190 .main {
191 box-sizing: border-box;
192 padding: 18px;
193 height: auto;
194 width: 80%;
195 }
196
197 /deep/ .el-form-item__label {
198 width: 96px;
199 text-align: right;
200 }
201
202 table {
203 margin-top: 10px;
204 background-color: #fff;
205 font-size: 14px;
206 width: 100%;
207 tr:hover {
208 background-color: #F5F7FA;
209 }
210 }
211
212 td {
213 text-align: center;
214 height: 36px;
215 min-width: 50px;
216 }
217
218 table:hover {
219 cursor: pointer;
220 }
221
222 .inputtitle {
223 line-height: 40px;
224 }
225
226 .shop {
227 margin-top: 20px;
228 }
229
230 .xz {
231 color: blue;
232 }
233
234 .noData {
235 color: #b2b2b2;
236 }
237 .table-bode{
238 height: 450px;
239 }
240 .page {
241 margin-top: 20px;
242 }
243
244 </style>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <li @click="exportToShp">ESRI Shape</li> 67 <li @click="exportToShp">ESRI Shape</li>
68 </ul> 68 </ul>
69 </li> 69 </li>
70 <li v-show="isZD">导入属性</li> 70 <li v-show="isZD" @click="drsx">导入属性</li>
71 <li v-show="!isZD">导入楼盘</li> 71 <li v-show="!isZD">导入楼盘</li>
72 <li>重叠分析</li> 72 <li>重叠分析</li>
73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li> 73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
...@@ -101,13 +101,15 @@ ...@@ -101,13 +101,15 @@
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 <!-- 添加定着物弹框 -->
108 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> 109 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
109 <Create @closeDialog="closeDialog" :auth="true"></Create> 110 <Create @closeDialog="closeDialog" :auth="true"></Create>
110 </el-dialog> 111 </el-dialog>
112 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
111 </div> 113 </div>
112 </template> 114 </template>
113 <script> 115 <script>
...@@ -119,6 +121,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils"; ...@@ -119,6 +121,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils";
119 import featureUpdate from "@libs/map/featureUpdate"; 121 import featureUpdate from "@libs/map/featureUpdate";
120 import {deleteLjz,deleteZdy} from "./../../api/lpb" 122 import {deleteLjz,deleteZdy} from "./../../api/lpb"
121 import exportTemJson from '@/assets/json/exportTemplate.json' 123 import exportTemJson from '@/assets/json/exportTemplate.json'
124 import sxdr from './../../components/sxdr/sxdr'
122 export default { 125 export default {
123 inheritAttrs: false, 126 inheritAttrs: false,
124 props: { 127 props: {
...@@ -132,10 +135,11 @@ export default { ...@@ -132,10 +135,11 @@ export default {
132 default: false, 135 default: false,
133 } 136 }
134 }, 137 },
135 components: { lineItem,Create,ImportGeo }, 138 components: { lineItem,Create,ImportGeo,sxdr },
136 mixins:[geoUtils,featureUpdate], 139 mixins:[geoUtils,featureUpdate],
137 data() { 140 data() {
138 return { 141 return {
142 sxdrVisible:false,
139 selectedDetail: {}, 143 selectedDetail: {},
140 timer: {}, 144 timer: {},
141 formatData: [], 145 formatData: [],
...@@ -195,6 +199,12 @@ export default { ...@@ -195,6 +199,12 @@ export default {
195 }, 199 },
196 200
197 methods: { 201 methods: {
202 drsx(){
203 this.sxdrVisible=true;
204 },
205 sxdrClose(){
206 this.sxdrVisible=false;
207 },
198 loading(){ 208 loading(){
199 this.$emit("loading") 209 this.$emit("loading")
200 }, 210 },
...@@ -432,6 +442,7 @@ export default { ...@@ -432,6 +442,7 @@ export default {
432 }else { 442 }else {
433 BSM = this.zdData.bsm; 443 BSM = this.zdData.bsm;
434 } 444 }
445 //当确定导入图形是 跳转到图形界面
435 this.queryGeoByBsm(BSM,type,function (features){ 446 this.queryGeoByBsm(BSM,type,function (features){
436 if(features && features.length > 0){ 447 if(features && features.length > 0){
437 if(features[0].geometry){ 448 if(features[0].geometry){
...@@ -440,6 +451,7 @@ export default { ...@@ -440,6 +451,7 @@ export default {
440 cancelButtonText: '取消', 451 cancelButtonText: '取消',
441 type: 'warning' 452 type: 'warning'
442 }).then(() => { 453 }).then(() => {
454 self.postionToMap();
443 self.improtDialog = true; 455 self.improtDialog = true;
444 self.currentClickZdGeo = features[0]; 456 self.currentClickZdGeo = features[0];
445 }).catch(() => { 457 }).catch(() => {
...@@ -449,11 +461,13 @@ export default { ...@@ -449,11 +461,13 @@ export default {
449 }); 461 });
450 }); 462 });
451 }else { 463 }else {
464 self.postionToMap();
452 self.currentClickZdGeo = features[0]; 465 self.currentClickZdGeo = features[0];
453 self.improtDialog = true; 466 self.improtDialog = true;
454 } 467 }
455 468
456 }else{ 469 }else{
470 self.postionToMap();
457 self.currentClickZdGeo = null; 471 self.currentClickZdGeo = null;
458 self.improtDialog = true; 472 self.improtDialog = true;
459 } 473 }
...@@ -502,7 +516,6 @@ export default { ...@@ -502,7 +516,6 @@ export default {
502 }).then(res => { 516 }).then(res => {
503 debugger 517 debugger
504 });*/ 518 });*/
505
506 }else{ 519 }else{
507 self.$message.warning("暂无空间信息!!!!"); 520 self.$message.warning("暂无空间信息!!!!");
508 } 521 }
...@@ -576,6 +589,7 @@ export default { ...@@ -576,6 +589,7 @@ export default {
576 //关闭图形弹框 589 //关闭图形弹框
577 closeImportDialog(){ 590 closeImportDialog(){
578 this.improtDialog = false; 591 this.improtDialog = false;
592 this.clearOverLayer();
579 } 593 }
580 594
581 }, 595 },
...@@ -724,4 +738,8 @@ export default { ...@@ -724,4 +738,8 @@ export default {
724 center; 738 center;
725 background-size: contain; 739 background-size: contain;
726 } 740 }
741 /deep/ .importDialog{
742 margin-top: 120px!important;
743 margin-left: 291px;
744 }
727 </style> 745 </style>
......
1 <template> 1 <template>
2 <div > 2 <div >
3 <div v-if="!resultDialog && !txtResultDialog" class="importDiv"> 3 <div v-if="!resultDialog && !txtResultDialog && !dealDialog" class="importDiv">
4 <el-upload 4 <el-upload
5 class="upload-demo" 5 class="upload-demo"
6 action="#" 6 action="#"
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
108 { required: true, message: '请选择地块', trigger: 'change' }, 108 { required: true, message: '请选择地块', trigger: 'change' },
109 ]" 109 ]"
110 > 110 >
111 <el-select v-model="txtZd.name" filterable placeholder="请选择"> 111 <el-select v-model="txtZd.name" filterable placeholder="请选择" @change="txtChange">
112 <el-option 112 <el-option
113 v-for="(item,index) in txtResult" 113 v-for="(item,index) in txtResult"
114 :key="index" 114 :key="index"
...@@ -123,6 +123,30 @@ ...@@ -123,6 +123,30 @@
123 </el-form-item> 123 </el-form-item>
124 </el-form> 124 </el-form>
125 </div> 125 </div>
126 <div v-if="dealDialog">
127 <el-form :model="dealForm" ref="dealForm" label-width="100px" size="small" @submit.native.prevent class="demo-ruleForm">
128 <el-form-item
129 label="处理方法"
130 prop="method"
131 :rules="[
132 { required: true, message: '请选择', trigger: 'change' },
133 ]"
134 >
135 <el-select v-model="dealForm.method" filterable placeholder="请选择">
136 <el-option
137 v-for="(item,index) in dealMethods"
138 :key="index"
139 :label="item.label"
140 :value="item.value">
141 </el-option>
142 </el-select>
143 </el-form-item>
144 <el-form-item>
145 <el-button type="primary" @click="submitDealForm('dealForm')">确定</el-button>
146 <el-button @click="cancelDealForm('dealForm')">取消</el-button>
147 </el-form-item>
148 </el-form>
149 </div>
126 </div> 150 </div>
127 </template> 151 </template>
128 <script> 152 <script>
...@@ -157,6 +181,25 @@ export default { ...@@ -157,6 +181,25 @@ export default {
157 txtResultDialog:null, 181 txtResultDialog:null,
158 txtZd:{ 182 txtZd:{
159 name:"" 183 name:""
184 },
185 overResults:[],//与导入宗地重叠的地块
186 currntDealGraphic:null,
187 dealMethods:[{
188 label:"不做处理",
189 value:"1"
190 },{
191 label:"删除叠加部分",
192 value:"2"
193 },{
194 label:"删除已重叠部分",
195 value:"3"
196 },{
197 label:"删除原图形",
198 value:"4"
199 }],
200 dealDialog:false,
201 dealForm:{
202 method:""
160 } 203 }
161 } 204 }
162 }, 205 },
...@@ -167,6 +210,7 @@ export default { ...@@ -167,6 +210,7 @@ export default {
167 timeLine(newValue,oldValue){ 210 timeLine(newValue,oldValue){
168 this.resultDialog = false; 211 this.resultDialog = false;
169 this.txtResultDialog = false; 212 this.txtResultDialog = false;
213 this.dealDialog = false;
170 } 214 }
171 }, 215 },
172 methods:{ 216 methods:{
...@@ -268,11 +312,7 @@ export default { ...@@ -268,11 +312,7 @@ export default {
268 attributes:null, 312 attributes:null,
269 geometry:geometry 313 geometry:geometry
270 } 314 }
271 if(self.propertyInfo.type == "zd"){ 315 self.checkGeo(graphic);
272 self.saveZd(graphic);
273 }else{
274 self.saveZRZ(graphic);
275 }
276 }else{ 316 }else{
277 this.$message.warning(response.message); 317 this.$message.warning(response.message);
278 } 318 }
...@@ -291,25 +331,95 @@ export default { ...@@ -291,25 +331,95 @@ export default {
291 graphic.geometry.spatialReference = { 331 graphic.geometry.spatialReference = {
292 wkt:wkt 332 wkt:wkt
293 } 333 }
334 self.checkGeo(graphic);
335 }else{
336 console.log('error submit!!');
337 return false;
338 }
339 })
340 },
341 txtChange(value){
342 var 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]]";
343 var graphics = self.txtResult.filter(item => {
344 return item.attributes.name == value;
345 })
346 var graphic = graphics[0];
347 graphic.geometry.type = "polygon";
348 graphic.geometry.spatialReference = {
349 wkt:wkt
350 }
351 this.addOverLayer(graphic.geometry,[]);
352 },
353 //校验空间完整性
354 checkGeo(graphic){
355 var self = this;
294 //校验完整性 直接调用空间方法 提交空间表 356 //校验完整性 直接调用空间方法 提交空间表
295 self.geoJoint(geometry,function (isJoint,message) { 357 self.geoJoint(graphic.geometry,function (isJoint,message) {
296 if(isJoint){ 358 if(isJoint){
297 self.$message.warning(message) 359 self.$message.warning(message)
298 return; 360 return;
299 }else { 361 }else {
300 if(self.propertyInfo.type == "zd"){ 362 var type = self.propertyInfo.type;
363 if(type == 'zd'){
364 //重叠分析
365 self.zdOverAnalys(self.propertyInfo.zdbsm,graphic,function (flag,results) {
366 if(flag){
367 self.$message.warning("导入的宗地与其他宗地有重叠,请处理!!");
368 self.dealOverData(results,graphic);
369 }else {
301 self.saveZd(graphic); 370 self.saveZd(graphic);
302 }else{ 371 }
372 });
373 }else {
374 self.zrzOverAnalys(this.propertyInfo.bsm,graphic,function (flag,mes) {
375 if(flag){
376 self.$message.warning(mes);
377 return;
378 }else {
303 self.saveZRZ(graphic); 379 self.saveZRZ(graphic);
304 } 380 }
381 });
382 }
305 } 383 }
306 }); 384 });
307 }else{ 385 },
386 //选择处理方式
387 submitDealForm(formName){
388 var self = this;
389 this.$refs[formName].validate((valid) => {
390 if(valid){
391 //选择处理方式
392 var value = self.dealForm.method;
393 switch (value) {
394 case '1':self.currntDealGraphic.attributes.BGZT =1;self.saveZd(self.currntDealGraphic);break;
395 case "2":self.getDifference(self.currntDealGraphic,self.overResults,self.delOverGeo);break;
396 case "3":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,true);break;
397 case "4":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,false);break;
398 }
399 }else {
308 console.log('error submit!!'); 400 console.log('error submit!!');
309 return false; 401 return false;
310 } 402 }
311 }) 403 })
312 }, 404 },
405 //裁剪自己在保存
406 delOverGeo(geometry){
407 this.currntDealGraphic.attributes.BGZT =2;
408 if(geometry == null){
409 this.$message.warning("完全重叠,已删除图形信息!!!")
410 this.currntDealGraphic.geometry = geometry;
411 }
412 this.saveZd(this.currntDealGraphic);
413 },
414 //裁剪别的在保存
415 delOtherGeo(results){
416 //执行编辑操作
417 var layer = this.getLayerByName("ZDJBXX");
418 var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
419 featureUrl += "/"+layer.id;
420 this.updateGraphic(featureUrl,results);
421 this.saveZd(this.currntDealGraphic);
422 },
313 //下载文档模板 423 //下载文档模板
314 downloadFile(url,fileName){ 424 downloadFile(url,fileName){
315 let link = document.createElement("a"); 425 let link = document.createElement("a");
...@@ -336,25 +446,20 @@ export default { ...@@ -336,25 +446,20 @@ export default {
336 attributes:self.currentClickZd, 446 attributes:self.currentClickZd,
337 geometry:geometry 447 geometry:geometry
338 } 448 }
339 self.geoJoint(geometry,function (isJoint,message) { 449 self.checkGeo(graphic);
340 if(isJoint){
341 self.$message.warning(message)
342 return;
343 }else {
344 if(self.propertyInfo.type == "zd"){
345 self.saveZd(graphic);
346 }else{
347 self.saveZRZ(graphic);
348 }
349 }
350 });
351
352 } else { 450 } else {
353 console.log('error submit!!'); 451 console.log('error submit!!');
354 return false; 452 return false;
355 } 453 }
356 }); 454 });
357 }, 455 },
456 dealOverData(results,graphic){
457 this.overResults = results;
458 this.currntDealGraphic = graphic;
459 this.resultDialog = false;
460 this.txtResultDialog = false;
461 this.dealDialog = true;
462 },
358 saveZd(graphic){ 463 saveZd(graphic){
359 var self = this; 464 var self = this;
360 var points = null,lines = null, 465 var points = null,lines = null,
...@@ -363,6 +468,9 @@ export default { ...@@ -363,6 +468,9 @@ export default {
363 featureUrl += "/"+layer.id; 468 featureUrl += "/"+layer.id;
364 if(self.geoInfo){ 469 if(self.geoInfo){
365 //替换 生成图像 高亮 470 //替换 生成图像 高亮
471 if(graphic.attributes && graphic.attributes.BGZT){
472 self.geoInfo.attributes.BGZT = graphic.attributes.BGZT;
473 }
366 self.geoInfo.attributes.BSM = this.propertyInfo.zdbsm; 474 self.geoInfo.attributes.BSM = this.propertyInfo.zdbsm;
367 self.geoInfo.attributes.ZDDM = this.propertyInfo.zddm; 475 self.geoInfo.attributes.ZDDM = this.propertyInfo.zddm;
368 self.geoInfo.attributes.XMMC = this.propertyInfo.mc; 476 self.geoInfo.attributes.XMMC = this.propertyInfo.mc;
...@@ -374,6 +482,7 @@ export default { ...@@ -374,6 +482,7 @@ export default {
374 var updResult = res.updateFeatureResults[0]; 482 var updResult = res.updateFeatureResults[0];
375 if(updResult.objectId){ 483 if(updResult.objectId){
376 var OBJECTID = updResult.objectId; 484 var OBJECTID = updResult.objectId;
485 if(graphic.geometry){
377 points = self.craetJZPoint(graphic); 486 points = self.craetJZPoint(graphic);
378 self.savejzd(points) 487 self.savejzd(points)
379 //生成边框线 488 //生成边框线
...@@ -381,27 +490,36 @@ export default { ...@@ -381,27 +490,36 @@ export default {
381 lines = res; 490 lines = res;
382 self.saveJzx(lines); 491 self.saveJzx(lines);
383 }); 492 });
493 }
494 self.$message.success("保存成功!!!");
384 self.goMap(); 495 self.goMap();
385 } 496 }
386 }); 497 });
387 }else{ 498 }else{
388 //生成图像 保存 499 //生成图像 保存
389 graphic.attributes = { 500 var attributes = {
390 BSM:this.propertyInfo.zdbsm, 501 BSM:this.propertyInfo.zdbsm,
391 ZDDM:this.propertyInfo.zddm, 502 ZDDM:this.propertyInfo.zddm,
392 XMMC:this.propertyInfo.mc 503 XMMC:this.propertyInfo.mc
504 };
505 if(graphic.attributes && graphic.attributes.BGZT){
506 attributes.BGZT = graphic.attributes.BGZT;
393 } 507 }
508 graphic.attributes = attributes;
394 self.addGraphic(featureUrl,graphic,function (res) { 509 self.addGraphic(featureUrl,graphic,function (res) {
395 var addRresult = res.addFeatureResults[0]; 510 var addRresult = res.addFeatureResults[0];
396 if(addRresult.objectId){ 511 if(addRresult.objectId){
397 var OBJECTID = addRresult.objectId; 512 var OBJECTID = addRresult.objectId;
513 if(graphic.geometry) {
398 points = self.craetJZPoint(graphic); 514 points = self.craetJZPoint(graphic);
399 self.savejzd(points) 515 self.savejzd(points)
400 //生成边框线 516 //生成边框线
401 self.createJZLine(graphic,function (res){ 517 self.createJZLine(graphic, function (res) {
402 lines = res; 518 lines = res;
403 self.saveJzx(lines); 519 self.saveJzx(lines);
404 }); 520 });
521 }
522 self.$message.success("保存成功!!!");
405 self.goMap(); 523 self.goMap();
406 } 524 }
407 }); 525 });
...@@ -459,12 +577,13 @@ export default { ...@@ -459,12 +577,13 @@ export default {
459 var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer"); 577 var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
460 featureUrl += "/"+layer.id; 578 featureUrl += "/"+layer.id;
461 if(self.geoInfo){ 579 if(self.geoInfo){
462 self.geoInfo.BSM = this.propertyInfo.bsm; 580 self.geoInfo.BSM = self.propertyInfo.bsm;
463 graphic.attributes = self.geoInfo; 581 graphic.attributes = self.geoInfo;
464 //替换 生成图像 高亮 582 //替换 生成图像 高亮
465 self.updateGraphic(featureUrl,graphic,function (res) { 583 self.updateGraphic(featureUrl,graphic,function (res) {
466 var addRresult = res.updateFeatureResults[0]; 584 var addRresult = res.updateFeatureResults[0];
467 if(addRresult.objectId) { 585 if(addRresult.objectId) {
586 self.$message.success("保存成功!!!");
468 self.goMap(); 587 self.goMap();
469 } 588 }
470 }); 589 });
...@@ -478,12 +597,13 @@ export default { ...@@ -478,12 +597,13 @@ export default {
478 self.addGraphic(featureUrl,graphic,function (res) { 597 self.addGraphic(featureUrl,graphic,function (res) {
479 var addRresult = res.addFeatureResults[0]; 598 var addRresult = res.addFeatureResults[0];
480 if(addRresult.objectId) { 599 if(addRresult.objectId) {
600 self.$message.success("保存成功!!!");
481 self.goMap(); 601 self.goMap();
482 } 602 }
483 }); 603 });
484 } 604 }
485 }, 605 },
486 //操作成功跳转 606 //操作成功不需要跳转地图 (直接定位新导入的图形)
487 goMap(){ 607 goMap(){
488 var bsm = "", type = this.propertyInfo.type; 608 var bsm = "", type = this.propertyInfo.type;
489 if(type == "zd"){ 609 if(type == "zd"){
...@@ -492,35 +612,46 @@ export default { ...@@ -492,35 +612,46 @@ export default {
492 bsm = this.propertyInfo.bsm; 612 bsm = this.propertyInfo.bsm;
493 } 613 }
494 this.resultDialog = false; 614 this.resultDialog = false;
615 this.txtResultDialog = false;
616 this.dealDialog = false;
495 this.$emit("closeImportDialog"); 617 this.$emit("closeImportDialog");
496 var curretRouterInfo = { 618 //TODO 定位当前新导入的图形
497 path: this.$route.path, 619 this.addGeoByBsm(bsm,type,"testMap");
498 query: this.$route.query
499 }
500 sessionStorage.setItem("curretRouterInfo", JSON.stringify(curretRouterInfo));
501 this.$router.push({
502 path: "/viewMap",
503 query: {
504 bsm: bsm,
505 type: this.propertyInfo.type
506 }
507 });
508 }, 620 },
509 //取消 621 //取消
510 cancel(){ 622 cancel(){
511 this.zdForm.zdBsm = ""; 623 this.zdForm.zdBsm = "";
512 this.currentClickZd = null; 624 this.currentClickZd = null;
513 this.resultDialog = false; 625 this.resultDialog = false;
626 // 清空当前图层上显示的图形
627 this.clearOverLayer();
514 }, 628 },
515 //取消文本选择的弹出框 629 //取消文本选择的弹出框
516 cancelTxtForm(){ 630 cancelTxtForm(){
517 this.txtZd.name = ""; 631 this.txtZd.name = "";
518 this.txtResultDialog = false; 632 this.txtResultDialog = false;
633 // 清空当前图层上显示的图形
634 this.clearOverLayer();
635 },
636 //取消导入处理的结果
637 cancelDealForm(){
638 this.dealForm.method = "";
639 this.dealDialog = false;
640 this.overResults = [];
641 // 清空当前图层上显示的图形
642 this.clearOverLayer();
519 }, 643 },
520 //宗地选择发生改变 644 //宗地选择发生改变
521 zdChange(value){ 645 zdChange(value){
522 this.zdForm.zdBsm = value.XMMC; 646 this.zdForm.zdBsm = value.XMMC;
523 this.currentClickZd = value; 647 this.currentClickZd = value;
648 var geometry = this.parseWktToArc(this.currentClickZd.wkt);
649 geometry.type = "polygon";
650 var 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]]";
651 geometry.spatialReference = {
652 wkt:wkt
653 }
654 this.addOverLayer(geometry,[]);
524 } 655 }
525 } 656 }
526 } 657 }
......
...@@ -10,6 +10,7 @@ import featureUpdate from "@libs/map/featureUpdate"; ...@@ -10,6 +10,7 @@ import featureUpdate from "@libs/map/featureUpdate";
10 import arcgisParser from 'terraformer-arcgis-parser' 10 import arcgisParser from 'terraformer-arcgis-parser'
11 import wktParse from 'terraformer-wkt-parser' 11 import wktParse from 'terraformer-wkt-parser'
12 import {maps} from '@/libs/map/mapUtils' 12 import {maps} from '@/libs/map/mapUtils'
13 import graphicSymbol from '@/assets/json/graphicSymbol.json'
13 14
14 export default { 15 export default {
15 data(){ 16 data(){
...@@ -197,8 +198,9 @@ export default { ...@@ -197,8 +198,9 @@ export default {
197 } 198 }
198 for(var i = 0;i < results.length;i++){ 199 for(var i = 0;i < results.length;i++){
199 var feature = results[i].feature; 200 var feature = results[i].feature;
200 var flag = geometryEngine.disjoint(polygon,feature.geometry); 201 var flag = geometryEngine.intersects(polygon,feature.geometry);
201 if(flag){ 202 var withinFlag = geometryEngine.within(polygon,feature.geometry);
203 if(!withinFlag && flag){
202 isJoint = true; 204 isJoint = true;
203 layerName = results[i].layerName; 205 layerName = results[i].layerName;
204 switch (layerName) { 206 switch (layerName) {
...@@ -244,7 +246,260 @@ export default { ...@@ -244,7 +246,260 @@ export default {
244 featureUpdate.methods.addGraphic(featureUrl,graphic,callBackFunction) ; 246 featureUpdate.methods.addGraphic(featureUrl,graphic,callBackFunction) ;
245 } 247 }
246 }); 248 });
249 },
250 //叠加分析 同一个图层的叠加分析
251 zdOverAnalys(bsm,graphic,callBacFunction){
252 var self = this;
253 loadModules([
254 "esri/geometry/Polygon"
255 ]).then(([
256 Polygon
257 ]) => {
258 var zdLayer = null;
259 zdLayer = self.getLayerByName("ZDJBXX");
260 var layerIds = [];
261 layerIds.push(zdLayer.id);
262 var polygon = new Polygon(graphic.geometry);
263 identifyUtils.methods.identify(zdLayer.layerUrl,layerIds,polygon,function (res) {
264 var results = res.results;
265 //判断数据是否与其他数据有重叠
266 var flag = false;
267 if(results && results.length > 0){
268 flag = true;
269 //加载在图层上 原本的要导入的数据 和重叠数据
270 self.addOverLayer(polygon,results);
271 }
272 callBacFunction(flag,results);
273 },true)
274 }).catch(err => {
275 console.log(err);
276 throw (err);
277 })
278 },
279 //添加添加元素和覆盖的元素到地图上
280 addOverLayer(geometry,results){
281 var view = maps["testMap"];
282 loadModules([
283 "esri/Graphic",
284 "esri/layers/GraphicsLayer",
285 "esri/geometry/geometryEngineAsync",
286 "esri/geometry/Extent"
287 ]).then(([
288 Graphic,
289 GraphicsLayer,
290 geometryEngineAsync,
291 Extent
292 ])=>{
293 var graphic = new Graphic({
294 geometry:geometry
295 })
296 var layer = view.map.findLayerById("overLayer");
297 if(layer){
298 layer.removeAll();
299 }else {
300 layer = new GraphicsLayer({
301 id:"overLayer"
302 })
303 view.map.add(layer);
304 }
305 var impotSymbol = graphicSymbol.fillSymbol.importSymbol,
306 defaultSymbol = graphicSymbol.fillSymbol.defaultSymbol;
307 for(var i = 0;i < results.length;i++){
308 var feature = results[i].feature;
309 feature.symbol = defaultSymbol;
310 layer.add(feature);
311 var geo = geometryEngineAsync.intersect(feature.geometry,geometry);
312 geo.then(function (res) {
313 var interGra = new Graphic({
314 geometry:res,
315 symbol:graphicSymbol.fillSymbol.highlightSymbol
316 })
317 layer.add(interGra);
318 })
319 }
320 graphic.symbol = impotSymbol
321 layer.add(graphic);
322 var extent = new Extent(JSON.parse(JSON.stringify(graphic.geometry.extent)))
323 extent.spatialReference = view.spatialReference;
324 view.extent = extent;
325 }).catch(err => {
326 console.log(err);
327
328 })
329 },
330 clearOverLayer(){
331 var view = maps["testMap"];
332 var layer = view.map.findLayerById("overLayer");
333 if(layer){
334 layer.removeAll();
335 }
336 },
337 //自然幢叠加分析 不能跨宗地 图层本身的叠加分析
338 zrzOverAnalys(bsm,graphic,callBacFunction){
339 var self = this;
340 loadModules([
341 "esri/geometry/Polygon",
342 "esri/geometry/geometryEngine"
343 ]).then(([
344 Polygon,
345 geometryEngine
346 ]) => {
347 var polygon = new Polygon(graphic.geometry);
348 var zdLayer = null,
349 zrzLayer = null;
350 zdLayer = self.getLayerByName("ZDJBXX");
351 zdLayer = self.getLayerByName("ZRZ");
352 var layerIds = [];
353 layerIds.push(zdLayer.id);
354 layerIds.push(zrzLayer.id);
355 identifyUtils.methods.identify(zdLayer.layerUrl,layerIds,polygon,function (res) {
356 var results = res.results;
357 //判断数据是否与其他数据有重叠
358 var flag = false,
359 mesge = "";
360 if(results && results.length > 0){
361 for(var i = 1;i < results.length;i++){
362 var feature = results[i].feature,
363 layerName = results[i].layerName;
364 if(layerName == 'ZRZ'){
365 if(feature.attributes['标识码'] != bsm){
366 var interFlag = geometryEngine.intersects(polygon,feature.geometry);
367 if(interFlag){
368 flag = true;
369 mesge="导入的自然幢与其他自然幢重叠,不能导入!!!";
370 break;
371 }
372 }
373 }else {
374 var interFlag = geometryEngine.intersects(polygon,feature.geometry);
375 var withinFlag = geometryEngine.within(polygon,feature.geometry);
376 if(!withinFlag && interFlag){
377 flag = true;
378 mesge="导入的自然幢与其跨宗地,不能导入!!!";
379 break;
380 }
381 }
382 }
383 }
384 callBacFunction(flag,mesge);
385 },true)
386 }).catch( err => {
387 console.log(err);
388 })
389 },
390 //去除重叠部分
391 getDifference(inputGraphic,subGraphic,callBackFuncton){
392 loadModules([
393 "esri/geometry/Polygon",
394 "esri/geometry/geometryEngine",
395 "esri/Graphic"
396 ]).then(([
397 Polygon,
398 geometryEngine,
399 Graphic
400 ])=>{
401 var inputGeometry = new Polygon(inputGraphic.geometry);
402 var outGeometry = null;
403 for(var i = 0;i < subGraphic.length;i++){
404 var feature = subGraphic[i].feature;
405 outGeometry = geometryEngine.difference(inputGeometry,feature.geometry);
406 }
407 if(callBackFuncton && typeof callBackFuncton == 'function'){
408 callBackFuncton(outGeometry);
247 } 409 }
410 }).catch(err => {
411 console.log(err);
412 })
413 },
414 //业务处理 先用query方法 查询将所有属性查询 在做空间裁剪
415 getResultsDif(subGraphics,currntGraphic,callBackFunction,flag){
416 var self = this;
417 loadModules([
418 "esri/geometry/geometryEngine",
419 "esri/geometry/Polygon"
420 ]).then(([
421 geometryEngine,
422 Polygon
423 ]) => {
424 var objectIds = [];
425 subGraphics.filter(item => {
426 objectIds.push(item.feature.attributes.OBJECTID);
427 })
428 var inputGeometry = new Polygon(currntGraphic.geometry);
429 var zdLayer = self.getLayerByName("ZDJBXX");
430 queryUtils.methods.queryByWhere(zdLayer.layerUrl+"/"+zdLayer.id,{OBJECTID:objectIds},null,true,"",subGraphics[0].feature.geometry.spatialReference,function (result) {
431 var features = result.features;
432 if(flag){
433 for(var i = 0;i < features.length;i++){
434 features[i].geometry = geometryEngine.difference(features[i].geometry,inputGeometry);
435 features[i].attributes.BGZT = 3;
436 }
437 }else {
438 for(var i = 0;i < features.length;i++){
439 features[i].geometry = null;
440 features[i].attributes.BGZT = 4;
441 }
442 }
443 if(callBackFunction && typeof callBackFunction == 'function'){
444 callBackFunction(features);
445 }
446 })
447
448 }).catch(err=>{
449 console.log(err);
450 })
248 451
452 },
453 addGeoByBsm(bsm, type,viewId) {
454 var self = this;
455 var layer = null;
456 if (type == 'zd') {
457 layer = this.getLayerByName("ZDJBXX");
458 } else if (type == 'zrz') {
459 layer = this.getLayerByName("ZRZ");
460 } else {
461 console.log("未定义类型!!");
462 return;
463 }
464 if (!layer) {
465 console.log("没有找到图层,不能查询");
466 return;
467 }
468 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) {
469 var features = res.features;
470 if(features && features.length > 0){
471 if( !features[0].geometry ){
472 self.$message.success("暂无图形信息!!");
473 return;
474 }
475 loadModules([
476 "esri/layers/GraphicsLayer"
477 ]).then( ([
478 GraphicsLayer
479 ]) => {
480 var view = maps[viewId];
481 var layer = view.map.findLayerById("highlightLayer");
482 if(layer){
483 layer.removeAll();
484 }else {
485 layer = new GraphicsLayer({
486 id:"highlightLayer"
487 })
488 view.map.add(layer,5);
489 }
490 var symbol = graphicSymbol.fillSymbol.highlightSymbol;
491 var graphic = features[0];
492 graphic.symbol = symbol;
493 layer.add(graphic);
494 view.extent = graphic.geometry.extent;
495 }).catch( err => {
496 thow(err);
497 })
498 }else {
499 self.$message.success("暂无图形信息!!");
500 return;
501 }
502 });
503 }
249 } 504 }
250 } 505 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -38,14 +38,13 @@ ...@@ -38,14 +38,13 @@
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,
49 center: [-0.154133333770497,0.6138183594020817], 48 center: [-0.154133333770497,0.6138183594020817],
50 spatialReference: { 49 spatialReference: {
51 wkid: 102100 50 wkid: 102100
......
...@@ -56,42 +56,7 @@ ...@@ -56,42 +56,7 @@
56 </el-form> 56 </el-form>
57 </el-col> 57 </el-col>
58 </el-row> 58 </el-row>
59 <!-- <el-row :gutter="10" class="shop"> 59 <div class="table-data">
60 <el-col :span="4" class="inputtitle">
61 宗地编码:
62 </el-col>
63 <el-col :span="8" class="">
64 <el-input v-model="queryData.zddm"></el-input>
65 </el-col>
66 <el-col :span="4" class="inputtitle">
67 不动产权证号:
68 </el-col>
69 <el-col :span="8" class="">
70 <el-input v-model="queryData.bdcqzh"></el-input>
71 </el-col>
72 </el-row> -->
73 <!-- <el-row :gutter="10">
74 <el-col :span="4" class="inputtitle">
75 不动产单元号:
76 </el-col>
77 <el-col :span="8">
78 <el-input v-model="queryData.bdcdyh"></el-input>
79 </el-col>
80 <el-col :span="4" class="inputtitle">
81 权利人:
82 </el-col>
83 <el-col :span="8">
84 <el-input v-model="queryData.qlrmc"></el-input>
85 </el-col>
86 </el-row>
87 <el-row :gutter="10">
88 <el-col :span="4" class="inputtitle">
89 坐落:
90 </el-col>
91 <el-col :span="8">
92 <el-input v-model="queryData.zl"></el-input>
93 </el-col>
94 </el-row> -->
95 <table border="1"> 60 <table border="1">
96 <tr> 61 <tr>
97 <td>序号</td> 62 <td>序号</td>
...@@ -120,9 +85,9 @@ ...@@ -120,9 +85,9 @@
120 <td>{{item.qlr}}</td> 85 <td>{{item.qlr}}</td>
121 <td>{{item.zl}}</td> 86 <td>{{item.zl}}</td>
122 </tr> 87 </tr>
123
124 </table> 88 </table>
125 </div> 89 </div>
90 </div>
126 <div class="page"> 91 <div class="page">
127 <el-pagination 92 <el-pagination
128 background 93 background
...@@ -145,7 +110,7 @@ ...@@ -145,7 +110,7 @@
145 name: "queryData", 110 name: "queryData",
146 data() { 111 data() {
147 return { 112 return {
148 total:1, 113 total: 1,
149 queryData: { 114 queryData: {
150 bdcdyh: "", 115 bdcdyh: "",
151 bdcqzh: "", 116 bdcqzh: "",
...@@ -175,9 +140,9 @@ ...@@ -175,9 +140,9 @@
175 return ['zd'] 140 return ['zd']
176 } 141 }
177 }, 142 },
178 isZdClose:{ 143 isZdClose: {
179 type:Boolean, 144 type: Boolean,
180 default:false 145 default: false
181 } 146 }
182 }, 147 },
183 mounted() { 148 mounted() {
...@@ -190,7 +155,7 @@ ...@@ -190,7 +155,7 @@
190 this.queryData.pageNo = val; 155 this.queryData.pageNo = val;
191 this.getData(this.queryData); 156 this.getData(this.queryData);
192 }, 157 },
193 reset(){ 158 reset() {
194 this.queryData = { 159 this.queryData = {
195 bdcdyh: "", 160 bdcdyh: "",
196 bdcqzh: "", 161 bdcqzh: "",
...@@ -204,23 +169,23 @@ ...@@ -204,23 +169,23 @@
204 }; 169 };
205 this.getData(this.queryData) 170 this.getData(this.queryData)
206 }, 171 },
207 getData(data){ 172 getData(data) {
208 data['dylxs'] = this.dylxs; 173 data['dylxs'] = this.dylxs;
209 getSearchList(data).then(res => { 174 getSearchList(data).then(res => {
210 this.Data = res.result.records 175 this.Data = res.result.records
211 this.total = res.result.total; 176 this.total = res.result.total;
212 }) 177 })
213 }, 178 },
214 search(){ 179 search() {
215 this.getData(this.queryData) 180 this.getData(this.queryData)
216 }, 181 },
217 addData(val){ 182 addData(val) {
218 this.$emit("getData", val) 183 this.$emit("getData", val)
219 if (this.isZdClose) { 184 if (this.isZdClose) {
220 this.close(); 185 this.close();
221 } 186 }
222 }, 187 },
223 close(){ 188 close() {
224 this.$emit('close') 189 this.$emit('close')
225 this.reset(); 190 this.reset();
226 } 191 }
...@@ -241,7 +206,8 @@ ...@@ -241,7 +206,8 @@
241 height: auto; 206 height: auto;
242 width: 80%; 207 width: 80%;
243 } 208 }
244 /deep/ .el-form-item__label{ 209
210 /deep/ .el-form-item__label {
245 width: 96px; 211 width: 96px;
246 text-align: right; 212 text-align: right;
247 } 213 }
...@@ -251,7 +217,7 @@ ...@@ -251,7 +217,7 @@
251 background-color: #fff; 217 background-color: #fff;
252 font-size: 14px; 218 font-size: 14px;
253 width: 100%; 219 width: 100%;
254 tr:hover{ 220 tr:hover {
255 background-color: #F5F7FA; 221 background-color: #F5F7FA;
256 } 222 }
257 } 223 }
...@@ -281,7 +247,10 @@ ...@@ -281,7 +247,10 @@
281 .noData { 247 .noData {
282 color: #b2b2b2; 248 color: #b2b2b2;
283 } 249 }
284 .page{ 250 .table-data{
251 height: 450px;
252 }
253 .page {
285 margin-top: 20px; 254 margin-top: 20px;
286 } 255 }
287 256
......
1 <template>
2 <div>
3 <el-dialog
4 title="属性导入"
5 :visible.sync="isVisible"
6 width="30%"
7 :before-close="close">
8 <div class="main-button">
9 <el-upload
10 class="upload-demo"
11 :action="uploadUrl"
12 :data="sxdrData"
13 :on-success="uploadSuccess"
14 :show-file-list="false"
15 multiple
16 >
17 <el-button type="primary">上传</el-button>
18 <el-button type="primary" @click="downloadTemplate">下载模板</el-button>
19 </el-upload>
20 </div>
21 <ul>
22 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
23 </ul>
24 <span slot="footer" class="dialog-footer">
25 <el-button @click="dialogVisible = false">取 消</el-button>
26 <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
27 </span>
28 </el-dialog>
29 </div>
30 </template>
31
32 <script>
33
34 export default {
35 name: "sxdr",
36 props: {
37 sxdrVisible: {
38 type: Boolean,
39 default: false
40 },
41 dylx: {
42 type: String,
43 },
44 bsm: {
45 type: String
46 }
47 },
48 data() {
49 return {
50 uploadUrl: '',
51 isVisible: false,
52 sxdrData: {
53 bsm: ''
54 },
55 errorData: []
56 }
57 },
58 mounted() {
59 this.$store.state.sxdrType = '';
60 },
61 methods: {
62 loading() {
63 this.$store.state.sxdrType = this.dylx;
64 },
65 reset() {
66 this.errorData = [];
67 this.uploadUrl = '';
68 this.sxdrData = {bsm: ''};
69 },
70 close() {
71 this.$emit('close')
72 this.reset();
73 },
74 downloadTemplate() {
75 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
76 },
77 uploadSuccess(res, file, fileList) {
78 if (res.success) {
79 this.$message.success("上传成功")
80 debugger
81 this.loading();
82 this.close()
83 } else {
84 this.$message.error("上传失败")
85 this.errorData = res.result
86 }
87 }
88 },
89 watch: {
90 sxdrVisible(val) {
91 this.isVisible = val;
92 },
93 dylx(val) {
94 switch (val) {
95 case "zd":
96 this.uploadUrl = "/api/tx/excelGeo/Zdimport";
97 break;
98 default:
99 break;
100 }
101 },
102 bsm(val) {
103 this.sxdrData.bsm = val;
104 }
105 }
106 }
107 </script>
108
109 <style scoped lang="less">
110 .main-button {
111 display: -webkit-flex;
112 display: flex;
113 flex-direction: column-reverse;
114 flex-wrap: nowrap;
115 }
116
117 ul {
118 margin-top: 20px;
119 li {
120 line-height: 15px;
121 color: red;
122 }
123 }
124 </style>
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
53 </el-form> 53 </el-form>
54 </el-col> 54 </el-col>
55 </el-row> 55 </el-row>
56 <div class="table-bode">
56 <table border="1"> 57 <table border="1">
57 <tr> 58 <tr>
58 <td>序号</td> 59 <td>序号</td>
...@@ -81,9 +82,9 @@ ...@@ -81,9 +82,9 @@
81 <td>{{item.qlr}}</td> 82 <td>{{item.qlr}}</td>
82 <td>{{item.zl}}</td> 83 <td>{{item.zl}}</td>
83 </tr> 84 </tr>
84
85 </table> 85 </table>
86 </div> 86 </div>
87 </div>
87 <div class="page"> 88 <div class="page">
88 <el-pagination 89 <el-pagination
89 background 90 background
...@@ -106,13 +107,11 @@ ...@@ -106,13 +107,11 @@
106 name: "zdQueryData", 107 name: "zdQueryData",
107 data() { 108 data() {
108 return { 109 return {
109 total:1, 110 total: 1,
110 queryData: { 111 queryData: {
111 bdcdyh: "", 112 bdcdyh: "",
112 bdcqzh: "", 113 bdcqzh: "",
113 dylxs: ['zd'],
114 qlrmc: "", 114 qlrmc: "",
115 qszt: ["2"],
116 xmmc: "", 115 xmmc: "",
117 zddm: "", 116 zddm: "",
118 zl: "", 117 zl: "",
...@@ -130,15 +129,9 @@ ...@@ -130,15 +129,9 @@
130 return false 129 return false
131 } 130 }
132 }, 131 },
133 qszt:{ 132 isZdClose: {
134 type:Array, 133 type: Boolean,
135 default:function () { 134 default: false
136 return ['2']
137 }
138 },
139 isZdClose:{
140 type:Boolean,
141 default:false
142 } 135 }
143 }, 136 },
144 mounted() { 137 mounted() {
...@@ -156,7 +149,6 @@ ...@@ -156,7 +149,6 @@
156 bdcdyh: "", 149 bdcdyh: "",
157 bdcqzh: "", 150 bdcqzh: "",
158 qlrmc: "", 151 qlrmc: "",
159 qszt: ["2"],
160 xmmc: "", 152 xmmc: "",
161 zddm: "", 153 zddm: "",
162 zl: "", 154 zl: "",
...@@ -166,7 +158,6 @@ ...@@ -166,7 +158,6 @@
166 this.getData(this.queryData) 158 this.getData(this.queryData)
167 }, 159 },
168 getData: function (data) { 160 getData: function (data) {
169 data['dylxs'] = this.dylxs;
170 zdlist(data).then(res => { 161 zdlist(data).then(res => {
171 this.Data = res.result.records 162 this.Data = res.result.records
172 this.total = res.result.total; 163 this.total = res.result.total;
...@@ -202,18 +193,18 @@ ...@@ -202,18 +193,18 @@
202 height: auto; 193 height: auto;
203 width: 80%; 194 width: 80%;
204 } 195 }
205 /deep/ .el-form-item__label{ 196
197 /deep/ .el-form-item__label {
206 width: 96px; 198 width: 96px;
207 text-align: right; 199 text-align: right;
208 } 200 }
209 201
210
211 table { 202 table {
212 margin-top: 10px; 203 margin-top: 10px;
213 background-color: #fff; 204 background-color: #fff;
214 font-size: 14px; 205 font-size: 14px;
215 width: 100%; 206 width: 100%;
216 tr:hover{ 207 tr:hover {
217 background-color: #F5F7FA; 208 background-color: #F5F7FA;
218 } 209 }
219 } 210 }
...@@ -243,7 +234,10 @@ ...@@ -243,7 +234,10 @@
243 .noData { 234 .noData {
244 color: #b2b2b2; 235 color: #b2b2b2;
245 } 236 }
246 .page{ 237 .table-bode{
238 height: 450px;
239 }
240 .page {
247 margin-top: 20px; 241 margin-top: 20px;
248 } 242 }
249 243
......
...@@ -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 saveGraphics = [];
26 if(!Array.isArray(graphic)){
27 graphic = [graphic];
28 }
29 for(var i = 0;i < graphic.length;i++){
25 var geo = null; 30 var geo = null;
26 if(graphic.geometry.type == 'point'){ 31 if(!graphic[i].geometry){
27 geo = new Point(graphic.geometry); 32 geo = null;
28 }else if(graphic.geometry.type == 'polyline'){ 33 }else if(graphic[i].geometry.type == 'point'){
29 geo = new Polyline(graphic.geometry); 34 geo = new Point(graphic[i].geometry);
30 }else if(graphic.geometry.type == 'polygon'){ 35 }else if(graphic[i].geometry.type == 'polyline'){
31 geo = new Polygon(graphic.geometry); 36 geo = new Polyline(graphic[i].geometry);
37 }else if(graphic[i].geometry.type == 'polygon'){
38 geo = new Polygon(graphic[i].geometry);
32 } 39 }
33 var saveGraphic = new Graphic({ 40 var saveGraphic = new Graphic({
34 attributes:graphic.attributes, 41 attributes:graphic[i].attributes,
35 geometry:geo 42 geometry:geo
36 }); 43 });
44 saveGraphics.push(saveGraphic);
45 }
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 })
74 var updGraphics = [];
75 if(!Array.isArray(graphic)){
76 graphic = [graphic];
77 }
78 for(var i = 0;i < graphic.length;i++){
65 var geo = null; 79 var geo = null;
66 if(graphic.geometry.type == 'point'){ 80 if(!graphic[i].geometry){
67 geo = new Point(graphic.geometry); 81 geo = new Polygon();
68 }else if(graphic.geometry.type == 'polyline'){ 82 }else if(graphic[i].geometry.type == 'point'){
69 geo = new Polyline(graphic.geometry); 83 geo = new Point(graphic[i].geometry);
70 }else if(graphic.geometry.type == 'polygon'){ 84 }else if(graphic[i].geometry.type == 'polyline'){
71 geo = new Polygon(graphic.geometry); 85 geo = new Polyline(graphic[i].geometry);
86 }else if(graphic[i].geometry.type == 'polygon'){
87 geo = new Polygon(graphic[i].geometry);
72 } 88 }
73 var updGraphic = new Graphic({ 89 var updGraphic = new Graphic({
74 attributes:graphic.attributes, 90 attributes:graphic[i].attributes,
75 geometry:geo 91 geometry:geo
76 }); 92 });
93 updGraphics.push(updGraphic);
94 }
95
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 })
124 var delGraphics = [];
125 if(!Array.isArray(graphic)){
126 graphic = [graphic];
127 }
128 for(var i = 0;i < graphic.length;i++){
105 var geo = null; 129 var geo = null;
106 if(graphic.geometry.type == 'point'){ 130 if(!graphic[i].geometry){
107 geo = new Point(graphic.geometry); 131 geo = null;
108 }else if(graphic.geometry.type == 'polyline'){ 132 }else if(graphic[i].geometry.type == 'point'){
109 geo = new Polyline(graphic.geometry); 133 geo = new Point(graphic[i].geometry);
110 }else if(graphic.geometry.type == 'polygon'){ 134 }else if(graphic[i].geometry.type == 'polyline'){
111 geo = new Polygon(graphic.geometry); 135 geo = new Polyline(graphic[i].geometry);
136 }else if(graphic[i].geometry.type == 'polygon'){
137 geo = new Polygon(graphic[i].geometry);
112 } 138 }
113 var delGraphic = new Graphic({ 139 var delGraphic = new Graphic({
114 attributes:graphic.attributes, 140 attributes:graphic[i].attributes,
115 geometry:geo 141 geometry:geo
116 }); 142 });
143 delGraphics.push(delGraphic);
144 }
145
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{
......
...@@ -15,6 +15,7 @@ const store = new Vuex.Store({ ...@@ -15,6 +15,7 @@ const store = new Vuex.Store({
15 zdmj: '', // 宗地面积 15 zdmj: '', // 宗地面积
16 zdzl: '', // 宗地坐落 16 zdzl: '', // 宗地坐落
17 rightClickZdbsm:'', //右键菜单传入的zdbsm 17 rightClickZdbsm:'', //右键菜单传入的zdbsm
18 sxdrType:'', // zd/zrz/dz/h 导入属性刷新数据
18 tdytList:[], 19 tdytList:[],
19 tddjList:[], 20 tddjList:[],
20 qlxzList:[], 21 qlxzList:[],
......
...@@ -293,9 +293,10 @@ ...@@ -293,9 +293,10 @@
293 </tr> 293 </tr>
294 </table> 294 </table>
295 </div> 295 </div>
296 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
297 :isZdClose="true" 297 :isClose="true"
298 @close="close"></query-data> 298 @close="close">
299 </dz-query-data>
299 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 300 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
300 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 301 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
301 </div> 302 </div>
...@@ -310,7 +311,7 @@ ...@@ -310,7 +311,7 @@
310 <ul> 311 <ul>
311 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li> 312 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
312 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li> 313 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
313 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>s's's's's's's's's's's's's's's's's's's 314 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
314 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li> 315 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
315 <li><span>权利人:</span>{{hFgqData.qlr}}</li> 316 <li><span>权利人:</span>{{hFgqData.qlr}}</li>
316 <li><span>坐落:</span>{{hFgqData.zl}}</li> 317 <li><span>坐落:</span>{{hFgqData.zl}}</li>
...@@ -331,7 +332,7 @@ ...@@ -331,7 +332,7 @@
331 </div> 332 </div>
332 <ul> 333 <ul>
333 <li v-for="(item,index) in zdZxx.dzList" :key="index" 334 <li v-for="(item,index) in zdZxx.dzList" :key="index"
334 :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} 335 :class="(index+1)%2===0?'':'oddborder'">{{item.xmmc}}
335 </li> 336 </li>
336 </ul> 337 </ul>
337 </div> 338 </div>
...@@ -455,11 +456,12 @@ ...@@ -455,11 +456,12 @@
455 import {getHZdxx} from './../../../../api/h' 456 import {getHZdxx} from './../../../../api/h'
456 import QueryData from './../../../../components/queryData/queryData' 457 import QueryData from './../../../../components/queryData/queryData'
457 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 458 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
459 import dzQueryData from './../../../../components/dzQueryData/dzQueryData'
458 import {Message} from 'element-ui' 460 import {Message} from 'element-ui'
459 461
460 export default { 462 export default {
461 name: "", 463 name: "",
462 components: {QueryData, zdQueryData}, 464 components: {QueryData, zdQueryData,dzQueryData},
463 props: {}, 465 props: {},
464 data() { 466 data() {
465 return { 467 return {
...@@ -557,7 +559,7 @@ ...@@ -557,7 +559,7 @@
557 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1); 559 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1);
558 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm); 560 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm);
559 this.dzFgqZrzData.forEach(i=>{ 561 this.dzFgqZrzData.forEach(i=>{
560 if (i.bsm == bsm) { 562 if (i.bsm === bsm) {
561 i.hasChoosed = "" 563 i.hasChoosed = ""
562 } 564 }
563 }) 565 })
...@@ -667,7 +669,7 @@ ...@@ -667,7 +669,7 @@
667 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){ 669 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){
668 // this.zdZrzList[childIndex].hasChoosed = index; 670 // this.zdZrzList[childIndex].hasChoosed = index;
669 if(fwlist.zrzlist.indexOf(bsm) < 0){ 671 if(fwlist.zrzlist.indexOf(bsm) < 0){
670 if(fwlist.ztype == 'zrz' && fwlist.zrzlist.length>0){ 672 if(fwlist.ztype === 'zrz' && fwlist.zrzlist.length>0){
671 Message.warning("当前幢类型只能选择一个自然幢") 673 Message.warning("当前幢类型只能选择一个自然幢")
672 }else{ 674 }else{
673 //存入当前选择幢信息的bsm 675 //存入当前选择幢信息的bsm
...@@ -744,7 +746,7 @@ ...@@ -744,7 +746,7 @@
744 } 746 }
745 }, 747 },
746 saveZd() { 748 saveZd() {
747 if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 749 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
748 zdfg(this.zdFghData).then(res => { 750 zdfg(this.zdFghData).then(res => {
749 if (res.success) { 751 if (res.success) {
750 this.$store.state.zdbsms = res.result; 752 this.$store.state.zdbsms = res.result;
...@@ -973,9 +975,9 @@ ...@@ -973,9 +975,9 @@
973 }, 975 },
974 dzFgqData: { 976 dzFgqData: {
975 handler: function (item) { 977 handler: function (item) {
976 this.dzFgqData.oldZdbsm = item.glbsm; 978 this.dzFgqData.oldZdbsm = item.bsm;
977 this.getDzZdjbxx(item.glbsm); 979 this.getDzZdjbxx(item.bsm);
978 this.dzfgGetZrzxx(item.glbsm) 980 this.dzfgGetZrzxx(item.bsm)
979 }, 981 },
980 deep: true 982 deep: true
981 }, 983 },
......
...@@ -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 var query = this.$route.query
81 var self = this;
82 setTimeout(function () {
80 if(query && JSON.stringify(query) != "{}"){ 83 if(query && JSON.stringify(query) != "{}"){
81 //self.addGeoByBsm(query.bsm,query.type,self.viewId); 84 //self.addGeoByBsm(query.bsm,query.type,self.viewId);
82 if(query.type == 'zd'){ 85 if(query.type == 'zd'){
83 this.getRightTree(query.bsm) 86 self.getRightTree(query.bsm)
84 }else if(query.type == 'zrz'){ 87 }else if(query.type == 'zrz'){
85 this.getRightTreeByZrzbsm(query.bsm); 88 self.getRightTreeByZrzbsm(query.bsm);
86 } 89 }
87 } 90 }
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 }
......
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
81 </td> 81 </td>
82 <td colspan="2">宗地特征码<i class="requisite">*</i></td> 82 <td colspan="2">宗地特征码<i class="requisite">*</i></td>
83 <td colspan="4"> 83 <td colspan="4">
84 <el-select class="formSelect" ref="zdtzm" :disabled="formData.qszt!='0'" v-model="formData.zdtzmbsm"> 84 <el-select class="formSelect" ref="zdtzm" :disabled="formData.qszt!='0'"
85 v-model="formData.zdtzmbsm">
85 <el-option 86 <el-option
86 v-for="item in $store.state.zdtzmList" 87 v-for="item in $store.state.zdtzmList"
87 :key="item.bsm" 88 :key="item.bsm"
...@@ -112,7 +113,8 @@ ...@@ -112,7 +113,8 @@
112 class="formInput percent80" 113 class="formInput percent80"
113 v-model="formData.zddm" 114 v-model="formData.zddm"
114 /> 115 />
115 <el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn" @click="generatorCode" 116 <el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn"
117 @click="generatorCode"
116 >生成 118 >生成
117 </el-button> 119 </el-button>
118 </td> 120 </td>
...@@ -120,13 +122,14 @@ ...@@ -120,13 +122,14 @@
120 <tr> 122 <tr>
121 <td colspan="2">地籍号</td> 123 <td colspan="2">地籍号</td>
122 <td colspan="4"> 124 <td colspan="4">
123 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh" /> 125 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.djh"/>
124 </td> 126 </td>
125 127
126 <td colspan="2">不动产单元号<i class="requisite">*</i></td> 128 <td colspan="2">不动产单元号<i class="requisite">*</i></td>
127 <td colspan="4" class="psr"> 129 <td colspan="4" class="psr">
128 <input 130 <input
129 type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="bdcdyh" maxlength="28" 131 type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="bdcdyh"
132 maxlength="28"
130 class="formInput" 133 class="formInput"
131 v-model="formData.bdcdyh" 134 v-model="formData.bdcdyh"
132 /> 135 />
...@@ -136,7 +139,8 @@ ...@@ -136,7 +139,8 @@
136 <tr> 139 <tr>
137 <td colspan="2">坐落<i class="requisite">*</i></td> 140 <td colspan="2">坐落<i class="requisite">*</i></td>
138 <td colspan="4"> 141 <td colspan="4">
139 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zl" class="formInput" v-model="formData.zl" /> 142 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zl"
143 class="formInput" v-model="formData.zl"/>
140 </td> 144 </td>
141 <td colspan="2">项目名称</td> 145 <td colspan="2">项目名称</td>
142 <td colspan="4" class="psr"> 146 <td colspan="4" class="psr">
...@@ -150,34 +154,32 @@ ...@@ -150,34 +154,32 @@
150 <tr> 154 <tr>
151 <td colspan="2">国民经济行业分类</td> 155 <td colspan="2">国民经济行业分类</td>
152 <td colspan="4"> 156 <td colspan="4">
153 <el-select-tree 157 <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">
154 :disabled="formData.qszt!='0'" 158 <el-option
155 :default-expand-all="defaultExpandAll" 159 v-for="item in $store.state.gmjjhyflbsmList"
156 :multiple="multiple" 160 :key="item.bsm"
157 :placeholder="placeholder" 161 :label="item.mc"
158 :data="$store.state.gmjjhyflbsmList" 162 :value="item.bsm"
159 :props="treeProps" 163 >
160 :check-strictly="checkStrictly" 164 </el-option>
161 :clearable="clearable" 165 </el-select>
162 v-model="formData.gmjjhyflbsm"
163 ></el-select-tree>
164 </td> 166 </td>
165 <td colspan="2">价格(元)</td> 167 <td colspan="2">价格(元)</td>
166 <td colspan="4" class="psr"> 168 <td colspan="4" class="psr">
167 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jg" /> 169 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jg"/>
168 </td> 170 </td>
169 </tr> 171 </tr>
170 <tr> 172 <tr>
171 <td colspan="2" rowspan="2">所在图幅号</td> 173 <td colspan="2" rowspan="2">所在图幅号</td>
172 <td colspan="2">比例尺</td> 174 <td colspan="2">比例尺</td>
173 <td colspan="8" class="psr"> 175 <td colspan="8" class="psr">
174 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc" /> 176 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.blc"/>
175 </td> 177 </td>
176 </tr> 178 </tr>
177 <tr> 179 <tr>
178 <td colspan="2">图幅号</td> 180 <td colspan="2">图幅号</td>
179 <td colspan="8" class="psr"> 181 <td colspan="8" class="psr">
180 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh" /> 182 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.tfh"/>
181 </td> 183 </td>
182 </tr> 184 </tr>
183 <tr> 185 <tr>
...@@ -209,7 +211,7 @@ ...@@ -209,7 +211,7 @@
209 </td> 211 </td>
210 <td colspan="2">容积说明</td> 212 <td colspan="2">容积说明</td>
211 <td colspan="4" class="psr"> 213 <td colspan="4" class="psr">
212 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm" /> 214 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm"/>
213 </td> 215 </td>
214 </tr> 216 </tr>
215 <tr> 217 <tr>
...@@ -241,7 +243,7 @@ ...@@ -241,7 +243,7 @@
241 </td> 243 </td>
242 <td colspan="2">建筑密度说明</td> 244 <td colspan="2">建筑密度说明</td>
243 <td colspan="4" class="psr"> 245 <td colspan="4" class="psr">
244 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm" /> 246 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzmdsm"/>
245 </td> 247 </td>
246 </tr> 248 </tr>
247 <tr> 249 <tr>
...@@ -273,32 +275,36 @@ ...@@ -273,32 +275,36 @@
273 </td> 275 </td>
274 <td colspan="2">建筑限高说明</td> 276 <td colspan="2">建筑限高说明</td>
275 <td colspan="4" class="psr"> 277 <td colspan="4" class="psr">
276 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm" /> 278 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.jzxgsm"/>
277 </td> 279 </td>
278 </tr> 280 </tr>
279 <tr> 281 <tr>
280 <td colspan="2" rowspan="4">宗地四至</td> 282 <td colspan="2" rowspan="4">宗地四至</td>
281 <td colspan="2">北至<i class="requisite">*</i></td> 283 <td colspan="2">北至<i class="requisite">*</i></td>
282 <td colspan="8" class="psr"> 284 <td colspan="8" class="psr">
283 <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszb" /> 285 <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="formData.qszt!='0'"
286 class="formInput" v-model="formData.zdszb"/>
284 </td> 287 </td>
285 </tr> 288 </tr>
286 <tr> 289 <tr>
287 <td colspan="2">东至<i class="requisite">*</i></td> 290 <td colspan="2">东至<i class="requisite">*</i></td>
288 <td colspan="8" class="psr"> 291 <td colspan="8" class="psr">
289 <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszd" /> 292 <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="formData.qszt!='0'"
293 class="formInput" v-model="formData.zdszd"/>
290 </td> 294 </td>
291 </tr> 295 </tr>
292 <tr> 296 <tr>
293 <td colspan="2">南至<i class="requisite">*</i></td> 297 <td colspan="2">南至<i class="requisite">*</i></td>
294 <td colspan="8" class="psr"> 298 <td colspan="8" class="psr">
295 <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszn" /> 299 <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="formData.qszt!='0'"
300 class="formInput" v-model="formData.zdszn"/>
296 </td> 301 </td>
297 </tr> 302 </tr>
298 <tr> 303 <tr>
299 <td colspan="2">西至<i class="requisite">*</i></td> 304 <td colspan="2">西至<i class="requisite">*</i></td>
300 <td colspan="8" class="psr"> 305 <td colspan="8" class="psr">
301 <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.zdszx" /> 306 <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="formData.qszt!='0'"
307 class="formInput" v-model="formData.zdszx"/>
302 </td> 308 </td>
303 </tr> 309 </tr>
304 <tr> 310 <tr>
...@@ -309,33 +315,38 @@ ...@@ -309,33 +315,38 @@
309 <tr> 315 <tr>
310 <td colspan="2" rowspan="2">批准面积(㎡)</td> 316 <td colspan="2" rowspan="2">批准面积(㎡)</td>
311 <td colspan="2" rowspan="2"> 317 <td colspan="2" rowspan="2">
312 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.pzmj" /> 318 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
319 class="formInput" v-model="formData.pzmj"/>
313 </td> 320 </td>
314 <td colspan="2" rowspan="2">宗地面积(㎡)<i class="requisite">*</i></td> 321 <td colspan="2" rowspan="2">宗地面积(㎡)<i class="requisite">*</i></td>
315 <td colspan="2" rowspan="2"> 322 <td colspan="2" rowspan="2">
316 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj" onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj" /> 323 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj"
324 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
317 </td> 325 </td>
318 <td colspan="2">建筑占地总面积</td> 326 <td colspan="2">建筑占地总面积</td>
319 <td colspan="2"> 327 <td colspan="2">
320 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.jzzdzmj" /> 328 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
329 class="formInput" v-model="formData.jzzdzmj"/>
321 </td> 330 </td>
322 </tr> 331 </tr>
323 <tr> 332 <tr>
324 <td colspan="2">建筑面积(㎡)</td> 333 <td colspan="2">建筑面积(㎡)</td>
325 <td colspan="2"> 334 <td colspan="2">
326 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.jzzmj" /> 335 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
336 class="formInput" v-model="formData.jzzmj"/>
327 </td> 337 </td>
328 </tr> 338 </tr>
329 <tr> 339 <tr>
330 <td colspan="2">共有/共用权利人情况</td> 340 <td colspan="2">共有/共用权利人情况</td>
331 <td colspan="10"> 341 <td colspan="10">
332 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.gygyqlrqk" /> 342 <input type="text" :disabled="formData.qszt!='0'" class="formInput"
343 v-model="formData.gygyqlrqk"/>
333 </td> 344 </td>
334 </tr> 345 </tr>
335 <tr> 346 <tr>
336 <td colspan="2" rowspan="2">说明</td> 347 <td colspan="2" rowspan="2">说明</td>
337 <td colspan="10" rowspan="2"> 348 <td colspan="10" rowspan="2">
338 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm" /> 349 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.sm"/>
339 </td> 350 </td>
340 </tr> 351 </tr>
341 </table> 352 </table>
...@@ -358,10 +369,10 @@ ...@@ -358,10 +369,10 @@
358 </template> 369 </template>
359 370
360 <script> 371 <script>
361 import Qlr from "../../../components/formMenu/qlr"; 372 import Qlr from "../../../components/formMenu/qlr";
362 import Qlxz from "../../../components/formMenu/qlxz"; 373 import Qlxz from "../../../components/formMenu/qlxz";
363 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 374 import geoUtils from "@components/lineTree/tx/js/geoUtils";
364 import { 375 import {
365 getAllList, 376 getAllList,
366 getDdicByMC, 377 getDdicByMC,
367 getListByXzqbsm, 378 getListByXzqbsm,
...@@ -369,15 +380,15 @@ import { ...@@ -369,15 +380,15 @@ import {
369 submit, 380 submit,
370 getTree, 381 getTree,
371 registerCall 382 registerCall
372 } from "../../../api/common"; 383 } from "../../../api/common";
373 import { 384 import {
374 getBdcdyh, 385 getBdcdyh,
375 getQjZdjbxxDetailById, 386 getQjZdjbxxDetailById,
376 updateQjZdjbxx, 387 updateQjZdjbxx,
377 } from "../../../api/zd"; 388 } from "../../../api/zd";
378 389
379 export default { 390 export default {
380 inject:['getRightTree'], 391 inject: ['getRightTree'],
381 name: "", 392 name: "",
382 components: { 393 components: {
383 Qlr, 394 Qlr,
...@@ -386,85 +397,70 @@ export default { ...@@ -386,85 +397,70 @@ export default {
386 props: {}, 397 props: {},
387 data() { 398 data() {
388 return { 399 return {
389
390 //树型结构
391 show: true,
392 clearable: true,
393 defaultExpandAll: true,
394 multiple: false,
395 placeholder: "请选择",
396 disabled: false,
397 checkStrictly: true,
398 treeProps: {
399 value: "dm",
400 children: "children",
401 label: "mc",
402 },
403
404 rules: [], 400 rules: [],
405 rjl:'', 401 rjl: '',
406 jzmd:'', 402 jzmd: '',
407 jzxg:'', 403 jzxg: '',
408 compareList: [ 404 compareList: [
409 { label: "<", value: "<" }, 405 {label: "<", value: "<"},
410 { label: ">", value: ">" }, 406 {label: ">", value: ">"},
411 { label: "=", value: "=" }, 407 {label: "=", value: "="},
412 { label: "<=", value: "<=" }, 408 {label: "<=", value: "<="},
413 { label: ">=", value: ">=" }, 409 {label: ">=", value: ">="},
414 { label: "-", value: "-" }, 410 {label: "-", value: "-"},
415 ], 411 ],
416 formData: {}, 412 formData: {},
417 dpdm:'', //宗地底盘代码 413 dpdm: '', //宗地底盘代码
418 curZdbsm:'', 414 curZdbsm: '',
419 mainBoxWidth:0, 415 mainBoxWidth: 0,
420 geoAttributes:{ 416 geoAttributes: {
421 OBJECTID:"", 417 OBJECTID: "",
422 BSM:"", 418 BSM: "",
423 YSDM:"", 419 YSDM: "",
424 ZDDM:"", 420 ZDDM: "",
425 BDCDYH:"", 421 BDCDYH: "",
426 ZDTZM :"", 422 ZDTZM: "",
427 ZL:"", 423 ZL: "",
428 ZDMJ:0, 424 ZDMJ: 0,
429 MJDW:"", 425 MJDW: "",
430 YT:"", 426 YT: "",
431 DJ:"", 427 DJ: "",
432 JG:0, 428 JG: 0,
433 QLLX:"", 429 QLLX: "",
434 QLXZ:"", 430 QLXZ: "",
435 QLSDFS:"", 431 QLSDFS: "",
436 RJL:0, 432 RJL: 0,
437 JZMD:0, 433 JZMD: 0,
438 JZXG:0, 434 JZXG: 0,
439 ZDSZD:"", 435 ZDSZD: "",
440 ZDSZN :"", 436 ZDSZN: "",
441 ZDSZX :"", 437 ZDSZX: "",
442 ZDSZB :"", 438 ZDSZB: "",
443 TFH:"", 439 TFH: "",
444 DJH:"", 440 DJH: "",
445 DAH:"", 441 DAH: "",
446 BZ :"", 442 BZ: "",
447 ZT:"", 443 ZT: "",
448 YWZT:"", 444 YWZT: "",
449 BLID:"", 445 BLID: "",
450 XMMC:"", 446 XMMC: "",
451 XMID:"", 447 XMID: "",
452 BGRQ:"", 448 BGRQ: "",
453 BGID:"", 449 BGID: "",
454 BGZT:"", 450 BGZT: "",
455 TDZH:"", 451 TDZH: "",
456 QSZT:0, 452 QSZT: 0,
457 BBLX:0, 453 BBLX: 0,
458 SFDB:0, 454 SFDB: 0,
459 QLR :"", 455 QLR: "",
460 CUTID:"", 456 CUTID: "",
461 BHQKID:"", 457 BHQKID: "",
462 DJZQDM :"", 458 DJZQDM: "",
463 SYQLXID:"", 459 SYQLXID: "",
464 } 460 }
465 }; 461 };
466 }, 462 },
467 mixins:[geoUtils], 463 mixins: [geoUtils],
468 created() { 464 created() {
469 this.curZdbsm = this.$route.query.bsm; 465 this.curZdbsm = this.$route.query.bsm;
470 }, 466 },
...@@ -475,12 +471,12 @@ export default { ...@@ -475,12 +471,12 @@ export default {
475 }) 471 })
476 }, 472 },
477 methods: { 473 methods: {
478 registerCall(){ 474 registerCall() {
479 let data={ 475 let data = {
480 type:'zd', 476 type: 'zd',
481 bsm:this.$store.state.zdbsm 477 bsm: this.$store.state.zdbsm
482 } 478 }
483 registerCall(data).then(res=>{ 479 registerCall(data).then(res => {
484 if (res.success) { 480 if (res.success) {
485 this.$message.success("登记成功") 481 this.$message.success("登记成功")
486 this.getRightTree(this.$store.state.zdbsm) 482 this.getRightTree(this.$store.state.zdbsm)
...@@ -493,8 +489,8 @@ export default { ...@@ -493,8 +489,8 @@ export default {
493 .then((res) => { 489 .then((res) => {
494 if (res.result) { 490 if (res.result) {
495 this.formData = res.result; 491 this.formData = res.result;
496 console.log(res.result,'res.result'); 492 console.log(res.result, 'res.result');
497 this.getXzqData(res.result.xzqbsm,res.result.djqbsm); 493 this.getXzqData(res.result.xzqbsm, res.result.djqbsm);
498 //如果没有宗地代码,自动生成 494 //如果没有宗地代码,自动生成
499 // if(res.result.zddm == null){ 495 // if(res.result.zddm == null){
500 // this.generatorCode() 496 // this.generatorCode()
...@@ -506,8 +502,8 @@ export default { ...@@ -506,8 +502,8 @@ export default {
506 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? '-' : this.formData.jyjzmd; 502 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? '-' : this.formData.jyjzmd;
507 this.jzxg = this.isInterval(this.formData.jyjzxg) ? this.formData.jyjzxg : ''; 503 this.jzxg = this.isInterval(this.formData.jyjzxg) ? this.formData.jyjzxg : '';
508 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? '-' : this.formData.jyjzxg; 504 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? '-' : this.formData.jyjzxg;
509 if(res.result.list.length>0){ 505 if (res.result.list.length > 0) {
510 if(res.result.list[0].list.length<1){ 506 if (res.result.list[0].list.length < 1) {
511 res.result.list[0].list.push({ 507 res.result.list[0].list.push({
512 "pzdjbsm": "", 508 "pzdjbsm": "",
513 "pzdjmc": "", 509 "pzdjmc": "",
...@@ -526,12 +522,12 @@ export default { ...@@ -526,12 +522,12 @@ export default {
526 "tdzh": "" 522 "tdzh": ""
527 }) 523 })
528 } 524 }
529 this.$nextTick(()=>{ 525 this.$nextTick(() => {
530 //权利性质数据传给子组件 526 //权利性质数据传给子组件
531 this.$refs.qlxzModule.countList = res.result.list; 527 this.$refs.qlxzModule.countList = res.result.list;
532 }) 528 })
533 }else{ 529 } else {
534 this.$nextTick(()=>{ 530 this.$nextTick(() => {
535 //权利性质数据传给子组件 531 //权利性质数据传给子组件
536 this.$refs.qlxzModule.countList = [ 532 this.$refs.qlxzModule.countList = [
537 { 533 {
...@@ -567,30 +563,31 @@ export default { ...@@ -567,30 +563,31 @@ export default {
567 } 563 }
568 } 564 }
569 }) 565 })
570 .catch((error) => {}); 566 .catch((error) => {
567 });
571 }, 568 },
572 569
573 //构造底盘代码,前6位是xzqbsm,接着3位djqbsm,3位djzqbsm,最后2位是syqlxbsm 860101555888GB 570 //构造底盘代码,前6位是xzqbsm,接着3位djqbsm,3位djzqbsm,最后2位是syqlxbsm 860101555888GB
574 generatorDpdm() { 571 generatorDpdm() {
575 this.$store.state.xzqList.forEach((item)=>{ 572 this.$store.state.xzqList.forEach((item) => {
576 if(item.bsm === this.formData.xzqbsm){ 573 if (item.bsm === this.formData.xzqbsm) {
577 this.dpdm = item.dm; 574 this.dpdm = item.dm;
578 } 575 }
579 }); 576 });
580 this.$store.state.djqList.forEach((item)=>{ 577 this.$store.state.djqList.forEach((item) => {
581 if(item.bsm === this.formData.djqbsm){ 578 if (item.bsm === this.formData.djqbsm) {
582 this.dpdm = this.dpdm + item.dm; 579 this.dpdm = this.dpdm + item.dm;
583 } 580 }
584 }); 581 });
585 this.$store.state.djzqList.forEach((item)=>{ 582 this.$store.state.djzqList.forEach((item) => {
586 if(item.bsm === this.formData.djzqbsm){ 583 if (item.bsm === this.formData.djzqbsm) {
587 this.dpdm = this.dpdm + item.dm; 584 this.dpdm = this.dpdm + item.dm;
588 } 585 }
589 }); 586 });
590 587
591 this.dpdm = this.dpdm + this.formData.syqlxbsm; 588 this.dpdm = this.dpdm + this.formData.syqlxbsm;
592 this.$store.state.zdtzmList.forEach((item)=>{ 589 this.$store.state.zdtzmList.forEach((item) => {
593 if(item.bsm === this.formData.zdtzmbsm){ 590 if (item.bsm === this.formData.zdtzmbsm) {
594 this.dpdm = this.dpdm + item.dm; 591 this.dpdm = this.dpdm + item.dm;
595 } 592 }
596 }); 593 });
...@@ -610,7 +607,8 @@ export default { ...@@ -610,7 +607,8 @@ export default {
610 this.formData.zddm = res.result.substring(0, 19); 607 this.formData.zddm = res.result.substring(0, 19);
611 this.formData.bdcdyh = res.result; 608 this.formData.bdcdyh = res.result;
612 }) 609 })
613 .catch((error) => {}); 610 .catch((error) => {
611 });
614 this.$message({ 612 this.$message({
615 type: 'success', 613 type: 'success',
616 message: '生成成功!' 614 message: '生成成功!'
...@@ -626,7 +624,7 @@ export default { ...@@ -626,7 +624,7 @@ export default {
626 //生成宗地代码 624 //生成宗地代码
627 generatorCode() { 625 generatorCode() {
628 626
629 if((this.formData.zddm!=null&&this.formData.zddm!=='')||(this.formData.bdcdyh!=null&&this.formData.bdcdyh!=='')){ 627 if ((this.formData.zddm != null && this.formData.zddm !== '') || (this.formData.bdcdyh != null && this.formData.bdcdyh !== '')) {
630 this.open(); 628 this.open();
631 return; 629 return;
632 } 630 }
...@@ -638,82 +636,83 @@ export default { ...@@ -638,82 +636,83 @@ export default {
638 this.formData.zddm = res.result.substring(0, 19); 636 this.formData.zddm = res.result.substring(0, 19);
639 this.formData.bdcdyh = res.result; 637 this.formData.bdcdyh = res.result;
640 }) 638 })
641 .catch((error) => {}); 639 .catch((error) => {
640 });
642 }, 641 },
643 //修改宗地基本信息 642 //修改宗地基本信息
644 updateZDxx(formData) { 643 updateZDxx(formData) {
645 //获取权利性质数据 644 //获取权利性质数据
646 this.formData.list = this.$refs.qlxzModule.getQlxzDataList(); 645 this.formData.list = this.$refs.qlxzModule.getQlxzDataList();
647 console.log(this.$refs.qlxzModule.getRulesResult(),'this.$refs.qlxzModule.getRules()'); 646 console.log(this.$refs.qlxzModule.getRulesResult(), 'this.$refs.qlxzModule.getRules()');
648 //判断容密高是否为区间值,如果是区间值,则将输入框的值赋予 647 //判断容密高是否为区间值,如果是区间值,则将输入框的值赋予
649 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl; 648 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
650 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd; 649 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd;
651 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg; 650 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg;
652 this.rules= [ 651 this.rules = [
653 { 652 {
654 data:this.formData.zdtzmbsm, 653 data: this.formData.zdtzmbsm,
655 name:'宗地特征码', 654 name: '宗地特征码',
656 dom:this.$refs.zdtzm, 655 dom: this.$refs.zdtzm,
657 rule: /^\s*$/g, //非空 656 rule: /^\s*$/g, //非空
658 }, 657 },
659 { 658 {
660 data:this.formData.zddm, 659 data: this.formData.zddm,
661 name:'宗地代码', 660 name: '宗地代码',
662 dom:this.$refs.zddm, 661 dom: this.$refs.zddm,
663 rule: /^\s*$/g, //非空 662 rule: /^\s*$/g, //非空
664 }, 663 },
665 { 664 {
666 data:this.formData.bdcdyh, 665 data: this.formData.bdcdyh,
667 name:'不动产单元号', 666 name: '不动产单元号',
668 dom:this.$refs.bdcdyh, 667 dom: this.$refs.bdcdyh,
669 rule: /^\s*$/g, //非空 668 rule: /^\s*$/g, //非空
670 }, 669 },
671 { 670 {
672 data:this.formData.zl, 671 data: this.formData.zl,
673 name:'坐落', 672 name: '坐落',
674 dom:this.$refs.zl, 673 dom: this.$refs.zl,
675 rule: /^\s*$/g, //非空 674 rule: /^\s*$/g, //非空
676 }, 675 },
677 { 676 {
678 data:this.formData.zdszd, 677 data: this.formData.zdszd,
679 name:'宗地东至', 678 name: '宗地东至',
680 dom:this.$refs.zdszd, 679 dom: this.$refs.zdszd,
681 rule: /^\s*$/g, //非空 680 rule: /^\s*$/g, //非空
682 }, 681 },
683 { 682 {
684 data:this.formData.zdszb, 683 data: this.formData.zdszb,
685 name:'宗地北至', 684 name: '宗地北至',
686 dom:this.$refs.zdszb, 685 dom: this.$refs.zdszb,
687 rule: /^\s*$/g, //非空 686 rule: /^\s*$/g, //非空
688 }, 687 },
689 { 688 {
690 data:this.formData.zdszx, 689 data: this.formData.zdszx,
691 name:'宗地西至', 690 name: '宗地西至',
692 dom:this.$refs.zdszx, 691 dom: this.$refs.zdszx,
693 rule: /^\s*$/g, //非空 692 rule: /^\s*$/g, //非空
694 }, 693 },
695 { 694 {
696 data:this.formData.zdszn, 695 data: this.formData.zdszn,
697 name:'宗地南至', 696 name: '宗地南至',
698 dom:this.$refs.zdszn, 697 dom: this.$refs.zdszn,
699 rule: /^\s*$/g, //非空 698 rule: /^\s*$/g, //非空
700 }, 699 },
701 { 700 {
702 data:this.formData.zdmj, 701 data: this.formData.zdmj,
703 name:'宗地面积', 702 name: '宗地面积',
704 dom:this.$refs.zdmj, 703 dom: this.$refs.zdmj,
705 rule: /^\s*$/g, //非空 704 rule: /^\s*$/g, //非空
706 }, 705 },
707 ] 706 ]
708 // console.log(this.rules,'rules'); 707 // console.log(this.rules,'rules');
709 this.$refs.qlxzModule.getRules(); 708 this.$refs.qlxzModule.getRules();
710 let flag = true; 709 let flag = true;
711 this.rules.forEach(item=>{ 710 this.rules.forEach(item => {
712 if(item.rule.test(item.data) || item.data == null){ 711 if (item.rule.test(item.data) || item.data == null) {
713 if(item.dom.$el){ 712 if (item.dom.$el) {
714 item.dom.$el.style.border = '1px solid red'; 713 item.dom.$el.style.border = '1px solid red';
715 item.dom.$el.style.boxSizing = 'border-box'; 714 item.dom.$el.style.boxSizing = 'border-box';
716 }else{ 715 } else {
717 item.dom.style.border = '1px solid red'; 716 item.dom.style.border = '1px solid red';
718 item.dom.style.boxSizing = 'border-box'; 717 item.dom.style.boxSizing = 'border-box';
719 } 718 }
...@@ -726,18 +725,18 @@ export default { ...@@ -726,18 +725,18 @@ export default {
726 return false 725 return false
727 } 726 }
728 }) 727 })
729 this.$nextTick(()=>{ 728 this.$nextTick(() => {
730 if(flag && this.$refs.qlxzModule.getRulesResult()){ 729 if (flag && this.$refs.qlxzModule.getRulesResult()) {
731 //宗地面积处理 730 //宗地面积处理
732 // console.log(this.formData.zdmj,'this.formData.zdmj'); 731 // console.log(this.formData.zdmj,'this.formData.zdmj');
733 // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'') 732 // this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'')
734 //判断宗地代码和不动产单元号是否手动修改过(宗地代码和不动产单元号的前14位是否和底盘代码一致) 733 //判断宗地代码和不动产单元号是否手动修改过(宗地代码和不动产单元号的前14位是否和底盘代码一致)
735 if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){ 734 if (this.formData.zddm.substring(0, 14) != this.dpdm || this.formData.bdcdyh.substring(0, 14) != this.dpdm) {
736 this.$message({ 735 this.$message({
737 message: '宗地代码或不动产单元号有误,请核对后再试一次', 736 message: '宗地代码或不动产单元号有误,请核对后再试一次',
738 type: "warning", 737 type: "warning",
739 }); 738 });
740 }else{ 739 } else {
741 updateQjZdjbxx(this.formData) 740 updateQjZdjbxx(this.formData)
742 .then((res) => { 741 .then((res) => {
743 if (res.code == 200) { 742 if (res.code == 200) {
...@@ -755,28 +754,29 @@ export default { ...@@ -755,28 +754,29 @@ export default {
755 }); 754 });
756 } 755 }
757 }) 756 })
758 .catch((error) => {}); 757 .catch((error) => {
758 });
759 //保存到空间库里面 759 //保存到空间库里面
760 var self = this; 760 var self = this;
761 for(var key in this.geoAttributes){ 761 for (var key in this.geoAttributes) {
762 if(key == "BSM"){ 762 if (key == "BSM") {
763 self.geoAttributes[key] = this.$store.state.zdbsm 763 self.geoAttributes[key] = this.$store.state.zdbsm
764 }else if(key == 'QLSDFS'){ 764 } else if (key == 'QLSDFS') {
765 var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs; 765 var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
766 var qlsdfs = qlsdfsList.filter(item => { 766 var qlsdfs = qlsdfsList.filter(item => {
767 return item.bsm == value; 767 return item.bsm == value;
768 }) 768 })
769 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:""; 769 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
770 }else { 770 } else {
771 var formKay = key.toLowerCase(); 771 var formKay = key.toLowerCase();
772 self.geoAttributes[key] = self.formData[formKay]; 772 self.geoAttributes[key] = self.formData[formKay];
773 } 773 }
774 } 774 }
775 self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) { 775 self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
776 console.log("属性保存完成!!"); 776 console.log("属性保存完成!!");
777 }); 777 });
778 } 778 }
779 }else{ 779 } else {
780 this.$message({ 780 this.$message({
781 // message: item.name+'不能为空', 781 // message: item.name+'不能为空',
782 message: '请完善表单后再继续操作', 782 message: '请完善表单后再继续操作',
...@@ -786,23 +786,23 @@ export default { ...@@ -786,23 +786,23 @@ export default {
786 }) 786 })
787 787
788 }, 788 },
789 inputBlur(e){ 789 inputBlur(e) {
790 if(e.target.value!=''){ 790 if (e.target.value != '') {
791 e.target.style.border="" 791 e.target.style.border = ""
792 }else{ 792 } else {
793 e.target.style.border="1px solid red"; 793 e.target.style.border = "1px solid red";
794 e.target.style.boxSizing = 'border-box'; 794 e.target.style.boxSizing = 'border-box';
795 } 795 }
796 }, 796 },
797 //提交宗地基本信息 797 //提交宗地基本信息
798 submitZDxx(){ 798 submitZDxx() {
799 let data={ 799 let data = {
800 glbsm:this.$store.state.zdbsm, 800 glbsm: this.$store.state.zdbsm,
801 status:1, 801 status: 1,
802 type:"zd" 802 type: "zd"
803 } 803 }
804 submit(data).then((res)=>{ 804 submit(data).then((res) => {
805 if(res.code===200){ 805 if (res.code === 200) {
806 this.$message.success("提交成功!") 806 this.$message.success("提交成功!")
807 this.getZdjbxxData(this.curZdbsm); 807 this.getZdjbxxData(this.curZdbsm);
808 getTree(this.curZdbsm).then((res) => { 808 getTree(this.curZdbsm).then((res) => {
...@@ -830,7 +830,8 @@ export default { ...@@ -830,7 +830,8 @@ export default {
830 this.djqList = res.result; 830 this.djqList = res.result;
831 this.$store.state.djqList = res.result; 831 this.$store.state.djqList = res.result;
832 }) 832 })
833 .catch((error) => {}); 833 .catch((error) => {
834 });
834 }, 835 },
835 changeDjq(item) { 836 changeDjq(item) {
836 getListByPbsm(item) 837 getListByPbsm(item)
...@@ -839,23 +840,25 @@ export default { ...@@ -839,23 +840,25 @@ export default {
839 this.djzqList = res.result; 840 this.djzqList = res.result;
840 this.$store.state.djzqList = res.result; 841 this.$store.state.djzqList = res.result;
841 }) 842 })
842 .catch((error) => {}); 843 .catch((error) => {
844 });
843 }, 845 },
844 //判断容密高是否为区间 846 //判断容密高是否为区间
845 isInterval(val){ 847 isInterval(val) {
846 if(val == '>' || val == '<' || val == '=' || val == '>=' || val == '<='|| val == null){ 848 if (val == '>' || val == '<' || val == '=' || val == '>=' || val == '<=' || val == null) {
847 return false 849 return false
848 }else{ 850 } else {
849 return true; 851 return true;
850 } 852 }
851 }, 853 },
852 //根据宗地信息的行政区代码查询行政区地籍区地籍子区的字典数据 854 //根据宗地信息的行政区代码查询行政区地籍区地籍子区的字典数据
853 getXzqData(xzqdm,djqdm){ 855 getXzqData(xzqdm, djqdm) {
854 getAllList() 856 getAllList()
855 .then((res) => { 857 .then((res) => {
856 this.$store.state.xzqList = res.result; 858 this.$store.state.xzqList = res.result;
857 }) 859 })
858 .catch((error) => {}); 860 .catch((error) => {
861 });
859 862
860 getListByPbsm(djqdm) 863 getListByPbsm(djqdm)
861 .then((res) => { 864 .then((res) => {
...@@ -866,9 +869,11 @@ export default { ...@@ -866,9 +869,11 @@ export default {
866 //生成底盘代码 869 //生成底盘代码
867 this.generatorDpdm(); 870 this.generatorDpdm();
868 }) 871 })
869 .catch((error) => {}); 872 .catch((error) => {
873 });
870 }) 874 })
871 .catch((error) => {}); 875 .catch((error) => {
876 });
872 } 877 }
873 }, 878 },
874 computed: { 879 computed: {
...@@ -886,34 +891,46 @@ export default { ...@@ -886,34 +891,46 @@ export default {
886 }, 891 },
887 }, 892 },
888 watch: { 893 watch: {
889 zl: function(val) { 894 zl: function (val) {
890 this.$store.state.zdzl = val; 895 this.$store.state.zdzl = val;
891 }, 896 },
892 mj: function(val) { 897 mj: function (val) {
893 this.$store.state.zdmj = val; 898 this.$store.state.zdmj = val;
894 }, 899 },
895 zddm: function(val) { 900 zddm: function (val) {
896 this.$store.state.zddm = val; 901 this.$store.state.zddm = val;
897 }, 902 },
898 zdbsm:function (val) { 903 zdbsm: function (val) {
899 this.getZdjbxxData(val) 904 this.getZdjbxxData(val)
900 this.curZdbsm = val; 905 this.curZdbsm = val;
901 }, 906 },
902 "formData.bdcdyh":function (val) { 907 "formData.bdcdyh": function (val) {
903 if (val != '') { 908 if (val != '') {
904 this.$refs.bdcdyh.style.border = ''; 909 this.$refs.bdcdyh.style.border = '';
905 } 910 }
906 }, 911 },
907 "formData.zddm":function (val) { 912 "formData.zddm": function (val) {
908 if (val != '') { 913 if (val != '') {
909 this.$refs.zddm.style.border = ''; 914 this.$refs.zddm.style.border = '';
910 } 915 }
911 } 916 }
912 }, 917 },
913 }; 918 "$store.state.sxdrType": {
919 handler(n) {
920 this.$message.success(n)
921 this.$nextTick(()=>{
922 if (n === 'zd') {
923 this.getZdjbxxData(this.$store.state.zdbsm)
924 }
925 })
926 },
927 immediate: true,
928 deep: true,
929 }
930 };
914 </script> 931 </script>
915 <style lang="less" scoped> 932 <style lang="less" scoped>
916 .main { 933 .main {
917 box-sizing: border-box; 934 box-sizing: border-box;
918 padding: 18px; 935 padding: 18px;
919 height: auto; 936 height: auto;
...@@ -982,7 +999,7 @@ export default { ...@@ -982,7 +999,7 @@ export default {
982 right: 6px; 999 right: 6px;
983 text-align: center; 1000 text-align: center;
984 background-color: #ffffff; 1001 background-color: #ffffff;
985 .el-button{ 1002 .el-button {
986 padding: 10px 30px; 1003 padding: 10px 30px;
987 margin-top: 8px; 1004 margin-top: 8px;
988 } 1005 }
...@@ -995,5 +1012,5 @@ export default { ...@@ -995,5 +1012,5 @@ export default {
995 border-color: rgba(0, 202, 205, .8); 1012 border-color: rgba(0, 202, 205, .8);
996 } 1013 }
997 } 1014 }
998 } 1015 }
999 </style> 1016 </style>
......