This commit is contained in:
duanxiaohai 2024-08-08 10:03:41 +08:00
parent 5f94d9fb97
commit 863098aad3
3 changed files with 35 additions and 21 deletions

View File

@ -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",

View File

@ -2070,8 +2070,10 @@ const changeFwq = async (id, name, names) => {
); //
}, 500);
} else {
console.log("无数据11");
ElMessage.warning("无数据");
ElMessage.warning({
message: "无数据",
offset: 100, //
});
}
}
};
@ -2164,7 +2166,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 = []; //
@ -2184,15 +2186,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, //
});
}
};
//线

View File

@ -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, //
});
}
};
@ -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;
}