diff --git a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
index 8e1a7d641..ed8354954 100644
--- a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
+++ b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <popup title="居民详情" @close="handleClose">
     <template v-slot:cnt>
-      <div class="m-info">
+      <div class="m-info" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
         <div class="subtitle">
           <i class="i-chunk"></i>
           <span>基本信息</span>
@@ -11,18 +11,22 @@
           <div class="item">
             <div class="field">所属网格：</div>
             <div class="value">
-              {{ info.houseInfo.gridName }}
+              <span v-if="info.community">{{ info.community }}</span>
+              <span v-if="info.grid"> - {{ info.grid }}</span>
             </div>
           </div>
           <div class="item">
             <div class="field">所属房屋：</div>
             <div class="value">
-              {{ info.houseInfo.homeName }}
+              <span v-if="info.village">{{ info.village }}</span>
+              <span v-if="info.building"> - {{ info.building }}</span>
+              <span v-if="info.unit"> - {{ info.unit }}</span>
+              <span v-if="info.room"> - {{ info.room }}</span>
             </div>
           </div>
           <div class="item">
             <div class="field">本地户籍：</div>
-            <div class="value">{{ info.localResidenceFlag == 1 ? "是" : "否" }}</div>
+            <div class="value">{{ info.census_type }}</div>
           </div>
         </div>
         <div class="row">
@@ -36,23 +40,23 @@
           </div>
           <div class="item">
             <div class="field">性别：</div>
-            <div class="value">{{ info.genderName }}</div>
+            <div class="value">{{ info.gender }}</div>
           </div>
           <div class="item">
             <div class="field">民族：</div>
-            <div class="value">{{ info.nationName }}</div>
+            <div class="value">{{ info.ethnic }}</div>
           </div>
           <div class="item">
             <div class="field">联系电话：</div>
-            <div class="value">{{ info.mobile }}</div>
+            <div class="value">{{ info.telephone }}</div>
           </div>
           <div class="item">
             <div class="field">证件号：</div>
-            <div class="value">{{ info.idNum }}</div>
+            <div class="value">{{ info.idcard }}</div>
           </div>
           <div class="item">
             <div class="field">备注：</div>
-            <div class="value">{{ info.remark }}</div>
+            <div class="value">{{ info.resident_remark }}</div>
           </div>
         </div>
 
@@ -67,7 +71,26 @@
             <div class="field">居民分类：</div>
             <div class="value">
               <div class="u-categorys">
-                <span v-for="item in peopleTypesArr" :key="item">{{ item }}</span>
+                <span v-if="info.crowd">党员</span>
+                <span v-if="info.mlsp">低保人员</span>
+                <span v-if="info.srs">保障房人员</span>
+                <span v-if="info.unemployed">失业人员</span>
+                <span v-if="info.woca">育龄妇女</span>
+                <span v-if="info.exs">退役军人</span>
+                <span v-if="info.ufs">统战人员</span>
+                <span v-if="info.petitioner">信访人员</span>
+                <span v-if="info.volunteer">志愿者</span>
+                <span v-if="info.in_person">特扶人员</span>
+                <span v-if="info.tenant">租户</span>
+                <span v-if="info.float_popu">流动人口</span>
+                <span v-if="info.special_popu">特殊人群</span>
+                <span v-if="info.aaaa">独居老人</span>
+                <span v-if="info.empty_nest">空巢老人</span>
+                <span v-if="info.disability">失能老人</span>
+                <span v-if="info.dementia">失智老人</span>
+                <span v-if="info.adisability">残疾</span>
+                <span v-if="info.ser_ill">大病</span>
+                <span v-if="info.ncd">慢病</span>
               </div>
             </div>
           </div>
@@ -640,6 +663,7 @@ export default {
   data() {
     return {
       info: {},
+      loading: false,
       currentTabIndex: 0,
       startTabIndex: 0,
       BaseTabList: ["教育信息", "兴趣爱好", "宗教", "健康", "工作", "经济状况", "居住", "家庭"],
@@ -652,7 +676,7 @@ export default {
       handler(val) {
         if (val) {
           this.getInfo(val);
-          this.getInfoBase(val);
+          // this.getInfoBase(val);
         }
       },
       immediate: true,
@@ -683,15 +707,34 @@ export default {
       }
     },
 
-    async getInfoBase(val) {
+    async getInfo() {
       const url = "resident_info";
-      const { data, code } = await requestPostBi(url, {
+      this.loading = true;
+      const { data, code, msg } = await requestPostBi(url, {
         queryParam: {
           resident_id: 1001001,
         },
       });
       if (code === 0) {
         this.info = { ...this.info, ...data[0] };
+        const { info } = this;
+        let tabList = this.BaseTabList;
+        info.crowd && tabList.push("党员");
+        info.srs && tabList.push("保障房");
+        info.unemployed && tabList.push("失业");
+        info.exs && tabList.push("退役军人");
+        info.ufs && tabList.push("统战人员");
+        info.volunteer && tabList.push("志愿者");
+        info.aged && tabList.push("老年人");
+        info.special_popu && tabList.push("特殊人群");
+        tabList.push("出生信息");
+        tabList.push("死亡信息");
+        tabList.push("迁出");
+        this.tabList = tabList;
+        this.loading = false;
+      } else {
+        this.loading = false;
+        this.$message.error(msg);
       }
     },
 
@@ -700,31 +743,15 @@ export default {
     },
 
     // 根据房屋id获取详情
-    getInfo(val) {
-      this.$http.post(`/actual/base/residentBaseInfo/detail/1001001`).then((res) => {
-        const { code, data } = res.data;
-        if (code === 0) {
-          this.info = data;
-          const { info } = this;
-          let tabList = this.BaseTabList;
-          info.crowd && tabList.push("党员");
-          info.srs && tabList.push("保障房");
-          info.unemployed && tabList.push("失业");
-          info.exs && tabList.push("退役军人");
-          info.ufs && tabList.push("统战人员");
-          info.volunteer && tabList.push("志愿者");
-          info.aged && tabList.push("老年人");
-          info.special_popu && tabList.push("特殊人群");
-          tabList.push("出生信息");
-          tabList.push("死亡信息");
-          tabList.push("迁出");
-          this.tabList = tabList;
-          this.getHomeTypes(info.categoryInfo);
-        } else {
-          this.$message.error(msg);
-        }
-      });
-    },
+    // getInfo(val) {
+    //   this.$http.post(`/actual/base/residentBaseInfo/detail/1001001`).then((res) => {
+    //     const { code, data } = res.data;
+    //     if (code === 0) {
+    //       this.info = data;
+    //       const { info } = this;
+
+    //   });
+    // },
 
     // 根据房屋id获取详情
     handlePageNoChange(page_num) {
@@ -883,7 +910,6 @@ export default {
     text-align: center;
     cursor: pointer;
   }
-
   .tab {
     @include toe;
     margin: 0 5px;
@@ -908,4 +934,9 @@ export default {
     }
   }
 }
+.row {
+  .field {
+    width: 150px !important;
+  }
+}
 </style>