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

src/view/guide.vue

@@ -140,7 +140,10 @@ onMounted(() => {
   let token = tools.data.get("token");
   // console.log(token, "token");
   if (token == null) {
-    ElMessage.error("请重新登录!");
+    ElMessage.error({
+      message: "请重新登录!",
+      offset: 100,
+    });
     window.location.href =
       "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
   }

src/view/sy_mapcopy.vue

@@ -1828,8 +1828,10 @@ const changeFwq = async (id, name, names) => {
         ); //中心点缩放
       }, 500);
     } else {
-      console.log("无数据11");
-      ElMessage.warning("无数据");
+      ElMessage.warning({
+        message: "无数据",
+        offset: 100, // 距离窗口顶部的偏移量
+      });
     }
   }
 };
@@ -1922,7 +1924,7 @@ const addggfwq = () => {
 
     // data.fwqCoordinates1 = calculateAverage(data.fwqCoordinates1);
     // data.fwqCoordinates2 = calculateAverage(data.fwqCoordinates2);
-    // console.log(centerPoint); // 输出中心点的经纬度
+    console.log(centerPoint); // 输出中心点的经纬度
     // console.log("经纬度", data.fwqCoordinates1, data.fwqCoordinates2 );
 
     let distances = []; // 初始化距离数组
@@ -1942,15 +1944,18 @@ const addggfwq = () => {
       distances.push(distance); // 将距离存入数组
     });
     let maxDistance = Math.max(...distances); // 找到最大距离
-    maxDistance = Math.ceil(maxDistance * 2.2); // 向上取整
+    maxDistance = Math.ceil(maxDistance * 1.8); // 向上取整
     if (maxDistance < 100) {
       maxDistance = 150; // 如果小于 100，则赋值为 150
     }
     data.zoomLevel = calculateZoomLevel(maxDistance);
-    // console.log("最大距离:", maxDistance,data.zoomLevel);
+    console.log("最大距离:", maxDistance, data.zoomLevel);
     drawACircle(maxDistance);
   } else {
-    ElMessage.warning("无数据");
+    ElMessage.warning({
+      message: "无数据",
+      offset: 100, // 距离窗口顶部的偏移量
+    });
   }
 };
 //计算两点之间直线距离

src/view/sy_table.vue

@@ -102,7 +102,10 @@
           </div>
         </div>
         <div class="formText_bootom">
-          <div class="yd_title left_2" :style="{'margin-top': show_7yx ? '40px' : '0px'}">
+          <div
+            class="yd_title left_2"
+            :style="{ 'margin-top': show_7yx ? '40px' : '0px' }"
+          >
             <div class="animate-border">
               <i></i>
               <i></i>
@@ -187,7 +190,10 @@ const goto = (url, val) => {
       path: `${url}`,
     });
   } else {
-    ElMessage.warning(`${val.name}暂无数据!`);
+    ElMessage.warning({
+      message: `${val.name}暂无数据!`,
+      offset: 100, // 距离窗口顶部的偏移量
+    });
   }
 };
 
@@ -624,7 +630,7 @@ const getData = async (name, fullName) => {
               name: item.sx,
               text: item.bmfxqk,
               // progress: item.xh,
-              progress: '95', //进度条
+              progress: "95", //进度条
             });
           });
         }