Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -162,6 +162,27 @@ export function jzxsbatchModify(data) {
     })
     })
 }
 }
 
 
+/* 
+  删除界址点 
+ */
+export function delJzdByBsm(data){
+	return request({
+		url: '/zd/qjJzd/',
+		method: 'delete',
+		params: data
+	})
+}
+/* 
+  删除界址线
+ */
+export function delJzxByBsm(data){
+	return request({
+		url: '/zd/qjJzx/',
+		method: 'delete',
+		params: data
+	})
+}
+
 /**x
 /**x
  *根据宗地Bsm删除宗地信息
  *根据宗地Bsm删除宗地信息
  */
  */

@@ -127,7 +127,7 @@
 </template>
 </template>
 <script>
 <script>
 import lineItem from "./lineItem.vue";
 import lineItem from "./lineItem.vue";
-import {deleteZdInfoByBsm,exportShp,exportExcel} from "@api/zd";
+import {deleteZdInfoByBsm,exportShp,exportExcel,delJzdByBsm,delJzxByBsm} from "@api/zd";
 import Create from "../../views/panel/create/index";
 import Create from "../../views/panel/create/index";
 import ImportGeo from './tx/importGeo'
 import ImportGeo from './tx/importGeo'
 import geoUtils from "@components/lineTree/tx/js/geoUtils";
 import geoUtils from "@components/lineTree/tx/js/geoUtils";
@@ -529,7 +529,13 @@ export default {
 					self.updateGraphic(featureUrl, features, function (res) {
 					self.updateGraphic(featureUrl, features, function (res) {
 						if(!res.updateFeatureResults[0].error){
 						if(!res.updateFeatureResults[0].error){
 							self.$message.warning("删除成功!!!")
 							self.$message.warning("删除成功!!!")
-							self.addGeoByBsm(BSM,type,"testMap");
+							//清除图层
+							self.clearHighlightLayer("testMap");
+							//self.addGeoByBsm(BSM,type,"testMap");
+							//删除界址点 界址线
+							if(type == 'zd'){
+								self.delJzdAndJzx(BSM);
+							}
 						}
 						}
 
 
 					});
 					});
@@ -538,6 +544,19 @@ export default {
 				}
 				}
 			});
 			});
 		},
 		},
+		//删除宗地界址点  界址线
+		delJzdAndJzx(bsm){
+			delJzdByBsm({zdbsm:bsm}).then(res => {
+				if(res.success){
+					console.log("删除界址点成功!!!");
+				}
+			});
+			delJzxByBsm({zdbsm:bsm}).then(res => {
+				if(res.success){
+					console.log("删除界址线成功!!!");
+				}
+			})
+		},
         /*
         /*
 	   * 导入图形
 	   * 导入图形
 	   * */
 	   * */

@@ -381,8 +381,9 @@ export default {
         if(valid){
         if(valid){
           //选择处理方式
           //选择处理方式
          var value = self.dealForm.method;
          var value = self.dealForm.method;
+		 self.currntDealGraphic.attributes = {};
          switch (value) {
          switch (value) {
-            case '1':self.currntDealGraphic.attributes.BGZT =1;self.saveZd(self.currntDealGraphic);break;
+            case '1':self.currntDealGraphic.attributes.BGZT = 1;self.saveZd(self.currntDealGraphic);break;
             case "2":self.getDifference(self.currntDealGraphic,self.overResults,self.delOverGeo);break;
             case "2":self.getDifference(self.currntDealGraphic,self.overResults,self.delOverGeo);break;
             case "3":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,true);break;
             case "3":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,true);break;
             case "4":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,false);break;
             case "4":self.getResultsDif(self.overResults,self.currntDealGraphic,self.delOtherGeo,false);break;
@@ -395,6 +396,9 @@ export default {
     },
     },
     //裁剪自己在保存
     //裁剪自己在保存
     delOverGeo(geometry){
     delOverGeo(geometry){
+		if(!this.currntDealGraphic.attributes){
+			this.currntDealGraphic.attributes = {};
+		}
       this.currntDealGraphic.attributes.BGZT =2;
       this.currntDealGraphic.attributes.BGZT =2;
       if(geometry == null){
       if(geometry == null){
         this.$message.warning("完全重叠，已删除图形信息!!!")
         this.$message.warning("完全重叠，已删除图形信息!!!")

@@ -508,6 +508,14 @@ export  default {
                     return;
                     return;
                 }
                 }
             });
             });
-        }
+        },
+		//清空当前图层
+		clearHighlightLayer(viewId){
+			var view = maps[viewId];
+			var layer = view.map.findLayerById("highlightLayer");
+			if(layer){
+			    layer.removeAll();
+			}
+		}
     }
     }
 }
 }
\ No newline at end of file

@@ -532,7 +532,6 @@
                     type:"dz"
                     type:"dz"
                 }
                 }
                 submit(data).then((res)=>{
                 submit(data).then((res)=>{
-                    debugger
                     if(res.code===200){
                     if(res.code===200){
                         this.$message.success("提交完成！");
                         this.$message.success("提交完成！");
                         this.getDzDetailByBsm(this.$route.query.bsm)
                         this.getDzDetailByBsm(this.$route.query.bsm)

@@ -234,7 +234,7 @@ export default {
         xmmc: "",
         xmmc: "",
         zddm: "",
         zddm: "",
         zl: "",
         zl: "",
-        type:'all',
+        type:'change',
         pageNo:1,
         pageNo:1,
         pageSize:15
         pageSize:15
       },
       },

@@ -806,7 +806,7 @@
 										var qlrTableData = this.$refs.qlrxxModule.tableData;
 										var qlrTableData = this.$refs.qlrxxModule.tableData;
 										if(qlrTableData.length > 0){
 										if(qlrTableData.length > 0){
 											for(var i = 0;i < qlrTableData.length;i++){
 											for(var i = 0;i < qlrTableData.length;i++){
-												if(i == 0){
+												if(i = 0){
 													self.geoAttributes[key] = qlrTableData[i].qlrmc;
 													self.geoAttributes[key] = qlrTableData[i].qlrmc;
 												}else{
 												}else{
 													self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;
 													self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;

@@ -395,7 +395,7 @@ export default {
 				}
 				}
 			})
 			})
 			this.$nextTick(()=>{
 			this.$nextTick(()=>{
-					if (flag && this.$refs.qlxzModule.getRulesResult()) {
+					if (flag) {
 						if(this.ljzbsm == ''){
 						if(this.ljzbsm == ''){
 							insertLjzInfo(this.form).then((res) => {
 							insertLjzInfo(this.form).then((res) => {
 								if (res.code === 200) {
 								if (res.code === 200) {
@@ -515,7 +515,7 @@ export default {
 		ljzbsm: {
 		ljzbsm: {
 			handler: function (item) {
 			handler: function (item) {
 				console.log(item,'item');
 				console.log(item,'item');
-				if(item!='' && this.$parent.menuType == 'ljz'){
+				if(item!='' && this.$parent.$parent.menuType == 'ljz'){
 					this.getLjzInfo(this.ljzbsm)
 					this.getLjzInfo(this.ljzbsm)
 				}
 				}
 			},
 			},