提交

src/api/system/coming.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 
 export function listInfo(query) {
   return request({
-    url: '/boman-web-core/core/account/toQianshan',
+    url: '/boman-web-core/core/toQianshan/toQianshan',
     method: 'get',
     params: query
   })

src/api/system/residentss.js

@@ -65,6 +65,17 @@ export function listInfotjjsfaml(query) {
   })
 }
 
+// 一键未认领
+export function listInfotjjsfamlwrl(query) {
+  return request({
+    url: '/boman-web-core/core/czrk/setNoRl',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 
 // 一键确认
 export function listInfotjjssbule(query) {

src/api/system/user.js

@@ -19,6 +19,16 @@ export function listRoleergth(data) {
 }
 
 
+export function rensh(query) {
+  return request({
+    url: '/system/online/onlineNum',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 
 
 

src/layout/components/Navbar.vue

@@ -43,15 +43,19 @@
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
-		  <!-- <router-link to="/system/ucleic/index">
-		    <el-dropdown-item>在线人数:<span style="color: #00a8ec;">2568</span></el-dropdown-item>
-		  </router-link> -->
           <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item>
+          <el-dropdown-item >系统人数:<span style="color: #00a8ec;">{{users.allCount}}</span>
+            </el-dropdown-item>
+
+
+            <el-dropdown-item @click.native="nhyel" >在线人数:<span style="color: #00a8ec;">{{users.onlineNum}}</span></el-dropdown-item>
+
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
+
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -69,12 +73,14 @@ import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 import Item from '@/layout/components/Sidebar/Item'
+import { rensh } from "@/api/system/user";
 export default {
 	data() {
 	  return {
 	    indexs: 1,
 	    newArr: [],
-      showde:true
+      showde:true,
+      users:{}
 	  }
 	},
   components: {
@@ -89,6 +95,7 @@ export default {
   },
   mounted() {
 	   this.init()
+     this.getUserre()
   },
   computed: {
     ...mapGetters([
@@ -114,6 +121,18 @@ export default {
     }
   },
   methods: {
+    nhyel(){
+
+      // console.log(235)name:'Profiles', params: {id:1}
+      if(this.users.roles[0] == 'region'){
+        this.$router.push({name:'Profiles'})
+      }else if(this.users.roles[0] == 'admin') {
+        this.$router.push({name:'Profiles'})
+      }else{
+         return false
+      }
+
+    },
     toggleSideBar(index) {
       this.$store.dispatch('app/toggleSideBar')
        // console.log( this.$store.dispatch('app/toggleSideBar'))
@@ -125,7 +144,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';   
+          location.href = '/index';
         })
       })
     },
@@ -155,12 +174,18 @@ export default {
 	    path
 	  } = route;
 	  // if set path, the sidebar will highlight the path you set
-	  console.log(route)
+	  console.log(route,13)
 	  if (meta.activeMenu) {
 	    this.$store.dispatch('TabFn', meta.activeMenu)
 	  }
 	  this.$store.dispatch('TabFn', path)
-	}
+	},
+  getUserre() {
+    rensh().then(response => {
+      this.users = response.data;
+      console.log(this.users.roles[0] == 'admin')
+    });
+  }
   }
 }
 </script>
@@ -170,7 +195,7 @@ export default {
   height: 50px;
   overflow: hidden;
   position: relative;
-  background-color: #1890ff ; 
+  background-color: #1890ff ;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .SignNumArr{

src/layout/components/Sidebar/Logo.vue

@@ -36,7 +36,7 @@ export default {
   },
   data() {
     return {
-      title: '潜山市数据平台',
+      title: '潜山市人口信息平台',
       logo: logoImg
     }
   }

src/router/index.js

@@ -131,7 +131,14 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
         name: 'Profile',
         meta: { title: '个人中心', icon: 'user' }
-      }  
+      },
+       {
+         path: 'profiles',
+         component: (resolve) => require(['@/views/system/user/profiles/index'], resolve),
+         name: 'Profiles',
+         meta: { title: '在线人数', icon: 'user' }
+       }
+
     ]
   },
   {

src/settings.js

@@ -1,9 +1,8 @@
 module.exports = {
-  title: '潜山市防疫数据平台',
+  title: '潜山市人口信息平台',
   // urls: `http://192.168.101.110:8090`,
   // urls: `http://192.168.101.11:8090`,
-  urls: `http://192.168.101.168:8090`,
-   // urls: `https://qsfy.qs163.cn`,
+   urls: `https://qsfy.qs163.cn`,
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/index.vue

@@ -85,7 +85,6 @@
         <el-table-column prop="cun" label="村"  align="center" width="180"/>
         <el-table-column prop="zu" label="组"  align="center"/>
         <el-table-column prop="czzrs" label="常住人口"  align="center"/>
-
         <el-table-column prop="hjzrs" label="户籍人口"  align="center"/>
 
 

src/views/login.vue

@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <img src="../assets/images/icon_dl_ewm@2x.png" v-if="stageType==1" @click="dhiwyrei" alt="" class="icon_rw">
       <img src="../assets/images/icon_dl_madl@2x.png" v-if="stageType==2" alt="" @click="bkue" class="icon_mim">
-      <h3 class="title"> 潜山市数据平台</h3>
+      <h3 class="title"> 潜山市人口信息平台</h3>
       <!-- <div v-if="statusFlag==2">
         <div class="erw_img">
           <img src="" alt="" class="imgs">

src/views/system/coming/index.vue

@@ -7,14 +7,14 @@
         	<el-row>
         		<el-col :span="14" class="jehak">
               <el-col :span="12">
-              	<el-form-item label="身份证号" prop="sfzhm">
-              		<el-input v-model="queryParams.sfzhm" placeholder="请输入身份证号码" style="width:220px;" clearable @keyup.enter.native="handleQuery" />
+              	<el-form-item label="身份证号" prop="hiIcd">
+              		<el-input v-model="queryParams.hiIcd" placeholder="请输入身份证号码" style="width:220px;" clearable @keyup.enter.native="handleQuery" />
               	</el-form-item>
               </el-col>
 
                <el-col :span="12">
-                 <el-form-item label="姓名" prop="name">
-                 	<el-input v-model="queryParams.name" placeholder="请输入姓名" style="width:220px;" clearable @keyup.enter.native="handleQuery" />
+                 <el-form-item label="姓名" prop="hiName">
+                 	<el-input v-model="queryParams.hiName" placeholder="请输入姓名" style="width:220px;" clearable @keyup.enter.native="handleQuery" />
                  </el-form-item>
 
                </el-col>
@@ -44,10 +44,10 @@
 					<el-row>
 
             <el-col :span="7">
-            	<el-form-item label="开始时间" prop="djsjqs">
+            	<el-form-item label="开始时间" prop="startTime">
             		<el-date-picker
             			clearable
-            			v-model="queryParams.djsjqs"
+            			v-model="queryParams.startTime"
             			type="datetime"
             			value-format="yyyy-MM-dd HH:mm:ss"
             			format="yyyy-MM-dd HH:mm:ss"
@@ -57,10 +57,10 @@
             	</el-form-item>
             </el-col>
             <el-col :span="7">
-            	<el-form-item label="结束时间" prop="djsjjs">
+            	<el-form-item label="结束时间" prop="endTime">
             	<el-date-picker
             		clearable
-            		v-model="queryParams.djsjjs"
+            		v-model="queryParams.endTime"
             		type="datetime"
             		value-format="yyyy-MM-dd HH:mm:ss"
             		format="yyyy-MM-dd HH:mm:ss"
@@ -120,34 +120,35 @@
 
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
+   <div class="nho">
+     <el-table  v-if="nbdgywkajs == true"   v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
+     	<el-table-column label="姓名" align="center" fixed prop="hi_name"   width="110"/>
+       <el-table-column label="性别" align="center" prop="sex"   width="80"/>
+     	<el-table-column label="联系方式" align="center" prop="hi_phone" width="110" />
+     	<el-table-column label="身份证号码" align="center" prop="SFZ_ID" width="180" />
+       <el-table-column label="风险等级" align="center" prop="risk_lv" width="102">
+         <template slot-scope="scope">
+                  <div :class="[scope.row.risk_lv == '低风险' ? 'njs' : scope.row.risk_lv == '中风险' ? 'nmk' : 'nmj']" >   {{scope.row.risk_lv == null? '暂无数据' : scope.row.risk_lv }}            </div>
+         </template>
+       </el-table-column>
+       <el-table-column label="登记时间" align="center" prop="hi_date" width="102" />
+       <el-table-column label="目的地" align="center" prop="address" width="102" />
+       <el-table-column label="目的地—-区县" align="center" prop="hi_destination_area" width="120" />
+       <el-table-column label="目的地—街道" align="center" prop="hi_destination_street" width="102" />
+       <el-table-column label="目的地—居委会" align="center" prop="hi_destination_rc" width="120" />
+        <el-table-column label="详细地址" align="center" prop="hi_adress" width="140" />
+       <el-table-column label="来源地 省份" align="center" prop="SHENG" width="102" />
+        <el-table-column label="来源地 城市" align="center" prop="SHI" width="102" />
+         <el-table-column label="来源地 区县" align="center" prop="QU" width="102" />
+          <el-table-column label="来源地-风险等级" align="center" prop="FXDJ_LY" width="120" >
+            <template slot-scope="scope">
+                     <div :class="[scope.row.FXDJ_LY == '低风险地区来宜' ? 'njs' : scope.row.FXDJ_LY == '中风险地区来宜' ? 'nmk' : 'nmj']" >   {{scope.row.FXDJ_LY == null? '暂无数据' : scope.row.FXDJ_LY }}            </div>
+            </template>
+            </el-table-column>
+     </el-table>
+     <pagination  v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+   </div>
 
-		<el-table  v-if="nbdgywkajs == true"   v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
-			<el-table-column label="姓名" align="center" fixed prop="hi_name"   width="110"/>
-      <el-table-column label="性别" align="center" prop="sex"   width="80"/>
-			<el-table-column label="联系方式" align="center" prop="hi_phone" width="110" />
-			<el-table-column label="身份证号码" align="center" prop="SFZ_ID" width="180" />
-      <el-table-column label="风险等级" align="center" prop="risk_lv" width="102">
-        <template slot-scope="scope">
-                 <div :class="[scope.row.risk_lv == '低风险' ? 'njs' : scope.row.risk_lv == '中风险' ? 'nmk' : 'nmj']" >   {{scope.row.risk_lv == null? '暂无数据' : scope.row.risk_lv }}            </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="登记时间" align="center" prop="hi_date" width="102" />
-      <el-table-column label="目的地" align="center" prop="address" width="102" />
-      <el-table-column label="目的地—-区县" align="center" prop="hi_destination_area" width="120" />
-      <el-table-column label="目的地—街道" align="center" prop="hi_destination_street" width="102" />
-      <el-table-column label="目的地—居委会" align="center" prop="hi_destination_rc" width="120" />
-       <el-table-column label="详细地址" align="center" prop="hi_adress" width="140" />
-      <el-table-column label="来源地 省份" align="center" prop="SHENG" width="102" />
-       <el-table-column label="来源地 城市" align="center" prop="SHI" width="102" />
-        <el-table-column label="来源地 区县" align="center" prop="QU" width="102" />
-         <el-table-column label="来源地-风险等级" align="center" prop="FXDJ_LY" width="120" >
-           <template slot-scope="scope">
-                    <div :class="[scope.row.FXDJ_LY == '低风险地区来宜' ? 'njs' : scope.row.FXDJ_LY == '中风险地区来宜' ? 'nmk' : 'nmj']" >   {{scope.row.FXDJ_LY == null? '暂无数据' : scope.row.FXDJ_LY }}            </div>
-           </template>
-           </el-table-column>
-
-
-		</el-table>
 
 
 <!-- v-loading="loading" -->
@@ -478,11 +479,13 @@ export default {
 			process: process.env.VUE_APP_BASE_API,
 			// 查询参数
 			queryParams: {
-				name:null,
-        rc:null,
-        djsjqs:null,
-        djsjjs:null,
-        sfzhm:null
+				hiName:null,
+        hiDestinationRc:null,
+        startTime:null,
+        endTime:null,
+        hiIcd:null,
+        pageSize:10,
+        pageNum:1
 			},
 			config: [],
       nhyeswdga:{nhus:[]},
@@ -707,8 +710,8 @@ export default {
 		};
 	},
 	created() {
-    this.queryParams.djsjjs = this.ShowDate('-1')
-    this.queryParams.djsjqs = this.ShowDate('0')
+    this.queryParams.endTime = this.ShowDate('0')
+    this.queryParams.startTime = this.ShowDate('1')
 		this.getList();
 		// this.getTreeselectjue();
     this.mnyesfjer(0)
@@ -1156,7 +1159,7 @@ export default {
       console.log(this.queryParams)
 			listInfo(this.queryParams).then(response => {
        console.log(this.queryParams,29)
-				this.infoList = response.data;
+				this.infoList = response.rows;
         this.nbdgywkajs = true
 				this.total = response.total;
 				this.loading = false;
@@ -1435,7 +1438,7 @@ export default {
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
-			// this.queryParams.pageNum = 1;
+			this.queryParams.pageNum = 1;
 			console.log(this.queryParams)
 			this.getList();
 		},
@@ -1446,9 +1449,11 @@ export default {
 			setTimeout( ()=>{
 				this.nhue = true
 			},100)
-			this.queryParams.name = undefined;
			this.queryParams.rc = undefined;
			this.queryParams.djsjqs = undefined;
-      this.queryParams.djsjjs = undefined
-      this.queryParams.sfzhm = undefined
+			this.queryParams.hiName = undefined;
			this.queryParams.hiDestinationRc = undefined;
			this.queryParams.endTime = this.ShowDate('0')
+			this.queryParams.startTime = this.ShowDate('1')
+      this.queryParams.hiIcd = undefined
+      this.queryParams.pageSize = 10
+      this.queryParams.pageNum = 1
       this.listd = []
       this.lser = []
 			this.resetForm('queryForm');
@@ -1935,17 +1940,18 @@ if(this.typeOptionsname.length == 0){
       let nhdye = []
       nhdye = this.$refs['cdd'].getCheckedNodes()[0].pathLabels
       console.log(nhdye,36)
-      if(data.length == 1){
-        this.queryParams.rc = nhdye[ nhdye.length - 1];
-      }else if(data.length == 2){
-        this.queryParams.rc = nhdye[0] + ',' + nhdye[ nhdye.length - 1];
-      }else if(data.length == 3){
-         this.queryParams.rc = nhdye[0] + ',' + nhdye[1] + ',' +nhdye[ nhdye.length - 1];
-      }else if(data.length == 4){
-        this.queryParams.rc = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
-      }else if(data.length == 5){
-        this.queryParams.rc = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
-      }
+      this.queryParams.hiDestinationRc = nhdye[ nhdye.length - 1]
+      // if(data.length == 1){
+      //   this.queryParams.rc = nhdye[ nhdye.length - 1];
+      // }else if(data.length == 2){
+      //   this.queryParams.rc = nhdye[0] + ',' + nhdye[ nhdye.length - 1];
+      // }else if(data.length == 3){
+      //    this.queryParams.rc = nhdye[0] + ',' + nhdye[1] + ',' +nhdye[ nhdye.length - 1];
+      // }else if(data.length == 4){
+      //   this.queryParams.rc = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
+      // }else if(data.length == 5){
+      //   this.queryParams.rc = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
+      // }
     },
     chahetwoswge(data){
       console.log(data)
@@ -2753,6 +2759,13 @@ let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|
 };
 </script>
 <style lang="scss">
+  .nho{
+    ::-webkit-scrollbar{
+      width: 10px !important;
+      height: 10px !important;
+    }
+  }
+
   .nhkhv{
     display: flex;
     align-items: center;

src/views/system/residentss/index.vue

@@ -26,11 +26,12 @@
                 <!-- optionPropsssd  optionPropsss-->
         			</el-form-item>
         		</el-col>
+
             <el-col :span="12" class="jehak">
             	<el-form-item label="户籍地址" prop="villagerGroup">
                 <el-cascader
                 	placeholder="点击选择户籍地址"
-                	:options="optionsList"
+                	:options="optionsListkl"
                 	:filterable="true"
                 	separator="/"
                 	@change="chahetwo"
@@ -38,7 +39,7 @@
                 	style="width: 134%;"
                 	ref="myCascaderqty"
                   v-model="lser"
-                  @active-item-change="handleItemChangefr"
+                  @active-item-change="handleItemChangefrkl"
                   @keyup.enter.native="handleQuery"
                 ></el-cascader>
             	</el-form-item>
@@ -119,29 +120,21 @@
       	  plain
       	  icon="el-icon-download"
       	  size="mini"
-      	  @click="handleExport"
-      	  v-hasPermi="['system:czrk:export']"
+      	  @click="handleExporttk"
       	>导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <!-- :disabled="queryParams.queryType == 'cz'" -->
       	<el-button
-      	  type="warning"
+      	  type="primary"
       	  plain
-      	  icon="el-icon-download"
+      	  icon="el-icon-wallet"
       	  size="mini"
-      	  @click="handleExportte"
-      	  v-hasPermi="['system:czrk:exportQianShan']"
-      	>导出只填写到潜山市数据</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExportte"
-          v-hasPermi="['system:czrk:exportQianShan']"
-        >导出只填写到镇数据</el-button>
+      	  @click="weirl"
+      	  v-hasPermi="['system:czrk:setNoRl']"
+      	>一键未认领</el-button>
       </el-col>
+
       <el-col :span="1.5">
       	<el-button type="primary" :plain="nhykis" icon="el-icon-view" size="mini"  @click="chajnd" >查看常住人口信息</el-button>
       </el-col>
@@ -154,68 +147,72 @@
 
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
+     <div class="bghks">
+       <el-table  v-if="nbdgywkajs == true"   v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
+       	<el-table-column type="selection" width="55" align="left" />
+       	<el-table-column label="姓名" align="center" prop="userName"   width="110"/>
+       	<el-table-column label="联系方式" align="center" prop="phoneNum" width="110" />
+       	<el-table-column label="身份证号码" align="center" prop="idCard" width="180" />
+       	<el-table-column v-if="queryParams.queryType == 'hj'" label="户籍地址" width="360" align="center"  >
+           <!-- prop="domicileSelect" -->
+           <!-- style="text-align: left;" -->
+
+           <template slot-scope="scope">
+                    <div v-if="scope.row.nowIn !==null"  v-html="scope.row.domicileSelect  + '<br>' + scope.row.nowIn">
+                    </div>
+                    <div v-else  v-html="scope.row.domicileSelect  + '<br>' + ''">
+                    </div>
+           </template>
+           </el-table-column>
+
+         <!-- <el-table-column v-if="queryParams.queryType == 'hj'" label="户籍地详细地址" width="280" align="center" prop="nowin"  /> -->
+         <!-- nowInSelect -->
+       	<el-table-column v-if="queryParams.queryType == 'cz'" label="居住地址" align="center" width="360" >
+           <template slot-scope="scope">
+                    <div v-if="scope.row.nowIn !==null"  v-html="scope.row.nowInSelect + '<br>' + scope.row.nowIn">               </div>
+                    <div v-else   v-html="scope.row.nowInSelect + '<br>' + ''">               </div>
+           </template>
+           </el-table-column>
+
+         <!-- <el-table-column v-if="queryParams.queryType == 'cz'" label="居住地地详细地址" align="center" width="280"  prop="nowin"/> -->
+
+         <el-table-column label="是否户主" align="center" prop="houseType" width="90" />
+
+
+         <el-table-column label="认领人" align="center"  width="110" >
+           <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" :content="scope.row.rlrNike" placement="top-start">
+                    <!-- rlr -->
+                    <span >{{ scope.row.rlr == null? scope.row.rlrNike : scope.row.rlr}}</span>
+                  </el-tooltip>
+           </template>
+         </el-table-column>
+         <el-table-column label="最后一次确认人" align="center"  width="120" >
+            <template slot-scope="scope">
+                   <el-tooltip class="item" effect="dark" :content="scope.row.confirmInfoNikeUser" placement="top-start">
+                     <span>{{ scope.row.confirmInfoUser == null? scope.row.confirmInfoNikeUser :  scope.row.confirmInfoUser}}</span>
+                   </el-tooltip>
+            </template>
+         </el-table-column>
+         <el-table-column label="确认时间" align="center" prop="confirmInfoUserTime" width="102" />
+         <!-- <el-table-column label="是否核酸" align="center" prop="isNucleicAcid" width="90" :formatter="homeNameFormats"/>
+         <el-table-column label="核酸时间" align="center" prop="nucleicAcidTime" width="102" /> -->
+         <el-table-column label="来宜号码" align="center" prop="toAppropriatePhone" width="110" />
+       	<el-table-column label="操作" align="left" class-name="small-padding fixed-width" fixed="right"  :width="queryParams.queryType == 'hj' ? '120' : '120'">
+       		<template slot-scope="scope">
+       			<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" >查看修改</el-button>
+             <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="ncoming(scope.row)" v-if="queryParams.queryType !== 'hj'">核酸信息</el-button> -->
+       			<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDelete(scope.row)" class="hueya" v-if="queryParams.queryType == 'hj'" >变更</el-button>
+             <el-button size="mini" type="text" icon="el-icon-edit" @click="chajndsls(scope.row)" class="hueya"  v-if="queryParams.queryType == 'hj'">变更历史</el-button>
+             <el-button v-if="scope.row.houseType == '是'"  size="mini" type="text" icon="el-icon-edit" @click="handleDeletefamide(scope.row)" class="hueya" >查看家庭成员</el-button>
+             <el-button v-if="scope.row.houseType == '是'" size="mini" type="text" icon="el-icon-plus"   @click="handleAdd(scope.row)" class="hueya" >添加家庭成员</el-button>
+       		</template>
+       	</el-table-column>
+       </el-table>
+       <p class="pj">{{user.phonenumber}}</p>
+       <p class="pjs">{{user.phonenumber}}</p>
+     </div>
 
-		<el-table  v-if="nbdgywkajs == true"   v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
-			<el-table-column type="selection" width="55" align="left" />
-			<el-table-column label="姓名" align="center" prop="userName"   width="110"/>
-			<el-table-column label="联系方式" align="center" prop="phoneNum" width="110" />
-			<el-table-column label="身份证号码" align="center" prop="idCard" width="180" />
-			<el-table-column v-if="queryParams.queryType == 'hj'" label="户籍地址" width="360" align="center"  >
-        <!-- prop="domicileSelect" -->
-        <!-- style="text-align: left;" -->
-
-        <template slot-scope="scope">
-                 <div v-if="scope.row.nowIn !==null"  v-html="scope.row.domicileSelect  + '<br>' + scope.row.nowIn">
-                 </div>
-                 <div v-else  v-html="scope.row.domicileSelect  + '<br>' + ''">
-                 </div>
-        </template>
-        </el-table-column>
-
-      <!-- <el-table-column v-if="queryParams.queryType == 'hj'" label="户籍地详细地址" width="280" align="center" prop="nowin"  /> -->
-      <!-- nowInSelect -->
-			<el-table-column v-if="queryParams.queryType == 'cz'" label="居住地址" align="center" width="360" >
-        <template slot-scope="scope">
-                 <div v-if="scope.row.nowIn !==null"  v-html="scope.row.nowInSelect + '<br>' + scope.row.nowIn">               </div>
-                 <div v-else   v-html="scope.row.nowInSelect + '<br>' + ''">               </div>
-        </template>
-        </el-table-column>
-
-      <!-- <el-table-column v-if="queryParams.queryType == 'cz'" label="居住地地详细地址" align="center" width="280"  prop="nowin"/> -->
-
-      <el-table-column label="是否户主" align="center" prop="houseType" width="90" />
-
-
-      <el-table-column label="认领人" align="center"  width="110" >
-        <template slot-scope="scope">
-               <el-tooltip class="item" effect="dark" :content="scope.row.rlrNike" placement="top-start">
-                 <!-- rlr -->
-                 <span >{{ scope.row.rlr == null? scope.row.rlrNike : scope.row.rlr}}</span>
-               </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column label="最后一次确认人" align="center"  width="120" >
-         <template slot-scope="scope">
-                <el-tooltip class="item" effect="dark" :content="scope.row.confirmInfoNikeUser" placement="top-start">
-                  <span>{{ scope.row.confirmInfoUser == null? scope.row.confirmInfoNikeUser :  scope.row.confirmInfoUser}}</span>
-                </el-tooltip>
-         </template>
-      </el-table-column>
-      <el-table-column label="确认时间" align="center" prop="confirmInfoUserTime" width="102" />
-      <!-- <el-table-column label="是否核酸" align="center" prop="isNucleicAcid" width="90" :formatter="homeNameFormats"/>
-      <el-table-column label="核酸时间" align="center" prop="nucleicAcidTime" width="102" /> -->
-      <el-table-column label="来宜号码" align="center" prop="toAppropriatePhone" width="110" />
-			<el-table-column label="操作" align="left" class-name="small-padding fixed-width" fixed="right"  :width="queryParams.queryType == 'hj' ? '120' : '120'">
-				<template slot-scope="scope">
-					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" >查看修改</el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="ncoming(scope.row)" v-if="queryParams.queryType !== 'hj'">核酸信息</el-button> -->
-					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDelete(scope.row)" class="hueya" v-if="queryParams.queryType == 'hj'" >变更</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="chajndsls(scope.row)" class="hueya"  v-if="queryParams.queryType == 'hj'">变更历史</el-button>
-          <el-button v-if="scope.row.houseType == '是'" size="mini" type="text" icon="el-icon-edit" @click="handleDeletefamide(scope.row)" class="hueya" >查看家庭成员</el-button>
-          <el-button v-if="scope.row.houseType == '是'" size="mini" type="text" icon="el-icon-plus"   @click="handleAdd(scope.row)" class="hueya" >添加家庭成员</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
 
 		<pagination v-if="queryParams.queryType == 'hj'" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
     <pagination v-if="queryParams.queryType == 'cz'" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getListjuzhu" />
@@ -580,17 +577,67 @@
     	</el-table>
     </el-dialog>
 
+    <el-dialog
+      title="点击选择导出数据"
+      :visible.sync="dch"
+      width="40%"
+      style="padding-bottom: 20px;"
+      >
+      <el-row :gutter="20" style="margin-bottom: 20px;">
+        <el-col :span='1.5'>
+           <el-button
+           	  type="warning"
+           	  plain
+           	  icon="el-icon-download"
+           	  size="mini"
+           	  @click="handleExport"
+           	  v-hasPermi="['system:czrk:export']"
+           	>导出</el-button>
+        </el-col>
+        <el-col :span='1.5'>
+           <el-button
+             type="warning"
+             plain
+             icon="el-icon-download"
+             size="mini"
+             @click="handleExportte"
+             v-hasPermi="['system:czrk:exportQianShan']"
+           >导出只填写到潜山市数据</el-button>
+        </el-col>
+        <el-col :span='1.5'>
+           <el-button
+             type="warning"
+             plain
+             icon="el-icon-download"
+             size="mini"
+             @click="handleExportte"
+             v-hasPermi="['system:czrk:exportTownHj']"
+           >导出只填写到镇数据</el-button>
+        </el-col>
+      </el-row>
+      <div style="height: 20px;">
+
+      </div>
+
+     <!-- </el-col>
+     <el-col :span="1.5"> -->
+       <!-- :disabled="queryParams.queryType == 'cz'" -->
+
+
+    </el-dialog>
+
 
 
 	</div>
 </template>
 
 <script>
-import { listInfo, listInfos, listInfosls, getInfo, delInfo, addInfo, updateInfo, exportInfo, listRoleer, idces, delInfort,yiaoe,exportConfig,exportConfigtyr,importLog,listInfotj,listRoleergth,listInfotjxz,listInfotjjs,listInfotjjsfaml,listRoleergthwg,listInfotjjssbule,listInfotjjssquer,treeselectdeptst } from '@/api/system/residentss';
+import { listInfo, listInfos, listInfosls, getInfo, delInfo, addInfo, updateInfo, exportInfo, listRoleer, idces, delInfort,yiaoe,exportConfig,exportConfigtyr,importLog,listInfotj,listRoleergth,listInfotjxz,listInfotjjs,listInfotjjsfaml,listRoleergthwg,listInfotjjssbule,listInfotjjssquer,treeselectdeptst,listInfotjjsfamlwrl } from '@/api/system/residentss';
 // import { treeselect } from '@/api/system/dept';
 import { treeselect } from "@/api/system/dept";
 import Treeselect from '@riophae/vue-treeselect';
-import { getToken } from '@/utils/auth';
+import { getToken } from '@/utils/auth';
+import { getUserProfile } from "@/api/system/user";
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -599,7 +646,8 @@ export default {
 	data() {
 		return {
 			// 遮罩层
-			loading: true,
+			loading: true,
+      dch:false,
 			// 选中数组
 			ids: [],
 			// 非单个禁用
@@ -772,7 +820,8 @@ export default {
 			deptOptionstwo: [],
 			options: [],
       optionss:[],
-      optionsList: [],
+      optionsList: [],
+      optionsListkl:[],
 			optionProps: {
 				value: 'areaId',
 				label: 'name',
@@ -897,14 +946,16 @@ export default {
       nhyesaw:1,
       nhyesfx:false,
       bgls:[],
-      comind:false
+      comind:false,
+      nmkl:false,
+      user:{}
 		};
 	},
 	created() {
 		this.getList();
 		// this.getTreeselectjue();
     this.mnyesfjer(0)
-    // this.mnyesfjers(0)
+    this.mnyesfjerkl("340800000000")
     this.mnyesfjerop(0)
     this.mnyesfjeropwg(0)
     this.getTreeselectjuetj()
@@ -918,7 +969,10 @@ export default {
      this.getDicts('person_type').then(response => {
      	this.typeOptions = response.data;
      });
-   // }
+   // }
+   getUserProfile().then(response => {
+     this.user = response.data;
+   });
 
 		// this.form.province = this.selected[0];
 		// this.form.city = this.selected[1];
@@ -1098,12 +1152,24 @@ export default {
         }
          console.log(this.nameutaiL,87)
       	this.form.czrkJzdzList[this.nameutaiL].optiodne = this.handleData(response.data);
-        // this.optionsLists = this.handleData(response.data);
         this.optionsList = this.handleData(response.data);
-        // this.optionsListwg = this.handleDatawg(response.data);
-        // this.form.czrkJzdzList[0].optiodne
       	this.loading = false;
-        console.log(this.cascaderKey,8765)
+      });
+    },
+    mnyesfjerkl(index,val){
+      this.loading = true;
+      let pids = {}
+      pids.pid = index
+      listRoleergth(pids).then(response => {
+        // this.cascaderKey = this.cascaderKey + 1
+        if(response.data.length == 0){
+          return
+        }
+        if(val !== undefined){
+          this.nameutaiL = val
+        }
+        this.optionsListkl =  this.handleData(response.data);
+      	this.loading = false;
       });
     },
     mnyesfjerty(index,val){
@@ -1218,6 +1284,15 @@ export default {
              let level = val.length + 1;  //需请求第几级地址
              this.optionsList = this.handleData(this.optionsList, code, level);
           	},
+            handleItemChangefrkl(val) {
+              console.log(val,235)
+               let code = val ? val[val.length - 1] : '';  //需请求数据的上级地址的code值
+               let level = val.length + 1;  //需请求第几级地址
+               this.optionsListkl = this.handleData(this.optionsListkl, code, level);
+            	},
+
+
+
 
           handleItemChanges(val) {
             console.log(val,235)
@@ -2241,35 +2316,50 @@ export default {
 		chahetwo(data) {
 			console.log(data)
       if(data.length == 1){
-        this.queryParams.provinceId = data[ data.length - 1];
-        this.queryParams.villageId = undefined
-        this.queryParams.cityId = undefined
-        this.queryParams.regionId = undefined
-        this.queryParams.villageTownsId = undefined
-      }else if(data.length == 2){
-        this.queryParams.provinceId = undefined
-        this.queryParams.regionId = undefined
-        this.queryParams.villageTownsId = undefined
-        this.queryParams.villageId = undefined
-        this.queryParams.cityId = data[ data.length - 1];
-      }else if(data.length == 3){
+        // this.queryParams.provinceId = data[ data.length - 1];
+        // this.queryParams.villageId = undefined
+        // this.queryParams.cityId = undefined
+        // this.queryParams.regionId = undefined
+        // this.queryParams.villageTownsId = undefined
         this.queryParams.cityId = undefined
         this.queryParams.provinceId = undefined
         this.queryParams.villageTownsId = undefined
         this.queryParams.villageId = undefined
         this.queryParams.regionId = data[ data.length - 1];
-      }else if(data.length == 4){
+      }else if(data.length == 2){
+        // this.queryParams.provinceId = undefined
+        // this.queryParams.regionId = undefined
+        // this.queryParams.villageTownsId = undefined
+        // this.queryParams.villageId = undefined
+        // this.queryParams.cityId = data[ data.length - 1];
         this.queryParams.provinceId = undefined
         this.queryParams.cityId = undefined
         this.queryParams.regionId = undefined
         this.queryParams.villageId = undefined
         this.queryParams.villageTownsId = data[ data.length - 1];
-      }else if(data.length == 5){
+      }else if(data.length == 3){
+        // this.queryParams.cityId = undefined
+        // this.queryParams.provinceId = undefined
+        // this.queryParams.villageTownsId = undefined
+        // this.queryParams.villageId = undefined
+        // this.queryParams.regionId = data[ data.length - 1];
         this.queryParams.provinceId = undefined
         this.queryParams.cityId = undefined
         this.queryParams.regionId = undefined
         this.queryParams.villageTownsId = undefined
         this.queryParams.villageId = data[ data.length - 1];
+      }else if(data.length == 4){
+        // this.queryParams.provinceId = undefined
+        // this.queryParams.cityId = undefined
+        // this.queryParams.regionId = undefined
+        // this.queryParams.villageId = undefined
+        // this.queryParams.villageTownsId = data[ data.length - 1];
+      }else if(data.length == 5){
+        // this.queryParams.provinceId = undefined
+        // this.queryParams.cityId = undefined
+        // this.queryParams.regionId = undefined
+        // this.queryParams.villageTownsId = undefined
+        // this.queryParams.villageId = data[ data.length - 1];
       }
 		},
     // 居住地址搜索条件
@@ -2716,11 +2806,21 @@ export default {
         	// 			}
         	// 		});
 
-
-
-
 		},
     handleExportte(){
+     var heuia = {
+                     tableName: "vaccine_info",
+                     empty: false,
+                     condition: {}
+                 }
+                 var that=this;
+          heuia.condition = this.queryParams
+     			const queryParams = this.queryParams
+           queryParams.pageNum = undefined
+           queryParams.pageSize= undefined
+             this.download('boman-web-core/core/czrk/exportTownHj',{...queryParams},  `只填写到镇数据表格.xlsx`)
+    },
+    handleExporttezh(){
       let nh = {}
      if(this.queryParams.queryType == 'cz'){
 
@@ -2730,15 +2830,9 @@ export default {
              this.download('boman-web-core/core/czrk/exportQianShanHj',{...nh},  `只填写到潜山市数据表格.xlsx`)
      }
     },
-    handleExporttezh(){
-      let nh = {}
-     if(this.queryParams.queryType == 'cz'){
-    
-             this.download('boman-web-core/core/jzdz/exportQianShanCz', {...nh}, `只填写到潜山市数据表格.xlsx`)
-     }else if(this.queryParams.queryType == 'hj'){
-    
-             this.download('boman-web-core/core/czrk/exportQianShanHj',{...nh},  `只填写到潜山市数据表格.xlsx`)
-     }
+    // 导出弹框
+    handleExporttk(){
+     this.dch = true
     },
     dachu(queryParams){
       this.download('boman-web-core/core/czrk/export', `数据表格.xlsx`)
@@ -3106,12 +3200,56 @@ let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|
       //核酸信息
       ncoming(row){
         this.comind = true
+      },
+      // 一键未认领
+      weirl(){
+
+        var that = this
+        this.$confirm('是否确认操作一键未认领?', '警告', {
+        	confirmButtonText: '确定',
+        	cancelButtonText: '取消',
+        	type: 'warning'
+        })
+        	.then(function() {
+        		listInfotjjsfamlwrl().then(response => {
+        		    				that.msgSuccess('操作成功');
+
+        		  })
+        	})
+        	.then(() => {
+        		// this.getList();
+        		// this.msgSuccess('删除成功');
+        	});
+
+
       }
   // }
 	}
 };
 </script>
 <style lang="scss">
+  .bghks{
+    position: relative;
+    .pj{
+      position: absolute;
+      top: 100px;
+      left: 380px;
+      font-size: 30px;
+      color: #dfe0e2;
+      transform: rotate(-20deg);
+      opacity: 0.6;
+      // z-index: -1;
+    }
+    .pjs{
+      position: absolute;
+      top: 240px;
+      left: 380px;
+      font-size: 30px;
+      color: #dfe0e2;
+      transform: rotate(-20deg);
+      opacity: 0.6;
+    }
+  }
   .placf {
     .el-input {
       .el-input__inner::placeholder{

src/views/system/ucleic/index.vue

@@ -5,29 +5,38 @@
 			<el-row>
         <el-col :span="24">
         	<el-row>
-        		<el-col :span="16" class="jehak">
+        		<el-col :span="14" class="jehak">
               <el-col :span="12">
               	<el-form-item label="身份证号" prop="zjhm">
-              		<el-input v-model="queryParams.zjhm" placeholder="请输入身份证号码" style="width:240px;" clearable @keyup.enter.native="handleQuery" />
+              		<el-input v-model="queryParams.zjhm" placeholder="请输入身份证号码" style="width:200px;" clearable @keyup.enter.native="handleQuery" />
               	</el-form-item>
               </el-col>
-
                <el-col :span="12">
-                 <el-form-item label="是否核酸" prop="isNucleicAcid">
-                 	<el-select v-model="queryParams.isNucleicAcid" placeholder="是否核酸" clearable style="width:240px;"  @keyup.enter.native="handleQuery"
-                 	   >
-                 		<el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-                 	</el-select>
+                 <el-form-item label="姓名" prop="xm">
+                 	<el-input v-model="queryParams.xm" placeholder="请输入姓名" style="width:200px;" clearable @keyup.enter.native="handleQuery" />
                  </el-form-item>
-
-
                </el-col>
 
         		</el-col>
-            <el-col :span="8">
-              <el-form-item label="姓名" prop="xm">
-              	<el-input v-model="queryParams.xm" placeholder="请输入姓名" style="width:240px;" clearable @keyup.enter.native="handleQuery" />
+            <el-col :span="9">
+              <el-form-item label="区域查询" prop="villagerGroup">
+                <el-cascader
+                	placeholder="点击选择区域"
+                	:options="optionsLists"
+                	filterable
+                	@change="chahetwos"
+                	:props="optionPropsssd"
+                	style="width: 154%;"
+                	@keyup.enter.native="handleQuery"
+                  ref = "cdd"
+                  v-model="listd"
+                  @active-item-change="handleItemChanges"
+                ></el-cascader>
+
               </el-form-item>
+              <!-- <el-form-item label="姓名" prop="xm">
+              	<el-input v-model="queryParams.xm" placeholder="请输入姓名" style="width:240px;" clearable @keyup.enter.native="handleQuery" />
+              </el-form-item> -->
            <!-- <el-form-item label="时间间隔" prop="isNucleicAcid">
             <el-select v-model="queryParams.isNucleicAcid" placeholder="时间间隔" clearable style="width:260px;"  @keyup.enter.native="handleQuery"
                >
@@ -58,7 +67,7 @@
 				<el-col :span="24">
 					<el-row>
 
-            <el-col :span="8">
+            <el-col :span="7">
              <el-form-item label="采集开始时间" prop="startTime">
              <el-date-picker
              	clearable
@@ -67,7 +76,7 @@
              	value-format="yyyy-MM-dd HH:mm:ss"
              	format="yyyy-MM-dd HH:mm:ss"
              	placeholder="选择开始时间"
-             	style="width: 240px;"
+             	style="width: 200px;"
              ></el-date-picker>
              </el-form-item>
             </el-col>
@@ -84,7 +93,7 @@
             	></el-date-picker>
             	</el-form-item>
             </el-col> -->
-            <el-col :span="8">
+            <el-col :span="7">
             	<el-form-item label="采集结束时间" prop="endTime">
             	<el-date-picker
             		clearable
@@ -93,10 +102,18 @@
             		value-format="yyyy-MM-dd HH:mm:ss"
             		format="yyyy-MM-dd HH:mm:ss"
             		placeholder="选择结束时间"
-            		style="width: 240px;"
+            		style="width: 200px;"
             	></el-date-picker>
             	</el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否核酸" prop="isNucleicAcid">
+              	<el-select v-model="queryParams.isNucleicAcid" placeholder="是否核酸" clearable style="width:160px;"  @keyup.enter.native="handleQuery"
+              	   >
+              		<el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+              	</el-select>
+              </el-form-item>
+            </el-col>
            <el-col :span="4" >
            	<el-form-item>
            		<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -136,7 +153,7 @@
         >导入</el-button> -->
       </el-col>
       <el-col :span="1.5" >
-        <el-button
+       <el-button
           type="warning"
           plain
           icon="el-icon-view"
@@ -145,8 +162,7 @@
         >统计功能</el-button>
       </el-col>
       <el-col :span="1.5" >
-       <el-button
-
+      <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -815,18 +831,21 @@ export default {
       pighomeList:[],
       optiodne:[],
       nnd:[],
-      nhye:false
+      nhye:false,
+      njkis:'hj'
 		};
-	},
-	created() {
+	},
+
+	created() {
+    this.queryParams.params.startTime = this.ShowDate('1')
+    this.queryParams.params.endTime = this.ShowDate('0')
 		this.getList();
 		// this.getTreeselectjue();
-    // this.mnyesfjer(0)
-    this.mnyesfjers("340882000000")
+    this.mnyesfjer(0)
+    this.mnyesfjers("340800000000")
     // this.mnyesfjerop(0)
     // this.mnyesfjeropwg("340882000000")
-    // this.queryParams.djsjjs = this.ShowDate('0')
-    // this.queryParams.djsjqs = this.ShowDate('7')
+
     console.log(this.ShowDate('7'))
     // this.getTreeselectjuetj()
     // this.getTreeselect()
@@ -1018,11 +1037,11 @@ export default {
         this.form.czrkJzdzList[data].village = nhdye[ nhdye.length - 1];
       }
      this.form.czrkJzdzList[data].deptId =  nhyhe[ nhyhe.length - 1]
-      // id
+   //    id
 			// this.form.province = data[0];
 			// this.form.city = data[1];
 			// this.form.region = data[2];
-      // 名称
+   //    名称
 			// this.naiseurya = this.form.province + this.form.city + this.form.region;
 			// if (this.jdourdjoaj == false) {
 			// 	// 修改
@@ -1050,7 +1069,7 @@ export default {
          console.log(this.nameutaiL,87)
       	// this.form.czrkJzdzList[this.nameutaiL].optiodne = this.handleData(response.data);
         this.optionsLists = this.handleData(response.data);
-        this.optionsList = this.handleData(response.data);
+        // this.optionsList = this.handleData(response.data);
         // this.form.czrkJzdzList[0].optiodne
       	this.loading = false;
         console.log(this.cascaderKey,8765)
@@ -1215,7 +1234,7 @@ export default {
            console.log(val,235)
             let code = val ? val[val.length - 1] : '';  //需请求数据的上级地址的code值
             let level = val.length + 1;  //需请求第几级地址
-            this.optionsListwg = this.handleDatawg(this.optionsListwg, code, level);
+            this.optionsLists = this.handleDatawg(this.optionsLists, code, level);
          	},
          handleDatawg(data, val, level) {
             console.log(data,val,level,7536)
@@ -1546,7 +1565,7 @@ export default {
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
-			// this.queryParams.pageNum = 1;
+			this.queryParams.pageNum = 1;
 			console.log(this.queryParams)
 			if(this.queryParams.queryType == 'hj'){
 			  this.getList();
@@ -1564,6 +1583,9 @@ export default {
         console.log(this.tj.lenth)
       }
        if(this.nnd.length == 2){
+        this.tj.lenth = 1
+      }
+      if(this.nnd.length == 3){
         this.tj.lenth = 2
       }
       this.nhye = false
@@ -1590,11 +1612,25 @@ export default {
 			setTimeout( ()=>{
 				this.nhue = true
 			},100)
-
 			this.queryParams.xm = undefined;
			this.queryParams.zjhm = undefined;
			this.queryParams.isNucleicAcid = undefined;
       this.queryParams.timeSlot = undefined
-      this.queryParams.params.startTime= undefined;
-      this.queryParams.params.endTime = undefined
+      this.queryParams.params.startTime = this.ShowDate('1')
+      this.queryParams.params.endTime = this.ShowDate('0')
+      this.queryParams.xzqh = undefined
+      this.queryParams.province = undefined;
+      this.queryParams.city = undefined;
+      this.queryParams.region = undefined;
+      this.queryParams.deptId = undefined
+      this.queryParams.provinceIdXjd = undefined
+      this.queryParams.cityIdXjd = undefined
+      this.queryParams.regionIdXjd = undefined
+      this.queryParams.villageTownsIdXjd = undefined
+      this.queryParams.villageIdXjd = undefined;
+      this.queryParams.provinceId = undefined
+      this.queryParams.cityId = undefined
+      this.queryParams.regionId = undefined
+      this.queryParams.villageTownsId = undefined
+      this.queryParams.villageId = undefined
       this.listd = []
       this.lser = []
        this.queryParams.pageNum = 1,
@@ -2057,6 +2093,7 @@ if(this.typeOptionsname.length == 0){
         this.tj.code = data[ data.length - 1];
       }
 		},
+
     // 居住地址搜索条件
     chahetwos(data) {
     	console.log(data)
@@ -2064,20 +2101,75 @@ if(this.typeOptionsname.length == 0){
       nhdye = this.$refs['cdd'].getCheckedNodes()[0].pathLabels
       console.log(nhdye,36)
       this.nnd = nhdye
-      if(data.length == 1){
-        this.queryParams.xzqh = nhdye[ nhdye.length - 1];
-      }else if(data.length == 2){
-        this.queryParams.xzqh = nhdye[0] + ',' + nhdye[ nhdye.length - 1];
-      }else if(data.length == 3){
-         this.queryParams.xzqh = nhdye[0] + ',' + nhdye[1] + ',' +nhdye[ nhdye.length - 1];
-      }else if(data.length == 4){
-
-        this.queryParams.xzqh = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
-        this.user.dept.deptName = ''
-      }else if(data.length == 5){
-        this.queryParams.xzqh = nhdye[0] + ',' + nhdye[1]  + ',' + nhdye[2]  + ',' +   nhdye[3]  + ',' +nhdye[ nhdye.length - 1];
-        this.user.dept.deptName = ''
+      // this.queryParams.xzqh = data[data.length - 1]
+      console.log(data,this.queryParams.queryType)
+      if(this.queryParams.queryType=='cz'){
+        if(data.length == 1){
+          this.queryParams.provinceIdXjd = data[ data.length - 1];
+          this.queryParams.cityIdXjd = undefined
+          this.queryParams.regionIdXjd = undefined
+          this.queryParams.villageTownsIdXjd = undefined
+          this.queryParams.villageIdXjd = undefined
+        }else if(data.length == 2){
+          this.queryParams.provinceIdXjd = undefined
+          this.queryParams.cityIdXjd = data[ data.length - 1];
+          this.queryParams.regionIdXjd = undefined
+          this.queryParams.villageTownsIdXjd = undefined
+          this.queryParams.villageIdXjd = undefined
+        }else if(data.length == 3){
+          this.queryParams.provinceIdXjd = undefined
+          this.queryParams.cityIdXjd = undefined
+          this.queryParams.regionIdXjd = data[ data.length - 1];
+          this.queryParams.villageTownsIdXjd = undefined
+          this.queryParams.villageIdXjd = undefined
+        }else if(data.length == 4){
+          this.queryParams.provinceIdXjd = undefined
+          this.queryParams.cityIdXjd = undefined
+          this.queryParams.regionIdXjd = undefined
+          this.queryParams.villageTownsIdXjd = data[ data.length - 1];
+          this.queryParams.villageIdXjd = undefined
+        }else if(data.length == 5){
+          this.queryParams.provinceIdXjd = undefined
+          this.queryParams.cityIdXjd = undefined
+          this.queryParams.regionIdXjd = undefined
+          this.queryParams.villageTownsIdXjd = undefined
+          this.queryParams.villageIdXjd = data[ data.length - 1];
+        }
+      }else if(this.queryParams.queryType =='hj'){
+        if(data.length == 1){
+          this.queryParams.provinceId = data[ data.length - 1];
+          this.queryParams.villageId = undefined
+          this.queryParams.cityId = undefined
+          this.queryParams.regionId = undefined
+          this.queryParams.villageTownsId = undefined
+
+        }else if(data.length == 2){
+          this.queryParams.provinceId = undefined
+          this.queryParams.regionId = undefined
+          this.queryParams.villageTownsId = undefined
+          this.queryParams.villageId = undefined
+          this.queryParams.cityId = data[ data.length - 1];
+        }else if(data.length == 3){
+          this.queryParams.cityId = undefined
+          this.queryParams.provinceId = undefined
+          this.queryParams.villageTownsId = undefined
+          this.queryParams.villageId = undefined
+          this.queryParams.regionId = data[ data.length - 1];
+        }else if(data.length == 4){
+          this.queryParams.provinceId = undefined
+          this.queryParams.cityId = undefined
+          this.queryParams.regionId = undefined
+          this.queryParams.villageId = undefined
+          this.queryParams.villageTownsId = data[ data.length - 1];
+        }else if(data.length == 5){
+          this.queryParams.provinceId = undefined
+          this.queryParams.cityId = undefined
+          this.queryParams.regionId = undefined
+          this.queryParams.villageTownsId = undefined
+          this.queryParams.villageId = data[ data.length - 1];
+        }
       }
+
     },
     chahetwoswge(data){
       console.log(data)
@@ -2417,20 +2509,53 @@ if(this.typeOptionsname.length == 0){
 
     },
 		/** 导出按钮操作 */
-		handleExport() {
-			var heuia = {
-			                tableName: "vaccine_info",
-			                empty: false,
-			                condition: {}
-			            }
-			            var that=this;
-			            heuia.condition = this.queryParams
-						const queryParams = this.queryParams
-			      queryParams.pageNum = undefined
-			      queryParams.pageSize= undefined
-			      this.download('boman-web-core/core/account/export', {
-			        ...queryParams
-			      }, `核酸检测数据表格.xlsx`)
+		handleExport() {
+      if(this.queryParams.queryType == 'cz'){
+        var heuia = {
+                        tableName: "vaccine_info",
+                        empty: false,
+                        condition: {}
+                    }
+                    var that=this;
+                    heuia.condition = this.queryParams
+        			const queryParams = this.queryParams
+              queryParams.pageNum = undefined
+              queryParams.pageSize= undefined
+              this.download('boman-web-core/core/account/exportCz', {
+                ...queryParams
+              }, `常住数据表格.xlsx`)
+      }else if(this.queryParams.queryType == 'hj'){
+        var heuia = {
+                        tableName: "vaccine_info",
+                        empty: false,
+                        condition: {}
+                    }
+                    var that=this;
+                    heuia.condition = this.queryParams
+        			const queryParams = this.queryParams
+              queryParams.pageNum = undefined
+              queryParams.pageSize= undefined
+              this.download('boman-web-core/core/account/exportHj', {
+                ...queryParams
+              }, `户籍数据表格.xlsx`)
+      }
+
+
+
+
+			// var heuia = {
+			//                 tableName: "vaccine_info",
+			//                 empty: false,
+			//                 condition: {}
+			//             }
+			//             var that=this;
+			//             heuia.condition = this.queryParams
+			// 			const queryParams = this.queryParams
+			//       queryParams.pageNum = undefined
+			//       queryParams.pageSize= undefined
+			//       this.download('boman-web-core/core/account/export', {
+			//         ...queryParams
+			//       }, `核酸检测数据表格.xlsx`)
 		},
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -2561,8 +2686,25 @@ if(this.typeOptionsname.length == 0){
   // 常住人口
   chajnd(data){
    this.queryParams.queryType = 'cz'
+   this.njkis = 'cz'
    this.queryParams.pageNum = 1
-   this.queryParams.status = data
+   // this.queryParams.status = data
+   this.queryParams.province = undefined;
+   this.queryParams.city = undefined;
+   this.queryParams.region = undefined;
+   this.queryParams.deptId = undefined
+   this.queryParams.provinceIdXjd = undefined
+   this.queryParams.cityIdXjd = undefined
+   this.queryParams.regionIdXjd = undefined
+   this.queryParams.villageTownsIdXjd = undefined
+   this.queryParams.villageIdXjd = undefined;
+   this.queryParams.provinceId = undefined
+   this.queryParams.cityId = undefined
+   this.queryParams.regionId = undefined
+   this.queryParams.villageTownsId = undefined
+   this.queryParams.villageId = undefined
+   this.listd = []
+   this.lser = []
    this.nhykis = false
    this.nhyki = true
    this.nhslke = data
@@ -2574,6 +2716,23 @@ if(this.typeOptionsname.length == 0){
     this.nhyki = false
     this.queryParams.pageNum = 1
    this.queryParams.queryType = 'hj'
+   this.njkis = 'hj'
+   this.queryParams.province = undefined;
+   this.queryParams.city = undefined;
+   this.queryParams.region = undefined;
+   this.queryParams.deptId = undefined
+   this.queryParams.provinceIdXjd = undefined
+   this.queryParams.cityIdXjd = undefined
+   this.queryParams.regionIdXjd = undefined
+   this.queryParams.villageTownsIdXjd = undefined
+   this.queryParams.villageIdXjd = undefined;
+   this.queryParams.provinceId = undefined
+   this.queryParams.cityId = undefined
+   this.queryParams.regionId = undefined
+   this.queryParams.villageTownsId = undefined
+   this.queryParams.villageId = undefined
+   this.listd = []
+   this.lser = []
    this.getList();
   },
   // 变更历史

src/views/system/user/profile/index.vue

@@ -77,6 +77,7 @@ export default {
   },
   created() {
     this.getUser();
+    console.log(this.$route.params.id,85)
   },
   methods: {
     getUser() {

src/views/system/user/profiles/index.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="登录地址" prop="ipaddr">
+        <el-input
+          v-model="queryParams.ipaddr"
+          placeholder="请输入登录地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+
+    </el-form>
+    <el-table
+      v-loading="loading"
+      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
+      style="width: 100%;"
+    >
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
+      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户名称" align="center" prop="nikeName" :show-overflow-tooltip="true" />
+      <el-table-column label="部门名称" align="center" prop="deptName" :show-overflow-tooltip="true" />
+      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+      <el-table-column label="登录类型" align="center" prop="loginType" :show-overflow-tooltip="true" />
+      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleForceLogout(scope.row)"
+            v-hasPermi="['monitor:online:forceLogout']"
+          >强退</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+  </div>
+</template>
+
+<script>
+import { list, forceLogout } from "@/api/monitor/online";
+
+export default {
+  name: "Online",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      pageNum: 1,
+      pageSize: 10,
+      // 查询参数
+      queryParams: {
+        ipaddr: undefined,
+        userName: undefined
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询登录日志列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 强退按钮操作 */
+    handleForceLogout(row) {
+      this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return forceLogout(row.tokenId);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("强退成功");
+        })
+    }
+  }
+};
+</script>

src/views/system/user/profiles/resetPwd.vue

@@ -0,0 +1,72 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" />
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" />
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" />
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user";
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      test: "1test",
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
+            response => {
+              this.msgSuccess("修改成功");
+            }
+          );
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>

src/views/system/user/profiles/userAvatar.vue

@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div class="avatar-upload-preview">
+            <img :src="previews.url" :style="previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :md="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :md="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :md="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+
+export default {
+  components: { VueCropper },
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: store.getters.avatar, //裁剪图片的地址
+        autoCrop: true, // 是否默认生成截图框
+        autoCropWidth: 200, // 默认生成截图框宽度
+        autoCropHeight: 200, // 默认生成截图框高度
+        fixedBox: true // 固定截图框大小 不允许改变
+      },
+      previews: {}
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>

src/views/system/user/profiles/userInfo.vue

@@ -0,0 +1,76 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="user.nickName" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="user.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="user.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="user.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/system/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "'请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
+            this.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({ path: "/index" });
+    }
+  }
+};
+</script>

src/views/system/xsr/index.vue

@@ -124,7 +124,7 @@
       <el-table-column label="新生儿姓名" align="center" prop="xsexm" width="100" />
       <el-table-column label="新生儿身份证号" align="center" prop="sfzjhm" width="165" />
       <el-table-column label="出生时间" align="center" prop="csrq" width="110" />
-      <el-table-column label="出生医院" align="center" prop="csyljg"  />
+      <el-table-column label="出生医院" align="center" prop="csyljg" width="110" />
       <el-table-column label="状态" align="center"   width="80">
         <template slot-scope="scope">
          {{scope.row.status == 1? '未确认' : '已确认'}}
@@ -1041,7 +1041,8 @@ export default {
 		},
 		/** 查询疫苗信息列表 */
 		getList() {
-			this.loading = true;
+			this.loading = true;
+      console.log(5)
 			listInfo(this.queryParams).then(response => {
 				this.infoList = response.rows;
         this.nbdgywkajs = true
@@ -1407,7 +1408,6 @@ export default {
 		handleQuery() {
 			this.queryParams.pageNum = 1;
 			console.log(this.queryParams)
-
         this.getList();
 
 		},