diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index d0577ad..769305e 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -12,13 +12,8 @@
-
+
{{ ageLess0(item.ages) }}
{{ item.rksl }}
@@ -30,13 +25,8 @@
-
+
{{ item.name }}
{{ item.rksl }}
@@ -50,18 +40,11 @@
-
+
{{ item.name }}
-
+ "> {{ itemm.name }}
@@ -83,13 +65,8 @@
-
+
{{ item.name }}
@@ -557,6 +534,7 @@ const addPolygonCounty = () => { cfJd.value = item.name; let jdCenter = []; if (item.name == "溪口镇") { + console.log(444444444, choose.value.person); BMAP(); getDatas("溪口镇", ""); getDataBq(cfJd.value, ""); @@ -570,9 +548,8 @@ const addPolygonCounty = () => { choose.value.person == "kjer" ) { // console.log(5555555555555555); - // getDataBq(cfJd.value, ""); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); - } else { + } else if (choose.value.person != "") { getDatas("溪口镇", choose.value.person); } @@ -738,12 +715,10 @@ const addPolygonCountyCs = () => { ) { getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); } else { - console.log(2, "溪口镇"); + // console.log(2, "溪口镇"); getDataBqs(cfJd.value, cfCs.value); - // getDatas2("溪口镇", choose.value.person, cfCs.value); - - // getDatas2("溪口镇", choose.value.person, cfCs.value); } + //这段注意 getDatas2(cfJd.value, choose.value.person, cfCs.value); addCsChoose(); addCsUnChoose(); @@ -1028,7 +1003,7 @@ const createCs2 = (polygon, indexx) => { div.style.justifyContent = "space-between"; div.style.alignItems = "center"; div.style.cursor = "pointer"; - div.style.padding = "5px"; + div.style.padding = "5px 10px"; div.style.minWidth = "90px"; div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; div.style.transform = "translateY(50px)"; @@ -1106,7 +1081,7 @@ const createCs = (polygon, indexx) => { div.style.justifyContent = "center"; div.style.alignItems = "center"; div.style.cursor = "pointer"; - div.style.padding = "5px"; + div.style.padding = "5px 10px"; div.style.minWidth = "60px"; div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; div.style.transform = "translateY(50px)"; @@ -1159,7 +1134,7 @@ const DGcreateCs = (polygon, indexx) => { div.style.justifyContent = "center"; div.style.alignItems = "center"; div.style.cursor = "pointer"; - div.style.padding = "5px"; + div.style.padding = "5px 10px"; div.style.minWidth = "60px"; div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; div.style.transform = "translateY(50px)"; @@ -1215,7 +1190,7 @@ const DGcreateCs2 = (polygon, indexx) => { div.style.justifyContent = "space-between"; div.style.alignItems = "center"; div.style.cursor = "pointer"; - div.style.padding = "5px"; + div.style.padding = "5px 10px"; div.style.minWidth = "90px"; div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`; div.style.transform = "translateY(50px)"; @@ -2268,6 +2243,9 @@ const getServiceCircle = async (communityName, townName) => { //获取人口数 const getData = async (i, e) => { + if (e == "9999") { + e = ""; + } await http .get(`/api/ggfwyth/ysyzt/getXzjdrksl?age=${e || ""}`) .then((res) => { @@ -2275,7 +2253,7 @@ const getData = async (i, e) => { if (cfJd.value == "") { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total", @@ -2324,6 +2302,9 @@ const getData = async (i, e) => { } }; const getDatas = async (e, i) => { + if (i == "9999") { + i = ""; + } await http .get(`/api/ggfwyth/ysyzt/getCssrksl?town=${e}&age=${i || ""}`) .then((res) => { @@ -2332,7 +2313,7 @@ const getDatas = async (e, i) => { } else if (cfJd.value !== "") { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total", @@ -2445,7 +2426,7 @@ const getDatas2 = async (e, i, cs) => { if (res.code == 200) { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total", @@ -2711,17 +2692,13 @@ onMounted(() => { bottom: 0; width: 520px; height: 960px; - background: linear-gradient( - 270deg, + background: linear-gradient(270deg, rgba(0, 52, 131, 0.69) 0%, rgba(0, 32, 83, 0.77) 50%, - rgba(0, 60, 131, 0.74) 100% - ), - radial-gradient( - 128% 99% at 100% 46%, + rgba(0, 60, 131, 0.74) 100%), + radial-gradient(128% 99% at 100% 46%, rgba(0, 48, 125, 0.29) 0%, - rgba(0, 61, 134, 0.42) 100% - ); + rgba(0, 61, 134, 0.42) 100%); box-shadow: inset 0px 0px 56px 0px rgba(173, 221, 255, 0.5); backdrop-filter: blur(3px); padding: 30px 26px; @@ -2893,17 +2870,13 @@ onMounted(() => { bottom: 0; width: 520px; height: 960px; - background: linear-gradient( - 270deg, + background: linear-gradient(270deg, rgba(0, 52, 131, 0.69) 0%, rgba(0, 32, 83, 0.77) 50%, - rgba(0, 60, 131, 0.74) 100% - ), - radial-gradient( - 128% 99% at 100% 46%, + rgba(0, 60, 131, 0.74) 100%), + radial-gradient(128% 99% at 100% 46%, rgba(0, 48, 125, 0.29) 0%, - rgba(0, 61, 134, 0.42) 100% - ); + rgba(0, 61, 134, 0.42) 100%); box-shadow: inset 0px 0px 56px 0px rgba(173, 221, 255, 0.5); backdrop-filter: blur(3px); padding: 30px 26px; @@ -2994,7 +2967,6 @@ onMounted(() => { } .zyys { - // margin-top: 25px; .zyys_content { margin-top: 20px; box-sizing: border-box; @@ -3063,12 +3035,10 @@ onMounted(() => { // line-height: 44px; letter-spacing: 4px; margin-bottom: 15px; - background: linear-gradient( - 180deg, - #ffffff 0%, - #ffffff 40%, - #00ffff 100% - ); + background: linear-gradient(180deg, + #ffffff 0%, + #ffffff 40%, + #00ffff 100%); /* 使文字没有背景颜色的背景 */ background-clip: text; /* 为了兼容性,添加渐变背景到IE */