Compare commits

..

No commits in common. "8e40adcdd3dae0e9c757f59fe2d02f305e56e804" and "65e80ea739cf6b51fd9cff63541883e8d8b6deb1" have entirely different histories.

3 changed files with 44 additions and 21 deletions

View File

@ -363,7 +363,7 @@
</div>
</div>
</div>
<!-- <Dialog
<Dialog
:dialogShow="dialogShow"
:columns="tableType.columns1"
:title="tableType.title2"
@ -372,7 +372,7 @@
@close="close"
@handle="handlePaginationDialog"
>
</Dialog> -->
</Dialog>
<DialogCamera
:cameraShow="camera.show"
:hlsUriSsl="camera.hlsUriSsl"
@ -799,7 +799,7 @@ const pd = computed(() => {
const onClickTag = (item) => {
tableType.title2 = item.name;
tableType.columns1 = columnsList["特殊标签"].column;
// dialogShow.value = true;
dialogShow.value = true;
};
//
// const onClickTag2 = (name, label) => {

View File

@ -1298,7 +1298,7 @@ const getData = async () => {
const ageRatioKeys = [
"nl17Percent",
"nl1834Percent",
"nl3559Percent",
"nl3569Percent",
"nl60Percent",
];
ageRatioKeys.forEach((key) => {

View File

@ -230,7 +230,7 @@
v-if="!showEdit && !dialogShow && !openD"
@click="openqx()"
>
地图权限
地图权限(123456)
<p :style="{ color: jsqx ? 'green' : 'red' }">{{ bjtitle }}</p>
</div>
<Dialog
@ -821,7 +821,6 @@ const yaosuTotal = ref([
img: j7,
img_map: j7_map,
wz: false,
tooltip:'name'
},
{
id: 8,
@ -842,7 +841,6 @@ const yaosuTotal = ref([
img: j10,
wz: true,
url: "/api/ggfwyth/ysyzt/getAeds",
tooltip:'siteAddress'
},
{
id: 11,
@ -851,7 +849,6 @@ const yaosuTotal = ref([
img_map: j11_map,
wz: false,
url: "/api/ggfwyth/ysyzt/getJashsxt",
tooltip:'sbmc'
},
]);
//
@ -1053,7 +1050,7 @@ const getCssj = async () => {
*/
//
const jsqx = ref(false);
const qxkey = "ggfwyth123";
const qxkey = "123456";
const qxvalue = ref("");
const bjtitle = computed(() => {
if (jsqx.value) {
@ -2491,25 +2488,23 @@ const changeys = (name) => {
let url;
let img;
let img_map;
let tooltip
yaosuTotal.value.forEach((item, index) => {
if (item.name == name) {
url = item.url;
img = item.img;
img_map = item.img_map;
tooltip=item.tooltip;
}
});
if (name == "摄像头" || name == "AED") {
getZyys(url, name, img, img_map,tooltip);
getZyys(url, name, img, img_map);
}
if (name == "养老机构") {
getZyys2(name, img, img_map,tooltip);
getZyys2(name, img, img_map);
}
}
};
//线
const getZyys = (url, name, img, img_map,tooltip) => {
const getZyys = (url, name, img, img_map) => {
http.get(url).then((res) => {
if (res.code == 200) {
yaosuIcon.value[name].sj = res.data;
@ -2537,13 +2532,13 @@ const getZyys = (url, name, img, img_map,tooltip) => {
// };
});
yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
createZyys(itemm, indexx, name,tooltip);
createZyys(itemm, indexx, name);
});
}
});
};
//
const getZyys2 = (name, img, img_map,tooltip) => {
const getZyys2 = (name, img, img_map) => {
if (name == "养老机构") {
yaosuIcon.value[name].sj = ylCount;
yaosuIcon.value[name].sj.forEach((item, index) => {
@ -2552,13 +2547,13 @@ const getZyys2 = (name, img, img_map,tooltip) => {
item.overlay = null;
});
yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
createZyys(itemm, indexx, name,tooltip);
createZyys(itemm, indexx, name);
});
}
};
// (overlay)
const createZyys = (polygon, indexx, name,tooltip) => {
const createZyys = (polygon, indexx, name) => {
function createLabelDOM() {
var content = document.createElement("div");
content.style.display = "flex";
@ -2575,8 +2570,37 @@ const createZyys = (polygon, indexx, name,tooltip) => {
img2.src = this.properties.imgSrc2;
// title
img2.title = polygon[tooltip];
img2.title =polygon.name;
// //
// let tooltip = document.createElement("div");
// tooltip.textContent = "";
// tooltip.style.visibility = "hidden";
// tooltip.style.backgroundColor = "black";
// tooltip.style.color = "#fff";
// tooltip.style.textAlign = "center";
// tooltip.style.borderRadius = "5px";
// tooltip.style.padding = "5px";
// tooltip.style.position = "absolute";
// tooltip.style.bottom = "100%"; //
// tooltip.style.left = "50%";
// tooltip.style.transform = "translateX(-50%)";
// tooltip.style.zIndex = "1";
// //
// content.addEventListener("mouseover", function() {
// console.log(556);
// tooltip.style.visibility = "visible";
// });
// //
// content.addEventListener("mouseout", function() {
// tooltip.style.visibility = "hidden";
// });
content.appendChild(img2);
// content.appendChild(tooltip);
return content;
}
yaosuIcon.value[name].sj[indexx].overlay = new BMapGL.CustomOverlay(
@ -2608,7 +2632,6 @@ const createZyys = (polygon, indexx, name,tooltip) => {
}
});
};
//
const getCameraUrl = () => {
// camera.deviceCode = dataMyTag.camera.sbbm;
@ -3939,7 +3962,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();