Merge branch 'dev-fangyi0919' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fangyi0919

src/views/modules/visual/communityGovern/geliguankong/geliguankong.vue

@@ -67,6 +67,12 @@
     <detail-info v-if="showProject"
                  :detailId="detailId"
                  @close="showProject = false" />
+
+    <people-more v-show="showedMoreInfo"
+                 v-if="selUserId"
+                 :userId="selUserId"
+                 :gridName="selGridName"
+                 @close="showedMoreInfo = false" />
   </cpt-card>
 </template>
 
@@ -80,6 +86,7 @@ import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts
 import ScreenLoading from "@/views/modules/visual/components/screen-loading"
 import ScreenNodata from "@/views/modules/visual/components/screen-nodata"
 import detailInfo from "./detail-info.vue"
+import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
 
 import { pieOption } from './pieOption.js'
 import dateFormat from "dai-js/tools/dateFormat"
@@ -92,6 +99,7 @@ export default {
   data () {
     return {
       showProject: false,
+      showedMoreInfo: false,
       dataLoading: true,
       pieNoData: false,
       gridPieNoData: false,
@@ -153,6 +161,8 @@ export default {
 
       categoryCode: '',
 
+      selUserId: '',
+      selGridName: '',
       detailId: '',
       processStatus: '',
 
@@ -228,7 +238,7 @@ export default {
             value: item.total,
             name: item.categoryName,
             categoryCode: item.categoryCode,
-            color: colorArray[3],
+            color: item.color,
             selected: false
           }
           this.gridPieData.push(obj)
@@ -263,7 +273,7 @@ export default {
             item.name ? item.name : '--',
             item.allName ? item.allName : '--',
             item.reason ? item.reason : '--',
-            item.isolatedState === '0' ? '集中隔离' : item.isolatedState === '1' ? '居家隔离' : item.isolatedState === '2' ? '国家健康监测' : '',
+            item.isolatedState === '0' ? '集中隔离' : item.isolatedState === '1' ? '居家隔离' : item.isolatedState === '2' ? '国家健康监测' : '--',
             item.lastNatTime ? item.lastNatTime : '--',
             { type: "operate", list: ["查看"] },
           ]
@@ -281,7 +291,10 @@ export default {
 
     async toPeopleInfo (index) {
       if (this.tableList[index].userId) {
-        this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${this.tableList[index].userId}` })
+        this.selUserId = this.tableList[index].userId
+        this.selGridName = this.tableList[index].gridName
+        this.showedMoreInfo = true
+        // this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${this.tableList[index].userId}` })
       } else {
         this.$message.info('无居民信息')
       }
@@ -507,7 +520,8 @@ export default {
 
     ScreenLoading,
     ScreenNodata,
-    detailInfo
+    detailInfo,
+    peopleMore
   },
 
   watch: {