From 83d441347c400bb1fb1cd03f7cce8ae4bcd55852 Mon Sep 17 00:00:00 2001
From: hexiaoyong <hexiaoyong@wodcloud.com>
Date: Mon, 24 Oct 2022 11:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/assets/css/index.css                      |  16 +
 src/main.js                                   |   2 +-
 src/page/login/index.vue                      |  69 +--
 src/page/main/develop/account/add/index.vue   |   6 +-
 .../main/develop/account/detail/index.vue     | 189 ++++++++
 src/page/main/develop/account/index.vue       |  31 +-
 .../system/organization/directory-form.vue    |   9 +-
 src/page/main/system/organization/index.vue   | 446 ++++++------------
 .../system/organization/org-detail/index.vue  | 232 +++++++++
 .../main/system/organization/org-form.vue     |   8 +-
 .../organization/platform-user/index.vue      | 279 +++++++++++
 .../platform-user/platform-account-form.vue   | 107 +++++
 .../platform-user/platform-person-form.vue    |  61 +++
 .../system/organization/system-user/index.vue | 280 +++++++++++
 .../system-user/system-account-form.vue       | 116 +++++
 .../system-user/system-person-form.vue        |  68 +++
 src/page/main/system/organization/tree.vue    |  66 ++-
 .../system/organization/user-detail/index.vue | 189 ++++++++
 src/router/function.js                        |  41 +-
 vite.config.js                                |   2 +-
 yarn.lock                                     |  10 +
 22 files changed, 1849 insertions(+), 379 deletions(-)
 create mode 100644 src/page/main/develop/account/detail/index.vue
 create mode 100644 src/page/main/system/organization/org-detail/index.vue
 create mode 100644 src/page/main/system/organization/platform-user/index.vue
 create mode 100644 src/page/main/system/organization/platform-user/platform-account-form.vue
 create mode 100644 src/page/main/system/organization/platform-user/platform-person-form.vue
 create mode 100644 src/page/main/system/organization/system-user/index.vue
 create mode 100644 src/page/main/system/organization/system-user/system-account-form.vue
 create mode 100644 src/page/main/system/organization/system-user/system-person-form.vue
 create mode 100644 src/page/main/system/organization/user-detail/index.vue

diff --git a/package.json b/package.json
index 402f5a0..49fc32c 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "ace-builds": "^1.9.6",
     "axios": "^0.21.1",
     "clipboard": "^2.0.11",
+    "crypto-js": "^4.1.1",
     "echarts": "^5.3.3",
     "element-plus": "^2.2.9",
     "html2canvas": "^1.4.1",
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 43df1e4..902e8f1 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -1512,3 +1512,19 @@ border-radius:8px;
   background: transparent;
   border-radius: 2px;
 }
+.font_bold {
+  font-size: 18px;
+  color: #202531;
+  font-weight: bold;
+  margin-bottom: 20px;
+}
+.name_btn {
+  color: #3759be;
+  cursor: pointer;
+}
+.fr {
+  float: right;
+}
+.pl-1 {
+  padding-left: 1rem;
+}
diff --git a/src/main.js b/src/main.js
index aeaa433..ea61b70 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,7 +40,7 @@ import menu from './router/function.js'
 
 //获取用户信息
 function getUser() {
-    return axios.get(`/apaas/system/getUserInfo`)
+    return axios.get(`/apaas/system/v5/user/getUserInfo`)
 }
 
 //处理菜单成为对象
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index a12a68d..db0c09b 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -17,12 +17,12 @@
               ></span> -->
           </el-input>
         </el-form-item>
-        <!-- <el-form-item prop="yzm" class="yzm">
+        <el-form-item prop="yzm" class="yzm">
           <div class="yzm_ctx">
             <el-input class="yzm_ipt" v-model.trim="form.yzm" placeholder="请输入验证码" :validate-event="false" @keyup.enter="login_remember_info()"></el-input>
             <img class="yzm_img" title="看不清？换一张" :src="imgSrc" @click="getImg()" />
           </div>
-        </el-form-item> -->
+        </el-form-item>
         <div class="apaas_button">
           <el-button class="btn_sub" type="primary" @click.prevent="login_remember_info()">登 录</el-button>
         </div>
@@ -37,6 +37,8 @@ import menu from '../../router/function'
 import {generateRoutes} from '../../router/index'
 import inputTable from '../../components/input-table.vue';
 import inputObjectTable from '../../components/input-object-table.vue';
+import CryptoJS from "crypto-js"; 
+
 export default {
   props: {},
   components: {
@@ -57,7 +59,7 @@ export default {
   computed: {},
   created() {
     console.log(111);
-    // this.getImg();
+    this.getImg();
   },
   mounted() {},
   methods: {
@@ -71,7 +73,7 @@ export default {
       });
     },
     getUser() {
-      this.$axios.get(`/apaas/system/getUserInfo`).then((res) => {
+      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) {
@@ -93,34 +95,34 @@ export default {
       });
     },
     login_remember_info() {
-      // if (!this.form.userid) {
-      //   return this.$message.error("请输入账号");
-      // }
-      // if (!this.form.password) {
-      //   return this.$message.error("请输入密码");
-      // }
-      // if (!this.form.yzm) {
-      //   return this.$message.error("请输入验证码");
-      // }
-      // this.$axios
-      //   .get(`/apaas/system/checkCaptcha/${this.imgId}/${this.form.yzm}`)
-      //   .then((res) => {
-      //     if (res.data.code == 200) {
-      //       this.login();
-      //     } else {
-      //       this.$message.error(res.data.desc);
-      //     }
-      //   });
-        this.login();
+      if (!this.form.userid) {
+        return this.$message.error("请输入账号");
+      }
+      if (!this.form.password) {
+        return this.$message.error("请输入密码");
+      }
+      if (!this.form.yzm) {
+        return this.$message.error("请输入验证码");
+      }
+      this.$axios
+        .get(`/apaas/system/v5/user/verifyCaptcha?id=${this.imgId}&value=${this.form.yzm}`)
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.login();
+          } else {
+            this.$message.error(res.data.data);
+          }
+        });
     },
     login() {
+
       this.$axios
-        .post(`/apaas/system/login`, {
-          userId: this.form.userid,
-          userPassword: this.form.password,
+        .post(`/apaas/system/v5/user/login`, {
+          system_account: this.form.userid,
+          password: CryptoJS.AES.encrypt(this.form.password,"swuE9cmCZQwrkYRV").toString(),
         })
         .then((res) => {
-          if (res.data.code == "200") {
+          if (res.data.code == 200) {
             let data = res.data.data;
             console.log(data);
             setCookie("bgToken", data.name);
@@ -132,10 +134,10 @@ export default {
         });
     },
     getImg() {
-      this.$axios.get(`/apaas/system/getCaptcha`).then((res) => {
+      this.$axios.get(`/apaas/system/v5/user/getCaptcha??width=240&height=32`).then((res) => {
         if (res.data.code == 200) {
-          this.imgId = res.data.data.key;
-          this.imgSrc = res.data.data.image;
+          this.imgId = res.data.data.id;
+          this.imgSrc = res.data.data.captcha;
         }
       });
     },
@@ -174,7 +176,12 @@ export default {
   width: 240px;
 }
 .yzm_img {
-  vertical-align: middle;
+  vertical-align: middle;    
+  width: 150px;
+  height: 32px;
+  margin-left: 10px;
+  display: inline-block;
+
 }
 .btn_sub {
   width: 400px;
diff --git a/src/page/main/develop/account/add/index.vue b/src/page/main/develop/account/add/index.vue
index 5bcae62..7f7450b 100644
--- a/src/page/main/develop/account/add/index.vue
+++ b/src/page/main/develop/account/add/index.vue
@@ -44,11 +44,12 @@
                      
                 </div>
                 <div class="content_main">
-                    <systemForm v-show="step === 1" ref="systemFormRef" :data="tempFormData" @action="getSystemFormData"></systemForm>
-                    <contactForm v-show="step === 2" ref="contactFormRef" :data="tempFormData" @action="getContactFormData"></contactForm>
+                    <systemForm v-show="step === 1" ref="systemFormRef" @action="getSystemFormData"></systemForm>
+                    <contactForm v-show="step === 2" ref="contactFormRef" @action="getContactFormData"></contactForm>
                     <div class="process_end" v-show="step === 3">
                         <div>
                             <div><img src="@/assets/imgs/img_data-complete.png" alt=""></div>
+                            <div class="font_bold">业务系统新增成功</div>
                             <el-button  @click="cancel">返回列表</el-button>
                             <el-button type="primary" @click="continueCreate">继续创建</el-button>
                         </div>
@@ -84,7 +85,6 @@ const router = useRouter();
 const step = ref(1);
 const systemFormRef = ref(null);
 const contactFormRef = ref(null);
-const tempFormData = ref(null)
 const formData = reactive({
   org: '',
   code: '',
diff --git a/src/page/main/develop/account/detail/index.vue b/src/page/main/develop/account/detail/index.vue
new file mode 100644
index 0000000..a4fb31f
--- /dev/null
+++ b/src/page/main/develop/account/detail/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="page_container">
+        <div class="bg-breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> 开发管理 </el-breadcrumb-item>
+                 <el-breadcrumb-item :to="{ path: '/develop/account' }"> 系统账号管理 </el-breadcrumb-item>
+                <el-breadcrumb-item > 详情 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="page_content apaas_scroll">
+                <div class="info_row">
+                <div class="title">
+                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content">
+                    <div class="img_box">
+                        <img src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                    </div>
+                    <div class="info_box">
+                        <bg-info :data="baseInfo"></bg-info>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="title">
+                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content">
+                    <div class="img_box"></div>
+                    <div class="info_box">
+                        <bg-info :data="contactInfo"></bg-info>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { reactive, toRefs, ref, } from '@vue/reactivity'
+import { getCurrentInstance } from 'vue'
+import { computed, onBeforeMount } from '@vue/runtime-core'
+import { useRouter } from 'vue-router';
+
+const baseInfo = reactive(
+    [
+    {
+      name: "所属机构",
+      value: "某某省/某某市/大数据局",
+      nameWidth: 112
+    },
+    {
+      name: "业务系统编码",
+      value: "00000001",
+      nameWidth: 112
+    },
+    {
+      name: "业务系统名称",
+      value: "大数据处理系统",
+      nameWidth: 112
+    },
+    {
+      name: "账号",
+      value: "admin001",
+      nameWidth: 112
+    },
+    {
+      name: "AppID",
+      value: "dasjkjjk",
+      nameWidth: 112
+    },
+    {
+      name: "AppSecret",
+      value: "asda*******************jhjh",
+      nameWidth: 112
+    },
+    {
+      name: "创建人",
+      value: "admin（机构管理员）",
+      nameWidth: 112
+    },
+    {
+      name: "创建时间",
+      value: "2022-01-01 10:10:10",
+      nameWidth: 112
+    },
+    {
+      name: "是否启用",
+      value: "是",
+      nameWidth: 112
+    },
+    {
+      name: "开发厂商名单",
+      value: "某某大数据开发商",
+      nameWidth: 112
+    },
+    {
+      name: "访问地址",
+      value: "http://www.bigdata.com",
+      full: true,
+      nameWidth: 112
+    },
+    {
+      name: "业务系统描述",
+      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      full: true,
+      nameWidth: 112
+    },
+  ]
+  )
+
+  const contactInfo = reactive(
+    [{
+      name: "联系人姓名",
+      value: "xxx",
+      nameWidth: 112
+    },
+    {
+      name: "联系人手机号",
+      value: "15627365265",
+      nameWidth: 112
+    },
+    {
+      name: "联系人邮箱",
+      value: "http://www.bigdata@163.com",
+      full: true,
+      nameWidth: 112
+    },
+    {
+      name: "备注",
+      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      full: true,
+      nameWidth: 112
+    },
+  ]
+  )
+
+  onBeforeMount(() => {
+     
+ })
+</script>
+
+<style scoped>
+.page_content {
+    padding: 15px;
+    overflow: auto;
+}
+.info_content {
+    display: flex;
+}
+.info_row {
+    margin-bottom: 40px;
+}
+.img_box {
+    width: 120px;
+}
+.info_box {
+    width: 60%;
+}
+
+.title {
+  font-size: 18px;
+  color: #1a1a1a;
+  font-weight: bold;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+.dashed_line {
+    flex: 1;
+    height: 1px;
+    margin: 0 10px;
+	border-bottom: dashed 1px #dadee7;
+}
+
+.icon_box {
+    display: inline-block;
+    width: 4px;
+	height: 14px;
+	background-color: #3759be;
+	border-radius: 2px;
+    margin-right: 5px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index f6c52af..972b406 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -31,6 +31,11 @@
               </div>
                 <div class="table_container apaas_scroll">
                   <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
+                    <template v-slot:name="{ row }">
+                      <span @click="goDetail(row)" class="name_btn">
+                        {{ row.name }}
+                      </span>
+                    </template>
                     <template v-slot:action="{ row }">
                       <bg-table-btn class="btn">
                         编辑
@@ -133,9 +138,6 @@ import { useRouter } from 'vue-router';
   const search=ref("");
 
   const router = useRouter();
-  onBeforeMount(() => {
-   
-  })
 
   const addAccount = (params) => {
     router.push({
@@ -240,13 +242,27 @@ import { useRouter } from 'vue-router';
     label: 'label',
   }
 
-   const changeSize = (size) => {
+  const changeSize = (size) => {
 
-    }
+  }
 
-    const changePage = (size) => {
+  const changePage = (size) => {
 
-    }
+  }
+
+  const goDetail = (params) => {
+     router.push({
+        path: "/develop/account/detail",
+        query: {
+          id: params.id
+        }
+      })
+  }
+
+
+  onBeforeMount(() => {
+   
+  })
 
 
 </script>
@@ -285,6 +301,7 @@ import { useRouter } from 'vue-router';
   height: calc(100% - 30px);
   overflow: auto;
 }
+
 .pagination_box {
   position: sticky;
   position: -webkit-sticky;
diff --git a/src/page/main/system/organization/directory-form.vue b/src/page/main/system/organization/directory-form.vue
index 372e841..533f6dc 100644
--- a/src/page/main/system/organization/directory-form.vue
+++ b/src/page/main/system/organization/directory-form.vue
@@ -5,11 +5,15 @@
     :model="directoryForm"
     :rules="directoryFormRules"
     ref="directoryRef"
-    style="max-width: 66%"
+    style="max-width: 80%"
   >
     <el-form-item label="上级目录" prop="parent">
-      <el-input v-model="directoryForm.parent" />
+      <el-input v-model="directoryForm.parent" style="width: 80%;" />
+      <el-form-item label="" style="padding-left: 16px">
+        <el-checkbox v-model="directoryForm.level" label="顶级"/>
+      </el-form-item>
     </el-form-item>
+    
     <el-form-item label="名称" prop="name">
       <el-input v-model="directoryForm.name" />
     </el-form-item>
@@ -22,6 +26,7 @@ import { reactive, ref, onMounted } from 'vue'
 const directoryForm = reactive({
   parent: '',
   name: '',
+  level: ''
 })
 
 const directoryFormRules = reactive({
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index 2f60cd5..2c2499f 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -20,40 +20,7 @@
                   />
                </div>
                <div class="tree">
-                 <!-- <el-tree class="file-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 "
-                        :class="{'is_active': treeSelected === data.dept}"
-                        :title="node.label"
-                        >{{ node.label }}
-                      </span>
-                      <span class="tree-action-box" :class="{'position_sticky': isSticky(data.label) }" @click.stop="showAction($event, data,node)">
-                        <bg-icon
-                          class="tree-more"
-                          icon="#bg-ic-s-more"
-                        ></bg-icon>
-                      </span>
-                    </div>
-                  </template>
-                 </el-tree>
-                 <Teleport to="body">
-                    <div
-                      class="tree-action"
-                      v-show="actionFlag"
-                      :style="{ top: acTop, left: acLeft }"
-                    >
-                     
-                      <div class="action" >
-                        上移
-                      </div>
-                      <div class="action" >
-                        下移
-                      </div>
-                    </div>
-                  </Teleport> -->
-                  <tree></tree>
+                  <tree @create="treeCreate"></tree>
                </div>
              </div>
            </div>
@@ -68,6 +35,11 @@
               </div>
                 <div class="table_container apaas_scroll">
                   <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
+                    <template v-slot:account="{ row }">
+                      <span @click="goDetail(row)" class="name_btn">
+                        {{ row.account }}
+                      </span>
+                    </template>
                     <template v-slot:action="{ row }">
                       <bg-table-btn class="btn">
                         编辑
@@ -94,43 +66,86 @@
               </div>
            </div>
         </div>
+        <el-dialog
+          v-model="dialogDirectory"
+          :title="action === 'create' ? '新增目录' : '编辑目录' "
+          width="758px"
+          :before-close="handleCloseDirectoryDirectory"
+        >
+          <div class="dialog_form">
+            <directoryForm ref="directoryFormRef" @action="getDirectoryFromData"></directoryForm>
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseDirectory">取消</el-button>
+              <el-button type="primary" @click="saveDirectory">保存</el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog
+          v-model="dialogOrg"
+          :title="action === 'create' ? '新增组织' : '编辑组织'"
+          width="758px"
+          :before-close="handleCloseOrg"
+        >
+          <div class="dialog_form">
+            <orgForm ref="orgFormRef" @action="getOrgFromData"></orgForm>
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseOrg">取消</el-button>
+              <el-button type="primary" @click="saveOrg">保存</el-button>
+            </span>
+          </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup>
 import { Search } from '@element-plus/icons-vue'
-import { reactive, toRefs, ref, } from '@vue/reactivity'
-import { getCurrentInstance } from 'vue'
+import { reactive, toRefs, ref } from '@vue/reactivity'
+import { getCurrentInstance, nextTick } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
 import { useRouter } from 'vue-router';
 import tree from './tree.vue';
-  const baseInfo = ref(
+import directoryForm from './directory-form.vue';
+import orgForm from './org-form.vue';
+  
+  const baseInfo = reactive(
     [
     {
-      name: "能力名称",
-      value: "",
-      nameWidth: 112
+      name: "机构类型",
+      value: "政务机构",
+      nameWidth: 130
+    },
+    {
+      name: "组织机构代码",
+      value: "0000001",
+      nameWidth: 130
     },
     {
-      name: "调用地址",
-      value: "",
-      nameWidth: 112
+      name: "机构名称",
+      value: "科技局",
+      nameWidth: 130
     },
     {
-      name: "是否TLS协议",
-      value: "",
-      full: true,
-      nameWidth: 112
+      name: "创建时间",
+      value: "2022-10-10 10:10:10",
+      nameWidth: 130
     },
     {
-      name: "是否TLS协议",
-      value: "",
-      full: true,
-      nameWidth: 112
+      name: "组织管理员数量",
+      value: "10",
+      nameWidth: 130
+    },
+    {
+      name: "业务系统数量",
+      value: "22",
+      nameWidth: 130
     },
   ]
   )
-  const headers = ref([
+  const headers = reactive([
         {
           label: "账号",
           prop: "account",
@@ -164,7 +179,7 @@ import tree from './tree.vue';
         },
       ])
  
-  const tableRows = ref([
+  const tableRows = reactive([
     {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
     {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
     {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
@@ -186,13 +201,10 @@ import tree from './tree.vue';
   const search=ref("");
 
   const router = useRouter();
-  onBeforeMount(() => {
-   
-  })
-
+  
   const addAccount = (params) => {
     router.push({
-        path: "/develop/account/add",
+        path: "/system/organization/system-user",
         query: {
           type: params
         }
@@ -204,158 +216,82 @@ import tree from './tree.vue';
     console.log(treeSelected.value)
   }
 
-  const data = [
-    {
-      label: '平台用户组织',
-      dept: 1
-    },
-    {
-      label: '湖北省efadsfasfdgsafgfdtrgsdfsfsd555',
-      dept: 4,
-      children: [
-        {
-          label: '武汉市啊实打实大苏打大阿斯顿发士大夫地',
-          children: [
-            {
-              label: '公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅',
-              dept: 2
-            },
-            {
-              label: 'fddfsgdfgdfgdsfsffsdfsdfsdfwefadsgs',
-               dept: 3
-            },
-            {
-              label: '咯技术的卡洛斯达拉斯达拉斯昆德拉老师',
-              dept: 5,
-            },
-          ],
-        },
-        {
-          label: '荆州市',
-          dept: 6,
-          children: [
-            {
-              label: '公安局',
-              dept: 7,
-            },
-            {
-              label: '应急管理局',
-              dept: 8,
-            },
-          ],
-        }
-      ],
-    },
-    {
-      label: '四川省',
-      dept: 9,
-      children: [
-        {
-          label: '成都市',
-          dept: 10,
-          children: [
-            {
-              label: '天府新区',
-              dept: 11,
-            },
-          ],
-        },
-      ],
-    },
-    {
-      label: '比格大数据',
-      dept: 12,
-      children: [
-        {
-          label: '武汉研发中心',
-          dept: 13,
-          children: [
-            {
-              label: '研发部',
-              dept: 14,
-            },
-          ],
-        },
-        {
-          label: '西南大区',
-          dept: 15,
-          children: [
-            {
-              label: '事业部',
-              dept: 16,
-            },
-            {
-              label: '事业部',
-              dept: 17,
-            },
-            {
-              label: '事业部',
-              dept: 18,
-            },
-            {
-              label: '事业部',
-              dept: 19,
-            },
-            {
-              label: '事业部',
-              dept: 20,
-            },
-            {
-              label: '事业部',
-              dept: 21,
-            },
-            {
-              label: '事业部',
-              dept: 22,
-            },
-          ],
-        },
-      ],
-    },
-  ]
 
-  const defaultProps = {
-    children: 'children',
-    label: 'label',
+  const changeSize = (size) => {
+
   }
 
-   const changeSize = (size) => {
+  const changePage = (size) => {
 
-    }
+  }
 
-    const changePage = (size) => {
+  const dialogDirectory = ref(false) 
+  const handleCloseDirectory = () => {
+    dialogDirectory.value = false;
+  }
 
-    }
-  const acTop = ref(0);
-  const acLeft = ref(0);
-  const actionFlag = ref(false)
-  const showAction = (e, data,node) => {
-    const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
-    console.log(rect, data,node);
-    acTop.value = rect.y - 17 + "px";
-    acLeft.value = rect.x + 35 + "px";
-    actionFlag.value = true;
-    // state.selectData = data
-    // if(node.parent.data.children){
-    //   state.selectParentData = node.parent.data
-    // }else{
-    //   //没有children则是最上层元素
-    //   state.selectParentData = null
-    // }
-  };
-  const isSticky = (data) => {
+  const directoryFormRef = ref(null)
+  const saveDirectory = () => {
+    directoryFormRef.value.submitForm();
+  }
+
+  const getDirectoryFromData = (data) => {
+    console.log(111111)
+    console.log(data)
+  }
+
+  const dialogOrg = ref(false) 
+  const handleCloseOrg = () => {
+    dialogOrg.value = false;
+  }
+
+  const orgFormRef = ref(null)
+  const saveOrg = () => {
+    orgFormRef.value.submitForm();
+  }
 
-          const canvas = document.createElement("canvas");
-          const context = canvas.getContext("2d");
-          context.font = '14px MicrosoftYaHei';
-          const { width } = context.measureText(data);
+  const getOrgFromData = (data) => {
+    console.log(111111)
+    console.log(data)
+  }
+  const action = ref('create')
+  const treeCreate = (data) => {
+    action.value = data.action
+    if(data.action === 'create' || data.action === 'edit') {
+      if(data.type === 'org') {
+        dialogOrg.value = true;
+        
+        if(data.data.value) {
+          orgFormRef.value.setForm({parent: data.data.value.dept});
+        }
 
-          console.log(data)
-           console.log(width)
+      }else {
+        dialogDirectory.value = true;
+        nextTick(()=> {
+          if(data.data.value) {
+          directoryFormRef.value.setForm({parent: data.data.value.dept});
+        }
+        })
+      }
+    }else {
+      console.log(data.action)
+    }
+  }
 
-          return width > 252 ? true : false;
+  const goDetail = (params) => {
+     router.push({
+        path: "/system/organization/user-detail",
+        query: {
+          id: params.id
+        }
+      })
   }
 
+  onBeforeMount(() => {
+   
+  })
+
+
 
 </script>
 
@@ -415,118 +351,12 @@ import tree from './tree.vue';
   height: calc(100% - 20px);
   overflow: auto;
 }
-.pagination_box {
-  position: sticky;
-  position: -webkit-sticky;
-  margin-top: 16px;
-  bottom: 1px;
-  background-color: #fff;
-  z-index: 1024;
-  height: 40px;
-  line-height: 40px;
-  padding-top: 5px;
-}
+
 .bg-pagination {
   bottom: unset
 }
-
-.tree-action-box {
-    display: none;  
-    position: absolute;
-    right: -5px;
-    top: 0px;
-    width: 44px;
-    height: 36px;
-    line-height: 36px;
-    text-align: center;
-    background-color: #f2f3f7;
-    box-shadow: -3px 0px 8px -3px 
-		rgba(0, 7, 101, 0.15);
-}
-.position_sticky {
-  position: sticky;
-  position: -webkit-sticky;
-}
-.tree-more {
-  font-size: 12px;
-  color: #3759be;
-}
-
-.file-tree :deep() .el-tree-node__content:hover .tree-action-box {
-  display: inline-block;
-}
-.file-tree :deep() .el-tree-node > .el-tree-node__children {
-  overflow: visible;
-}
-.file-tree :deep() .el-tree-node__content {
-  position: relative;
-}
-.action-box:hover .tree-action {
-  display: block;
-}
-.label-text {
-  font-size: 14px;
-	color: #404a62;
-}
-.tree-action-box:hover + .label-text {
-  padding: 8px 0;
-  background-color: var(--el-tree-node-hover-bg-color);
-}
-.label-text:hover {
-  padding: 8px 0;
-  background-color: var(--el-tree-node-hover-bg-color);
-}
-.is_active {
-  padding: 8px 0;
-  background-color: var(--el-tree-node-hover-bg-color);
-}
-
-.custom_tree_node {
-  width: 100%;
-  font-size: 14px;
-  color: #202531;
-  padding-right: 16px;
-}
-.text_clip {
-      width: 100%;
-    display: inline-block;
-}
-
-.tree-action .action {
-  width: 100%;
-  height: 34px;
-  line-height: 34px;
-  padding-left: 16px;
-  font-size: 14px;
-  color: #202531;
-  cursor: pointer;
-}
-.tree-action :deep().el-upload {
-  width: 100%;
-}
-.tree-action .action:hover {
-  background-color: #eff2fa;
-  color: #3759be;
-}
-
-.tree-action .disable{
-  cursor: not-allowed;
-  color: #616f94;
-}
-.tree-action .disable:hover{
-  background-color: #fff;
-  color: #616f94;
-}
-
-.tree-action {
-  /* display: none; */
-  width: 144px;
-  background-color: #ffffff;
-  box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
-  padding: 4px 0;
-  border-radius: 4px;
-  position: fixed;
-  z-index: 9;
+.dialog_form {
+  padding: 16px;
 }
 
 </style>
\ No newline at end of file
diff --git a/src/page/main/system/organization/org-detail/index.vue b/src/page/main/system/organization/org-detail/index.vue
new file mode 100644
index 0000000..565964c
--- /dev/null
+++ b/src/page/main/system/organization/org-detail/index.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="page_container">
+        <div class="bg-breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/system/organization' }"> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item> 组织详情 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="page_content apaas_scroll">
+                <div class="info_row">
+                <div class="title">
+                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content">
+                    <div class="info_box">
+                        <bg-info :data="baseInfo"></bg-info>
+                    </div>
+                    <div class="org_file info_box">
+                      <div class="pl-1">组织附件</div>
+                      <div>
+                        <div class="file_item pl-1">
+                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-doc"></bg-icon></span>
+                          <span class="file_name">xxxxxxx协议.doc</span>
+                          <span class="fr download_btn">
+                            <el-button type="primary" @click="downloadFile"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
+                          </span>
+                        </div>
+                        <div class="file_item pl-1">
+                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-zip"></bg-icon></span>
+                          <span class="file_name">xxxxxxx协议.zip</span>
+                          <span class="fr download_btn">
+                            <el-button type="primary"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
+                          </span>
+                        </div>
+                        <div class="file_item pl-1">
+                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-image"></bg-icon></span>
+                          <span class="file_name">xxxxxxx协议.jpg</span>
+                          <span class="fr download_btn">
+                            <el-button type="primary"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="title">
+                    <div><span  class="icon_box"></span> 业务系统信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content info_box">
+                    <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
+                       
+                      </bg-table>
+                      <div class="pagination_box">
+                     <bg-pagination
+                        :page="1"
+                        :size="10"
+                        :total="100"
+                        @change-page="changePage"
+                        @change-size="changeSize"
+                      >
+                      </bg-pagination>
+                  </div>       
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { reactive, toRefs, ref, } from '@vue/reactivity'
+import { getCurrentInstance } from 'vue'
+import { computed, onBeforeMount } from '@vue/runtime-core'
+import { useRouter } from 'vue-router';
+
+const baseInfo = reactive(
+    [
+    {
+      name: "机构名称",
+      value: "大数据局",
+      nameWidth: 130
+    },
+    {
+      name: "组织机构代码",
+      value: "00000001",
+      nameWidth: 130
+    },
+    {
+      name: "组织管理员数量",
+      value: "15",
+      nameWidth: 130
+    },
+    {
+      name: "业务系统数量",
+      value: "10",
+      nameWidth: 130
+    },
+    {
+      name: "组织描述",
+      value: "组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述",
+      nameWidth: 130
+    },
+  ])
+
+  const headers = reactive([
+        {
+          label: "业务系统名称",
+          prop: "name",
+        },
+        {
+          label: "是否启用",
+          prop: "is_use",
+        },
+        {
+          label: "业务系统账号",
+          prop: "account",
+        },
+      ])
+ 
+  const tableRows = reactive([
+    {name: '大数据处理系统',is_use: "是",account: "admin"},
+    {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    // {name: '大数据处理系统',is_use: "是",account: "admin"},
+    
+  ])
+
+  const changeSize = (size) => {
+
+  }
+
+  const changePage = (size) => {
+
+  }
+
+  const downloadFile = (data) => {
+
+  }
+
+  onBeforeMount(() => {
+     
+ })
+</script>
+
+<style scoped>
+.page_content {
+    padding: 15px;
+    overflow: auto;
+    font-size: 14px;
+	  color: #202531;
+}
+.info_content {
+    /* display: flex; */
+}
+.org_file {
+  margin-top: 15px;
+}
+.file_item {
+  height: 48px;
+  line-height: 48px;
+	background-color: #fafafa;
+	border-radius: 4px;
+  font-size: 14px;
+  margin-bottom: 8px;
+}
+.file_name {
+  padding-left: 10px;
+	color: #202531;
+}
+.download_btn {
+  padding-right: 4px;
+}
+.info_row {
+    margin-bottom: 40px;
+}
+.img_box {
+    width: 120px;
+}
+.info_box {
+    width: 60%;
+}
+
+.title {
+  font-size: 18px;
+  color: #1a1a1a;
+  font-weight: bold;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+.dashed_line {
+    flex: 1;
+    height: 1px;
+    margin: 0 10px;
+	border-bottom: dashed 1px #dadee7;
+}
+
+.icon_box {
+    display: inline-block;
+    width: 4px;
+	height: 14px;
+	background-color: #3759be;
+	border-radius: 2px;
+    margin-right: 5px;
+}
+
+.pagination_box {
+  position: sticky;
+  position: -webkit-sticky;
+  margin-top: 16px;
+  bottom: -15px;
+  background-color: #fff;
+  z-index: 1024;
+  height: 40px;
+  line-height: 40px;
+  padding-top: 5px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue
index 53ea24e..dd18bc3 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -5,10 +5,13 @@
     :model="orgForm"
     :rules="formRules"
     ref="orgRef"
-    style="max-width: 66%"
+    style="max-width: 80%"
   >
     <el-form-item label="上级目录" prop="parent">
-      <el-input v-model="orgForm.parent" />
+      <el-input v-model="orgForm.parent" style="width: 80%"/>
+      <el-form-item label="" style="padding-left: 16px">
+        <el-checkbox v-model="orgForm.level" label="顶级"/>
+      </el-form-item>
     </el-form-item>
     <el-form-item label="政务机构名称" prop="orgName">
       <el-input v-model="orgForm.orgName" />
@@ -32,6 +35,7 @@ import { reactive, ref, onMounted } from 'vue'
 
 const orgForm = reactive({
   parent: '',
+  level: '',
   orgName: '',
   code: '',
   desc: '',
diff --git a/src/page/main/system/organization/platform-user/index.vue b/src/page/main/system/organization/platform-user/index.vue
new file mode 100644
index 0000000..252df27
--- /dev/null
+++ b/src/page/main/system/organization/platform-user/index.vue
@@ -0,0 +1,279 @@
+<template>
+    <div class="page_container">
+        <div class="bg-breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/system/organization' }"> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item> 新增平台用户 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="page_content flex_cloumn">
+            <div class="content_top apaas_scroll">
+                <div class="content_process">
+                    <div>
+                        <el-steps :active="step" >
+                            <el-step title="" :class="{'process_complete': step > 1}">
+                                <template #icon>
+                                    <span class="process_desc">
+                                        <span class="icon_box" v-if="step > 0"><bg-icon class="step_icon" icon="#bg-ic-file"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                    账号信息
+                                    </span>
+                                </template>
+                            </el-step>
+                            <el-step title="" :class="{'process_complete': step > 2}">
+                                <template #icon>
+                                    <span class="process_desc">
+                                        <span class="icon_box" v-if="step > 1"><bg-icon class="step_icon" icon="#bg-ic-file-staff"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                        个人
+                                    </span>
+                                </template>
+                            </el-step>
+                            <el-step title="">
+                                <template #icon>
+                                    <span class="process_desc">
+                                    <span class="icon_box" v-if="step > 2"><bg-icon class="step_icon" icon="#bg-ic-file-success"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                        完成
+                                    </span>
+                                </template>
+                            </el-step>
+                        </el-steps> 
+                    </div>
+                     
+                </div>
+                <div class="content_main">
+                    <platformAccountForm v-show="step === 1" ref="platformAccountFormRef" @action="getPlatformAccountFormData"></platformAccountForm>
+                    <platformPersonForm v-show="step === 2" ref="plplatformPersonFormRef" @action="getPlatformPersonFormData"></platformPersonForm>
+                    <div class="process_end" v-show="step === 3">
+                        <div>
+                            <div><img src="@/assets/imgs/img_data-complete.png" alt=""></div>
+                            <div class="font_bold">平台用户新增成功</div>
+                            <el-button  @click="cancel">返回列表</el-button>
+                            <el-button type="primary" @click="continueCreate">继续创建</el-button>
+                        </div>
+                            
+                    </div>
+                </div>
+            </div>
+            <div class="content_bottom" v-if="step !== 3">
+                <div v-show="step === 1">
+                    <el-button  @click="cancel">取消</el-button>
+                    <el-button type="primary" @click="nextStep">下一步</el-button>
+                </div>
+                <div v-show="step === 2">
+                    <el-button @click="cancel">取消</el-button>
+                    <el-button type="primary" @click="previousStep">上一步</el-button>
+                    <el-button type="primary" @click="submit">提交</el-button>
+                </div>
+                
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import platformAccountForm from './platform-account-form.vue';
+import platformPersonForm from './platform-person-form.vue';
+import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted  } from 'vue';
+
+const route = useRoute();
+const router = useRouter();
+const step = ref(1);
+const platformAccountFormRef = ref(null);
+const plplatformPersonFormRef = ref(null);
+const formData = reactive({
+  logo: '',
+  account: '',
+  phone: '',
+  password: '',
+  confirm_password: '',
+  role: '',
+  is_use: 1,
+
+  name: '',
+  email: '',
+  remark: '',
+
+}); //账号信息表单+个人信息表单
+
+// 下一步
+const nextStep = () => {
+    platformAccountFormRef.value.submitForm();
+}
+//账号信息表单检验触发事件 data为null 校验失败
+const getPlatformAccountFormData = (data) => {
+        if(data) {
+            formData.value = Object.assign(formData,data);
+            step.value = 2;
+        }else {
+
+        }
+}
+//个人信息表单检验触发事件 data为null 校验失败
+const getPlatformPersonFormData = (data) => {
+    if(data) {
+        formData.value = Object.assign(formData,data);
+        console.log(formData);
+        step.value = 3;
+    }
+}
+//上一步
+const previousStep = () => {
+    step.value--;
+}
+//提交表单
+const submit = () => {
+    plplatformPersonFormRef.value.submitForm();
+}
+//继续创建 清空表单
+const continueCreate = () => {
+    platformAccountFormRef.value.clearForm();
+    plplatformPersonFormRef.value.clearForm();
+    step.value = 1;
+}
+//取消
+const cancel = () => {
+    router.go(-1);
+}
+
+onBeforeUnmount(()=>{
+    
+})
+onMounted(() => {
+    if(route.query.type === "1") {
+        setTimeout(()=> {
+            platformAccountFormRef.value.setForm({
+                org: 'a',
+                code: 'b',
+                name: 'b',
+                desc: 'b',
+                logo: ['b'],
+                role: 'b',
+                account: 'b',
+                password: 'b',
+                confirm_password: 'b',
+                url: 'b',
+                firm_name: 'b',
+                is_use: 'b',
+               
+            })
+            plplatformPersonFormRef.value.setForm({
+                contact_user: 'c',
+                phone: 'c',
+                email: 'c',
+                remark: 'c',
+            })
+        },500)
+    }
+})
+
+</script>
+
+<style scoped>
+.flex_cloumn {
+    display: flex;
+    flex-direction: column;
+}
+.content_top {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+}
+/* .content_top::-webkit-scrollbar {
+  width: 5px;
+  height: 0px;
+}
+.content_top::-webkit-scrollbar-thumb {
+  background: #dedede;
+  border-radius: 10px;
+  height: 0px;
+}
+.content_top::-webkit-scrollbar-track {
+  background: transparent;
+  border-radius: 2px;
+} */
+
+.content_bottom {
+    height: 68px;
+    line-height: 68px;
+    text-align: right;
+    padding: 0 20px;
+    border-top: 1px solid #e6e9ef;
+}
+.content_process {
+    border-bottom: 1px solid #e6e9ef;
+    padding: 38px 16%;
+}
+.content_main {
+    flex: 1;
+    padding: 30px;
+    box-sizing: border-box;
+}
+.process_desc {
+    background-color: #fff;
+    display: inline-block;
+    position: absolute;
+    padding: 0 5px;
+    font-size: 18px;
+    color: #202531;
+    font-weight: bold;
+}
+.process_desc img {
+    height: 25px;
+    width: 25px;
+    vertical-align: middle;
+}
+.process_end {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    
+}
+.process_end div {
+    text-align: center;
+}
+.step_icon {
+    color: #fff;
+    font-weight: 600;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.icon_box {
+    display: inline-block;
+    background-color: #2b4695;
+    width: 48px;
+    height: 48px;
+    border-radius: 99px;
+    position: relative;
+    border: 3px solid #b0bee8;
+    vertical-align: middle;
+}
+.circle {
+    display: inline-block;
+    background-color: #a9b1c7;
+    width: 24px;
+    height: 24px;
+    border-radius: 99px;
+    position: relative;
+    border: 4px solid #e6e9ef;
+    vertical-align: middle;
+}
+.content_process :deep() .el-step.is-horizontal .el-step__line {
+    height: 4px;
+}
+.content_process :deep() .el-step__head.is-finish .el-step__line {
+    background: linear-gradient(to right,#2b4695 50%,#e6e9ef 50%);
+}
+.process_complete :deep() .el-step__head.is-finish .el-step__line {
+    background: linear-gradient(to right,#2b4695 100%,#e6e9ef 0%);
+}
+
+</style>
diff --git a/src/page/main/system/organization/platform-user/platform-account-form.vue b/src/page/main/system/organization/platform-user/platform-account-form.vue
new file mode 100644
index 0000000..d4521d9
--- /dev/null
+++ b/src/page/main/system/organization/platform-user/platform-account-form.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="platformAccountForm"
+    :rules="platformAccountFormRules"
+    ref="platformAccountRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="头像" prop="logo">
+       <bg-upload-image v-model="platformAccountForm.logo" :showTips="true" :limit="1" :fileSize="500" :fileSizeUnit="'KB'" listType="picture-card" :accept="['.jpg','.jpeg','.png']" customTips="请选择图片上传：大小120 * 120像素支持jpg、png等格式，图片需小于500KB"></bg-upload-image>
+    </el-form-item>
+     <el-form-item label="账号" prop="account">
+      <el-input v-model="platformAccountForm.account" />
+    </el-form-item>
+    <el-form-item label="手机号" prop="phone">
+      <el-input v-model="platformAccountForm.phone" />
+    </el-form-item>
+     <el-form-item label="密码" prop="password">
+      <el-input type="password" v-model="platformAccountForm.password" />
+    </el-form-item>
+     <el-form-item label="确认密码" prop="confirm_password">
+      <el-input type="password" v-model="platformAccountForm.confirm_password" />
+    </el-form-item>
+    <el-form-item label="角色授权" prop="role">
+      <el-input v-model="platformAccountForm.role" />
+    </el-form-item>
+    <el-form-item label="是否启用" prop="is_use">
+      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="platformAccountForm.is_use"></bg-switch>
+    </el-form-item>
+    
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+
+const platformAccountForm = reactive({
+  logo: '',
+  account: '',
+  phone: '',
+  password: '',
+  confirm_password: '',
+  role: '',
+  is_use: 1,
+ 
+})
+
+const validatePass = (rule, value, callback) => {
+  if (value !== platformAccountForm.password) {
+    callback(new Error("密码输入不一致"))
+  } else {
+    callback()
+  }
+}
+
+const platformAccountFormRules = reactive({
+  account: [
+    { required: true, message: '请输入账号', trigger: 'blur' },
+  ],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+  ],
+  role: [
+    { required: true, message: '请选择角色', trigger: 'blur' },
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+  ],
+  confirm_password: [
+      { required: true, message: '请确认密码', trigger: 'blur' },
+    { validator: validatePass, trigger: 'blur' }
+  ],
+})
+
+
+
+const platformAccountRef = ref(null)
+const emit = defineEmits(['action'])
+
+const submitForm = async () => {
+  if (!platformAccountRef) return
+  await platformAccountRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', platformAccountForm)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+
+const clearForm = () => {
+  if (!platformAccountRef) return
+  platformAccountRef.value.resetFields()
+} 
+
+const setForm = (data) => {
+  platformAccountForm.value = Object.assign(platformAccountForm, data);
+}
+
+onMounted(() => {
+    
+})
+
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/platform-user/platform-person-form.vue b/src/page/main/system/organization/platform-user/platform-person-form.vue
new file mode 100644
index 0000000..f57525e
--- /dev/null
+++ b/src/page/main/system/organization/platform-user/platform-person-form.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="platformPersonForm"
+    :rules="platformPersonFormRules"
+    ref="platformPersonFormRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="姓名" prop="name">
+      <el-input v-model="platformPersonForm.name" />
+    </el-form-item>
+    <el-form-item label="邮箱">
+      <el-input v-model="platformPersonForm.email"/>
+    </el-form-item>
+     <el-form-item label="备注">
+      <el-input type="textarea" :rows="3" v-model="platformPersonForm.remark" />
+    </el-form-item>
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+
+const platformPersonForm = reactive({
+  name: '',
+  email: '',
+  remark: '',
+})
+
+const platformPersonFormRules = reactive({
+ 
+})
+const platformPersonFormRef = ref(null)
+const emit = defineEmits(['action'])
+
+const submitForm = async () => {
+  if (!platformPersonFormRef) return
+  await platformPersonFormRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', platformPersonForm)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+const clearForm = () => {
+  if (!platformPersonFormRef) return
+  platformPersonFormRef.value.resetFields()
+} 
+
+const setForm = (data) => {
+  platformPersonForm.value = Object.assign(platformPersonForm, data);
+}
+
+onMounted(() => {
+   
+})
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/system-user/index.vue b/src/page/main/system/organization/system-user/index.vue
new file mode 100644
index 0000000..1dfb873
--- /dev/null
+++ b/src/page/main/system/organization/system-user/index.vue
@@ -0,0 +1,280 @@
+<template>
+    <div class="page_container">
+        <div class="bg-breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/system/organization' }"> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item> 新增组织管理员 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="page_content flex_cloumn">
+            <div class="content_top apaas_scroll">
+                <div class="content_process">
+                    <div>
+                        <el-steps :active="step" >
+                            <el-step title="" :class="{'process_complete': step > 1}">
+                                <template #icon>
+                                    <span class="process_desc">
+                                        <span class="icon_box" v-if="step > 0"><bg-icon class="step_icon" icon="#bg-ic-file"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                    账号信息
+                                    </span>
+                                </template>
+                            </el-step>
+                            <el-step title="" :class="{'process_complete': step > 2}">
+                                <template #icon>
+                                    <span class="process_desc">
+                                        <span class="icon_box" v-if="step > 1"><bg-icon class="step_icon" icon="#bg-ic-file-staff"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                        个人信息
+                                    </span>
+                                </template>
+                            </el-step>
+                            <el-step title="">
+                                <template #icon>
+                                    <span class="process_desc">
+                                    <span class="icon_box" v-if="step > 2"><bg-icon class="step_icon" icon="#bg-ic-file-success"></bg-icon></span> 
+                                        <span class="circle" v-else></span>
+                                        完成
+                                    </span>
+                                </template>
+                            </el-step>
+                        </el-steps> 
+                    </div>
+                     
+                </div>
+                <div class="content_main">
+                    <systemAccountForm v-show="step === 1" ref="systemAccountRef" @action="getSystemAccountFormData"></systemAccountForm>
+                    <systemPersonForm v-show="step === 2" ref="systemPersonRef" @action="getSystemPersonFormData"></systemPersonForm>
+                    <div class="process_end" v-show="step === 3">
+                        <div>
+                            <div><img src="@/assets/imgs/img_data-complete.png" alt=""></div>
+                            <div class="font_bold">平台用户新增成功</div>
+                            <el-button  @click="cancel">返回列表</el-button>
+                            <el-button type="primary" @click="continueCreate">继续创建</el-button>
+                        </div>
+                            
+                    </div>
+                </div>
+            </div>
+            <div class="content_bottom" v-if="step !== 3">
+                <div v-show="step === 1">
+                    <el-button  @click="cancel">取消</el-button>
+                    <el-button type="primary" @click="nextStep">下一步</el-button>
+                </div>
+                <div v-show="step === 2">
+                    <el-button @click="cancel">取消</el-button>
+                    <el-button type="primary" @click="previousStep">上一步</el-button>
+                    <el-button type="primary" @click="submit">提交</el-button>
+                </div>
+                
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import systemAccountForm from './system-account-form.vue';
+import systemPersonForm from './system-person-form.vue';
+import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted  } from 'vue';
+
+const route = useRoute();
+const router = useRouter();
+const step = ref(1);
+const systemAccountRef = ref(null);
+const systemPersonRef = ref(null);
+const formData = reactive({
+  org: '',
+  role: '',
+  logo: '',
+  account: '',
+  phone: '',
+  password: '',
+  confirm_password: '',
+  is_use: 1,
+
+  name: '',
+  certificate_type: '',
+  certificate_account: '',
+  email: '',
+  remark: '',
+}); //账号信息表单+个人信息表单
+
+// 下一步
+const nextStep = () => {
+    systemAccountRef.value.submitForm();
+}
+//账号信息表单检验触发事件 data为null 校验失败
+const getSystemAccountFormData = (data) => {
+        if(data) {
+            formData.value = Object.assign(formData,data);
+            step.value = 2;
+        }else {
+
+        }
+}
+//个人信息表单检验触发事件 data为null 校验失败
+const getSystemPersonFormData = (data) => {
+    if(data) {
+        formData.value = Object.assign(formData,data);
+        console.log(formData);
+        step.value = 3;
+    }
+}
+//上一步
+const previousStep = () => {
+    step.value--;
+}
+//提交表单
+const submit = () => {
+    systemPersonRef.value.submitForm();
+}
+//继续创建 清空表单
+const continueCreate = () => {
+    systemAccountRef.value.clearForm();
+    systemPersonRef.value.clearForm();
+    step.value = 1;
+}
+//取消
+const cancel = () => {
+    router.go(-1);
+}
+
+onBeforeUnmount(()=>{
+    
+})
+onMounted(() => {
+    if(route.query.type === "1") {
+        setTimeout(()=> {
+            systemAccountRef.value.setForm({
+                org: 'a',
+                code: 'b',
+                name: 'b',
+                desc: 'b',
+                logo: ['b'],
+                role: 'b',
+                account: 'b',
+                password: 'b',
+                confirm_password: 'b',
+                url: 'b',
+                firm_name: 'b',
+                is_use: 'b',
+               
+            })
+            systemPersonRef.value.setForm({
+                contact_user: 'c',
+                phone: 'c',
+                email: 'c',
+                remark: 'c',
+            })
+        },500)
+    }
+})
+
+</script>
+
+<style scoped>
+.flex_cloumn {
+    display: flex;
+    flex-direction: column;
+}
+.content_top {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+}
+/* .content_top::-webkit-scrollbar {
+  width: 5px;
+  height: 0px;
+}
+.content_top::-webkit-scrollbar-thumb {
+  background: #dedede;
+  border-radius: 10px;
+  height: 0px;
+}
+.content_top::-webkit-scrollbar-track {
+  background: transparent;
+  border-radius: 2px;
+} */
+
+.content_bottom {
+    height: 68px;
+    line-height: 68px;
+    text-align: right;
+    padding: 0 20px;
+    border-top: 1px solid #e6e9ef;
+}
+.content_process {
+    border-bottom: 1px solid #e6e9ef;
+    padding: 38px 16%;
+}
+.content_main {
+    flex: 1;
+    padding: 30px;
+    box-sizing: border-box;
+}
+.process_desc {
+    background-color: #fff;
+    display: inline-block;
+    position: absolute;
+    padding: 0 5px;
+    font-size: 18px;
+    color: #202531;
+    font-weight: bold;
+}
+.process_desc img {
+    height: 25px;
+    width: 25px;
+    vertical-align: middle;
+}
+.process_end {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    
+}
+.process_end div {
+    text-align: center;
+}
+.step_icon {
+    color: #fff;
+    font-weight: 600;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.icon_box {
+    display: inline-block;
+    background-color: #2b4695;
+    width: 48px;
+    height: 48px;
+    border-radius: 99px;
+    position: relative;
+    border: 3px solid #b0bee8;
+    vertical-align: middle;
+}
+.circle {
+    display: inline-block;
+    background-color: #a9b1c7;
+    width: 24px;
+    height: 24px;
+    border-radius: 99px;
+    position: relative;
+    border: 4px solid #e6e9ef;
+    vertical-align: middle;
+}
+.content_process :deep() .el-step.is-horizontal .el-step__line {
+    height: 4px;
+}
+.content_process :deep() .el-step__head.is-finish .el-step__line {
+    background: linear-gradient(to right,#2b4695 50%,#e6e9ef 50%);
+}
+.process_complete :deep() .el-step__head.is-finish .el-step__line {
+    background: linear-gradient(to right,#2b4695 100%,#e6e9ef 0%);
+}
+</style>
diff --git a/src/page/main/system/organization/system-user/system-account-form.vue b/src/page/main/system/organization/system-user/system-account-form.vue
new file mode 100644
index 0000000..55a232d
--- /dev/null
+++ b/src/page/main/system/organization/system-user/system-account-form.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="systemAccountFormRef"
+    :rules="systemAccountFormRules"
+    ref="platformAccountRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="所属组织机构" prop="org">
+      <el-input v-model="systemAccountFormRef.org" />
+    </el-form-item>
+    <el-form-item label="角色" prop="role">
+      <el-input v-model="systemAccountFormRef.role" />
+    </el-form-item>
+    <el-form-item label="头像" prop="logo">
+       <bg-upload-image v-model="systemAccountFormRef.logo" :showTips="true" :limit="1" :fileSize="500" :fileSizeUnit="'KB'" listType="picture-card" :accept="['.jpg','.jpeg','.png']" customTips="请选择图片上传：大小120 * 120像素支持jpg、png等格式，图片需小于500KB"></bg-upload-image>
+    </el-form-item>
+     <el-form-item label="账号" prop="account">
+      <el-input v-model="systemAccountFormRef.account" />
+    </el-form-item>
+    <el-form-item label="手机号" prop="phone">
+      <el-input v-model="systemAccountFormRef.phone" />
+    </el-form-item>
+     <el-form-item label="密码" prop="password">
+      <el-input type="password" v-model="systemAccountFormRef.password" />
+    </el-form-item>
+     <el-form-item label="确认密码" prop="confirm_password">
+      <el-input type="password" v-model="systemAccountFormRef.confirm_password" />
+    </el-form-item>
+  
+    <el-form-item label="是否启用" prop="is_use">
+      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="systemAccountFormRef.is_use"></bg-switch>
+    </el-form-item>
+    
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+
+const systemAccountFormRef = reactive({
+  org: '',
+  role: '',
+  logo: '',
+  account: '',
+  phone: '',
+  password: '',
+  confirm_password: '',
+  is_use: 1,
+ 
+})
+
+const validatePass = (rule, value, callback) => {
+  if (value !== systemAccountFormRef.password) {
+    callback(new Error("密码输入不一致"))
+  } else {
+    callback()
+  }
+}
+
+const systemAccountFormRules = reactive({
+  org: [
+    { required: true, message: '请选择组织', trigger: 'blur' },
+  ],
+  role: [
+    { required: true, message: '请选择角色', trigger: 'blur' },
+  ],
+  account: [
+    { required: true, message: '请输入账号', trigger: 'blur' },
+  ],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+  ],
+ 
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+  ],
+  confirm_password: [
+      { required: true, message: '请确认密码', trigger: 'blur' },
+    { validator: validatePass, trigger: 'blur' }
+  ],
+})
+
+
+
+const platformAccountRef = ref(null)
+const emit = defineEmits(['action'])
+
+const submitForm = async () => {
+  if (!platformAccountRef) return
+  await platformAccountRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', systemAccountFormRef)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+
+const clearForm = () => {
+  if (!platformAccountRef) return
+  platformAccountRef.value.resetFields()
+} 
+
+const setForm = (data) => {
+  systemAccountFormRef.value = Object.assign(systemAccountFormRef, data);
+}
+
+onMounted(() => {
+    
+})
+
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/system-user/system-person-form.vue b/src/page/main/system/organization/system-user/system-person-form.vue
new file mode 100644
index 0000000..f6a4be1
--- /dev/null
+++ b/src/page/main/system/organization/system-user/system-person-form.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="contactForm"
+    :rules="contactFormRules"
+    ref="contactRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="联系人姓名" prop="name">
+      <el-input v-model="contactForm.name" />
+    </el-form-item>
+    <el-form-item label="证件类型" prop="certificate_type">
+      <el-input v-model="contactForm.certificate_type" />
+    </el-form-item>
+    <el-form-item label="证件号" prop="certificate_account">
+      <el-input v-model="contactForm.certificate_account" />
+    </el-form-item>
+    <el-form-item label="联系人邮箱">
+      <el-input v-model="contactForm.email"/>
+    </el-form-item>
+     <el-form-item label="备注">
+      <el-input type="textarea" :rows="3" v-model="contactForm.remark" />
+    </el-form-item>
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+
+const contactForm = reactive({
+  name: '',
+  certificate_type: '',
+  certificate_account: '',
+  email: '',
+  remark: '',
+})
+
+const contactFormRules = reactive({
+})
+const contactRef = ref(null)
+const emit = defineEmits(['action'])
+
+const submitForm = async () => {
+  if (!contactRef) return
+  await contactRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', contactForm)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+const clearForm = () => {
+  if (!contactRef) return
+  contactRef.value.resetFields()
+} 
+
+const setForm = (data) => {
+  contactForm.value = Object.assign(contactForm, data);
+}
+
+onMounted(() => {
+   
+})
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue
index 23ab4ac..16403c6 100644
--- a/src/page/main/system/organization/tree.vue
+++ b/src/page/main/system/organization/tree.vue
@@ -4,11 +4,17 @@
            <div class="custom_tree_node">
              <span
                class="label-text "
-               :class="{'is_active': treeSelected === data.dept}"
+               :class="{'is_active': selectData && selectData.dept === data.dept}"
                :title="node.label"
                >{{ node.label }}
              </span>
-             <span class="tree-action-box" :class="{'position_sticky': isSticky(data.label) }" @click.stop="showAction($event, data,node)">
+             <span v-if="data.dept === 1" class="tree-action-box first_node" @click.stop="showAction($event, data,node)">
+               <bg-icon
+                 class="tree-more"
+                 icon="#bg-ic-s-more"
+               ></bg-icon>
+             </span>
+             <span v-else class="tree-action-box" :class="{'position_sticky': isSticky(data.label) }" @click.stop="showAction($event, data,node)">
                <bg-icon
                  class="tree-more"
                  icon="#bg-ic-s-more"
@@ -23,15 +29,23 @@
          v-show="actionFlag"
          :style="{ top: acTop, left: acLeft }"
        >
-        
-         <div class="action" >新建本级目录</div>
-         <div class="action" >新建下级目录</div>
-         <div class="action" >新建本级组织</div>
-         <div class="action" >新建下级组织</div>
-         <div class="action" >编辑目录</div>
-         <div class="action" >删除</div>
-         <div class="action" >上移</div>
-         <div class="action" >下移</div>
+         <div v-if="selectData && selectData.dept === 1" class="action" @click="treeCreate({type: 'directory',target: null})">新建目录</div>
+         <div v-if="selectData && selectData.dept === 1" class="action" @click="treeCreate({type: 'org',target: null})" >新建组织</div>
+
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'create',target: 'local'})">新建本级目录</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'create',target: 'child'})">新建下级目录</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'delete',target: 'local'})">删除</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
+         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
+
+         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
+         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'edit',target: 'local'})">编辑组织</div>
+         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'delete',target: 'local'})">删除</div>
+         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'mvup',target: 'local'})">上移</div>
+         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'mvdown',target: 'local'})">下移</div>
        </div>
     </Teleport>
 </template>
@@ -41,8 +55,6 @@ import { reactive, toRefs, ref, } from '@vue/reactivity'
 import { getCurrentInstance } from 'vue'
 import { computed, onBeforeMount, onBeforeUnmount } from '@vue/runtime-core'
 import { useRouter } from 'vue-router';
- const treeSelected = ref(null);
-  
 
   const data = [
     {
@@ -55,6 +67,7 @@ import { useRouter } from 'vue-router';
       children: [
         {
           label: '武汉市啊实打实大苏打大阿斯顿发士大夫地',
+          dept: 666,
           children: [
             {
               label: '公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅',
@@ -162,12 +175,15 @@ import { useRouter } from 'vue-router';
   const acTop = ref(0);
   const acLeft = ref(0);
   const actionFlag = ref(false)
+  const selectData = ref(null)
+  const selectDataParent = ref(null) 
   const showAction = (e, data,node) => {
     const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
-    console.log(rect, data,node);
     acTop.value = rect.y - 17 + "px";
     acLeft.value = rect.x + 35 + "px";
     actionFlag.value = true;
+    selectData.value = data;
+    selectDataParent.value = node.parent.data.label ? node.parent.data : null;
   };
   const isSticky = (data) => {
 
@@ -182,22 +198,23 @@ import { useRouter } from 'vue-router';
     actionFlag.value = false;
   }
   
-//   const nodeClick = (node,nodeAttr,treeNode,event)=>{
-    
-//   }
+
   const emit = defineEmits(['action'])
   const handleNodeClick = (node,nodeAttr,treeNode,event) => {
-    treeSelected.value = data.dept
-    console.log(treeSelected.value)
-    emit('select',{node,nodeAttr,treeNode,event})
+    selectData.value = node;
+    emit('select',{node,nodeAttr,treeNode,event});
     //只读则无操作事件
-      closeAction()
+      closeAction();
+  }
+
+  const treeCreate = (params) => {
+    emit('create',{type: params.type,action: params.action,data: params.target === 'local'? selectDataParent : selectData});
   }
   
   onBeforeMount(()=>{
     //只读则无操作事件
-      window.addEventListener("click", closeAction)
-      window.addEventListener("scroll", closeAction,true)
+      window.addEventListener("click", closeAction);
+      window.addEventListener("scroll", closeAction,true);
   })
   
   onBeforeUnmount(()=>{
@@ -234,6 +251,9 @@ import { useRouter } from 'vue-router';
 .file-tree :deep() .el-tree-node__content:hover .tree-action-box {
   display: inline-block;
 }
+.file-tree :deep() .el-tree-node__content .first_node {
+  display: inline-block;
+}
 .file-tree :deep() .el-tree-node > .el-tree-node__children {
   overflow: visible;
 }
diff --git a/src/page/main/system/organization/user-detail/index.vue b/src/page/main/system/organization/user-detail/index.vue
new file mode 100644
index 0000000..ac3ba5d
--- /dev/null
+++ b/src/page/main/system/organization/user-detail/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="page_container">
+        <div class="bg-breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/system/organization' }"> 组织管理 </el-breadcrumb-item>
+                <el-breadcrumb-item> 用户详情 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="page_content apaas_scroll">
+                <div class="info_row">
+                <div class="title">
+                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content">
+                    <div class="img_box">
+                        <img src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                    </div>
+                    <div class="info_box">
+                        <bg-info :data="baseInfo"></bg-info>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="title">
+                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div class="dashed_line">
+                    </div>
+                </div>
+                <div class="info_content">
+                    <div class="img_box"></div>
+                    <div class="info_box">
+                        <bg-info :data="contactInfo"></bg-info>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { reactive, toRefs, ref, } from '@vue/reactivity'
+import { getCurrentInstance } from 'vue'
+import { computed, onBeforeMount } from '@vue/runtime-core'
+import { useRouter } from 'vue-router';
+
+const baseInfo = reactive(
+    [
+    {
+      name: "所属机构",
+      value: "某某省/某某市/大数据局",
+      nameWidth: 112
+    },
+    {
+      name: "业务系统编码",
+      value: "00000001",
+      nameWidth: 112
+    },
+    {
+      name: "业务系统名称",
+      value: "大数据处理系统",
+      nameWidth: 112
+    },
+    {
+      name: "账号",
+      value: "admin001",
+      nameWidth: 112
+    },
+    {
+      name: "AppID",
+      value: "dasjkjjk",
+      nameWidth: 112
+    },
+    {
+      name: "AppSecret",
+      value: "asda*******************jhjh",
+      nameWidth: 112
+    },
+    {
+      name: "创建人",
+      value: "admin（机构管理员）",
+      nameWidth: 112
+    },
+    {
+      name: "创建时间",
+      value: "2022-01-01 10:10:10",
+      nameWidth: 112
+    },
+    {
+      name: "是否启用",
+      value: "是",
+      nameWidth: 112
+    },
+    {
+      name: "开发厂商名单",
+      value: "某某大数据开发商",
+      nameWidth: 112
+    },
+    {
+      name: "访问地址",
+      value: "http://www.bigdata.com",
+      full: true,
+      nameWidth: 112
+    },
+    {
+      name: "业务系统描述",
+      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      full: true,
+      nameWidth: 112
+    },
+  ]
+  )
+
+  const contactInfo = reactive(
+    [{
+      name: "联系人姓名",
+      value: "xxx",
+      nameWidth: 112
+    },
+    {
+      name: "联系人手机号",
+      value: "15627365265",
+      nameWidth: 112
+    },
+    {
+      name: "联系人邮箱",
+      value: "http://www.bigdata@163.com",
+      full: true,
+      nameWidth: 112
+    },
+    {
+      name: "备注",
+      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      full: true,
+      nameWidth: 112
+    },
+  ]
+  )
+
+  onBeforeMount(() => {
+     
+ })
+</script>
+
+<style scoped>
+.page_content {
+    padding: 15px;
+    overflow: auto;
+}
+.info_content {
+    display: flex;
+}
+.info_row {
+    margin-bottom: 40px;
+}
+.img_box {
+    width: 120px;
+}
+.info_box {
+    width: 60%;
+}
+
+.title {
+  font-size: 18px;
+  color: #1a1a1a;
+  font-weight: bold;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+.dashed_line {
+    flex: 1;
+    height: 1px;
+    margin: 0 10px;
+	border-bottom: dashed 1px #dadee7;
+}
+
+.icon_box {
+    display: inline-block;
+    width: 4px;
+	height: 14px;
+	background-color: #3759be;
+	border-radius: 2px;
+    margin-right: 5px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/router/function.js b/src/router/function.js
index 408324f..690f41a 100644
--- a/src/router/function.js
+++ b/src/router/function.js
@@ -183,10 +183,17 @@ var adminMenu = [
           {
             name: "account-add-manage",
             menuName:'新建账号',
-            parentPath:null,
+            parentPath:'/develop/account',
             menuType:'manager',
             path: "/develop/account/add",
           },
+          {
+            name: "account-detail-manage",
+            menuName:'账号详情',
+            parentPath: '/develop/account',
+            menuType:'manager',
+            path: "/develop/account/detail",
+          },
           {
             name: "menu-manage",
             menuName:'菜单管理',
@@ -214,6 +221,38 @@ var adminMenu = [
             show:true,
             path: "/system/organization",
           },
+          {
+            name: "paltform-user-manage",
+            menuName:'新增平台用户',
+            parentPath: '/system/organization',
+            menuType:'manager',
+            show:false,
+            path: "/system/organization/platform-user",
+          },
+          {
+            name: "system-user-manage",
+            menuName:'新增组织用户',
+            parentPath: '/system/organization',
+            menuType:'manager',
+            show: false,
+            path: "/system/organization/system-user",
+          },
+          {
+            name: "user-detail-manage",
+            menuName:'用户详情',
+            parentPath: '/system/organization',
+            menuType:'manager',
+            show: false,
+            path: "/system/organization/user-detail",
+          },
+          {
+            name: "org-detail-manage",
+            menuName:'组织详情',
+            parentPath: '/system/organization',
+            menuType:'manager',
+            show: false,
+            path: "/system/organization/org-detail",
+          },
           {
             name: "role-manage",
             menuName:'角色管理',
diff --git a/vite.config.js b/vite.config.js
index 0daefe5..a43b3c5 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -39,7 +39,7 @@ export default {
     }
   },
   build:{
-    outDir:'dist/apaas/manage/ui',//打包输出文件夹
+    outDir:'dist/apaas/system/ui',//打包输出文件夹
     assetsDir:'static',//打包输出静态文件
   },
   
diff --git a/yarn.lock b/yarn.lock
index 5501743..ea77b0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -528,6 +528,11 @@ compute-scroll-into-view@^1.0.17:
   resolved "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
   integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
 
+crypto-js@^4.1.1:
+  version "4.1.1"
+  resolved "https://mirrors.cloud.tencent.com/npm/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
+  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+
 css-line-break@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
@@ -890,6 +895,11 @@ is-url@^1.2.4:
   resolved "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
+js-md5@^0.7.3:
+  version "0.7.3"
+  resolved "https://mirrors.cloud.tencent.com/npm/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
+  integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==
+
 lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz"
-- 
2.26.0