feat：tenantList

threadpool/console/src/layout/components/Navbar.vue

@@ -87,7 +87,7 @@
       tenantInfo(newVal) {
         this.tenant.tenantId = newVal.tenantId
         this.tenant.resource = newVal.resource
-        console.log("ischangLang", newVal)
+        console.log("ischangLang", newVal, this.tenantList)
       }
     },
     methods: {
@@ -106,6 +106,7 @@
         .getCurrentUser(userName)
         .then((response) => {
           const { resources } = response;
+        console.log("isTenList1", resources, this.tenantList)
           if (response.role == 'ROLE_ADMIN') {
             resources.unshift({
               action: "rw",
@@ -115,15 +116,22 @@
               index: 0,
             })
           }
-          const resourcesRes = resources.map((item, index) => ({
+        console.log("isTenList1111111", this.$t('common.allTenant'), resources, this.tenantList)
-            ...item,
+          const resourcesRes = resources.map((item, index) => {
+            let query = {
+              ...item,
             tenantId: item.resource,
             index: index,
-          }))
+            }
+            console.log("=============", index, query, item)
+            return query
+        })
+        console.log("isTenList22222", resourcesRes, this.tenantList)
           this.$store.dispatch('tenant/setTenantList', resourcesRes)
           this.tenant = JSON.parse(this.$cookie.get('tenantInfo')) || resourcesRes[0]
           this.$store.dispatch('tenant/setTenantInfo', this.tenant || resourcesRes[0])
           this.$cookie.set('tenantInfo', JSON.stringify(this.tenant));
+        console.log("isTenList2", this.tenantList)
         })
         .catch(() => {});
         

threadpool/console/src/views/hippo4j/instance/index.vue

@@ -584,6 +584,9 @@ export default {
   created() {
     // this.fetchData()
     // 初始化项目
+      this.listQuery.tenantId = this?.tenantInfo?.tenantId || this.listQuery.tenantId
+      let isAllTenant = this.listQuery.tenantId == i18nConfig.messages.zh.common.allTenant || this.listQuery.tenantId == i18nConfig.messages.en.common.allTenant
+      this.listQuery.tenantId = isAllTenant ? '' : this.listQuery.tenantId
     this.tenantSelectList();
   },
   methods: {
@@ -819,6 +822,7 @@ export default {
       this.itemOptions = [];
       this.threadPoolOptions = [];
       const tenantId = { tenantId: this.listQuery.tenantId, size: this.size };
+      console.log("XXXXXXXXXXXXXXX", tenantId)
       itemApi
         .list(tenantId)
         .then((response) => {