diff --git a/src/view/guide.vue b/src/view/guide.vue index fadf252..c99f7b7 100644 --- a/src/view/guide.vue +++ b/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; } @@ -191,7 +194,7 @@ const tabData = reactive({ }, ], scenList: [ - { + { img: png3, url: "/home/index", }, @@ -203,7 +206,7 @@ const tabData = reactive({ img: png2, url: "/home/index/map", }, - + // { // img: png4, // url: "/home/yl", diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue index 7c84787..8af5929 100644 --- a/src/view/sy_mapcopy.vue +++ b/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, // 距离窗口顶部的偏移量 + }); } }; //计算两点之间直线距离 diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index 6761935..518eced 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -102,7 +102,10 @@
-
+
@@ -187,7 +190,10 @@ const goto = (url, val) => { path: `${url}`, }); } else { - ElMessage.warning(`${val.name}暂无数据!`); + ElMessage.warning({ + message: `${val.name}暂无数据!`, + offset: 100, // 距离窗口顶部的偏移量 + }); } }; @@ -492,7 +498,7 @@ const gaikuangList = reactive({ hygiene: false, }); //是否显示七优享 -const show_7yx=ref(true); +const show_7yx = ref(true); const gk = computed(() => { if ( gaikuangList.work || @@ -523,9 +529,9 @@ const tapshow = (parentId, childId) => { // gaikuangList.education = false; // gaikuangList.yl = false; // gaikuangList.hygiene = false; - for (let name in gaikuangList) { - gaikuangList[name]=false; - } + for (let name in gaikuangList) { + gaikuangList[name] = false; + } getData(parentId.name, parentId.son[childId].name); // 菜单名匹配 const menuName = [ @@ -541,10 +547,10 @@ const tapshow = (parentId, childId) => { const firstChar = parentId.name.charAt(0); const matchingMenu = menuName.find((name) => name.charAt(0) === firstChar); if (matchingMenu) { - show_7yx.value=true; + show_7yx.value = true; sevenYX(matchingMenu); - }else{ - show_7yx.value=false; + } else { + show_7yx.value = false; } } }; @@ -563,7 +569,7 @@ const toggleVisibility = (val) => { const gaikuang = (name) => { console.log(4444, name); for (let name in gaikuangList) { - gaikuangList[name]=false; + gaikuangList[name] = false; } if (name == "弱有所扶") { gaikuangList.work = true; @@ -624,7 +630,7 @@ const getData = async (name, fullName) => { name: item.sx, text: item.bmfxqk, // progress: item.xh, - progress: '95', //进度条 + progress: "95", //进度条 }); }); } @@ -684,7 +690,7 @@ onMounted(() => { text-align: left; font-style: normal; // font-family: YouSheBiaoTiHei; - font-family: titletheRightWay, titletheRightWay; + font-family: titletheRightWay, titletheRightWay; text-shadow: 0px 2px 4px rgba(56, 50, 50, 0.5); padding: 19px 0 0 17px; }