gxgetDatas2

src/view/person/index.vue

@@ -35,7 +35,8 @@
             <div class="my-info-label">居住状态</div>
             <div class="my-info-content">
               <p v-if="baseInfo.jzzt == 1">居住</p>
-              <p v-else>未居住</p>
+              <p v-else-if="baseInfo.jzzt == 0">未居住</p>
+              <p v-else></p>
             </div>
           </div>
           <div class="my-info-item">
@@ -424,39 +425,42 @@ const getData = (nm, identNo) => {
       }
     });
 };
-const getData2 = (nm, identNo) => {
+// const getData2 = (nm, identNo) => {
-  http
+//   http
-    .get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`)
+//     .get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`)
-    .then((res) => {
+//     .then((res) => {
-      if (res.code == 200) {
+//       if (res.code == 200) {
-        baseInfo.value = res.data;
+//         baseInfo.value = res.data;
 
-        // dataMyTag.myTag.map((item) => {
+//         // dataMyTag.myTag.map((item) => {
-        //   if (res.data[item.jkName]) {
+//         //   if (res.data[item.jkName]) {
-        //     item.show = Number(res.data[item.jkName]);
+//         //     item.show = Number(res.data[item.jkName]);
+//         //   }
+//         // });
+//         if(res.data.yljlx){
+//           data.value=[
+//             {
+//               type:res.data.yljlx,
+//               date:res.data.yljffrq,
+//               sum:res.data.yljffje
+//             }
+//           ]
+//         }else{
+//            data.value=[]
+//         }
+//         // console.log(dataMyTag.myTag, 555);
 //       }
 //     });
-        if(res.data.yljlx){
+// };
-          data.value=[
-            {
-              type:res.data.yljlx,
-              date:res.data.yljffrq,
-              sum:res.data.yljffje
-            }
-          ]
-        }else{
-           data.value=[]
-        }
-        // console.log(dataMyTag.myTag, 555);
-      }
-    });
-};
 onMounted(() => {
   // console.log(routers.query);
   if(routers.query.type == 'map'){
     getData(routers.query.nm, routers.query.identNo);
   }else{
-    getData2(routers.query.nm, routers.query.identNo);
+    // getData2(routers.query.nm, routers.query.identNo);
+    baseInfo.value.nm=routers.query.nm;
+    baseInfo.value.dz=routers.query.dz;
+    baseInfo.value.identNo=routers.query.identNo;
   }
   
 });

src/view/sy_details.vue

@@ -599,7 +599,7 @@ const handleRowClick = (row, column, event) => {
   console.log(row);
   router.push({
     path: `/home/index/person`,
-    query: { nm: row.xm, identNo: row.sfzhm, type: "detail" },
+    query: { nm: row.xm, identNo: row.sfzhm, dz: row.dz, type: "detail" },
   });
 };
 onMounted(() => {

src/view/sy_mapcopy.vue

@@ -47,7 +47,7 @@
                       'below-line2': index % 2 === 0,
                     },
                   ]"
-                  >{{ (item.progress).toFixed(2) + "%" }}</span
+                  >{{ item.progress.toFixed(2) + "%" }}</span
                 >
                 <span
                   style="color: #fff; white-space: nowrap"
@@ -239,7 +239,7 @@ const cfJd = ref("");
 //存放村社
 const cfCs = ref("");
 //点击存放村社暂时
-const cfCsZs=ref('')
+const cfCsZs = ref("");
 //地图
 var map = null;
 //默认龙游县灰色地块
@@ -970,7 +970,7 @@ const tableType = reactive({
     {
       label: "居住状态",
       property: "jzzt",
-      type:'slot'
+      type: "slot",
     },
     {
       label: "民族",
@@ -986,9 +986,7 @@ const tableType = reactive({
       width: "300px",
     },
   ],
-  data: [
+  data: [],
- 
-  ],
 });
 // 表格分页
 const pagination = reactive({
@@ -1032,7 +1030,7 @@ const clear = () => {
   title_cs.value = "";
   cfJd.value = "";
   cfCs.value = "";
-  cfCsZs.value='';
+  cfCsZs.value = "";
   cs_un_choose_arr.value.forEach((item, index) => {
     map.removeOverlay(cs_un_choose_arr.value[index]);
   });
@@ -1275,7 +1273,6 @@ const getDatas = async (e, i) => {
                 map.removeOverlay(cs_dd_arr.value[index]);
               });
 
-              
               cs_dd_arr.value = [...xuanzhongCs.value];
               cs_dd_arr.value.map((item, index) => {
                 DGcreateCs2(item, index);
@@ -1751,8 +1748,6 @@ const open_detail = () => {
     person_detail(age);
     dialogShow.value = true;
   }
-  
-  
 };
 const close = () => {
   dialogShow.value = false;
@@ -1779,7 +1774,9 @@ const person_detail = (age) => {
     .get(
       `/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${
         pagination.pageSize
-      }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${cfJd.value || ""}`
+      }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${
+        cfJd.value || ""
+      }`
     )
     .then((res) => {
       if (res.code == 200) {
@@ -2390,7 +2387,12 @@ const addPolygonCountyCs = () => {
           //   getDataBqs(cfJd.value, cfCs.value);
         }
         //这段注意
-        getDatas2(cfJd.value, choose.value.person, cfCs.value);
+        if (choose.value.person == 1) {
+          getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
+        } else {
+          getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);
+        }
+        // getDatas2(cfJd.value, choose.value.person, cfCs.value);
         addCsChoose();
         addCsUnChoose();
         // if (choose.value.person == "") {
@@ -2483,7 +2485,12 @@ const addCsUnChoose = () => {
         // });
         // getDataBqs(cfJd.value, cfCs.value);
         getDataBq(cfJd.value, cfCs.value);
-        getDatas2(cfJd.value, choose.value.person, cfCs.value);
+              if (choose.value.person == 1) {
+          getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
+        } else {
+          getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);
+        }
+        // getDatas2(cfJd.value, choose.value.person, cfCs.value);
         // if (
         //   choose.value.person == "cjr" ||
         //   choose.value.person == "dibian" ||