Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/sy_details.vue

@@ -85,7 +85,7 @@
             <i></i>
             <i></i>
           </div>
-          <span class="text">
+          <span class="text" v-if="data.tabelshow">
             <img
               v-if="data.first"
               src="@/assets/sy-table/sy_details4.png"
@@ -143,6 +143,8 @@ import tools from "@/utils/tools";
 const router = useRouter();
 const routers = useRoute();
 const data = reactive({
+  name: "",
+  tabelshow: false,
   pagedData: [],
   first: true,
   tableData: [],
@@ -558,7 +560,7 @@ const tableHeaderColor = (arg) => {
     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;
+  }
 });
 </script>
 

src/view/sy_map.vue

@@ -3443,7 +3443,7 @@ onMounted(() => {
   .title_name {
     cursor: pointer;
     display: flex;
-    font-family: YouSheBiaoTiHei;
+    font-family: titletheRightWay;
     font-size: 30px;
     font-weight: 900;
     // line-height: 44px;
@@ -3455,12 +3455,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;

src/view/sy_table.vue

@@ -122,12 +122,7 @@
                   <img src="@/assets/sy-table/sy-table3.png" />
                   <div class="tableli">{{ item.name }}</div>
                 </div>
-                <div
-                  class="tableBoxCenter1"
-                  @click="goto('/home/index/table/details', item)"
-                >
-                  详情
-                </div>
+                <div class="tableBoxCenter1" @click="goto(item)">详情</div>
               </div>
               <div class="tableBoxTopa">{{ item.text }}</div>
               <div class="progress-container">
@@ -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) => {