diff --git a/.beagle.yml b/.beagle.yml
index 030c8fae03ab289783166e0a1a83ac075a63403a..07ae0918430df5d4a02c9f94cfdeb50563547b65 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -78,9 +78,9 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
     settings:
       namespace: apaas-v5
-      deployment: apaas-system-ui
-      container: apaas-system-ui
-      image: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:5.0.1-alpha
+      deployment: apaas-manage-ui
+      container: apaas-manage-ui
+      image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.1-alpha
     environment:
       KUBERNETES_SERVER:
         from_secret: KUBERNETES_SERVER
diff --git a/src/App.vue b/src/App.vue
index 9bd68532f3f706d1bf92c05c7a3949ee7e94a73c..e7c1bb1feb041db1f7df025f9721f3a6a67dc8af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -60,9 +60,12 @@ export default {
     },
     nowParent(){
       if(this.pageShow&&this.$store.state.userInfo){
+        console.log(2222222)
+         console.log(this.navMenu)
         // return this.navMenu[this.rowPath.slice(1,4)]
         // return this.pathToData(this.navMenu,this.rowPath)
         return this.navMenu[1]
+       
       }else{
         return ''
       }
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 1e808b6b805508c36f8fdb3ed8358e4d99977576..76fbdd61293a785139b1317d75d8a67af0bd6ad1 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -326,7 +326,7 @@ div {
 }
 
 /* 设置tree的样式 */
-.el-tree {
+/* .el-tree {
   position: static!important;
 }
 .el-tree-node__content{
@@ -336,7 +336,7 @@ div {
   background-image: linear-gradient(90deg, 
 		rgba(255, 255, 255, 0.05) 83%, 
 		rgba(0, 0, 0, 0.05) 86%);
-}
+} */
 /* .usrrole .el-tree-node:focus>.el-tree-node__content{
   background: rgb(248, 249, 253) !important;
 }
@@ -1473,24 +1473,14 @@ border-radius:8px;
 }
 
 .flex_left {
-<<<<<<< HEAD
   height: calc(100% - 20px);
-=======
-  background-color: #fff;
-  height: calc(100% - 16px);
->>>>>>> 133893b61e0b75788c7111d07959c747c7a0fa2d
   width: 320px;
   margin-right: 10px;
   overflow: hidden;
 }
 .flex_right {
-<<<<<<< HEAD
   
   height: calc(100% - 20px);
-=======
-  background-color: #fff;
-  height: calc(100% - 16px);
->>>>>>> 133893b61e0b75788c7111d07959c747c7a0fa2d
   flex: 1;
   
   overflow: hidden;
diff --git a/src/bg-ui/bg-switch.vue b/src/bg-ui/bg-switch.vue
index 5578a31b72810b86dc2b8bb63075cce6b2d10273..9dee5dd89691e6d9f60f5e2bc944529a15e3de1e 100644
--- a/src/bg-ui/bg-switch.vue
+++ b/src/bg-ui/bg-switch.vue
@@ -71,9 +71,10 @@ export default {
       return this.now_index == 0
         ? {
             left: this.gap + "px",
+            
           }
         : {
-            right: this.gap + "px",
+            left: 'calc(100% - 15px)',
           };
     },
   },
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index c51a51f8375a51636c943ea57f9329183e228b84..7b31c81ed62778a03e43faf168ba02acdcf4337f 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -2061,6 +2061,7 @@ a {
     position: absolute;
     // top: 2px;
     background-color: #fff;
+    transition: all .3s,
   }
 
   &.disabled {
diff --git a/src/main.js b/src/main.js
index ea61b70cebc6ca2fff8871f5c07bb97b8cf500b6..3e824b0ba26f5436eb81adb6a708c2eb0c72afa7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,7 +62,7 @@ Promise.all([getUser()]).then(res => {
       store.commit('setUserInfo', res[0].data.data)
   
   
-      if (res[0].data.data.userType == 1) {//超管
+      // if (res[0].data.data.userType == 1) {//超管
         store.commit('setMenu', menu.adminMenu)
         menu.menuToRouter(menu.adminMenu)
         console.log(menu);
@@ -74,7 +74,7 @@ Promise.all([getUser()]).then(res => {
         store.commit('setMenuObj',menuObj)
         console.log(menuObj);
         
-      }
+      // }
     }
     generateRoutes()
     
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index db0c09b1d4a84ca99242b2a3278f0d9123d97801..e9af295b9c40fe697fe7c1dfbc09991f784af611 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -76,7 +76,7 @@ export default {
       this.$axios.get(`/apaas/system/v5/user/getUserInfo`).then((res) => {
         if (res.data.code == 200) {
           this.$store.commit("setUserInfo", res.data.data);
-          if (res.data.data.userType == 1) {
+          // if (res.data.data.userType == 1) {
             //超管
             this.$store.commit("setMenu", menu.adminMenu);
 
@@ -88,7 +88,7 @@ export default {
             let menuObj = {}
             this.getMenuObj(menu.adminMenu,'',menuObj)
             this.$store.commit('setMenuObj',menuObj)
-          }
+          // }
           generateRoutes()
           this.$router.push("/");
         }
@@ -124,8 +124,8 @@ export default {
         .then((res) => {
           if (res.data.code == 200) {
             let data = res.data.data;
-            console.log(data);
-            setCookie("bgToken", data.name);
+            // console.log(data);
+            // setCookie("bgToken", data.name);
 
             this.getUser();
           } else {
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index 972b406bcfb96d8cedcb9777f1c8a50e91a4bf41..dc3ca0bfb0411351556dc9a6428808b88cab5975 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -20,7 +20,17 @@
                   />
                </div>
                <div class="tree">
-                 <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" :default-expand-all="true" />
+                 <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" :default-expand-all="true">
+                    <template #default="{ node, data }">
+                      <div class="custom_tree_node">
+                        <span
+                          class="label-text "
+                          :title="node.label"
+                          >{{ node.label }}
+                        </span>
+                      </div>
+                    </template>
+                 </el-tree>
                </div>
              </div>
            </div>
@@ -31,11 +41,14 @@
               </div>
                 <div class="table_container apaas_scroll">
                   <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
-                    <template v-slot:name="{ row }">
+                    <template v-slot:business_name="{ row }">
                       <span @click="goDetail(row)" class="name_btn">
-                        {{ row.name }}
+                        {{ row.business_name }}
                       </span>
                     </template>
+                    <template v-slot:state="{ row }">
+                      <bg-switch @click="stateChange(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
+                    </template>
                     <template v-slot:action="{ row }">
                       <bg-table-btn class="btn">
                         编辑
@@ -73,36 +86,38 @@ import { reactive, toRefs, ref, } from '@vue/reactivity'
 import { getCurrentInstance } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
 import { useRouter } from 'vue-router';
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
 
   const headers = ref([
         {
           label: "业务系统编码",
-          prop: "code",
+          prop: "business_code",
           width: 180
         },
         {
           label: "业务系统名称",
-          prop: "name",
+          prop: "business_name",
           minWidth: 180
         },
         {
           label: "账号",
-          prop: "account",
+          prop: "system_account",
           width: 150
         },
         {
           label: "所属机构",
-          prop: "org",
+          prop: "organization_name",
           width: 240
         },
         {
           label: "创建时间",
-          prop: "create_time",
+          prop: "created_time",
           width: 150
         },
         {
           label: "是否启用",
-          prop: "is_use",
+          prop: "state",
           width: 80
         },
         {
@@ -112,33 +127,36 @@ import { useRouter } from 'vue-router';
           fixed: "right",
         },
       ])
-  const tableRows = ref([
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-    {code: "YWXT0000001",name: "大数据处理系统",account: "admin",org: "大数据局",create_time: "2022-01-01 00:00",is_use: "是"},
-  ])
+  const tableRows = ref([])
   const search=ref("");
+  const filter = reactive({
+        keyword: "",
+        page: 1,
+        size: 10,
+      });
+  const tableTotal = ref(0);
 
   const router = useRouter();
 
+  const getTableRows = () => {
+      let params = {...filter.value}
+      $axios
+        .get(
+          `/apaas/system/v5/user/list`,
+          {
+            params,
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            tableRows.value = res.data.data || []
+            tableTotal.value = res.data.total
+          }else {
+            $message.error(res.data.msg)
+          }
+        })
+  }
+
   const addAccount = (params) => {
     router.push({
         path: "/develop/account/add",
@@ -242,6 +260,21 @@ import { useRouter } from 'vue-router';
     label: 'label',
   }
 
+  const stateChange = (row) => {
+    const state = row.state.toString(); 
+      $axios
+        .post(
+          `/apaas/system/v5/user/state/${row.organization_id}/${state}`,
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            getTableRows()
+          }else {
+            $message.error(res.data.msg)
+          }
+        })
+  }
+
   const changeSize = (size) => {
 
   }
@@ -261,7 +294,7 @@ import { useRouter } from 'vue-router';
 
 
   onBeforeMount(() => {
-   
+    getTableRows()
   })
 
 
@@ -293,6 +326,16 @@ import { useRouter } from 'vue-router';
 .tree :deep() .el-tree-node>.el-tree-node__children {
   overflow: unset;
 }
+.custom_tree_node {
+  width: 100%;
+  font-size: 14px;
+  color: #202531;
+  padding-right: 16px;
+}
+.label-text:hover {
+  padding: 3px 0;
+  background-color: var(--el-tree-node-hover-bg-color);
+}
 .main_container {
   padding: 15px;
   height: 100%;