Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/sy_map.vue

@@ -1053,8 +1053,8 @@ const moveSave = () => {
 //退出移动模式
 const moveBack = () => {
   // select.close();
-  movepoy.close();
-  sceneMove.removeEventListener(OperateEventType.CLICK, clickHandler);
+  // movepoy.close();
+  // sceneMove.removeEventListener(OperateEventType.CLICK, clickHandler);
   polyLayer.removeOverlay(cs_choose_arr.value[0]);
   map.removeGeoJSONLayer(polyLayer);
   cs_choose_arr.value.forEach((item, index) => {
@@ -1165,6 +1165,7 @@ const backEdit = () => {
   showEdit.value = false;
   drawing.value = false;
 };
+//批量修改村社位置
 const shangchuan = async () => {
   for (const item of xkzDk) {
     let a = [];
@@ -1181,7 +1182,7 @@ const shangchuan = async () => {
         });
       }
     });
-    await new Promise((resolve) => setTimeout(resolve, 300));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   // xkzDk.forEach(async (item, index) => {
   //   let a = [];
@@ -1239,9 +1240,13 @@ const centerEdit = () => {
 };
 const csName = async () => {
   let n = input1.value;
+    let regionalDivisionEditDTO = {
+    id: changeCsqkId.value,
+    data: input1.value,
+  };
   await http
     .post(
-      `/api/ggfwyth/regionalDivision/updateCsName?id=${changeCsqkId.value}&data=${input1.value}`
+      `/api/ggfwyth/regionalDivision/updateCsName`,regionalDivisionEditDTO
     )
     .then((res) => {
       if (res.code == 200) {
@@ -3284,7 +3289,7 @@ const loadCs = async (name) => {
   }
   console.log(6666);
 };
-//添加村社区块shangchuan
+//添加村社区块
 const addPolygonCountyCs = () => {
   xkzDk.map((item, index) => {
     let num = index % 9;
@@ -3292,14 +3297,15 @@ const addPolygonCountyCs = () => {
     //地区的坐标范围
     let points = [];
     // console.log(item.name,item.point[0]);
+    //批量修改村社位置shangchuan()
     // item.point[0].forEach((itemm, indexx) => {
     //   itemm[0] = itemm[0] + 0.01;
     //   itemm[1] = itemm[1] + 0.00328;
     // });
     item.point[0].map((p) => points.push(new BMapGL.Point(...p)));
-    let offsetPoints2 = points.map((point) =>
-      offsetPoint2(point, offsetX2, offsetY2)
-    );
+    // let offsetPoints2 = points.map((point) =>
+    //   offsetPoint2(point, offsetX2, offsetY2)
+    // );
     if (points.length) {
       //创建面
       cs_qk_arr.value[index] = new BMapGL.Polygon(points, {
@@ -3771,7 +3777,7 @@ const reset_font2 = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(async () => {
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   loadingss.value = true;
   reset_font();
   initMap();

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.65:8095/", //刘进
-        // target: "http://220.191.238.50:996/", //线上
+        // target: "http://10.0.0.65:8095/", //刘进
+        target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },