Compare commits

..

No commits in common. "e34071d948aa8ff0aa7af12b769f386f73c1f7a3" and "59c1c4df02ac3631c0471114299b889e568bd311" have entirely different histories.

1 changed files with 35 additions and 78 deletions

View File

@ -154,9 +154,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="btns" v-if="showEdit"> <div class="btns">
<div class="btnopen" @click="openEdit">编辑</div> <div class="btnopen" @click="openEdit">编辑</div>
<div class="btnsave" @click="saveEdit">保存</div> <div class="btnsave">保存</div>
<div class="btnclose" @click="closeEdit">取消</div> <div class="btnclose" @click="closeEdit">取消</div>
</div> </div>
@ -230,7 +230,7 @@ import http from "@/utils/request.js";
import mapTown from "@/assets/json/ly.json"; import mapTown from "@/assets/json/ly.json";
import { VideoCamera } from "@element-plus/icons-vue"; import { VideoCamera } from "@element-plus/icons-vue";
// import xkz from "@/assets/json/xkz.json"; // import xkz from "@/assets/json/xkz.json";
// import cssj from "@/assets/json/cssj.json"; import cssj from "@/assets/json/cssj.json";
import j0 from "@/assets/images/map/j0.png"; import j0 from "@/assets/images/map/j0.png";
import j1 from "@/assets/images/map/j1.png"; import j1 from "@/assets/images/map/j1.png";
import j2 from "@/assets/images/map/j2.png"; import j2 from "@/assets/images/map/j2.png";
@ -281,11 +281,7 @@ const cs_un_choose_arr = ref([]); //单点社区其他区块(灰色)
const cs_dd_arr = ref([]); // const cs_dd_arr = ref([]); //
// //
const csqk = ref({}); const csqk = ref({});
var cssj; // var cssj
//id
const changeCsqkId = ref("");
//
const showEdit = ref(false);
// //
const title_choose = ref(""); const title_choose = ref("");
const title_jd = ref(""); const title_jd = ref("");
@ -808,8 +804,8 @@ const initMap = () => {
// //
addJd(); addJd();
}; };
const getCssj = async () => { const getCssj = () => {
await http http
.get("/api/ggfwyth/regionalDivision/getCsRegionalDivision") .get("/api/ggfwyth/regionalDivision/getCsRegionalDivision")
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
@ -817,84 +813,42 @@ const getCssj = async () => {
} }
}); });
}; };
//
var arrJWD = [[[]]]; var arrJWD = [[[]]];
var arr1;
var iii;
//bd09bd09 //bd09bd09
const bd09 = (x, y) => { const bd09 = async (x, y, index) => {
iii=index;
var ggPoint = new BMapGL.Point(x, y); var ggPoint = new BMapGL.Point(x, y);
var pointArr = []; var pointArr = [];
pointArr.push(ggPoint); pointArr.push(ggPoint);
var convertor = new BMapGL.Convertor(); var convertor = new BMapGL.Convertor();
convertor.translate(pointArr, COORDINATES_BD09_MC, COORDINATES_BD09, (e) => { convertor.translate(pointArr, COORDINATES_BD09_MC, COORDINATES_BD09, (e) => {
let arr1 = []; arr1 = [];
arr1.push(e.points[0].lng); arr1.push(e.points[0].lng);
arr1.push(e.points[0].lat); arr1.push(e.points[0].lat);
console.log("arr1", arr1); console.log("arr1", arr1);
arr1.push(iii);
arrJWD[0][0].push(arr1); arrJWD[0][0].push(arr1);
}); });
}; };
// //
const openEdit = () => { const openEdit = () => {
arrJWD = [[[]]];
cs_choose_arr.value[0].enableEditing(); cs_choose_arr.value[0].enableEditing();
console.log(cs_choose_arr.value[0]); console.log(cs_choose_arr.value[0]);
}; };
// //
const saveEdit = async () => { const closeEdit = () => {
cs_choose_arr.value[0].disableEditing(); cs_choose_arr.value[0].disableEditing();
console.log(cs_choose_arr.value[0]); console.log(cs_choose_arr.value[0]);
for (const item of cs_choose_arr.value[0].points) { cs_choose_arr.value[0].points.forEach((item, index) => {
if (item?.latLng) { bd09(item.lng, item.lat, index);
let arr1 = []; });
arr1.push(item?.latLng.lng);
arr1.push(item?.latLng.lat);
arrJWD[0][0].push(arr1);
} else {
bd09(item.lng, item.lat);
//0.1convertor.translate
await new Promise((resolve) => setTimeout(resolve, 100));
}
}
console.log("arrJWD", arrJWD); console.log("arrJWD", arrJWD);
saveDK();
}; };
//
const closeEdit = async () => {
cs_choose_arr.value[0].disableEditing();
cs_choose_arr.value.forEach((item, index) => {
map.removeOverlay(cs_choose_arr.value[index]);
});
addCsChoose();
showEdit.value = false;
};
//
const saveDK = async () => {
await http
.post(
`/api/ggfwyth/regionalDivision/addCsManagerRegionalDivision?id=${
changeCsqkId.value
}&data=${JSON.stringify(arrJWD)}`
)
.then((res) => {
if (res.code == 200) {
ElMessage.success("编辑成功");
}
});
await getCssj();
await loadCs(cfJd.value);
cs_choose_arr.value.forEach((item, index) => {
map.removeOverlay(cs_choose_arr.value[index]);
});
chooseCsList.value.length = 0;
xkzDk.forEach((itemm, indexx) => {
if (itemm.name == cfCs.value) {
chooseCsList.value.push(itemm);
addCsChoose();
}
});
};
// //
const csh = () => { const csh = () => {
clear(); clear();
@ -2567,7 +2521,7 @@ const createCustomOverlayJd2 = (polygon, indexx) => {
//------------------------------ //------------------------------
//--------------------- //---------------------
// //
const loadCs = async (name) => { const loadCs = (name) => {
xkzCenter.length = 0; xkzCenter.length = 0;
xkzDk.length = 0; xkzDk.length = 0;
cssj.forEach((item, index) => { cssj.forEach((item, index) => {
@ -2580,24 +2534,20 @@ const loadCs = async (name) => {
for (let w in v.geometry.coordinates) { for (let w in v.geometry.coordinates) {
if (v.geometry.coordinates[w][0].length < 60) continue; if (v.geometry.coordinates[w][0].length < 60) continue;
xkzDk.push({ xkzDk.push({
id: v.id,
name: v.properties.name, name: v.properties.name,
point: v.geometry.coordinates[w], point: v.geometry.coordinates[w],
}); });
} }
xkzCenter.push({ xkzCenter.push({
id: v.id,
name: v.properties.name, name: v.properties.name,
center: v.properties.center, center: v.properties.center,
}); });
} else { } else {
xkzDk.push({ xkzDk.push({
id: v.id,
name: v.properties.name, name: v.properties.name,
point: v.geometry.coordinates[0], point: v.geometry.coordinates[0],
}); });
xkzCenter.push({ xkzCenter.push({
id: v.id,
name: v.properties.name, name: v.properties.name,
center: v.properties.center, center: v.properties.center,
}); });
@ -2699,6 +2649,18 @@ const addCsChoose = () => {
zIndex: 99, zIndex: 99,
}); });
map.addOverlay(cs_choose_arr.value[index]); map.addOverlay(cs_choose_arr.value[index]);
cs_choose_arr.value[index].addEventListener("click", (e) => {
console.log(4444444444, e);
// e.overlay
if (e.overlay && e.overlay.type === "Polygon") {
var vertices = e.overlay.getPath(); //
var coordinates = vertices.map(function (point) {
return { lng: point.lng, lat: point.lat };
});
console.log(coordinates); //
}
});
} }
}); });
}; };
@ -2974,11 +2936,6 @@ const DGcreateCs = (polygon, indexx) => {
}, },
}); });
map.addOverlay(cs_dd_arr.value[indexx]); map.addOverlay(cs_dd_arr.value[indexx]);
cs_dd_arr.value[indexx].addEventListener("click", () => {
console.log(polygon.id);
changeCsqkId.value = polygon.id;
showEdit.value = !showEdit.value;
});
}; };
//(+) //(+)
const DGcreateCs2 = (polygon, indexx) => { const DGcreateCs2 = (polygon, indexx) => {
@ -3099,7 +3056,7 @@ onMounted(async () => {
getData(); getData();
BMAP(); BMAP();
getFwq(); getFwq();
getCssj(); // getCssj();
await getDataBq(); await getDataBq();
loadingss.value = false; loadingss.value = false;
}); });
@ -3671,8 +3628,8 @@ onMounted(async () => {
z-index: 999; z-index: 999;
position: absolute; position: absolute;
color: #ffffff; color: #ffffff;
top: 15%; top: 120px;
right: 30%; left: 600px;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.btnopen { .btnopen {