From 5f25aeed87578f6abcc6e4399c45d120fc280c1c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Feb 2023 15:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8,=E6=9F=A5=E7=9C=8B/=E4=BF=AE=E6=94=B9=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E5=8F=91=E8=A1=A8=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/epidemic/static/static.vue   |  84 +++++++++--
 .../epidemic/static/vaccineCountTable.vue     | 133 ++++++++++++++++++
 .../modules/shequzhili/htgl/cpts/htglInfo.vue |   2 +-
 src/views/modules/shequzhili/htgl/index.vue   |   2 +-
 4 files changed, 207 insertions(+), 14 deletions(-)
 create mode 100644 src/views/modules/base/epidemic/static/vaccineCountTable.vue

diff --git a/src/views/modules/base/epidemic/static/static.vue b/src/views/modules/base/epidemic/static/static.vue
index 89e72248f..ef1112d3e 100644
--- a/src/views/modules/base/epidemic/static/static.vue
+++ b/src/views/modules/base/epidemic/static/static.vue
@@ -46,13 +46,30 @@
 
       </div>
     </div>
-
+    <el-dialog  :visible.sync="dialogVisible"
+               width="50%"
+               @close="diaClose"
+               >
+               <vaccine-Count ref="ref_vaccineCount"
+              :seriesNum="seriesNum"
+              :tableData="tableData"
+              >
+               </vaccine-Count>
+               <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[10, 20, 60, 100]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
-
+import vaccineCount from "./vaccineCountTable.vue"
 import nextTick from "dai-js/tools/nextTick";
 import screenEchartsFrame from "@c/screen-echarts-frame";
 
@@ -64,16 +81,18 @@ import * as echarts from 'echarts';
 export default {
   name: "warning-box",
   components: {
-
+    vaccineCount,
     screenEchartsFrame,
 
   },
   data () {
     return {
       disabled: true,
-
       agencyIdArray: [],
       orgOptions: [],
+      dialogVisible:false,
+      seriesNum:{},
+      tableData:[],
       orgOptionProps: {
         multiple: false,
         value: 'agencyId',
@@ -81,7 +100,6 @@ export default {
         children: 'subAgencyList',
         checkStrictly: true
       },
-
       noEduInit: false,
 
       agencyId: '',
@@ -110,10 +128,12 @@ export default {
           color: 'rgba(255, 186, 0, 1)'
         }
       ],
-
+      pageNo:1,
+      pageSize:10,
+      total:1,
+      resiVaccineNum:"",
       pieEduChartSs: null,
       pieEduOptions: null,
-
       lineChart: "",
       lineOption: {},
       lineInitState: false,
@@ -150,6 +170,14 @@ export default {
       // this.pieInitState = true
 
     },
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.clickPieShowTable( this.resiVaccineNum)
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.clickPieShowTable( this.resiVaccineNum)
+    },
     async getPieData () {
       // const url = "/epmetuser/icresiuser/partymembereducationstatistics";
       const url = '/epmetuser/epidemicPrevention/vaccinePie'
@@ -215,13 +243,47 @@ export default {
       console.log('----------------------最大值', maxValue, maxIndex)
       let fun = params => {
         this.clickEduPie(params.dataIndex)
-
+        this.clickPieShowTable(params.dataIndex)
+        this.resiVaccineNum = params.dataIndex
       }
       this.$refs.eduChart.handleClick(fun)
+      // this.$refs.eduChart.on("click", pieConsole);
+      //   function pieConsole(param) {
+      //       //     获取data长度
+      //       alert(option.series[0].data.length);
+      //       //      获取地N个data的值
+      //       // 　　alert(option.series[0].data[i]);
+      //       //     获取series中param.dataIndex事件对应的值
+          
+
+      //       //刷新页面
+      //       // location.reload();
+      //       // window.location.reload();
+      //   }
 
-
+    },
+    diaClose () {
+      this.dialogVisible = false
+      this.pageNo = 1
+      this.resiVaccineNum = ''
     },
 
+    async clickPieShowTable(index){
+      this.dialogVisible = true
+      let url = "/epmetuser/epidemicPrevention/page"
+      let params = {
+        pageNo:this.pageNo,
+        pageSize:this.pageSize,
+        vaccineCount: index
+      }
+      let {data,code,msg} = await requestPost(url,params)
+      if(code==0){
+        this.total = data.total || 0;
+        this.tableData = data.list
+      }else{
+        this.$message.error(msg);
+      }
+    },
     clickEduPie (seriesIndex) {
       let _code = ''
       let isClick = false
@@ -269,11 +331,9 @@ export default {
       this.pieEduOptions.series[0].data = this.pieItem
       // this.$refs.pieChart.hideLoading()
       this.$refs.eduChart.setOption(this.pieEduOptions)
-
-
+     
 
     },
-
     lineInitOk () {
       this.lineInitState = true;
     },
diff --git a/src/views/modules/base/epidemic/static/vaccineCountTable.vue b/src/views/modules/base/epidemic/static/vaccineCountTable.vue
new file mode 100644
index 000000000..6053f40ce
--- /dev/null
+++ b/src/views/modules/base/epidemic/static/vaccineCountTable.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="">
+                <!-- :height="tableHeight" -->
+    <el-table class="table"
+                :data="tableData"
+                border
+                ref="ref_table"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="gridName"
+                         header-align="center"
+                         align="center"
+                         label="所属网格"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="houseName"
+                         header-align="center"
+                         align="center"
+                         label="所属房屋"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="证件号"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="birthDay"
+                         header-align="center"
+                         align="center"
+                         label="出生日期"
+                         width="140">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button 
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+           
+          </template>
+        </el-table-column>
+      </el-table>
+      <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
+                 :userId="currentPepeleId"
+                 :gridName="currentPepeleGridName"
+                 @close="showedPeopleMoreInfo = false" />
+  </div>
+  
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+export default {
+  data() {
+    return {
+      showedPeopleMoreInfo: false,
+      tableLoading: false,
+      currentPepeleId:"",
+      currentPepeleGridName:""
+    };
+  },
+  created() {
+  },
+ async mounted(){
+  //  await this.getResiList()
+  },
+  props:{
+    seriesNum:{
+      type:Object,
+      default:()=>{}
+    },
+    tableData:{
+      type:Array,
+      default:()=>[]
+    }
+  },
+  watch:{
+    // 'seriesNum':{
+    //   handler(newVal){
+    //     console.log(newVal);
+    //       this.getResiList()
+    //   },
+    //   deep:true,
+    //   inject:true
+    // }
+  },
+  methods: {
+    handleDetail(row){
+      this.showedPeopleMoreInfo= true
+      this.currentPepeleId = row.id
+      this.currentPepeleGridName = row.gridId
+      console.log(row);
+    }
+  
+  },
+  components: {peopleMore},
+  computed: {},
+  watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/htgl/cpts/htglInfo.vue b/src/views/modules/shequzhili/htgl/cpts/htglInfo.vue
index 6926df9fb..20c022908 100644
--- a/src/views/modules/shequzhili/htgl/cpts/htglInfo.vue
+++ b/src/views/modules/shequzhili/htgl/cpts/htglInfo.vue
@@ -24,7 +24,7 @@
 
       <el-row type="flex"  >
           <el-col :span="24">
-            <span  class="htgl_info_label">话题发表人:</span> {{htglDetailData.releaseUserName||'--'}}
+            <span  class="htgl_info_label">话题发表人:</span> {{htglDetailData.userName||'--'}}
         </el-col>
       </el-row>
 
diff --git a/src/views/modules/shequzhili/htgl/index.vue b/src/views/modules/shequzhili/htgl/index.vue
index 115aa5bbb..63a53cee4 100644
--- a/src/views/modules/shequzhili/htgl/index.vue
+++ b/src/views/modules/shequzhili/htgl/index.vue
@@ -118,7 +118,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="releaseUserName"
+          prop="userName"
           align="center"
           min-width="150"
           label="话题发表人"