From 964435f715eeb458ea421396d66cb5a4ce84d547 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 4 Apr 2023 15:44:32 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=BF=81=E5=85=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/huji/immigration/edit.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 73e1b8115..89efb44f5 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -368,9 +368,9 @@ export default {
         sourceAddress: [
           { required: true, message: '来源地不能为空', trigger: 'blur' }
         ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ]
+        // address: [
+        //   { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        // ]
       }
     },
 

From 90ed5a88831089c7ca1d8c7ed3283d820f8645b4 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 4 Apr 2023 16:10:06 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index e9870045b..2c2cb8de4 100644
--- a/src/router/index.js
+++ b/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) {

From 5e0990d091bb23c17e6df520cd2599ce242a8110 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 4 Apr 2023 17:33:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=BB=98=E8=AE=A4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 2691436e3d8204e07cee903994a1b9bb06ae2186 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 6 Apr 2023 10:45:49 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=AB=98=E5=BA=A6=E4=B8=8D=E4=B8=BA?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/house/list.vue | 13 +++++++++----
 src/views/dataBoardMain/main.vue           |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue
index 4c943ec90..350122e67 100644
--- a/src/views/dataBoard/renfang/house/list.vue
+++ b/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,7 +238,6 @@ export default {
 				this.$message.error(msg);
 			}
 		},
-
 		async getCount() {
 			const { org_id, houseType, pageNo, pageSize } = this;
 
@@ -264,9 +265,13 @@ export default {
 			}
 		},
 	},
+	watch: {
+        $route(to, from){
+					this.handleRouter()
+        },
+    },
 
 	destroyed() {
-		console.log("我已经离开了！");
 	},
 };
 </script>
diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue
index 26658c142..97f9467f6 100644
--- a/src/views/dataBoardMain/main.vue
+++ b/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 },

From 2502575b1b56c1e69695b08c360f6c5b7bc1af1a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 6 Apr 2023 13:52:44 +0800
Subject: [PATCH 5/7] bug#108

---
 src/views/modules/home/index.vue   |  8 +++-----
 src/views/modules/shequ/chaxun.vue | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index bac4b0752..59d85892c 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -378,12 +378,10 @@ export default {
 
 		toSearchPage(type, searchKey) {
 			this.$router.push({
-				path: "/main/shequ-chaxun",
-				query: {
-					type,
-					searchKey,
-				},
+				path: "/main/shequ-chaxun"
 			});
+			localStorage.setItem('homeSearchType',type)
+			localStorage.setItem('homeSearchKey',searchKey)
 		},
 
 		handleClickSearchBtn() {
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 1d4d6b69e..2f8cc52fc 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -726,8 +726,12 @@ export default {
   methods: {
     firstSearch() {
       console.log(getQueryPara("type"));
-      this.searchData.searchKey = getQueryPara("searchKey");
-      this.searchData.type = getQueryPara("type");
+      console.log(this.$route.query.type,'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>
 

From ee6a12c35be6cc1a392bf8232bed130c7ec60074 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 6 Apr 2023 15:02:32 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=87=B3=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/buildTable.vue     | 13 +++++++++----
 src/views/modules/base/community/communityTable.vue | 10 +++++++---
 src/views/modules/base/community/roomTable.vue      | 13 +++++++++----
 src/views/modules/base/huji/chusheng/index.vue      | 13 +++++++++----
 src/views/modules/base/huji/immigration/index.vue   |  9 +++++++--
 src/views/modules/base/resi copy.vue                | 13 +++++++++----
 src/views/modules/base/resi.vue                     |  9 +++++++--
 src/views/modules/communityParty/elegant/index.vue  | 13 +++++++++----
 src/views/modules/communityParty/members/index.vue  | 13 +++++++++----
 src/views/modules/communityService/shzz/index.vue   | 13 +++++++++----
 src/views/modules/communityService/sqzzz/index.vue  | 13 +++++++++----
 .../modules/communityService/worklog/workLog.vue    | 13 +++++++++----
 src/views/modules/cpts/base/index.vue               | 13 +++++++++----
 src/views/modules/cpts/base2/index.vue              |  9 +++++++--
 src/views/modules/plugins/change/resichange.vue     | 13 +++++++++----
 src/views/modules/plugins/change/resideath.vue      | 13 +++++++++----
 src/views/modules/plugins/change/resiwelfare.vue    | 13 +++++++++----
 .../plugins/point/icpointnucleicmonitoring.vue      | 13 +++++++++----
 .../plugins/point/icpointvaccinesinoculation.vue    | 13 +++++++++----
 src/views/modules/plugins/rent/resi.vue             | 13 +++++++++----
 src/views/modules/shequzhili/csgltc/csgl.vue        | 13 +++++++++----
 src/views/modules/shequzhili/ggfwtc/ggfw.vue        | 13 +++++++++----
 src/views/modules/shequzhili/xiangmu/index.vue      | 13 +++++++++----
 .../modules/shequzhili/xiangmu/xiangmu-ling.vue     | 13 +++++++++----
 src/views/modules/sys/icvaccineprarmeter.vue        | 13 +++++++++----
 25 files changed, 217 insertions(+), 93 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 848ea83a0..85116b49e 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -812,10 +812,15 @@ export default {
         return false
       }
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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');
+			})
 
 
       //清空上传列表
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ed4a73411..8b24bca15 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1252,10 +1252,14 @@ export default {
 
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
-				duration: 0,
+				dangerouslyUseHTMLString: true,
+				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 = "";
 
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index c9f5bbbc2..d46ff95cc 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -896,10 +896,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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();
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 1fd6ccc38..3909d8202 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -711,10 +711,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 91552bb44..b65e6d94e 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -795,9 +795,14 @@ export default {
 			this.importBtnTitle = "正在上传中...";
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
-				duration: 0,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/base/resi copy.vue b/src/views/modules/base/resi copy.vue
index 85c67e52a..f718cf0a3 100644
--- a/src/views/modules/base/resi copy.vue	
+++ b/src/views/modules/base/resi copy.vue	
@@ -821,10 +821,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 17f30e6db..d9e126924 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1183,9 +1183,14 @@ export default {
 			this.importBtnTitle = "正在上传中...";
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
-				duration: 0,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 0a26f120f..2df87bda6 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -549,10 +549,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index aaa3a99a3..64bc3cbc4 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -640,10 +640,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 608226274..44fd068ee 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -318,10 +318,15 @@ export default {
 
             this.getTableData();
             this.$message({
-              showClose: true,
-              message: '导入中，请到系统管理-导入记录中查看进度',
-              duration: 0
-            })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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);
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 0831e5e73..28d67ca55 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -346,10 +346,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 49909027b..36b55cc5b 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/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,
-          message: "导入中，请到系统管理-导入记录中查看进度",
-          duration: 0,
-        });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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 {
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index acd40b732..9d57a5c46 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -509,10 +509,15 @@ export default {
       if (!url) return;
 
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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); //添加文件对象
diff --git a/src/views/modules/cpts/base2/index.vue b/src/views/modules/cpts/base2/index.vue
index 4927984ec..41699252a 100644
--- a/src/views/modules/cpts/base2/index.vue
+++ b/src/views/modules/cpts/base2/index.vue
@@ -636,9 +636,14 @@ export default {
 
 			this.$message({
 				showClose: true,
-				message: "导入中，请到系统管理-导入记录中查看进度",
-				duration: 0,
+				dangerouslyUseHTMLString: true,
+				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); //添加文件对象
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index 6197262cc..59ad5c0e5 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -711,10 +711,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index beeff894d..52f0763c7 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -767,10 +767,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index 2d2663b12..5d922f0db 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -704,10 +704,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index e93a3ce98..15352d4fd 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -491,10 +491,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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();
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index cab65f3be..8eb2fe2f9 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -429,10 +429,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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();
diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue
index c04af0926..d4bc8b192 100644
--- a/src/views/modules/plugins/rent/resi.vue
+++ b/src/views/modules/plugins/rent/resi.vue
@@ -704,10 +704,15 @@ export default {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 216e3525f..1dc440b29 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/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,
-          message: "导入中，请到系统管理-导入记录中查看进度",
-          duration: 0,
-        });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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 {
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 2086ea9f0..74b8e4e9b 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/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,
-          message: "导入中，请到系统管理-导入记录中查看进度",
-          duration: 0,
-        });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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 {
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 91b88f602..9bbd6aa06 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -439,10 +439,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index 7ec075d1e..015bdee07 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -554,10 +554,15 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index 9a36ac2b7..07f9a5371 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -754,10 +754,15 @@ export default {
       }
 
       this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				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();

From 4220334b229b509a5f8988e1fddedb1b2d7973ff Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 6 Apr 2023 16:25:47 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=A6=82=E8=A7=88=E5=88=97=E8=A1=A8=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/cpts/fwgl.vue  | 4 ++--
 src/views/dataBoard/renfang/house/list.vue | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue
index d2c112759..04e475d9c 100644
--- a/src/views/dataBoard/renfang/cpts/fwgl.vue
+++ b/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
diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue
index 350122e67..a5f264d75 100644
--- a/src/views/dataBoard/renfang/house/list.vue
+++ b/src/views/dataBoard/renfang/house/list.vue
@@ -240,7 +240,6 @@ export default {
 		},
 		async getCount() {
 			const { org_id, houseType, pageNo, pageSize } = this;
-
 			const url = "house_list_total";
 
 			const { data, code, msg } = await requestPostBi(