111

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -213,7 +213,7 @@
                          label="身份证"
                          min-width="170">
         </el-table-column>
-        <el-table-column prop="roomShow"
+        <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
@@ -469,14 +469,30 @@ export default {
         this.tableData = data.list
 
         this.analysisTableSelection()
+        this.tableData.forEach(item => {
+          if (!item.allName) {
+            item.allName = '--'
+          }
+          item.roomShow = ''
+          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
+            item.roomShow = '--'
+          } else {
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.villageName
+            }
+            if (item.buildName) {
+              item.roomShow = item.roomShow + item.buildName
+            }
+            if (item.unitName) {
+              item.roomShow = item.roomShow + item.unitName
+            }
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.homeName
+            }
+          }
 
-        // this.tableData.forEach(item => {
-        //   if (item.time) {
-        //     let timeArray = item.time.split(' ')
-        //     item.time = timeArray[0]
-        //   }
 
-        // });
+        });
       } else {
         this.$message.error(msg)
       }
@@ -938,7 +954,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
 
     },
 

src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@@ -207,7 +207,7 @@
                          label="身份证"
                          min-width="170">
         </el-table-column>
-        <el-table-column prop="roomShow"
+        <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
@@ -473,6 +473,9 @@ export default {
         this.analysisTableSelection()
 
         this.tableData.forEach(item => {
+          if (!item.allName) {
+            item.allName = '--'
+          }
           item.roomShow = ''
           if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
             item.roomShow = '--'
@@ -487,7 +490,7 @@ export default {
               item.roomShow = item.roomShow + item.unitName
             }
             if (item.villageName) {
-              item.roomShow = item.homeName + item.homeName
+              item.roomShow = item.roomShow + item.homeName
             }
           }
 
@@ -951,7 +954,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
 
     },