导航

dsk-operate-ui/src/api/login.js

@@ -65,3 +65,11 @@ export function getTenants(data) {
     method: 'post',
   })
 }
+//
+// 切换租户
+export function changeTenants(data) {
+  return request({
+    url: '/switch/tenant?tenantId='+data,
+    method: 'post',
+  })
+}

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -16,12 +16,11 @@
           <el-dropdown-menu slot="dropdown" class="user-dropdown">
             <el-dropdown-item>
               <span>我的企业 <img class="dir" src="@/assets/images/direction.png"> </span>
-              <div class="mycom">
+              <div class="mycom" v-if="tenanlist.length>1">
                 <div class="bg">
-                  <div @click="getorther" class="choose"><img src="@/assets/images/enter.png" class="logos"><span>重庆大司空科技</span><img class="on" src="@/assets/images/tips.png"></div>
-                  <div @click="getorther"><img src="@/assets/images/enter.png" class="logos"><span>重庆大司空科技重庆大司空科技重庆大司空科技重庆大司空科技</span><img class="on" src="@/assets/images/tips.png"></div>
-                  <div @click="getorther"><img src="@/assets/images/enter.png" class="logos"><span>重庆大司空科技</span><img class="on" src="@/assets/images/tips.png"></div>
-                  <div @click="getorther"><img src="@/assets/images/enter.png" class="logos"><span>重庆大司空科技</span><img class="on" src="@/assets/images/tips.png"></div>
+                  <div @click="getorther(item.tenantId)" v-for="(item,index) in tenanlist" :class="{'choose':tenantId == item.tenantId}">
+                    <img src="@/assets/images/enter.png" class="logos"><span>{{item.companyName}}</span><img class="on" src="@/assets/images/tips.png">
+                  </div>
                 </div>
               </div>
             </el-dropdown-item>
@@ -43,6 +42,8 @@
 import { mapGetters } from 'vuex'
 import elementResizeDetectorMaker from "element-resize-detector"
 import TagsView from './TagsView'
+import { getTenants ,changeTenants} from "@/api/login";
+import { getTenantid,setTenantid,setToken} from '@/utils/auth'
 export default {
   props:['offsetWidth'],
   components: {
@@ -50,6 +51,8 @@ export default {
   },
   data() {
     return {
+      tenantId:-1,
+      tenanlist:[],
       scrollerWidth: null,
       navbarWidth: null
     }
@@ -77,8 +80,18 @@ export default {
     })
     this.navbarWidth=`calc(100% - ${this.offsetWidth}px)`
     // this.$refs.mydrodown.show()
+    this.getTetant()
   },
   methods: {
+    getTetant(){
+      this.tenantId = getTenantid()
+      // getTenants(localStorage.getItem('userphone')).then(res=>{
+      getTenants('15823584612').then(res=>{
+        if(res.code == 200){
+          this.tenanlist = res.data
+        }
+      })
+    },
     async logout() {
       this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
@@ -90,7 +103,11 @@ export default {
         })
       }).catch(() => {});
     },
-    getorther(){
+    getorther(id){
+      setTenantid(id)
+      changeTenants(id).then(res=>{
+        setToken(res.data.accessToken)
+      })
       location.reload();
       this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
     }

dsk-operate-ui/src/views/login.vue

@@ -154,6 +154,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
+            localStorage.setItem('userphone',this.loginForm.username)
             this.goin()
           }).catch(() => {
             this.loading = false;

dsk-operate-ui/src/views/system/user/index.vue

@@ -444,6 +444,7 @@ export default {
           }
         ],
         phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",