Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/sy.vue

@@ -1246,7 +1246,7 @@ const getData = async () => {
         //   data.salvageServices[key] = res.data.jzfw[key];
         // });
         data.salvageServices.jzrc = addThousandSeparator(res.data.jzfw.jzrc);
-        data.salvageServices.jzje = addThousandSeparator(res.data.jzfw.jzje) ;
+        data.salvageServices.jzje = addThousandSeparator(res.data.jzfw.jzje);
       }
       // 教育事业&师生比例
       const jysyKeys = ["xxzs", "xszs", "jzgzs"];
@@ -1421,20 +1421,21 @@ const showEc = (val) => {
         1411, 1232,
       ]; // 骑行时长（分钟）
       dataEc.times = [
+        "14",
+        "15",
+        "16",
+        "17",
+        "18",
+        "19",
+        "20",
+        "21",
+        "22",
+        "23",
+        "24",
+        "25",
         "26",
         "27",
-        "29",
+        "28",
-        "30",
-        "01",
-        "02",
-        "03",
-        "04",
-        "05",
-        "06",
-        "07",
-        "08",
-        "09",
-        "10",
       ];
       dialogShowEc.value = true;
       break;
@@ -1464,21 +1465,21 @@ const showTab = (val) => {
         7574, 8647, 9515, 8974,
       ];
       dataTab.times = [
+        "14",
+        "15",
+        "16",
+        "17",
+        "18",
+        "19",
+        "20",
+        "21",
+        "22",
+        "23",
+        "24",
+        "25",
         "26",
         "27",
         "28",
-        "29",
-        "30",
-        "01",
-        "02",
-        "03",
-        "04",
-        "05",
-        "06",
-        "07",
-        "08",
-        "09",
-        "10",
       ];
       dataTab.data = [
         {
@@ -1573,21 +1574,21 @@ const showTab = (val) => {
         97, 57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43,
       ];
       dataTab.times = [
+        "14",
+        "15",
+        "16",
+        "17",
+        "18",
+        "19",
+        "20",
+        "21",
+        "22",
+        "23",
+        "24",
+        "25",
         "26",
         "27",
         "28",
-        "29",
-        "30",
-        "01",
-        "02",
-        "03",
-        "04",
-        "05",
-        "06",
-        "07",
-        "08",
-        "09",
-        "10",
       ];
       dataTab.data = [
         {

src/view/sy_details.vue

@@ -23,7 +23,7 @@
           <el-table-column prop="xm" label="姓名" width="60" />
           <el-table-column prop="dz" label="地址" />
           <el-table-column prop="nl" label="年龄" />
-          <el-table-column prop="sfzhm" label="身份证号" />
+          <!-- <el-table-column prop="sfzhm" label="身份证号" /> -->
           <el-table-column prop="bq" label="人口标签" />
         </el-table>
         <el-pagination
@@ -116,7 +116,7 @@
           <el-table-column prop="fullName" label="姓名" width="60" />
           <el-table-column prop="address" label="地址" />
           <el-table-column prop="age" label="年龄" />
-          <el-table-column prop="IDNumber" label="身份证号" />
+          <!-- <el-table-column prop="IDNumber" label="身份证号" /> -->
           <el-table-column prop="PopulationLabel" label="人口标签" />
         </el-table>
         <el-pagination
@@ -141,193 +141,7 @@ import http from "@/utils/request.js";
 const data = reactive({
   pagedData: [],
   first: true,
-  tableData: [
+  tableData: [],
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-    {
-      fullName: "王*",
-      address: "龙游县东华街道",
-      age: "13",
-      IDNumber: "330825****92022011",
-      PopulationLabel: "低保、 困难儿童",
-    },
-  ],
-  // tableData1: [
-  //   {
-  //     SerialNumber: "01",
-  //     SubsidyType: "城乡最低生活保障补助",
-  //     SubsidRecipients:
-  //       "龙游户籍的公民，其共同生活的家庭成员人均月收入低于当地最低生活保障标准，且符合当地最低生活保障家庭财产状况规定的家庭",
-  //     SubsidyStandards: "330-1100元/月（补差发放）",
-  //     ProcessingMethod: "自主申报",
-  //   },
-  //   {
-  //     SerialNumber: "02",
-  //     SubsidyType: "困境儿童补助",
-  //     SubsidRecipients:
-  //       "困境儿童：低保、低边家庭的重度残疾和三级四级精神、智力残疾，患重病和罕见病儿童。                   ",
-  //     SubsidyStandards: "困境儿童1714元/月",
-  //     ProcessingMethod: "到户籍所在地乡镇或街道自主申报",
-  //   },
-  //   {
-  //     SerialNumber: "03",
-  //     SubsidyType: "低保低边家庭儿童",
-  //     SubsidRecipients: "低保低边家庭中除困境儿童外的其他儿童",
-  //     SubsidyStandards: "171.4元/月",
-  //     ProcessingMethod: "无需申报",
-  //   },
-  //   {
-  //     SerialNumber: "04",
-  //     SubsidyType: "临时救助",
-  //     SubsidRecipients:
-  //       "城乡居民因遭遇突发事件、意外伤害、重大疾病或其他特殊原因，导致基本生活陷入困境，其他社会救助制度暂时无法覆盖或救助之后，基本生活暂时仍有严重困难的家庭或个人。",
-  //     SubsidyStandards: "根据实际情况分类分档进行救助,原则上12倍以内低保金",
-  //     ProcessingMethod: "自主申报",
-  //   },
-  //   {
-  //     SerialNumber: "05",
-  //     SubsidyType: "困难残疾人生活补贴",
-  //     SubsidRecipients:
-  //       "户籍、持有《中华人民共和国残疾认证》且是低保低边的残疾人",
-  //     SubsidyStandards: "330元/月/人",
-  //     ProcessingMethod:
-  //       "由本人或监护人向户籍所在乡镇（街道）提出申请，乡镇（街道）要将通过审定的补贴对象名单在申请人所在村（社区）公示，并定期更新补贴对象信息。",
-  //   },
-  //   {
-  //     SerialNumber: "06",
-  //     SubsidyType: "雨露计划补贴",
-  //     SubsidRecipients:
-  //       "低收入农户及其子女在校接受全日制高等职业教育、中等职业教育（不含普通高中）",
-  //     SubsidyStandards: "3000元/人/年",
-  //     ProcessingMethod: "自主申报，每年10月",
-  //   },
-  //   {
-  //     SerialNumber: "07",
-  //     SubsidyType: "扶贫小额信贷贴息",
-  //     SubsidRecipients: "低收入农户",
-  //     SubsidyStandards: "按3%年利率对其贷款进行贴息",
-  //     ProcessingMethod: "浙里办自主申报",
-  //   },
-  //   {
-  //     SerialNumber: "08",
-  //     SubsidyType: "扶贫健康保险",
-  //     SubsidRecipients: "低收入农户",
-  //     SubsidyStandards: "150元/人/年",
-  //     ProcessingMethod: "统一由扶贫办投保",
-  //   },
-  //   {
-  //     SerialNumber: "09",
-  //     SubsidyType: "农村困难家庭危房改造补助",
-  //     SubsidRecipients:
-  //       "农村的低保家庭、低保边缘家庭、分散供养的特困人员和困难残疾人家庭户",
-  //     SubsidyStandards:
-  //       "省级标准：15000元/户;县级配套标准：C级7500元/户、D级22500元/户",
-  //     ProcessingMethod: "自主申报，无时间限制",
-  //   },
-  //   {
-  //     SerialNumber: "10",
-  //     SubsidyType: "公共租赁住房补贴",
-  //     SubsidRecipients: "符合条件的城镇住房困难家庭",
-  //     SubsidyStandards: "人均保障面积15平方米，10元/平方米·月。",
-  //     ProcessingMethod: "浙里办线上办理，常态化受理",
-  //   },
-  //   {
-  //     SerialNumber: "11",
-  //     SubsidyType: "特殊身份人员免缴城乡居民基本医疗保险费",
-  //     SubsidRecipients: "低保、低边、特困供养人员",
-  //     SubsidyStandards: "当年城居医保费个人部分",
-  //     ProcessingMethod:
-  //       "年底根据民政名单统一资助参保次年的城居医保，后每月根据民政实时新增减少数据进行动态更新",
-  //   },
-  //   {
-  //     SerialNumber: "12",
-  //     SubsidyType: "医疗救助",
-  //     SubsidRecipients: "纳入特困、低保、低边的因病致贫人员",
-  //     SubsidyStandards:
-  //       "纳入低保低边的因病致贫人员前6个月的住院自负合规医疗费用救助比例为60%。纳入后的住院救助标准：特困供养人员基本医疗费用给予全额解决、低保人员住院自负合规医疗费用救助比例80%、低边人员住院自负合规医疗费用救助比例70%。符合医疗救助条件的医保参保人员，大病起付标准为9000元，按80%补助。",
-  //     ProcessingMethod:
-  //       "因病致贫前6个月的费用由医保系统自动获取审核计算，纳入后的费用直接一站式结算。",
-  //   },
-  //   {
-  //     SerialNumber: "13",
-  //     SubsidyType: "学前教育免保育费资助",
-  //     SubsidRecipients:
-  //       "本人及其家庭的经济能力难以满足其在校（或幼儿园）期间的学习和生活基本支出的在籍学生。（一）特殊群体主要包括城市低保家庭学生、特困供养学生、孤儿、烈士子女、持证残疾学生、城市低保边缘家庭学生、低收入农户家庭学生、建档立卡贫困家庭学生等。（二）其他群体1.因遭受自然灾害、意外事件、重大疾病等突发情况导致家庭经济困难的学生。2.学校结合家庭经济因素、地区经济社会发展水平因素通过家访、个别访谈、信函索证、大数据分析、民主评议等方式，根据实事求是的原则认定需要资助的学生。",
-  //     SubsidyStandards:
-  //       "学前教育免保育费资助标准为我县三级公办幼儿园保育费350元/月，每学期按5个月1750元的标准进行资助。若幼儿园收取的保育费等于或高于1750元，则按1750元予以资助；若幼儿园收取的保育费低于1750元，则按该园实际收取的保育费金额予以资助。",
-  //     ProcessingMethod: "每学期初申请，学校认定、公示后给予资助",
-  //   },
-  //   {
-  //     SerialNumber: "14",
-  //     SubsidyType: "义务教育营养改善计划（营养餐）",
-  //     SubsidRecipients:
-  //       "本人及其家庭的经济能力难以满足其在校（或幼儿园）期间的学习和生活基本支出的在籍学生。（一）特殊群体主要包括城市低保家庭学生、特困供养学生、孤儿、烈士子女、持证残疾学生、城市低保边缘家庭学生、低收入农户家庭学生、建档立卡贫困家庭学生等。（二）其他群体1.因遭受自然灾害、意外事件、重大疾病等突发情况导致家庭经济困难的学生。2.学校结合家庭经济因素、地区经济社会发展水平因素通过家访、个别访谈、信函索证、大数据分析、民主评议等方式，根据实事求是的原则认定需要资助的学生。",
-  //     SubsidyStandards:
-  //       "各学校每周为家庭经济困难学生免费提供5餐荤素搭配、营养合理的营养餐（一般为午餐）。具体金额参照各校实际用餐收费减免。",
-  //     ProcessingMethod: "每学期初申请，学校认定、公示后给予资助",
-  //   },
-  // ],
   tableData1: [
     {
       SerialNumber: "01",
@@ -645,6 +459,55 @@ const data = reactive({
       IDNumber: "330825****92022011",
       PopulationLabel: "低保、 困难儿童",
     },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
+    {
+      fullName: "王*",
+      address: "龙游县东华街道",
+      age: "13",
+      IDNumber: "330825****92022011",
+      PopulationLabel: "低保、 困难儿童",
+    },
   ],
 });
 // 表格分页

src/view/sy_map.vue

@@ -1453,11 +1453,13 @@ const changeFwq = async (id, list, center, name, names) => {
     fwq_list_arr.value.forEach((item, index) => {
       map.removeOverlay(fwq_list_arr.value[index]); // 清空服务圈 图标
     });
+
     drawACircle("hide"); //隐藏服务圈  圆
   } else {
     await getServiceCircle(names, name);
     choose.value.fwq = id;
     map.clearOverlays(); //清空地图上所有的覆盖物
+    choose.value.person=''
     addggfwq(); //创建公共服务圈
     setTimeout(() => {
       goMapCenter(center, 16); //中心点缩放
@@ -2208,7 +2210,7 @@ const updateFwqList = (data, townName, communityName) => {
               (item) => item.xzjd === townName && item.csq === communityName
             )
             .map((item) => ({
-              x: 33,
+              x: 53,
               y: 0,
               img: fwqbg1,
               img2: b2,
@@ -2964,6 +2966,7 @@ onMounted(() => {
   }
 
   .zyys {
+    margin-top: 25px;
     .zyys_content {
       margin-top: 20px;
       box-sizing: border-box;

src/view/sy_table.vue

@@ -3,20 +3,30 @@
     <div class="displayFlex left_bg">
       <div class="title">基本公共服务</div>
       <div class="lineEnd"></div>
-      <div class="tabPosition" v-for="(item, index) in data.tabPosition">
+      <div class="menuBar">
-        <div class="tabPositionBox">
+        <div class="tabPosition" v-for="(item, index) in data.tabPosition">
-          <div class="img"><img :src="item.img" alt="" /></div>
+          <div class="tabPositionBox" @click="toggleVisibility(item)">
-          <div class="tabsItem">
+            <div class="img"><img :src="item.img" alt="" /></div>
-            {{ item.name }}
+            <div class="tabsItem">
+              {{ item.name }}
+            </div>
           </div>
-        </div>
+          <transition name="fade-scale">
-        <div
+            <div v-show="item.visible">
-          class="tabPositionminBox"
+              <div
-          v-for="(item1, index1) in item.son"
+                class="tabPositionminBox"
-          :class="data.taps == item1.id ? 'tabPositionminBoxBgc' : ''"
+                v-for="(item1, index1) in item.son"
-          @click="tapshow(index1)"
+                :class="
-        >
+                  data.taps == item1.id && data.taps1 == item.id
-          {{ item1.name }}
+                    ? 'tabPositionminBoxBgc'
+                    : ''
+                "
+                @click="tapshow(item.id, index1)"
+              >
+                {{ item1.name }}
+              </div>
+            </div>
+          </transition>
         </div>
       </div>
     </div>
@@ -156,43 +166,126 @@ const goto = (url) => {
 };
 
 const data = reactive({
+  taps1: "6",
   taps: "0",
-  taps1: "0",
   tabPosition: [
     {
       id: "0",
       name: "幼有所育",
       img: icon1,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "优孕优生服务",
+        },
+        {
+          id: "1",
+          name: "儿童健康服务",
+        },
+        {
+          id: "2",
+          name: "儿童关爱服务",
+        },
+      ],
     },
     {
       id: "1",
       name: "学有所教",
       img: icon2,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "学前教育助学服务",
+        },
+        {
+          id: "1",
+          name: "义务教育服务",
+        },
+        {
+          id: "2",
+          name: "普通高中助学服务",
+        },
+        {
+          id: "3",
+          name: "中等职业教育助学服务",
+        },
+      ],
     },
     {
       id: "2",
-      name: "老有所得",
+      name: "劳有所得",
       img: icon3,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "就业创业服务",
+        },
+        {
+          id: "1",
+          name: "工伤失业保险服务",
+        },
+      ],
     },
     {
       id: "3",
       name: "病有所医",
       img: icon4,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "公共卫生服务",
+        },
+        {
+          id: "1",
+          name: "医疗保险服务",
+        },
+        {
+          id: "2",
+          name: "计划生育扶助服务",
+        },
+      ],
     },
     {
       id: "4",
       name: "老有所养",
       img: icon5,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "养老助老服务",
+        },
+        {
+          id: "1",
+          name: "养老保险服务",
+        },
+      ],
     },
     {
       id: "5",
       name: "住有所居",
       img: icon6,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "公租房服务",
+        },
+        {
+          id: "1",
+          name: "住房改造服务",
+        },
+      ],
     },
     {
       id: "6",
       name: "弱有所扶",
       img: icon7,
+      visible: true,
       son: [
         {
           id: "0",
@@ -200,37 +293,73 @@ const data = reactive({
         },
         {
           id: "1",
-          name: "公共法律服务",
+          name: "法律援助服务",
         },
         {
           id: "2",
           name: "扶残助残服务",
         },
-        {
-          id: "3",
-          name: "儿童健康服务",
-        },
       ],
     },
     {
       id: "7",
-      name: "军有所扶",
+      name: "军有所抚",
       img: icon8,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "优军优抚服务",
+        },
+      ],
     },
     {
       id: "8",
       name: "文有所化",
       img: icon9,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "公共文化服务",
+        },
+      ],
     },
     {
       id: "9",
       name: "体有所育",
       img: icon10,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "公共体育服务",
+        },
+      ],
     },
     {
       id: "10",
       name: "事有所便",
       img: icon11,
+      visible: false,
+      son: [
+        {
+          id: "0",
+          name: "生活便利服务",
+        },
+        {
+          id: "1",
+          name: "生活安全服务",
+        },
+        {
+          id: "2",
+          name: "生活环境服务",
+        },
+        {
+          id: "3",
+          name: "殡葬公共服务",
+        },
+      ],
     },
   ],
   tableData: [
@@ -255,7 +384,7 @@ const data = reactive({
       targetValue6: "县医保局",
     },
     {
-      highFrequencyApp: "困难群众医疗费用综合保障率(%%)",
+      highFrequencyApp: "困难群众医疗费用综合保障率(%)",
       targetValue: ">83",
       targetValue1: ">83",
       targetValue2: "86.59(1-5月)",
@@ -314,10 +443,18 @@ const data = reactive({
   ],
 });
 
-const tapshow = (val) => {
+const tapshow = (parentId, childId) => {
-  // console.log(val);
+  // data.taps1 = parentId;
-  data.taps = val;
+  // data.taps = childId;
 };
+const toggleVisibility = (val) => {
+  data.tabPosition.forEach((parent) => {
+    if (parent.id === val.id) {
+      parent.visible = !parent.visible;
+    }
+  });
+};
+
 // 服务表格样式
 const tableHeaderColor = (arg) => {
   return {
@@ -378,6 +515,14 @@ const rowState = (row) => {
       border-bottom: 1px dashed #fff;
       margin: 17px 0;
     }
+
+    .menuBar::-webkit-scrollbar {
+      display: none; /* Chrome Safari */
+    }
+    .menuBar {
+      height: 100vh;
+      overflow-y: auto;
+    }
     .tabPosition {
       display: flex;
       flex-direction: column;
@@ -385,39 +530,44 @@ const rowState = (row) => {
       font-size: 22px;
       font-weight: 500;
       letter-spacing: 1px;
+    }
+    .tabPosition img {
+      width: 18px;
+      height: 18px;
+      margin-right: 10px;
+      vertical-align: middle;
+    }
+    .tabPositionBox {
+      display: flex;
+      align-items: center;
+      margin: 12px 0 12px 19px;
+      cursor: pointer;
+    }
+    .tabPositionminBox {
+      font-size: 18px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 200px;
+      height: 50px;
+      border-radius: 4px;
+    }
+    .tabPositionminBoxBgc {
+      background: rgba(73, 121, 191);
+    }
 
-      img {
+    .fade-scale-enter-active,
-        width: 18px;
+    .fade-scale-leave-active {
-        height: 18px;
+      transition: opacity 0.5s ease;
-        margin-right: 10px;
+    }
-        vertical-align: middle;
+    .fade-scale-enter,
-      }
+    .fade-scale-leave-to {
-
+      opacity: 0;
-      .tabPositionBox {
-        display: flex;
-        align-items: center;
-        margin: 12px 0 12px 19px;
-        cursor: pointer;
-      }
-      .tabPositionminBox {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 200px;
-        height: 50px;
-
-        border-radius: 4px;
-        cursor: pointer;
-        // opacity: 0.45;
-      }
-      .tabPositionminBoxBgc {
-        background: rgba(73, 121, 191);
-      }
     }
   }
   .left_bg {
     // width: 642px;
-    width: 230px;
+    width: 270px;
     height: 943px;
     box-sizing: border-box;
     padding: 19px 17px;
@@ -593,14 +743,11 @@ const rowState = (row) => {
     border: none !important;
     padding-left: 10px !important;
   }
-
-
 }
 :deep(.el-table td.el-table__cell) {
   padding: 12px 0px;
 }
 
-
 :deep(.el-table--enable-row-hover .el-table__body tr:hover > td) {
   background-color: #2f4b74;
 }