Compare commits

...

3 Commits

Author SHA1 Message Date
姚宇浩 8e40adcdd3 gx 2024-08-30 11:42:50 +08:00
姚宇浩 d763a20212 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-30 11:35:47 +08:00
姚宇浩 6809d6f8c3 1 2024-08-30 11:30:04 +08:00
3 changed files with 21 additions and 44 deletions

View File

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

View File

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

View File

@ -230,7 +230,7 @@
v-if="!showEdit && !dialogShow && !openD" v-if="!showEdit && !dialogShow && !openD"
@click="openqx()" @click="openqx()"
> >
地图权限(123456) 地图权限
<p :style="{ color: jsqx ? 'green' : 'red' }">{{ bjtitle }}</p> <p :style="{ color: jsqx ? 'green' : 'red' }">{{ bjtitle }}</p>
</div> </div>
<Dialog <Dialog
@ -821,6 +821,7 @@ const yaosuTotal = ref([
img: j7, img: j7,
img_map: j7_map, img_map: j7_map,
wz: false, wz: false,
tooltip:'name'
}, },
{ {
id: 8, id: 8,
@ -841,6 +842,7 @@ const yaosuTotal = ref([
img: j10, img: j10,
wz: true, wz: true,
url: "/api/ggfwyth/ysyzt/getAeds", url: "/api/ggfwyth/ysyzt/getAeds",
tooltip:'siteAddress'
}, },
{ {
id: 11, id: 11,
@ -849,6 +851,7 @@ const yaosuTotal = ref([
img_map: j11_map, img_map: j11_map,
wz: false, wz: false,
url: "/api/ggfwyth/ysyzt/getJashsxt", url: "/api/ggfwyth/ysyzt/getJashsxt",
tooltip:'sbmc'
}, },
]); ]);
// //
@ -1050,7 +1053,7 @@ const getCssj = async () => {
*/ */
// //
const jsqx = ref(false); const jsqx = ref(false);
const qxkey = "123456"; const qxkey = "ggfwyth123";
const qxvalue = ref(""); const qxvalue = ref("");
const bjtitle = computed(() => { const bjtitle = computed(() => {
if (jsqx.value) { if (jsqx.value) {
@ -2488,23 +2491,25 @@ const changeys = (name) => {
let url; let url;
let img; let img;
let img_map; let img_map;
let tooltip
yaosuTotal.value.forEach((item, index) => { yaosuTotal.value.forEach((item, index) => {
if (item.name == name) { if (item.name == name) {
url = item.url; url = item.url;
img = item.img; img = item.img;
img_map = item.img_map; img_map = item.img_map;
tooltip=item.tooltip;
} }
}); });
if (name == "摄像头" || name == "AED") { if (name == "摄像头" || name == "AED") {
getZyys(url, name, img, img_map); getZyys(url, name, img, img_map,tooltip);
} }
if (name == "养老机构") { if (name == "养老机构") {
getZyys2(name, img, img_map); getZyys2(name, img, img_map,tooltip);
} }
} }
}; };
//线 //线
const getZyys = (url, name, img, img_map) => { const getZyys = (url, name, img, img_map,tooltip) => {
http.get(url).then((res) => { http.get(url).then((res) => {
if (res.code == 200) { if (res.code == 200) {
yaosuIcon.value[name].sj = res.data; yaosuIcon.value[name].sj = res.data;
@ -2532,13 +2537,13 @@ const getZyys = (url, name, img, img_map) => {
// }; // };
}); });
yaosuIcon.value[name].sj.forEach((itemm, indexx) => { yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
createZyys(itemm, indexx, name); createZyys(itemm, indexx, name,tooltip);
}); });
} }
}); });
}; };
// //
const getZyys2 = (name, img, img_map) => { const getZyys2 = (name, img, img_map,tooltip) => {
if (name == "养老机构") { if (name == "养老机构") {
yaosuIcon.value[name].sj = ylCount; yaosuIcon.value[name].sj = ylCount;
yaosuIcon.value[name].sj.forEach((item, index) => { yaosuIcon.value[name].sj.forEach((item, index) => {
@ -2547,13 +2552,13 @@ const getZyys2 = (name, img, img_map) => {
item.overlay = null; item.overlay = null;
}); });
yaosuIcon.value[name].sj.forEach((itemm, indexx) => { yaosuIcon.value[name].sj.forEach((itemm, indexx) => {
createZyys(itemm, indexx, name); createZyys(itemm, indexx, name,tooltip);
}); });
} }
}; };
// (overlay) // (overlay)
const createZyys = (polygon, indexx, name) => { const createZyys = (polygon, indexx, name,tooltip) => {
function createLabelDOM() { function createLabelDOM() {
var content = document.createElement("div"); var content = document.createElement("div");
content.style.display = "flex"; content.style.display = "flex";
@ -2570,37 +2575,8 @@ const createZyys = (polygon, indexx, name) => {
img2.src = this.properties.imgSrc2; img2.src = this.properties.imgSrc2;
// title // title
img2.title =polygon.name; img2.title = polygon[tooltip];
// //
// 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(img2);
// content.appendChild(tooltip);
return content; return content;
} }
yaosuIcon.value[name].sj[indexx].overlay = new BMapGL.CustomOverlay( yaosuIcon.value[name].sj[indexx].overlay = new BMapGL.CustomOverlay(
@ -2632,6 +2608,7 @@ const createZyys = (polygon, indexx, name) => {
} }
}); });
}; };
// //
const getCameraUrl = () => { const getCameraUrl = () => {
// camera.deviceCode = dataMyTag.camera.sbbm; // camera.deviceCode = dataMyTag.camera.sbbm;
@ -3962,7 +3939,7 @@ const reset_font2 = () => {
"scale(" + width / 1920 + "," + height / 1080 + ")"; "scale(" + width / 1920 + "," + height / 1080 + ")";
}; };
onMounted(async () => { onMounted(async () => {
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
loadingss.value = true; loadingss.value = true;
reset_font(); reset_font();
initMap(); initMap();