+ :class="current == index ? 'active-item' : ''" @click="handleTabs(item, index)">
{{ item.content }}
{{ item.reportTime }}
@@ -219,7 +219,7 @@ export default {
}
.list-wr {
display: flex;
- padding: 0 32px;
+ // padding: 0 32px;
}
.list-left {
@@ -230,9 +230,13 @@ export default {
flex-shrink: 0;
border-right: 1px dashed #1257c9;
overflow: auto;
+ .active-item {
+ border: 1px solid #0063FE !important;
+ box-shadow: 0px 0px 10px #0063fe inset;
+ }
.left-item {
- padding: 10px 0;
- border-right: 1px dashed #1257c9;
+ padding: 10px 0px 10px 10px;
+ // border-right: 1px dashed #1257c9;
cursor: pointer;
.item-title {
font-size: 16px;
From 7d1cf800773705af5a3e91dd0f09fd84ce26392f Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 9 Jun 2022 17:36:11 +0800
Subject: [PATCH 08/13] bug
---
src/views/modules/visual/communityParty/gridParty.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 0f51c6fa0..4be1b3cc1 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -149,6 +149,7 @@ export default {
async mounted() {
await nextTick(100);
// await this.getAgencyList()
+ await this.getWorkUserInfo()
this.agencyId = this.$store.state.user.agencyId
this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图
this.getEduList() // 左下角列表数据
@@ -164,7 +165,6 @@ export default {
require('../../../../assets/img/shuju/measure/other.png')
]
await this.loadOrgData()
- await this.getWorkUserInfo()
// this.loadMap()
this.getMapData()
// this.isfirstInit = false
@@ -489,7 +489,7 @@ export default {
if (!data.level) {
this.agencyInfo.level = 'street'
}
-
+ this.agencyInfo.agencyLevel = this.agencyInfo.level
},
(rspMsg, data) => {
this.$message.error(rspMsg)
From d5c74cdcca0e49806d61667a0bd0b93eb85d10dc Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 10 Jun 2022 14:48:05 +0800
Subject: [PATCH 09/13] dd
---
src/views/components/editResi.vue | 2 +-
src/views/components/resiForm.vue | 31 ++++++++++++++++---
src/views/modules/base/resi.vue | 8 +++--
.../modules/communityParty/members/index.vue | 2 +-
4 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 542b5841a..751bde6c1 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -348,7 +348,7 @@ export default {
_form = { ...obj }
// return _form
}
- const itemTypes = ['cascader', 'daterange', 'timerange']
+ const itemTypes = ['daterange', 'timerange']
arr.forEach(item => {
if (item.multiSelect || itemTypes.includes(item.itemType)) {
if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 5c5f6680d..db3d6ac9f 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -296,8 +296,11 @@ export default {
}
let initForm = (obj, arr) => {
let _form = {}
- console.log('formInfo---arr', arr)
+ console.log('formInfo---obj', obj)
if (Object.keys(obj).length > 0) {
+ for(const n in obj) {
+ if (obj[n] == null) obj[n] = ''
+ }
_form = { ...obj }
return _form
}
@@ -355,6 +358,8 @@ export default {
}
return {
openSearch: false,
+ isParty: false,
+ partyInfo: [],
fixedForm: {
GRID_ID: '',
VILLAGE_ID: '',
@@ -533,7 +538,10 @@ export default {
// console.log('columnName', item.columnName, columnName)
if (item.columnName === columnName && item.itemType === 'radio' && item.childGroup) {
console.log('columnName', item.columnName, columnName)
- this.$emit('changegroup', { value, childGroup: item.childGroup })
+ if (this.isParty) {
+ this.$emit('changegroup', { value, partyInfo: this.partyInfo, childGroup: item.childGroup })
+ } else this.$emit('changegroup', { value, childGroup: item.childGroup })
+
}
})
},
@@ -672,7 +680,7 @@ export default {
if (this.supportAdd) newForm = this.handlerMuscForm()
return newForm
},
- validateIdcard (idCard) {
+ validateIdcard (idCard, type) {
this.$http
.post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
.then(({ data: res }) => {
@@ -680,10 +688,23 @@ export default {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
+
if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
else this.form.IS_VOLUNTEER = '0'
- if (res.data.isPartyMember == '1') this.form.IS_PARTY = '1'
- else this.form.IS_PARTY = '0'
+
+ if (res.data.isPartyMember == '1') {
+ this.form.IS_PARTY = '1'
+ this.isParty = true
+ this.partyInfo = res.data.detail.ic_party_member
+ } else this.form.IS_PARTY = '0'
+
+ // if (type == 'vol') {
+ // this.isParty = false
+
+ // } else if (res.data.isPartyMember == '1' && val == 'party') {
+ // this.isParty = true
+ // }
+
}
})
.catch(() => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 10efef011..e290da0d5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -202,6 +202,7 @@
:name="'group' + item.groupId">
@@ -832,7 +833,7 @@ export default {
},
async handleChangeGroup (val) {
console.log('changeguoprrrrr----', val)
- let { childGroup, value } = val
+ let { childGroup, value, partyInfo } = val
let hasT = false
let i = 0
@@ -855,7 +856,10 @@ export default {
// console.log('')
}
})
- list.push(childGroup)
+ if (partyInfo.length > 0 && childGroup.tableName == 'ic_party_member') {
+ list.push({...childGroup, formInfo: partyInfo[0] })
+ } else list.push(childGroup)
+
}
} else {
// console.log('changegroup----000', value)
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 3077d9d71..55fae06d5 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -751,7 +751,7 @@ export default {
console.log('user---ppp', user)
// addorupdate query
await this.$http
- .get('/resi/partymember/icPartyOrg/getTreelist', { params: {agencyId: agencyId || user.agencyId} })
+ .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: {agencyId: agencyId || user.agencyId} })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
From d45217807c73643d79f5925e5a37cc9b04da593d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 10 Jun 2022 14:55:00 +0800
Subject: [PATCH 10/13] =?UTF-8?q?sso=E7=99=BB=E5=BD=95=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 5 ++-
.env.production | 1 +
.env.production.sit | 3 +-
.env.production.uat | 3 +-
.env.shibei_production | 3 +-
src/router/index.js | 8 ++++
src/views/pages/login-sso.vue | 73 +++++++++++++++++++++++++++++++++++
src/views/pages/login.vue | 4 ++
8 files changed, 96 insertions(+), 4 deletions(-)
create mode 100644 src/views/pages/login-sso.vue
diff --git a/.env.development b/.env.development
index fa857bf28..bae43a57e 100644
--- a/.env.development
+++ b/.env.development
@@ -9,4 +9,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
VUE_APP_NODE_ENV=dev
#项目根路径
-VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
+VUE_APP_PUBLIC_PATH=epmet-oper
+
+#是否使用另外一种登录方式
+VUE_APP_SSO_LOGIN=off
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 5b72f6d9d..f7b9892ef 100644
--- a/.env.production
+++ b/.env.production
@@ -2,3 +2,4 @@ NODE_ENV=production
VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
VUE_APP_NODE_ENV=prod
VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off
diff --git a/.env.production.sit b/.env.production.sit
index b0c600ea6..786741226 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -2,4 +2,5 @@ NODE_ENV=production
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_NODE_ENV=prod:sit
-VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
+VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off
\ No newline at end of file
diff --git a/.env.production.uat b/.env.production.uat
index 83e93d4d1..5dbdd152d 100644
--- a/.env.production.uat
+++ b/.env.production.uat
@@ -2,4 +2,5 @@ NODE_ENV=production
# VUE_APP_API_SERVER = http://120.27.18.76/api
VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_NODE_ENV=prod:uat
-VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
+VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off
\ No newline at end of file
diff --git a/.env.shibei_production b/.env.shibei_production
index b227d2fa1..36e0547b1 100644
--- a/.env.shibei_production
+++ b/.env.shibei_production
@@ -1,4 +1,5 @@
NODE_ENV=production
VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api
VUE_APP_NODE_ENV=shibei_prod
-VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
+VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index ad6160919..1aafbd543 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,6 +32,14 @@ export const pageRoutes = [
title: "登录",
},
},
+ {
+ path: "/login-sso",
+ component: () => import("@/views/pages/login-sso"),
+ name: "login-sso",
+ meta: {
+ title: "登录",
+ },
+ },
{
path: "/",
name: "index",
diff --git a/src/views/pages/login-sso.vue b/src/views/pages/login-sso.vue
new file mode 100644
index 000000000..50ca7e6c9
--- /dev/null
+++ b/src/views/pages/login-sso.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 6db09b136..80f8b987a 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -140,6 +140,10 @@ export default {
},
},
created() {
+ if (process.env.VUE_APP_SSO_LOGIN == "on") {
+ this.$router.replace({ name: "login-sso" });
+ }
+
//平阴联动平台 登陆
if (this.$route.query.platformToken) {
this.isShowLogin = false;
From bec8c462cb19836da0f2af9172f0eb1ef1df73bf Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 10 Jun 2022 15:37:23 +0800
Subject: [PATCH 11/13] dd
---
src/views/modules/base/resi.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index e290da0d5..5700c7756 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -856,7 +856,7 @@ export default {
// console.log('')
}
})
- if (partyInfo.length > 0 && childGroup.tableName == 'ic_party_member') {
+ if (partyInfo && partyInfo.length > 0 && childGroup.tableName == 'ic_party_member') {
list.push({...childGroup, formInfo: partyInfo[0] })
} else list.push(childGroup)
From 51208ba897e939cfa64e079b11760e0cbfc3c7e2 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 10 Jun 2022 15:48:08 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/pages/login-sso.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/pages/login-sso.vue b/src/views/pages/login-sso.vue
index 50ca7e6c9..5de5fd94d 100644
--- a/src/views/pages/login-sso.vue
+++ b/src/views/pages/login-sso.vue
@@ -51,6 +51,9 @@ export default {
if (code === 0) {
localStorage.setItem("token", data.token);
this.$router.replace({ name: "index" });
+ } else {
+ this.$router.replace({ name: "login-sso" });
+ this.getAuthUrl();
}
},
},
From 46f4a7ee2091f8b9b3526f907246b611b18264b7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 10 Jun 2022 16:11:31 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mixins/login.js | 52 +++++++++++++++++++++++++++
src/utils/index.js | 3 +-
src/views/main-navbar.vue | 44 ++---------------------
src/views/main-shuju/main-navbar.vue | 53 +++++++---------------------
4 files changed, 68 insertions(+), 84 deletions(-)
create mode 100644 src/mixins/login.js
diff --git a/src/mixins/login.js b/src/mixins/login.js
new file mode 100644
index 000000000..47eeeed1e
--- /dev/null
+++ b/src/mixins/login.js
@@ -0,0 +1,52 @@
+import { clearLoginInfo } from "@/utils";
+
+export default {
+ data() {
+ return {};
+ /* eslint-enable */
+ },
+ created() {},
+ activated() {},
+ methods: {
+ // 退出
+ logoutHandle() {
+ this.$confirm(
+ this.$t("prompt.info", { handle: this.$t("logout") }),
+ this.$t("prompt.title"),
+ {
+ confirmButtonText: this.$t("confirm"),
+ cancelButtonText: this.$t("cancel"),
+ type: "warning",
+ }
+ )
+ .then(() => {
+ //关闭所有标签页
+ // tabs, 关闭全部
+ this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+ (item) => item.name === "home"
+ );
+
+ this.$http
+ .post("/auth/login/logout")
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ //别处登陆时 退出不提示 直接跳登陆页即可
+ if (res.code !== 10007) {
+ this.$message.error(res.msg);
+ }
+ }
+
+ clearLoginInfo();
+ this.$router.push({ name: "login" });
+ // if (localStorage.getItem('userType') === 'work') {
+ // this.$router.push({ name: 'loginWork' })
+ // } else {
+ // this.$router.push({ name: 'login' })
+ // }
+ })
+ .catch(() => {});
+ })
+ .catch(() => {});
+ },
+ },
+};
diff --git a/src/utils/index.js b/src/utils/index.js
index c2232ac77..1ef12237d 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,4 +1,3 @@
-import Cookies from 'js-cookie'
import store from '@/store'
/**
@@ -44,7 +43,7 @@ export function getDictLabel(dictType, dictValue) {
*/
export function clearLoginInfo() {
store.commit('resetStore')
- Cookies.remove('token')
+ localStorage.removeItem('token')
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false
}
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index febbcd0ca..15fabb3f2 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -128,9 +128,11 @@ import { messages } from "@/i18n";
import { mapGetters } from "vuex";
import screenfull from "screenfull";
import UpdatePasswordWork from "./main-navbar-update-password-work";
-import { clearLoginInfo } from "@/utils";
+import mixinLogin from "@/mixins/login";
+
export default {
inject: ["refresh"],
+ mixins: [mixinLogin],
data() {
return {
showHeader: true,
@@ -197,46 +199,6 @@ export default {
this.$refs.updatePassowrd.init();
});
},
- // 退出
- logoutHandle() {
- this.$confirm(
- this.$t("prompt.info", { handle: this.$t("logout") }),
- this.$t("prompt.title"),
- {
- confirmButtonText: this.$t("confirm"),
- cancelButtonText: this.$t("cancel"),
- type: "warning",
- }
- )
- .then(() => {
- //关闭所有标签页
- // tabs, 关闭全部
- this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
- (item) => item.name === "home"
- );
-
- this.$http
- .post("/auth/login/logout")
- .then(({ data: res }) => {
- if (res.code !== 0) {
- //别处登陆时 退出不提示 直接跳登陆页即可
- if (res.code !== 10007) {
- this.$message.error(res.msg);
- }
- }
-
- clearLoginInfo();
- this.$router.push({ name: "login" });
- // if (localStorage.getItem('userType') === 'work') {
- // this.$router.push({ name: 'loginWork' })
- // } else {
- // this.$router.push({ name: 'login' })
- // }
- })
- .catch(() => {});
- })
- .catch(() => {});
- },
},
};
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index e0715272f..8478802d5 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -140,9 +140,11 @@ import { messages } from "@/i18n";
import { mapGetters } from "vuex";
import screenfull from "screenfull";
import UpdatePasswordWork from "./main-navbar-update-password-work";
-import { clearLoginInfo } from "@/utils";
+import mixinLogin from "@/mixins/login";
+
export default {
inject: ["refresh"],
+ mixins: [mixinLogin],
data() {
return {
showHeader: true,
@@ -167,10 +169,15 @@ export default {
const customerId = localStorage.getItem("customerId");
let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
//暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
- if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
- for (let index in siteconfigElement){
- if (siteconfigElement[index].id == '6'){
- let newMenuArr = siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
+ if (
+ "04c0d396e298f13e57aa5904a657eaa6" != customerId &&
+ "3fdd0380deff5b30f45376cdf995d1c1" != customerId
+ ) {
+ for (let index in siteconfigElement) {
+ if (siteconfigElement[index].id == "6") {
+ let newMenuArr = siteconfigElement[index].children.filter(
+ (item) => item.id !== "duoyuanfuwufenxi"
+ );
siteconfigElement[index].children = newMenuArr;
}
}
@@ -214,42 +221,6 @@ export default {
this.$refs.updatePassowrd.init();
});
},
- // 退出
- logoutHandle() {
- this.$confirm(
- this.$t("prompt.info", { handle: this.$t("logout") }),
- this.$t("prompt.title"),
- {
- confirmButtonText: this.$t("confirm"),
- cancelButtonText: this.$t("cancel"),
- type: "warning",
- }
- )
- .then(() => {
- //关闭所有标签页
- // tabs, 关闭全部
- this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
- (item) => item.name === "home2"
- );
-
- this.$http
- .post("/auth/login/logout")
- .then(({ data: res }) => {
- if (res.code !== 0) {
- //别处登陆时 退出不提示 直接跳登陆页即可
- if (res.code !== 10007) {
- this.$message.error(res.msg);
- }
- }
-
- clearLoginInfo();
-
- this.$router.push({ name: "login" });
- })
- .catch(() => {});
- })
- .catch(() => {});
- },
},
};