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

src/view/analyze.vue

@@ -906,12 +906,15 @@ const data = reactive({
       },
     },
     push: [
-      { name: "小奔通", num: 4196 },
-      { name: "交通", num: 4026 },
-      { name: "两慢病", num: 2 },
-      { name: "天气", num: 102 },
-      { name: "低保低边医疗救助政策", num: 87 },
-      { name: "孕妇生育津贴申领", num: 19 },
+      { name: "小奔通", num: 60313 },
+      { name: "失业", num: 3336 },
+      { name: "两慢病", num: 8166 },
+      { name: "低保低边人员", num: 84 },
+      { name: "孕产妇", num: 172 },
+      { name: "出行温馨提示", num: 406223 },
+      { name: "气象预警", num: 620745 },
+      { name: "龙游龙游活动", num: 64563 },
+      { name: "公交出行信息推送", num: 731 },
     ],
   },
 });
@@ -973,7 +976,7 @@ const getData = async () => {
       // console.log(res.data, "信息推送");
       // data.analysis = res.data;
       data.analysis.lnr = res.data.lnr;
-      data.analysis.push[0].num = res.data.push[0].num;
+      // data.analysis.push[0].num = res.data.push[0].num;
 
       const ageBt = ["nl6170", "nl7180", "nl8190", "nl91100", "nl100"];
       ageBt.forEach((key, index) => {
@@ -1024,7 +1027,7 @@ const getData = async () => {
 };
 
 onMounted(() => {
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   startAutoSwitching();
 });
 

src/view/person/index.vue

@@ -945,8 +945,9 @@ const getData = (identNo) => {
       if (res.code === 200 && res.data) {
         const { ryjbxx, camera, rybqxx } = res.data;
         // 判断 ryjbxx 和 camera 是否存在
-        baseInfo.value = ryjbxx || {}; // 如果 ryjbxx 未定义则赋值为空对象
-        dataMyTag.camera = camera || {}; // 如果 camera 未定义则赋值为空对象
+        baseInfo.value = ryjbxx || {};
+        dataMyTag.camera = camera ?? false;
+        // console.log(dataMyTag.camera, camera);
 
         if (Array.isArray(dataMyTag.myTag)) {
           dataMyTag.myTag.forEach((item) => {
@@ -1036,7 +1037,7 @@ watch(
   }
 );
 onMounted(() => {
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   if (routers.query.type) {
     errorMessage.value = "";
     dataMyTag.identNo = routers.query.identNo;

src/view/sy_details.vue

@@ -3,7 +3,7 @@
     <div class="displayFlex left_bg">
       <div class="bt_title">
         <div class="yd_title">
-          <span>服务对象（{{ formData.name }}）</span>
+          <span>服务对象清单（{{ formData.name }}）</span>
           <div class="semi-circle-shadow"></div>
           <div class="animate-border">
             <i></i>
@@ -750,11 +750,11 @@ const formData = reactive({
   lmbhzTableData: {
     url: "",
     columns: [
-      {
-        label: "时间",
-        property: "sfsj",
-        width: "120",
-      },
+      // {
+      //   label: "时间",
+      //   property: "sfsj",
+      //   width: "120",
+      // },
       {
         label: "姓名",
         property: "xm",

src/view/sy_table.vue

@@ -5,7 +5,7 @@
       <!-- <div class="lineEnd"></div> -->
       <div class="menuBar">
         <div class="tabPosition" v-for="(item, index) in data.tabPosition">
-          <div class="tabPositionBox" @click="toggleVisibility(item)">
+          <div class="tabPositionBox" @click="toggleVisibility(item, true)">
             <div style="display: flex; text-align: center">
               <div class="img"><img :src="item.img" alt="" /></div>
               <div class="tabsItem">
@@ -209,6 +209,7 @@ const goto = (val) => {
 const data = reactive({
   taps1: "6",
   taps: "1",
+  tapbody: {},
   tabPosition: [
     {
       id: "0",
@@ -522,9 +523,11 @@ const gk = computed(() => {
 });
 
 const tapshow = (parentId, childId) => {
-  console.log(parentId, childId, "菜单名");
+  // console.log(parentId, childId, "菜单名");
   data.taps1 = parentId.id;
   data.taps = childId;
+  localStorage.setItem("taps", data.taps);
+  localStorage.setItem("taps1", JSON.stringify(parentId));
   if (
     childId == 0 &&
     (parentId.name == "弱有所扶" ||
@@ -564,15 +567,19 @@ const tapshow = (parentId, childId) => {
     }
   }
 };
-const toggleVisibility = (val) => {
-  // console.log(val, "最低生活保障");
+const toggleVisibility = (val, show) => {
+  // console.log(val, show, "最低生活保障");
   data.tabPosition.forEach((parent) => {
     parent.visible = false;
     if (parent.id === val.id) {
       parent.visible = !parent.visible;
     }
   });
-  tapshow(val, 0);
+  if (show) {
+    tapshow(val, 0);
+  } else {
+    tapshow(data.tapbody, data.taps);
+  }
 };
 const gaikuang = (name) => {
   // console.log(4444, name);
@@ -670,17 +677,18 @@ const sevenYX = (name) => {
 
 onMounted(() => {
   // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
-  getData("弱有所扶", "社会救助服务");
-  sevenYX("弱有众扶");
+
+  if (localStorage.getItem("taps1") !== undefined) {
+    data.tapbody = JSON.parse(localStorage.getItem("taps1"));
+    data.taps = localStorage.getItem("taps");
+    data.taps1 = data.tapbody.id;
+    // console.log("菜单", data.tapbody, data.taps);
+    toggleVisibility(data.tapbody, false);
+  } else {
+    getData("弱有所扶", "社会救助服务");
+    sevenYX("弱有众扶");
+  }
 });
-// onMounted(() => {
-//   let token = tools.data.get("token");
-//   if (token == null) {
-//     ElMessage.error("请重新登录!");
-//     window.location.href =
-//       "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
-//   }
-// });
 </script>
 
 <style lang="scss" scoped>