From 976bd621eb9cee363dcb923c1a832d2ea1499132 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 16:33:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A4=A7=E6=A6=82=E6=84=8F=E6=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.js | 10 ++++++++-- src/views/pages/login.vue | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/utils/index.js b/src/utils/index.js index 9567f50d6..ec577e6cb 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -43,8 +43,10 @@ export function getDictLabel(dictType, dictValue) { * 清除登录信息 */ export function clearLoginInfo() { + console.log('==========clearLoginInfo') store.commit("resetStore"); localStorage.removeItem("token"); + localStorage.setItem('thePageAtExit', location.href); window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false; } @@ -164,7 +166,11 @@ export function computedCard(idCard) { if (sex % 2 === 0) sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别 else sex = "1"; - return { age, sex, birth }; + return { + age, + sex, + birth + }; } // 将数组分成小块数组的集合 export function spliceIntoChunks(arr, chunkSize) { @@ -203,4 +209,4 @@ export function encryptedData(key, data) { encryptor.setPublicKey(key); // 加密数据 return encryptor.encrypt(data); -} +} \ No newline at end of file diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 8e39a89e2..5c6743163 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -257,7 +257,13 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("token", res.data.token); - this.$router.replace({ name: "index" }); + let href = localStorage.getItem("thePageAtExit"); + if (href) { + localStorage.removeItem("thePageAtExit"); + location.href = href; + } else { + this.$router.replace({ name: "index" }); + } }) .catch(() => { this.endLoading(); From ef7cc8772c6b939caceb392b0df99482d1f1e7a7 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 16:51:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=9B=B2=E4=BA=9B=E4=B8=80=E9=80=9A=20?= =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E5=A5=BD=E4=BD=BF=E4=B8=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index b0275579a..b81df3453 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -137,6 +137,8 @@ import People from "./people"; import cptCard from "@/views/modules/visual/cpts/card"; import gridMap from "@/views/modules/visual/cpts/map/index"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; +import getQueryPara from "dai-js/modules/getQueryPara"; + let loading; //加载动画 @@ -191,6 +193,15 @@ export default { }, async mounted() { + const queryOrgId = getQueryPara("orgId"); + const queryOrgLevel = getQueryPara("orgLevel"); + console.log("orgId", queryOrgId); + if(queryOrgId){ + this.orgId = queryOrgId + this.orgLevel = queryOrgLevel || '' + } + + //加载组织数据 await this.loadOrgData(); await this.loadList(); From 917b985a96372e4571d07cb9838ffcd05665e79c Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 17:15:09 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=86=99=E6=AD=BB=E6=9C=AA=E4=BC=A0?= =?UTF-8?q?=E4=B9=8Blevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index b81df3453..0a27a1144 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -198,7 +198,7 @@ export default { console.log("orgId", queryOrgId); if(queryOrgId){ this.orgId = queryOrgId - this.orgLevel = queryOrgLevel || '' + this.orgLevel = queryOrgLevel || 'community' } From 04a83254d42044d35a6e7bbb7b7e60b2f10fe9d5 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 17:38:29 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=95=E8=AF=95?= =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 0a27a1144..1300abe8b 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -198,7 +198,7 @@ export default { console.log("orgId", queryOrgId); if(queryOrgId){ this.orgId = queryOrgId - this.orgLevel = queryOrgLevel || 'community' + this.orgLevel = queryOrgLevel || 'agency' } From 7cccd076839122e21499595cbeb8fbc4f5e4e196 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 17:46:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/login.vue | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 5c6743163..3e77cdbde 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -154,6 +154,16 @@ export default { }, methods: { + // 登陆后跳转逻辑 + skipAfterLogin() { + let href = localStorage.getItem("thePageAtExit"); + if (href) { + localStorage.removeItem("thePageAtExit"); + location.href = href; + } else { + this.$router.replace({ name: "index" }); + } + }, // 获取公钥 getPubKey() { this.$http @@ -227,7 +237,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("showHeader", "0"); localStorage.setItem("token", res.data.token); - this.$router.replace({ name: "index" }); + this.skipAfterLogin(); }) .catch(() => {}); // epmet-ext9.elinkservice.cn/platform-admin @@ -257,13 +267,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("token", res.data.token); - let href = localStorage.getItem("thePageAtExit"); - if (href) { - localStorage.removeItem("thePageAtExit"); - location.href = href; - } else { - this.$router.replace({ name: "index" }); - } + this.skipAfterLogin(); }) .catch(() => { this.endLoading(); From eb91c66e3f381033cd320ef7ce4c9341fc44cd92 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 5 Nov 2022 18:40:03 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=86=85=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/main-shuju.scss | 7 ++++++ src/views/main-shuju/main.vue | 39 +++++++++++++++++++-------------- src/views/main.vue | 2 +- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index a74a552f5..a87d382e7 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -159,6 +159,13 @@ } } } + + &.z-iframe { + padding-top: 0; + .aui-content--tabs { + padding-top: 0; + } + } } /* Navbar diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 869cd5b9c..e1026e6fd 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -1,22 +1,27 @@ From 9df41339df0d66e306672529975775e00480bea0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 7 Nov 2022 16:08:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=80=9A=E8=BF=87pc=E6=96=B0=E5=A2=9E=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=BA=EF=BC=8C=E7=99=BB=E8=AE=B0=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentcontractreview.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 2654fdaec..b8c46a817 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -196,9 +196,9 @@ From f92f3e4060972b4e45d7f81ab349a2cc7e715ed1 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 7 Nov 2022 16:45:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentcontractreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index b8c46a817..a1d211e33 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -229,7 +229,7 @@ export default { mixinViewModuleOptions: { getDataListURL: '/pli/power/rentContractInfo/page', getDataListIsPage: true, - deleteURL: '/pli/power/rentContractInfo', + deleteURL: '/pli/power/rentContractInfo/delete', deleteIsBatch: true }, optionsV: [],