diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 4974f2f..0484762 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -85,7 +85,7 @@ - + { color: "#fff", border: "none", textAlign: "center", - fontFamily: "PingFangSC, PingFang SC", + fontFamily: "PingFangSC, PingFang SC", // boxShadow: " inset 0px 0px 56px 0px rgba(173,221,255,0.5)", }; }; @@ -601,13 +603,16 @@ const handleRowClick = (row, column, event) => { console.log(row); router.push({ path: `/home/index/person`, - query: { identNo: row.sfzhm,type: "detail" }, + query: { identNo: row.sfzhm, type: "detail" }, }); }; onMounted(() => { // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage); handleCurrentChange(1); + if (routers.query.name) { + data.name = routers.query.name; + } }); diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index fdc54a0..601ba5a 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -169,8 +169,7 @@
未居住
@@ -1653,10 +1652,9 @@ const changeys = (name) => { img = item.img; } }); - if(name=='摄像头'){ - getZyys(url, name,img); + if (name == "摄像头") { + getZyys(url, name, img); } - } }; const getZyys = (url, name, img) => { @@ -3450,7 +3448,7 @@ onMounted(() => { .title_name { cursor: pointer; display: flex; - font-family: YouSheBiaoTiHei; + font-family: titletheRightWay; font-size: 30px; font-weight: 900; // line-height: 44px; @@ -3462,12 +3460,13 @@ onMounted(() => { /* 为了兼容性,添加渐变背景到IE */ -webkit-background-clip: text; -webkit-text-fill-color: transparent; - padding-left: 23px; + padding-left: 32px; span { display: block; - font-family: YouSheBiaoTiHei; - font-size: 30px; - font-weight: 900; + font-family: titletheRightWay; + font-size: 34px; + font-weight: normal; + // font-weight: 900; // line-height: 44px; letter-spacing: 4px; margin-bottom: 18px; diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index e98d969..d1fd133 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -122,12 +122,7 @@
{{ item.name }}
-
- 详情 -
+
详情
{{ item.text }}
@@ -183,11 +178,19 @@ import tools from "@/utils/tools"; const router = useRouter(); const routers = useRoute(); // 路由跳转 -const goto = (url, val) => { - // console.log(val); - if (val.name == "最低生活保障") { +const goto = (val) => { + const availableRoutes = [ + "最低生活保障", + "老年人福利补贴", + "慢性病患者健康管理", + "义务教育学生生活补助", + "义务教育学生营养改善计划", + ]; + // 检查数组val.name中是否存在availableRoutes。 + if (availableRoutes.includes(val.name)) { router.push({ - path: `${url}`, + path: "/home/index/table/details", + query: { name: val.name }, }); } else { ElMessage.warning({ @@ -563,8 +566,6 @@ const toggleVisibility = (val) => { parent.visible = !parent.visible; } }); - console.log(val); - tapshow(val, 0); }; const gaikuang = (name) => {