From 12025770bc99a0532350fd63debbfa66a6dd2bc8 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Fri, 17 May 2024 22:09:06 +0800
Subject: [PATCH] 123

---
 src/api/login.js                              |  7 ++++
 src/layout/components/Navbar.vue              | 33 +++++++++++++++++++
 src/store/getters.js                          |  2 ++
 src/store/modules/user.js                     |  5 +++
 .../system/tenant/add-or-update-tenant.vue    |  4 +--
 src/views/system/tenant/index.vue             | 20 ++++++++---
 vue.config.js                                 |  4 +--
 7 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 3c5bcfe..aab82ce 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -69,3 +69,10 @@ export function getCodeSms() {
     timeout: 20000
   })
 }
+
+export function authTenantList() {
+  return request({
+    url: '/auth/tenant/list',
+    method: 'get'
+  })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1c192d5..c7864cb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,6 +7,19 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+        <el-select
+            v-model="tenantId"
+            filterable
+            reserve-keyword
+            placeholder="请选择平台"
+            :disabled="this.userId !== 1"
+            class="right-menu-item"
+            @change="changeTenant"
+        >
+          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+<!--          <template #prefix><svg-icon icon-class="home"  /></template>-->
+        </el-select>
+
         <search id="header-search" class="right-menu-item" />
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -48,6 +61,8 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import store from "@/store";
+import { authTenantList } from '@/api/login'
 
 export default {
   components: {
@@ -83,10 +98,28 @@ export default {
       }
     }
   },
+  data() {
+    return {
+      tenantId: store.getters.tenantId,
+      userId: store.getters.userId,
+      tenantList: [],
+      tenantEnabled: false
+    }
+  },
+  created() {
+    authTenantList().then(resp => {
+      const { data } = resp;
+      this.tenantList = data;
+    })
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
+    changeTenant(){
+      this.$tab.closeAllPage()
+      this.$router.push("/")
+    },
     async logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
diff --git a/src/store/getters.js b/src/store/getters.js
index d37de70..4e457de 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -8,6 +8,8 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  userId: state => state.user.id,
+  tenantId: state => state.user.tenantId,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 88372bb..6b7f3c4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@ const user = {
     id: '',
     name: '',
     avatar: '',
+    tenantId: '',
     roles: [],
     permissions: []
   },
@@ -24,6 +25,9 @@ const user = {
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
+    SET_TENANT_ID: (state, tenantId) => {
+      state.tenantId = tenantId
+    },
     SET_ROLES: (state, roles) => {
       state.roles = roles
     },
@@ -64,6 +68,7 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
+          commit('SET_TENANT_ID', user.tenantId)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {
diff --git a/src/views/system/tenant/add-or-update-tenant.vue b/src/views/system/tenant/add-or-update-tenant.vue
index 8fc35f6..8d2d181 100644
--- a/src/views/system/tenant/add-or-update-tenant.vue
+++ b/src/views/system/tenant/add-or-update-tenant.vue
@@ -130,7 +130,7 @@ export default {
           if(!this.form.id){
             this.buttonLoading = true;
             addTenant(this.form).then(data => {
-              this.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功");
               this.buttonLoading = false;
               this.open = false
               this.$emit('refreshDataList')
@@ -140,7 +140,7 @@ export default {
           }else{
             this.buttonLoading = true;
             updateTenant(this.form).then(data => {
-              this.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功");
               this.buttonLoading = false;
               this.open = false
               this.$emit('refreshDataList')
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 82c2d3b..c311178 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -71,7 +71,7 @@
     <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" v-if="false" />
-      <el-table-column label="租户编号" align="center" prop="tenantId" />
+      <el-table-column label="平台编号" align="center" prop="tenantId" />
       <el-table-column label="联系人" align="center" prop="contactUserName" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" />
       <el-table-column label="企业名称" align="center" prop="companyName" />
@@ -124,9 +124,8 @@
   </div>
 </template>
 <script>
-import { changeTenantStatus, listTenant, syncTenantPackage } from '@/api/system/tenant'
+import { changeTenantStatus, delTenant, listTenant, syncTenantPackage } from '@/api/system/tenant'
 import AddOrUpdateTenant from '@/views/system/tenant/add-or-update-tenant.vue'
-import { delTenantPackage } from '@/api/system/tenantPackage'
 
 export default {
   name: 'index',
@@ -224,7 +223,20 @@ export default {
       }).finally(() => {
         this.loading = false;
       });
-    }
+    },
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除平台【"' + row.tenantId + '"】的数据项？').then(() => {
+        this.loading = true;
+        return delTenant(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
   }
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index 5d3da61..f6b04a1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-        // target: `http://124.222.254.188:9779/prod-api`,
+        // target: `http://localhost:8080`,
+        target: `http://124.222.254.188:8090`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''