Merge remote-tracking branch 'origin/dev' into preview

* origin/dev:
  数据看板房屋概览列表总数接口传参
  导入状态点击导入记录跳转至导入记录页面
  bug#108
  数据看板滚动条高度不为0
  面包屑导航默认首页
  菜单接口修改
  迁入记录详细地址必填项

src/js/store/index.js

@@ -27,7 +27,7 @@ export default new Vuex.Store({
     // 内容, 是否需要刷新
     contentIsNeedRefresh: false,
     // 内容, 标签页(默认添加首页)
-    contentTabs: [],
+    contentTabs: [{name:"home",title:"首页"}],
     contentTabsActiveName: "",
 
     mainShuju: {

src/router/index.js

@@ -427,7 +427,7 @@ router.beforeEach((to, from, next) => {
 	}
 	const customerId = localStorage.getItem("customerId");
 	console.log("customerId：", customerId);
-	http.get("gov/access/menu/navDigitalCommunity?tableName=data_menu").then(({
+	http.get("gov/access/menu/navDigitalCommunityNew?tableName=data_menu").then(({
 		data: res
 	}) => {
 		if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
@@ -449,7 +449,7 @@ router.beforeEach((to, from, next) => {
 			name: "login",
 		});
 	});
-	http.get("gov/access/menu/navDigitalCommunity").then(({
+	http.get("gov/access/menu/navDigitalCommunityNew").then(({
 		data: res
 	}) => {
 		if (res.code == 10005 || res.code == 10006 || res.code == 10007) {

src/views/dataBoard/renfang/cpts/fwgl.vue

@@ -25,7 +25,7 @@
 				</div>
 				<div class="pie-right">
 					<div class="right-row">
-						<div class="row-item" @click="toListPage">
+						<div class="row-item" @click="toListPage('all')">
 							<div class="item-one">
 								<img
 									class="img"
@@ -42,7 +42,7 @@
 
 						<div
 							class="row-item marginleft10"
-							@click="toListPage('self_dwelling', '自住')"
+							@click="toListPage('self', '自住')"
 						>
 							<div class="item-one">
 								<img

src/views/dataBoard/renfang/house/list.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="g-pgi">
+	<div class="g-pgi" >
 		<!-- 组织路由 -->
 		<cpt-bread
 			:separator="'/'"
@@ -162,8 +162,10 @@ export default {
 		this.getList();
 		this.getCount();
 	},
-
 	methods: {
+		handleRouter(){
+				document.getElementById('scT').getElementsByClassName('g-bd')[0].scrollTop = 0
+		},
 		handleClickBreadItem({ item }) {
 			if (item.type == "back") {
 				this.$router.back();
@@ -236,10 +238,8 @@ export default {
 				this.$message.error(msg);
 			}
 		},
-
 		async getCount() {
 			const { org_id, houseType, pageNo, pageSize } = this;
-
 			const url = "house_list_total";
 
 			const { data, code, msg } = await requestPostBi(
@@ -264,9 +264,13 @@ export default {
 			}
 		},
 	},
+	watch: {
+        $route(to, from){
+					this.handleRouter()
+        },
+    },
 
 	destroyed() {
-		console.log("我已经离开了！");
 	},
 };
 </script>

src/views/dataBoardMain/main.vue

@@ -1,5 +1,5 @@
 <template>
-	<fixed1920 class="g-fx">
+	<fixed1920 class="g-fx" id="g-scT">
 		<div v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')" :class="[
 				'g-pg',
 				{ 'z-sidebar--fold': $store.state.sidebarFold },

src/views/modules/base/community/buildTable.vue

@@ -812,10 +812,15 @@ export default {
         return false
       }
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
 
       //清空上传列表

src/views/modules/base/community/communityTable.vue

@@ -1252,10 +1252,14 @@ export default {
 
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-				duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000,
 			});
-
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 			//清空上传列表
 			let url = "";
 

src/views/modules/base/community/roomTable.vue

@@ -896,10 +896,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
       //清空上传列表
       this.$refs["upload"].clearFiles();

src/views/modules/base/huji/chusheng/index.vue

@@ -711,10 +711,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http

src/views/modules/base/huji/immigration/edit.vue

@@ -368,9 +368,9 @@ export default {
         sourceAddress: [
           { required: true, message: '来源地不能为空', trigger: 'blur' }
         ],
-        address: [
+        // address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        //   { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ]
+        // ]
       }
     },
 

src/views/modules/base/huji/immigration/index.vue

@@ -795,9 +795,14 @@ export default {
 			this.importBtnTitle = "正在上传中...";
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-				duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
 			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append("file", file.file); //添加文件对象
 			await this.$http

src/views/modules/base/resi copy.vue

@@ -821,10 +821,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http

src/views/modules/base/resi.vue

@@ -1183,9 +1183,14 @@ export default {
 			this.importBtnTitle = "正在上传中...";
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-				duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
 			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append("file", file.file); //添加文件对象
 			await this.$http

src/views/modules/communityParty/elegant/index.vue

@@ -549,10 +549,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+        duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       this.$http

src/views/modules/communityParty/members/index.vue

@@ -640,10 +640,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+        duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       this.$http

src/views/modules/communityService/shzz/index.vue

@@ -318,10 +318,15 @@ export default {
 
             this.getTableData();
             this.$message({
-              showClose: true,
+				showClose: true,
-              message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-              duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-            })
+        duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
           })
           .catch((err) => {
             console.log("失败", err);

src/views/modules/communityService/sqzzz/index.vue

@@ -346,10 +346,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http

src/views/modules/communityService/worklog/workLog.vue

@@ -650,10 +650,15 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
         this.$message({
-          showClose: true,
+				showClose: true,
-          message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-          duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
         this.loadTable()
       } else {

src/views/modules/cpts/base/index.vue

@@ -509,10 +509,15 @@ export default {
       if (!url) return;
 
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象

src/views/modules/cpts/base2/index.vue

@@ -636,9 +636,14 @@ export default {
 
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-				duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
 			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
 			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
 			formData.append("file", file.file); //添加文件对象

src/views/modules/home/index.vue

@@ -378,12 +378,10 @@ export default {
 
 		toSearchPage(type, searchKey) {
 			this.$router.push({
-				path: "/main/shequ-chaxun",
+				path: "/main/shequ-chaxun"
-				query: {
-					type,
-					searchKey,
-				},
 			});
+			localStorage.setItem('homeSearchType',type)
+			localStorage.setItem('homeSearchKey',searchKey)
 		},
 
 		handleClickSearchBtn() {

src/views/modules/plugins/change/resichange.vue

@@ -711,10 +711,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       await this.$http

src/views/modules/plugins/change/resideath.vue

@@ -767,10 +767,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       await this.$http

src/views/modules/plugins/change/resiwelfare.vue

@@ -704,10 +704,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       await this.$http

src/views/modules/plugins/point/icpointnucleicmonitoring.vue

@@ -491,10 +491,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
       //清空上传列表
       this.$refs["upload"].clearFiles();

src/views/modules/plugins/point/icpointvaccinesinoculation.vue

@@ -429,10 +429,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
       //清空上传列表
       this.$refs["upload"].clearFiles();

src/views/modules/plugins/rent/resi.vue

@@ -704,10 +704,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
+				dangerouslyUseHTMLString: true,
-        duration: 0
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      })
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
       await this.$http

src/views/modules/shequ/chaxun.vue

@@ -726,8 +726,12 @@ export default {
   methods: {
     firstSearch() {
       console.log(getQueryPara("type"));
-      this.searchData.searchKey = getQueryPara("searchKey");
+      console.log(this.$route.query.type,'type');
-      this.searchData.type = getQueryPara("type");
+      console.log(this.$route.query.searchKey,'search');
+      // this.searchData.searchKey = getQueryPara("searchKey");
+      // this.searchData.type = getQueryPara("type");
+      this.searchData.searchKey = localStorage.getItem('homeSearchKey') || ''
+      this.searchData.type =  localStorage.getItem('homeSearchType') || ''
       this.handleClickSearchBtn();
     },
 
@@ -742,7 +746,6 @@ export default {
           if (n.value == row[item.columnName] ) _val = n.label;
         });
       }
-      console.log(row.mobile);
 
       if(row.mobile == '' || row.mobile == '--'){
         row.mobile = "" 
@@ -754,11 +757,11 @@ export default {
     },
 
     handleClickSearchBtn() {
-		
       const {
         searchData: { type, searchKey },
       } = this;
-	  console.log("ddddddddd",type)
+      localStorage.setItem('homeSearchType',type)
+			localStorage.setItem('homeSearchKey',searchKey)
       if (!searchKey) return this.$message.error("请输入搜索条件");
       if (type == "jumin") {
         this.searchJumin.pageNo = 1;
@@ -894,6 +897,10 @@ export default {
       // this.searchData.searchKey = ''
     }
   },
+  destroyed(){
+    localStorage.removeItem('homeSearchKey')
+    localStorage.removeItem('homeSearchType')
+  },
 };
 </script>
 

src/views/modules/shequzhili/csgltc/csgl.vue

@@ -545,10 +545,15 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
         this.$message({
-          showClose: true,
+				showClose: true,
-          message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-          duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
         this.loadTable()
       } else {

src/views/modules/shequzhili/ggfwtc/ggfw.vue

@@ -583,10 +583,15 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
         this.$message({
-          showClose: true,
+				showClose: true,
-          message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-          duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
         this.loadTable()
       } else {

src/views/modules/shequzhili/xiangmu/index.vue

@@ -439,10 +439,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http

src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue

@@ -554,10 +554,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
       const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       fmData.append("file", file.file); //添加文件对象
       await this.$http

src/views/modules/sys/icvaccineprarmeter.vue

@@ -754,10 +754,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
+				showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
+				dangerouslyUseHTMLString: true,
-        duration: 0,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-      });
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
+			})
 
       //清空上传列表
       this.$refs["upload"].clearFiles();