1

public/index.html

@@ -118,11 +118,7 @@
       width: 51%;
       height: 100%;
       /* background: #7171C6; */;
-<<<<<<< HEAD
 	    background-image: linear-gradient(#056185, #3e0c84);
-=======
-	  background-image: linear-gradient(#056185, #3e0c84);
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

src/settings.js

@@ -1,13 +1,8 @@
 module.exports = {
   title: '潜山市人口信息平台',
   // urls: `http://192.168.101.110:8090`,
-<<<<<<< HEAD
   // urls: `http://192.168.101.11:8090`,
   urls: `http://192.168.101.168:8090`,
-=======
-  urls: `http://192.168.101.11:8090`,
-  // urls: `http://192.168.101.168:8090`,
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    // urls: `https://qsfy.qs163.cn`,
 
   /**

src/views/system/resident/index.vue

@@ -161,14 +161,9 @@
       </el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row> -->
-<<<<<<< HEAD
 
 <!-- v-if="nbdgywkajs == true" -->
 		<el-table     v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
-=======
-
-		<el-table  v-if="nbdgywkajs == true"   v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" :height="tableMaxHeight">
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 			<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" />

src/views/system/residentss/index.vue

@@ -91,7 +91,6 @@
             		</el-select>
             	</el-form-item>
             </el-col>
-<<<<<<< HEAD
             <el-col :span="6">
             	<el-form-item label="全员核酸" prop="isNucleicAcidFive">
             		<el-select v-model="queryParams.isNucleicAcidFive" placeholder="是否参加5天一次全员核酸" style="width:180px;" clearable>
@@ -99,8 +98,6 @@
             		</el-select>
             	</el-form-item>
             </el-col>
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
             <el-col :span="4" >
             	<el-form-item>
             		<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -123,7 +120,6 @@
       <el-col :span="1.5">
       	<!-- <el-button type="primary"  icon="el-icon-view" size="mini"  @click="chajndsls" :disabled="single" v-if="queryParams.queryType == 'hj'">变更历史</el-button> -->
       </el-col>
-<<<<<<< HEAD
         <el-col :span="1.5" >
           <el-button
             type="info"
@@ -135,8 +131,6 @@
           >导入</el-button>
         </el-col>
 
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       <el-col :span="1.5">
         <!-- :disabled="queryParams.queryType == 'cz'" -->
       	<el-button
@@ -172,20 +166,12 @@
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
      <div class="bghks">
-<<<<<<< HEAD
        <!-- v-if="nbdgywkajs == true" -->
        <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" fixed="left"   width="110" />
         <el-table-column label="身份证号码" align="center" prop="idCard" fixed="left" width="180" />
        	<el-table-column label="联系方式" align="center" prop="phoneNum"  width="110" />
-=======
-       <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" />
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
        	<el-table-column v-if="queryParams.queryType == 'hj'" label="户籍地址" width="360" align="center"  >
            <!-- prop="domicileSelect" -->
            <!-- style="text-align: left;" -->
@@ -211,10 +197,6 @@
 
          <el-table-column label="是否户主" align="center" prop="houseType" width="90" />
 
-<<<<<<< HEAD
-=======
-
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
          <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">
@@ -230,20 +212,12 @@
                    </el-tooltip>
             </template>
          </el-table-column>
-<<<<<<< HEAD
         <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="是否5天一次全员核酸" align="center" prop="isNucleicAcidFive" width="150"   fixed="right" :formatter="homeNameFormats"/>
        	<el-table-column label="操作" align="left" class-name="small-padding fixed-width" fixed="right"  :width="queryParams.queryType == 'hj' ? '160' : '120'">
-=======
-         <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'">
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
        		<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> -->
@@ -478,7 +452,6 @@
                 	<el-input :disabled="true" v-model="form.hi_phone" type="input" placeholder="来宜号码" />
                 </el-form-item>
             </el-col> -->
-<<<<<<< HEAD
             <el-col :span="12">
               <el-form-item label="全员核酸" prop="isNucleicAcidFive">
               	<el-select v-model="form.isNucleicAcidFive" placeholder="是否参加5天一次全员核酸" clearable style="width: 100%;">
@@ -491,13 +464,6 @@
               	<el-input v-model="form.remark" type="input" placeholder="请输入备注" />
               </el-form-item>
             </el-col>
-=======
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark">
-              	<el-input v-model="form.remark" type="input" placeholder="请输入备注" />
-              </el-form-item>
-              </el-col>
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
           </el-col>
 				</el-row>
 
@@ -660,11 +626,7 @@
              plain
              icon="el-icon-download"
              size="mini"
-<<<<<<< HEAD
              @click="handleExporttezh"
-=======
-             @click="handleExportte"
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
              v-hasPermi="['system:czrk:exportQianShan']"
            >导出只填写到潜山市数据</el-button>
         </el-col>
@@ -689,7 +651,6 @@
 
 
     </el-dialog>
-<<<<<<< HEAD
   <!-- 导入对话框 -->
   <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
     <!-- upload.url + '?source=' + upload.source -->
@@ -726,9 +687,6 @@
       <el-button @click="nske">取 消</el-button>
     </div>
   </el-dialog>
-=======
-
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 
 
 	</div>
@@ -761,10 +719,7 @@ export default {
 			showSearch: true,
 			// 总条数
 			total: 0,
-<<<<<<< HEAD
       totalde:0,
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       id:'fg',
       idsg:'gh',
       ruleshy:{},
@@ -788,11 +743,7 @@ export default {
 				province: null,
 				city: null,
 				userName: null,
-<<<<<<< HEAD
         queryType:'cz',
-=======
-        queryType:'hj',
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 				gender: null,
 				idCard: null,
 				phoneNum: null,
@@ -858,22 +809,13 @@ export default {
           }
 				]
 			},
-<<<<<<< HEAD
       nhykis:false,
       nhyki:true,
-=======
-      nhykis:true,
-      nhyki:false,
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       nhykils:true,
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
-<<<<<<< HEAD
         open: false,
-=======
-        opens: false,
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
         // 弹出层标题（用户导入）
         title: "",
         // 是否禁用上传
@@ -883,11 +825,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-<<<<<<< HEAD
         url: process.env.VUE_APP_BASE_API + "/boman-web-core/core/jzdz/importData"
-=======
-        url: process.env.VUE_APP_BASE_API + "/boman-web-core//file/common/importYmjz"
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       },
 			// 表单校验
 			rules: {
@@ -897,10 +835,7 @@ export default {
         houseType:[{ required: true, message: '请选择户主', trigger: 'blur' }],
         code:[{ required: true, message: '请输入户编号信息', trigger: 'blur' }],
         yhzgx:[{ required: true, message: '请选择与户主关系', trigger: 'blur' }],
-<<<<<<< HEAD
         isNucleicAcidFive:[{ required: true, message: '不能为空', trigger: 'blur' }]
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       },
       // yhzgx:[{ required: true, message: '请选择与户主关系', trigger: 'blur' }],
 			selected: [],
@@ -1076,7 +1011,6 @@ export default {
       bgls:[],
       comind:false,
       nmkl:false,
-<<<<<<< HEAD
       user:{},
       qyhs:[]
 		};
@@ -1084,13 +1018,6 @@ export default {
 	created() {
 		// this.getList();
     this.getListjuzhu()
-=======
-      user:{}
-		};
-	},
-	created() {
-		this.getList();
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 		// this.getTreeselectjue();
     this.mnyesfjer(0)
     this.mnyesfjerkl("340800000000")
@@ -1110,13 +1037,10 @@ export default {
    // }
    getUserProfile().then(response => {
      this.user = response.data;
-<<<<<<< HEAD
    });
    // 全员核酸
    this.getDicts('nucleic_acid').then(response => {
      this.qyhs = response.data;
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    });
 
 		// this.form.province = this.selected[0];
@@ -1148,11 +1072,7 @@ export default {
       return this.selectDictLabel(this.typeOptions,row.status);
       },
     homeNameFormats(row, column) {
-<<<<<<< HEAD
       return this.selectDictLabel(this.qyhs,row.isNucleicAcidFive);
-=======
-      return this.selectDictLabel(this.typeOptionshuujs,row.isNucleicAcid);
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       },
     /** 初始化下拉框数据 **/
         getRootModels() {
@@ -1539,7 +1459,6 @@ export default {
 		getList() {
 			this.loading = true;
       this.nbdgywkajs = true
-<<<<<<< HEAD
       // this.total = 0
       console.log(this.queryParams.pageNum);
 			listInfo(this.queryParams).then(response => {
@@ -1550,25 +1469,13 @@ export default {
         console.log(this.queryParams.pageNum);
         this.nbdgywkajs = true
 
-=======
-      this.total = 0
-			listInfo(this.queryParams).then(response => {
-				this.infoList = response.rows;
-        this.nbdgywkajs = true
-				this.total = response.total;
-				this.loading = false;
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 			});
 		},
     /** 查询居住疫苗信息列表 */
     getListjuzhu() {
     	this.loading = true;
       this.nbdgywkajs = true
-<<<<<<< HEAD
       // this.total = 0
-=======
-      this.total = 0
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
     	listInfos(this.queryParams).then(response => {
     		this.infoList = response.rows;
         this.nbdgywkajs = true
@@ -1956,10 +1863,7 @@ export default {
 				remark: undefined,
         villageTowns:undefined,
         village:undefined,
-<<<<<<< HEAD
         isNucleicAcidFive:'1',
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
         czrkJzdzList: [
         	{
         		provinceId: '',
@@ -2137,10 +2041,7 @@ export default {
       this.$set(this.form, 'villageTowns', null)
       //   this.form.village=null
       this.$set(this.form, 'village', null)
-<<<<<<< HEAD
       this.$set(this.form, 'isNucleicAcidFive', '1')
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       this.loading = false
       console.log(data)
 			this.opens = true;
@@ -3074,11 +2975,7 @@ export default {
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "数据导入";
-<<<<<<< HEAD
       this.upload.open = true;
-=======
-      this.upload.opens = true;
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
     },
     // 获取屏幕高度
               showFilterForm () {
@@ -3117,10 +3014,7 @@ export default {
   chajnd(){
    this.queryParams.queryType = 'cz'
    this.queryParams.pageNum = 1
-<<<<<<< HEAD
    this.total = 0
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    this.nhykis = false
    this.nhyki = true
    this.getListjuzhu();
@@ -3130,10 +3024,7 @@ export default {
     this.nhykis = true
     this.nhyki = false
     this.queryParams.pageNum = 1
-<<<<<<< HEAD
     this.total = 0
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    this.queryParams.queryType = 'hj'
    this.getList();
   },
@@ -3408,7 +3299,6 @@ let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|
         	});
 
 
-<<<<<<< HEAD
       },
       // 文件上传中处理
        handleFileUploadProgress(event, file, fileList) {
@@ -3439,9 +3329,6 @@ let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|
         console.log(345)
              this.upload.open = false;
       },
-=======
-      }
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
   // }
 	}
 };

src/views/system/time/index.vue

@@ -199,9 +199,9 @@
 	      @click="handleImporthg"
 	    >导入错误日志</el-button>
 	  </el-col>
-			<!-- <el-col :span="1.5">
+			<el-col :span="1.5">
 				<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['core:info:export']">导出</el-button>
-			</el-col> -->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button type="primary" plain icon="el-icon-view" size="mini" @click="handleExportjy" :disabled="exportflag" v-hasPermi="['core:info:export']">导出进度</el-button>
 			</el-col>

src/views/system/ucleic/index.vue

@@ -142,27 +142,11 @@
       <el-col :span="1.5">
       	<!-- <el-button type="success" plain icon="el-icon-download" size="mini"  @click="handleDeleteda" >下载模板</el-button> -->
       </el-col>
-<<<<<<< HEAD
       <!-- v-if="queryParams.status == 4" -->
 
       <el-col :span="1.5" >
        <el-button
           type="success"
-=======
-      <el-col :span="1.5" v-if="queryParams.status == 4">
-        <!-- <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['system:czrk:importData']"
-        >导入</el-button> -->
-      </el-col>
-      <el-col :span="1.5" >
-       <el-button
-          type="warning"
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
           plain
           icon="el-icon-view"
           size="mini"
@@ -170,7 +154,6 @@
         >统计功能</el-button>
       </el-col>
       <el-col :span="1.5" >
-<<<<<<< HEAD
         <!-- <el-col :span="1.5" >
           <el-button
             type="info"
@@ -181,15 +164,12 @@
             v-hasPermi="['system:czrk:importData']"
           >导入</el-button>
         </el-col> -->
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-<<<<<<< HEAD
           v-hasPermi="['system:accountingData:exportHj']"
         >导出户籍信息</el-button>
       </el-col>
@@ -202,10 +182,6 @@
           @click="handleExports"
           v-hasPermi="['system:accountingData:exportCz']"
         >导出常住信息</el-button>
-=======
-          v-hasPermi="['system:accountingData:export']"
-        >导出</el-button>
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       </el-col>
 
       <el-col :span="1.5" v-for="(ietm,index) in jbuttomfs" :key="index">
@@ -538,20 +514,13 @@
 
     <!-- 导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-<<<<<<< HEAD
       <!-- upload.url + '?source=' + upload.source -->
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       <el-upload
         ref="upload"
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-<<<<<<< HEAD
         :action="upload.url"
-=======
-        :action="upload.url + '?source=' + upload.source"
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -564,22 +533,13 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-<<<<<<< HEAD
           <!-- <div class="nhkhv">
-=======
-          <div class="nhkhv">
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
             <span><i>*</i>数据来源:</span>
             <el-select v-model="upload.source" placeholder="请选择数据来源"    style="width: 100%;">
             	<el-option v-for="dict in typeOptionstimesgt" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
             </el-select>
-<<<<<<< HEAD
           </div> -->
           <el-link type="info" style="font-size:14px;text-align: center;color: #5E8AC6; width: 100%;" @click="importTemplate">下载模板</el-link>
-=======
-          </div>
-          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
         </div>
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
@@ -641,11 +601,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-<<<<<<< HEAD
         url: process.env.VUE_APP_BASE_API + "/boman-web-core/core/jzdz/importData"
-=======
-        url: process.env.VUE_APP_BASE_API + "/boman-web-core/core/czrk/importData"
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
       },
 			// 弹出层标题
 			title: '',
@@ -1340,11 +1296,7 @@ export default {
 		getList() {
 			this.loading = true;
       this.nbdgywkajs = true
-<<<<<<< HEAD
       // this.total = 0
-=======
-      this.total = 0
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 			listInfo(this.queryParams).then(response => {
 				this.infoList = response.rows;
         this.nbdgywkajs = true
@@ -1356,11 +1308,7 @@ export default {
     getListjuzhu() {
     	this.loading = true;
       this.nbdgywkajs = true
-<<<<<<< HEAD
       
-=======
-      this.total = 0
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
     	listInfos(this.queryParams).then(response => {
     		this.infoList = response.rows;
         this.nbdgywkajs = true
@@ -2207,10 +2155,6 @@ if(this.typeOptionsname.length == 0){
           this.queryParams.cityId = undefined
           this.queryParams.regionId = undefined
           this.queryParams.villageTownsId = undefined
-<<<<<<< HEAD
-=======
-
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
         }else if(data.length == 2){
           this.queryParams.provinceId = undefined
           this.queryParams.regionId = undefined
@@ -2578,9 +2522,6 @@ if(this.typeOptionsname.length == 0){
     },
 		/** 导出按钮操作 */
 		handleExport() {
-<<<<<<< HEAD
-=======
-      if(this.queryParams.queryType == 'cz'){
         var heuia = {
                         tableName: "vaccine_info",
                         empty: false,
@@ -2591,32 +2532,10 @@ if(this.typeOptionsname.length == 0){
         			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'){
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
-        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
-<<<<<<< HEAD
               queryParams.queryType = 'hj'
               this.download('boman-web-core/core/account/exportHj', {
                 ...queryParams
               }, `户籍数据表格.xlsx`)
-=======
-              this.download('boman-web-core/core/account/exportHj', {
-                ...queryParams
-              }, `户籍数据表格.xlsx`)
-      }
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 
 
 
@@ -2635,7 +2554,6 @@ if(this.typeOptionsname.length == 0){
 			//         ...queryParams
 			//       }, `核酸检测数据表格.xlsx`)
 		},
-<<<<<<< HEAD
     /** 导出常住按钮操作 */
     handleExports() {
         var heuia = {
@@ -2671,8 +2589,6 @@ if(this.typeOptionsname.length == 0){
     	//         ...queryParams
     	//       }, `核酸检测数据表格.xlsx`)
     },
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
@@ -2687,19 +2603,11 @@ if(this.typeOptionsname.length == 0){
     },
    // 提交上传文件
    submitFileForm() {
-<<<<<<< HEAD
      // console.log(this.upload.source)
      // if(this.upload.source == null){
      //   this.msgInfo('请选择数据来源');
      //   return  false
      // }
-=======
-     console.log(this.upload.source)
-     if(this.upload.source == null){
-       this.msgInfo('请选择数据来源');
-       return  false
-     }
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
      this.$refs.upload.submit();
    },
    nske(){
@@ -2773,19 +2681,11 @@ if(this.typeOptionsname.length == 0){
     },
     /** 导入按钮操作 */
     handleImport() {
-<<<<<<< HEAD
       // this.getDicts('data_sources').then(response => {
       	// this.typeOptionstimesgt = response.data;
         this.upload.title = "数据导入";
         this.upload.open = true;
       // });
-=======
-      this.getDicts('data_sources').then(response => {
-      	this.typeOptionstimesgt = response.data;
-        this.upload.title = "数据导入";
-        this.upload.open = true;
-      });
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
 
     },
     // 获取屏幕高度
@@ -2820,10 +2720,7 @@ if(this.typeOptionsname.length == 0){
    this.queryParams.queryType = 'cz'
    this.njkis = 'cz'
    this.queryParams.pageNum = 1
-<<<<<<< HEAD
    this.total = 0
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    // this.queryParams.status = data
    this.queryParams.province = undefined;
    this.queryParams.city = undefined;
@@ -2852,10 +2749,7 @@ if(this.typeOptionsname.length == 0){
     this.nhyki = false
     this.queryParams.pageNum = 1
    this.queryParams.queryType = 'hj'
-<<<<<<< HEAD
    this.total = 0
-=======
->>>>>>> bd2a9768061a18b7d56347bd0cdebfc5b2eff99e
    this.njkis = 'hj'
    this.queryParams.province = undefined;
    this.queryParams.city = undefined;