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

src/assets/css/common.css

@@ -16,6 +16,10 @@
   font-family: titleNore; 
   src: url('../css/优设标题黑.ttf')
 }
+@font-face {
+  font-family: titletheRightWay; 
+  src: url('../css/庞门正道标题体3.0.ttf')
+}
 
 span,
 p,

src/view/guide.vue

@@ -27,7 +27,7 @@
               class="image-wall"
               style="transition: transform 1s ease 0.5s"
               :style="{
-                transform: `rotateY(${45 * indexP}deg) translateZ(450px)`,
+                transform: `rotateY(${91.25 * indexP}deg) translateZ(350px)`,
               }"
               @click.stop="toPage(itemP.url)"
             >
@@ -137,13 +137,13 @@ const reset_font = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(() => {
-  let token = tools.data.get("token");
-  // console.log(token, "token");
-  if (token == null) {
-    ElMessage.error("请重新登录!");
-    window.location.href =
-      "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
-  }
+  // let token = tools.data.get("token");
+  // // console.log(token, "token");
+  // if (token == null) {
+  //   ElMessage.error("请重新登录!");
+  //   window.location.href =
+  //     "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
+  // }
   reset_font();
   reset_font();
 });
@@ -157,6 +157,10 @@ const tabData = reactive({
   tabNum: 0,
   PageUrl: "/home/index/table",
   tabList: [
+    {
+      name: "总体概况",
+      img: tab1,
+    },
     {
       name: "评估模型",
       img: tab7,
@@ -165,32 +169,32 @@ const tabData = reactive({
       name: "要素一张图",
       img: tab8,
     },
-    {
-      name: "总体概况",
-      img: tab1,
-    },
-    {
-      name: "养老体系",
-      img: tab2,
-    },
-    {
-      name: "卫生体系",
-      img: tab3,
-    },
-    {
-      name: "教育体系",
-      img: tab4,
-    },
-    {
-      name: "救助体系",
-      img: tab5,
-    },
+    // {
+    //   name: "养老体系",
+    //   img: tab2,
+    // },
+    // {
+    //   name: "卫生体系",
+    //   img: tab3,
+    // },
+    // {
+    //   name: "教育体系",
+    //   img: tab4,
+    // },
+    // {
+    //   name: "救助体系",
+    //   img: tab5,
+    // },
     {
       name: "智能分析",
       img: tab6,
     },
   ],
   scenList: [
+  {
+      img: png3,
+      url: "/home/index",
+    },
     {
       img: png1,
       url: "/home/index/table",
@@ -199,26 +203,23 @@ const tabData = reactive({
       img: png2,
       url: "/home/index/map",
     },
-    {
-      img: png3,
-      url: "/home/index",
-    },
-    {
-      img: png4,
-      url: "/home/yl",
-    },
-    {
-      img: png5,
-      url: "/home/hygiene",
-    },
-    {
-      img: png6,
-      url: "/home/education",
-    },
-    {
-      img: png7,
-      url: "/home/work",
-    },
+   
+    // {
+    //   img: png4,
+    //   url: "/home/yl",
+    // },
+    // {
+    //   img: png5,
+    //   url: "/home/hygiene",
+    // },
+    // {
+    //   img: png6,
+    //   url: "/home/education",
+    // },
+    // {
+    //   img: png7,
+    //   url: "/home/work",
+    // },
     {
       img: png8,
       url: "/home/analyze",
@@ -230,7 +231,7 @@ const changeTab = (val) => {
   tabData.PageUrl = tabData.scenList[val].url;
   transTime.value = 0.8;
   tabData.tabNum = val;
-  rotateY.value = 360 - 45 * val;
+  rotateY.value = 360 - 91.25 * val;
   rotateX.value = 0;
   setTimeout(() => {
     transTime.value = 0;

src/view/person/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="person-container">
+    <a @click="back()" class="page_back"><i class="el-icon-arrow-left" title="返回"></i>返回</a>
+
     <div class="person-content">
       <div class="person-side">
         <div class="my-label">
@@ -390,6 +392,11 @@ const tableType = reactive({
 const onClickTag = (item) => {
   dialogShow.value = true;
 };
+const back = () =>{
+    //  sessionStorage.setItem('return',true);
+     window.location.href = 'javascript:history.back(-1)';
+}
+
 const paginationDialog = reactive({
   current: 1,
   pageSize: 5,
@@ -601,7 +608,8 @@ onMounted(() => {
 
     .my-label-title {
       display: inline-block;
-      font-family: PangMenZhengDao, PangMenZhengDao;
+      // font-family: PangMenZhengDao, PangMenZhengDao;
+      font-family: titletheRightWay, titletheRightWay;
       font-weight: normal;
       font-size: 34px;
       color: #b8fcfc;

src/view/sy_mapcopy.vue

@@ -1753,6 +1753,7 @@ const open_detail = () => {
 const close = () => {
   dialogShow.value = false;
   pagination.total = 100;
+
   pagination.currentPage = 1;
 };
 //表格分页

src/view/sy_table.vue

@@ -624,7 +624,7 @@ const getData = async (name, fullName) => {
               name: item.sx,
               text: item.bmfxqk,
               // progress: item.xh,
-              progress: '95',
+              progress: '95', //进度条
             });
           });
         }

src/view/table_gk/gk_yl.vue

@@ -681,9 +681,20 @@ const getData = () => {
       // 助老服务
       data.smfwcs = res.data.zlfw.smfwcs;
       // 乡镇助餐次数
-      res.data.zlfw.xzzccs.forEach((element) => {
+      let elements = res.data.zlfw.xzzccs;
+      // 先处理 zccs 不等于 0 的元素
+      elements.forEach((element) => {
+        if (element.zccs !== 0) {
           data.zccs1.push(element.xzjd); // 地点
           data.zccs2.push(element.zccs); // 次数
+        }
+      });
+      // 处理 zccs 等于 0 的元素
+      elements.forEach((element) => {
+        if (element.zccs === 0) {
+          data.zccs1.push(element.xzjd); // 地点
+          data.zccs2.push(element.zccs); // 次数
+        }
       });
     }
     showEchart.value = true;

src/view/yl.vue

@@ -217,10 +217,7 @@
           </div>
         </div>
         <div class="history">
-          <div
-            class="history1"
-            @click="showMapDialog('养老机构')"
-          >
+          <div class="history1" @click="showMapDialog('养老机构')">
             <div>
               <span>{{ data.yljgzlzx.yljg }}<span class="unit">个</span></span>
             </div>
@@ -448,7 +445,7 @@ const showDialog = (title, url, coulumn) => {
 const showMapDialog = (title) => {
   mapTitle.value = title;
   dialogShowMap.value = true;
-}
+};
 //获取表格数据
 const getTable = (url, currentPage) => {
   http
@@ -657,7 +654,7 @@ const getData = () => {
       // 计划生育
       res.data.familyPlanning.familyPlanningData.forEach((element) => {
         data.centerBottom1.push(element.jhsyrs); // 人次
-        data.centerBottom2.push((element.jhsybtje / 10000)); // 金额
+        data.centerBottom2.push(element.jhsybtje / 10000); // 金额
         // data.centerBottom2.push(element.jhsybtje); // 金额
       });
       // 年份
@@ -668,9 +665,20 @@ const getData = () => {
       // 助老服务
       data.smfwcs = res.data.zlfw.smfwcs;
       // 乡镇助餐次数
-      res.data.zlfw.xzzccs.forEach((element) => {
+      let elements = res.data.zlfw.xzzccs;
+      // 先处理 zccs 不等于 0 的元素
+      elements.forEach((element) => {
+        if (element.zccs !== 0) {
           data.zccs1.push(element.xzjd); // 地点
           data.zccs2.push(element.zccs); // 次数
+        }
+      });
+      // 处理 zccs 等于 0 的元素
+      elements.forEach((element) => {
+        if (element.zccs === 0) {
+          data.zccs1.push(element.xzjd); // 地点
+          data.zccs2.push(element.zccs); // 次数
+        }
       });
     }
     showEchart.value = true;