This commit is contained in:
duanxiaohai 2024-10-21 15:44:15 +08:00
parent 5339a1e51e
commit ade632515d
2 changed files with 47 additions and 17 deletions

View File

@ -1777,6 +1777,33 @@ const showTab = (val) => {
djmbsj: "14:20",
cc: "6",
},
{
lm: "301",
smz: "龙游—金村",
xjsbsj: "7:30",
xjmbsj: "14:30",
djsbsj: "7:30",
djmbsj: "14:30",
cc: "6",
},
{
lm: "302",
smz: "龙游—南溪",
xjsbsj: "6:50",
xjmbsj: "14:40",
djsbsj: "6:50",
djmbsj: "14:40",
cc: "6",
},
{
lm: "303",
smz: "龙游—徐坞",
xjsbsj: "6:50",
xjmbsj: "14:50",
djsbsj: "6:50",
djmbsj: "14:50",
cc: "6",
},
];
dialogShowTab.value = true;
break;

View File

@ -264,7 +264,7 @@
/>
</template>
<template #zxs="{ currentCol, currentData }">
<div v-if="currentData.zt>0" style="font-size: 30px;">*</div>
<div v-if="currentData.zt > 0" style="font-size: 30px">*</div>
</template>
</Dialog>
<DialogCamera
@ -2951,7 +2951,7 @@ const createZyys = (polygon, indexx, name, tooltip) => {
} else {
zyysCenter.length = 0;
zyysDk.length = 0;
await get_dk_zyys(polygon.fgfwrs,polygon.lb,polygon.ssly);
await get_dk_zyys(polygon.fgfwrs, polygon.lb, polygon.ssly);
xr_dk_center_zyys();
}
@ -3003,7 +3003,7 @@ const loadCs_zyys = async (name) => {
}
}
};
const get_dk_zyys = async (sj,xd,ssly) => {
const get_dk_zyys = async (sj, xd, ssly) => {
zyys_dk.value.length = 0;
zyys_center.value.length = 0;
zyys_data.value.point.length = 0;
@ -3020,10 +3020,10 @@ const get_dk_zyys = async (sj,xd,ssly) => {
sj.forEach((item, index) => {
zyysDk.forEach((dk) => {
if (item.committee == dk.name) {
let a={
let a = {
...dk,
zt:item.zt
}
zt: item.zt,
};
zyys_data.value.point.push(a);
}
});
@ -3045,9 +3045,9 @@ const get_dk_zyys = async (sj,xd,ssly) => {
//()
const xr_dk_center_zyys = async () => {
zyys_data.value.point.map((item, index) => {
let color="blue";
if(item.zt>0){
color="green";
let color = "blue";
if (item.zt > 0) {
color = "green";
}
let points = [];
item.point[0].map((p) => points.push(new BMapGL.Point(...p)));
@ -3095,8 +3095,11 @@ const Xr_zyysNum = (polygon, indexx) => {
div.style.cursor = "pointer";
div.style.padding = "5px";
div.style.minWidth = "60px";
div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`;
div.style.transform = "translateY(50px)";
div.style.borderRadius = "12px";
// div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`;
div.style.background = "linear-gradient(90deg, rgba(146,151,217,1) 0%, rgba(236,236,236,1) 100%)";
div.style.transform = "translate(50px, 26px)";
// div.style.transform = "translateY(50px)";
div.setAttribute("name", this.properties.title);
var title = document.createElement("div");
@ -3144,11 +3147,11 @@ const Xr_zyysNum = (polygon, indexx) => {
tableType.columns = table_column_list.zxs;
zyys_table.town = polygon.town;
zyys_table.committee = polygon.committee;
console.log(222222222,polygon);
console.log(222222222, polygon);
if(polygon.ssly=="教育"){
zyys_table.xd = polygon.xd;
}else{
if (polygon.ssly == "教育") {
zyys_table.xd = polygon.xd;
} else {
zyys_table.xd = "";
}