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/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/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/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/components/resiForm.vue b/src/views/components/resiForm.vue
index 7246d608c..db3d6ac9f 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -198,6 +198,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
+                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">
@@ -295,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
       }
@@ -354,6 +358,8 @@ export default {
     }
     return {
       openSearch: false,
+      isParty: false,
+      partyInfo: [],
       fixedForm: {
         GRID_ID: '',
         VILLAGE_ID: '',
@@ -532,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 })
+          
         }
       })
     },
@@ -671,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 }) => {
@@ -679,8 +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'
+               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/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(() => {});
-    },
   },
 };
 </script>
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(() => {});
-    },
   },
 };
 </script>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 10efef011..5700c7756 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -202,6 +202,7 @@
                            :name="'group' + item.groupId">
                 <resi-form :ref="'group' + item.groupId"
                            :columns="3"
+                           :form-info="item.formInfo && item.formInfo "
                            :support-add="item.supportAdd"
                            :form-id="item.columnName"
                            :form-list="item.itemList" />
@@ -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 && 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/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue
index cc7d8795a..188001175 100644
--- a/src/views/modules/communityParty/members/cpts/record.vue
+++ b/src/views/modules/communityParty/members/cpts/record.vue
@@ -54,8 +54,8 @@
             <el-date-picker
               v-if="scope.row.isEdit"
               v-model="scope.row.timeRange"
-              type="daterange"
-              value-format="yyyy-MM-dd"
+              type="monthrange"
+              value-format="yyyy-MM"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -64,7 +64,7 @@
             <div v-else class="div-content">{{ scope.row.startDate + ' - ' + scope.row.endDate }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="btnType == 'add'" label="操作" align="center" width="120">
+        <el-table-column v-if="!disabled" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <template v-if="scope.row.isEdit">
               <el-button
@@ -80,7 +80,7 @@
                 class="btn-color-edit"
                 >取消</el-button>
             </template>
-            <!-- <template v-else>
+            <template v-else>
               <el-button
                 @click="handleChange(scope.row, 'edit')"
                 type="text"
@@ -101,7 +101,7 @@
                   >删除</el-button
                 >
               </el-popconfirm>
-            </template> -->
+            </template>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index e0269b0aa..11775d811 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -216,11 +216,11 @@ export default {
         address: '',
         rdsj: '',
         sszb: '',
-        isLd: '',
+        isLd: '0',
         ldzh: '',
-        partyZw: '',
-        isDyzxh: '',
-        isMxx: '',
+        partyZw: '0',
+        isDyzxh: '0',
+        isMxx: '0',
         culture: '',
         remark: ''
       },
@@ -239,6 +239,7 @@ export default {
       handler(val) {
         if (Object.keys(val).length > 0) {
           this.form = { ...val }
+          if (val.icResiUserId) this.isAuto = true
           console.log('val----------in', val)
           this.partyOrgs = val.orgPids.split(':')
           console.log('partyOrgs-----', this.partyOrgs)
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)
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index dc685a44e..6ac74f3d2 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -56,7 +56,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()" size="small">{{ $t('query') }}</el-button>
+          <el-button class="diy-button--search" @click="getDataList()" size="small">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
@@ -73,7 +73,7 @@
         <div class="resi-row-btn">
           <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table class="resi-table" :height="tableHeight" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
@@ -114,7 +114,7 @@
   import axios from 'axios'
   import mixinViewModule from '@/mixins/view-module'
   import AddOrUpdate from './icpartymemberpayrecorddetail-add-or-update'
-
+  import { mapGetters } from 'vuex'
     export default {
   mixins: [mixinViewModule],
   data () {
@@ -125,6 +125,7 @@
         deleteURL: '/resi/partymember/icPartyMemberPayRecordDetail',
         deleteIsBatch: true
       },
+      searchH: 0,
       exportBtn: false,
       exportBtnTitle: '导出',
       dataForm: {
@@ -157,6 +158,20 @@
   components: {
     AddOrUpdate
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 270 + this.iframeHeigh
+      const _h = this.clientHeight - 270 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
   created() {
       this.getOrgList()
   },
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 1e132a6fa..ff1acebd8 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -7,7 +7,7 @@
       </div>
       <!-- 列表表格 -->
       <el-table
-          class="table"
+          class="resi-table"
           v-loading="tableLoading"
           :data="tableData"
           :default-expand-all="true"
@@ -37,7 +37,7 @@
                             @click="deleteAgency(scope.row.id)"
                             type="text"
                             size="small"
-                            class="div-table-button--edit">删除</el-button>
+                            class="btn-color-del">删除</el-button>
               </template>
           </el-table-column>
       </el-table>
@@ -47,7 +47,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 :title="memberTitle"
-                width="850px"
+                width="1050px"
                 top="5vh"
                 class="dialog-h"
                 @closed="lookMemberClose">
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 4d2197a8f..ee42fadc9 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -10,15 +10,97 @@
                     :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                     style="width: 100%"
                     highlight-current-row>
-            <el-table-column prop="name"
-                            label="姓名">
-            </el-table-column>
-            <el-table-column prop="mobile"
-                            label="联系方式">
-            </el-table-column>
-            <el-table-column prop="idCard"
-                            label="身份证号">
-            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="姓名"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="idCard"
+              label="身份证号"
+              align="center"
+              min-width="180"
+            />
+            <el-table-column
+              prop="mobile"
+              label="手机号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="rdsj"
+              label="入党时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="sszb"
+              label="所属党组织"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="ldzh"
+              label="流动党员证号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="partyZw"
+              label="职务"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="address"
+              label="地址"
+              align="center"
+              show-overflow-tooltip
+              min-width="180"
+            />
+            <el-table-column
+              prop="isPay"
+              label="是否缴费"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="payDate"
+              label="最近一次缴费时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="culture"
+              label="文化程度"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="point"
+              label="量化积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="activityPoint"
+              label="活跃积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="volunteerCategory"
+              label="志愿者类别"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="center"
+              min-width="180"
+            />
           </el-table>
           <el-pagination
             @size-change="handleSizeChange"
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 49d0755de..4ebad94fb 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -484,20 +484,9 @@ export default {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
         if (type == "cascader") {
-          if (valueArr.length > 0) {
-            let level1 = options.find((item) => item.value == valueArr[0]);
-            if (level1) {
-              if (valueArr.length > 1 && level1.children) {
-                let level2 = level1.children.find(
-                  (item) => item.value == valueArr[1]
-                );
-                if (level2) {
-                  return level1.label + "-" + level2.label;
-                }
-              }
-              return level1.label;
-            }
-          }
+          let finalValue = [];
+          this.getNodePath(options, value, finalValue);
+          return finalValue.join("-");
         } else {
           return valueArr
             .map((val) => {
@@ -513,6 +502,24 @@ export default {
       return "--";
     },
 
+    getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id
+      for (let i = 0; i < node.length; i++) {
+        const ele = node[i];
+        if (ele.value === val) {
+          path.push(ele.label);
+          return path
+        } else if (ele.children && ele.children.length > 0) {
+          if (ele.children.some(row => row.value === val)) {
+            path.unshift(ele.label);
+            this.getNodePath(ele.children,val,path);
+          } else {
+            this.getNodePath(ele.children,val,path);
+          }
+        }
+      }
+      return path;
+    },
+
     //加载组织数据
     async getField() {
       const url = "/oper/customize/icform/getcustomerform";
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 79f533a5c..9ff87022c 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -523,8 +523,38 @@ export default {
             index: index + 1
           }
         })
-        const url = require('../../../../assets/img/shuju/measure/other.png')
-        this.iconUrlArray = [url]
+        this.unitTableData.forEach(item => {
+
+          if (item.type === '楼宇党建') {
+            item.urlIndex = 0
+          } else if (item.type === '两新组织') {
+            item.urlIndex = 1
+          } else if (item.type === '区域单位党建') {
+            item.urlIndex = 2
+          } else if (item.type === '机关直属部门') {
+            item.urlIndex = 3
+          } else if (item.type === '社会团体') {
+            item.urlIndex = 4
+          } else if (item.type === '民办非企业单位') {
+            item.urlIndex = 5
+          } else if (item.type === '基金会') {
+            item.urlIndex = 6
+          } else if (item.type === '其他') {
+            item.urlIndex = 7
+          }
+        });
+        // const url = require('../../../../assets/img/shuju/measure/other.png')
+        // this.iconUrlArray = [url]
+        this.iconUrlArray = [
+          require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
+          require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
+          require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
+          require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
+          require('../../../../assets/img/shuju/measure/other.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/qita.png')//其他
+        ]
 
         this.showMap = true
         //第一次加载完置为false
@@ -655,11 +685,11 @@ export default {
         // this.cateInfo = data
         const colorItem = {
           0: {
-            color: 'rgba(250, 32, 10, 1)',
+            color: '#FA200A',
             icon: require('../../../../assets/img/shuju/measure/lxdj.png')
           },
           1: {
-            color: 'rgba(251, 177, 4, 1)',
+            color: '#FBB104',
             icon: require('../../../../assets/img/shuju/measure/lxzz.png')
           },
           2: {
@@ -667,12 +697,12 @@ export default {
             icon: require('../../../../assets/img/shuju/measure/qydw.png')
           },
           3: {
-            color: 'rgba(65, 181, 104, 1)',
+            color: '#41B568',
             icon: require('../../../../assets/img/shuju/measure/jgzs.png')
           },
           4: {
-            color: 'rgba(192, 21, 195, 1)',
-            icon: require('../../../../assets/img/shuju/measure/qita.png')
+            color: '#50C2ED',
+            icon: require('../../../../assets/img/shuju/measure/other.png')
           },
           5: {
             color: '#ee7801',
@@ -684,17 +714,21 @@ export default {
           },
           7: {
             color: '#0189d5',
-            icon: require('../../../../assets/img/shuju/measure/other.png')
+            
+            icon: require('../../../../assets/img/shuju/measure/qita.png')
           }
         }
         this.partyItem = data.map((item, index) => {
           return {
             ...item,
-            ...colorItem[index],
+            itemStyle: {
+              ...colorItem[item.code]
+            },
             name: item.label,
             isClick: false
           }
         })
+        console.log('this.partyItem----', this.partyItem)
         this.totalCount = 0
         data.forEach(item => {
           this.totalCount += Number(item.value)
@@ -869,18 +903,18 @@ export default {
             item.urlIndex = 7
           }
         });
-        const url = require('../../../../assets/img/shuju/measure/other.png')
-        // this.iconUrlArray = [
-        //   require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
-        //   require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
-        //   require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
-        //   require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-        //   require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
-        //   require('../../../../assets/img/shuju/measure/minban.png'),//民办
-        //   require('../../../../assets/img/shuju/measure/jijin.png'),//基金
-        //   require('../../../../assets/img/shuju/measure/other.png')//其他
-        // ]
-        this.iconUrlArray = [url, url, url, url, url, url, url, url]
+        // const url = require('../../../../assets/img/shuju/measure/other.png')
+        this.iconUrlArray = [
+          require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
+          require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
+          require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
+          require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
+          require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/other.png')//其他
+        ]
+        // this.iconUrlArray = [url, url, url, url, url, url, url, url]
 
 
         //第一次加载完置为false
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index bd73c11ca..4be1b3cc1 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -5,14 +5,14 @@
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           网格党建平面图&nbsp;&nbsp;
-          <el-cascader 
+          <!-- <el-cascader 
             v-model="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
             :getCheckedNodes="getCheckedNodes" 
             @change="handleCascader">
-          </el-cascader>
+          </el-cascader> -->
         </div> 
       </div>
       <div class="card-echart">
@@ -148,7 +148,8 @@ export default {
   },
   async mounted() {
     await nextTick(100);
-    await this.getAgencyList()
+    // 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
@@ -362,8 +362,8 @@ export default {
       // this.$refs.pieChart.hideLoading()
       this.$refs.eduChart.setOption(this.pieEduOptions)
       if (this.noEduInit) {
-        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
         this.pageNo = 1
         this.pageSize = 10;
         this.eduList = []
@@ -462,7 +462,7 @@ export default {
           return {
             ...item,
             color: "#00E5ED",
-            fillColor: "rgba(0, 229, 237, 0.16)"
+            fillColor: "rgba(0, 229, 237, 0)"
           }
         })
 
@@ -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)
diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue
index 1b07df9c1..dedf9f32c 100644
--- a/src/views/modules/visual/communityParty/memberInfo.vue
+++ b/src/views/modules/visual/communityParty/memberInfo.vue
@@ -13,7 +13,7 @@
         <div class="list-wr info-h">
           <div class="list-left info-scroll">
             <div v-for="(item, index) in list" :key="item.id" class="left-item" 
-            :class="current == index &&'left-item-on'" @click="handleTabs(item, index)">
+            :class="current == index ? 'active-item' : ''" @click="handleTabs(item, index)">
               <div class="item-title">{{ item.content }}</div>
               <div class="item-time">{{ item.reportTime }}</div>
             </div>
@@ -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;
diff --git a/src/views/modules/visual/communityParty/options.js b/src/views/modules/visual/communityParty/options.js
index ba0ddd334..a22fd586d 100644
--- a/src/views/modules/visual/communityParty/options.js
+++ b/src/views/modules/visual/communityParty/options.js
@@ -88,7 +88,7 @@ export function pieOption (_charts) {
             // formatter: '{a|{c}}\n\n{name|{b}}',
             formatter: '{a|{c}}\n{r|}\n{name|{b}}',
             minMargin: 5,
-            edgeDistance: 1,
+            edgeDistance: '10%',
             lineHeight: 15,
             color: '#fff',
             fontSize: 12,
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 2924e5200..a0144d62f 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -370,7 +370,7 @@ const vueGis = {
             id: oneIcon.id_,
           },
         });
-        // console.log('oneIcon----', oneIcon)
+        console.log('oneIcon----ddd', oneIcon)
         let polyIconStyle = new Style({
           image: new Icon({
             // anchor: [0.5, 0.5],
@@ -404,14 +404,14 @@ const vueGis = {
               info: { ...oneIcon },
             },
           });
+          console.log('oneIcon----', oneIcon)
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],
               // imgSize: [32, 32],
               // scale: 0.5,
-              src:
-                (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) ||
-                this.iconUrlArray[0],
+              // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
+              src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
             }),
             // text: createTextStyle(oneIcon)
           });
@@ -603,14 +603,24 @@ const vueGis = {
           return styles[feature.getGeometry().getType()];
         };
       })();
-
       // select = new Select({
       //   style: overlayStyle
       // });
       // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01
 
-      map.addLayer(polygonLayer);
+      // map.addLayer(polygonLayer);
       // map.addInteraction(select);
+      select = new Select({
+        style: overlayStyle
+      });
+
+
+      map.addLayer(polygonLayer)
+      if (this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+         console.log('去掉默认点击')
+      } else {
+          map.addInteraction(select);
+      }
     },
 
     //初始化多边形icon图层
diff --git a/src/views/pages/login-sso.vue b/src/views/pages/login-sso.vue
new file mode 100644
index 000000000..5de5fd94d
--- /dev/null
+++ b/src/views/pages/login-sso.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="g-app">
+    <div class="m-hint">登录中...</div>
+  </div>
+</template>
+
+<script>
+import { requestGet, requestPost } from "@/js/dai/request";
+import getQueryPara from "dai-js/modules/getQueryPara";
+
+export default {
+  data() {
+    return {};
+  },
+
+  components: {},
+  computed: {},
+
+  created() {
+    let ticket = getQueryPara("ticket");
+    if (ticket) {
+      this.loginByTicket(ticket);
+    } else {
+      this.getAuthUrl();
+    }
+  },
+  mounted() {},
+
+  methods: {
+    async getAuthUrl() {
+      const url = "/auth/sso/ssoAuthUrl";
+
+      const { data, code, msg } = await requestGet(url, {
+        clientLoginUrl: location.href,
+      });
+
+      if (code === 0) {
+        location.href = data.authUrl + "&mode=ticket";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async loginByTicket(ticket) {
+      const url = "/auth/sso/login?ticket=" + ticket;
+
+      const { data, code, msg } = await requestPost(url, {
+        ticket,
+      });
+
+      if (code === 0) {
+        localStorage.setItem("token", data.token);
+        this.$router.replace({ name: "index" });
+      } else {
+        this.$router.replace({ name: "login-sso" });
+        this.getAuthUrl();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.g-app {
+  width: 100vw;
+  height: 100vh;
+  background-color: #f7f7f7;
+  .m-hint {
+    text-align: center;
+    font-size: 36px;
+    line-height: 100vh;
+    color: #999999;
+    font-weight: bold;
+  }
+}
+</style>
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;