Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov-zhengwu-yantai

src/main.js

@@ -40,6 +40,7 @@ if (getQueryPara("token")) {
   console.log("token222222", localStorage.getItem("token"));
 }
 
+// 山东通转接专用
 (function () {
   let href = location.href;
   if (href.endsWith("#/") && href.includes("/login_sdt")) {

src/views/main-navbar.vue

@@ -101,7 +101,7 @@
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>
-              <el-dropdown-menu slot="dropdown">
+              <el-dropdown-menu v-if="loginType!='sdt-sso'" slot="dropdown">
                 <el-dropdown-item @click.native="updatePasswordHandle()">{{
                   $t("updatePassword.title")
                 }}</el-dropdown-item>
@@ -135,6 +135,7 @@ export default {
   inject: ["refresh"],
   data() {
     return {
+      loginType: localStorage.getItem("loginType"),
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,

src/views/main-shuju/main-navbar.vue

@@ -117,7 +117,7 @@
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>
-              <el-dropdown-menu slot="dropdown">
+              <el-dropdown-menu v-if="loginType!='sdt-sso'" slot="dropdown">
                 <el-dropdown-item @click.native="updatePasswordHandle()">{{
                   $t("updatePassword.title")
                 }}</el-dropdown-item>
@@ -151,6 +151,7 @@ export default {
   inject: ["refresh"],
   data() {
     return {
+      loginType: localStorage.getItem("loginType"),
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,

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

@@ -605,7 +605,7 @@ export default {
       this.vDisabled = false
       this.bDisabled = false
       if (obj.level === 'building') {//点击楼栋
-        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
         this.selAgencyId = ''
         this.selGridId = ''
         await this.getValiheList()
@@ -613,16 +613,18 @@ export default {
         await this.getBuildList()
         this.buildingId = this.selTreeObj.id
         await this.getUniList()
+        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
         this.vDisabled = true
         this.bDisabled = true
 
       } else if (obj.level === 'neighborHood') {//点击小区
-        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
         this.selAgencyId = ''
         this.selGridId = ''
         await this.getValiheList()
         this.neighborHoodId = this.selTreeObj.id
         await this.getBuildList()
+        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
         this.vDisabled = true
       } else {
         this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)

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

@@ -291,6 +291,8 @@ export default {
   async mounted () {
     this.updateBtnAuths();
 
+    console.log(this.buildingId)
+
     this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
       elseParams: {
         categoryKeys: ["house_info"],