Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
43d91574 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 2158aacc c248f96e
Inline Side-by-side
Showing 14 changed files with 411 additions and 71 deletions
...@@ -59,3 +59,14 @@ export function getHZdxx(bsm) { ...@@ -59,3 +59,14 @@ export function getHZdxx(bsm) {
59 }) 59 })
60 60
61 } 61 }
62
63 /**
64 * 户合并
65 */
66 export function hhb(data) {
67 return request({
68 url: '/bg/hSplitMerge/hHb',
69 method: 'post',
70 data: data
71 })
72 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -523,6 +523,40 @@ export default { ...@@ -523,6 +523,40 @@ export default {
523 this.outNum--; 523 this.outNum--;
524 } 524 }
525 }, 525 },
526 reset(){
527 this.countList=[
528 {
529 id: Math.random(),
530 isInside: false,
531 hasNotBorder: false,
532 bsm: "", //权利性质标识码
533 glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
534 qlxzdm: "",
535 zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
536 list: [
537 {
538 pzdjbsm: "",
539 pzdjmc: "",
540 pzytdm: "",
541 pzytmc: "",
542 pzytmj: 0,
543 qlxzbsm: "",
544 sjdjbsm: "",
545 sjdjmc: "",
546 sjytdm: "",
547 sjytmc: "",
548 sjytmj: 0,
549 syqx: "",
550 tdsyjssj: "",
551 pickerStart:{},
552 pickerEnd:{},
553 tdsyqssj: "",
554 tdzh: "",
555 },
556 ],
557 },
558 ];
559 },
526 //内层操作 560 //内层操作
527 handleInClick(index, childIndex, type) { 561 handleInClick(index, childIndex, type) {
528 let insideObj = { 562 let insideObj = {
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 @contextmenu.prevent="openMenu($event, item,list)" 46 @contextmenu.prevent="openMenu($event, item,list)"
47 :class="{ 47 :class="{
48 active_color: item.expand, 48 active_color: item.expand,
49 curPage:$route.query.bsm==item.bsm
49 }" 50 }"
50 > 51 >
51 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> 52 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
...@@ -404,4 +405,7 @@ export default { ...@@ -404,4 +405,7 @@ export default {
404 position: relative; 405 position: relative;
405 top: 1px; 406 top: 1px;
406 } 407 }
408 .curPage{
409 color: orange;
410 }
407 </style> 411 </style>
......
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li> 73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
74 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li> 74 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
75 <li @click="deleteByBsm()">删除</li> 75 <li @click="deleteByBsm()">删除</li>
76 <li @click="deleteGeoByBsm()">删除图形</li>
76 </ul> 77 </ul>
77 <ul 78 <ul
78 v-show="dzVisible" 79 v-show="dzVisible"
...@@ -429,12 +430,51 @@ export default { ...@@ -429,12 +430,51 @@ export default {
429 } 430 }
430 }); 431 });
431 }, 432 },
433 //删除图形
434 deleteGeoByBsm() {
435 var self = this;
436 var BSM = "";
437 var type = this.zdData.type;
438 if (type == "zd") {
439 BSM = this.zdData.zdbsm;
440 } else {
441 BSM = this.zdData.bsm;
442 }
443 //删除图形相关信息
444 var type = this.zdData.type;
445 this.queryGeoByBsm(BSM, type,function (features) {
446 if (features && features.length > 0 && features[0].geometry.rings.length > 0) {
447 var layer = null;
448 if (type == 'zd') {
449 layer = self.getLayerByName("ZDJBXX");
450 } else {
451 layer = self.getLayerByName("ZRZ");
452 }
453 var featureUrl = layer.layerUrl.replace("MapServer", "FeatureServer");
454 featureUrl += "/" + layer.id;
455 features[0].geometry = null;
456 self.updateGraphic(featureUrl, features, function (res) {
457 if(!res.updateFeatureResults[0].error){
458 self.$message.warning("删除成功!!!")
459 self.addGeoByBsm(BSM,type,"testMap");
460 }
461
462 });
463 }else {
464 self.$message.warning("暂无图形信息!!!")
465 }
466 });
467 },
432 /* 468 /*
433 * 导入图形 469 * 导入图形
434 * */ 470 * */
435 importGeo(){ 471 importGeo(){
436 var self = this; 472 var self = this;
437 var BSM = ""; 473 var BSM = "";
474 if(this.zdData.qszt != '0'){
475 this.$message.warning("不是临时数据，不能导入图形!!!");
476 return;
477 }
438 //先这么写着 后面返回类型 根据类型判断 478 //先这么写着 后面返回类型 根据类型判断
439 var type = this.zdData.type; 479 var type = this.zdData.type;
440 if(type == "zd"){ 480 if(type == "zd"){
......
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
249 var graphic = { 249 var graphic = {
250 attributes:JSON.parse(JSON.stringify(attributes)), 250 attributes:JSON.parse(JSON.stringify(attributes)),
251 geometry:{ 251 geometry:{
252 rings:[[points.concat()]] 252 rings:[[points]]
253 } 253 }
254 } 254 }
255 features.push(graphic); 255 features.push(graphic);
...@@ -340,7 +340,7 @@ export default { ...@@ -340,7 +340,7 @@ export default {
340 }, 340 },
341 txtChange(value){ 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]]"; 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 => { 343 var graphics = this.txtResult.filter(item => {
344 return item.attributes.name == value; 344 return item.attributes.name == value;
345 }) 345 })
346 var graphic = graphics[0]; 346 var graphic = graphics[0];
...@@ -371,7 +371,7 @@ export default { ...@@ -371,7 +371,7 @@ export default {
371 } 371 }
372 }); 372 });
373 }else { 373 }else {
374 self.zrzOverAnalys(this.propertyInfo.bsm,graphic,function (flag,mes) { 374 self.zrzOverAnalys(self.propertyInfo.bsm,graphic,function (flag,mes) {
375 if(flag){ 375 if(flag){
376 self.$message.warning(mes); 376 self.$message.warning(mes);
377 return; 377 return;
...@@ -578,7 +578,7 @@ export default { ...@@ -578,7 +578,7 @@ export default {
578 featureUrl += "/"+layer.id; 578 featureUrl += "/"+layer.id;
579 if(self.geoInfo){ 579 if(self.geoInfo){
580 self.geoInfo.BSM = self.propertyInfo.bsm; 580 self.geoInfo.BSM = self.propertyInfo.bsm;
581 graphic.attributes = self.geoInfo; 581 graphic.attributes = self.geoInfo.attributes;
582 //替换 生成图像 高亮 582 //替换 生成图像 高亮
583 self.updateGraphic(featureUrl,graphic,function (res) { 583 self.updateGraphic(featureUrl,graphic,function (res) {
584 var addRresult = res.updateFeatureResults[0]; 584 var addRresult = res.updateFeatureResults[0];
......
...@@ -234,10 +234,10 @@ export default { ...@@ -234,10 +234,10 @@ export default {
234 if(features && features.length > 0){ 234 if(features && features.length > 0){
235 attributes.OBJECTID = features[0].attributes.OBJECTID; 235 attributes.OBJECTID = features[0].attributes.OBJECTID;
236 features[0].attributes = attributes; 236 features[0].attributes = attributes;
237 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]]"; 237 /* 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]]";
238 features[0].geometry.spatialReference = { 238 features[0].geometry.spatialReference = {
239 wkt:wkt 239 wkt:wkt
240 } 240 }*/
241 featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction); 241 featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction);
242 }else{ 242 }else{
243 var graphic = { 243 var graphic = {
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
348 var zdLayer = null, 348 var zdLayer = null,
349 zrzLayer = null; 349 zrzLayer = null;
350 zdLayer = self.getLayerByName("ZDJBXX"); 350 zdLayer = self.getLayerByName("ZDJBXX");
351 zdLayer = self.getLayerByName("ZRZ"); 351 zrzLayer = self.getLayerByName("ZRZ");
352 var layerIds = []; 352 var layerIds = [];
353 layerIds.push(zdLayer.id); 353 layerIds.push(zdLayer.id);
354 layerIds.push(zrzLayer.id); 354 layerIds.push(zrzLayer.id);
...@@ -358,11 +358,11 @@ export default { ...@@ -358,11 +358,11 @@ export default {
358 var flag = false, 358 var flag = false,
359 mesge = ""; 359 mesge = "";
360 if(results && results.length > 0){ 360 if(results && results.length > 0){
361 for(var i = 1;i < results.length;i++){ 361 for(var i = 0;i < results.length;i++){
362 var feature = results[i].feature, 362 var feature = results[i].feature,
363 layerName = results[i].layerName; 363 layerName = results[i].layerName;
364 if(layerName == 'ZRZ'){ 364 if(layerName == 'ZRZ'){
365 if(feature.attributes['标识码'] != bsm){ 365 if(!feature.attributes['标识码'] || feature.attributes['标识码'] != bsm){
366 var interFlag = geometryEngine.intersects(polygon,feature.geometry); 366 var interFlag = geometryEngine.intersects(polygon,feature.geometry);
367 if(interFlag){ 367 if(interFlag){
368 flag = true; 368 flag = true;
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
370 break; 370 break;
371 } 371 }
372 } 372 }
373 }else { 373 }else if(layerName == 'ZDJBXX') {
374 var interFlag = geometryEngine.intersects(polygon,feature.geometry); 374 var interFlag = geometryEngine.intersects(polygon,feature.geometry);
375 var withinFlag = geometryEngine.within(polygon,feature.geometry); 375 var withinFlag = geometryEngine.within(polygon,feature.geometry);
376 if(!withinFlag && interFlag){ 376 if(!withinFlag && interFlag){
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
468 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) { 468 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) {
469 var features = res.features; 469 var features = res.features;
470 if(features && features.length > 0){ 470 if(features && features.length > 0){
471 if( !features[0].geometry ){ 471 if( !features[0].geometry || features[0].geometry.rings.length == 0 ){
472 self.$message.success("暂无图形信息！！"); 472 self.$message.success("暂无图形信息！！");
473 return; 473 return;
474 } 474 }
......
...@@ -12,31 +12,31 @@ ...@@ -12,31 +12,31 @@
12 <tr> 12 <tr>
13 <td>层建筑面积(㎡)</td> 13 <td>层建筑面积(㎡)</td>
14 <td> 14 <td>
15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input> 15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
16 </td> 16 </td>
17 <td> 17 <td>
18 层套内建筑面积(㎡) 18 层套内建筑面积(㎡)
19 </td> 19 </td>
20 <td> 20 <td>
21 <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input> 21 <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 <td>层阳台面积(㎡)</td> 25 <td>层阳台面积(㎡)</td>
26 <td> 26 <td>
27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input> 27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
28 </td> 28 </td>
29 <td> 29 <td>
30 层半墙面积(㎡) 30 层半墙面积(㎡)
31 </td> 31 </td>
32 <td> 32 <td>
33 <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input> 33 <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
34 </td> 34 </td>
35 </tr> 35 </tr>
36 <tr> 36 <tr>
37 <td>层共有建筑面积(㎡)</td> 37 <td>层共有建筑面积(㎡)</td>
38 <td> 38 <td>
39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input> 39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
40 </td> 40 </td>
41 <td> 41 <td>
42 层分摊建筑面积(㎡) 42 层分摊建筑面积(㎡)
......
...@@ -405,18 +405,38 @@ ...@@ -405,18 +405,38 @@
405 addQjTdytRequestList:[{ 405 addQjTdytRequestList:[{
406 }], //土地用途新增实体列表 406 }], //土地用途新增实体列表
407 }] 407 }]
408 } 408 };
409 this.$refs.qlxzModule.reset();
410 this.ytTitleRowspan=1; //用途的单元格垂直合并数量
411 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
409 }, 412 },
410 save: function () { 413 save: function () {
411 this.form['hbsms'] = this.bsms 414 this.form['hbsms'] = this.bsms
412 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 415 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
416 for(let i=0;i< this.form.fwjgList.length;i++){
417 if(this.form.fwjgList[i].fwjgzdbsm===''){
418 this.form.fwjgList.splice(i,1);
419 }
420 }
421 for(let i=0;i< this.form.fwytList.length;i++){
422 if(this.form.fwytList[i].fwsjytbsm===''){
423 this.form.fwytList.splice(i,1);
424 }
425 }
426 for(let i=0;i< this.form.qlxzList.length;i++){
427 if(this.form.qlxzList[i].qlxzdm===''){
428 this.form.qlxzList.splice(i,1);
429 }
430 }
413 console.log("批量户信息") 431 console.log("批量户信息")
414 console.log(this.form) 432 console.log(this.form)
415 batchUpdateQjH(this.form).then((res)=>{ 433 batchUpdateQjH(this.form).then((res)=>{
416 if(res.code===200){ 434 if(res.code===200){
417 this.lodding() 435 this.lodding()
418 this.$message.success("保存成功！") 436 this.$message.success("保存成功！")
419 this.reset(); 437 this.$nextTick(()=>{
438 this.reset();
439 })
420 this.close(); 440 this.close();
421 } 441 }
422 }) 442 })
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }"> 84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
85 <!-- 楼盘表主体 --> 85 <!-- 楼盘表主体 -->
86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
87 <lpbContent ref="lpbContent"></lpbContent> 87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent>
88 </div> 88 </div>
89 <!-- 右侧图例 --> 89 <!-- 右侧图例 -->
90 <div class="lp-legend"> 90 <div class="lp-legend">
...@@ -211,6 +211,7 @@ ...@@ -211,6 +211,7 @@
211 211
212 <script> 212 <script>
213 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index"; 213 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
214 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
214 export default { 215 export default {
215 name:"", 216 name:"",
216 components:{lpbContent}, 217 components:{lpbContent},
...@@ -312,6 +313,7 @@ export default { ...@@ -312,6 +313,7 @@ export default {
312 xmmc:'测试自然幢', 313 xmmc:'测试自然幢',
313 bdcqzh:'A12111111111111111', 314 bdcqzh:'A12111111111111111',
314 dylx:'zrz', 315 dylx:'zrz',
316 zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b'
315 } 317 }
316 ] 318 ]
317 }, 319 },
...@@ -329,6 +331,7 @@ export default { ...@@ -329,6 +331,7 @@ export default {
329 //办理 331 //办理
330 handleClick(row){ 332 handleClick(row){
331 this.isSearch = false; 333 this.isSearch = false;
334 this.zrzbsm = row.zrzbsm;
332 }, 335 },
333 //分页 336 //分页
334 handleCurrentChange(val) { 337 handleCurrentChange(val) {
...@@ -346,7 +349,26 @@ export default { ...@@ -346,7 +349,26 @@ export default {
346 }, 349 },
347 //实预测转换 350 //实预测转换
348 scyclxChange(){ 351 scyclxChange(){
349 352 //清空已选中层户
353 // this.bsms = [];
354 this.$refs.lpbContent.hbsmList = [];
355 this.$nextTick(()=>{
356 //户
357 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
358 item.style.borderColor = 'rgb(230, 230, 230)';
359 if (item.className == "tdSelect") {
360 item.className = "";
361 }
362 });
363 //层
364 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
365 console.log(item.className,'item.className');
366 item.className = "floor";
367 });
368 })
369 //获取图例数据
370 this.getDyztBsmList();
371 this.getLpbFwytAndQlxz();
350 }, 372 },
351 inputChange() { 373 inputChange() {
352 if (this.bdcdyh != "") { 374 if (this.bdcdyh != "") {
...@@ -363,6 +385,89 @@ export default { ...@@ -363,6 +385,89 @@ export default {
363 legendToggle() { 385 legendToggle() {
364 this.legendToggleFlag = !this.legendToggleFlag; 386 this.legendToggleFlag = !this.legendToggleFlag;
365 }, 387 },
388 //获取各项单元状态统计数据
389 getDyztBsmList() {
390 let data = {
391 zrzbsm: this.$store.state.zrzbsm,
392 scyclx: this.scyclx,
393 };
394 getLpbTj(data).then((res) => {
395 if (res.code === 200) {
396 this.dyztList = res.result;
397 this.dyztList.splice(1,0,this.dyztList[8]);
398 this.dyztList.pop();
399 this.dyztList.forEach(item=>{
400 item.ts = item.bsms.length;
401 switch (item.name) {
402 case 'Qqzt':
403 item.color = "#6EDEE1";
404 item.name = "已确权"
405 break;
406 case 'Wqqzt':
407 item.color = "#83AAFE";
408 item.name = "未确权"
409 break;
410 case 'Bazt':
411 item.color = "#8ADC88";
412 item.name = "已备案"
413 break;
414 case 'Ydyzt':
415 item.color = "#F2AD67";
416 item.name = "预抵押"
417 break;
418 case 'Zjgcdyzt':
419 item.color = "#F191C8";
420 item.name = "在建抵押"
421 break;
422 case 'Dyzt':
423 item.color = "#FF8282";
424 item.name = "抵押"
425 break;
426 case 'Cfzt':
427 item.color = "#D7CECF";
428 item.name = "查封"
429 break;
430 case 'Yyzt':
431 item.color = "#D4A3EB";
432 item.name = "异议"
433 break;
434 case 'Xzzt':
435 item.color = "#A5A3FB";
436 item.name = "限制"
437 break;
438 default:
439 break;
440 }
441 })
442 }
443 });
444 },
445 // 获取房屋用途和房屋性质统计数据
446 getLpbFwytAndQlxz(){
447 let data = {
448 zrzbsm: this.$store.state.zrzbsm,
449 scyclx: this.scyclx,
450 };
451 getLpbFwytAndQlxz(data).then((res) => {
452 if (res.code === 200) {
453 // this.fwytList = res.result
454 this.fwytList = res.result.fwyt;
455 this.fwxzList = res.result.qlxz;
456 if(this.fwytList.length>0){
457 this.fwytList.forEach(item=>{
458 item.color = "#2591FD";
459 item.ts = item.bsms.length
460 })
461 }
462 if(this.fwxzList.length>0){
463 this.fwxzList.forEach(item=>{
464 item.color = "#2591FD";
465 item.ts = item.bsms.length
466 })
467 }
468 }
469 });
470 }
366 }, 471 },
367 computed: {}, 472 computed: {},
368 watch: { 473 watch: {
...@@ -373,7 +478,18 @@ export default { ...@@ -373,7 +478,18 @@ export default {
373 } else { 478 } else {
374 this.lpbContentwidth += 204; 479 this.lpbContentwidth += 204;
375 } 480 }
376 }, 481 },
482 //选择自然幢展示楼盘表后，查询右侧图例数据
483 isSearch(n){
484 if (!n) {
485 this.getDyztBsmList();
486 this.getLpbFwytAndQlxz();
487 }
488 },
489 //改变syclx，更新楼盘表数据
490 scyclx(n){
491 this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
492 }
377 }, 493 },
378 } 494 }
379 </script> 495 </script>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <hr /> 37 <hr />
38 <div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index"> 38 <div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index">
39 <span class="key">{{key}}：</span> 39 <span class="key">{{key}}：</span>
40 <span class="value" :title="value">{{value}}</span> 40 <span class="value" :title="value">{{value == 'Null' ?"":value}}</span>
41 </div> 41 </div>
42 </div> 42 </div>
43 </el-card> 43 </el-card>
...@@ -142,7 +142,6 @@ export default { ...@@ -142,7 +142,6 @@ export default {
142 }, 142 },
143 //图层选择事件 143 //图层选择事件
144 selectLayerChange(){ 144 selectLayerChange(){
145 debugger
146 var self = this; 145 var self = this;
147 this.features = []; 146 this.features = [];
148 var layerAndResult = this.results.filter(function (item) { 147 var layerAndResult = this.results.filter(function (item) {
......
...@@ -30,10 +30,11 @@ export default { ...@@ -30,10 +30,11 @@ export default {
30 console.log("没有找到图层，不能查询"); 30 console.log("没有找到图层，不能查询");
31 return; 31 return;
32 } 32 }
33 var view = maps[viewId];
33 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) { 34 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm }, null, true, null, null, function (res) {
34 var features = res.features; 35 var features = res.features;
35 if(features && features.length > 0){ 36 if(features && features.length > 0){
36 if( !features[0].geometry ){ 37 if( !features[0].geometry || features[0].geometry.rings.length == 0){
37 self.$message.success("暂无图形信息！！"); 38 self.$message.success("暂无图形信息！！");
38 return; 39 return;
39 } 40 }
...@@ -42,7 +43,6 @@ export default { ...@@ -42,7 +43,6 @@ export default {
42 ]).then( ([ 43 ]).then( ([
43 GraphicsLayer 44 GraphicsLayer
44 ]) => { 45 ]) => {
45 var view = maps[viewId];
46 var layer = view.map.findLayerById("highlightLayer"); 46 var layer = view.map.findLayerById("highlightLayer");
47 if(layer){ 47 if(layer){
48 layer.removeAll(); 48 layer.removeAll();
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </div> 97 </div>
98 <!-- 楼盘表主体 --> 98 <!-- 楼盘表主体 -->
99 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 99 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
100 <lpbContent ref="lpbContent" :key="time"></lpbContent> 100 <lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
101 </div> 101 </div>
102 <!-- 右侧图例 --> 102 <!-- 右侧图例 -->
103 <div class="lp-legend"> 103 <div class="lp-legend">
...@@ -635,7 +635,7 @@ export default { ...@@ -635,7 +635,7 @@ export default {
635 if (res.code === 200) { 635 if (res.code === 200) {
636 this.$message.success("生成完成！"); 636 this.$message.success("生成完成！");
637 } else { 637 } else {
638 this.$message.warning("生成失败！"); 638 this.$message.warning(res.message);
639 } 639 }
640 } 640 }
641 ); 641 );
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 ref="hBsm" 62 ref="hBsm"
63 :key="hsIndex" 63 :key="hsIndex"
64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
65 @click="handleTdClick($event, hs.bsm)" 65 @click="handleTdClick($event, hs.bsm,hs)"
66 @dblclick="dbclick(hs.bsm)" 66 @dblclick="dbclick(hs.bsm)"
67 @contextmenu.prevent="openMenu($event, hs, 'h')" 67 @contextmenu.prevent="openMenu($event, hs, 'h')"
68 > 68 >
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 ref="hBsm" 117 ref="hBsm"
118 :key="hsIndex" 118 :key="hsIndex"
119 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 119 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
120 @click="handleTdClick($event, hs.bsm)" 120 @click="handleTdClick($event, hs.bsm,hs)"
121 @dblclick="dbclick(hs.bsm)" 121 @dblclick="dbclick(hs.bsm)"
122 @contextmenu.prevent="openMenu($event, hs, 'h')" 122 @contextmenu.prevent="openMenu($event, hs, 'h')"
123 > 123 >
...@@ -133,7 +133,9 @@ ...@@ -133,7 +133,9 @@
133 133
134 <!-- 逻辑幢名称 --> 134 <!-- 逻辑幢名称 -->
135 <div class="ljz-name name"> 135 <div class="ljz-name name">
136 {{ ljzs.ljzmc }} 136 <p>
137 {{ ljzs.ljzmc }}
138 </p>
137 </div> 139 </div>
138 </div> 140 </div>
139 </div> 141 </div>
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
177 ref="hBsm" 179 ref="hBsm"
178 :key="hsIndex" 180 :key="hsIndex"
179 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 181 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
180 @click="handleTdClick($event, hs.bsm)" 182 @click="handleTdClick($event, hs.bsm,hs)"
181 @dblclick="dbclick(hs.bsm)" 183 @dblclick="dbclick(hs.bsm)"
182 @contextmenu.prevent="openMenu($event, hs, 'h')" 184 @contextmenu.prevent="openMenu($event, hs, 'h')"
183 > 185 >
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
222 ref="hBsm" 224 ref="hBsm"
223 :key="hsIndex" 225 :key="hsIndex"
224 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 226 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
225 @click="handleTdClick($event, hs.bsm)" 227 @click="handleTdClick($event, hs.bsm,hs)"
226 @dblclick="dbclick(hs.bsm)" 228 @dblclick="dbclick(hs.bsm)"
227 @contextmenu.prevent="openMenu($event, hs, 'h')" 229 @contextmenu.prevent="openMenu($event, hs, 'h')"
228 > 230 >
...@@ -257,6 +259,10 @@ ...@@ -257,6 +259,10 @@
257 向下添加层 259 向下添加层
258 </li> 260 </li>
259 <li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li> 261 <li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li>
262 <!-- 合并 -->
263 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
264 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
265
260 </ul> 266 </ul>
261 <!-- 层操作弹框 --> 267 <!-- 层操作弹框 -->
262 <el-dialog 268 <el-dialog
...@@ -299,11 +305,22 @@ ...@@ -299,11 +305,22 @@
299 </template> 305 </template>
300 <script> 306 <script>
301 import moveH from "./../../../../../components/moveH/moveH"; 307 import moveH from "./../../../../../components/moveH/moveH";
302 import { getLpb, insertUpDownC, deleteCByBsm } from "../../../../../api/lpb"; 308 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
309 import { hhb } from "@api/h";
310 import { Message } from 'element-ui';
303 export default { 311 export default {
304 name: "", 312 name: "",
305 components: { moveH }, 313 components: { moveH },
306 props: {}, 314 props: {
315 isHbfg:{
316 type:Boolean,
317 default:false
318 },
319 zrzbsm:{
320 type:String,
321 default:''
322 }
323 },
307 data() { 324 data() {
308 return { 325 return {
309 moveHvisible: false, 326 moveHvisible: false,
...@@ -344,13 +361,15 @@ export default { ...@@ -344,13 +361,15 @@ export default {
344 }, 361 },
345 formLabelWidth: "120px", 362 formLabelWidth: "120px",
346 yclpbData:{}, 363 yclpbData:{},
347 sclpbData:{} 364 sclpbData:{},
365 fghbChoosedList:[],
366 canHb:''//判断合并类型
348 }; 367 };
349 }, 368 },
350 created() {}, 369 created() {},
351 mounted() { 370 mounted() {
352 this.getLpb(this.$store.state.zrzbsm, "0"); 371 this.getLpb(this.zrzbsm, "0");
353 this.getLpb(this.$store.state.zrzbsm, "1"); 372 this.getLpb(this.zrzbsm, "1");
354 setTimeout(() => { 373 setTimeout(() => {
355 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 374 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
356 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 375 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -489,7 +508,7 @@ export default { ...@@ -489,7 +508,7 @@ export default {
489 } 508 }
490 }, 509 },
491 //户单击事件 510 //户单击事件
492 handleTdClick(e, bsm) { 511 handleTdClick(e, bsm,hs) {
493 let self = this; 512 let self = this;
494 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件 513 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
495 clearTimeout(self.time); 514 clearTimeout(self.time);
...@@ -498,20 +517,38 @@ export default { ...@@ -498,20 +517,38 @@ export default {
498 if (e.target.className.indexOf("tdSelect") == -1) { 517 if (e.target.className.indexOf("tdSelect") == -1) {
499 //未选中→选中 518 //未选中→选中
500 e.target.className = "tdSelect"; //加边框 519 e.target.className = "tdSelect"; //加边框
501 this.hbsmList.push(bsm); // 将户bsm放进hbsmList 520 if(this.isHbfg){
521 this.fghbChoosedList.push(hs);
522 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
523 }else{
524 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
525 }
502 } else { 526 } else {
503 //选中→未选中 527 //选中→未选中
504 e.target.className = ""; 528 e.target.className = "";
505 this.deleteArrOption(this.hbsmList, bsm); 529 if(this.isHbfg){
530 this.deleteArrOption(this.fghbChoosedList, hs)
531 this.deleteArrOption(this.hbsmList, bsm);
532 }else{
533 this.deleteArrOption(this.hbsmList, bsm);
534 }
535 }
536 if(this.isHbfg){
537
538 }else{
539 this.$parent.getHbsm(this.hbsmList, false);
506 } 540 }
507 this.$parent.getHbsm(this.hbsmList, false);
508 }, 200); 541 }, 200);
509 }, 542 },
510 //户双击事件 543 //户双击事件
511 dbclick(bsm) { 544 dbclick(bsm) {
512 clearTimeout(this.time); 545 clearTimeout(this.time);
513 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList 546 if (this.isHbfg) {
514 this.$parent.getHbsm(bsm, true); 547
548 }else{
549 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
550 this.$parent.getHbsm(bsm, true);
551 }
515 }, 552 },
516 //删除多重数组中的某一项 553 //删除多重数组中的某一项
517 deleteArrOption(arr, item) { 554 deleteArrOption(arr, item) {
...@@ -536,26 +573,53 @@ export default { ...@@ -536,26 +573,53 @@ export default {
536 }, 573 },
537 //户右键点击事件 574 //户右键点击事件
538 openMenu(e, item, type) { 575 openMenu(e, item, type) {
539 console.log(e, "e");
540 this.lpbChLeft = e.pageX; 576 this.lpbChLeft = e.pageX;
541 this.lpbChTop = e.pageY; 577 this.lpbChTop = e.pageY;
542 this.chData = item; 578 if (this.isHbfg) {
543 this.rightClickFlag = type; 579 this.rightClickFlag = 'hb';
544 this.lpbChVisible = true; 580 if (this.fghbChoosedList.length>1) {
581 this.lpbChVisible = true;
582 //判断选中户可以执行的合并类型
583 let chIsSame = this.fghbChoosedList.every((item)=> {
584 return item.ch == this.fghbChoosedList[0].ch;
585 });
586 let hhIsSame = this.fghbChoosedList.every((item)=> {
587 return item.hh == this.fghbChoosedList[0].hh;
588 });
589 this.$nextTick(()=>{
590 if(chIsSame){
591 this.canHb = 'zyhb'
592 }else if(hhIsSame){
593 this.canHb = 'sxhb'
594 }else{
595 this.canHb = ''
596 }
597 })
598 }
599 }else{
600 console.log(e, "e");
601 this.chData = item;
602 this.rightClickFlag = type;
603 this.lpbChVisible = true;
604 }
545 }, 605 },
546 // 层选中事件 606 // 层选中事件
547 handleClickC(e, item) { 607 handleClickC(e, item) {
548 //判断点击的层是否选中 608 if (this.isHbfg) {
549 if (e.target.className.indexOf("tdSelect") == -1) { 609
550 //未选中→选中 610 }else{
551 e.target.className += " tdSelect"; //加边框 611 //判断点击的层是否选中
552 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList 612 if (e.target.className.indexOf("tdSelect") == -1) {
553 } else { 613 //未选中→选中
554 //选中→未选中 614 e.target.className += " tdSelect"; //加边框
555 e.target.className = "floor"; 615 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
556 this.deleteArrOption(this.cbsmList, item.bsm); 616 } else {
617 //选中→未选中
618 e.target.className = "floor";
619 this.deleteArrOption(this.cbsmList, item.bsm);
620 }
621 this.$parent.getCbsm(this.cbsmList);
557 } 622 }
558 this.$parent.getCbsm(this.cbsmList);
559 }, 623 },
560 //关闭右键菜单 624 //关闭右键菜单
561 closeMenu() { 625 closeMenu() {
...@@ -638,6 +702,46 @@ export default { ...@@ -638,6 +702,46 @@ export default {
638 qsztClick(){ 702 qsztClick(){
639 703
640 }, 704 },
705 //户合并
706 handleHb(type){
707 let olbBsms = '';
708 this.hbsmList.forEach((item,index)=>{
709 olbBsms+= index<this.hbsmList.length-1? item+',':item
710 })
711 if (type == this.canHb) {
712 this.$confirm("是否确认合并选中户?", "提示", {
713 confirmButtonText: "确定",
714 cancelButtonText: "取消",
715 type: "warning",
716 })
717 .then(() => {
718 //确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
719 let params = {
720 "newuserbsm": "",
721 "oldBsms": olbBsms,
722 "scyclx": this.$parent.scyclx,
723 "ljzbsm": this.fghbChoosedList[0].ljzbsm,
724 "zdybsm": this.fghbChoosedList[0].zdybsm,
725 "zrzbsm": this.fghbChoosedList[0].zrzbsm
726 }
727 // console.log(params,'params');
728 hhb(params).then((res) => {
729 if(res.code == 200){
730 Message.success('合并成功');
731 // 清除选中户
732 this.clearChoosedH();
733 this.fghbChoosedList = [];
734 // 更新楼盘表
735 this.getLpb(this.zrzbsm, this.$parent.scyclx);
736 }
737 })
738 .catch(() => {});
739 })
740 .catch(() => {});
741 }else{
742
743 }
744 }
641 }, 745 },
642 computed: { 746 computed: {
643 createFlagChange() { 747 createFlagChange() {
...@@ -687,12 +791,8 @@ export default { ...@@ -687,12 +791,8 @@ export default {
687 //父组件中选择单元状态改变选中户的边框颜色 791 //父组件中选择单元状态改变选中户的边框颜色
688 choosedList(n) { 792 choosedList(n) {
689 this.$refs.hBsm.forEach((item) => { 793 this.$refs.hBsm.forEach((item) => {
690 // console.log(item.dataset.bsm,'item.dataset.bsm');
691 // console.log(this.choosedList,'this.choosedList');
692 this.choosedList.forEach((i) => { 794 this.choosedList.forEach((i) => {
693 if (item.dataset.bsm == i) { 795 if (item.dataset.bsm == i) {
694 // console.log(item.style.border,'item.style.border');
695 // console.log(this.borderColor,'this.borderColor');
696 item.style.border = '1px solid '+this.borderColor; 796 item.style.border = '1px solid '+this.borderColor;
697 } 797 }
698 }); 798 });
...@@ -741,7 +841,8 @@ export default { ...@@ -741,7 +841,8 @@ export default {
741 bottom: 0; 841 bottom: 0;
742 position: absolute; 842 position: absolute;
743 height: 40px; 843 height: 40px;
744 background-color: rosybrown; 844 // background-color: rosybrown;
845 border:1px solid #E6E6E6
745 } 846 }
746 // .chTable-wrap{ 847 // .chTable-wrap{
747 // position: absolute; 848 // position: absolute;
...@@ -765,7 +866,12 @@ export default { ...@@ -765,7 +866,12 @@ export default {
765 .ljz-name { 866 .ljz-name {
766 width: calc(100% - 32px); 867 width: calc(100% - 32px);
767 height: 40px; 868 height: 40px;
768 background-color: darkorange; 869 // background-color: darkorange;
870 p{
871 width: 100%;
872 height: 100%;
873 border:1px solid #E6E6E6
874 }
769 } 875 }
770 } 876 }
771 div:last-child { 877 div:last-child {
...@@ -791,7 +897,8 @@ export default { ...@@ -791,7 +897,8 @@ export default {
791 display: inline-table; 897 display: inline-table;
792 .zdy-name { 898 .zdy-name {
793 bottom: 0; 899 bottom: 0;
794 background-color: blanchedalmond; 900 // background-color: blanchedalmond;
901 border:1px solid #E6E6E6
795 } 902 }
796 } 903 }
797 .zdy-zdy:last-child { 904 .zdy-zdy:last-child {
...@@ -801,7 +908,8 @@ export default { ...@@ -801,7 +908,8 @@ export default {
801 .zdy-name { 908 .zdy-name {
802 width: calc; 909 width: calc;
803 height: 40px; 910 height: 40px;
804 background-color: rosybrown; 911 // background-color: rosybrown;
912 border:1px solid #E6E6E6
805 } 913 }
806 } 914 }
807 .column-reverse { 915 .column-reverse {
...@@ -876,13 +984,17 @@ export default { ...@@ -876,13 +984,17 @@ export default {
876 .zrz { 984 .zrz {
877 height: 60px; 985 height: 60px;
878 line-height: 60px; 986 line-height: 60px;
879 background-color: darkgoldenrod; 987 background-color: #ffffff;
988 border:1px solid #E6E6E6;
880 position: relative; 989 position: relative;
881 bottom: 66px; 990 bottom: 66px;
882 text-align: center; 991 text-align: center;
883 transition: 0.5s; 992 transition: 0.5s;
884 } 993 }
885 994 .cantHb{
995 opacity: .5;
996 cursor: not-allowed;
997 }
886 .btnGroup { 998 .btnGroup {
887 margin: 20px auto 0; 999 margin: 20px auto 0;
888 width: 150px; 1000 width: 150px;
......
...@@ -280,6 +280,7 @@ ...@@ -280,6 +280,7 @@
280 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 280 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
281 import {getQjZdjbxxDetailById} from "../../../api/zd" 281 import {getQjZdjbxxDetailById} from "../../../api/zd"
282 import {submit,registerCall} from "../../../api/common" 282 import {submit,registerCall} from "../../../api/common"
283 import geoUtils from "@components/lineTree/tx/js/geoUtils";
283 export default { 284 export default {
284 name:'zrz', 285 name:'zrz',
285 components:{ 286 components:{
...@@ -358,7 +359,6 @@ ...@@ -358,7 +359,6 @@
358 loading:false, 359 loading:false,
359 source:'', 360 source:'',
360 geoAttributes:{ 361 geoAttributes:{
361 OBJECTID:null,
362 YSDM:"", 362 YSDM:"",
363 BDCDYH:"", 363 BDCDYH:"",
364 ZDDM:"", 364 ZDDM:"",
...@@ -400,6 +400,7 @@ ...@@ -400,6 +400,7 @@
400 mainBoxWidth:0, 400 mainBoxWidth:0,
401 } 401 }
402 }, 402 },
403 mixins:[geoUtils],
403 methods: { 404 methods: {
404 registerCall(){ 405 registerCall(){
405 let data={ 406 let data={
...@@ -540,7 +541,7 @@ ...@@ -540,7 +541,7 @@
540 type: "warning", 541 type: "warning",
541 }); 542 });
542 }else{ 543 }else{
543 saveZrzInfo(this.form).then((res)=>{ 544 saveZrzInfo(this.form).then((res)=>{
544 if(res.code===200){ 545 if(res.code===200){
545 this.$message.success("保存完成！") 546 this.$message.success("保存完成！")
546 }else { 547 }else {
...@@ -558,9 +559,12 @@ ...@@ -558,9 +559,12 @@
558 for(var key in this.geoAttributes){ 559 for(var key in this.geoAttributes){
559 if(key == "BSM"){ 560 if(key == "BSM"){
560 self.geoAttributes[key] = this.bsm 561 self.geoAttributes[key] = this.bsm
561 }else{ 562 }else if(key == 'JGRQ'){
562 var formKay = key.toLowerCase(); 563 var formKay = key.toLowerCase();
563 self.geoAttributes[key] = self.formData[formKay]; 564 self.geoAttributes[key] = new Date(self.form[formKay]).getTime();
565 }else {
566 var formKay = key.toLowerCase();
567 self.geoAttributes[key] = self.form[formKay];
564 } 568 }
565 } 569 }
566 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) { 570 self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
......