From 99d568fb0b12abd284047ffba7b93cf9218762c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Fri, 16 Dec 2022 16:07:40 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                                 |    8 +
 .prettierrc.js                                |   27 +
 src/bg-ui/bg-upload-image.vue                 |   71 +-
 src/page/main/config/dict/index.vue           |  542 +++---
 .../main/develop/account/add/contact-form.vue |   89 +-
 src/page/main/develop/account/add/index.vue   |  515 ++---
 .../main/develop/account/add/system-form.vue  |  358 ++--
 .../main/develop/account/detail/index.vue     |  366 ++--
 src/page/main/develop/account/index.vue       | 1117 +++++------
 src/page/main/develop/menu/index.vue          |  723 ++++---
 src/page/main/develop/menu/menu-form.vue      |  222 +--
 .../home-config/banner/edit/banner-form.vue   |   87 +-
 .../main/home-config/banner/edit/index.vue    |  119 +-
 src/page/main/home-config/banner/index.vue    |  202 +-
 src/page/main/home-config/foot-info/index.vue |  140 +-
 .../main/home-config/recommend/edit/index.vue |  537 +++--
 .../home-config/recommend/edit/type-form.vue  |  100 +-
 src/page/main/home-config/recommend/index.vue |  211 +-
 .../system/organization/directory-form.vue    |  179 +-
 src/page/main/system/organization/index.vue   | 1727 ++++++++---------
 .../system/organization/org-detail/index.vue  |  389 ++--
 .../main/system/organization/org-form.vue     |  186 +-
 .../system/organization/org-user/index.vue    |  501 ++---
 .../org-user/org-account-form.vue             |  274 ++-
 .../organization/org-user/org-person-form.vue |   81 +-
 .../organization/platform-user/index.vue      |  530 ++---
 .../platform-user/platform-account-form.vue   |  204 +-
 .../platform-user/platform-person-form.vue    |   53 +-
 src/page/main/system/organization/tree.vue    |  588 +++---
 .../system/organization/user-detail/index.vue |  150 +-
 src/page/main/system/role/add/index.vue       |    2 +-
 src/page/main/system/role/add/role_form.vue   |  226 +--
 src/page/main/system/role/edit/index.vue      |    4 +-
 src/page/main/system/role/index.vue           |  515 +++--
 34 files changed, 5367 insertions(+), 5676 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .prettierrc.js

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..e6a67af
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+[*]
+charset = utf-8
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+max_line_length = 120
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 0000000..4420fc3
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,27 @@
+/**
+ * 优先级高于.editorconfig
+ * https://prettier.io/docs/en/options.html
+ * 单引号，双引号，末尾是否逗号，是否需要分号根据团队需要配置
+ * 但是prettier对vue template的格式化能力有限，建议多观察是否满足需要，最佳实践还是要结合eslint进行风格统一
+ */
+module.exports = {
+  arrowParens: "always",
+  bracketSameLine: true, // https://prettier.io/docs/en/options.html#bracket-line
+  bracketSpacing: true,
+  embeddedLanguageFormatting: "auto",
+  htmlWhitespaceSensitivity: "css",
+  insertPragma: false,
+  jsxSingleQuote: false,
+  printWidth: 120, // 如果属性过多需要换行，减少该值
+  proseWrap: "preserve",
+  quoteProps: "as-needed",
+  requirePragma: false,
+  semi: true,
+  singleAttributePerLine: false,
+  singleQuote: false, // 双引号
+  tabWidth: 2, // 缩进
+  trailingComma: "es5",
+  useTabs: false, // 不要用tab缩进
+  vueIndentScriptAndStyle: false,
+  endOfLine: "lf",
+};
diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue
index 51eb59e..bf31b3e 100644
--- a/src/bg-ui/bg-upload-image.vue
+++ b/src/bg-ui/bg-upload-image.vue
@@ -7,7 +7,7 @@
     :action="action"
     :data="{
       directory: 'image',
-      uniqueCode: false
+      uniqueCode: false,
     }"
     :auto-upload="autoUpload"
     :list-type="listType"
@@ -17,8 +17,7 @@
     :on-success="handleSuccess"
     :on-remove="handleRemove"
     :on-preview="handlePreview"
-    :multiple="multiple"
-  >
+    :multiple="multiple">
     <template v-slot:trigger>
       <el-icon v-if="listType === 'picture-card'"><Plus /></el-icon>
       <!-- <i class="el-icon-plus" v-if="listType === 'picture-card'"></i> -->
@@ -28,36 +27,29 @@
     </template>
 
     <template v-if="!autoUpload">
-      <el-button
-        type="success"
-        icon="el-icon-position"
-        @click="submitUpload"
-        style="margin-left: 16px"
-      >
+      <el-button type="success" icon="el-icon-position" @click="submitUpload" style="margin-left: 16px">
         上传到服务器
       </el-button>
     </template>
 
     <template v-slot:tip v-if="showTips && tips">
-      <div class="el-upload__tip" style="color:#909bb6;">
-        {{ customTips||tips }}
+      <div class="el-upload__tip" style="color: #909bb6">
+        {{ customTips || tips }}
       </div>
     </template>
   </el-upload>
 
-  <el-dialog title="图片预览" v-model="dialogVisible" custom-class="bg-upload-image-dialog">
-    <img style="margin:30px 0;width: 600px;" :src="dialogImageUrl" alt="Preview Image" />
+  <el-dialog title="图片预览" v-model="dialogVisible" class="bg-upload-image-dialog">
+    <img style="margin: 30px 0; width: 600px" :src="dialogImageUrl" alt="Preview Image" />
   </el-dialog>
 </template>
 
 <script>
-import {
-  UploadFilled
-} from '@element-plus/icons-vue'
+import { UploadFilled } from "@element-plus/icons-vue";
 export default {
   name: "BgUploadImage",
   props: {
-    modelValue:{
+    modelValue: {
       type: Array,
       default: () => [],
     },
@@ -99,12 +91,12 @@ export default {
       type: Boolean,
       default: false,
     }, // 显示提示
-    customTips:{
+    customTips: {
       type: String,
       default: "",
-    },// 自定义提示内容 
+    }, // 自定义提示内容
   },
-  emits: ['update:modelValue',"change"],
+  emits: ["update:modelValue", "change"],
   computed: {
     acceptTypes() {
       if (Array.isArray(this.accept)) {
@@ -146,34 +138,34 @@ export default {
     return {
       fileList: [],
       UploadFilled,
-      dialogImageUrl:'',
-      dialogVisible:false
+      dialogImageUrl: "",
+      dialogVisible: false,
     };
   },
   watch: {
     modelValue() {
       let newStr = this.modelValue.map((v) => v.url).join(",");
-      let oldStr = this.fileList
-        .map((v) => (v.response && v.response.data) || v.url)
-        .join(",");
+      let oldStr = this.fileList.map((v) => (v.response && v.response.data) || v.url).join(",");
 
       if (newStr !== oldStr) {
         this.fileList = [...this.modelValue];
       }
       this.$nextTick().then(() => {
-        this.checkLimit(this.modelValue)
+        this.checkLimit(this.modelValue);
       });
     },
   },
   methods: {
     checkLimit(filelist) {
-      const limit = this.limit
-      const uploadDom = this.$refs['upload']
-      const length = uploadDom.$el.children[0].children.length
+      const limit = this.limit;
+      const uploadDom = this.$refs["upload"];
+      const length = uploadDom.$el.children[0].children.length;
       if (filelist.length === limit) {
-        uploadDom.$el.children[0].children[length-1].style.display = 'none'
+        uploadDom.$el.children[0].children[length - 1].style.display = "none";
       } else {
-        uploadDom.$el.children[0].children[length-1]?uploadDom.$el.children[0].children[length-1].style.display = '':''
+        uploadDom.$el.children[0].children[length - 1]
+          ? (uploadDom.$el.children[0].children[length - 1].style.display = "")
+          : "";
       }
     },
     handleBeforeUpload(file) {
@@ -184,12 +176,9 @@ export default {
       };
       let temp = file.name.split(".");
       let type = "." + temp[temp.length - 1].toLocaleLowerCase();
-      let fileTypeIsOk =
-        this.types.length === 0 || this.types.indexOf(type) > -1;
+      let fileTypeIsOk = this.types.length === 0 || this.types.indexOf(type) > -1;
       let fileSizeIsOk =
-        this.fileSize === 0 ||
-        this.fileSize === undefined ||
-        file.size / units[this.fileSizeUnit] <= this.fileSize;
+        this.fileSize === 0 || this.fileSize === undefined || file.size / units[this.fileSizeUnit] <= this.fileSize;
       let checked = fileTypeIsOk && fileSizeIsOk;
 
       if (!checked) {
@@ -200,15 +189,15 @@ export default {
     },
     handleSuccess(response, file, fileList) {
       this.updateFileList(fileList);
-      this.checkLimit(fileList)
+      this.checkLimit(fileList);
     },
     handleRemove(file, fileList) {
       this.updateFileList(fileList);
-      this.checkLimit(fileList)
+      this.checkLimit(fileList);
     },
     handlePreview({ name, url }) {
-      this.dialogImageUrl = url
-      this.dialogVisible = true
+      this.dialogImageUrl = url;
+      this.dialogVisible = true;
       // let a = document.createElement("a"); // 生成一个a元素
       // let event = new MouseEvent("click"); // 创建一个单击事件
 
@@ -229,7 +218,7 @@ export default {
       console.log(values);
 
       this.$emit("update:modelValue", values);
-      this.$emit("change",values);
+      this.$emit("change", values);
     },
     submitUpload() {
       this.$refs.upload.submit();
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index 092523e..ad034e7 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -9,15 +9,24 @@
     <div class="flex_row">
       <div class="flex_left">
         <div class="box">
-          <el-input class="type-input" v-model.trim="typeKeyword" @input="searchType" :prefix-icon="Search" placeholder="请输入搜索内容"></el-input>
-          
+          <el-input
+            class="type-input"
+            v-model.trim="typeKeyword"
+            @input="searchType"
+            :prefix-icon="Search"
+            placeholder="请输入搜索内容"></el-input>
+
           <div class="type_station bg-scroll">
-            <div class="type-box" :class="{'current-type':nodeClassifyId==item.classify_id}" @click="nodeClick(item)" v-for="(item,index) in typeList" :key="'type'+index+200">
-              {{item.classify_name}}
+            <div
+              class="type-box"
+              :class="{ 'current-type': nodeClassifyId == item.classify_id }"
+              @click="nodeClick(item)"
+              v-for="(item, index) in typeList"
+              :key="'type' + index + 200">
+              {{ item.classify_name }}
             </div>
           </div>
         </div>
-            
       </div>
       <div class="flex_right">
         <div class="main_container">
@@ -26,7 +35,7 @@
               <div class="apaas_button">
                 <el-button class="register_btn" type="primary" @click="register">
                   <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
-                    新建
+                  新建
                 </el-button>
               </div>
             </template>
@@ -34,17 +43,12 @@
               <div class="left-filter filter_list">
                 <div class="filter_item">
                   <span class="filter_title">状态</span>
-                  <el-select
-                    v-model="filter.state"
-                    placeholder="请选择"
-                    style="width: 300px"
-                  >
+                  <el-select v-model="filter.state" placeholder="请选择" style="width: 300px">
                     <el-option
                       v-for="(item, index) in stateOptions"
                       :key="'pushOptions' + index"
                       :label="item.name"
-                      :value="item.value"
-                    >
+                      :value="item.value">
                     </el-option>
                   </el-select>
                 </div>
@@ -62,7 +66,11 @@
                   {{ row.updated_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
                 </template>
                 <template v-slot:state="{ row }">
-                  <bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
+                  <bg-switch
+                    @click="changeUseRow(row)"
+                    :labels="['否', '是']"
+                    :values="[0, 1]"
+                    v-model="row.state"></bg-switch>
                 </template>
                 <template v-slot:action="{ row }">
                   <bg-table-btns :operations="getOperations(row)" />
@@ -74,47 +82,29 @@
               :size="filter.size"
               :total="tableTotal"
               @change-page="changePage"
-              @change-size="changeSize"
-            >
+              @change-size="changeSize">
             </bg-pagination>
           </div>
         </div>
       </div>
     </div>
     <!-- 新建/编辑弹窗 -->
-    <el-dialog
-      class="dialog_box"
-      :title=" addType == 1 ? '新建' : '编辑'"
-      v-model="addDialog"
-      width="758px"
-      :before-close="
-        () => {
-          addDialog = false;
-        }
-      "
-    >
-      <el-form
-        ref="bgForm"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-        class="bg_form"
-      >
+    <el-dialog class="dialog_box" :title="addType == 1 ? '新建' : '编辑'" v-model="addDialog" width="758px">
+      <el-form ref="bgForm" :model="formData" :rules="rules" label-width="80px" class="bg_form">
         <el-form-item label="名称" prop="name">
           <el-input
             v-model.trim="formData.name"
             show-word-limit
             :maxlength="
-              nodeClassifyId == 'eb9c7d70-c123-42b7-8e61-dde1b022b669' 
-              ? 6
-              : nodeClassifyId == 'efd9ec3b-7f18-49e2-9d88-bcca022243bb'
-              ? 4
-              : nodeClassifyId == '949a1138-4995-464e-97a9-424d097eb271'
-              ? 2
-              : 20
+              nodeClassifyId == 'eb9c7d70-c123-42b7-8e61-dde1b022b669'
+                ? 6
+                : nodeClassifyId == 'efd9ec3b-7f18-49e2-9d88-bcca022243bb'
+                ? 4
+                : nodeClassifyId == '949a1138-4995-464e-97a9-424d097eb271'
+                ? 2
+                : 20
             "
-            placeholder="请输入名称"
-          ></el-input>
+            placeholder="请输入名称"></el-input>
         </el-form-item>
         <el-form-item label="描述" prop="describe">
           <el-input
@@ -124,8 +114,7 @@
             show-word-limit
             maxlength="200"
             resize="vertical"
-            placeholder="请输入描述"
-          ></el-input>
+            placeholder="请输入描述"></el-input>
         </el-form-item>
         <el-form-item label="是否启用" prop="state" style="margin-bottom: 0px">
           <el-switch
@@ -135,8 +124,7 @@
             :inactive-value="0"
             inline-prompt
             active-text="是"
-            inactive-text="否"
-          />
+            inactive-text="否" />
         </el-form-item>
       </el-form>
       <template v-slot:footer>
@@ -156,8 +144,7 @@
         () => {
           dialogDelete = false;
         }
-      "
-    >
+      ">
       <div>确定要删除此字典值吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -170,12 +157,12 @@
 </template>
 
 <script setup>
-import { reactive, ref,onBeforeMount,toRefs,computed, watch, nextTick } from 'vue'
-import { useRouter } from 'vue-router';
-import { ElMessage } from 'element-plus'
-import axios from '../../../../request/http.js'
-import { Search } from '@element-plus/icons-vue'
-const bgForm = ref(null)
+import { reactive, ref, onBeforeMount, toRefs, computed, watch, nextTick } from "vue";
+import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+import axios from "../../../../request/http.js";
+import { Search } from "@element-plus/icons-vue";
+const bgForm = ref(null);
 const state = reactive({
   bgForm,
   typeList: [], // 分类数据
@@ -191,7 +178,7 @@ const state = reactive({
     {
       label: "描述",
       prop: "describe",
-      minWidth: 360
+      minWidth: 360,
     },
     {
       label: "更新时间",
@@ -220,20 +207,20 @@ const state = reactive({
   stateOptions: [
     {
       name: "全部",
-      value: ""
+      value: "",
     },
     {
       name: "启用",
-      value: "1"
+      value: "1",
     },
     {
       name: "禁用",
-      value: "0"
+      value: "0",
     },
   ], // 启用禁用
   actionRow: null, // 当前操作的数据
   dialogDelete: false, // 删除弹窗
-  addType: 0, // 
+  addType: 0, //
   addDialog: false,
   formData: {
     name: "",
@@ -241,70 +228,67 @@ const state = reactive({
     state: 1,
   },
   rules: {
-    name: [
-      { required: true, message: "请输入名称", trigger: "blur" }
-    ],
+    name: [{ required: true, message: "请输入名称", trigger: "blur" }],
     describe: [
       { required: true, message: "请输入描述", trigger: "blur" },
-      { max: 200, message: "描述最大为200字", trigger: "blur"}
+      { max: 200, message: "描述最大为200字", trigger: "blur" },
     ],
-    state: [
-      { required: true, message: "请选择是否启用", trigger: "change" }
-    ]
+    state: [{ required: true, message: "请选择是否启用", trigger: "change" }],
   },
-})
+});
 
 const nodeClick = (item) => {
-  state.nodeId = item.id
-  state.nodeClassifyId = item.classify_id
+  state.nodeId = item.id;
+  state.nodeClassifyId = item.classify_id;
   state.filter = {
     state: "",
     search: "",
     page: 1,
     limit: 10,
-  }
-  changePage(1)
-} // 切换字典分类
+  };
+  changePage(1);
+}; // 切换字典分类
 
 const searchType = () => {
   if (state.timer) {
     clearTimeout(state.timer);
   }
-  state.timer = setTimeout(() => {  
-    getTypeList()
+  state.timer = setTimeout(() => {
+    getTypeList();
   }, 500);
-} // 字典分类筛选
+}; // 字典分类筛选
 
 const getTypeList = () => {
   let params = {
-    name:state.typeKeyword
-  }
+    name: state.typeKeyword,
+  };
   axios
-    .get(`/apaas/system/v5/dictionary/classify/list`,{params})
-    .then( (res) => {
+    .get(`/apaas/system/v5/dictionary/classify/list`, { params })
+    .then((res) => {
       if (res.data.code == 200) {
-        state.typeList = res.data.data || []
-        state.nodeClassifyId = state.typeList[0].classify_id || null
-        state.nodeId = state.typeList[0].id || null
+        state.typeList = res.data.data || [];
+        state.nodeClassifyId = state.typeList[0].classify_id || null;
+        state.nodeId = state.typeList[0].id || null;
         if (state.nodeId) {
-          getTableRows()
+          getTableRows();
         }
-      }else {
-        ElMessage.error(res.data.data)
+      } else {
+        ElMessage.error(res.data.data);
       }
-    }).catch((err) => {
-      console.log(err)
     })
-} // 获取字典分类
+    .catch((err) => {
+      console.log(err);
+    });
+}; // 获取字典分类
 
 const changeSearch = (val) => {
-  state.filter.search = val
-  changePage(1)
-} // 表格关键字筛选
+  state.filter.search = val;
+  changePage(1);
+}; // 表格关键字筛选
 
 const filterAction = () => {
-  changePage(1)
-} // 查询按钮
+  changePage(1);
+}; // 查询按钮
 
 const filterClear = () => {
   state.filter = {
@@ -312,12 +296,12 @@ const filterClear = () => {
     search: "",
     limit: 10,
     page: 1,
-  }
-  changePage(1)
-} // 重置筛选项
+  };
+  changePage(1);
+}; // 重置筛选项
 
-const  getOperations = (row) => {
-  if (state.nodeClassifyId == '263758a4-0349-4d49-a816-e8ff8d33a8bb') {
+const getOperations = (row) => {
+  if (state.nodeClassifyId == "263758a4-0349-4d49-a816-e8ff8d33a8bb") {
     return [
       {
         name: "编辑",
@@ -326,16 +310,16 @@ const  getOperations = (row) => {
       },
       {
         name: "上移",
-        callback: () => moveRow(row,1),
+        callback: () => moveRow(row, 1),
         disabled: !row.canMoveUp,
       },
       {
         name: "下移",
-        callback: () => moveRow(row,2),
+        callback: () => moveRow(row, 2),
         disabled: !row.canMoveDown,
       },
-    ]
-  }else {
+    ];
+  } else {
     return [
       {
         name: "编辑",
@@ -349,221 +333,213 @@ const  getOperations = (row) => {
       },
       {
         name: "上移",
-        callback: () => moveRow(row,1),
+        callback: () => moveRow(row, 1),
         disabled: !row.canMoveUp,
       },
       {
         name: "下移",
-        callback: () => moveRow(row,2),
+        callback: () => moveRow(row, 2),
         disabled: !row.canMoveDown,
       },
     ];
   }
-} // 表格操作按钮
+}; // 表格操作按钮
 
 const getTableRows = () => {
-  let params = {...state.filter}
-  params.id = state.nodeId
+  let params = { ...state.filter };
+  params.id = state.nodeId;
   axios
-    .get(
-      `/apaas/system/v5/dictionary/list`,
-      {
-        params,
-      }
-    )
+    .get(`/apaas/system/v5/dictionary/list`, {
+      params,
+    })
     .then((res) => {
       if (res.data.code == 200) {
-        state.tableRows = res.data.data || []
-        state.tableTotal = res.data.total
+        state.tableRows = res.data.data || [];
+        state.tableTotal = res.data.total;
         if (state.tableRows.length > 0) {
-          state.tableRows.forEach(e => {
-            e.canMoveUp = true
-            e.canMoveDown = true
-          })
-          state.tableRows[0].canMoveUp = false
-          state.tableRows[state.tableRows.length - 1].canMoveDown = false
+          state.tableRows.forEach((e) => {
+            e.canMoveUp = true;
+            e.canMoveDown = true;
+          });
+          state.tableRows[0].canMoveUp = false;
+          state.tableRows[state.tableRows.length - 1].canMoveDown = false;
         }
-      }else {
-        ElMessage.error(res.data.data)
+      } else {
+        ElMessage.error(res.data.data);
       }
-    })
-} // 获取表格数据
+    });
+}; // 获取表格数据
 
 const changeUseRow = (row) => {
-  axios
-    .put(`/apaas/system/v5/dictionary/state?id=${row.id}&state=${row.state}`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
-        row.state = row.state == 0 ? 1 : 0
-      }
-    })
-} // 启用禁用
+  axios.put(`/apaas/system/v5/dictionary/state?id=${row.id}&state=${row.state}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      changePage(1);
+    } else {
+      ElMessage.error(res.data.data);
+      row.state = row.state == 0 ? 1 : 0;
+    }
+  });
+}; // 启用禁用
 
 const changePage = (page) => {
-  state.filter.page = page
-  getTableRows()
-} // 改变页码
+  state.filter.page = page;
+  getTableRows();
+}; // 改变页码
 
 const changeSize = (size) => {
-  state.filter.limit = size
-  changePage(1)
-} // 改变每页条数
+  state.filter.limit = size;
+  changePage(1);
+}; // 改变每页条数
 
 const register = () => {
   state.formData = {
     name: "",
     describe: "",
     state: 1,
-  }
+  };
   if (state.bgForm) {
     nextTick().then(() => {
-      state.bgForm.validate(valid => {
+      state.bgForm.validate((valid) => {
         if (!valid) {
-          state.bgForm.clearValidate()
+          state.bgForm.clearValidate();
         }
-      })
-    })
+      });
+    });
   }
-  state.addType = 1
-  state.addDialog = true
-} // 新建字典按钮
+  state.addType = 1;
+  state.addDialog = true;
+}; // 新建字典按钮
 
 const edit_row = (row) => {
   axios
     .get(`/apaas/system/v5/dictionary/${row.id}`)
     .then((res) => {
       if (res.data.code == 200) {
-        state.actionRow = res.data.data
+        state.actionRow = res.data.data;
         state.formData = {
           name: state.actionRow.name,
           describe: state.actionRow.describe,
-          state: state.actionRow.state
-        }
-      }else {
-        ElMessage.error(res.data.data)
+          state: state.actionRow.state,
+        };
+      } else {
+        ElMessage.error(res.data.data);
       }
-    }).catch((err) => {
-      console.log(err)
     })
-    if (state.bgForm) {
-      nextTick().then(() => {
-        state.bgForm.validate(valid => {
-          if (!valid) {
-            state.bgForm.clearValidate()
-          }
-        })
-      })
-    }
-    state.addType = 2
-    state.addDialog = true
-} // 编辑按钮
+    .catch((err) => {
+      console.log(err);
+    });
+  if (state.bgForm) {
+    nextTick().then(() => {
+      state.bgForm.validate((valid) => {
+        if (!valid) {
+          state.bgForm.clearValidate();
+        }
+      });
+    });
+  }
+  state.addType = 2;
+  state.addDialog = true;
+}; // 编辑按钮
 
 const addConfirm = () => {
-  state.bgForm.validate(valid => {
+  state.bgForm.validate((valid) => {
     if (valid) {
-      if (state.addType == 1) { // 新增
+      if (state.addType == 1) {
+        // 新增
         let params = {
           classify_id: state.nodeClassifyId,
-          ...state.formData
-        }
-        axios
-          .post(`/apaas/system/v5/dictionary/add`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              state.addDialog = false
-              changePage(1)
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
-      }else { // 编辑
+          ...state.formData,
+        };
+        axios.post(`/apaas/system/v5/dictionary/add`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            state.addDialog = false;
+            changePage(1);
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
+      } else {
+        // 编辑
         let params = {
           id: state.actionRow.id,
-          ...state.formData
-        }
-        axios
-          .put(`/apaas/system/v5/dictionary/update`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              state.addDialog = false
-              changePage(1)
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
+          ...state.formData,
+        };
+        axios.put(`/apaas/system/v5/dictionary/update`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            state.addDialog = false;
+            changePage(1);
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
       }
     }
-  })
-} // 确定新增/编辑
+  });
+}; // 确定新增/编辑
 
 const delete_row = (row) => {
-  state.dialogDelete = true
-  state.actionRow = row
-} // 删除按钮
+  state.dialogDelete = true;
+  state.actionRow = row;
+}; // 删除按钮
 
 const deleteData = () => {
-  axios
-    .delete(
-      `/apaas/system/v5/dictionary/${state.actionRow.id}`
-    )
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        state.dialogDelete = false
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 确定删除
+  axios.delete(`/apaas/system/v5/dictionary/${state.actionRow.id}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      state.dialogDelete = false;
+      changePage(1);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 确定删除
 
-const moveRow = (row,type) => {
-  let index
-  state.tableRows.forEach((e,i) => {
+const moveRow = (row, type) => {
+  let index;
+  state.tableRows.forEach((e, i) => {
     if (e.id == row.id) {
-      index = i
+      index = i;
     }
-  })
-  let nextRow
-  if (type == 1) { // 上移
-    nextRow = state.tableRows[index - 1]
-  }else { // 下移
-    nextRow = state.tableRows[index + 1]
+  });
+  let nextRow;
+  if (type == 1) {
+    // 上移
+    nextRow = state.tableRows[index - 1];
+  } else {
+    // 下移
+    nextRow = state.tableRows[index + 1];
   }
   let params = [
     {
       id: row.id,
-      sort: nextRow.sort
+      sort: nextRow.sort,
     },
     {
       id: nextRow.id,
-      sort: row.sort
-    }
-  ]
+      sort: row.sort,
+    },
+  ];
   axios
-    .put(`/apaas/system/v5/dictionary/sort`,[...params])
+    .put(`/apaas/system/v5/dictionary/sort`, [...params])
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
+        ElMessage.success(res.data.msg);
+        changePage(1);
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
     .catch((err) => {
-      console.log(err)
-    })
-}
+      console.log(err);
+    });
+};
 
 onBeforeMount(() => {
- getTypeList()
-})
+  getTypeList();
+});
 
 const {
   typeList,
@@ -575,13 +551,11 @@ const {
   filter,
   stateOptions,
   dialogDelete,
-  addType, 
+  addType,
   addDialog,
   formData,
   rules,
-} = toRefs(state)
-  
-
+} = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -598,7 +572,7 @@ const {
     // flex-grow: 1;
     width: 100%;
     display: flex;
-    
+
     margin-bottom: 16px;
     position: relative;
     height: calc(100% - 62px);
@@ -609,10 +583,9 @@ const {
       border-radius: 6px;
       padding: 16px;
       height: 100%;
-      box-shadow: 0px 1px 4px 0px 
-      	rgba(0, 7, 101, 0.15);
+      box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
       overflow: hidden;
-      
+
       .box {
         width: 208px;
         height: 100%;
@@ -632,7 +605,7 @@ const {
               background-color: #f2f3f7;
             }
           }
-          .current-type{
+          .current-type {
             background-color: #f2f3f7;
             border-radius: 4px;
           }
@@ -643,7 +616,7 @@ const {
       flex: 1;
       background-color: #fff;
       border-radius: 6px;
-      box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+      box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
       height: 100%;
       .main_container {
         height: 100%;
@@ -662,7 +635,7 @@ const {
             }
           }
         }
-  
+
         .table_container {
           height: calc(100% - 70px);
           width: 100%;
@@ -674,43 +647,40 @@ const {
       }
     }
   }
-  
-    .bg_form {
-      width: 100%;
-      box-sizing: border-box;
-      .el-form-item {
-        margin-bottom: 24px;
-        :deep().el-form-item__label {
-          line-height: 36px;
-          height: 36px;
-        }
-        .el-form-item__content {
-          width: 100%;
-          .el-textarea {
-            :deep().el-input__count {
-              bottom: -16px;
-              right: 4px;
-              font-family: Roboto-Regular;
-              color: #a9b1c7;
-            }
+
+  .bg_form {
+    width: 100%;
+    box-sizing: border-box;
+    .el-form-item {
+      margin-bottom: 24px;
+      :deep().el-form-item__label {
+        line-height: 36px;
+        height: 36px;
+      }
+      .el-form-item__content {
+        width: 100%;
+        .el-textarea {
+          :deep().el-input__count {
+            bottom: -16px;
+            right: 4px;
+            font-family: Roboto-Regular;
+            color: #a9b1c7;
           }
-          .bg-switch-ele {
-            width: 52px;
+        }
+        .bg-switch-ele {
+          width: 52px;
+          height: 24px;
+          :deep().el-switch__core {
+            width: 100%;
             height: 24px;
-            :deep().el-switch__core {
-              width: 100%;
-              height: 24px;
-              .el-switch__inner,
-              .el-switch__action {
-                top: 3px;
-              }
+            .el-switch__inner,
+            .el-switch__action {
+              top: 3px;
             }
           }
         }
       }
-    
+    }
   }
-  
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/develop/account/add/contact-form.vue b/src/page/main/develop/account/add/contact-form.vue
index fad495e..b2fca37 100644
--- a/src/page/main/develop/account/add/contact-form.vue
+++ b/src/page/main/develop/account/add/contact-form.vue
@@ -5,8 +5,7 @@
     :model="contactForm"
     :rules="contactFormRules"
     ref="contactRef"
-    style="max-width: 66%"
-  >
+    style="max-width: 66%">
     <el-form-item label="联系人姓名" prop="contact_name">
       <el-input v-model="contactForm.contact_name" />
     </el-form-item>
@@ -14,24 +13,22 @@
       <el-input v-model="contactForm.contact_phone" />
     </el-form-item>
     <el-form-item label="联系人邮箱" prop="contact_email">
-      <el-input v-model="contactForm.contact_email"/>
+      <el-input v-model="contactForm.contact_email" />
     </el-form-item>
-     <el-form-item label="备注" prop="remark">
-      <el-input type="textarea" :rows="3" v-model="contactForm.remark" show-word-limit maxlength="300"/>
+    <el-form-item label="备注" prop="remark">
+      <el-input type="textarea" :rows="3" v-model="contactForm.remark" show-word-limit maxlength="300" />
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted,getCurrentInstance } from 'vue'
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, ref, onMounted } from "vue";
 const contactForm = reactive({
-  contact_name: '',
-  contact_phone: '',
-  contact_email: '',
-  remark: '',
-})
+  contact_name: "",
+  contact_phone: "",
+  contact_email: "",
+  remark: "",
+});
 const props = defineProps({
   formType: {
     type: Boolean,
@@ -39,14 +36,14 @@ const props = defineProps({
   },
   id: {
     type: String,
-    default: '', 
-  }
+    default: "",
+  },
 });
 
 const checkPhone = (rule, value, callback) => {
   var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
   setTimeout(() => {
-    if (!phone_ruler.test(value)&&value.length!==0) {
+    if (!phone_ruler.test(value) && value.length !== 0) {
       callback(new Error("请输入正确的手机号码"));
     } else {
       callback();
@@ -72,55 +69,53 @@ const checkPhone = (rule, value, callback) => {
 // }
 
 const checkName = (rule, value, callback) => {
-  var reg = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/
+  var reg = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
   if (!reg.test(value)) {
-    callback(new Error("只能输入字母、数字和汉字"))
-  }else {
-    callback()
+    callback(new Error("只能输入字母、数字和汉字"));
+  } else {
+    callback();
   }
-}
+};
 
 const contactFormRules = reactive({
   contact_name: [
-    { required: true, message: '请输入联系人姓名', trigger: 'blur' },
-    { max: 50, message: "联系人姓名最大长度为50个字符", trigger: "blur"},
-    { validator: checkName, trigger: 'blur' },
+    { required: true, message: "请输入联系人姓名", trigger: "blur" },
+    { max: 50, message: "联系人姓名最大长度为50个字符", trigger: "blur" },
+    { validator: checkName, trigger: "blur" },
   ],
   contact_phone: [
-    { required: true, message: '请输入联系人手机号', trigger: 'blur' },
-    { validator: checkPhone, trigger: 'blur' },
+    { required: true, message: "请输入联系人手机号", trigger: "blur" },
+    { validator: checkPhone, trigger: "blur" },
     // { validator: checkPhoneRepet, trigger: 'blur' }
   ],
   contact_email: [
-    { type: 'email', message: '请输入正确的邮箱', trigger: 'blur' },
-    { max: 100, message: "邮箱最大长度为100个字符", trigger: "blur"},
-  ]
-})
-const contactRef = ref(null)
-const emit = defineEmits(['action'])
+    { type: "email", message: "请输入正确的邮箱", trigger: "blur" },
+    { max: 100, message: "邮箱最大长度为100个字符", trigger: "blur" },
+  ],
+});
+const contactRef = ref(null);
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!contactRef) return
+  if (!contactRef) return;
   await contactRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', contactForm)
+      emit("action", contactForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 const clearForm = () => {
-  if (!contactRef) return
-  contactRef.value.resetFields()
-} 
+  if (!contactRef) return;
+  contactRef.value.resetFields();
+};
 
 const setForm = (data) => {
-   Object.assign(contactForm, data);
-}
+  Object.assign(contactForm, data);
+};
 
-onMounted(() => {
-   
-})
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/develop/account/add/index.vue b/src/page/main/develop/account/add/index.vue
index 2eaab7e..74aa39c 100644
--- a/src/page/main/develop/account/add/index.vue
+++ b/src/page/main/develop/account/add/index.vue
@@ -1,248 +1,260 @@
 <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> {{ route.query.id ? '编辑' : '新建'}} </el-breadcrumb-item>
-            </el-breadcrumb>
+  <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> {{ route.query.id ? "编辑" : "新建" }} </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="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">
-                    <systemForm v-show="step === 1" ref="systemFormRef" :form-type="route.query.id ? true : false" :id="route.query.id" @action="getSystemFormData"></systemForm>
-                    <contactForm v-show="step === 2" ref="contactFormRef" :id="route.query.id" @action="getContactFormData"></contactForm>
-                    <div class="process_end" v-show="step === 3">
-                        <div>
-                            <div>
-                                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="">
-                                <img v-else src="@/assets/imgs/img_data-fail.png" alt="">
-                            </div>
-                            <div class="font_bold">{{route.query.id ? (successFlag ? '业务系统编辑成功' : '业务系统编辑失败') : (successFlag ? '业务系统新建成功' : '业务系统新建失败')}}</div>
-                            <el-button  @click="cancel">返回列表</el-button>
-                            <el-button v-if="!route.query.id" 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 class="content_main">
+          <systemForm
+            v-show="step === 1"
+            ref="systemFormRef"
+            :form-type="route.query.id ? true : false"
+            :id="route.query.id"
+            @action="getSystemFormData"></systemForm>
+          <contactForm
+            v-show="step === 2"
+            ref="contactFormRef"
+            :id="route.query.id"
+            @action="getContactFormData"></contactForm>
+          <div class="process_end" v-show="step === 3">
+            <div>
+              <div>
+                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="" />
+                <img v-else src="@/assets/imgs/img_data-fail.png" alt="" />
+              </div>
+              <div class="font_bold">
+                {{
+                  route.query.id
+                    ? successFlag
+                      ? "业务系统编辑成功"
+                      : "业务系统编辑失败"
+                    : successFlag
+                    ? "业务系统新建成功"
+                    : "业务系统新建失败"
+                }}
+              </div>
+              <el-button @click="cancel">返回列表</el-button>
+              <el-button v-if="!route.query.id" 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 systemForm from './system-form.vue';
-import contactForm from './contact-form.vue';
-import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted, getCurrentInstance  } from 'vue';
-import CryptoJS from "crypto-js"; 
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { useRoute, useRouter } from "vue-router";
+import systemForm from "./system-form.vue";
+import contactForm from "./contact-form.vue";
+import { reactive, ref, onBeforeMount, toRefs, computed, onBeforeUnmount, onMounted } from "vue";
+import CryptoJS from "crypto-js";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 const router = useRouter();
 const step = ref(1);
 const systemFormRef = ref(null);
 const contactFormRef = ref(null);
 const formData = reactive({
-  organization_id: '',
-  business_code: '',
-  business_name: '',
-  business_desc: '',
-  logo: '',
-  system_role_id: '',
-  system_account: '',
-  password: '',
-  confirm_password: '',
-  access_address: '',
-  develop_id: '',
+  organization_id: "",
+  business_code: "",
+  business_name: "",
+  business_desc: "",
+  logo: "",
+  system_role_id: "",
+  system_account: "",
+  password: "",
+  confirm_password: "",
+  access_address: "",
+  develop_id: "",
   state: 1,
 
-  contact_name: '',
-  contact_phone: '',
-  contact_email: '',
-  remark: '',
+  contact_name: "",
+  contact_phone: "",
+  contact_email: "",
+  remark: "",
 }); //业务系统表单+联系人表单
-const successFlag = ref(false)
+const successFlag = ref(false);
 
 // 下一步
 const nextStep = () => {
-    systemFormRef.value.submitForm();
-}
+  systemFormRef.value.submitForm();
+};
 //业务系统表单检验触发事件 data为null 校验失败
 const getSystemFormData = (data) => {
-        if(data) {
-            Object.assign(formData,data);
-            step.value = 2;
-        }else {
-
-        }
-}
-//联系人表单检验触发事件 data为null 校验失败 
+  if (data) {
+    Object.assign(formData, data);
+    step.value = 2;
+  } else {
+  }
+};
+//联系人表单检验触发事件 data为null 校验失败
 const getContactFormData = (data) => {
-
-    if(data) {
-        Object.assign(formData,data);
-        if(route.query.id) {
-            console.log(formData)
-            let params = {
-                ...formData,
-                id: parseInt(route.query.id),
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-            }
-            $axios.post(`/apaas/system/v5/user/update`,params)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    successFlag.value = true;
-                    step.value = 3;
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
-        }else {
-            let params = {
-                ...formData,
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-                password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString(),
-            }
-            $axios.put(`/apaas/system/v5/user/create`,params)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    successFlag.value = true;
-                    step.value = 3;
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
+  if (data) {
+    Object.assign(formData, data);
+    if (route.query.id) {
+      console.log(formData);
+      let params = {
+        ...formData,
+        id: parseInt(route.query.id),
+        logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+      };
+      axios.post(`/apaas/system/v5/user/update`, params).then((res) => {
+        if (res.data.code == 200) {
+          successFlag.value = true;
+          step.value = 3;
+        } else {
+          ElMessage.error(res.data.data);
         }
+      });
+    } else {
+      let params = {
+        ...formData,
+        logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+        password: CryptoJS.AES.encrypt(formData.password, "swuE9cmCZQwrkYRV").toString(),
+      };
+      axios.put(`/apaas/system/v5/user/create`, params).then((res) => {
+        if (res.data.code == 200) {
+          successFlag.value = true;
+          step.value = 3;
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
     }
-}
+  }
+};
 //上一步
 const previousStep = () => {
-    step.value--;
-}
+  step.value--;
+};
 //提交表单
 const submit = () => {
-    contactFormRef.value.submitForm();
-}
+  contactFormRef.value.submitForm();
+};
 //继续创建 清空表单
 const continueCreate = () => {
-    systemFormRef.value.clearForm();
-    contactFormRef.value.clearForm();
-    step.value = 1;
-    successFlag.value = false;
-}
+  systemFormRef.value.clearForm();
+  contactFormRef.value.clearForm();
+  step.value = 1;
+  successFlag.value = false;
+};
 //取消
 const cancel = () => {
-    // router.go(-1);
-    router.push({
-        path: "/develop/account",
-        query: {
-            id: formData.organization_id
-        }
-    })
-}
+  // router.go(-1);
+  router.push({
+    path: "/develop/account",
+    query: {
+      id: formData.organization_id,
+    },
+  });
+};
 
 const getDetail = () => {
-    $axios.get(`/apaas/system/v5/user/detail/${route.query.id}`)
-        .then((res) => {
-            if (res.data.code == 200) {
-                const form = res.data.data;
-                systemFormRef.value.setForm({
-                    organization_id: form.organization_id,
-                    system_role_id: form.system_role_id,
-                    logo: form.logo ? [{url:form.logo}] : [],
-                    business_code: form.business_code,
-                    business_name: form.business_name,
-                    business_desc: form.business_desc,
-                    system_account: form.system_account,
-                    access_address: form.access_address,
-                    develop_id: form.develop_id,
-                    state: form.state,
-                    appid: form.app_id,
-                    appsecret: form.app_secret
-                    
-                })
+  axios.get(`/apaas/system/v5/user/detail/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      const form = res.data.data;
+      systemFormRef.value.setForm({
+        organization_id: form.organization_id,
+        system_role_id: form.system_role_id,
+        logo: form.logo ? [{ url: form.logo }] : [],
+        business_code: form.business_code,
+        business_name: form.business_name,
+        business_desc: form.business_desc,
+        system_account: form.system_account,
+        access_address: form.access_address,
+        develop_id: form.develop_id,
+        state: form.state,
+        appid: form.app_id,
+        appsecret: form.app_secret,
+      });
 
-            contactFormRef.value.setForm({
-                contact_name: form.contact_name,
-                contact_phone: form.contact_phone,
-                contact_email: form.contact_email,
-                remark: form.remark,
-            })
-            }else {
-                $message.error(res.data.data)
-            }
-        })
+      contactFormRef.value.setForm({
+        contact_name: form.contact_name,
+        contact_phone: form.contact_phone,
+        contact_email: form.contact_email,
+        remark: form.remark,
+      });
+    } else {
+      ElMessage.error(res.data.data);
     }
+  });
+};
 
-    onBeforeUnmount(()=>{
-       
-    })
-    onMounted(() => {
-        if(route.query.id) {
-            getDetail()
-        }
-    })
-
+onBeforeUnmount(() => {});
+onMounted(() => {
+  if (route.query.id) {
+    getDetail();
+  }
+});
 </script>
 
 <style scoped>
 .flex_cloumn {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 .content_top {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
 }
 /* .content_top::-webkit-scrollbar {
   width: 5px;
@@ -259,80 +271,79 @@ const getDetail = () => {
 } */
 
 .content_bottom {
-    height: 68px;
-    line-height: 68px;
-    text-align: right;
-    padding: 0 20px;
-    border-top: 1px solid #e6e9ef;
+  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%;
+  border-bottom: 1px solid #e6e9ef;
+  padding: 38px 16%;
 }
 .content_main {
-    flex: 1;
-    padding: 30px;
-    box-sizing: border-box;
+  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;
+  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;
+  height: 25px;
+  width: 25px;
+  vertical-align: middle;
 }
 .process_end {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .process_end div {
-    text-align: center;
+  text-align: center;
 }
 .step_icon {
-    color: #fff;
-    font-weight: 600;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
+  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;
+  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;
+  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;
+  height: 4px;
 }
 .content_process :deep() .el-step__head.is-finish .el-step__line {
-    background: linear-gradient(to right,#2b4695 50%,#e6e9ef 50%);
+  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%);
+  background: linear-gradient(to right, #2b4695 100%, #e6e9ef 0%);
 }
 </style>
diff --git a/src/page/main/develop/account/add/system-form.vue b/src/page/main/develop/account/add/system-form.vue
index 05fcecc..31ab92f 100644
--- a/src/page/main/develop/account/add/system-form.vue
+++ b/src/page/main/develop/account/add/system-form.vue
@@ -5,82 +5,85 @@
     :model="systemForm"
     :rules="formRules"
     ref="systemRef"
-    style="max-width: 66%"
-  >
+    style="max-width: 66%">
     <el-form-item label="所属机构" prop="organization_id">
-      <el-tree-select v-model="systemForm.organization_id" :data="orgData" :props="treeProps" :render-after-expand="false" :disabled="formType" style="width: 100%;"/>
+      <el-tree-select
+        v-model="systemForm.organization_id"
+        :data="orgData"
+        :props="treeProps"
+        :render-after-expand="false"
+        :disabled="formType"
+        style="width: 100%" />
     </el-form-item>
     <el-form-item label="业务系统编码" prop="business_code" v-if="formType">
-      <el-input v-model="systemForm.business_code" :disabled="formType"/>
+      <el-input v-model="systemForm.business_code" :disabled="formType" />
     </el-form-item>
     <el-form-item label="业务系统名称" prop="business_name">
       <el-input v-model="systemForm.business_name" />
     </el-form-item>
     <el-form-item label="AppId" prop="appid" v-if="formType">
-      <el-input v-model="systemForm.appid" :disabled="formType" style="width: 80%;"/>
+      <el-input v-model="systemForm.appid" :disabled="formType" style="width: 80%" />
       <span class="pl-1"><el-button type="primary" @click="copyText(systemForm.appid)">复制</el-button></span>
     </el-form-item>
     <el-form-item label="AppSecret" prop="appsecret" v-if="formType">
-      <el-input v-model="systemForm.appsecret" :disabled="formType" style="width: 80%;"/>
+      <el-input v-model="systemForm.appsecret" :disabled="formType" style="width: 80%" />
       <span class="pl-1"><el-button type="primary" @click="copyText(systemForm.appsecret)">复制</el-button></span>
       <span class="pl-1"><el-button type="primary" @click="resetSecret">重置</el-button></span>
     </el-form-item>
     <el-form-item label="系统LOGO" prop="logo">
-       <bg-upload-image v-model="systemForm.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>
+      <bg-upload-image
+        v-model="systemForm.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="business_desc">
+    <el-form-item label="业务系统概述" prop="business_desc">
       <el-input type="textarea" :rows="3" v-model="systemForm.business_desc" show-word-limit maxlength="300" />
     </el-form-item>
-     <el-form-item label="角色" prop="system_role_id" v-if="!formType">
-     <el-select v-model="systemForm.system_role_id" placeholder="请选择角色" :disabled="true" style="width: 100%">
-        <el-option
-          v-for="item in roleList"
-          :key="item.role_id"
-          :label="item.role_name"
-          :value="item.role_id"
-        />
+    <el-form-item label="角色" prop="system_role_id" v-if="!formType">
+      <el-select v-model="systemForm.system_role_id" placeholder="请选择角色" :disabled="true" style="width: 100%">
+        <el-option v-for="item in roleList" :key="item.role_id" :label="item.role_name" :value="item.role_id" />
       </el-select>
     </el-form-item>
-     <el-form-item label="账号" prop="system_account">
+    <el-form-item label="账号" prop="system_account">
       <el-input v-model="systemForm.system_account" />
     </el-form-item>
-     <el-form-item label="密码" prop="password" v-if="!formType">
-      <el-input :type="password_eye ? 'text' : 'password'" v-model="systemForm.password" >
+    <el-form-item label="密码" prop="password" v-if="!formType">
+      <el-input :type="password_eye ? 'text' : 'password'" v-model="systemForm.password">
         <template #suffix>
-          <bg-icon @click="password_eye = !password_eye" class="icon_eye"  icon="#bg-ic-eye"></bg-icon>
+          <bg-icon @click="password_eye = !password_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
         </template>
       </el-input>
     </el-form-item>
-     <el-form-item label="确认密码" prop="confirm_password" v-if="!formType">
-      <el-input :type="confirm_eye ? 'text' : 'password'" v-model="systemForm.confirm_password" >
+    <el-form-item label="确认密码" prop="confirm_password" v-if="!formType">
+      <el-input :type="confirm_eye ? 'text' : 'password'" v-model="systemForm.confirm_password">
         <template #suffix>
-            <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye"  icon="#bg-ic-eye"></bg-icon>
+          <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
         </template>
       </el-input>
     </el-form-item>
-     <el-form-item label="访问地址" prop="access_address">
+    <el-form-item label="访问地址" prop="access_address">
       <el-input v-model="systemForm.access_address" />
     </el-form-item>
     <el-form-item label="开发厂商名称" prop="develop_id">
       <el-select v-model="systemForm.develop_id" placeholder="请选择开发厂商" style="width: 100%">
-        <el-option
-          v-for="item in firmList"
-          :key="item.dict_id"
-          :label="item.dict_name"
-          :value="item.dict_id"
-        />
+        <el-option v-for="item in firmList" :key="item.dict_id" :label="item.dict_name" :value="item.dict_id" />
       </el-select>
     </el-form-item>
     <el-form-item label="是否启用" prop="state">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="systemForm.state"></bg-switch>
+      <bg-switch :labels="['否', '是']" :values="[0, 1]" v-model="systemForm.state"></bg-switch>
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onBeforeMount, onMounted, getCurrentInstance, computed } from 'vue'
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, ref, onBeforeMount, onMounted, computed } from "vue";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const props = defineProps({
   formType: {
     type: Boolean,
@@ -88,213 +91,194 @@ const props = defineProps({
   },
   id: {
     type: String,
-    default: '', 
-  }
+    default: "",
+  },
 });
 const systemForm = reactive({
-  organization_id: '',
-  business_code: '',
-  business_name: '',
-  business_desc: '',
+  organization_id: "",
+  business_code: "",
+  business_name: "",
+  business_desc: "",
   logo: [],
-  system_role_id: '',
-  system_account: '',
-  password: '',
-  confirm_password: '',
-  access_address: '',
-  develop_id: '',
+  system_role_id: "",
+  system_account: "",
+  password: "",
+  confirm_password: "",
+  access_address: "",
+  develop_id: "",
   state: 1,
-  appid: '',
-  appsecret: ''
-})
-const password_eye = ref(false)
+  appid: "",
+  appsecret: "",
+});
+const password_eye = ref(false);
 const confirm_eye = ref(false);
 
 const validatePass = (rule, value, callback) => {
   if (value !== systemForm.password) {
-    callback(new Error("密码输入不一致"))
+    callback(new Error("密码输入不一致"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 const validateBusinessName = (rule, value, callback) => {
-  let reg = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/
+  let reg = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
   if (!reg.test(value)) {
-    callback(new Error("只能输入字母、数字和汉字"))
-  }else {
+    callback(new Error("只能输入字母、数字和汉字"));
+  } else {
     let params = null;
-     if (props.id){
-       params = {id: parseInt(props.id),business_name: value,organization_id: systemForm.organization_id}
-     }else {
-       params = {business_name: value,organization_id: systemForm.organization_id}
-     }
-  
-    $axios.post(`/apaas/system/v5/user/check/business`,params)
-      .then((res) => {
-       if (res.data.code == 200) {
-          callback()
-       }else {
-          callback(new Error(res.data.data))
-       }
-      })
+    if (props.id) {
+      params = { id: parseInt(props.id), business_name: value, organization_id: systemForm.organization_id };
+    } else {
+      params = { business_name: value, organization_id: systemForm.organization_id };
+    }
+
+    axios.post(`/apaas/system/v5/user/check/business`, params).then((res) => {
+      if (res.data.code == 200) {
+        callback();
+      } else {
+        callback(new Error(res.data.data));
+      }
+    });
   }
-}
+};
 
 const validateSystemAccount = (rule, value, callback) => {
-  let reg = /^[a-zA-Z0-9]+$/
+  let reg = /^[a-zA-Z0-9]+$/;
   if (!reg.test(value)) {
-    callback(new Error("只能输入字母和数字"))
-  }else {
+    callback(new Error("只能输入字母和数字"));
+  } else {
     let params = null;
-    if (props.id){
-      params = {id: parseInt(props.id),system_account: value,}
-    }else {
-      params = {system_account: value}
+    if (props.id) {
+      params = { id: parseInt(props.id), system_account: value };
+    } else {
+      params = { system_account: value };
     }
-  
-    $axios.post(`/apaas/system/v5/user/check/account`,params)
-      .then((res) => {
-        if (res.data.code == 200) {
-          callback()
-        }else {
-          callback(new Error(res.data.data))
-        }
-      })
+
+    axios.post(`/apaas/system/v5/user/check/account`, params).then((res) => {
+      if (res.data.code == 200) {
+        callback();
+      } else {
+        callback(new Error(res.data.data));
+      }
+    });
   }
-}
+};
 
 const formRules = reactive({
-  organization_id: [
-    { required: true, message: '请选择组织机构', trigger: 'change' },
-  ],
+  organization_id: [{ required: true, message: "请选择组织机构", trigger: "change" }],
   business_name: [
-    { required: true, message: '请输入业务系统名称', trigger: 'blur' },
-    { max: 50, message: '业务系统名称最大长度为50个字符', trigger: 'blur' },
-    { validator: validateBusinessName, trigger: 'blur' },
-  ],
-  system_role_id: [
-    { required: true, message: '请选择角色', trigger: 'blur' },
+    { required: true, message: "请输入业务系统名称", trigger: "blur" },
+    { max: 50, message: "业务系统名称最大长度为50个字符", trigger: "blur" },
+    { validator: validateBusinessName, trigger: "blur" },
   ],
+  system_role_id: [{ required: true, message: "请选择角色", trigger: "blur" }],
   system_account: [
-    { required: true, message: '请输入账号', trigger: 'blur' },
-    { min: 4,message: '帐号长度不得低于4个字符',trigger: 'blur' },
-    { max: 20,message: '帐号最大长度为20个字符',trigger: 'blur' },
-    { validator: validateSystemAccount, trigger: 'blur' },
+    { required: true, message: "请输入账号", trigger: "blur" },
+    { min: 4, message: "帐号长度不得低于4个字符", trigger: "blur" },
+    { max: 20, message: "帐号最大长度为20个字符", trigger: "blur" },
+    { validator: validateSystemAccount, trigger: "blur" },
   ],
   password: [
-    { required: true, message: '请输入密码', trigger: 'blur' },
-    { min: 8,message: '密码长度不得低于8位',trigger: 'blur' }
+    { required: true, message: "请输入密码", trigger: "blur" },
+    { min: 8, message: "密码长度不得低于8位", trigger: "blur" },
   ],
   confirm_password: [
-    { required: true, message: '请确认密码', trigger: 'blur' },
-    { validator: validatePass, trigger: 'blur' }
+    { required: true, message: "请确认密码", trigger: "blur" },
+    { validator: validatePass, trigger: "blur" },
   ],
-  access_address: [
-    { max: 500,message: '访问地址最大长度为500个字符',trigger: 'blur' },
-  ],
-  develop_id: [
-    { required: true, message: "请选择开发厂商", trigger: "change"}
-  ]
-})
+  access_address: [{ max: 500, message: "访问地址最大长度为500个字符", trigger: "blur" }],
+  develop_id: [{ required: true, message: "请选择开发厂商", trigger: "change" }],
+});
 
-const systemRef = ref(null)
-const emit = defineEmits(['action'])
-const roleList = ref([])
-const firmList = ref([])
+const systemRef = ref(null);
+const emit = defineEmits(["action"]);
+const roleList = ref([]);
+const firmList = ref([]);
 
 const submitForm = async () => {
-  if (!systemRef) return
+  if (!systemRef) return;
   await systemRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', systemForm)
+      emit("action", systemForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const clearForm = () => {
-  if (!systemRef) return
+  if (!systemRef) return;
   systemRef.value.resetFields();
   systemForm.system_role_id = roleList.value[0].role_id;
-} 
+};
 
 const setForm = (data) => {
   Object.assign(systemForm, data);
-}
+};
 
-const orgData = ref([])
+const orgData = ref([]);
 const treeProps = {
-  label: 'name',
-  children: 'Child',
-  value: 'organization_id'
-}
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+};
 const getOrgTree = () => {
-  $axios.get(`/apaas/system/v5/org/tree`)
-     .then((res) => {
-     if (res.data.code == 200) {
-        const orgDataTemp =  res.data.data || []
-        orgDataTemp.shift()
-        orgData.value = orgDataTemp;
-     }else {
-         $message.error(res.data.data)
-     }
-     })
-}
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      const orgDataTemp = res.data.data || [];
+      orgDataTemp.shift();
+      orgData.value = orgDataTemp;
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 const copyText = (data) => {
   navigator.clipboard.writeText(data).then(
-        function () {
-          $message.success("复制成功")
-        },
-        function () {
-        }
-      );
-}
+    function () {
+      ElMessage.success("复制成功");
+    },
+    function () {}
+  );
+};
 const resetSecret = () => {
-  $axios.get(`/apaas/system/v5/user/reset/secret/${props.id}`)
-     .then((res) => {
-      if (res.data.code == 200) {
-            systemForm.appsecret = res.data.data;
-            $message.success("重置成功！")
-      }else {
-          $message.error(res.data.data)
-      }
-     })
-}
+  axios.get(`/apaas/system/v5/user/reset/secret/${props.id}`).then((res) => {
+    if (res.data.code == 200) {
+      systemForm.appsecret = res.data.data;
+      ElMessage.success("重置成功！");
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 const getRoleList = () => {
-  $axios.get(`/apaas/system/v5/org/select/role?is_admin=1`)
-     .then((res) => {
-      if (res.data.code == 200) {
-            roleList.value = res.data.data;
-            systemForm.system_role_id = roleList.value[0].role_id;
-      }else {
-         
-      }
-     })
-}
+  axios.get(`/apaas/system/v5/org/select/role?is_admin=1`).then((res) => {
+    if (res.data.code == 200) {
+      roleList.value = res.data.data;
+      systemForm.system_role_id = roleList.value[0].role_id;
+    } else {
+    }
+  });
+};
 
 const getFirmList = () => {
-  $axios.get(`/apaas/system/v5/dictionary/developer/list`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        firmList.value = res.data.data || [];
-      }else {
-        $message.error(res.data.data)
-      }
-    })
-}
-
-onBeforeMount(() =>{
-  getOrgTree()
-  getRoleList()
-  getFirmList()
-})
-
-onMounted(() => {
+  axios.get(`/apaas/system/v5/dictionary/developer/list`).then((res) => {
+    if (res.data.code == 200) {
+      firmList.value = res.data.data || [];
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-})
+onBeforeMount(() => {
+  getOrgTree();
+  getRoleList();
+  getFirmList();
+});
 
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/develop/account/detail/index.vue b/src/page/main/develop/account/detail/index.vue
index fa85df7..50de223 100644
--- a/src/page/main/develop/account/detail/index.vue
+++ b/src/page/main/develop/account/detail/index.vue
@@ -1,201 +1,200 @@
 <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 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 v-if="logo" :src="logo" style="height: 96px; width: 96px; border-radius: 99px" alt="" />
+            <img
+              v-else
+              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="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 v-if="logo" :src="logo" style="height: 96px;width: 96px;border-radius: 99px" alt="">
-                        <img v-else 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 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 { useRoute, useRouter } from 'vue-router';
+import { reactive, toRefs, ref, onBeforeMount } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
-const baseInfo = reactive(
-    [{
-      name: "所属机构",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "业务系统编码",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "业务系统名称",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "账号",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "AppID",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "AppSecret",
-      value: "",
-      copy_icon: true,
-      secret: true,
-      nameWidth: 130
-    },
-    {
-      name: "创建人",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "创建时间",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "是否启用",
-      value: "",
-      state: "",
-      nameWidth: 130
-    },
-    {
-      name: "开发厂商名称",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "访问地址",
-      value: "",
-      full: true,
-      nameWidth: 130
-    },
-    {
-      name: "业务系统描述",
-      value: "",
-      full: true,
-      nameWidth: 130
-    },
-  ]
-  )
+const baseInfo = reactive([
+  {
+    name: "所属机构",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "业务系统编码",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "业务系统名称",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "账号",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "AppID",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "AppSecret",
+    value: "",
+    copy_icon: true,
+    secret: true,
+    nameWidth: 130,
+  },
+  {
+    name: "创建人",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "创建时间",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "是否启用",
+    value: "",
+    state: "",
+    nameWidth: 130,
+  },
+  {
+    name: "开发厂商名称",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "访问地址",
+    value: "",
+    full: true,
+    nameWidth: 130,
+  },
+  {
+    name: "业务系统描述",
+    value: "",
+    full: true,
+    nameWidth: 130,
+  },
+]);
 
-  const contactInfo = reactive(
-    [{
-      name: "联系人姓名",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "联系人手机号",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "联系人邮箱",
-      value: "",
-      full: true,
-      nameWidth: 130
-    },
-    {
-      name: "备注",
-      value: "",
-      full: true,
-      nameWidth: 130
-    },
-  ])
-  const logo = ref('')
+const contactInfo = reactive([
+  {
+    name: "联系人姓名",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "联系人手机号",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "联系人邮箱",
+    value: "",
+    full: true,
+    nameWidth: 130,
+  },
+  {
+    name: "备注",
+    value: "",
+    full: true,
+    nameWidth: 130,
+  },
+]);
+const logo = ref("");
 
-  const getDetail = () => {
-      $axios.get(`/apaas/system/v5/user/detail/${route.query.id}`)
-             .then((res) => {
-             if (res.data.code == 200) {
-                 const detail = res.data.data; 
-                 baseInfo[0].value = detail.organization_name;
-                 baseInfo[1].value = detail.business_code;
-                 baseInfo[2].value = detail.business_name;
-                 baseInfo[3].value = detail.system_account;
-                 baseInfo[4].value = detail.app_id;
-                 baseInfo[5].value = detail.app_secret;
-                 baseInfo[6].value = detail.created_by+"("+(detail.created_user_role ? detail.created_user_role.join('、') : '')+")";
-                 baseInfo[7].value = detail.created_time;
-                 baseInfo[8].value = detail.state === 1 ? '是' : '否';
-                 baseInfo[8].state = detail.state === 1 ? 'success' : 'default';
-                 baseInfo[9].value = detail.develop_name;
-                 baseInfo[10].value = detail.access_address;
-                 baseInfo[11].value = detail.business_desc;
+const getDetail = () => {
+  axios.get(`/apaas/system/v5/user/detail/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      const detail = res.data.data;
+      baseInfo[0].value = detail.organization_name;
+      baseInfo[1].value = detail.business_code;
+      baseInfo[2].value = detail.business_name;
+      baseInfo[3].value = detail.system_account;
+      baseInfo[4].value = detail.app_id;
+      baseInfo[5].value = detail.app_secret;
+      baseInfo[6].value =
+        detail.created_by + "(" + (detail.created_user_role ? detail.created_user_role.join("、") : "") + ")";
+      baseInfo[7].value = detail.created_time;
+      baseInfo[8].value = detail.state === 1 ? "是" : "否";
+      baseInfo[8].state = detail.state === 1 ? "success" : "default";
+      baseInfo[9].value = detail.develop_name;
+      baseInfo[10].value = detail.access_address;
+      baseInfo[11].value = detail.business_desc;
 
-                 contactInfo[0].value = detail.contact_name;
-                 contactInfo[1].value = detail.contact_phone;
-                 contactInfo[2].value = detail.contact_email;
-                 contactInfo[3].value = detail.remark;
+      contactInfo[0].value = detail.contact_name;
+      contactInfo[1].value = detail.contact_phone;
+      contactInfo[2].value = detail.contact_email;
+      contactInfo[3].value = detail.remark;
 
-                 logo.value = detail.logo;
-             }else {
-                 $message.error(res.data.data)
-             }
-         })
-  }
+      logo.value = detail.logo;
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-  onBeforeMount(() => {
-     getDetail()
- })
+onBeforeMount(() => {
+  getDetail();
+});
 </script>
 
 <style scoped>
 .page_content {
-    padding: 15px;
-    overflow: auto;
+  padding: 15px;
+  overflow: auto;
 }
 .info_content {
-    display: flex;
+  display: flex;
 }
 .info_row {
-    margin-bottom: 40px;
+  margin-bottom: 40px;
 }
 .img_box {
-    width: 120px;
+  width: 120px;
 }
 .info_box {
-    width: 60%;
+  width: 60%;
 }
 
 .title {
@@ -207,19 +206,18 @@ const baseInfo = reactive(
   align-items: center;
 }
 .dashed_line {
-    flex: 1;
-    height: 1px;
-    margin: 0 10px;
-	border-bottom: dashed 1px #dadee7;
+  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;
+  display: inline-block;
+  width: 4px;
+  height: 14px;
+  background-color: #3759be;
+  border-radius: 2px;
+  margin-right: 5px;
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index 149b01c..0038430 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -1,614 +1,572 @@
 <template>
-    <div class="page_container">
-        <div class="bg-breadcrumb">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item> 开发管理 </el-breadcrumb-item>
-                <el-breadcrumb-item > 系统账号管理 </el-breadcrumb-item>
-            </el-breadcrumb>
-        </div>
-         <div class="flex_row">
-           <div class="flex_left bgc_white">
-             <div class="tree_header">
-                 政务机构
-             </div>
-             <div class="tree_content">
-               <div class="search"> 
-                 <el-input
-                    v-model="filterTree"
-                    placeholder="请输入组织名称搜索"
-                    :prefix-icon="Search"
-                  />
-               </div>
-               <div class="tree">
-                  <el-tree ref="treeRef" 
-                    :data="orgData" 
-                    :props="defaultProps" 
-                    @node-click="handleNodeClick"
-                    node-key="id"
-                    :highlight-current="true" 
-                    :filter-node-method="filterNode" 
-                    :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>
-           <div class="flex_right bgc_white">
-             <div class="main_container">
-               <bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入关键字">
-                  <template v-slot:left_action>
-                    <div class="apaas_button">
-                    <el-button class="register_btn" type="primary" @click="addAccount">
-                      <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
-                        新建
-                    </el-button>
-                    <el-button class="register_btn" @click="deleteBatch">
-                        批量删除
-                    </el-button>
-                    <el-button class="register_btn" @click="resetPsd">
-                        重置密码
-                    </el-button>
-                    <span class="header_info">已选择<span style="color: #202531;font-weight: bold">{{selected.length}}</span>项</span>
-                    <span class="header_info can_click_text" @click="clearSelected">清空</span>
-                  </div>
-                  </template>
-                </bg-filter-group>
-                <div class="table_container apaas_scroll">
-                  <bg-table ref="dataTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true" :select="true" @selectAc="selectRows">
-                    <template v-slot:business_name="{ row }">
-                      <span @click="goDetail(row)" class="can_click_text">
-                        {{ 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="can_click_text" @click="editAccount(row.id)">
-                        编辑
-                      </bg-table-btn>
-                      <bg-table-btn class="can_click_text" @click="editPsdAccount(row)">
-                        修改密码
-                      </bg-table-btn>
-                      <bg-table-btn class="can_click_text"  @click="deleteAccount(row)">
-                        删除
-                      </bg-table-btn>
-                    </template>
-                  </bg-table>
-                  <div class="pagination_box">
-                     <bg-pagination
-                    :page="filter.page"
-                    :size="filter.limit"
-                    :total="tableTotal"
-                    @change-page="changePage"
-                    @change-size="changeSize"
-                  >
-                  </bg-pagination>
-                  </div>
-                  
-                </div>
-                 
-              </div>
-           </div>
-        </div>
-        <el-dialog
-          v-model="deleteFlag"
-          title="删除"
-          width="520px"
-          :before-close="handleCloseDelete"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做删除操作。
-          </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseDelete">取消</el-button>
-              <el-button type="primary" @click="deleteConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
-         <el-dialog
-          v-model="deleteRowFlag"
-          title="删除"
-          width="520px"
-          :before-close="handleCloseRowDelete"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedRow.business_name}}</span>做删除操作。
+  <div class="page_container">
+    <div class="bg-breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item> 开发管理 </el-breadcrumb-item>
+        <el-breadcrumb-item> 系统账号管理 </el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+    <div class="flex_row">
+      <div class="flex_left bgc_white">
+        <div class="tree_header">政务机构</div>
+        <div class="tree_content">
+          <div class="search">
+            <el-input v-model="filterTree" placeholder="请输入组织名称搜索" :prefix-icon="Search" />
           </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseRowDelete">取消</el-button>
-              <el-button type="primary" @click="deleteRowConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="resetFlag"
-          title="重置密码"
-          width="520px"
-          :before-close="handleCloseReset"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做重置密码操作。
-           
+          <div class="tree">
+            <el-tree
+              ref="treeRef"
+              :data="orgData"
+              :props="defaultProps"
+              @node-click="handleNodeClick"
+              node-key="id"
+              :highlight-current="true"
+              :filter-node-method="filterNode"
+              :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>
-              重置密码为123456，是否继续？
+        </div>
+      </div>
+      <div class="flex_right bgc_white">
+        <div class="main_container">
+          <bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入关键字">
+            <template v-slot:left_action>
+              <div class="apaas_button">
+                <el-button class="register_btn" type="primary" @click="addAccount">
+                  <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
+                  新建
+                </el-button>
+                <el-button class="register_btn" @click="deleteBatch"> 批量删除 </el-button>
+                <el-button class="register_btn" @click="resetPsd"> 重置密码 </el-button>
+                <span class="header_info"
+                  >已选择<span style="color: #202531; font-weight: bold">{{ selected.length }}</span
+                  >项</span
+                >
+                <span class="header_info can_click_text" @click="clearSelected">清空</span>
+              </div>
+            </template>
+          </bg-filter-group>
+          <div class="table_container apaas_scroll">
+            <bg-table
+              ref="dataTable"
+              :headers="headers"
+              :rows="tableRows"
+              :isIndex="true"
+              :stripe="true"
+              :select="true"
+              @selectAc="selectRows">
+              <template v-slot:business_name="{ row }">
+                <span @click="goDetail(row)" class="can_click_text">
+                  {{ 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="can_click_text" @click="editAccount(row.id)"> 编辑 </bg-table-btn>
+                <bg-table-btn class="can_click_text" @click="editPsdAccount(row)"> 修改密码 </bg-table-btn>
+                <bg-table-btn class="can_click_text" @click="deleteAccount(row)"> 删除 </bg-table-btn>
+              </template>
+            </bg-table>
+            <div class="pagination_box">
+              <bg-pagination
+                :page="filter.page"
+                :size="filter.limit"
+                :total="tableTotal"
+                @change-page="changePage"
+                @change-size="changeSize">
+              </bg-pagination>
             </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseReset">取消</el-button>
-              <el-button type="primary" @click="resetConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="editFlag"
-          title="修改密码"
-          width="520px"
-          :before-close="handleCloseEdit"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedRow.business_name}}</span>做修改密码操作，修改后旧密码将无法登录。
-           
-          </div>
-           <div>
-             <el-form
-                :label-position="'right'"
-                label-width="120px"
-                :model="passwordForm"
-                :rules="passwordFormRules"
-                ref="passwordRef"
-                style="max-width: 80%"
-              >
-                <el-form-item label="新密码" prop="password">
-                  <el-input v-model="passwordForm.password" :type="password_eye ? 'text' : 'password'" placeholder="请输入密码">
-                    <template #suffix>
-                      <bg-icon @click="password_eye = !password_eye" class="icon_eye"  icon="#bg-ic-eye"></bg-icon>
-                    </template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="确认新密码" prop="confirm_password">
-                  <el-input v-model="passwordForm.confirm_password" :type="confirm_eye ? 'text' : 'password'" placeholder="请确认新密码"> 
-                    <template #suffix>
-                      <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
-                    </template>
-                  </el-input>
-                </el-form-item>
-              </el-form>
           </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseEdit">取消</el-button>
-              <el-button type="primary" @click="editConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
+        </div>
+      </div>
     </div>
+    <el-dialog v-model="deleteFlag" title="删除" width="520px" :before-close="handleCloseDelete">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedName.join("、") }}</span
+        >做删除操作。
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseDelete">取消</el-button>
+          <el-button type="primary" @click="deleteConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="deleteRowFlag" title="删除" width="520px" :before-close="handleCloseRowDelete">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedRow.business_name }}</span
+        >做删除操作。
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseRowDelete">取消</el-button>
+          <el-button type="primary" @click="deleteRowConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="resetFlag" title="重置密码" width="520px" :before-close="handleCloseReset">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedName.join("、") }}</span
+        >做重置密码操作。
+      </div>
+      <div>重置密码为123456，是否继续？</div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseReset">取消</el-button>
+          <el-button type="primary" @click="resetConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="editFlag" title="修改密码" width="520px" :before-close="handleCloseEdit">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedRow.business_name }}</span
+        >做修改密码操作，修改后旧密码将无法登录。
+      </div>
+      <div>
+        <el-form
+          :label-position="'right'"
+          label-width="120px"
+          :model="passwordForm"
+          :rules="passwordFormRules"
+          ref="passwordRef"
+          style="max-width: 80%">
+          <el-form-item label="新密码" prop="password">
+            <el-input
+              v-model="passwordForm.password"
+              :type="password_eye ? 'text' : 'password'"
+              placeholder="请输入密码">
+              <template #suffix>
+                <bg-icon @click="password_eye = !password_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="确认新密码" prop="confirm_password">
+            <el-input
+              v-model="passwordForm.confirm_password"
+              :type="confirm_eye ? 'text' : 'password'"
+              placeholder="请确认新密码">
+              <template #suffix>
+                <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseEdit">取消</el-button>
+          <el-button type="primary" @click="editConfirm">确定</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, watch, nextTick } from 'vue'
-import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRoute, useRouter } from 'vue-router';
-import { edit } from 'ace-builds';
-import CryptoJS from "crypto-js"; 
-
-  const { proxy } = getCurrentInstance()
-  const { $axios,$message } = proxy
-
-  const dataTable = ref(null);
-  const headers = ref([
-        {
-          label: "业务系统编码",
-          prop: "business_code",
-          minWidth: 160
-        },
-        {
-          label: "业务系统名称",
-          prop: "business_name",
-          minWidth: 160
-        },
-        {
-          label: "账号",
-          prop: "system_account",
-        },
-        {
-          label: "所属机构",
-          prop: "organization_name",
-          minWidth: 180
-        },
-        {
-          label: "创建时间",
-          prop: "created_time",
-          width: 160
-        },
-        {
-          label: "是否启用",
-          prop: "state",
-        },
-        {
-          label: "操作",
-          prop: "action",
-          width: 220,
-          fixed: "right",
-        },
-      ])
-  const tableRows = ref([])
-  const search=ref("");
-  const filter = reactive({
-        search: "",
-        page: 1,
-        limit: 10,
-      });
-  const tableTotal = ref(0);
-  const deleteFlag = ref(false)
-  const deleteRowFlag = ref(false)
-  const resetFlag = ref(false)
-  const selectedRow = ref({})
-  const selected = ref([])
-  const selectedName = ref([])
-  const editFlag = ref(false)
-  const password_eye = ref(false)
-  const confirm_eye = ref(false)
-  const passwordRef = ref(null)
-  const passwordForm = reactive({
-    password: '',
-    confirm_password: '',
-  })
-  const selectNode = ref(null)
-  const selectNodeObj = ref(null)
-  const filterTree = ref('')
-  const treeRef = ref(null)
-  const validatePass = (rule, value, callback) => {
-    if (value !== passwordForm.password) {
-      callback(new Error("密码输入不一致"))
-    } else {
-      callback()
-    }
-  }
-
-  const passwordFormRules = reactive({
-    password: [
-      { required: true, message: '请输入密码', trigger: 'blur' },
-      {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
-    ],
-    confirm_password: [
-      { required: true, message: '请确认密码', trigger: 'blur' },
-      { validator: validatePass, trigger: 'blur' }
-    ],
-  })
-
-  const router = useRouter();
-  const route = useRoute()
-  const getTableRows = () => {
-      let params = {...filter, organization_id: selectNode.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.data)
-          }
-        })
-  }
-
-  const addAccount = (params) => {
-    router.push({
-        path: "/develop/account/add",
-      })
-  }
-
-  const handleNodeClick = (data) => {
-    if(data.data_type == 1) {
-      selectNode.value = data.id;
-      changePage(1)
-    }else {
-      nextTick(() => {
-        treeRef.value.setCurrentKey(null)
-      })
-    }
+import { Search } from "@element-plus/icons-vue";
+import { watch, nextTick, reactive, toRefs, ref, computed, onBeforeMount } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { edit } from "ace-builds";
+import CryptoJS from "crypto-js";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
+
+const dataTable = ref(null);
+const headers = ref([
+  {
+    label: "业务系统编码",
+    prop: "business_code",
+    minWidth: 160,
+  },
+  {
+    label: "业务系统名称",
+    prop: "business_name",
+    minWidth: 160,
+  },
+  {
+    label: "账号",
+    prop: "system_account",
+  },
+  {
+    label: "所属机构",
+    prop: "organization_name",
+    minWidth: 180,
+  },
+  {
+    label: "创建时间",
+    prop: "created_time",
+    width: 160,
+  },
+  {
+    label: "是否启用",
+    prop: "state",
+  },
+  {
+    label: "操作",
+    prop: "action",
+    width: 220,
+    fixed: "right",
+  },
+]);
+const tableRows = ref([]);
+const search = ref("");
+const filter = reactive({
+  search: "",
+  page: 1,
+  limit: 10,
+});
+const tableTotal = ref(0);
+const deleteFlag = ref(false);
+const deleteRowFlag = ref(false);
+const resetFlag = ref(false);
+const selectedRow = ref({});
+const selected = ref([]);
+const selectedName = ref([]);
+const editFlag = ref(false);
+const password_eye = ref(false);
+const confirm_eye = ref(false);
+const passwordRef = ref(null);
+const passwordForm = reactive({
+  password: "",
+  confirm_password: "",
+});
+const selectNode = ref(null);
+const selectNodeObj = ref(null);
+const filterTree = ref("");
+const treeRef = ref(null);
+const validatePass = (rule, value, callback) => {
+  if (value !== passwordForm.password) {
+    callback(new Error("密码输入不一致"));
+  } else {
+    callback();
   }
-
-  const orgData = ref([])
-  const customNodeClass = (data,node) => {
-    if (data.data_type == 0) {
-      return 'noFocus'
-    }else {
-      return ''
-    }
-  }
-  const defaultProps = {
-    label: 'name',
-    children: 'Child',
-    value: 'organization_id',
-    class: customNodeClass,
-  }
-  const  getOrgTree = () => {
-    $axios.get(`/apaas/system/v5/org/tree`)
-      .then((res) => {
+};
+
+const passwordFormRules = reactive({
+  password: [
+    { required: true, message: "请输入密码", trigger: "blur" },
+    { min: 8, message: "密码长度不得低于8位", trigger: "blur" },
+  ],
+  confirm_password: [
+    { required: true, message: "请确认密码", trigger: "blur" },
+    { validator: validatePass, trigger: "blur" },
+  ],
+});
+
+const router = useRouter();
+const route = useRoute();
+const getTableRows = () => {
+  let params = { ...filter, organization_id: selectNode.value };
+  axios
+    .get(`/apaas/system/v5/user/list`, {
+      params,
+    })
+    .then((res) => {
       if (res.data.code == 200) {
-          orgData.value = res.data.data || [];
-          orgData.value.shift()
-          const orgList = searchOrg(orgData.value);
-          if (route.query.id) {
-            searchItem(orgData.value,route.query.id)
-          }else {
-            selectNode.value = orgList.length > 0 ? orgList[0].id : '';
-          }
-          nextTick(() =>{
-            if (route.query.id) {
-              treeRef.value.setCurrentNode(selectNodeObj.value)
-            }else {
-              if(orgList.length > 0) {
-                treeRef.value.setCurrentNode(orgList[0])
-              }
-            }
-          })
-          getTableRows()
-      }else {
-          $message.error(res.data.data)
+        tableRows.value = res.data.data || [];
+        tableTotal.value = res.data.total;
+      } else {
+        ElMessage.error(res.data.data);
       }
-      })
+    });
+};
+
+const addAccount = (params) => {
+  router.push({
+    path: "/develop/account/add",
+  });
+};
+
+const handleNodeClick = (data) => {
+  if (data.data_type == 1) {
+    selectNode.value = data.id;
+    changePage(1);
+  } else {
+    nextTick(() => {
+      treeRef.value.setCurrentKey(null);
+    });
   }
-  const searchItem = (data,id) => {
-    data.forEach(e => {
-      if (e.organization_id == id) {
-        selectNodeObj.value = e
-        selectNode.value = e.id
-      }else {
-        if (e.Child) {
-          searchItem(e.Child,id)
-        }
-      }
-    })
+};
+
+const orgData = ref([]);
+const customNodeClass = (data, node) => {
+  if (data.data_type == 0) {
+    return "noFocus";
+  } else {
+    return "";
   }
-  const searchOrg = (data) => {
-    const arr = []
-    data.forEach(item => {
-      if(item.data_type === 1) {
-        arr.push(item);
-        return 
-      }else {
-        if(item.Child){
-          searchOrg(item.Child)
-        }else {
-          return 
-        }
+};
+const defaultProps = {
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+  class: customNodeClass,
+};
+const getOrgTree = () => {
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      orgData.value = res.data.data || [];
+      orgData.value.shift();
+      const orgList = searchOrg(orgData.value);
+      if (route.query.id) {
+        searchItem(orgData.value, route.query.id);
+      } else {
+        selectNode.value = orgList.length > 0 ? orgList[0].id : "";
       }
-    })
-    return arr;
-  }
-
-  watch(filterTree, (val) => {
-    treeRef.value.filter(val)
-  })
-
-  const filterNode = (value, data) => {
-    if (!value) return true
-    return data.name.includes(value)
-  }
-
-  const stateChange = (row) => {
-    const state = row.state.toString(); 
-      $axios.post(
-          `/apaas/system/v5/user/state/${row.id}/${state}`,
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            getTableRows()
-          }else {
-            $message.error(res.data.data)
-            row.state = row.state == 0 ? 1 : 0
+      nextTick(() => {
+        if (route.query.id) {
+          treeRef.value.setCurrentNode(selectNodeObj.value);
+        } else {
+          if (orgList.length > 0) {
+            treeRef.value.setCurrentNode(orgList[0]);
           }
-        })
-  }
-
-  const changeSize = (size) => {
-    filter.limit = size;
-    filter.page = 1;
-    changePage(1)
-  }
-
-  const changePage = (page) => {
-    filter.page = page;
-    getTableRows()
-  }
-
-  const changeSearch = (val) => {
-  filter.search = val
-    changePage(1)
-  } // 表格关键字筛选
-
-  const goDetail = (params) => {
-     router.push({
-        path: "/develop/account/detail",
-        query: {
-          id: params.id
-        }
-      })
-  }
-
-  const editAccount = (id) => {
-    router.push({
-        path: "/develop/account/add",
-        query: {
-          id: id
         }
-      })
-  }
-
-  const deleteAccount = (data) => {
-    if(data.state === 0) {
-      selectedRow.value = data;
-      deleteRowFlag.value = true;
-    }else {
-      $message.error('当前状态已启用，不可删除！')
+      });
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
     }
-  }
-
-  const handleCloseDelete = () => {
-      deleteFlag.value = false;
-  }
-  const handleCloseRowDelete = () => {
-      deleteRowFlag.value = false;
-  }
-
-  const deleteConfirm = () => {
-    const ids = selected.value.map(item => item.id)
-     $axios.delete(
-          `/apaas/system/v5/user/delete`,{data: {ids: ids}}
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseDelete();
-        })
-  }
-
-  const deleteRowConfirm = () => {
-    $axios.delete(
-          `/apaas/system/v5/user/delete`,{data: {ids: [selectedRow.value.id]}}
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseRowDelete();
-        })
-  }
-
-  const deleteBatch = () => {
-    if(selectedName.value.length > 0){
-      deleteFlag.value = true;
-    }else {
-       $message.error('请先选择需要操作的数据!')
+  });
+};
+const searchItem = (data, id) => {
+  data.forEach((e) => {
+    if (e.organization_id == id) {
+      selectNodeObj.value = e;
+      selectNode.value = e.id;
+    } else {
+      if (e.Child) {
+        searchItem(e.Child, id);
+      }
     }
-      
-  }
-
-  const handleCloseReset = () => {
-      resetFlag.value = false;
-  }
-
-  const resetPsd = () => {
-    if(selectedName.value.length > 0){
-       resetFlag.value = true;
-    }else {
-       $message.error('请先选择需要操作的数据!')
+  });
+};
+const searchOrg = (data) => {
+  const arr = [];
+  data.forEach((item) => {
+    if (item.data_type === 1) {
+      arr.push(item);
+      return;
+    } else {
+      if (item.Child) {
+        searchOrg(item.Child);
+      } else {
+        return;
+      }
+    }
+  });
+  return arr;
+};
+
+watch(filterTree, (val) => {
+  treeRef.value.filter(val);
+});
+
+const filterNode = (value, data) => {
+  if (!value) return true;
+  return data.name.includes(value);
+};
+
+const stateChange = (row) => {
+  const state = row.state.toString();
+  axios.post(`/apaas/system/v5/user/state/${row.id}/${state}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+      row.state = row.state == 0 ? 1 : 0;
     }
-      
+  });
+};
+
+const changeSize = (size) => {
+  filter.limit = size;
+  filter.page = 1;
+  changePage(1);
+};
+
+const changePage = (page) => {
+  filter.page = page;
+  getTableRows();
+};
+
+const changeSearch = (val) => {
+  filter.search = val;
+  changePage(1);
+}; // 表格关键字筛选
+
+const goDetail = (params) => {
+  router.push({
+    path: "/develop/account/detail",
+    query: {
+      id: params.id,
+    },
+  });
+};
+
+const editAccount = (id) => {
+  router.push({
+    path: "/develop/account/add",
+    query: {
+      id: id,
+    },
+  });
+};
+
+const deleteAccount = (data) => {
+  if (data.state === 0) {
+    selectedRow.value = data;
+    deleteRowFlag.value = true;
+  } else {
+    ElMessage.error("当前状态已启用，不可删除！");
   }
-
-  const resetConfirm = () => {
-    const ids = selected.value.map(item => item.id)
-     $axios.post(
-          `/apaas/system/v5/user/resetpwd`,{ids: ids}
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseReset();
-        })
+};
+
+const handleCloseDelete = () => {
+  deleteFlag.value = false;
+};
+const handleCloseRowDelete = () => {
+  deleteRowFlag.value = false;
+};
+
+const deleteConfirm = () => {
+  const ids = selected.value.map((item) => item.id);
+  axios.delete(`/apaas/system/v5/user/delete`, { data: { ids: ids } }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+    handleCloseDelete();
+  });
+};
+
+const deleteRowConfirm = () => {
+  axios.delete(`/apaas/system/v5/user/delete`, { data: { ids: [selectedRow.value.id] } }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+    handleCloseRowDelete();
+  });
+};
+
+const deleteBatch = () => {
+  if (selectedName.value.length > 0) {
+    deleteFlag.value = true;
+  } else {
+    ElMessage.error("请先选择需要操作的数据!");
   }
+};
 
-  const editPsdAccount = (data) => {
-      selectedRow.value = data;
-      editFlag.value = true;
-  }
+const handleCloseReset = () => {
+  resetFlag.value = false;
+};
 
-  const handleCloseEdit = () => {
-      if (!passwordRef) return
-            passwordRef.value.resetFields()
-      editFlag.value = false;
-      password_eye.value = false;
-      confirm_eye.value = false;
+const resetPsd = () => {
+  if (selectedName.value.length > 0) {
+    resetFlag.value = true;
+  } else {
+    ElMessage.error("请先选择需要操作的数据!");
   }
- const editConfirm = () => {
-   if (!passwordRef) return
-     passwordRef.value.validate((valid, fields) => {
-      if (valid) {
-          $axios.post(
-          `/apaas/system/v5/user/editpwd`,
-          {
+};
+
+const resetConfirm = () => {
+  const ids = selected.value.map((item) => item.id);
+  axios.post(`/apaas/system/v5/user/resetpwd`, { ids: ids }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+    handleCloseReset();
+  });
+};
+
+const editPsdAccount = (data) => {
+  selectedRow.value = data;
+  editFlag.value = true;
+};
+
+const handleCloseEdit = () => {
+  if (!passwordRef) return;
+  passwordRef.value.resetFields();
+  editFlag.value = false;
+  password_eye.value = false;
+  confirm_eye.value = false;
+};
+const editConfirm = () => {
+  if (!passwordRef) return;
+  passwordRef.value.validate((valid, fields) => {
+    if (valid) {
+      axios
+        .post(`/apaas/system/v5/user/editpwd`, {
           id: selectedRow.value.id,
-          password: CryptoJS.AES.encrypt(passwordForm.password,"swuE9cmCZQwrkYRV").toString()
-          }
-        )
+          password: CryptoJS.AES.encrypt(passwordForm.password, "swuE9cmCZQwrkYRV").toString(),
+        })
         .then((res) => {
           if (res.data.code == 200) {
-             $message.success(res.data.msg)
-          }else {
-            $message.error(res.data.data)
+            ElMessage.success(res.data.msg);
+          } else {
+            ElMessage.error(res.data.data);
           }
           handleCloseEdit();
-        })
-        
-      } 
-    })
- }
-
-  const selectRows = (data) => {
-    selected.value = data.selection;
-    selectedName.value = data.selection.map(item => item.business_name)
-  }
-
-  const clearSelected = () => {
-    dataTable.value.clearTable();
-  }
-
-
-  onBeforeMount(() => {
-    getOrgTree()
-    //getTableRows()
-    
-  })
-
-
+        });
+    }
+  });
+};
+
+const selectRows = (data) => {
+  selected.value = data.selection;
+  selectedName.value = data.selection.map((item) => item.business_name);
+};
+
+const clearSelected = () => {
+  dataTable.value.clearTable();
+};
+
+onBeforeMount(() => {
+  getOrgTree();
+  //getTableRows()
+});
 </script>
 
 <style scoped>
 .tree_header {
   height: 40px;
   line-height: 40px;
-	background-color: #f7f7f9;
-	border-radius: 6px 6px 0px 0px;
+  background-color: #f7f7f9;
+  border-radius: 6px 6px 0px 0px;
   font-size: 16px;
-	letter-spacing: 0px;
-	color: #202531;
+  letter-spacing: 0px;
+  color: #202531;
   padding-left: 16px;
 }
 .tree_content {
@@ -621,12 +579,11 @@ import CryptoJS from "crypto-js";
 .tree {
   overflow: auto;
   height: calc(100% - 65px);
-
 }
-.tree :deep() .el-tree-node>.el-tree-node__children {
+.tree :deep() .el-tree-node > .el-tree-node__children {
   overflow: unset;
 }
-.tree :deep().noFocus:focus>.el-tree-node__content {
+.tree :deep().noFocus:focus > .el-tree-node__content {
   background-color: #fff;
 }
 .custom_tree_node {
@@ -661,8 +618,6 @@ import CryptoJS from "crypto-js";
 }
 .bg-pagination {
   bottom: unset;
-  margin-top: 0px
+  margin-top: 0px;
 }
-
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue
index 49e8831..fedaf3e 100644
--- a/src/page/main/develop/menu/index.vue
+++ b/src/page/main/develop/menu/index.vue
@@ -3,80 +3,75 @@
     <div class="bg-breadcrumb">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item> 开发管理 </el-breadcrumb-item>
-        <el-breadcrumb-item > 菜单管理 </el-breadcrumb-item>
+        <el-breadcrumb-item> 菜单管理 </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="flex_row">
       <div class="flex_left">
-           <div class="tree_content">
-             <div class="search"> 
-               <el-input
-                  v-model.trim="search"
-                  placeholder="请输入内容"
-                  :prefix-icon="Search"
-                />
-             </div>
-             <div class="tree">
-              <el-tree
-                class="file-tree"
-                :data="data" 
-                :props="defaultProps" 
-                @node-click="handleNodeClick"
-                :default-expand-all="true" 
-                :highlight-current="true"
-                node-key="menu_id"
-                ref="menuTree"
-                :filter-node-method="filterNode"
-                :expand-on-click-node="false"
-
-              >
-                <template #default="{ node, data }">
-                  <div class="custom-tree-node" pointer-events="none">
-                    
-                    <span
-                      class="label-text text_clip"
-                      :title="data.menu_name"
-                      >{{ data.menu_name }}</span
-                    >
-                  </div>
-                  <span 
-                    class="tree-action-box" 
-                    :class="{'position_sticky': isSticky(data.name) }"
-                    @click.stop="showAction($event, data,node)"
-                  >
-                    <bg-icon
-                      class="tree-more"
-                      icon="#bg-ic-s-more"
-                    ></bg-icon>
-                  </span>
-                </template>
-               </el-tree >
-               <Teleport to="body">
+        <div class="tree_content">
+          <div class="search">
+            <el-input v-model.trim="search" placeholder="请输入内容" :prefix-icon="Search" />
+          </div>
+          <div class="tree">
+            <el-tree
+              class="file-tree"
+              :data="data"
+              :props="defaultProps"
+              @node-click="handleNodeClick"
+              :default-expand-all="true"
+              :highlight-current="true"
+              node-key="menu_id"
+              ref="menuTree"
+              :filter-node-method="filterNode"
+              :expand-on-click-node="false">
+              <template #default="{ node, data }">
+                <div class="custom-tree-node" pointer-events="none">
+                  <span class="label-text text_clip" :title="data.menu_name">{{ data.menu_name }}</span>
+                </div>
+                <span
+                  class="tree-action-box"
+                  :class="{ position_sticky: isSticky(data.name) }"
+                  @click.stop="showAction($event, data, node)">
+                  <bg-icon class="tree-more" icon="#bg-ic-s-more"></bg-icon>
+                </span>
+              </template>
+            </el-tree>
+            <Teleport to="body">
+              <div
+                class="tree-action"
+                ref="treeAction"
+                v-show="actionFlag"
+                :style="{ top: acTop, left: acLeft, bottom: acBottom }">
+                <div class="action" @click="fileAction(1, selectData, selectParentData)">新建本级</div>
+                <div class="action" @click="fileAction(2, selectData, selectParentData)">新建下级</div>
+                <div class="action" @click="fileAction(3, selectData, selectParentData)">删除</div>
+                <div
+                  class="action"
+                  :class="{ disable: moveIndex == 0 }"
+                  @click="fileAction(4, selectData, selectParentData, moveIndex == 0)">
+                  上移
+                </div>
                 <div
-                  class="tree-action"
-                  ref="treeAction"
-                  v-show="actionFlag"
-                  :style="{ top: acTop, left: acLeft,bottom:acBottom }"
-                >
-                  <div class="action" @click="fileAction(1,selectData,selectParentData)">
-                    新建本级
-                  </div>
-                  <div class="action" @click="fileAction(2,selectData,selectParentData)">
-                    新建下级
-                  </div>
-                  <div class="action" @click="fileAction(3,selectData,selectParentData)">
-                    删除
-                  </div>
-                  <div class="action" :class="{'disable':moveIndex==0}" @click="fileAction(4,selectData,selectParentData,moveIndex==0)">
-                    上移
-                  </div>
-                  <div class="action" :class="{'disable': !selectParentData ? moveIndex == data.length - 1 : moveIndex==selectParentData.Child.length-1}" @click="fileAction(5,selectData,selectParentData,!selectParentData ? moveIndex == data.length - 1 : moveIndex==selectParentData.Child.length-1)" >
-                    下移
-                  </div>
+                  class="action"
+                  :class="{
+                    disable: !selectParentData
+                      ? moveIndex == data.length - 1
+                      : moveIndex == selectParentData.Child.length - 1,
+                  }"
+                  @click="
+                    fileAction(
+                      5,
+                      selectData,
+                      selectParentData,
+                      !selectParentData ? moveIndex == data.length - 1 : moveIndex == selectParentData.Child.length - 1
+                    )
+                  ">
+                  下移
                 </div>
-              </Teleport>
-             </div>
-           </div>
+              </div>
+            </Teleport>
+          </div>
+        </div>
       </div>
       <div class="flex_right">
         <div class="main_container">
@@ -84,25 +79,13 @@
             <menuForm ref="menuFormRef" :data="menuFormData"></menuForm>
           </div>
           <div class="base-btn">
-            <el-button  type="primary" @click="saveMenu(menuFormRef,addType)">
-                保存
-            </el-button>
+            <el-button type="primary" @click="saveMenu(menuFormRef, addType)"> 保存 </el-button>
           </div>
         </div>
       </div>
     </div>
     <!-- 删除弹窗 -->
-    <el-dialog
-      class="dialog_box"
-      title="提示"
-      v-model="delDialog"
-      width="400px"
-      :before-close="
-        () => {
-          delDialog = false;
-        }
-      "
-    >
+    <el-dialog class="dialog_box" title="提示" v-model="delDialog" width="400px">
       <div>确定要删除此菜单吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -115,33 +98,33 @@
 </template>
 
 <script setup>
-import { Search } from '@element-plus/icons-vue'
-import { reactive, toRefs, ref, nextTick, computed, onBeforeMount, onBeforeUnmount, watch } from 'vue'
-import { useRouter } from 'vue-router';
-import { ElMessage } from 'element-plus'
-import axios from '../../../../request/http.js'
-import menuForm from './menu-form.vue'
+import { Search } from "@element-plus/icons-vue";
+import { reactive, toRefs, ref, nextTick, computed, onBeforeMount, onBeforeUnmount, watch } from "vue";
+import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+import axios from "../../../../request/http.js";
+import menuForm from "./menu-form.vue";
 const router = useRouter();
 
-const menuTree = ref(null) // 树形
-const treeAction = ref(null) // 树形操作弹出框
-const menuFormRef = ref(null) // 右侧表单
-const acTop = ref('');
-const acLeft = ref('');
-const acBottom = ref('');
-const actionFlag = ref(false) // 弹出框状态标识
+const menuTree = ref(null); // 树形
+const treeAction = ref(null); // 树形操作弹出框
+const menuFormRef = ref(null); // 右侧表单
+const acTop = ref("");
+const acLeft = ref("");
+const acBottom = ref("");
+const actionFlag = ref(false); // 弹出框状态标识
 
 const state = reactive({
   data: [], // 树形数据
   search: "", // 树形搜索
-  selectData:null, // 当前选中的节点
-  selectParentData:null, // 当前选中节点的父节点
+  selectData: null, // 当前选中的节点
+  selectParentData: null, // 当前选中节点的父节点
   treeAction,
   menuTree,
-  bottomGap:30,//弹窗吸底高度
+  bottomGap: 30, //弹窗吸底高度
   defaultProps: {
-    children: 'Child',
-    label: 'menu_name',
+    children: "Child",
+    label: "menu_name",
   }, // 树形配置
   actionDataIndex: 0, // 当前选中节点在本级的位置，用来判断是否可以上下移动
   menuFormData: null, // 菜单数据
@@ -149,178 +132,177 @@ const state = reactive({
   newMenuId: 0, // 新增菜单时用来指定menu_id，达到选中效果
   timer: null, // 定时器
   delDialog: false,
-})
+});
 
 const moveIndex = computed({
-  get: () => {  
-    let index = 0
-    if(state.selectData) {
-      findIndex(state.selectData.menu_id,state.data)
-      index = state.actionDataIndex
+  get: () => {
+    let index = 0;
+    if (state.selectData) {
+      findIndex(state.selectData.menu_id, state.data);
+      index = state.actionDataIndex;
     }
-    
-    return index
-  }
-}) // 计算上下移动
 
-watch(() => state.search,(n,o) => {
-  if (state.timer) {
-    clearTimeout(state.timer);
+    return index;
+  },
+}); // 计算上下移动
+
+watch(
+  () => state.search,
+  (n, o) => {
+    if (state.timer) {
+      clearTimeout(state.timer);
+    }
+    state.timer = setTimeout(() => {
+      state.menuTree.filter(n);
+    }, 500);
   }
-  state.timer = setTimeout(() => {
-    state.menuTree.filter(n)
-  }, 500);
-}) // 树形搜索值
+); // 树形搜索值
 
-const getMenuTree = (type,id) => {
-  axios
-    .get(`/apaas/system/v5/menu/tree`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        state.data = res.data.data || []
-        nextTick().then(() => {
-          if (type) {
-            if (type == 1) { // 删除数据后默认选中父节点或第一个节点
-              state.menuTree && state.menuTree.setCurrentKey(state.selectParentData.menu_id);
-              handleNodeClick(state.selectParentData);
-              nextTick().then(() => {
-                setScroll()
-              })
-            }else {
-              state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
-              handleNodeClick(state.data[0]);
-            }
-          }else { // 上下移，初始化时默认选中节点 新建选中新增的节点
-            if (id) {
-              findData(state.data,id)
-            }
-            if (state.selectData) {
-              state.menuTree && state.menuTree.setCurrentKey(state.selectData.menu_id);
-              handleNodeClick(state.selectData);
-              nextTick().then(() => {
-                setScroll()
-              })
-            }else {
-              state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
-              handleNodeClick(state.data[0]);
-            }
+const getMenuTree = (type, id) => {
+  axios.get(`/apaas/system/v5/menu/tree`).then((res) => {
+    if (res.data.code == 200) {
+      state.data = res.data.data || [];
+      nextTick().then(() => {
+        if (type) {
+          if (type == 1) {
+            // 删除数据后默认选中父节点或第一个节点
+            state.menuTree && state.menuTree.setCurrentKey(state.selectParentData.menu_id);
+            handleNodeClick(state.selectParentData);
+            nextTick().then(() => {
+              setScroll();
+            });
+          } else {
+            state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
+            handleNodeClick(state.data[0]);
           }
-        })
-
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 获取菜单树
+        } else {
+          // 上下移，初始化时默认选中节点 新建选中新增的节点
+          if (id) {
+            findData(state.data, id);
+          }
+          if (state.selectData) {
+            state.menuTree && state.menuTree.setCurrentKey(state.selectData.menu_id);
+            handleNodeClick(state.selectData);
+            nextTick().then(() => {
+              setScroll();
+            });
+          } else {
+            state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
+            handleNodeClick(state.data[0]);
+          }
+        }
+      });
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取菜单树
 const setScroll = () => {
-  setTimeout(()=> {
-    var nodeOffsetTop = document.querySelector(
-      ".file-tree .is-current"
-    ).offsetTop
-    var treeScroll = document.querySelector(
-      ".tree"
-    )
-    var parentHeight = treeScroll.clientHeight
-    
+  setTimeout(() => {
+    var nodeOffsetTop = document.querySelector(".file-tree .is-current").offsetTop;
+    var treeScroll = document.querySelector(".tree");
+    var parentHeight = treeScroll.clientHeight;
+
     if (nodeOffsetTop > parentHeight) {
-      treeScroll.scrollTop = nodeOffsetTop - parentHeight / 2
+      treeScroll.scrollTop = nodeOffsetTop - parentHeight / 2;
     }
-  },300)
-}
-const findData = (arr,id) => {
-  arr.forEach(e => {
+  }, 300);
+};
+const findData = (arr, id) => {
+  arr.forEach((e) => {
     if (e.menu_id == id) {
-      state.selectData = e
-    }else {
+      state.selectData = e;
+    } else {
       if (e.Child && e.Child.length > 0) {
-        findData(e.Child,id)
+        findData(e.Child, id);
       }
     }
-  })
-} // 处理数据 用于新增菜单后选中新增的菜单
+  });
+}; // 处理数据 用于新增菜单后选中新增的菜单
 
-const findIndex= (code,arr) => {
-  arr.forEach((e,i) => {
+const findIndex = (code, arr) => {
+  arr.forEach((e, i) => {
     if (e.menu_id == code) {
-      state.actionDataIndex = i
-    }else {
+      state.actionDataIndex = i;
+    } else {
       if (e.Child && e.Child.length > 0) {
-        findIndex(code,e.Child)
+        findIndex(code, e.Child);
       }
     }
-  })
-} // 处理数据 用于判断能否上下移
+  });
+}; // 处理数据 用于判断能否上下移
 
 const isSticky = (data) => {
   const canvas = document.createElement("canvas");
   const context = canvas.getContext("2d");
-  context.font = '14px MicrosoftYaHei';
+  context.font = "14px MicrosoftYaHei";
   const { width } = context.measureText(data);
   return width > 255 ? true : false;
-}
+};
 
-const showAction = (e, data,node) => {
-  acTop.value = ''
-  acLeft.value = ''
-  acBottom.value = ''
+const showAction = (e, data, node) => {
+  acTop.value = "";
+  acLeft.value = "";
+  acBottom.value = "";
   const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
-  var allHeight = document.body.scrollHeight
-  
+  var allHeight = document.body.scrollHeight;
+
   actionFlag.value = true;
-  state.selectData = data
-  if(node.parent.data.Child){
-    state.selectParentData = node.parent.data
-  }else{
+  state.selectData = data;
+  if (node.parent.data.Child) {
+    state.selectParentData = node.parent.data;
+  } else {
     //没有children则是最上层元素
-    state.selectParentData = null
+    state.selectParentData = null;
   }
-  nextTick().then(()=>{
-    setTimeout(()=>{
-      var height = window.getComputedStyle(state.treeAction).height
-      height = parseInt(height)
+  nextTick().then(() => {
+    setTimeout(() => {
+      var height = window.getComputedStyle(state.treeAction).height;
+      height = parseInt(height);
       //判断弹窗位置是否超过屏幕，超过则吸底展示
-      if(height+rect.y - 17>allHeight-state.bottomGap){
-        acBottom.value = state.bottomGap+ "px";
+      if (height + rect.y - 17 > allHeight - state.bottomGap) {
+        acBottom.value = state.bottomGap + "px";
         acLeft.value = rect.x + 35 + "px";
-      }else{
+      } else {
         acTop.value = rect.y - 17 + "px";
         acLeft.value = rect.x + 35 + "px";
       }
-    })
-  })
-} // 树形操作框
+    });
+  });
+}; // 树形操作框
 
 const handleNodeClick = (data) => {
   if (state.selectData && state.selectData.menu_id == data.menu_id) {
-    return
+    return;
   }
-  state.selectData = data
-  menuFormRef.value.setForm(state.selectData)
-  closeAction()
+  state.selectData = data;
+  menuFormRef.value.setForm(state.selectData);
+  closeAction();
   if (menuFormRef) {
     nextTick().then(() => {
-      menuFormRef.value.menuRef.validate(valid => {
+      menuFormRef.value.menuRef.validate((valid) => {
         if (!valid) {
-          menuFormRef.value.menuRef.clearValidate()
+          menuFormRef.value.menuRef.clearValidate();
         }
-      })
-    })
+      });
+    });
   } // 清除表单验证
-} // 菜单树节点点击
+}; // 菜单树节点点击
 
-const filterNode = (val,data) => {
+const filterNode = (val, data) => {
   if (!val) {
-    return true
+    return true;
   }
-  return data.menu_name.includes(val)
-} // 树形筛选
+  return data.menu_name.includes(val);
+}; // 树形筛选
 
-const fileAction = (val,data,parent,disabled=false) => {
-  if (val == 1) { // 新建本级菜单
-    state.addType = 1
+const fileAction = (val, data, parent, disabled = false) => {
+  if (val == 1) {
+    // 新建本级菜单
+    state.addType = 1;
     let newChild = {
       menu_name: "新菜单", // 菜单名称
-      menu_id: 'new' + state.newMenuId, // 菜单id，用于新增后选中
+      menu_id: "new" + state.newMenuId, // 菜单id，用于新增后选中
       menu_type: !parent ? 0 : parent.menu_type == 0 ? 0 : 2, // 新增本级的类型
       dict_group_id: parent ? parent.dict_group_id : "", // 父级的分组 有则继承，无则自选
       state: 1, // 启用状态
@@ -332,19 +314,23 @@ const fileAction = (val,data,parent,disabled=false) => {
       system_type: "", // 系统类型
       new_window: 0,
       remark: "",
-    }
-    state.menuTree.insertAfter(newChild,parent? parent.Child[parent.Child.length-1] : state.data[state.data.length -1])
+    };
+    state.menuTree.insertAfter(
+      newChild,
+      parent ? parent.Child[parent.Child.length - 1] : state.data[state.data.length - 1]
+    );
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
     handleNodeClick(newChild);
-    state.newMenuId++
-  }else if (val == 2) { // 新建下级菜单
+    state.newMenuId++;
+  } else if (val == 2) {
+    // 新建下级菜单
     if (disabled) {
-      return
+      return;
     }
-    state.addType = 2
+    state.addType = 2;
     let newChild = {
       menu_name: "新菜单",
-      menu_id: 'new' + state.newMenuId,
+      menu_id: "new" + state.newMenuId,
       menu_type: data.menu_type == 0 ? 0 : 2,
       dict_group_id: data.dict_group_id,
       state: 1,
@@ -356,132 +342,130 @@ const fileAction = (val,data,parent,disabled=false) => {
       system_type: "", // 系统类型
       new_window: 0,
       remark: "",
-    }
-    state.menuTree.append(newChild,data)
+    };
+    state.menuTree.append(newChild, data);
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
     handleNodeClick(newChild);
-    state.selectParentData = data
-    state.newMenuId++
-  }else if (val == 3) { // 删除菜单
+    state.selectParentData = data;
+    state.newMenuId++;
+  } else if (val == 3) {
+    // 删除菜单
     if (data.id) {
       if (data.state == 1) {
-        ElMessage.error("删除内容中有启用状态的数据，不可删除！")
-        return
+        ElMessage.error("删除内容中有启用状态的数据，不可删除！");
+        return;
       }
-      state.delDialog = true
-    }else {
-      state.delDialog = true
+      state.delDialog = true;
+    } else {
+      state.delDialog = true;
     }
-    
-  }else if (val == 4) { // 菜单上移
+  } else if (val == 4) {
+    // 菜单上移
     if (disabled) {
-      return
+      return;
     }
-    let nextObj = null
+    let nextObj = null;
     if (parent) {
-      parent.Child.forEach((e,i)=> {
+      parent.Child.forEach((e, i) => {
         if (data.id == e.id) {
-          nextObj = parent.Child[i-1]
+          nextObj = parent.Child[i - 1];
         }
-      })
-    }else {
-      state.data.forEach((e,i) => {
+      });
+    } else {
+      state.data.forEach((e, i) => {
         if (data.id == e.id) {
-          nextObj = state.data[i-1]
+          nextObj = state.data[i - 1];
         }
-      })
+      });
     }
-    changeSort(data,nextObj)
-  }else { // 菜单下移
+    changeSort(data, nextObj);
+  } else {
+    // 菜单下移
     if (disabled) {
-      return
+      return;
     }
-    let nextObj = null
+    let nextObj = null;
     if (parent) {
-      parent.Child.forEach((e,i)=> {
+      parent.Child.forEach((e, i) => {
         if (data.id == e.id) {
-          nextObj = parent.Child[i+1]
+          nextObj = parent.Child[i + 1];
         }
-      })
-    }else {
-      state.data.forEach((e,i) => {
+      });
+    } else {
+      state.data.forEach((e, i) => {
         if (data.id == e.id) {
-          nextObj = state.data[i+1]
+          nextObj = state.data[i + 1];
         }
-      })
+      });
     }
-    changeSort(data,nextObj)
+    changeSort(data, nextObj);
   }
   if (menuFormRef) {
     nextTick().then(() => {
-      menuFormRef.value.menuRef.validate(valid => {
+      menuFormRef.value.menuRef.validate((valid) => {
         if (!valid) {
-          menuFormRef.value.menuRef.clearValidate()
+          menuFormRef.value.menuRef.clearValidate();
         }
-      })
-    })
+      });
+    });
   } // 清除表单验证
-} // 各种操作按钮
+}; // 各种操作按钮
 
 const deleteData = () => {
   if (state.selectData.id) {
-    axios
-      .delete(`/apaas/system/v5/menu/${state.selectData.id}`)
-      .then((res) => {
-        if (res.data.code == 200) {
-          ElMessage.success(res.data.msg)
-          state.selectData = null
-          let type = state.selectParentData ? 1 : 2 // 1--有父级  2--无父级
-          getMenuTree(type)
-          state.delDialog = false
-        }else {
-          ElMessage.error(res.data.data)
-        }
-      })
-  }else { 
-    state.menuTree.remove(state.selectData)
-    state.selectData = null
-    let type = state.selectParentData ? 1 : 2 // 1--有父级  2--无父级
+    axios.delete(`/apaas/system/v5/menu/${state.selectData.id}`).then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.msg);
+        state.selectData = null;
+        let type = state.selectParentData ? 1 : 2; // 1--有父级  2--无父级
+        getMenuTree(type);
+        state.delDialog = false;
+      } else {
+        ElMessage.error(res.data.data);
+      }
+    });
+  } else {
+    state.menuTree.remove(state.selectData);
+    state.selectData = null;
+    let type = state.selectParentData ? 1 : 2; // 1--有父级  2--无父级
     if (type == 1) {
       state.menuTree && state.menuTree.setCurrentKey(state.selectParentData.menu_id);
       handleNodeClick(state.selectParentData);
-    }else {
+    } else {
       state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
       handleNodeClick(state.data[0]);
     }
-    state.delDialog = false
+    state.delDialog = false;
   }
-}
+};
 
-const changeSort = (data,nextObj) => {
+const changeSort = (data, nextObj) => {
   let params = [
     {
       id: data.id,
-      sort: nextObj.sort
+      sort: nextObj.sort,
     },
     {
       id: nextObj.id,
-      sort: data.sort
+      sort: data.sort,
+    },
+  ];
+  axios.put(`/apaas/system/v5/menu/sort`, params).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getMenuTree();
+    } else {
+      ElMessage.error(res.data.data);
     }
-  ]
-  axios
-    .put(`/apaas/system/v5/menu/sort`,params)
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        getMenuTree()
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 菜单上下移
+  });
+}; // 菜单上下移
 
 const closeAction = () => {
   actionFlag.value = false;
-} // 点击其他地方，菜单操作框关闭
+}; // 点击其他地方，菜单操作框关闭
 
-const saveMenu = (el,type) => {
-  el.menuRef.validate(valid => {
+const saveMenu = (el, type) => {
+  el.menuRef.validate((valid) => {
     if (valid) {
       let params = {
         menu_name: el.menuForm.menu_name,
@@ -490,83 +474,71 @@ const saveMenu = (el,type) => {
         state: el.menuForm.state,
         menu_url: el.menuForm.menu_url,
         menu_logo: el.menuForm.menu_logo,
-        source: el.menuForm.menu_type == 0 ? "" : el.menuForm.source, 
+        source: el.menuForm.menu_type == 0 ? "" : el.menuForm.source,
         system_type: el.menuForm.system_type,
         new_window: el.menuForm.new_window,
         remark: el.menuForm.remark,
-      }
-      if (state.selectData.id) { // 编辑
-        axios
-          .put(`/apaas/system/v5/menu/${state.selectData.id}`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              getMenuTree()
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
-        }else { // 新增
+      };
+      if (state.selectData.id) {
+        // 编辑
+        axios.put(`/apaas/system/v5/menu/${state.selectData.id}`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            getMenuTree();
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
+      } else {
+        // 新增
         if (state.selectParentData) {
           if (state.selectParentData.menu_type == 1 && el.menuForm.menu_type == 0) {
-            ElMessage.error("菜单之下不可以新建目录")
-            return
+            ElMessage.error("菜单之下不可以新建目录");
+            return;
           }
         }
-        if(type == 1) { // 新增本级
-          params.p_menu_id = state.selectParentData ? state.selectParentData.menu_id : ""
-        }else { // 新增下级
-          params.p_menu_id = state.selectParentData.menu_id
+        if (type == 1) {
+          // 新增本级
+          params.p_menu_id = state.selectParentData ? state.selectParentData.menu_id : "";
+        } else {
+          // 新增下级
+          params.p_menu_id = state.selectParentData.menu_id;
         }
-        axios
-          .post(`/apaas/system/v5/menu/add`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              state.selectData = null
-              getMenuTree(null,res.data.data)
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
+        axios.post(`/apaas/system/v5/menu/add`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            state.selectData = null;
+            getMenuTree(null, res.data.data);
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
       }
     }
-  })
-} // 保存按钮，新增或编辑菜单
+  });
+}; // 保存按钮，新增或编辑菜单
 
-onBeforeMount(()=>{
-  window.addEventListener("click", closeAction)
-  window.addEventListener("scroll", closeAction,true)
-  getMenuTree()
-})
+onBeforeMount(() => {
+  window.addEventListener("click", closeAction);
+  window.addEventListener("scroll", closeAction, true);
+  getMenuTree();
+});
 
-onBeforeUnmount(()=>{
-  window.removeEventListener('click', closeAction);
-  window.removeEventListener('scroll', closeAction);
-  
-})
+onBeforeUnmount(() => {
+  window.removeEventListener("click", closeAction);
+  window.removeEventListener("scroll", closeAction);
+});
 
-const {
-  data,
-  search,
-  defaultProps,
-  selectParentData,
-  selectData,
-  menuFormData,
-  addType,
-  delDialog,
-} = toRefs(state)
+const { data, search, defaultProps, selectParentData, selectData, menuFormData, addType, delDialog } = toRefs(state);
 </script>
 
 <style scoped>
-
 .flex_left {
   background-color: #fff;
   height: calc(100% - 16px);
   width: 320px;
-  box-shadow: 0px 1px 4px 0px 
-		rgba(0, 7, 101, 0.15);
-	border-radius: 6px;
+  box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
+  border-radius: 6px;
   margin-right: 10px;
   overflow: hidden;
 }
@@ -574,9 +546,8 @@ const {
   background-color: #fff;
   height: calc(100% - 16px);
   flex: 1;
-  box-shadow: 0px 1px 4px 0px 
-		rgba(0, 7, 101, 0.15);
-	border-radius: 6px;
+  box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
+  border-radius: 6px;
   overflow: hidden;
 }
 
@@ -592,10 +563,10 @@ const {
   overflow: auto;
   height: calc(100% - 65px);
 }
-.tree :deep().el-tree-node>.el-tree-node__content {
+.tree :deep().el-tree-node > .el-tree-node__content {
   /* padding: 0 16px!important; */
-} 
-.tree :deep() .el-tree-node>.el-tree-node__children {
+}
+.tree :deep() .el-tree-node > .el-tree-node__children {
   overflow: unset;
   /* padding-left: 16px; */
 }
@@ -622,15 +593,13 @@ const {
   display: inline-block;
 }
 .tree .el-tree {
-  position: static!important;
+  position: static !important;
 }
-.tree .el-tree :deep().el-tree-node__content{
-  height: 36px!important;
+.tree .el-tree :deep().el-tree-node__content {
+  height: 36px !important;
 }
 .tree .el-tree :deep().el-tree-node__content:hover {
-  background-image: linear-gradient(90deg, 
-		rgba(255, 255, 255, 0.05) 83%, 
-		rgba(0, 0, 0, 0.05) 86%);
+  background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 83%, rgba(0, 0, 0, 0.05) 86%);
 }
 .tree-more {
   font-size: 12px;
@@ -659,11 +628,11 @@ const {
   color: #3759be;
 }
 
-.tree-action .disable{
+.tree-action .disable {
   cursor: not-allowed;
   color: #616f94;
 }
-.tree-action .disable:hover{
+.tree-action .disable:hover {
   background-color: #fff;
   color: #616f94;
 }
@@ -688,4 +657,4 @@ const {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue
index f50f7fd..34b0740 100644
--- a/src/page/main/develop/menu/menu-form.vue
+++ b/src/page/main/develop/menu/menu-form.vue
@@ -6,8 +6,7 @@
     :rules="formRules"
     ref="menuRef"
     style="width: 856px"
-    class="menu_form"
-  >
+    class="menu_form">
     <el-form-item label="菜单名称" prop="menu_name">
       <el-input v-model.trim="menuForm.menu_name" show-word-limit maxlength="8" placeholder="请输入菜单名称" />
     </el-form-item>
@@ -20,15 +19,10 @@
     </el-form-item>
     <el-form-item label="分组" prop="dict_group_id" v-if="!topLevel">
       <el-select v-model="menuForm.dict_group_id" :disabled="groupFlag" placeholder="请选择分组">
-        <el-option
-          v-for="item in groupList"
-          :key="item.dict_id"
-          :label="item.dict_name"
-          :value="item.dict_id"
-        />
+        <el-option v-for="item in groupList" :key="item.dict_id" :label="item.dict_name" :value="item.dict_id" />
       </el-select>
     </el-form-item>
-    <el-form-item label="跳转方式" prop="new_window" v-if="menuForm.menu_type !=0">
+    <el-form-item label="跳转方式" prop="new_window" v-if="menuForm.menu_type != 0">
       <el-radio-group v-model="menuForm.new_window">
         <el-radio :label="0">当前窗口</el-radio>
         <el-radio :label="1">新窗口</el-radio>
@@ -39,12 +33,7 @@
     </el-form-item>
     <el-form-item label="系统类型" prop="system_type" v-if="topLevel">
       <el-select v-model="menuForm.system_type" placeholder="请选择系统类型">
-        <el-option
-          v-for="item in systemGroupList"
-          :key="item.dict_id"
-          :label="item.dict_name"
-          :value="item.dict_id"
-        />
+        <el-option v-for="item in systemGroupList" :key="item.dict_id" :label="item.dict_name" :value="item.dict_id" />
       </el-select>
     </el-form-item>
     <el-form-item label="是否启用" prop="state">
@@ -56,22 +45,17 @@
         inline-prompt
         active-text="是"
         inactive-text="否"
-        :disabled="disabledSwitch"
-      />
+        :disabled="disabledSwitch" />
     </el-form-item>
     <el-form-item label="菜单路径" :prop="topLevel ? '' : 'menu_url'">
       <el-input v-model="menuForm.menu_url" show-word-limit maxlength="200" placeholder="请输入菜单路径" />
     </el-form-item>
     <el-form-item label="菜单图标" prop="menu_logo">
-      <div class="iconBox" :style="iconFlag ? {'border-color':'#2b4695'} : {} " @click="openIconbox">
+      <div class="iconBox" :style="iconFlag ? { 'border-color': '#2b4695' } : {}" @click="openIconbox">
         <div>
           <span>
-            <bg-icon
-              class="bgIcon"
-              style="margin-right: 8px"
-              :icon="'#' + menuForm.menu_logo"
-            ></bg-icon>
-            <span>{{menuForm.menu_logo.replace("bg-ic-","")}}</span>
+            <bg-icon class="bgIcon" style="margin-right: 8px" :icon="'#' + menuForm.menu_logo"></bg-icon>
+            <span>{{ menuForm.menu_logo.replace("bg-ic-", "") }}</span>
           </span>
         </div>
         <div>
@@ -79,32 +63,20 @@
             class="bgIcon clearIcon"
             icon="#bg-ic-circle-close"
             v-if="menuForm.menu_logo != ''"
-            @click.stop="clearIcon"
-          ></bg-icon>
-          <bg-icon
-            class="bgIcon"
-            :icon="iconFlag ? '#bg-ic-caret-top' : '#bg-ic-caret-bottom'"
-          ></bg-icon>
+            @click.stop="clearIcon"></bg-icon>
+          <bg-icon class="bgIcon" :icon="iconFlag ? '#bg-ic-caret-top' : '#bg-ic-caret-bottom'"></bg-icon>
         </div>
       </div>
       <div class="icon_box" v-show="iconFlag">
         <div class="input_box">
-          <el-input
-            placeholder="请输入内容"
-            :prefix-icon="Search"
-            v-model="icon_search"
-            @input="searchIcon"
-          >
+          <el-input placeholder="请输入内容" :prefix-icon="Search" v-model="icon_search" @input="searchIcon">
           </el-input>
         </div>
         <div class="icon_content bg-scroll">
-          <div class="icon_item" v-for="(e,i) in showIconArr" :key="i+100" @click="changeIcon(e)">
-            <span :title="e.name"> 
-              <bg-icon
-                class="selectBgIcon"
-                :icon="'#' + e.icon"
-              ></bg-icon>
-              {{e.name}}
+          <div class="icon_item" v-for="(e, i) in showIconArr" :key="i + 100" @click="changeIcon(e)">
+            <span :title="e.name">
+              <bg-icon class="selectBgIcon" :icon="'#' + e.icon"></bg-icon>
+              {{ e.name }}
             </span>
           </div>
         </div>
@@ -117,23 +89,23 @@
 </template>
 
 <script setup>
-import { Search } from '@element-plus/icons-vue'
-import { reactive, ref, onMounted, toRefs } from 'vue'
-import axios from '../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import allIconArr from '@/assets/js/bg_icon.js'
+import { Search } from "@element-plus/icons-vue";
+import { reactive, ref, onMounted, toRefs } from "vue";
+import axios from "../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import allIconArr from "@/assets/js/bg_icon.js";
 
-const menuRef = ref(null)
+const menuRef = ref(null);
 const props = defineProps({
   data: {
     type: Object,
     default: null,
   },
-})
+});
 const state = reactive({
   menuRef,
   menuForm: {
-    menu_name: '',
+    menu_name: "",
     menu_type: 0,
     dict_group_id: "",
     state: 1,
@@ -145,24 +117,12 @@ const state = reactive({
     remark: "",
   },
   formRules: {
-    menu_name: [
-      { required: true, message: '请输入菜单名称', trigger: 'blur' },
-    ],
-    menu_type: [
-      { required: true, message: '请选择菜单类型', trigger: 'change' },
-    ],
-    dict_group_id: [
-      { required: true, message: '请选择菜单分组', trigger: 'change' },
-    ],
-    system_type: [
-      { required: true, message: '请选择系统类型', trigger: 'change' },
-    ],
-    menu_url: [
-      { required: true, message: '请输入菜单路径', trigger: 'blur' },
-    ],
-    new_window: [
-      { required: true, message: '请选择跳转方式', trigger: 'change' },
-    ]
+    menu_name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
+    menu_type: [{ required: true, message: "请选择菜单类型", trigger: "change" }],
+    dict_group_id: [{ required: true, message: "请选择菜单分组", trigger: "change" }],
+    system_type: [{ required: true, message: "请选择系统类型", trigger: "change" }],
+    menu_url: [{ required: true, message: "请输入菜单路径", trigger: "blur" }],
+    new_window: [{ required: true, message: "请选择跳转方式", trigger: "change" }],
   },
   groupList: [], // 菜单分组
   systemGroupList: [], // 系统类型--顶级菜单使用
@@ -176,102 +136,105 @@ const state = reactive({
   typeDisFlag: null,
   groupFlag: true,
   disabledSwitch: false, // 内置菜单built_in为1-不可禁用 0或不存在-可禁用
-})
+});
 
 const getGroupList = () => {
   axios
     .get(`/apaas/system/v5/menu/group/dict`)
     .then((res) => {
       if (res.data.code == 200) {
-        state.groupList = res.data.data || []
-      }else {
-        ElMessage.error(res.data.data)
+        state.groupList = res.data.data || [];
+      } else {
+        ElMessage.error(res.data.data);
       }
-    }).catch((err) => {
-      console.log(err)
     })
-} // 获取分组数据
+    .catch((err) => {
+      console.log(err);
+    });
+}; // 获取分组数据
 
 const getSystemGroup = () => {
   axios
     .get(`/apaas/system/v5/menu/system/dict`)
     .then((res) => {
       if (res.data.code == 200) {
-        state.systemGroupList = res.data.data || []
-      }else {
-        ElMessage.error(res.data.data)
+        state.systemGroupList = res.data.data || [];
+      } else {
+        ElMessage.error(res.data.data);
       }
-    }).catch((err) => {
-      console.log(err)
     })
-} // 获取系统类型数据
+    .catch((err) => {
+      console.log(err);
+    });
+}; // 获取系统类型数据
 const openIconbox = () => {
-  state.iconFlag = !state.iconFlag
-  state.icon_search = ""
-  searchIcon()
-} // 打开/关闭图标盒子
+  state.iconFlag = !state.iconFlag;
+  state.icon_search = "";
+  searchIcon();
+}; // 打开/关闭图标盒子
 const searchIcon = () => {
   if (state.timer) {
     clearTimeout(state.timer);
   }
   state.timer = setTimeout(() => {
-    let iconList = []
+    let iconList = [];
     if (state.icon_search == "") {
-      state.showIconArr = state.iconArr
-    }else {
-      state.iconArr.map(e => {
+      state.showIconArr = state.iconArr;
+    } else {
+      state.iconArr.map((e) => {
         if (e.name.indexOf(state.icon_search) !== -1) {
-          iconList.push(e)
+          iconList.push(e);
         }
-      })
-      state.showIconArr = iconList
+      });
+      state.showIconArr = iconList;
     }
-  },500)
-} // 图标筛选
+  }, 500);
+}; // 图标筛选
 
 const setForm = (data) => {
   if (data.level && data.level == 1) {
-    state.topLevel = true
-  }else {
-    state.topLevel = false
+    state.topLevel = true;
+  } else {
+    state.topLevel = false;
     if (data.level == 2) {
-      state.groupFlag = false
-    }else {
-      state.groupFlag = true
+      state.groupFlag = false;
+    } else {
+      state.groupFlag = true;
     }
   }
-  state.typeDisFlag = data.p_menu_type
-  if (data.id) { // 编辑状态
-    state.radioDisabled = true
-  }else {
-    state.radioDisabled = false
+  state.typeDisFlag = data.p_menu_type;
+  if (data.id) {
+    // 编辑状态
+    state.radioDisabled = true;
+  } else {
+    state.radioDisabled = false;
   }
-  state.disabledSwitch = data.built_in && data.built_in == 1 ? true : false
+  state.disabledSwitch = data.built_in && data.built_in == 1 ? true : false;
   state.menuForm = Object.assign(state.menuForm, data);
-} // 表单赋值
+}; // 表单赋值
 
 const clearIcon = () => {
-  state.menuForm.menu_logo = ""
-} // 清除选中的图标
+  state.menuForm.menu_logo = "";
+}; // 清除选中的图标
 
 const changeIcon = (e) => {
-  state.menuForm.menu_logo = e.icon
-  state.iconFlag = false
-  state.icon_search = ""
-  searchIcon()
-} // 选中图标
+  state.menuForm.menu_logo = e.icon;
+  state.iconFlag = false;
+  state.icon_search = "";
+  searchIcon();
+}; // 选中图标
 onMounted(() => {
   // 处理图标数据
-  allIconArr.forEach(e => {
+  allIconArr.forEach((e) => {
     state.iconArr.push({
       icon: e,
-      name: e.replace("bg-ic-","")
-    })
-  })
-  state.showIconArr = state.iconArr
-  getGroupList()
-  getSystemGroup()
-})
+      name: e.replace("bg-ic-", ""),
+    });
+  });
+  state.showIconArr = state.iconArr;
+  getGroupList();
+  getSystemGroup();
+});
 const {
   menuForm,
   formRules,
@@ -285,9 +248,9 @@ const {
   groupFlag,
   systemGroupList,
   disabledSwitch,
-} = toRefs(state)
+} = toRefs(state);
 
-defineExpose({ setForm , menuForm, menuRef })
+defineExpose({ setForm, menuForm, menuRef });
 </script>
 
 <style lang="scss" scoped>
@@ -350,10 +313,9 @@ defineExpose({ setForm , menuForm, menuRef })
       .icon_box {
         width: 100%;
         height: 236px;
-        box-shadow: 0px 4px 12px 0px 
-	      	rgba(18, 30, 63, 0.1);
-	      border-radius: 4px;
-	      border: solid 1px #e6e9ef;
+        box-shadow: 0px 4px 12px 0px rgba(18, 30, 63, 0.1);
+        border-radius: 4px;
+        border: solid 1px #e6e9ef;
         margin-top: 10px;
         padding: 12px 0px 12px 8px;
         .input_box {
@@ -401,4 +363,4 @@ defineExpose({ setForm , menuForm, menuRef })
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/banner/edit/banner-form.vue b/src/page/main/home-config/banner/edit/banner-form.vue
index 1af48e4..e55f1c1 100644
--- a/src/page/main/home-config/banner/edit/banner-form.vue
+++ b/src/page/main/home-config/banner/edit/banner-form.vue
@@ -1,11 +1,5 @@
 <template>
-  <el-form
-    :model="formData"
-    :rules="formRules"
-    ref="form"
-    style="max-width: 1048px"
-    class="form"
-  >
+  <el-form :model="formData" :rules="formRules" ref="form" style="max-width: 1048px" class="form">
     <el-form-item label="banner名称" prop="banner_name">
       <el-input v-model="formData.banner_name" />
     </el-form-item>
@@ -13,75 +7,70 @@
       <el-input v-model="formData.link_address" />
     </el-form-item>
     <el-form-item label="上传banner图片" prop="banner_image">
-       <bg-upload-image v-model="formData.banner_image" :fileSize="1" :showTips="true" customTips="请选择图片上传：大小1920 * 560像素支持jpg、png等格式，图片需小于1MB" :limit="1" listType="picture-card" :accept="['.jpg','.jpeg','.png']"></bg-upload-image>
+      <bg-upload-image
+        v-model="formData.banner_image"
+        :fileSize="1"
+        :showTips="true"
+        customTips="请选择图片上传：大小1920 * 560像素支持jpg、png等格式，图片需小于1MB"
+        :limit="1"
+        listType="picture-card"
+        :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
     </el-form-item>
     <el-form-item label="是否启用" prop="state" class="state_form_item">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="formData.state"></bg-switch>
+      <bg-switch :labels="['否', '是']" :values="[0, 1]" v-model="formData.state"></bg-switch>
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-const router = useRouter()
-const route = useRoute()
-const form = ref(null)
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
+const router = useRouter();
+const route = useRoute();
+const form = ref(null);
 const state = reactive({
   formData: {
     banner_name: "",
     link_address: "",
     banner_image: [],
-    state: 1
+    state: 1,
   },
   formRules: {
-    banner_name: [
-      { required: true, message: '请输入banner名称', trigger: 'blur' },
-    ],
-    banner_image: [
-      { required: true, message: '请上传banner图', trigger: 'change' },
-    ],
-    state: [
-      { required: true, message: '请选择启用状态', trigger: 'change' },
-    ],
-  }
-})
+    banner_name: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
+    banner_image: [{ required: true, message: "请上传banner图", trigger: "change" }],
+    state: [{ required: true, message: "请选择启用状态", trigger: "change" }],
+  },
+});
 
-const emit = defineEmits(['action'])
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!form) return
+  if (!form) return;
   await form.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', state.formData)
+      emit("action", state.formData);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const clearForm = () => {
-  if (!form) return
-  form.value.resetFields()
-
-} 
+  if (!form) return;
+  form.value.resetFields();
+};
 
 const setForm = (data) => {
   Object.assign(state.formData, data);
-}
+};
+
+onBeforeMount(() => {});
 
-onBeforeMount(() => {
-  
-})
-    
-const {
-  formData,
-  formRules,
-} = toRefs(state)
+const { formData, formRules } = toRefs(state);
 
-defineExpose({ submitForm, clearForm, setForm })
+defineExpose({ submitForm, clearForm, setForm });
 </script>
 
 <style lang="scss" scoped>
@@ -104,4 +93,4 @@ defineExpose({ submitForm, clearForm, setForm })
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/banner/edit/index.vue b/src/page/main/home-config/banner/edit/index.vue
index d3a90e1..383b317 100644
--- a/src/page/main/home-config/banner/edit/index.vue
+++ b/src/page/main/home-config/banner/edit/index.vue
@@ -8,7 +8,7 @@
       </div>
       <div class="content_bottom">
         <div>
-          <el-button  @click="cancel">取消</el-button>
+          <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="submit">保存</el-button>
         </div>
       </div>
@@ -17,103 +17,96 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
-import bannerForm from "./banner-form.vue"
-const router = useRouter()
-const route = useRoute()
+import bannerForm from "./banner-form.vue";
+const router = useRouter();
+const route = useRoute();
 const bannerFormRef = ref(null);
 const state = reactive({
   formData: {
     banner_name: "",
     link_address: "",
     banner_image: [],
-    state: 1
-  }
-})
+    state: 1,
+  },
+});
 
 const getDetail = (id) => {
   axios
     .get(`/apaas/system/v5/banner/${id}`)
-    .then(res => {
+    .then((res) => {
       if (res.data.code == 200) {
-        const data = res.data.data
+        const data = res.data.data;
         bannerFormRef.value.setForm({
           banner_name: data.banner_name,
           link_address: data.link_address,
-          banner_image: data.banner_image ? [{url: data.banner_image}] : [],
-          state: data.state
-        })
-      }else {
-        ElMessage.error(res.data.data)
+          banner_image: data.banner_image ? [{ url: data.banner_image }] : [],
+          state: data.state,
+        });
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
-    .catch(err => {
-      console.log(err)
-    })
-}
+    .catch((err) => {
+      console.log(err);
+    });
+};
 
 const submit = () => {
-  bannerFormRef.value.submitForm()
-}
+  bannerFormRef.value.submitForm();
+};
 
 const submitFormData = (data) => {
   if (data) {
-    Object.assign(state.formData,data);
-    console.log(state.formData)
+    Object.assign(state.formData, data);
+    console.log(state.formData);
     if (route.query.id) {
       // 编辑
       let params = {
         ...state.formData,
-        id: +route.query.id
-      }
-      params.banner_image = params.banner_image && params.banner_image.length > 0 ? params.banner_image[0].url : ''
-      axios
-        .put(`/apaas/system/v5/banner`,params)
-        .then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg)
-            router.go(-1)
-          }else {
-            ElMessage.error(res.data.data)
-          }
-        })
-    }else {
+        id: +route.query.id,
+      };
+      params.banner_image = params.banner_image && params.banner_image.length > 0 ? params.banner_image[0].url : "";
+      axios.put(`/apaas/system/v5/banner`, params).then((res) => {
+        if (res.data.code == 200) {
+          ElMessage.success(res.data.msg);
+          router.go(-1);
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
+    } else {
       let params = {
         ...state.formData,
-      }
-      params.banner_image = params.banner_image && params.banner_image.length > 0 ? params.banner_image[0].url : ''
-      axios
-        .post(`/apaas/system/v5/banner`,params)
-        .then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg)
-            router.go(-1)
-          }else {
-            ElMessage.error(res.data.data)
-          }
-        })
+      };
+      params.banner_image = params.banner_image && params.banner_image.length > 0 ? params.banner_image[0].url : "";
+      axios.post(`/apaas/system/v5/banner`, params).then((res) => {
+        if (res.data.code == 200) {
+          ElMessage.success(res.data.msg);
+          router.go(-1);
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
     }
   }
-}
+};
 
 const cancel = () => {
-  router.go(-1)
-}
+  router.go(-1);
+};
 
 onBeforeMount(() => {
   if (route.query.id) {
-    getDetail(route.query.id)
+    getDetail(route.query.id);
   }
-})
-    
-const {
-
-} = toRefs(state)
+});
 
+const {} = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -133,7 +126,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -158,4 +151,4 @@ const {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/banner/index.vue b/src/page/main/home-config/banner/index.vue
index 536fbab..5d969ff 100644
--- a/src/page/main/home-config/banner/index.vue
+++ b/src/page/main/home-config/banner/index.vue
@@ -3,9 +3,7 @@
   <div class="detail_container">
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
-      <bg-filter-group
-        :showSearch="false"
-      >
+      <bg-filter-group :showSearch="false">
         <template v-slot:left_action>
           <div class="apaas_button">
             <el-button class="register_btn" type="primary" @click="addBanner">
@@ -17,18 +15,16 @@
       </bg-filter-group>
       <div class="table_container">
         <div class="table bg-scroll">
-          <bg-table 
-            ref="Bgtable" 
-            :headers="headers" 
-            :rows="tableRows"
-            :isIndex="true"
-            :stripe="true"
-          >
+          <bg-table ref="Bgtable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
             <template v-slot:updated_time="{ row }">
               {{ row.updated_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
             </template>
             <template v-slot:state="{ row }">
-              <bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
+              <bg-switch
+                @click="changeUseRow(row)"
+                :labels="['否', '是']"
+                :values="[0, 1]"
+                v-model="row.state"></bg-switch>
             </template>
             <template v-slot:action="{ row }">
               <bg-table-btns :operations="getOperations(row)" />
@@ -47,8 +43,7 @@
         () => {
           dialogDelete = false;
         }
-      "
-    >
+      ">
       <div>确定要删除吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -61,13 +56,13 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
-const router = useRouter()
-const Bgtable = ref(null)
+const router = useRouter();
+const Bgtable = ref(null);
 const state = reactive({
   headers: [
     {
@@ -100,27 +95,25 @@ const state = reactive({
   tableRows: [],
   dialogDelete: false,
   actionRow: null,
-})
+});
 
 const getRoleRows = () => {
-  axios
-    .get(`/apaas/system/v5/banner/list`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        state.tableRows = res.data.data || []
-        if (state.tableRows.length > 0) {
-          state.tableRows.forEach(e => {
-            e.canMoveUp = true
-            e.canMoveDown = true
-          })
-          state.tableRows[0].canMoveUp = false
-          state.tableRows[state.tableRows.length - 1].canMoveDown = false
-        }
-      }else {
-        ElMessage.error(res.data.data)
+  axios.get(`/apaas/system/v5/banner/list`).then((res) => {
+    if (res.data.code == 200) {
+      state.tableRows = res.data.data || [];
+      if (state.tableRows.length > 0) {
+        state.tableRows.forEach((e) => {
+          e.canMoveUp = true;
+          e.canMoveDown = true;
+        });
+        state.tableRows[0].canMoveUp = false;
+        state.tableRows[state.tableRows.length - 1].canMoveDown = false;
       }
-    })
-} // 获取列表
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取列表
 
 const getOperations = (row) => {
   return [
@@ -136,117 +129,108 @@ const getOperations = (row) => {
     },
     {
       name: "上移",
-      callback: () => moveRow(row,1),
+      callback: () => moveRow(row, 1),
       disabled: !row.canMoveUp,
     },
     {
       name: "下移",
-      callback: () => moveRow(row,2),
+      callback: () => moveRow(row, 2),
       disabled: !row.canMoveDown,
     },
   ];
-} // 表格操作按钮
+}; // 表格操作按钮
 
 const addBanner = () => {
-  router.push("/home-config/banner/add")
-}
+  router.push("/home-config/banner/add");
+};
 
 const edit_row = (row) => {
   router.push({
     path: "/home-config/banner/edit",
     query: {
-      id: row.id
-    }
-  })
-}
+      id: row.id,
+    },
+  });
+};
 
 const delete_row = (row) => {
-  state.actionRow = row
-  state.dialogDelete = true
-}
+  state.actionRow = row;
+  state.dialogDelete = true;
+};
 
 const deleteData = () => {
-  axios
-    .delete(`/apaas/system/v5/banner/${state.actionRow.id}`)
-    .then(res => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        state.dialogDelete = false
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
+  axios.delete(`/apaas/system/v5/banner/${state.actionRow.id}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      state.dialogDelete = false;
+      getRoleRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-const moveRow = (row,type) => {
-  let index
-  state.tableRows.forEach((e,i) => {
+const moveRow = (row, type) => {
+  let index;
+  state.tableRows.forEach((e, i) => {
     if (e.id == row.id) {
-      index = i
+      index = i;
     }
-  })
-  let nextRow
-  if (type == 1) { // 上移
-    nextRow = state.tableRows[index - 1]
-  }else { // 下移
-    nextRow = state.tableRows[index + 1]
+  });
+  let nextRow;
+  if (type == 1) {
+    // 上移
+    nextRow = state.tableRows[index - 1];
+  } else {
+    // 下移
+    nextRow = state.tableRows[index + 1];
   }
   let params = [
     {
       id: row.id,
-      sort: nextRow.sort
+      sort: nextRow.sort,
     },
     {
       id: nextRow.id,
-      sort: row.sort
-    }
-  ]
+      sort: row.sort,
+    },
+  ];
   axios
-    .post(`/apaas/system/v5/banner/sort`,[...params])
+    .post(`/apaas/system/v5/banner/sort`, [...params])
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
+        ElMessage.success(res.data.msg);
+        getRoleRows();
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
     .catch((err) => {
-      console.log(err)
-    })
-}
+      console.log(err);
+    });
+};
 
 const changeUseRow = (row) => {
   let params = {
     id: row.id,
-    state: row.state
-  }
-  axios
-    .post(`/apaas/system/v5/banner/status`,params)
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
-        row.state = row.state == 0 ? 1 : 0
-      }
-    })
-}
+    state: row.state,
+  };
+  axios.post(`/apaas/system/v5/banner/status`, params).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getRoleRows();
+    } else {
+      ElMessage.error(res.data.data);
+      row.state = row.state == 0 ? 1 : 0;
+    }
+  });
+};
 
 onBeforeMount(() => {
-  getRoleRows()
-})
-    
-const {
-  filter,
-  headers,
-  tableRows,
-  tableTotal,
-  dialogDelete,
-} = toRefs(state)
+  getRoleRows();
+});
 
+const { filter, headers, tableRows, tableTotal, dialogDelete } = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -266,7 +250,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -280,4 +264,4 @@ const {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/foot-info/index.vue b/src/page/main/home-config/foot-info/index.vue
index 756248c..ffb12a0 100644
--- a/src/page/main/home-config/foot-info/index.vue
+++ b/src/page/main/home-config/foot-info/index.vue
@@ -4,21 +4,23 @@
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
       <div class="content_top">
-        <el-form
-          :model="formData"
-          :rules="formRules"
-          ref="formRef"
-          style="max-width: 1048px"
-          class="form"
-        >
+        <el-form :model="formData" :rules="formRules" ref="formRef" style="max-width: 1048px" class="form">
           <el-form-item label="公司名称" prop="company_name">
-            <el-input v-model="formData.company_name" placeholder="请输入公司名称" show-word-limit maxlength="50"/>
+            <el-input v-model="formData.company_name" placeholder="请输入公司名称" show-word-limit maxlength="50" />
           </el-form-item>
           <el-form-item label="公司地址" prop="company_address">
-            <el-input v-model="formData.company_address" placeholder="请输入公司地址" show-word-limit maxlength="100"/>
+            <el-input v-model="formData.company_address" placeholder="请输入公司地址" show-word-limit maxlength="100" />
           </el-form-item>
           <el-form-item label="公司logo" prop="logo">
-             <bg-upload-image v-model="formData.logo" :fileSize="500" :fileSizeUnit="'KB'" :showTips="true" customTips="请选择图片上传：大小80 * 80像素支持jpg、png等格式，图片需小于500KB" :limit="1" listType="picture-card" :accept="['.jpg','.jpeg','.png']"></bg-upload-image>
+            <bg-upload-image
+              v-model="formData.logo"
+              :fileSize="500"
+              :fileSizeUnit="'KB'"
+              :showTips="true"
+              customTips="请选择图片上传：大小80 * 80像素支持jpg、png等格式，图片需小于500KB"
+              :limit="1"
+              listType="picture-card"
+              :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
           </el-form-item>
           <el-form-item label="公司电话" prop="contact_phone">
             <el-input v-model="formData.contact_phone" placeholder="请输入公司电话" show-word-limit maxlength="20" />
@@ -35,104 +37,92 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
-const router = useRouter()
-const route = useRoute()
+const router = useRouter();
+const route = useRoute();
 const formRef = ref(null);
 
-const checkPhone = (rule,value,callback) => {
-  let reg = /^((1[0-9]{10})|(((([0-9]{3}-)?[0-9]{8})|(([0-9]{4}-)?[0-9]{7}))(-[0-9]{1,4})?))$/
-  if (value !== '') {
-    console.log(1)
+const checkPhone = (rule, value, callback) => {
+  let reg = /^((1[0-9]{10})|(((([0-9]{3}-)?[0-9]{8})|(([0-9]{4}-)?[0-9]{7}))(-[0-9]{1,4})?))$/;
+  if (value !== "") {
+    console.log(1);
     if (!reg.test(value)) {
-      console.log(2)
-      callback(new Error("电话号码格式不正确，请重新输入"))
-    }else {
-      console.log(3)
-      callback()
+      console.log(2);
+      callback(new Error("电话号码格式不正确，请重新输入"));
+    } else {
+      console.log(3);
+      callback();
     }
-  }else {
-    callback()
+  } else {
+    callback();
   }
-}
+};
 const state = reactive({
   formData: {
     company_name: "",
     company_address: "",
     logo: [],
-    contact_phone: ""
+    contact_phone: "",
   },
   formRules: {
     company_name: [
-      { required: true, message: "请输入公司名称", trigger: "blur"},
-      { max: 50, message: "长度最大为50个字符", trigger: "blur"}
-    ],
-    company_address: [
-
-    ],
-    logo: [
-
-    ],
-    contact_phone: [
-      { validator: checkPhone, trigger: "blur"}
+      { required: true, message: "请输入公司名称", trigger: "blur" },
+      { max: 50, message: "长度最大为50个字符", trigger: "blur" },
     ],
-  }
-})
+    company_address: [],
+    logo: [],
+    contact_phone: [{ validator: checkPhone, trigger: "blur" }],
+  },
+});
 
 const getFootInfo = () => {
   axios
     .get(`/apaas/system/v5/config/get`)
-    .then(res => {
+    .then((res) => {
       if (res.data.code == 200) {
-        const data = res.data.data
+        const data = res.data.data;
         state.formData = {
           company_name: data.company_name,
           company_address: data.company_address,
-          logo: data.logo ? [{url: data.logo}] : [],
-          contact_phone: data.contact_phone
-        }
-      }else {
-        ElMessage.error(res.data.data)
+          logo: data.logo ? [{ url: data.logo }] : [],
+          contact_phone: data.contact_phone,
+        };
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
-    .catch(err => {
-      console.log(err)
-    })
-}
+    .catch((err) => {
+      console.log(err);
+    });
+};
 
 const submit = () => {
   formRef.value.validate((valid, fields) => {
     if (valid) {
       let params = {
         ...state.formData,
-        logo: state.formData.logo && state.formData.logo.length > 0 ? state.formData.logo[0].url : '',
-      }
-      axios
-        .post(`/apaas/system/v5/config/set`,params)
-        .then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg)
-          }else {
-            ElMessage.error(res.data.data)
-          }
-        })
+        logo: state.formData.logo && state.formData.logo.length > 0 ? state.formData.logo[0].url : "",
+      };
+      axios.post(`/apaas/system/v5/config/set`, params).then((res) => {
+        if (res.data.code == 200) {
+          ElMessage.success(res.data.msg);
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
     }
-  })
-}
+  });
+};
 
 onBeforeMount(() => {
-  getFootInfo()
-})
-    
-const {
-  formData,
-  formRules,
-} = toRefs(state)
+  getFootInfo();
+});
 
+const { formData, formRules } = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -152,7 +142,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -194,4 +184,4 @@ const {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/recommend/edit/index.vue b/src/page/main/home-config/recommend/edit/index.vue
index 9d28693..6819490 100644
--- a/src/page/main/home-config/recommend/edit/index.vue
+++ b/src/page/main/home-config/recommend/edit/index.vue
@@ -4,46 +4,40 @@
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
       <div class="content_top bg-scroll">
-        <type-form ref="typeFormRef" :businessList="businessList" @action="submitFormData" @changeType="changeType"></type-form>
+        <type-form
+          ref="typeFormRef"
+          :businessList="businessList"
+          @action="submitFormData"
+          @changeType="changeType"></type-form>
         <div class="ability_select">
           <div class="title">
-            <span>已选择能力（{{selectArrNew.length}}/9）</span>
-            <el-tooltip
-              class="box-item"
-              effect="light"
-              content="最少需选择6个能力"
-              placement="top"
-              >
-              <bg-icon icon="#bg-ic-circle-warning" style="color: #7784a6;"></bg-icon>
+            <span>已选择能力（{{ selectArrNew.length }}/9）</span>
+            <el-tooltip class="box-item" effect="light" content="最少需选择6个能力" placement="top">
+              <bg-icon icon="#bg-ic-circle-warning" style="color: #7784a6"></bg-icon>
             </el-tooltip>
           </div>
           <div class="select_arr">
-            <ability-list :list="selectArr" :flag="true" @openBox="openDialog" @deleteItem="deleteItem" @move="move"></ability-list>
+            <ability-list
+              :list="selectArr"
+              :flag="true"
+              @openBox="openDialog"
+              @deleteItem="deleteItem"
+              @move="move"></ability-list>
           </div>
         </div>
         <div class="state_box">
           <span>是否启用</span>
-          <bg-switch :labels="['否','是']" :values="[0,1]" v-model="formData.state"></bg-switch>
+          <bg-switch :labels="['否', '是']" :values="[0, 1]" v-model="formData.state"></bg-switch>
         </div>
       </div>
       <div class="content_bottom">
         <div>
-          <el-button  @click="cancel">取消</el-button>
+          <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="submit">保存</el-button>
         </div>
       </div>
     </div>
-    <el-dialog
-      class="select_dialog"
-      title="选择能力"
-      v-model="selectDialog"
-      width="1220px"
-      :before-close="
-        () => {
-          selectDialog = false;
-        }
-      "
-    >
+    <el-dialog class="select_dialog" title="选择能力" v-model="selectDialog" width="1220px">
       <div class="select_box">
         <div class="topFilter">
           <div class="right">
@@ -52,25 +46,30 @@
               placeholder="请选择开放程度"
               style="width: 240px"
               multiple
-              collapse-tags
-            >
+              collapse-tags>
               <el-option
                 v-for="(item, index) in typeList"
                 :key="'typeList' + index"
                 :label="item.name"
-                :value="item.id"
-              >
+                :value="item.id">
               </el-option>
             </el-select>
             <el-cascader
               v-model="dialogFilter.organization_id"
               :options="orgList"
               placeholder="请选择组织"
-              :props="{ expandTrigger: 'hover', label: 'name', value: 'id', multiple: true, emitPath: false, checkStrictly: true, children: 'Child'}"
+              :props="{
+                expandTrigger: 'hover',
+                label: 'name',
+                value: 'id',
+                multiple: true,
+                emitPath: false,
+                checkStrictly: true,
+                children: 'Child',
+              }"
               :clearable="true"
               collapse-tags
-              style="width: 240px"
-            >
+              style="width: 240px">
               <template #default="{ data }">
                 <span>{{ data.name }}</span>
               </template>
@@ -79,8 +78,7 @@
               v-model.trim="dialogFilter.keyword"
               placeholder="请输入内容"
               style="width: 240px"
-              :prefix-icon="Search"
-            />
+              :prefix-icon="Search" />
             <el-button type="primary" @click="searchAction">查询</el-button>
             <el-button type="default" @click="clearAction">重置</el-button>
           </div>
@@ -88,11 +86,18 @@
         <div class="table_box">
           <div class="collation">
             <div>
-              <span class="collation-text" :class="{'current':dialogFilter.collation==item.value}" v-for="(item,index) in collationArr" :key="'collationArr' + index" @click="changeCollation(item.value)">{{item.name}}</span>
+              <span
+                class="collation-text"
+                :class="{ current: dialogFilter.collation == item.value }"
+                v-for="(item, index) in collationArr"
+                :key="'collationArr' + index"
+                @click="changeCollation(item.value)"
+                >{{ item.name }}</span
+              >
             </div>
             <div>
               <span>已选择</span>
-              <span class="num">（{{selectArrNew.length}}/9）</span>
+              <span class="num">（{{ selectArrNew.length }}/9）</span>
               <span>项</span>
               <span class="can_click_text" @click="clearSelection">清空</span>
             </div>
@@ -100,7 +105,6 @@
           <div class="user_table bg-scroll">
             <ability-list :list="list" @changeCheck="changeCheck"></ability-list>
           </div>
-          
         </div>
       </div>
       <template v-slot:footer>
@@ -110,8 +114,7 @@
           :total="total"
           @change-page="changePage"
           @change-size="changeSize"
-          :pageSizes="[15,30,50]"
-        >
+          :pageSizes="[15, 30, 50]">
         </bg-pagination>
         <div class="apaas_button">
           <el-button type="default" @click="selectDialog = false">取 消</el-button>
@@ -123,24 +126,24 @@
 </template>
 
 <script setup>
-import { Search } from '@element-plus/icons-vue'
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { Search } from "@element-plus/icons-vue";
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
-import typeForm from "./type-form.vue"
-import abilityList from "@/components/ability-list.vue"
-const router = useRouter()
-const route = useRoute()
+import typeForm from "./type-form.vue";
+import abilityList from "@/components/ability-list.vue";
+const router = useRouter();
+const route = useRoute();
 const typeFormRef = ref(null);
 const state = reactive({
   formData: {
     business_type_id: "",
     logo: [],
-    state: 1
+    state: 1,
   },
-  selectArr: ["","","","","","","","",""],
+  selectArr: ["", "", "", "", "", "", "", "", ""],
   selectDialog: false,
   dialogFilter: {
     openness: [],
@@ -155,177 +158,172 @@ const state = reactive({
   total: 0,
   collationArr: [
     {
-      name:'综合排序',
-      value:0,
+      name: "综合排序",
+      value: 0,
     },
     {
-      name:'最新更新',
-      value:1,
+      name: "最新更新",
+      value: 1,
     },
     {
-      name:'最高人气',
-      value:2,
+      name: "最高人气",
+      value: 2,
     },
     {
-      name:'最好评价',
-      value:3,
+      name: "最好评价",
+      value: 3,
     },
   ],
   businessList: [],
   list: [],
-  selectArrNew: []
-})
+  selectArrNew: [],
+});
 
 const getDetail = (id) => {
   axios
     .get(`/apaas/system/v5/recommend/ability/detail/${id}`)
-    .then(res => {
+    .then((res) => {
       if (res.data.code == 200) {
-        const data = res.data.data
-        console.log(data)
+        const data = res.data.data;
+        console.log(data);
         typeFormRef.value.setForm({
           business_type_id: data.business_type_id,
-          logo: data.logo ? [{url: data.logo}] : [],
-        })
-        state.selectArr = []
-        state.selectArrNew = []
-        state.formData.state = data.state
-        state.formData.business_type_id = data.business_type_id
-        state.selectArrNew = data.ability_list || []
-        state.selectArrNew.forEach((e,i) => {
-          e.canDown = true
-          e.canUp = true
+          logo: data.logo ? [{ url: data.logo }] : [],
+        });
+        state.selectArr = [];
+        state.selectArrNew = [];
+        state.formData.state = data.state;
+        state.formData.business_type_id = data.business_type_id;
+        state.selectArrNew = data.ability_list || [];
+        state.selectArrNew.forEach((e, i) => {
+          e.canDown = true;
+          e.canUp = true;
           if (i == 0) {
-            e.canUp = false
+            e.canUp = false;
           }
           if (i == state.selectArrNew.length - 1) {
-            e.canDown = false
+            e.canDown = false;
           }
-        })
-        state.selectArr.push(...state.selectArrNew)
-        for (var i = 0; i < 9-state.selectArrNew.length;i++) {
-          state.selectArr.push("")
+        });
+        state.selectArr.push(...state.selectArrNew);
+        for (var i = 0; i < 9 - state.selectArrNew.length; i++) {
+          state.selectArr.push("");
         }
-        console.log(state.selectArr)
-      }else {
-        ElMessage.error(res.data.data)
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
-    .catch(err => {
-      console.log(err)
-    })
-}
+    .catch((err) => {
+      console.log(err);
+    });
+};
 
 const getOrgList = () => {
-  axios
-    .get(`/apaas/system/v5/org/tree`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        state.orgList = res.data.data || []
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 获取组织列表
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      state.orgList = res.data.data || [];
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取组织列表
 
 const changeType = (val) => {
-  state.formData.business_type_id = val
-  state.selectArr = ["","","","","","","","",""]
-  state.selectArrNew = []
-}
+  state.formData.business_type_id = val;
+  state.selectArr = ["", "", "", "", "", "", "", "", ""];
+  state.selectArrNew = [];
+};
 const getAbilityList = () => {
   let params = {
     ...state.dialogFilter,
-    business_type: state.formData.business_type_id
-  }
-  params.organization_id = params.organization_id && params.organization_id.length > 0 ? params.organization_id.join(',') : ''
-  params.openness = params.openness && params.openness.length > 0 ? params.openness.join(',') : ''
-  axios
-    .get(`/apaas/system/v5/recommend/ability/list`,{params})
-    .then(res => {
-      if (res.data.code == 200) {
-        state.list = res.data.data.ability_list || []
-        state.selectArrNew = []
-        state.total = res.data.data.ability_total
-        nextTick(() => {
-          state.list.forEach(e => {
-            e.checked = false
-            state.selectArr.forEach(k => {
-              if (k.id) {
-                if (e.id == k.id) {
-                  e.checked = true
-                  state.selectArrNew.push(e)
-                }
+    business_type: state.formData.business_type_id,
+  };
+  params.organization_id =
+    params.organization_id && params.organization_id.length > 0 ? params.organization_id.join(",") : "";
+  params.openness = params.openness && params.openness.length > 0 ? params.openness.join(",") : "";
+  axios.get(`/apaas/system/v5/recommend/ability/list`, { params }).then((res) => {
+    if (res.data.code == 200) {
+      state.list = res.data.data.ability_list || [];
+      state.selectArrNew = [];
+      state.total = res.data.data.ability_total;
+      nextTick(() => {
+        state.list.forEach((e) => {
+          e.checked = false;
+          state.selectArr.forEach((k) => {
+            if (k.id) {
+              if (e.id == k.id) {
+                e.checked = true;
+                state.selectArrNew.push(e);
               }
-            })
-          })
-        })
-      }
-    })
-}
+            }
+          });
+        });
+      });
+    }
+  });
+};
 
 const openDialog = () => {
-  state.selectDialog = true
-  console.log(state.dialogFilter)
-  clearAction()
-}
+  state.selectDialog = true;
+  clearAction();
+};
 
 const deleteItem = (item) => {
-  changeCheck(item,true)
-}
+  changeCheck(item, true);
+};
 
 const move = (temp) => {
-  let id = temp.item.id
-  let index = null
-  state.selectArr.forEach((e,i) => {
+  let id = temp.item.id;
+  let index = null;
+  state.selectArr.forEach((e, i) => {
     if (e.id == id) {
-      index = i
+      index = i;
     }
-  })
+  });
   if (temp.type == 1) {
-    state.selectArr[index] = state.selectArr[index+1]
-    state.selectArr[index+1] = temp.item
-  }else {
-    state.selectArr[index] = state.selectArr[index-1]
-    state.selectArr[index-1] = temp.item
+    state.selectArr[index] = state.selectArr[index + 1];
+    state.selectArr[index + 1] = temp.item;
+  } else {
+    state.selectArr[index] = state.selectArr[index - 1];
+    state.selectArr[index - 1] = temp.item;
   }
-  state.selectArr.forEach((e,i) => {
-    if (e != '') {
-      e.canDown = true
-      e.canUp = true
+  state.selectArr.forEach((e, i) => {
+    if (e != "") {
+      e.canDown = true;
+      e.canUp = true;
       if (i == 0) {
-        e.canUp = false
+        e.canUp = false;
       }
       if (i == state.selectArrNew.length - 1) {
-        e.canDown = false
+        e.canDown = false;
       }
     }
-  })
-}
+  });
+};
 const changePage = (val) => {
-  state.dialogFilter.page = 1
-  getAbilityList()
-}
+  state.dialogFilter.page = 1;
+  getAbilityList();
+};
 
 const changeSize = (val) => {
-  state.dialogFilter.limit = val
-  changePage(1)
-}
+  state.dialogFilter.limit = val;
+  changePage(1);
+};
 
 const changeCollation = (val) => {
-  state.dialogFilter.collation = val
-  changePage(1)
-}
+  state.dialogFilter.collation = val;
+  changePage(1);
+};
 
 const clearSelection = () => {
-  state.list.forEach(e => {
-    e.checked = false
-  })
-  state.selectArrNew = []
-}
+  state.list.forEach((e) => {
+    e.checked = false;
+  });
+  state.selectArrNew = [];
+};
 const searchAction = () => {
-  changePage(1)
-}
+  changePage(1);
+};
 
 const clearAction = () => {
   state.dialogFilter = {
@@ -334,140 +332,132 @@ const clearAction = () => {
     keyword: "",
     collation: 0,
     limit: 15,
-  }
-  changePage(1)
-}
+  };
+  changePage(1);
+};
 
-const changeCheck = (item,deleteFlag) => {
-  let arr = state.selectArrNew.map(e => e.id) || []
+const changeCheck = (item, deleteFlag) => {
+  let arr = state.selectArrNew.map((e) => e.id) || [];
   if (arr.indexOf(item.id) > -1) {
-    state.selectArrNew.splice(arr.indexOf(item.id),1)
-  }else {
-    state.selectArrNew.push(item)
+    state.selectArrNew.splice(arr.indexOf(item.id), 1);
+  } else {
+    state.selectArrNew.push(item);
   }
-  state.selectArrNew.forEach((e,i) => {
-    e.canDown = true
-    e.canUp = true
+  state.selectArrNew.forEach((e, i) => {
+    e.canDown = true;
+    e.canUp = true;
     if (i == 0) {
-      e.canUp = false
+      e.canUp = false;
     }
     if (i == state.selectArrNew.length - 1) {
-      e.canDown = false
+      e.canDown = false;
     }
-  })
+  });
   if (deleteFlag) {
-    conform()
+    conform();
   }
-}
+};
 const submit = () => {
-  typeFormRef.value.submitForm()
-}
+  typeFormRef.value.submitForm();
+};
 
 const conform = () => {
   if (state.selectArrNew.length > 9) {
-    ElMessage.error("最多可选择9个能力")
-    return
+    ElMessage.error("最多可选择9个能力");
+    return;
   }
-  state.selectArr = JSON.parse(JSON.stringify(state.selectArrNew))
+  state.selectArr = JSON.parse(JSON.stringify(state.selectArrNew));
   if (state.selectArr.length < 9) {
-    let arr = []
-    for (var i = 0; i < 9-state.selectArr.length; i++ ) {
-      arr.push("")
+    let arr = [];
+    for (var i = 0; i < 9 - state.selectArr.length; i++) {
+      arr.push("");
     }
-    state.selectArr.push(...arr)
+    state.selectArr.push(...arr);
   }
-  state.selectDialog = false
-}
+  state.selectDialog = false;
+};
 
 const submitFormData = (data) => {
   if (state.selectArrNew.length < 6) {
-    ElMessage.error("最少选择6个能力")
-    return
+    ElMessage.error("最少选择6个能力");
+    return;
   }
   if (data) {
-    Object.assign(state.formData,data);
-    console.log(state.formData)
+    Object.assign(state.formData, data);
+    console.log(state.formData);
     if (route.query.id) {
       // 编辑
-      let abilitys = []
-      state.selectArrNew.forEach(e => {
-        abilitys.push(e.ability_id)
-      })
+      let abilitys = [];
+      state.selectArrNew.forEach((e) => {
+        abilitys.push(e.ability_id);
+      });
       let params = {
         ...state.formData,
         id: +route.query.id,
-        abilitys: abilitys
-      }
-      delete params.business_type_id
-      params.logo = params.logo && params.logo.length > 0 ? params.logo[0].url : ''
-      console.log(params)
-      axios
-        .post(`/apaas/system/v5/recommend/ability/update`,params)
-        .then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg)
-            router.go(-1)
-          }else {
-            ElMessage.error(res.data.data)
-          }
-        })
-    }else {
-      let abilitys = []
-      state.selectArrNew.forEach(e => {
-        abilitys.push(e.ability_id)
-      })
+        abilitys: abilitys,
+      };
+      delete params.business_type_id;
+      params.logo = params.logo && params.logo.length > 0 ? params.logo[0].url : "";
+      axios.post(`/apaas/system/v5/recommend/ability/update`, params).then((res) => {
+        if (res.data.code == 200) {
+          ElMessage.success(res.data.msg);
+          router.go(-1);
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
+    } else {
+      let abilitys = [];
+      state.selectArrNew.forEach((e) => {
+        abilitys.push(e.ability_id);
+      });
       let params = {
         ...state.formData,
-        abilitys: abilitys
-      }
-      params.logo = params.logo && params.logo.length > 0 ? params.logo[0].url : ''
-      console.log(params)
-      axios
-        .post(`/apaas/system/v5/recommend/ability/add`,params)
-        .then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg)
-            router.go(-1)
-          }else {
-            ElMessage.error(res.data.data)
-          }
-        })
+        abilitys: abilitys,
+      };
+      params.logo = params.logo && params.logo.length > 0 ? params.logo[0].url : "";
+      axios.post(`/apaas/system/v5/recommend/ability/add`, params).then((res) => {
+        if (res.data.code == 200) {
+          ElMessage.success(res.data.msg);
+          router.go(-1);
+        } else {
+          ElMessage.error(res.data.data);
+        }
+      });
     }
   }
-}
+};
 
 const cancel = () => {
-  router.go(-1)
-}
+  router.go(-1);
+};
 
 const getTypeList = () => {
-  axios
-    .get("/apaas/system/v5/dictionary/alllist")
-    .then((res) => {
-      if (res.data.code == 200) {
-        let data = res.data.data || []
-        data.forEach(e => {
-          if (e.classify_id == "eb9c7d70-c123-42b7-8e61-dde1b022b669") {
-            state.businessList = e.list || [];
-          }
-          if (e.classify_id == "949a1138-4995-464e-97a9-424d097eb271") {
-            state.typeList = e.list || []
-          }
-        })
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
+  axios.get("/apaas/system/v5/dictionary/alllist").then((res) => {
+    if (res.data.code == 200) {
+      let data = res.data.data || [];
+      data.forEach((e) => {
+        if (e.classify_id == "eb9c7d70-c123-42b7-8e61-dde1b022b669") {
+          state.businessList = e.list || [];
+        }
+        if (e.classify_id == "949a1138-4995-464e-97a9-424d097eb271") {
+          state.typeList = e.list || [];
+        }
+      });
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 onBeforeMount(() => {
-  getTypeList()
-  getOrgList()
+  getTypeList();
+  getOrgList();
   if (route.query.id) {
-    getDetail(route.query.id)
+    getDetail(route.query.id);
   }
-})
-    
+});
+
 const {
   formData,
   selectArr,
@@ -481,8 +471,7 @@ const {
   list,
   selectArrNew,
   businessList,
-} = toRefs(state)
-
+} = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -502,7 +491,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -598,7 +587,7 @@ const {
         padding: 10px 0;
         height: calc(100% - 68px);
         background-color: #f8f9fb;
-        .collation{
+        .collation {
           width: 100%;
           display: flex;
           justify-content: space-between;
@@ -606,31 +595,31 @@ const {
           font-size: 14px;
           color: #202531;
 
-          .collation-text{
+          .collation-text {
             font-size: 14px;
             color: #404a62;
             margin-right: 32px;
             position: relative;
             cursor: pointer;
-          
-            &::after{
-              content: '';
+
+            &::after {
+              content: "";
               display: block;
               position: absolute;
               top: 2px;
               right: -16px;
               width: 1px;
-              cursor:auto;
+              cursor: auto;
               height: 16px;
-	            background-color: #cbced7;
+              background-color: #cbced7;
             }
-          
-            &:nth-last-of-type(1)::after{
+
+            &:nth-last-of-type(1)::after {
               display: none;
             }
           }
-          .current{
-            color:#3759be!important;
+          .current {
+            color: #3759be !important;
           }
           .can_click_text {
             margin-left: 24px;
@@ -660,4 +649,4 @@ const {
 .el-dialog .el-dialog__footer {
   padding: 16px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/recommend/edit/type-form.vue b/src/page/main/home-config/recommend/edit/type-form.vue
index d651b09..a6834bb 100644
--- a/src/page/main/home-config/recommend/edit/type-form.vue
+++ b/src/page/main/home-config/recommend/edit/type-form.vue
@@ -1,93 +1,85 @@
 <template>
-  <el-form
-    :model="formData"
-    :rules="formRules"
-    ref="form"
-    style="max-width: 1048px"
-    class="form"
-  >
+  <el-form :model="formData" :rules="formRules" ref="form" style="max-width: 1048px" class="form">
     <el-form-item label="能力类型" prop="business_type_id">
-      <el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType" :disabled="route.query.id">
-        <el-option
-          v-for="item in props.businessList"
-          :key="item.dict_id"
-          :label="item.name"
-          :value="item.id"
-        />
+      <el-select
+        v-model="formData.business_type_id"
+        placeholder="请选择能力类型"
+        style="width: 100%"
+        @change="changeType"
+        :disabled="route.query.id">
+        <el-option v-for="item in props.businessList" :key="item.dict_id" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
     <el-form-item label="上传图标" prop="logo">
-       <bg-upload-image v-model="formData.logo" :fileSize="500" :fileSizeUnit="'KB'" :showTips="true" customTips="请选择图片上传：大小36 * 36像素支持jpg、png等格式，图片需小于500KB" :limit="1" listType="picture-card" :accept="['.jpg','.jpeg','.png']"></bg-upload-image>
+      <bg-upload-image
+        v-model="formData.logo"
+        :fileSize="500"
+        :fileSizeUnit="'KB'"
+        :showTips="true"
+        customTips="请选择图片上传：大小36 * 36像素支持jpg、png等格式，图片需小于500KB"
+        :limit="1"
+        listType="picture-card"
+        :accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-const router = useRouter()
-const route = useRoute()
-const form = ref(null)
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
+const router = useRouter();
+const route = useRoute();
+const form = ref(null);
 const props = defineProps({
   businessList: {
     type: Array,
-    default: []
-  }
-})
+    default: [],
+  },
+});
 const state = reactive({
   formData: {
     business_type_id: "",
     logo: [],
   },
   formRules: {
-    business_type_id: [
-      { required: true, message: '请选择业务类型', trigger: 'change' },
-    ],
-    logo: [
-      { required: true, message: '请上传图标', trigger: 'change' },
-    ],
+    business_type_id: [{ required: true, message: "请选择业务类型", trigger: "change" }],
+    logo: [{ required: true, message: "请上传图标", trigger: "change" }],
   },
-})
+});
 
-const emit = defineEmits(['action','changeType'])
+const emit = defineEmits(["action", "changeType"]);
 
 const submitForm = async () => {
-  if (!form) return
+  if (!form) return;
   await form.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', state.formData)
+      emit("action", state.formData);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const changeType = (val) => {
-  emit("changeType",val)
-}
+  emit("changeType", val);
+};
 
 const clearForm = () => {
-  if (!form) return
-  form.value.resetFields()
-
-} 
+  if (!form) return;
+  form.value.resetFields();
+};
 
 const setForm = (data) => {
   Object.assign(state.formData, data);
-}
+};
 
-onBeforeMount(() => {
+onBeforeMount(() => {});
 
-})
-    
-const {
-  formData,
-  formRules,
-} = toRefs(state)
+const { formData, formRules } = toRefs(state);
 
-defineExpose({ submitForm, clearForm, setForm })
+defineExpose({ submitForm, clearForm, setForm });
 </script>
 
 <style lang="scss" scoped>
@@ -108,4 +100,4 @@ defineExpose({ submitForm, clearForm, setForm })
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/home-config/recommend/index.vue b/src/page/main/home-config/recommend/index.vue
index 433280d..cbe2a67 100644
--- a/src/page/main/home-config/recommend/index.vue
+++ b/src/page/main/home-config/recommend/index.vue
@@ -3,9 +3,7 @@
   <div class="detail_container">
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
-      <bg-filter-group
-        :showSearch="false"
-      >
+      <bg-filter-group :showSearch="false">
         <template v-slot:left_action>
           <div class="apaas_button">
             <el-button class="register_btn" type="primary" @click="addBanner">
@@ -17,15 +15,13 @@
       </bg-filter-group>
       <div class="table_container">
         <div class="table bg-scroll">
-          <bg-table 
-            ref="Bgtable" 
-            :headers="headers" 
-            :rows="tableRows"
-            :isIndex="true"
-            :stripe="true"
-          >
+          <bg-table ref="Bgtable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
             <template v-slot:recommend_state="{ row }">
-              <bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.recommend_state"></bg-switch>
+              <bg-switch
+                @click="changeUseRow(row)"
+                :labels="['否', '是']"
+                :values="[0, 1]"
+                v-model="row.recommend_state"></bg-switch>
             </template>
             <template v-slot:action="{ row }">
               <bg-table-btns :operations="getOperations(row)" />
@@ -35,17 +31,7 @@
       </div>
     </div>
     <!-- 删除弹窗 -->
-    <el-dialog
-      class="dialog_box"
-      title="提示"
-      v-model="dialogDelete"
-      width="400px"
-      :before-close="
-        () => {
-          dialogDelete = false;
-        }
-      "
-    >
+    <el-dialog class="dialog_box" title="提示" v-model="dialogDelete" width="400px">
       <div>确定要删除吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -58,13 +44,13 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
-const router = useRouter()
-const Bgtable = ref(null)
+const router = useRouter();
+const Bgtable = ref(null);
 const state = reactive({
   headers: [
     {
@@ -93,27 +79,25 @@ const state = reactive({
   tableRows: [],
   dialogDelete: false,
   actionRow: null,
-})
+});
 
 const getRoleRows = () => {
-  axios
-    .get(`/apaas/system/v5/recommend/ability/classify/list`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        state.tableRows = res.data.data || []
-        if (state.tableRows.length > 0) {
-          state.tableRows.forEach(e => {
-            e.canMoveUp = true
-            e.canMoveDown = true
-          })
-          state.tableRows[0].canMoveUp = false
-          state.tableRows[state.tableRows.length - 1].canMoveDown = false
-        }
-      }else {
-        ElMessage.error(res.data.data)
+  axios.get(`/apaas/system/v5/recommend/ability/classify/list`).then((res) => {
+    if (res.data.code == 200) {
+      state.tableRows = res.data.data || [];
+      if (state.tableRows.length > 0) {
+        state.tableRows.forEach((e) => {
+          e.canMoveUp = true;
+          e.canMoveDown = true;
+        });
+        state.tableRows[0].canMoveUp = false;
+        state.tableRows[state.tableRows.length - 1].canMoveDown = false;
       }
-    })
-} // 获取列表
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取列表
 
 const getOperations = (row) => {
   return [
@@ -129,116 +113,107 @@ const getOperations = (row) => {
     },
     {
       name: "上移",
-      callback: () => moveRow(row,1),
+      callback: () => moveRow(row, 1),
       disabled: !row.canMoveUp,
     },
     {
       name: "下移",
-      callback: () => moveRow(row,2),
+      callback: () => moveRow(row, 2),
       disabled: !row.canMoveDown,
     },
   ];
-} // 表格操作按钮
+}; // 表格操作按钮
 
 const addBanner = () => {
-  console.log("新建")
-  router.push("/home-config/recommend/add")
-}
+  router.push("/home-config/recommend/add");
+};
 
 const edit_row = (row) => {
-  console.log("去编辑")
   router.push({
     path: "/home-config/recommend/edit",
     query: {
-      id: row.id
-    }
-  })
-}
+      id: row.id,
+    },
+  });
+};
 
 const delete_row = (row) => {
-  state.actionRow = row
-  state.dialogDelete = true
-}
+  state.actionRow = row;
+  state.dialogDelete = true;
+};
 
 const deleteData = () => {
   let params = {
-    id: state.actionRow.id
-  }
-  axios
-    .delete(`/apaas/system/v5/recommend/ability/delete`,{data: params})
-    .then(res => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        state.dialogDelete = false
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
+    id: state.actionRow.id,
+  };
+  axios.delete(`/apaas/system/v5/recommend/ability/delete`, { data: params }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      state.dialogDelete = false;
+      getRoleRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-const moveRow = (row,type) => {
-  let index
-  state.tableRows.forEach((e,i) => {
+const moveRow = (row, type) => {
+  let index;
+  state.tableRows.forEach((e, i) => {
     if (e.id == row.id) {
-      index = i
+      index = i;
     }
-  })
-  let nextRow
-  if (type == 1) { // 上移
-    nextRow = state.tableRows[index - 1]
-  }else { // 下移
-    nextRow = state.tableRows[index + 1]
+  });
+  let nextRow;
+  if (type == 1) {
+    // 上移
+    nextRow = state.tableRows[index - 1];
+  } else {
+    // 下移
+    nextRow = state.tableRows[index + 1];
   }
   let params = [
     {
       id: row.id,
-      sort: nextRow.sort
+      sort: nextRow.sort,
     },
     {
       id: nextRow.id,
-      sort: row.sort
-    }
-  ]
+      sort: row.sort,
+    },
+  ];
   axios
-    .post(`/apaas/system/v5/recommend/ability/sort`,[...params])
+    .post(`/apaas/system/v5/recommend/ability/sort`, [...params])
     .then((res) => {
       if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
+        ElMessage.success(res.data.msg);
+        getRoleRows();
+      } else {
+        ElMessage.error(res.data.data);
       }
     })
     .catch((err) => {
-      console.log(err)
-    })
-}
+      console.log(err);
+    });
+};
 
 const changeUseRow = (row) => {
-  axios
-    .get(`/apaas/system/v5/recommend/ability/state/${row.id}/${row.recommend_state}`)
-    .then(res => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        getRoleRows()
-      }else {
-        ElMessage.error(res.data.data)
-        row.recommend_state = row.recommend_state == 0 ? 1 : 0
-      }
-    })
-}
+  axios.get(`/apaas/system/v5/recommend/ability/state/${row.id}/${row.recommend_state}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getRoleRows();
+    } else {
+      ElMessage.error(res.data.data);
+      row.recommend_state = row.recommend_state == 0 ? 1 : 0;
+    }
+  });
+};
 
 onBeforeMount(() => {
-  getRoleRows()
-})
-    
-const {
-  headers,
-  tableRows,
-  dialogDelete,
-} = toRefs(state)
+  getRoleRows();
+});
 
+const { headers, tableRows, dialogDelete } = toRefs(state);
 </script>
 
 <style lang="scss" scoped>
@@ -258,7 +233,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -272,4 +247,4 @@ const {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/organization/directory-form.vue b/src/page/main/system/organization/directory-form.vue
index 736b54e..e3e69ee 100644
--- a/src/page/main/system/organization/directory-form.vue
+++ b/src/page/main/system/organization/directory-form.vue
@@ -5,22 +5,21 @@
     :model="directoryForm"
     :rules="directoryFormRules"
     ref="directoryRef"
-    style="max-width: 80%"
-  >
+    style="max-width: 80%">
     <el-form-item label="上级目录" prop="p_organization_id" v-if="formType === 'create'">
-      <el-tree-select 
-          v-model="directoryForm.p_organization_id" 
-          :data="orgData" 
-          :props="treeProps" 
-          :render-after-expand="false" 
-          :check-strictly="true" 
-          :disabled="directoryForm.level"
-          style="width: 80%;" />
+      <el-tree-select
+        v-model="directoryForm.p_organization_id"
+        :data="orgData"
+        :props="treeProps"
+        :render-after-expand="false"
+        :check-strictly="true"
+        :disabled="directoryForm.level"
+        style="width: 80%" />
       <el-form-item label="" style="padding-left: 16px">
-        <el-checkbox v-model="directoryForm.level" @change="isTop" label="顶级"/>
+        <el-checkbox v-model="directoryForm.level" @change="isTop" label="顶级" />
       </el-form-item>
     </el-form-item>
-    
+
     <el-form-item label="名称" prop="name">
       <el-input v-model="directoryForm.name" />
     </el-form-item>
@@ -28,98 +27,90 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance, nextTick } from 'vue'
-  const props = defineProps({
+import { reactive, ref, onMounted, onBeforeMount, nextTick } from "vue";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
+const props = defineProps({
   formType: {
-      type: String,
-      default: 'create', //false 新建 true 编辑
-    },
-  });
-  const { proxy } = getCurrentInstance()
-  const { $axios,$message } = proxy
+    type: String,
+    default: "create", //false 新建 true 编辑
+  },
+});
 
-  const directoryForm = reactive({
-    p_organization_id: '',
-    name: '',
-    level: false
-  })
+const directoryForm = reactive({
+  p_organization_id: "",
+  name: "",
+  level: false,
+});
 
-  const directoryFormRules = reactive({
-    p_organization_id: [
-      { required: true, message: '请输入上级目录', trigger: 'blur' },
-    ],
-    name: [
-      { required: true, message: '请输入名称', trigger: 'blur' },
-    ],
-  })
-  const directoryRef = ref(null)
-  const emit = defineEmits(['action'])
+const directoryFormRules = reactive({
+  p_organization_id: [{ required: true, message: "请输入上级目录", trigger: "blur" }],
+  name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+});
+const directoryRef = ref(null);
+const emit = defineEmits(["action"]);
 
-  const submitForm = async () => {
-    if (!directoryRef) return
-    await directoryRef.value.validate((valid, fields) => {
-      if (valid) {
-        emit('action', directoryForm)
-      } else {
-        emit('action',null)
-      }
-    })
-  }
-  const clearForm = () => {
-    if (!directoryRef) return
-    directoryRef.value.resetFields()
-  } 
+const submitForm = async () => {
+  if (!directoryRef) return;
+  await directoryRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit("action", directoryForm);
+    } else {
+      emit("action", null);
+    }
+  });
+};
+const clearForm = () => {
+  if (!directoryRef) return;
+  directoryRef.value.resetFields();
+};
 
-  const setForm = (data) => {
-    Object.assign(directoryForm, data);
-  }
+const setForm = (data) => {
+  Object.assign(directoryForm, data);
+};
 
-  const orgData = ref([])
-  const treeProps = {
-    label: 'name',
-    children: 'Child',
-    value: 'organization_id',
-    disabled: 'disabled'
-  }
-  const getOrgTree = () => {
-    $axios.get(`/apaas/system/v5/org/tree`)
-      .then((res) => {
-      if (res.data.code == 200) {
-          const orgDataTemp =  res.data.data || []
-          orgDataTemp.shift()
-          orgData.value = filterOrg(orgDataTemp);
-          
-      }else {
-          $message.error(res.data.data)
-      }
-      })
-  }
+const orgData = ref([]);
+const treeProps = {
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+  disabled: "disabled",
+};
+const getOrgTree = () => {
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      const orgDataTemp = res.data.data || [];
+      orgDataTemp.shift();
+      orgData.value = filterOrg(orgDataTemp);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-  const filterOrg = (data) => {
-      if(data.length > 0) {
-          data.forEach(item => {
-            item.disabled = item.data_type === 0 ? false : true;
-            if(item.Child){
-              filterOrg(item.Child)
-            }else {
-              return  
-            }
-        })
+const filterOrg = (data) => {
+  if (data.length > 0) {
+    data.forEach((item) => {
+      item.disabled = item.data_type === 0 ? false : true;
+      if (item.Child) {
+        filterOrg(item.Child);
+      } else {
+        return;
       }
-    return data;
+    });
   }
+  return data;
+};
 
-  const isTop = (data) => {
-    directoryForm.p_organization_id = data ? ' ' : ''; //空格绕过表单非空校验
-  }
+const isTop = (data) => {
+  directoryForm.p_organization_id = data ? " " : ""; //空格绕过表单非空校验
+};
 
-  onBeforeMount(() =>{
-    getOrgTree()
-  })
+onBeforeMount(() => {
+  getOrgTree();
+});
 
-  onMounted(() => {
-    
-  })
+onMounted(() => {});
 
-  defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index c1c7058..7957609 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -1,935 +1,884 @@
 <template>
-    <div class="page_container">
-        <div class="bg-breadcrumb">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item> 系统管理 </el-breadcrumb-item>
-                <el-breadcrumb-item > 组织管理 </el-breadcrumb-item>
-            </el-breadcrumb>
-        </div>
-         <div class="flex_row">
-           <div class="flex_left bgc_white">
-             <div class="tree_header">
-                 政务机构
-             </div>
-             <div class="tree_content">
-               <div class="search"> 
-                 <el-input
-                    v-model="search"
-                    placeholder="请输入组织名称搜索"
-                    :prefix-icon="Search"
-                    @input="searchChange"
-                  />
-               </div>
-               <div class="tree">
-                  <tree ref="orgTree" @action="treeAction" @select="treeSelect"></tree>
-               </div>
-             </div>
-           </div>
-           <div class="flex_right">
-             <div class="info_container bgc_white">
-                <div class="title">
-                  <span  class="icon_box">
-                    <span class="step_icon">
-                      <bg-icon icon="#bg-ic-file"></bg-icon>
-                    </span>
-                    <span>
-                      基本信息
-                    </span>
-                  </span> 
-                  <span class="can_click_text detail_btn" v-if="selectTreeDataType === 1" @click="toOrgDetail">
-                    查看详情
-                    <bg-icon style="font-size: 8px; color: #95a3ca; vertical-align: middle" icon="#bg-ic-arrow-right" />
-                  </span>
-                </div>
-                <bg-info class="info_box" v-if="selectTreeDataType === 1" :data="baseInfo"></bg-info>
-                <bg-info class="info_box" v-if="selectTreeDataType === 2" :data="baseInfo2"></bg-info>
-             </div>
-             <div class="main_container bgc_white">
-                <bg-filter-group @search="changeSearch" v-model="filter.key_word" placeholder="请输入关键字">
-                    <template v-slot:left_action>
-                      <div class="apaas_button">
-                      <el-button class="register_btn" type="primary" @click="addAccount">
-                        <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
-                          {{selectTreeDataType === 1 ? '新增组织管理员' :  '新增平台用户' }}
-                      </el-button>
-                      <el-button class="register_btn" @click="deleteBatch">
-                          批量删除
-                      </el-button>
-                      <el-button class="register_btn" @click="resetPsd">
-                          重置密码
-                      </el-button>
-                      <span class="header_info">已选择<span style="color: #202531;font-weight: bold">{{selected.length}}</span>项</span>
-                      <span class="header_info can_click_text" @click="clearSelected">清空</span>
-                    </div>
-                    </template>
-                    <template v-slot:filter_group>
-                      <div class="left-filter filter_list">
-                        <div class="filter_item">
-                          <span class="filter_title">启用状态</span>
-                          <el-select
-                            v-model="filter.state"
-                            placeholder="请选择"
-                            style="width: 300px"
-                          >
-                            <el-option
-                              v-for="(item, index) in stateOptions"
-                              :key="'pushOptions' + index"
-                              :label="item.name"
-                              :value="item.value"
-                            >
-                            </el-option>
-                          </el-select>
-                        </div>
-                      </div>
-                      <div class="right-action apaas_button">
-                        <el-button type="primary" @click="filterAction"> 查询 </el-button>
-                        <el-button type="default" @click="filterClear"> 重置 </el-button>
-                      </div>
-                    </template>
-                </bg-filter-group>
-                <div class="table_container apaas_scroll">
-                  <bg-table ref="dataTable" :headers="headers" :rows="tableRows" :isIndex="true" canEdit canEditFlag='canSelect'  :stripe="true" :select="true" @selectAc="selectRows">
-                    <template v-slot:system_account="{ row }">
-                      <span @click="goDetail(row)" class="can_click_text">
-                        {{ row.system_account }}
-                      </span>
-                    </template>
-                    <template v-slot:state="{ row }">
-                      <bg-switch @click="stateChange(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state" :disabled="row.is_admin== 4"></bg-switch>
-                    </template>
-                    <template v-slot:action="{ row }">
-                      <bg-table-btn :disabled="row.is_admin== 4" @click="editAccount(row)" class="can_click_text">
-                        编辑
-                      </bg-table-btn>
-                      <bg-table-btn :disabled="row.is_admin== 4 && userInfo.is_admin !== 4" @click="editPsdAccount(row)" class="can_click_text">
-                        修改密码
-                      </bg-table-btn>
-                      <bg-table-btn :disabled="row.is_admin== 4" @click="deleteAccount(row)" class="can_click_text">
-                        删除
-                      </bg-table-btn>
-                    </template>
-                  </bg-table>
-                  <div class="pagination_box">
-                     <bg-pagination
-                    :page="filter.page"
-                    :size="filter.limit"
-                    :total="tableTotal"
-                    @change-page="changePage"
-                    @change-size="changeSize"
-                  >
-                  </bg-pagination>
-                  </div>       
-                </div>
-              </div>
-           </div>
-        </div>
-        <el-dialog
-          v-model="dialogDirectory"
-          :title="action === 'create' ? '新增目录' : '编辑目录' "
-          width="758px"
-          :before-close="handleCloseDirectory"
-          destroy-on-close
-        >
-          <div class="dialog_form">
-            <directoryForm ref="directoryFormRef" :form-type="directoryFormType" @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"
-          destroy-on-close
-        >
-          <div class="dialog_form">
-            <orgForm ref="orgFormRef" :form-type="orgFormType" @action="getOrgFormData"></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>
-        <el-dialog
-          v-model="dialogDelNode"
-          title="删除"
-          width="520px"
-          :before-close="handleCloseDelNode"
-        >
-          <div class="dialog_form">
-            确认删除吗？
-          </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseDelNode">取消</el-button>
-              <el-button type="primary" @click="confirmDelNode">确认</el-button>
-            </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="deleteRowFlag"
-          title="删除"
-          width="520px"
-          :before-close="handleCloseRowDelete"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedRow.system_account}}</span>做删除操作。
-          </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseRowDelete">取消</el-button>
-              <el-button type="primary" @click="deleteRowConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="editFlag"
-          title="修改密码"
-          width="520px"
-          :before-close="handleCloseEdit"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedRow.system_account}}</span>做修改密码操作，修改后旧密码将无法登录。
-           
+  <div class="page_container">
+    <div class="bg-breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item> 系统管理 </el-breadcrumb-item>
+        <el-breadcrumb-item> 组织管理 </el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+    <div class="flex_row">
+      <div class="flex_left bgc_white">
+        <div class="tree_header">政务机构</div>
+        <div class="tree_content">
+          <div class="search">
+            <el-input v-model="search" placeholder="请输入组织名称搜索" :prefix-icon="Search" @input="searchChange" />
           </div>
-           <div>
-             <el-form
-                :label-position="'right'"
-                label-width="120px"
-                :model="passwordForm"
-                :rules="passwordFormRules"
-                ref="passwordRef"
-                style="max-width: 80%"
-              >
-                <el-form-item label="新密码" prop="password">
-                  <el-input v-model="passwordForm.password" :type="password_eye ? 'text' : 'password'" placeholder="请输入密码">
-                    <template #suffix>
-                      <bg-icon @click="password_eye = !password_eye" class="icon_eye"  icon="#bg-ic-eye"></bg-icon>
-                    </template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="确认新密码" prop="confirm_password">
-                  <el-input v-model="passwordForm.confirm_password" :type="confirm_eye ? 'text' : 'password'" placeholder="请确认新密码"> 
-                    <template #suffix>
-                      <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
-                    </template>
-                  </el-input>
-                </el-form-item>
-              </el-form>
+          <div class="tree">
+            <tree ref="orgTree" @action="treeAction" @select="treeSelect"></tree>
           </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseEdit">取消</el-button>
-              <el-button type="primary" @click="editConfirm">确定</el-button>
+        </div>
+      </div>
+      <div class="flex_right">
+        <div class="info_container bgc_white">
+          <div class="title">
+            <span class="icon_box">
+              <span class="step_icon">
+                <bg-icon icon="#bg-ic-file"></bg-icon>
+              </span>
+              <span> 基本信息 </span>
             </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="deleteFlag"
-          title="删除"
-          width="520px"
-          :before-close="handleCloseDelete"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; mdeleteConfirmargin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做删除操作。
-          </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseDelete">取消</el-button>
-              <el-button type="primary" @click="deleteConfirm">确定</el-button>
+            <span class="can_click_text detail_btn" v-if="selectTreeDataType === 1" @click="toOrgDetail">
+              查看详情
+              <bg-icon style="font-size: 8px; color: #95a3ca; vertical-align: middle" icon="#bg-ic-arrow-right" />
             </span>
-          </template>
-        </el-dialog>
-        <el-dialog
-          v-model="resetFlag"
-          title="重置密码"
-          width="520px"
-          :before-close="handleCloseReset"
-        >
-          <div class="warning_info">
-            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
-            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做重置密码操作。
-           
           </div>
-           <div>
-              重置密码为123456，是否继续？
+          <bg-info class="info_box" v-if="selectTreeDataType === 1" :data="baseInfo"></bg-info>
+          <bg-info class="info_box" v-if="selectTreeDataType === 2" :data="baseInfo2"></bg-info>
+        </div>
+        <div class="main_container bgc_white">
+          <bg-filter-group @search="changeSearch" v-model="filter.key_word" placeholder="请输入关键字">
+            <template v-slot:left_action>
+              <div class="apaas_button">
+                <el-button class="register_btn" type="primary" @click="addAccount">
+                  <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
+                  {{ selectTreeDataType === 1 ? "新增组织管理员" : "新增平台用户" }}
+                </el-button>
+                <el-button class="register_btn" @click="deleteBatch"> 批量删除 </el-button>
+                <el-button class="register_btn" @click="resetPsd"> 重置密码 </el-button>
+                <span class="header_info"
+                  >已选择<span style="color: #202531; font-weight: bold">{{ selected.length }}</span
+                  >项</span
+                >
+                <span class="header_info can_click_text" @click="clearSelected">清空</span>
+              </div>
+            </template>
+            <template v-slot:filter_group>
+              <div class="left-filter filter_list">
+                <div class="filter_item">
+                  <span class="filter_title">启用状态</span>
+                  <el-select v-model="filter.state" placeholder="请选择" style="width: 300px">
+                    <el-option
+                      v-for="(item, index) in stateOptions"
+                      :key="'pushOptions' + index"
+                      :label="item.name"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+              <div class="right-action apaas_button">
+                <el-button type="primary" @click="filterAction"> 查询 </el-button>
+                <el-button type="default" @click="filterClear"> 重置 </el-button>
+              </div>
+            </template>
+          </bg-filter-group>
+          <div class="table_container apaas_scroll">
+            <bg-table
+              ref="dataTable"
+              :headers="headers"
+              :rows="tableRows"
+              :isIndex="true"
+              canEdit
+              canEditFlag="canSelect"
+              :stripe="true"
+              :select="true"
+              @selectAc="selectRows">
+              <template v-slot:system_account="{ row }">
+                <span @click="goDetail(row)" class="can_click_text">
+                  {{ row.system_account }}
+                </span>
+              </template>
+              <template v-slot:state="{ row }">
+                <bg-switch
+                  @click="stateChange(row)"
+                  :labels="['否', '是']"
+                  :values="[0, 1]"
+                  v-model="row.state"
+                  :disabled="row.is_admin == 4"></bg-switch>
+              </template>
+              <template v-slot:action="{ row }">
+                <bg-table-btn :disabled="row.is_admin == 4" @click="editAccount(row)" class="can_click_text">
+                  编辑
+                </bg-table-btn>
+                <bg-table-btn
+                  :disabled="row.is_admin == 4 && userInfo.is_admin !== 4"
+                  @click="editPsdAccount(row)"
+                  class="can_click_text">
+                  修改密码
+                </bg-table-btn>
+                <bg-table-btn :disabled="row.is_admin == 4" @click="deleteAccount(row)" class="can_click_text">
+                  删除
+                </bg-table-btn>
+              </template>
+            </bg-table>
+            <div class="pagination_box">
+              <bg-pagination
+                :page="filter.page"
+                :size="filter.limit"
+                :total="tableTotal"
+                @change-page="changePage"
+                @change-size="changeSize">
+              </bg-pagination>
             </div>
-          <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="handleCloseReset">取消</el-button>
-              <el-button type="primary" @click="resetConfirm">确定</el-button>
-            </span>
-          </template>
-        </el-dialog>
+          </div>
+        </div>
+      </div>
     </div>
+    <el-dialog
+      v-model="dialogDirectory"
+      :title="action === 'create' ? '新增目录' : '编辑目录'"
+      width="758px"
+      :before-close="handleCloseDirectory"
+      destroy-on-close>
+      <div class="dialog_form">
+        <directoryForm
+          ref="directoryFormRef"
+          :form-type="directoryFormType"
+          @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"
+      destroy-on-close>
+      <div class="dialog_form">
+        <orgForm ref="orgFormRef" :form-type="orgFormType" @action="getOrgFormData"></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>
+    <el-dialog v-model="dialogDelNode" title="删除" width="520px" :before-close="handleCloseDelNode">
+      <div class="dialog_form">确认删除吗？</div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseDelNode">取消</el-button>
+          <el-button type="primary" @click="confirmDelNode">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="deleteRowFlag" title="删除" width="520px" :before-close="handleCloseRowDelete">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedRow.system_account }}</span
+        >做删除操作。
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseRowDelete">取消</el-button>
+          <el-button type="primary" @click="deleteRowConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="editFlag" title="修改密码" width="520px" :before-close="handleCloseEdit">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedRow.system_account }}</span
+        >做修改密码操作，修改后旧密码将无法登录。
+      </div>
+      <div>
+        <el-form
+          :label-position="'right'"
+          label-width="120px"
+          :model="passwordForm"
+          :rules="passwordFormRules"
+          ref="passwordRef"
+          style="max-width: 80%">
+          <el-form-item label="新密码" prop="password">
+            <el-input
+              v-model="passwordForm.password"
+              :type="password_eye ? 'text' : 'password'"
+              placeholder="请输入密码">
+              <template #suffix>
+                <bg-icon @click="password_eye = !password_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="确认新密码" prop="confirm_password">
+            <el-input
+              v-model="passwordForm.confirm_password"
+              :type="confirm_eye ? 'text' : 'password'"
+              placeholder="请确认新密码">
+              <template #suffix>
+                <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseEdit">取消</el-button>
+          <el-button type="primary" @click="editConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="deleteFlag" title="删除" width="520px" :before-close="handleCloseDelete">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; mdeleteconfirmargin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedName.join("、") }}</span
+        >做删除操作。
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseDelete">取消</el-button>
+          <el-button type="primary" @click="deleteConfirm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="resetFlag" title="重置密码" width="520px" :before-close="handleCloseReset">
+      <div class="warning_info">
+        <bg-icon
+          style="font-size: 12px; color: #a9b1c7; margin-right: 8px; vertical-align: baseline"
+          icon="#bg-ic-circle-tips"></bg-icon>
+        您正在对 <span class="danger_info">{{ selectedName.join("、") }}</span
+        >做重置密码操作。
+      </div>
+      <div>重置密码为123456，是否继续？</div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleCloseReset">取消</el-button>
+          <el-button type="primary" @click="resetConfirm">确定</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, nextTick } from 'vue'
-import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRouter } from 'vue-router';
-import tree from './tree.vue';
-import directoryForm from './directory-form.vue';
-import orgForm from './org-form.vue';
-import CryptoJS from "crypto-js"; 
-import { downloadFileFormatNew } from '@/services/helper'
-import store from '@/store'
-
-  const { proxy } = getCurrentInstance()
-  const { $axios,$message } = proxy
-  
-  const dataTable = ref(null);
-  const toOrgDetail = () => {
-    router.push({
-        path: "/system/organization/org-detail",
-        query: {
-          id: selectOrgNode.value.organization_id
-        }
-       
-      })
-  }
-  const baseInfo = reactive(
-    [
-    {
-      name: "机构类型",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织机构代码",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "机构名称",
-      value: "",
-      callback: toOrgDetail,
-      nameWidth: 130
-    },
-    {
-      name: "创建时间",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织管理员数量",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "业务系统数量",
-      value: "",
-      nameWidth: 130
-    },
-  ])
-  const baseInfo2 = reactive(
-    [{
-      name: "机构名称",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织机构代码",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "用户数",
-      value: "",
-      nameWidth: 130,
-      full: true
-    },
-  ])
-  const headers = reactive([
-        {
-          label: "账号",
-          prop: "system_account",
-          minWidth: 150
-        },
-        {
-          label: "手机号",
-          prop: "contact_phone",
-          minWidth: 150
-        },
-        {
-          label: "角色",
-          prop: "system_role",
-          minWidth: 150
-        },
-        {
-          label: "创建时间",
-          prop: "created_time",
-          minWidth: 200
-        },
-        {
-          label: "是否启用",
-          prop: "state",
-          width: 80
-        },
-        {
-          label: "操作",
-          prop: "action",
-          width: 220,
-          fixed: "right",
-        },
-      ]);
- const stateOptions = ref([
-   {
-      name: "全部",
-      value: ""
+import { Search } from "@element-plus/icons-vue";
+import { computed, onBeforeMount, nextTick, reactive, ref, toRefs } from "@vue/runtime-core";
+import { useRouter } from "vue-router";
+import tree from "./tree.vue";
+import directoryForm from "./directory-form.vue";
+import orgForm from "./org-form.vue";
+import CryptoJS from "crypto-js";
+import { downloadFileFormatNew } from "@/services/helper";
+import store from "@/store";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
+
+const dataTable = ref(null);
+const toOrgDetail = () => {
+  router.push({
+    path: "/system/organization/org-detail",
+    query: {
+      id: selectOrgNode.value.organization_id,
     },
-    {
-      name: "启用",
-      value: "1"
-    },
-    {
-      name: "禁用",
-      value: "0"
-    },
- ])
-  const tableRows = ref([]);
-  const tableTotal = ref(0);
-  const orgTree = ref(null);
-  const selectTreeData = ref(null)
-  const actionTreeData = ref(null)
-  const selectTreeDataType = ref(2);
-  const selectOrgNode = ref(null);
-  const dialogDelNode = ref(false)
-  const router = useRouter();
-  const filter = reactive({
-        state: '',
-        key_word: "",
-        page: 1,
-        limit: 10,
-      });
-  const deleteFlag = ref(false)
-  const deleteRowFlag = ref(false)
-  const resetFlag = ref(false)
-  const selectedRow = ref({})
-  const selected = ref([])
-  const selectedName = ref([])
-  const editFlag = ref(false)
-  const password_eye = ref(false)
-  const confirm_eye = ref(false)
-  const passwordRef = ref(null)
-  const passwordForm = reactive({
-    password: '',
-    confirm_password: '',
-  })
-  const search = ref('')
-  const userInfo = computed(() => {
-    return store.state.userInfo
-  })
-  const validatePass = (rule, value, callback) => {
-    if (value !== passwordForm.password) {
-      callback(new Error("密码输入不一致"))
-    } else {
-      callback()
-    }
-  }
-
-  const passwordFormRules = reactive({
-    password: [
-      { required: true, message: '请输入密码', trigger: 'blur' },
-      {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
-    ],
-    confirm_password: [
-      { required: true, message: '请确认密码', trigger: 'blur' },
-      { validator: validatePass, trigger: 'blur' }
-    ],
-  })
-  
-  const addAccount = () => {
-    if(selectTreeDataType.value === 1) {
-      router.push({
-        path: "/system/organization/org-user",
-        query: {
-          orgId: selectOrgNode.value.organization_id
-        }
-      })
-    }else {
-      router.push({
-        path: "/system/organization/platform-user",
-       
-      })
-    }
-    
-  }
-
-
-  const changeSize = (size) => {
-    filter.limit = size;
-    changePage(1)
-  }
-
-  const changePage = (page) => {
-    filter.page = page;
-    getTableRows();
-  }
-
-  const changeSearch = (val) => {
-  filter.key_word = val
-    changePage(1)
-  } // 表格关键字筛选
-
-  const filterAction = () => {
-    changePage(1)
-  } // 查询按钮
-
-  const filterClear = () => {
-    filter.state = "";
-    filter.key_word = "";
-    filter.limit = 10
-    filter.page = 1
-    changePage(1)
-  } // 重置筛选项
-
-  const dialogDirectory = ref(false)
-  const directoryFormType = ref('create')
-  const orgFormType = ref('create')
-  const handleCloseDirectory = () => {
-    dialogDirectory.value = false;
-  }
-
-  const directoryFormRef = ref(null)
-  const saveDirectory = () => {
-    directoryFormRef.value.submitForm();
-  }
-
-  //新增/编剧目录
-  const getDirectoryFromData = (data) => {
-    
-    if(directoryFormType.value === 'create') {
-      const params = {
-        p_organization_id: data.level ? "" : data.p_organization_id,
-        name: data.name,
-        data_type: 0
+  });
+};
+const baseInfo = reactive([
+  {
+    name: "机构类型",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织机构代码",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "机构名称",
+    value: "",
+    callback: toOrgDetail,
+    nameWidth: 130,
+  },
+  {
+    name: "创建时间",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织管理员数量",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "业务系统数量",
+    value: "",
+    nameWidth: 130,
+  },
+]);
+const baseInfo2 = reactive([
+  {
+    name: "机构名称",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织机构代码",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "用户数",
+    value: "",
+    nameWidth: 130,
+    full: true,
+  },
+]);
+const headers = reactive([
+  {
+    label: "账号",
+    prop: "system_account",
+    minWidth: 150,
+  },
+  {
+    label: "手机号",
+    prop: "contact_phone",
+    minWidth: 150,
+  },
+  {
+    label: "角色",
+    prop: "system_role",
+    minWidth: 150,
+  },
+  {
+    label: "创建时间",
+    prop: "created_time",
+    minWidth: 200,
+  },
+  {
+    label: "是否启用",
+    prop: "state",
+    width: 80,
+  },
+  {
+    label: "操作",
+    prop: "action",
+    width: 220,
+    fixed: "right",
+  },
+]);
+const stateOptions = ref([
+  {
+    name: "全部",
+    value: "",
+  },
+  {
+    name: "启用",
+    value: "1",
+  },
+  {
+    name: "禁用",
+    value: "0",
+  },
+]);
+const tableRows = ref([]);
+const tableTotal = ref(0);
+const orgTree = ref(null);
+const selectTreeData = ref(null);
+const actionTreeData = ref(null);
+const selectTreeDataType = ref(2);
+const selectOrgNode = ref(null);
+const dialogDelNode = ref(false);
+const router = useRouter();
+const filter = reactive({
+  state: "",
+  key_word: "",
+  page: 1,
+  limit: 10,
+});
+const deleteFlag = ref(false);
+const deleteRowFlag = ref(false);
+const resetFlag = ref(false);
+const selectedRow = ref({});
+const selected = ref([]);
+const selectedName = ref([]);
+const editFlag = ref(false);
+const password_eye = ref(false);
+const confirm_eye = ref(false);
+const passwordRef = ref(null);
+const passwordForm = reactive({
+  password: "",
+  confirm_password: "",
+});
+const search = ref("");
+const userInfo = computed(() => {
+  return store.state.userInfo;
+});
+const validatePass = (rule, value, callback) => {
+  if (value !== passwordForm.password) {
+    callback(new Error("密码输入不一致"));
+  } else {
+    callback();
+  }
+};
+
+const passwordFormRules = reactive({
+  password: [
+    { required: true, message: "请输入密码", trigger: "blur" },
+    { min: 8, message: "密码长度不得低于8位", trigger: "blur" },
+  ],
+  confirm_password: [
+    { required: true, message: "请确认密码", trigger: "blur" },
+    { validator: validatePass, trigger: "blur" },
+  ],
+});
+
+const addAccount = () => {
+  if (selectTreeDataType.value === 1) {
+    router.push({
+      path: "/system/organization/org-user",
+      query: {
+        orgId: selectOrgNode.value.organization_id,
+      },
+    });
+  } else {
+    router.push({
+      path: "/system/organization/platform-user",
+    });
+  }
+};
+
+const changeSize = (size) => {
+  filter.limit = size;
+  changePage(1);
+};
+
+const changePage = (page) => {
+  filter.page = page;
+  getTableRows();
+};
+
+const changeSearch = (val) => {
+  filter.key_word = val;
+  changePage(1);
+}; // 表格关键字筛选
+
+const filterAction = () => {
+  changePage(1);
+}; // 查询按钮
+
+const filterClear = () => {
+  filter.state = "";
+  filter.key_word = "";
+  filter.limit = 10;
+  filter.page = 1;
+  changePage(1);
+}; // 重置筛选项
+
+const dialogDirectory = ref(false);
+const directoryFormType = ref("create");
+const orgFormType = ref("create");
+const handleCloseDirectory = () => {
+  dialogDirectory.value = false;
+};
+
+const directoryFormRef = ref(null);
+const saveDirectory = () => {
+  directoryFormRef.value.submitForm();
+};
+
+//新增/编剧目录
+const getDirectoryFromData = (data) => {
+  if (directoryFormType.value === "create") {
+    const params = {
+      p_organization_id: data.level ? "" : data.p_organization_id,
+      name: data.name,
+      data_type: 0,
+    };
+    axios.post(`/apaas/system/v5/org/add`, params).then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.msg);
+        orgTree.value.getOrgTree(res.data.data.id);
+      } else {
+        ElMessage.error(res.data.data);
       }
-      $axios.post(`/apaas/system/v5/org/add`, params)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(res.data.data.id);
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseDirectory()
-        })
-    }else if(directoryFormType.value === 'edit') {
-      const params = {
-        name: data.name,
-        data_type: 0
+      handleCloseDirectory();
+    });
+  } else if (directoryFormType.value === "edit") {
+    const params = {
+      name: data.name,
+      data_type: 0,
+    };
+    axios.put(`/apaas/system/v5/org/${actionTreeData.value.id}`, params).then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.msg);
+        orgTree.value.getOrgTree(actionTreeData.value.id);
+      } else {
+        ElMessage.error(res.data.data);
       }
-      $axios.put(`/apaas/system/v5/org/${actionTreeData.value.id}`, params)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(actionTreeData.value.id);
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseDirectory()
-        })
-    }
-    
-  }
-
-  const dialogOrg = ref(false) 
-  const handleCloseOrg = () => {
-    dialogOrg.value = false;
-  }
-
-  const orgFormRef = ref(null)
-  const saveOrg = () => {
-    orgFormRef.value.submitForm();
-  }
-
-  //新增/编辑组织
-  const getOrgFormData = (data) => {
-    if(orgFormType.value === 'create') {
-      const params = {
-        p_organization_id: data.level ? "" : data.p_organization_id,
-        name: data.name,
-        organization_code: data.organization_code,
-        description: data.description,
-        attachment:  data.attachment && data.attachment.length > 0 ? data.attachment.map(item => item.url).join(',') : '',
-        data_type: 1
+      handleCloseDirectory();
+    });
+  }
+};
+
+const dialogOrg = ref(false);
+const handleCloseOrg = () => {
+  dialogOrg.value = false;
+};
+
+const orgFormRef = ref(null);
+const saveOrg = () => {
+  orgFormRef.value.submitForm();
+};
+
+//新增/编辑组织
+const getOrgFormData = (data) => {
+  if (orgFormType.value === "create") {
+    const params = {
+      p_organization_id: data.level ? "" : data.p_organization_id,
+      name: data.name,
+      organization_code: data.organization_code,
+      description: data.description,
+      attachment:
+        data.attachment && data.attachment.length > 0 ? data.attachment.map((item) => item.url).join(",") : "",
+      data_type: 1,
+    };
+    axios.post(`/apaas/system/v5/org/add`, params).then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.msg);
+        orgTree.value.getOrgTree(res.data.data.id);
+      } else {
+        ElMessage.error(res.data.data);
       }
-      $axios.post(`/apaas/system/v5/org/add`, params)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(res.data.data.id);
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseOrg()
-        })
-    }else if(orgFormType.value === 'edit') {
-      const params = {
-        // p_organization_id: data.level ? "" : data.p_organization_id,
-        name: data.name,
-        organization_code: data.organization_code,
-        description: data.description,
-        attachment:  data.attachment && data.attachment.length > 0 ? data.attachment.map(item => item.url).join(',') : '',
-        data_type: 1
+      handleCloseOrg();
+    });
+  } else if (orgFormType.value === "edit") {
+    const params = {
+      // p_organization_id: data.level ? "" : data.p_organization_id,
+      name: data.name,
+      organization_code: data.organization_code,
+      description: data.description,
+      attachment:
+        data.attachment && data.attachment.length > 0 ? data.attachment.map((item) => item.url).join(",") : "",
+      data_type: 1,
+    };
+    axios.put(`/apaas/system/v5/org/${actionTreeData.value.id}`, params).then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.msg);
+        orgTree.value.getOrgTree(actionTreeData.value.id);
+      } else {
+        ElMessage.error(res.data.data);
       }
-      $axios.put(`/apaas/system/v5/org/${actionTreeData.value.id}`, params)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(actionTreeData.value.id);
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseOrg()
-        })
-    }
-    
-  }
-
-  const handleCloseDelNode = () => {
-    dialogDelNode.value = false;
-  }
-
-  //删除目录/组织
-  const confirmDelNode = () => {
-      $axios.delete(`/apaas/system/v5/org/${actionTreeData.value.id}`)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(actionTreeData.value.id === selectTreeData.value.id ? null : selectTreeData.value.id);
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseDelNode()
-        })
+      handleCloseOrg();
+    });
   }
+};
 
-  const moveOrg = (params) => {
-     $axios.put(`/apaas/system/v5/org/sort`,params)
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            orgTree.value.getOrgTree(selectTreeData.value.id);
-          }else {
-            $message.error(res.data.data)
-          }
-        })
-  }
+const handleCloseDelNode = () => {
+  dialogDelNode.value = false;
+};
 
-  const action = ref('create')
-  const treeAction = (data) => {
-    action.value = data.action
-    if(data.action === 'create' || data.action === 'edit') {
-      if(data.type === 'org') {
-        orgFormType.value = data.action;
-        dialogOrg.value = true;
-        nextTick(() => {
-          if(data.data) {
-            if(data.action === 'edit') {
-               orgFormRef.value.setForm({
-                 name: data.data.value.name,
-                 p_organization_id: data.data.value.p_organization_id,
-                 level: data.data.value.p_organization_id ? false : true,
-                 organization_code: data.data.value.organization_code,
-                 description: data.data.value.description,
-                 attachment: data.data.value.attachment.split(',').map(i => {return {name: downloadFileFormatNew(i),url: i}})
-                 });
-            }else if(data.action === 'create') {
-              orgFormRef.value.setForm({p_organization_id: data.data.value.organization_id});
-            }
-            
-          }
-        })
-      }else {
-        directoryFormType.value = data.action;
-        dialogDirectory.value = true;
-        nextTick(()=> {
-          if(data.data) {
-            if(data.action === 'edit') {
-              directoryFormRef.value.setForm({name: data.data.value.name});
-            }else if(data.action === 'create') {
-              directoryFormRef.value.setForm({p_organization_id: data.data.value.organization_id});
-            }
-            
-        }
-        })
-      }
-    }else if(data.action === 'delete'){
-      dialogDelNode.value = true;
-    }else if(data.action === 'mvup' || data.action === 'mvdown') {
-      moveOrg(data.data);
-    }
-  }
-
-  const treeSelect = (data) => {
-    if(data.type === 'action') {
-      actionTreeData.value = data.data.value;
-    }else {
-      selectTreeData.value = data.data.value;
+//删除目录/组织
+const confirmDelNode = () => {
+  axios.delete(`/apaas/system/v5/org/${actionTreeData.value.id}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      orgTree.value.getOrgTree(actionTreeData.value.id === selectTreeData.value.id ? null : selectTreeData.value.id);
+    } else {
+      ElMessage.error(res.data.data);
     }
-     
-    if(data.type === 'click' && (data.data.value.data_type === 1 || data.data.value.data_type === 2)) {
-      selectTreeDataType.value = data.data.value.data_type;
-      selectOrgNode.value = data.data.value;
-      getTableRows();
+    handleCloseDelNode();
+  });
+};
+
+const moveOrg = (params) => {
+  axios.put(`/apaas/system/v5/org/sort`, params).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      orgTree.value.getOrgTree(selectTreeData.value.id);
+    } else {
+      ElMessage.error(res.data.data);
     }
-  }
-
-  const getTableRows = () => {
-    let params = {...filter, organization_id: selectTreeData.value.organization_id,data_type: selectTreeData.value.data_type}
-      $axios.get(
-          `/apaas/system/v5/org/detail`,
-          {
-            params
-          }
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            tableRows.value = (res.data.data.org_users.data || []).map(item => {
-                item.system_role = item.system_role ? item.system_role.join('、') : '-';
-                return item;
+  });
+};
+
+const action = ref("create");
+const treeAction = (data) => {
+  action.value = data.action;
+  if (data.action === "create" || data.action === "edit") {
+    if (data.type === "org") {
+      orgFormType.value = data.action;
+      dialogOrg.value = true;
+      nextTick(() => {
+        if (data.data) {
+          if (data.action === "edit") {
+            orgFormRef.value.setForm({
+              name: data.data.value.name,
+              p_organization_id: data.data.value.p_organization_id,
+              level: data.data.value.p_organization_id ? false : true,
+              organization_code: data.data.value.organization_code,
+              description: data.data.value.description,
+              attachment: data.data.value.attachment.split(",").map((i) => {
+                return { name: downloadFileFormatNew(i), url: i };
+              }),
             });
-            tableRows.value.forEach(e => {
-              if (e.is_admin == 4 && userInfo.value.is_admin != 4) {
-                e.canSelect = 1
-              }else {
-                e.canSelect = 0
-              }
-            })
-            tableTotal.value = res.data.data.org_users.total;
-            if(params.data_type === 1) {
-              baseInfo[0].value = res.data.data.org_info.organization_type;
-              baseInfo[1].value = res.data.data.org_info.organization_code;
-              baseInfo[2].value = res.data.data.org_info.name;
-              baseInfo[3].value = res.data.data.org_info.created_time;
-              baseInfo[4].value = res.data.data.org_info.org_admin_number;
-              baseInfo[5].value = res.data.data.org_info.business_system_number;
-            }else {
-              baseInfo2[0].value = res.data.data.org_info.name;
-              baseInfo2[1].value = res.data.data.org_info.organization_code;
-              baseInfo2[2].value = res.data.data.org_info.platform_users_number;
-            }
-            console.log(baseInfo)
-            
-          }else {
-            $message.error(res.data.data)
+          } else if (data.action === "create") {
+            orgFormRef.value.setForm({ p_organization_id: data.data.value.organization_id });
           }
-        })
-  }
-
-  const searchChange = (val) => {
-    orgTree.value.filterTree(val);
-  }
-
-  const goDetail = (params) => {
-     router.push({
-        path: "/system/organization/user-detail",
-        query: {
-          id: params.id
         }
-      })
-  }
-
-  const stateChange = (row) => {
-    if (row.is_admin== 4) {
-      return
-    }
-    const state = row.state.toString(); 
-      $axios.post(
-          `/apaas/system/v5/user/state/${row.id}/${state}`,
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            $message.success(res.data.msg)
-            getTableRows()
-          }else {
-            $message.error(res.data.data)
-            row.state = row.state == 0 ? 1 : 0
+      });
+    } else {
+      directoryFormType.value = data.action;
+      dialogDirectory.value = true;
+      nextTick(() => {
+        if (data.data) {
+          if (data.action === "edit") {
+            directoryFormRef.value.setForm({ name: data.data.value.name });
+          } else if (data.action === "create") {
+            directoryFormRef.value.setForm({ p_organization_id: data.data.value.organization_id });
           }
-        })
+        }
+      });
+    }
+  } else if (data.action === "delete") {
+    dialogDelNode.value = true;
+  } else if (data.action === "mvup" || data.action === "mvdown") {
+    moveOrg(data.data);
   }
+};
 
-  const editPsdAccount = (data) => {
-      selectedRow.value = data;
-      editFlag.value = true;
+const treeSelect = (data) => {
+  if (data.type === "action") {
+    actionTreeData.value = data.data.value;
+  } else {
+    selectTreeData.value = data.data.value;
   }
 
-  const handleCloseEdit = () => {
-      if (!passwordRef) return
-            passwordRef.value.resetFields()
-      editFlag.value = false;
+  if (data.type === "click" && (data.data.value.data_type === 1 || data.data.value.data_type === 2)) {
+    selectTreeDataType.value = data.data.value.data_type;
+    selectOrgNode.value = data.data.value;
+    getTableRows();
   }
- const editConfirm = () => {
-   if (!passwordRef) return
-     passwordRef.value.validate((valid, fields) => {
-      if (valid) {
-          $axios.post(
-          `/apaas/system/v5/user/editpwd`,
-          {
-          id: selectedRow.value.id,
-          password: CryptoJS.AES.encrypt(passwordForm.password,"swuE9cmCZQwrkYRV").toString()
-          }
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseEdit();
-        })
-        
-      } 
+};
+
+const getTableRows = () => {
+  let params = {
+    ...filter,
+    organization_id: selectTreeData.value.organization_id,
+    data_type: selectTreeData.value.data_type,
+  };
+  axios
+    .get(`/apaas/system/v5/org/detail`, {
+      params,
     })
-  }
-
-  const deleteAccount = (data) => {
-    if(data.state === 0) {
-      selectedRow.value = data;
-      deleteRowFlag.value = true;
-    }else {
-      $message.error('当前状态已启用，不可删除！')
-    }
-     
-  }
-
-  const handleCloseRowDelete = () => {
-      deleteRowFlag.value = false;
-  }
-
-  const deleteRowConfirm = () => {
-    $axios.delete(
-          `/apaas/system/v5/user/delete`,{data: {ids: [selectedRow.value.id]}}
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
+    .then((res) => {
+      if (res.data.code == 200) {
+        tableRows.value = (res.data.data.org_users.data || []).map((item) => {
+          item.system_role = item.system_role ? item.system_role.join("、") : "-";
+          return item;
+        });
+        tableRows.value.forEach((e) => {
+          if (e.is_admin == 4 && userInfo.value.is_admin != 4) {
+            e.canSelect = 1;
+          } else {
+            e.canSelect = 0;
           }
-          handleCloseRowDelete();
-        })
-  }
-
-  const editAccount = (data) => {
-    if(selectTreeDataType.value === 1) {
-       router.push({
-        path: "/system/organization/org-user",
-        query: {
-          id: data.id
-        }
-      })
-    } else { router.push({
-        path: "/system/organization/platform-user",
-        query: {
-          id: data.id
+        });
+        tableTotal.value = res.data.data.org_users.total;
+        if (params.data_type === 1) {
+          baseInfo[0].value = res.data.data.org_info.organization_type;
+          baseInfo[1].value = res.data.data.org_info.organization_code;
+          baseInfo[2].value = res.data.data.org_info.name;
+          baseInfo[3].value = res.data.data.org_info.created_time;
+          baseInfo[4].value = res.data.data.org_info.org_admin_number;
+          baseInfo[5].value = res.data.data.org_info.business_system_number;
+        } else {
+          baseInfo2[0].value = res.data.data.org_info.name;
+          baseInfo2[1].value = res.data.data.org_info.organization_code;
+          baseInfo2[2].value = res.data.data.org_info.platform_users_number;
         }
-      })
-      
-    } 
-  }
+        console.log(baseInfo);
+      } else {
+        ElMessage.error(res.data.data);
+      }
+    });
+};
+
+const searchChange = (val) => {
+  orgTree.value.filterTree(val);
+};
+
+const goDetail = (params) => {
+  router.push({
+    path: "/system/organization/user-detail",
+    query: {
+      id: params.id,
+    },
+  });
+};
 
-  const handleCloseDelete = () => {
-      deleteFlag.value = false;
+const stateChange = (row) => {
+  if (row.is_admin == 4) {
+    return;
   }
-
-  const deleteConfirm = () => {
-    const ids = selected.value.map(item => item.id)
-     $axios.delete(
-          `/apaas/system/v5/user/delete`,{data: {ids: ids}}
-        )
+  const state = row.state.toString();
+  axios.post(`/apaas/system/v5/user/state/${row.id}/${state}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+      row.state = row.state == 0 ? 1 : 0;
+    }
+  });
+};
+
+const editPsdAccount = (data) => {
+  selectedRow.value = data;
+  editFlag.value = true;
+};
+
+const handleCloseEdit = () => {
+  if (!passwordRef) return;
+  passwordRef.value.resetFields();
+  editFlag.value = false;
+};
+const editConfirm = () => {
+  if (!passwordRef) return;
+  passwordRef.value.validate((valid, fields) => {
+    if (valid) {
+      axios
+        .post(`/apaas/system/v5/user/editpwd`, {
+          id: selectedRow.value.id,
+          password: CryptoJS.AES.encrypt(passwordForm.password, "swuE9cmCZQwrkYRV").toString(),
+        })
         .then((res) => {
           if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
+            ElMessage.success(res.data.msg);
+          } else {
+            ElMessage.error(res.data.data);
           }
-          handleCloseDelete();
-        })
-  }
-
-  const deleteBatch = () => {
-    if(selectedName.value.length > 0){
-      deleteFlag.value = true;
-    }else {
-       $message.error('请先选择需要操作的数据!')
+          handleCloseEdit();
+        });
     }
-      
-  }
-
-  const handleCloseReset = () => {
-      resetFlag.value = false;
-  }
-
-  const resetPsd = () => {
-    if(selectedName.value.length > 0){
-       resetFlag.value = true;
-    }else {
-       $message.error('请先选择需要操作的数据!')
+  });
+};
+
+const deleteAccount = (data) => {
+  if (data.state === 0) {
+    selectedRow.value = data;
+    deleteRowFlag.value = true;
+  } else {
+    ElMessage.error("当前状态已启用，不可删除！");
+  }
+};
+
+const handleCloseRowDelete = () => {
+  deleteRowFlag.value = false;
+};
+
+const deleteRowConfirm = () => {
+  axios.delete(`/apaas/system/v5/user/delete`, { data: { ids: [selectedRow.value.id] } }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
     }
-      
-  }
-
-  const resetConfirm = () => {
-    const ids = selected.value.map(item => item.id)
-     $axios.post(
-          `/apaas/system/v5/user/resetpwd`,{ids: ids}
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-             $message.success(res.data.msg)
-             getTableRows()
-          }else {
-            $message.error(res.data.data)
-          }
-          handleCloseReset();
-        })
-  }
-
-  const selectRows = (data) => {
-    selected.value = data.selection;
-    selectedName.value = data.selection.map(item => item.system_account)
-  }
-
-  const clearSelected = () => {
-    dataTable.value.clearTable();
-  }
-
-  
+    handleCloseRowDelete();
+  });
+};
 
-  onBeforeMount(() => {
-   
-  })
+const editAccount = (data) => {
+  if (selectTreeDataType.value === 1) {
+    router.push({
+      path: "/system/organization/org-user",
+      query: {
+        id: data.id,
+      },
+    });
+  } else {
+    router.push({
+      path: "/system/organization/platform-user",
+      query: {
+        id: data.id,
+      },
+    });
+  }
+};
+
+const handleCloseDelete = () => {
+  deleteFlag.value = false;
+};
+
+const deleteConfirm = () => {
+  const ids = selected.value.map((item) => item.id);
+  axios.delete(`/apaas/system/v5/user/delete`, { data: { ids: ids } }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+    handleCloseDelete();
+  });
+};
+
+const deleteBatch = () => {
+  if (selectedName.value.length > 0) {
+    deleteFlag.value = true;
+  } else {
+    ElMessage.error("请先选择需要操作的数据!");
+  }
+};
+
+const handleCloseReset = () => {
+  resetFlag.value = false;
+};
+
+const resetPsd = () => {
+  if (selectedName.value.length > 0) {
+    resetFlag.value = true;
+  } else {
+    ElMessage.error("请先选择需要操作的数据!");
+  }
+};
+
+const resetConfirm = () => {
+  const ids = selected.value.map((item) => item.id);
+  axios.post(`/apaas/system/v5/user/resetpwd`, { ids: ids }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      getTableRows();
+    } else {
+      ElMessage.error(res.data.data);
+    }
+    handleCloseReset();
+  });
+};
 
+const selectRows = (data) => {
+  selected.value = data.selection;
+  selectedName.value = data.selection.map((item) => item.system_account);
+};
 
+const clearSelected = () => {
+  dataTable.value.clearTable();
+};
 
+onBeforeMount(() => {});
 </script>
 
 <style scoped>
 .tree_header {
   height: 40px;
   line-height: 40px;
-	background-color: #f7f7f9;
-	border-radius: 6px 6px 0px 0px;
+  background-color: #f7f7f9;
+  border-radius: 6px 6px 0px 0px;
   font-size: 16px;
-	letter-spacing: 0px;
-	color: #202531;
+  letter-spacing: 0px;
+  color: #202531;
   padding-left: 16px;
 }
 .tree_content {
@@ -944,7 +893,7 @@ import store from '@/store'
   height: calc(100% - 65px);
   /* padding: 5px; */
 }
-.tree :deep() .el-tree-node>.el-tree-node__children {
+.tree :deep() .el-tree-node > .el-tree-node__children {
   overflow: unset;
 }
 .flex_right {
@@ -957,7 +906,7 @@ import store from '@/store'
 }
 .title {
   font-size: 18px;
-	color: #202531;
+  color: #202531;
   font-weight: bold;
   margin-bottom: 10px;
   max-width: 960px;
@@ -966,8 +915,8 @@ import store from '@/store'
   align-items: center;
 }
 .detail_btn {
-	font-size: 14px;
-	font-weight: normal;
+  font-size: 14px;
+  font-weight: normal;
 }
 .icon_box {
   display: flex;
@@ -1005,8 +954,7 @@ import store from '@/store'
 .filter-group .right-action .el-button {
   width: 64px;
 }
-          
-        
+
 .table_container {
   height: calc(100% - 20px);
   overflow: auto;
@@ -1014,10 +962,9 @@ import store from '@/store'
 }
 
 .bg-pagination {
-  bottom: unset
+  bottom: unset;
 }
 .dialog_form {
   padding: 24px 8px 6px;
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/organization/org-detail/index.vue b/src/page/main/system/organization/org-detail/index.vue
index acb3e00..0f3460c 100644
--- a/src/page/main/system/organization/org-detail/index.vue
+++ b/src/page/main/system/organization/org-detail/index.vue
@@ -1,211 +1,205 @@
 <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 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="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" v-for="(item, index) in fileList" :key="'file_'+index">
-                          <span><bg-icon  style="font-size: 24px" :icon="'#bg-ic-'+formatFile(item)"></bg-icon></span>
-                          <span class="file_name">{{downloadFileFormatNew(item)}}</span>
-                          <span class="fr download_btn">
-                            <el-button type="primary" @click="downloadFile(item)"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-                </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="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="filter.page"
-                        :size="filter.limit"
-                        :total="tableTotal"
-                        @change-page="changePage"
-                        @change-size="changeSize"
-                      >
-                      </bg-pagination>
-                  </div>       
-                </div>
+              <div class="file_item pl-1" v-for="(item, index) in fileList" :key="'file_' + index">
+                <span><bg-icon style="font-size: 24px" :icon="'#bg-ic-' + formatFile(item)"></bg-icon></span>
+                <span class="file_name">{{ downloadFileFormatNew(item) }}</span>
+                <span class="fr download_btn">
+                  <el-button type="primary" @click="downloadFile(item)"
+                    ><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="filter.page"
+              :size="filter.limit"
+              :total="tableTotal"
+              @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 { useRoute } from 'vue-router';
-import { downloadFileFormatNew } from '@/services/helper'
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, toRefs, ref, computed, onBeforeMount } from "vue";
+import { useRoute } from "vue-router";
+import { downloadFileFormatNew } from "@/services/helper";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 
-const baseInfo = reactive(
-    [
-    {
-      name: "机构名称",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织机构代码",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织管理员数量",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "业务系统数量",
-      value: "",
-      nameWidth: 130
-    },
-    {
-      name: "组织描述",
-      value: "",
-      nameWidth: 130
-    },
-  ])
+const baseInfo = reactive([
+  {
+    name: "机构名称",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织机构代码",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织管理员数量",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "业务系统数量",
+    value: "",
+    nameWidth: 130,
+  },
+  {
+    name: "组织描述",
+    value: "",
+    nameWidth: 130,
+  },
+]);
 
-  const headers = reactive([
-        {
-          label: "业务系统名称",
-          prop: "business_name",
-        },
-        {
-          label: "是否启用",
-          prop: "state",
-        },
-        {
-          label: "业务系统账号",
-          prop: "system_account",
-        },
-      ])
- 
-  const tableRows = ref([])
-  const fileList = ref([])
-  const filter = reactive({
-        page: 1,
-        limit: 10,
-      });
-  const tableTotal = ref(0);
+const headers = reactive([
+  {
+    label: "业务系统名称",
+    prop: "business_name",
+  },
+  {
+    label: "是否启用",
+    prop: "state",
+  },
+  {
+    label: "业务系统账号",
+    prop: "system_account",
+  },
+]);
 
-  const changeSize = (size) => {
-    filter.limit = size;
-    changePage(1)
-  }
+const tableRows = ref([]);
+const fileList = ref([]);
+const filter = reactive({
+  page: 1,
+  limit: 10,
+});
+const tableTotal = ref(0);
 
-  const changePage = (page) => {
-    filter.page = page;
-    getSystemInfo();
-  }
+const changeSize = (size) => {
+  filter.limit = size;
+  changePage(1);
+};
 
-  const downloadFile = (data) => {
-    const a = document.createElement("a"); // 创建a标签
-      a.setAttribute("download", ""); // download属性
-      a.setAttribute("href", data); // href链接
-      a.click(); // 自执行点击事件
-  }
+const changePage = (page) => {
+  filter.page = page;
+  getSystemInfo();
+};
 
-  const formatFile = (url) => {
-    const file = url.split('.')[1];
-    let icon = ''
-    if(('docx').indexOf(file) !== -1) {
-      icon = 'c-file-doc'
-    }else if(('xlsx').indexOf(file) !== -1) {
-      icon = 'c-file-xlsx'
-    }else if(('pdf').indexOf(file) !== -1) {
-      icon = 'c-file-pdf'
-    }else if(('txt').indexOf(file) !== -1) {
-      icon = 'c-file-txt'
-    }else if(('zip').indexOf(file) !== -1) {
-      icon = 'c-file-zip'
-    }else if(('jpg,png').indexOf(file) !== -1) {
-      icon = 'c-file-image'
-    }else {
-      icon = 'txt'
-    }
-    return icon;
-  }
+const downloadFile = (data) => {
+  const a = document.createElement("a"); // 创建a标签
+  a.setAttribute("download", ""); // download属性
+  a.setAttribute("href", data); // href链接
+  a.click(); // 自执行点击事件
+};
 
-  const getDetail = () => {
-      $axios.get(`/apaas/system/v5/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`)
-                  .then((res) => {
-                  if (res.data.code == 200) {
-                      const detail = res.data.data.org_info;
-                      baseInfo[0].value = detail.name;
-                      baseInfo[1].value = detail.organization_code;
-                      baseInfo[2].value = detail.org_admin_number;
-                      baseInfo[3].value = detail.business_system_number;
-                      baseInfo[4].value = detail.description;
-                      fileList.value = detail.attachment ? detail.attachment.split(',') : [];
-                  }else {
-                      $message.error(res.data.data)
-                  }
-              })
+const formatFile = (url) => {
+  const file = url.split(".")[1];
+  let icon = "";
+  if ("docx".indexOf(file) !== -1) {
+    icon = "c-file-doc";
+  } else if ("xlsx".indexOf(file) !== -1) {
+    icon = "c-file-xlsx";
+  } else if ("pdf".indexOf(file) !== -1) {
+    icon = "c-file-pdf";
+  } else if ("txt".indexOf(file) !== -1) {
+    icon = "c-file-txt";
+  } else if ("zip".indexOf(file) !== -1) {
+    icon = "c-file-zip";
+  } else if ("jpg,png".indexOf(file) !== -1) {
+    icon = "c-file-image";
+  } else {
+    icon = "txt";
   }
+  return icon;
+};
 
-  const getSystemInfo = () => {
-    console.log(11111111)
-    const params = {...filter,organization_id: route.query.id}
-    $axios.get(`/apaas/system/v5/org/business/msg`,{params})
-            .then((res) => {
-            if (res.data.code == 200) {
-              tableRows.value = res.data.data || [];
-              tableTotal.value = res.data.total;
-            }else {
-                $message.error(res.data.data)
-            }
-        })
-  }
+const getDetail = () => {
+  axios
+    .get(`/apaas/system/v5/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`)
+    .then((res) => {
+      if (res.data.code == 200) {
+        const detail = res.data.data.org_info;
+        baseInfo[0].value = detail.name;
+        baseInfo[1].value = detail.organization_code;
+        baseInfo[2].value = detail.org_admin_number;
+        baseInfo[3].value = detail.business_system_number;
+        baseInfo[4].value = detail.description;
+        fileList.value = detail.attachment ? detail.attachment.split(",") : [];
+      } else {
+        ElMessage.error(res.data.data);
+      }
+    });
+};
 
-  onBeforeMount(() => {
-     if(route.query.id) {
-        getDetail()
-        getSystemInfo()
+const getSystemInfo = () => {
+  console.log(11111111);
+  const params = { ...filter, organization_id: route.query.id };
+  axios.get(`/apaas/system/v5/org/business/msg`, { params }).then((res) => {
+    if (res.data.code == 200) {
+      tableRows.value = res.data.data || [];
+      tableTotal.value = res.data.total;
+    } else {
+      ElMessage.error(res.data.data);
     }
- })
+  });
+};
+
+onBeforeMount(() => {
+  if (route.query.id) {
+    getDetail();
+    getSystemInfo();
+  }
+});
 </script>
 
 <style scoped>
 .page_content {
-    padding: 15px;
-    overflow: auto;
-    font-size: 14px;
-	  color: #202531;
+  padding: 15px;
+  overflow: auto;
+  font-size: 14px;
+  color: #202531;
 }
 .info_content {
-    /* display: flex; */
+  /* display: flex; */
 }
 .org_file {
   margin-top: 15px;
@@ -213,26 +207,26 @@ const baseInfo = reactive(
 .file_item {
   height: 48px;
   line-height: 48px;
-	background-color: #fafafa;
-	border-radius: 4px;
+  background-color: #fafafa;
+  border-radius: 4px;
   font-size: 14px;
   margin-bottom: 8px;
 }
 .file_name {
   padding-left: 10px;
-	color: #202531;
+  color: #202531;
 }
 .download_btn {
   padding-right: 4px;
 }
 .info_row {
-    margin-bottom: 40px;
+  margin-bottom: 40px;
 }
 .img_box {
-    width: 120px\;
+  width: 120px\;;
 }
 .info_box {
-    width: 60%;
+  width: 60%;
 }
 
 .title {
@@ -244,19 +238,19 @@ const baseInfo = reactive(
   align-items: center;
 }
 .dashed_line {
-    flex: 1;
-    height: 1px;
-    margin: 0 10px;
-	border-bottom: dashed 1px #dadee7;
+  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;
+  display: inline-block;
+  width: 4px;
+  height: 14px;
+  background-color: #3759be;
+  border-radius: 2px;
+  margin-right: 5px;
 }
 
 .pagination_box {
@@ -277,5 +271,4 @@ const baseInfo = reactive(
   height: 160px;
   padding-top: 25px;
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue
index c58e7b8..92dce0b 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -1,22 +1,16 @@
 <template>
-  <el-form
-    :label-position="'right'"
-    label-width="120px"
-    :model="orgForm"
-    :rules="formRules"
-    ref="orgRef"
-  >
+  <el-form :label-position="'right'" label-width="120px" :model="orgForm" :rules="formRules" ref="orgRef">
     <el-form-item label="上级目录" prop="p_organization_id" v-if="formType === 'create'">
-      <el-tree-select 
-          v-model="orgForm.p_organization_id" 
-          :data="orgData" 
-          :props="treeProps" 
-          :render-after-expand="false" 
-          :check-strictly="true" 
-          :disabled="orgForm.level"
-          style="width: 80%;" />
+      <el-tree-select
+        v-model="orgForm.p_organization_id"
+        :data="orgData"
+        :props="treeProps"
+        :render-after-expand="false"
+        :check-strictly="true"
+        :disabled="orgForm.level"
+        style="width: 80%" />
       <el-form-item label="" style="padding-left: 16px">
-        <el-checkbox v-model="orgForm.level" @change="isTop" label="顶级"/>
+        <el-checkbox v-model="orgForm.level" @change="isTop" label="顶级" />
       </el-form-item>
     </el-form-item>
     <el-form-item label="政务机构名称" prop="name">
@@ -29,134 +23,130 @@
       <el-input type="textarea" :rows="3" v-model="orgForm.description" maxlength="300" show-word-limit />
     </el-form-item>
     <el-form-item label="组织附件" prop="logo">
-       <bg-upload 
-          v-model="orgForm.attachment" 
-          customTips 
-          :limit="3"
-          :fileTypes="['zip','rar','doc','docx','xlsx','xls','png','jpg']" 
-          :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'"
-        >
-          <span>将文件拖到此处，或 点击上传</span>
-        </bg-upload>
+      <bg-upload
+        v-model="orgForm.attachment"
+        customTips
+        :limit="3"
+        :fileTypes="['zip', 'rar', 'doc', 'docx', 'xlsx', 'xls', 'png', 'jpg']"
+        :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'">
+        <span>将文件拖到此处，或 点击上传</span>
+      </bg-upload>
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue'
+import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from "vue";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const props = defineProps({
   formType: {
     type: String,
-    default: 'create', //false 新建 true 编辑
+    default: "create", //false 新建 true 编辑
   },
 });
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
 const orgForm = reactive({
-  p_organization_id: '',
+  p_organization_id: "",
   level: false,
-  name: '',
-  organization_code: '',
-  description: '',
-  attachment: []
-})
+  name: "",
+  organization_code: "",
+  description: "",
+  attachment: [],
+});
 
 const checkCode = (rule, value, callback) => {
-  var reg = /^[a-zA-Z0-9]+$/
+  var reg = /^[a-zA-Z0-9]+$/;
   if (!reg.test(value)) {
-    callback(new Error("只能输入字母和数字"))
-  }else {
-    callback()
+    callback(new Error("只能输入字母和数字"));
+  } else {
+    callback();
   }
-}
+};
 
 const checkName = (rule, value, callback) => {
-  var reg = /^[a-zA-Z\u4e00-\u9fa5]+$/
+  var reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
   if (!reg.test(value)) {
-    callback(new Error("只能输入字母和汉字"))
-  }else {
-    callback()
+    callback(new Error("只能输入字母和汉字"));
+  } else {
+    callback();
   }
-}
+};
 
 const formRules = reactive({
-  p_organization_id: [
-    { required: true, message: '输入上级目录', trigger: 'blur' },
-  ],
+  p_organization_id: [{ required: true, message: "输入上级目录", trigger: "blur" }],
   name: [
-    { required: true, message: '请输入机构名称', trigger: 'blur' },
-    { max: 50, message: '机构名称最大长度为50位', trigger: 'blur' },
-    { validator: checkName, trigger: 'blur' }
+    { required: true, message: "请输入机构名称", trigger: "blur" },
+    { max: 50, message: "机构名称最大长度为50位", trigger: "blur" },
+    { validator: checkName, trigger: "blur" },
   ],
   organization_code: [
-    { required: true, message: '请输入组织机构代码', trigger: 'blur' },
-    { max: 18, message: '组织机构代码最大长度为18位', trigger: 'blur' },
-    { validator: checkCode, trigger: 'blur' }
+    { required: true, message: "请输入组织机构代码", trigger: "blur" },
+    { max: 18, message: "组织机构代码最大长度为18位", trigger: "blur" },
+    { validator: checkCode, trigger: "blur" },
   ],
-})
+});
 
-const orgRef = ref(null)
-const emit = defineEmits(['action'])
+const orgRef = ref(null);
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!orgRef) return
+  if (!orgRef) return;
   await orgRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', orgForm)
+      emit("action", orgForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const clearForm = () => {
-  if (!orgRef) return
-  orgRef.value.resetFields()
-} 
+  if (!orgRef) return;
+  orgRef.value.resetFields();
+};
 const setForm = (data) => {
   Object.assign(orgForm, data);
-}
-const orgData = ref([])
+};
+const orgData = ref([]);
 const treeProps = {
-  label: 'name',
-  children: 'Child',
-  value: 'organization_id',
-  disabled: 'disabled'
-}
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+  disabled: "disabled",
+};
 const getOrgTree = () => {
-  $axios.get(`/apaas/system/v5/org/tree`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        const orgDataTemp =  res.data.data || []
-        orgDataTemp.shift()
-        orgData.value = filterOrg(orgDataTemp);
-      }else {
-        $message.error(res.data.data)
-      }
-    })
-}
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      const orgDataTemp = res.data.data || [];
+      orgDataTemp.shift();
+      orgData.value = filterOrg(orgDataTemp);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 const filterOrg = (data) => {
-  if(data.length > 0) {
-    data.forEach(item => {
+  if (data.length > 0) {
+    data.forEach((item) => {
       item.disabled = item.data_type === 0 ? false : true;
-      if(item.Child){
-        filterOrg(item.Child)
-      }else {
-        return  
+      if (item.Child) {
+        filterOrg(item.Child);
+      } else {
+        return;
       }
-    })
+    });
   }
   return data;
-}
+};
 
 const isTop = (data) => {
-  orgForm.p_organization_id = data ? ' ' : ''; //空格绕过表单非空校验
-}
+  orgForm.p_organization_id = data ? " " : ""; //空格绕过表单非空校验
+};
 onBeforeMount(() => {
-  getOrgTree()
-})
-onMounted(() => {})
+  getOrgTree();
+});
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/system/organization/org-user/index.vue b/src/page/main/system/organization/org-user/index.vue
index 07b9ff1..4395749 100644
--- a/src/page/main/system/organization/org-user/index.vue
+++ b/src/page/main/system/organization/org-user/index.vue
@@ -1,245 +1,253 @@
 <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> {{route.query.id ? '编辑组织用户':'新增组织管理员'}} </el-breadcrumb-item>
-            </el-breadcrumb>
+  <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> {{ route.query.id ? "编辑组织用户" : "新增组织管理员" }} </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="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">
-                    <orgAccountForm v-show="step === 1" :form-type="route.query.id ? true : false" :id="route.query.id" ref="orgAccountRef" @action="getOrgAccountFormData"></orgAccountForm>
-                    <orgPersonForm v-show="step === 2" ref="orgPersonRef" @action="getOrgPersonFormData"></orgPersonForm>
-                    <div class="process_end" v-show="step === 3">
-                        <div>
-                            <div>
-                                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="">
-                                <img v-else src="@/assets/imgs/img_data-fail.png" alt="">
-                            </div>
-                            <div class="font_bold">{{route.query.id ? (successFlag ? '组织用户编辑成功' : '组织用户编辑失败') : (successFlag ? '组织用户新增成功' : '组织用户新增失败')}}</div>
-                            <el-button  @click="cancel">返回列表</el-button>
-                            <el-button v-if="!route.query.id" 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 class="content_main">
+          <orgAccountForm
+            v-show="step === 1"
+            :form-type="route.query.id ? true : false"
+            :id="route.query.id"
+            ref="orgAccountRef"
+            @action="getOrgAccountFormData"></orgAccountForm>
+          <orgPersonForm v-show="step === 2" ref="orgPersonRef" @action="getOrgPersonFormData"></orgPersonForm>
+          <div class="process_end" v-show="step === 3">
+            <div>
+              <div>
+                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="" />
+                <img v-else src="@/assets/imgs/img_data-fail.png" alt="" />
+              </div>
+              <div class="font_bold">
+                {{
+                  route.query.id
+                    ? successFlag
+                      ? "组织用户编辑成功"
+                      : "组织用户编辑失败"
+                    : successFlag
+                    ? "组织用户新增成功"
+                    : "组织用户新增失败"
+                }}
+              </div>
+              <el-button @click="cancel">返回列表</el-button>
+              <el-button v-if="!route.query.id" 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 orgAccountForm from './org-account-form.vue';
-import orgPersonForm from './org-person-form.vue';
-import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted, getCurrentInstance } from 'vue';
-import CryptoJS from "crypto-js"; 
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { useRoute, useRouter } from "vue-router";
+import orgAccountForm from "./org-account-form.vue";
+import orgPersonForm from "./org-person-form.vue";
+import { reactive, ref, onBeforeMount, toRefs, computed, onBeforeUnmount, onMounted } from "vue";
+import CryptoJS from "crypto-js";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 const router = useRouter();
 const step = ref(1);
 const orgAccountRef = ref(null);
 const orgPersonRef = ref(null);
 const formData = reactive({
-  organization_id: '',
-  select_role: '',
+  organization_id: "",
+  select_role: "",
   logo: [],
-  system_account: '',
-  contact_phone: '',
-  password: '',
-  confirm_password: '',
+  system_account: "",
+  contact_phone: "",
+  password: "",
+  confirm_password: "",
   state: 1,
 
-  contact_name: '',
-  document_type: '',
-  document_number: '',
-  contact_email: '',
-  remark: '',
+  contact_name: "",
+  document_type: "",
+  document_number: "",
+  contact_email: "",
+  remark: "",
 }); //账号信息表单+个人信息表单
 
-const successFlag = ref(false)
-const orgId = ref('')
+const successFlag = ref(false);
+const orgId = ref("");
 
 // 下一步
 const nextStep = () => {
-    orgAccountRef.value.submitForm();
-}
+  orgAccountRef.value.submitForm();
+};
 //账号信息表单检验触发事件 data为null 校验失败
 const getOrgAccountFormData = (data) => {
-        if(data) {
-            Object.assign(formData,data);
-            step.value = 2;
-        }else {
-
-        }
-}
+  if (data) {
+    Object.assign(formData, data);
+    step.value = 2;
+  } else {
+  }
+};
 //个人信息表单检验触发事件 data为null 校验失败
 const getOrgPersonFormData = (data) => {
-    if(data) {
-       if(data) {
-        Object.assign(formData,data);
-        if(route.query.id) {
-            let params = {
-                ...formData,
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-            }
-            params.document_type = params.document_type == "" ? 0 : params.document_type
-            $axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    successFlag.value = true;
-                    step.value = 3;
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
-
-        }else {
-            const params = {
-                ...formData,
-                // organization_id: orgId.value,
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-                is_admin: 2,
-                password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString()
-            };
-            params.document_type = params.document_type == "" ? 0 : params.document_type
-            $axios.post(`/apaas/system/v5/org/add/user`,params)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    successFlag.value = true;
-                    step.value = 3;
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
-        }
-    }
+  if (data) {
+    if (data) {
+      Object.assign(formData, data);
+      if (route.query.id) {
+        let params = {
+          ...formData,
+          logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+        };
+        params.document_type = params.document_type == "" ? 0 : params.document_type;
+        axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`, params).then((res) => {
+          if (res.data.code == 200) {
+            successFlag.value = true;
+            step.value = 3;
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
+      } else {
+        const params = {
+          ...formData,
+          // organization_id: orgId.value,
+          logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+          is_admin: 2,
+          password: CryptoJS.AES.encrypt(formData.password, "swuE9cmCZQwrkYRV").toString(),
+        };
+        params.document_type = params.document_type == "" ? 0 : params.document_type;
+        axios.post(`/apaas/system/v5/org/add/user`, params).then((res) => {
+          if (res.data.code == 200) {
+            successFlag.value = true;
+            step.value = 3;
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
+      }
     }
-}
+  }
+};
 //上一步
 const previousStep = () => {
-    step.value--;
-}
+  step.value--;
+};
 //提交表单
 const submit = () => {
-    orgPersonRef.value.submitForm();
-}
+  orgPersonRef.value.submitForm();
+};
 //继续创建 清空表单
 const continueCreate = () => {
-    orgAccountRef.value.clearForm();
-    orgPersonRef.value.clearForm();
-    step.value = 1;
-    successFlag.value = false;
-}
+  orgAccountRef.value.clearForm();
+  orgPersonRef.value.clearForm();
+  step.value = 1;
+  successFlag.value = false;
+};
 //取消
 const cancel = () => {
-    router.push({
-        path: "/system/organization",
-        query: {
-            id: route.query.orgId
-        }
-    })
-}
+  router.push({
+    path: "/system/organization",
+    query: {
+      id: route.query.orgId,
+    },
+  });
+};
 const getDetail = () => {
-    $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    const form = res.data.data;
-                    orgAccountRef.value.setForm({
-                        organization_id: form.organization_id,
-                        select_role: form.select_role,
-                        logo: form.logo ? [{url:form.logo}] : [],
-                        system_account: form.system_account,
-                        contact_phone: form.contact_phone,
-                        state: form.state,
-                        
-                    })
+  axios.get(`/apaas/system/v5/org/user/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      const form = res.data.data;
+      orgAccountRef.value.setForm({
+        organization_id: form.organization_id,
+        select_role: form.select_role,
+        logo: form.logo ? [{ url: form.logo }] : [],
+        system_account: form.system_account,
+        contact_phone: form.contact_phone,
+        state: form.state,
+      });
 
-                    orgPersonRef.value.setForm({
-                        contact_name: form.contact_name,
-                        document_type: form.document_type ? form.document_type : "",
-                        document_number: form.document_number,
-                        contact_email: form.contact_email,
-                        remark: form.remark,
-                    })
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
-}
-
-onBeforeMount(() => {
-    if(route.query.id) {
-       getDetail()
+      orgPersonRef.value.setForm({
+        contact_name: form.contact_name,
+        document_type: form.document_type ? form.document_type : "",
+        document_number: form.document_number,
+        contact_email: form.contact_email,
+        remark: form.remark,
+      });
+    } else {
+      ElMessage.error(res.data.data);
     }
-})
+  });
+};
 
-onMounted(() => {
-    
-})
+onBeforeMount(() => {
+  if (route.query.id) {
+    getDetail();
+  }
+});
 
+onMounted(() => {});
 </script>
 
 <style scoped>
 .flex_cloumn {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 .content_top {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
 }
 /* .content_top::-webkit-scrollbar {
   width: 5px;
@@ -256,80 +264,79 @@ onMounted(() => {
 } */
 
 .content_bottom {
-    height: 68px;
-    line-height: 68px;
-    text-align: right;
-    padding: 0 20px;
-    border-top: 1px solid #e6e9ef;
+  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%;
+  border-bottom: 1px solid #e6e9ef;
+  padding: 38px 16%;
 }
 .content_main {
-    flex: 1;
-    padding: 30px;
-    box-sizing: border-box;
+  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;
+  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;
+  height: 25px;
+  width: 25px;
+  vertical-align: middle;
 }
 .process_end {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .process_end div {
-    text-align: center;
+  text-align: center;
 }
 .step_icon {
-    color: #fff;
-    font-weight: 600;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
+  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;
+  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;
+  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;
+  height: 4px;
 }
 .content_process :deep() .el-step__head.is-finish .el-step__line {
-    background: linear-gradient(to right,#2b4695 50%,#e6e9ef 50%);
+  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%);
+  background: linear-gradient(to right, #2b4695 100%, #e6e9ef 0%);
 }
 </style>
diff --git a/src/page/main/system/organization/org-user/org-account-form.vue b/src/page/main/system/organization/org-user/org-account-form.vue
index acca43a..ce605c2 100644
--- a/src/page/main/system/organization/org-user/org-account-form.vue
+++ b/src/page/main/system/organization/org-user/org-account-form.vue
@@ -5,50 +5,62 @@
     :model="orgAccountForm"
     :rules="orgAccountFormRules"
     ref="orgformAccountRef"
-    style="max-width: 66%"
-  >
+    style="max-width: 66%">
     <el-form-item label="所属组织机构" prop="organization_id">
-      <el-tree-select v-model="orgAccountForm.organization_id" :data="orgData" :props="treeProps" :render-after-expand="false" :disabled="true" style="width: 100%;"/>
+      <el-tree-select
+        v-model="orgAccountForm.organization_id"
+        :data="orgData"
+        :props="treeProps"
+        :render-after-expand="false"
+        :disabled="true"
+        style="width: 100%" />
       <!-- <el-input v-model="orgAccountForm.organization_id" /> -->
     </el-form-item>
     <el-form-item label="角色" prop="select_role" v-if="!formType">
-      <el-select v-model="orgAccountForm.select_role" multiple placeholder="请选择角色" :disabled="true" style="width: 100%">
-        <el-option
-          v-for="item in roleList"
-          :key="item.role_id"
-          :label="item.role_name"
-          :value="item.role_id"
-        />
+      <el-select
+        v-model="orgAccountForm.select_role"
+        multiple
+        placeholder="请选择角色"
+        :disabled="true"
+        style="width: 100%">
+        <el-option v-for="item in roleList" :key="item.role_id" :label="item.role_name" :value="item.role_id" />
       </el-select>
     </el-form-item>
     <el-form-item label="头像" prop="logo">
-       <bg-upload-image v-model="orgAccountForm.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>
+      <bg-upload-image
+        v-model="orgAccountForm.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="system_account">
+    <el-form-item label="账号" prop="system_account">
       <el-input v-model="orgAccountForm.system_account" />
     </el-form-item>
     <el-form-item label="手机号" prop="contact_phone">
       <el-input v-model="orgAccountForm.contact_phone" />
     </el-form-item>
-     <el-form-item label="密码" prop="password" v-if="!formType">
+    <el-form-item label="密码" prop="password" v-if="!formType">
       <el-input type="password" v-model="orgAccountForm.password" />
     </el-form-item>
-     <el-form-item label="确认密码" prop="confirm_password" v-if="!formType">
+    <el-form-item label="确认密码" prop="confirm_password" v-if="!formType">
       <el-input type="password" v-model="orgAccountForm.confirm_password" />
     </el-form-item>
-  
+
     <el-form-item label="是否启用" prop="state">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="orgAccountForm.state"></bg-switch>
+      <bg-switch :labels="['否', '是']" :values="[0, 1]" v-model="orgAccountForm.state"></bg-switch>
     </el-form-item>
-    
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue';
-import { useRoute } from 'vue-router';
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, ref, onMounted, onBeforeMount } from "vue";
+import { useRoute } from "vue-router";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 const props = defineProps({
   formType: {
@@ -57,168 +69,154 @@ const props = defineProps({
   },
   id: {
     type: String,
-    default: '', 
-  }
+    default: "",
+  },
 });
 const orgAccountForm = reactive({
-  organization_id: '',
-  select_role: '',
+  organization_id: "",
+  select_role: "",
   logo: [],
-  system_account: '',
-  contact_phone: '',
-  password: '',
-  confirm_password: '',
+  system_account: "",
+  contact_phone: "",
+  password: "",
+  confirm_password: "",
   state: 1,
-})
+});
 
 const validatePass = (rule, value, callback) => {
   if (value !== orgAccountForm.password) {
-    callback(new Error("密码输入不一致"))
+    callback(new Error("密码输入不一致"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 
 const validateSystemAccount = (rule, value, callback) => {
   let params = null;
-   if (props.id){
-     params = {id: parseInt(props.id),system_account: value,}
-   }else {
-     params = {system_account: value}
-   }
-
-  $axios.post(`/apaas/system/v5/user/check/account`,params)
-     .then((res) => {
-      if (res.data.code == 200) {
-            callback()
-      }else {
-          callback(new Error(res.data.data))
-      }
-     })
+  if (props.id) {
+    params = { id: parseInt(props.id), system_account: value };
+  } else {
+    params = { system_account: value };
   }
 
-  const checkPhone = (rule, value, callback) => {
-      var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
-      setTimeout(() => {
-        if (!phone_ruler.test(value)&&value.length!==0) {
-          callback(new Error("请输入正确的手机号码"));
-        } else {
-          callback();
-        }
-      });
-  };
-
-  const checkPhoneRepet = (rule, value, callback) => {
-    let params = null;
-    if (props.id){
-      params = {id: parseInt(props.id),contact_phone: value,}
-    }else {
-      params = {id: 0,contact_phone: value}
+  axios.post(`/apaas/system/v5/user/check/account`, params).then((res) => {
+    if (res.data.code == 200) {
+      callback();
+    } else {
+      callback(new Error(res.data.data));
     }
+  });
+};
+
+const checkPhone = (rule, value, callback) => {
+  var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
+  setTimeout(() => {
+    if (!phone_ruler.test(value) && value.length !== 0) {
+      callback(new Error("请输入正确的手机号码"));
+    } else {
+      callback();
+    }
+  });
+};
+
+const checkPhoneRepet = (rule, value, callback) => {
+  let params = null;
+  if (props.id) {
+    params = { id: parseInt(props.id), contact_phone: value };
+  } else {
+    params = { id: 0, contact_phone: value };
+  }
 
-    $axios.post(`/apaas/system/v5/org/check`,params)
-      .then((res) => {
-        if (res.data.code == 200) {
-              callback()
-        }else {
-            callback(new Error(res.data.data))
-        }
-      })
+  axios.post(`/apaas/system/v5/org/check`, params).then((res) => {
+    if (res.data.code == 200) {
+      callback();
+    } else {
+      callback(new Error(res.data.data));
     }
+  });
+};
 
 const orgAccountFormRules = reactive({
-  organization_id: [
-    { required: true, message: '请选择组织', trigger: 'blur' },
-  ],
-  select_role: [
-    { required: true, message: '请选择角色', trigger: 'blur' },
-  ],
+  organization_id: [{ required: true, message: "请选择组织", trigger: "blur" }],
+  select_role: [{ required: true, message: "请选择角色", trigger: "blur" }],
   system_account: [
-    { required: true, message: '请输入账号', trigger: 'blur' },
-    { validator: validateSystemAccount, trigger: 'blur' },
+    { required: true, message: "请输入账号", trigger: "blur" },
+    { validator: validateSystemAccount, trigger: "blur" },
   ],
   contact_phone: [
-    { required: true, message: '请输入手机号', trigger: 'blur' },
-    { validator: checkPhone, trigger: 'blur' },
-    { validator: checkPhoneRepet, trigger: 'blur' }
+    { required: true, message: "请输入手机号", trigger: "blur" },
+    { validator: checkPhone, trigger: "blur" },
+    { validator: checkPhoneRepet, trigger: "blur" },
   ],
- 
+
   password: [
-    { required: true, message: '请输入密码', trigger: 'blur' },
-    {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
+    { required: true, message: "请输入密码", trigger: "blur" },
+    { min: 8, message: "密码长度不得低于8位", trigger: "blur" },
   ],
   confirm_password: [
-      { required: true, message: '请确认密码', trigger: 'blur' },
-    { validator: validatePass, trigger: 'blur' }
+    { required: true, message: "请确认密码", trigger: "blur" },
+    { validator: validatePass, trigger: "blur" },
   ],
-})
+});
 
-const orgformAccountRef = ref(null)
-const emit = defineEmits(['action'])
-const roleList = ref([])
+const orgformAccountRef = ref(null);
+const emit = defineEmits(["action"]);
+const roleList = ref([]);
 
 const submitForm = async () => {
-  if (!orgformAccountRef) return
+  if (!orgformAccountRef) return;
   await orgformAccountRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', orgAccountForm)
+      emit("action", orgAccountForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const clearForm = () => {
-  if (!orgformAccountRef) return
-  orgformAccountRef.value.resetFields()
+  if (!orgformAccountRef) return;
+  orgformAccountRef.value.resetFields();
   orgAccountForm.select_role = [roleList.value[0].role_id];
-
-} 
+};
 
 const setForm = (data) => {
   Object.assign(orgAccountForm, data);
-}
+};
 
-const orgData = ref([])
+const orgData = ref([]);
 const treeProps = {
-  label: 'name',
-  children: 'Child',
-  value: 'organization_id'
-}
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+};
 const getOrgTree = () => {
-  $axios.get(`/apaas/system/v5/org/tree`)
-     .then((res) => {
-     if (res.data.code == 200) {
-         orgData.value = res.data.data || [];
-     }else {
-         $message.error(res.data.data)
-     }
-     })
-}
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      orgData.value = res.data.data || [];
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 const getRoleList = () => {
-  $axios.get(`/apaas/system/v5/org/select/role?is_admin=2`)
-     .then((res) => {
-      if (res.data.code == 200) {
-            roleList.value = res.data.data;
-            orgAccountForm.select_role = [roleList.value[0].role_id];
-      }else {
-         
-      }
-     })
-}
-
-onBeforeMount(() =>{
-  getOrgTree()
-  getRoleList()
-  orgAccountForm.organization_id = route.query.orgId;
-})
-
+  axios.get(`/apaas/system/v5/org/select/role?is_admin=2`).then((res) => {
+    if (res.data.code == 200) {
+      roleList.value = res.data.data;
+      orgAccountForm.select_role = [roleList.value[0].role_id];
+    } else {
+    }
+  });
+};
 
-onMounted(() => {
-    
-})
+onBeforeMount(() => {
+  getOrgTree();
+  getRoleList();
+  orgAccountForm.organization_id = route.query.orgId;
+});
 
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/system/organization/org-user/org-person-form.vue b/src/page/main/system/organization/org-user/org-person-form.vue
index a3a92a4..fc95899 100644
--- a/src/page/main/system/organization/org-user/org-person-form.vue
+++ b/src/page/main/system/organization/org-user/org-person-form.vue
@@ -5,83 +5,82 @@
     :model="orgPersonForm"
     :rules="orgPersonFormRules"
     ref="orgPersonFormRef"
-    style="max-width: 66%"
-  >
+    style="max-width: 66%">
     <el-form-item label="联系人姓名" prop="contact_name">
       <el-input v-model="orgPersonForm.contact_name" />
     </el-form-item>
     <el-form-item label="证件类型" prop="document_type">
       <el-select v-model="orgPersonForm.document_type" placeholder="请选择证件类型" style="width: 100%">
-        <el-option
-          v-for="item in documentTypeList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
+        <el-option v-for="item in documentTypeList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
     </el-form-item>
     <el-form-item label="证件号" prop="document_number">
       <el-input v-model="orgPersonForm.document_number" />
     </el-form-item>
     <el-form-item label="联系人邮箱" prop="contact_email">
-      <el-input v-model="orgPersonForm.contact_email"/>
+      <el-input v-model="orgPersonForm.contact_email" />
     </el-form-item>
-     <el-form-item label="备注" prop="remark">
+    <el-form-item label="备注" prop="remark">
       <el-input type="textarea" :rows="3" v-model="orgPersonForm.remark" />
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted } from "vue";
 
 const orgPersonForm = reactive({
-  contact_name: '',
-  document_type: '',
-  document_number: '',
-  contact_email: '',
-  remark: '',
-})
+  contact_name: "",
+  document_type: "",
+  document_number: "",
+  contact_email: "",
+  remark: "",
+});
 
-const documentTypeList = ref([{
-  label: '身份证',
-  value: 1
-}])
+const documentTypeList = ref([
+  {
+    label: "身份证",
+    value: 1,
+  },
+]);
 
 const orgPersonFormRules = reactive({
   contact_email: [
     // { required: true, message: '请输入手机号', trigger: 'blur' },
-    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
+    { type: "email", message: "请输入正确的邮箱", trigger: "blur" },
   ],
   document_number: [
-    { pattern:  /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/,  message: '请输入正确的身份证号', trigger: 'blur' }
-  ]
-})
-const orgPersonFormRef = ref(null)
-const emit = defineEmits(['action'])
+    {
+      pattern:
+        /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/,
+      message: "请输入正确的身份证号",
+      trigger: "blur",
+    },
+  ],
+});
+const orgPersonFormRef = ref(null);
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!orgPersonFormRef) return
+  if (!orgPersonFormRef) return;
   await orgPersonFormRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', orgPersonForm)
+      emit("action", orgPersonForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 const clearForm = () => {
-  if (!orgPersonFormRef) return
-  orgPersonFormRef.value.resetFields()
-} 
+  if (!orgPersonFormRef) return;
+  orgPersonFormRef.value.resetFields();
+};
 
 const setForm = (data) => {
   Object.assign(orgPersonForm, data);
-}
+};
 
-onMounted(() => {
-   
-})
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/system/organization/platform-user/index.vue b/src/page/main/system/organization/platform-user/index.vue
index f438071..b5f751c 100644
--- a/src/page/main/system/organization/platform-user/index.vue
+++ b/src/page/main/system/organization/platform-user/index.vue
@@ -1,260 +1,270 @@
 <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> {{route.query.id ? '编辑平台用户':'新增平台用户'}} </el-breadcrumb-item>
-            </el-breadcrumb>
+  <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> {{ route.query.id ? "编辑平台用户" : "新增平台用户" }} </el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+    <div class="page_content flex_cloumn">
+      <div class="content_top apaas_scroll">
+        <div class="content_process" v-if="!route.query.id">
+          <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="page_content flex_cloumn">
-            <div class="content_top apaas_scroll">
-                <div class="content_process" v-if="!route.query.id">
-                    <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" :form-type="route.query.id ? true : false" :id="route.query.id" 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 v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="">
-                                <img v-else src="@/assets/imgs/img_data-fail.png" alt="">
-                            </div>
-                            <div class="font_bold">{{route.query.id ? (successFlag ? '平台用户编辑成功' : '平台用户编辑失败') : (successFlag ? '平台用户新增成功' : '平台用户新增失败')}}</div>
-                            <el-button  @click="cancel">返回列表</el-button>
-                            <el-button v-if="!route.query.id" type="primary" @click="continueCreate">继续创建</el-button>
-                        </div>
-                            
-                    </div>
-                </div>
-            </div>
-            <div class="content_bottom" v-if="step !== 3">
-                <div v-show="!route.query.id && 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 v-show="route.query.id">
-                    <el-button @click="cancel">取消</el-button>
-                    <el-button type="primary" @click="nextStep">保存</el-button>
-                </div>
+        <div class="content_main">
+          <platformAccountForm
+            v-show="step === 1"
+            :form-type="route.query.id ? true : false"
+            :id="route.query.id"
+            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 v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="" />
+                <img v-else src="@/assets/imgs/img_data-fail.png" alt="" />
+              </div>
+              <div class="font_bold">
+                {{
+                  route.query.id
+                    ? successFlag
+                      ? "平台用户编辑成功"
+                      : "平台用户编辑失败"
+                    : successFlag
+                    ? "平台用户新增成功"
+                    : "平台用户新增失败"
+                }}
+              </div>
+              <el-button @click="cancel">返回列表</el-button>
+              <el-button v-if="!route.query.id" type="primary" @click="continueCreate">继续创建</el-button>
             </div>
+          </div>
         </div>
-
+      </div>
+      <div class="content_bottom" v-if="step !== 3">
+        <div v-show="!route.query.id && 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 v-show="route.query.id">
+          <el-button @click="cancel">取消</el-button>
+          <el-button type="primary" @click="nextStep">保存</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 CryptoJS from "crypto-js"; 
-import { reactive, ref,onBeforeMount,toRefs,computed, onMounted, getCurrentInstance  } from 'vue';
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { useRoute, useRouter } from "vue-router";
+import platformAccountForm from "./platform-account-form.vue";
+import platformPersonForm from "./platform-person-form.vue";
+import CryptoJS from "crypto-js";
+import { reactive, ref, onBeforeMount, toRefs, computed, onMounted } from "vue";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 const router = useRouter();
 const step = ref(1);
 const platformAccountFormRef = ref(null);
 const plplatformPersonFormRef = ref(null);
 const formData = reactive({
-  logo: '',
-  system_account: '',
-  contact_phone: '',
-  password: '',
-  confirm_password: '',
-  select_role: '',
-  state: '',
-
-  contact_name: '',
-  contact_email: '',
-  remark: '',
+  logo: "",
+  system_account: "",
+  contact_phone: "",
+  password: "",
+  confirm_password: "",
+  select_role: "",
+  state: "",
 
+  contact_name: "",
+  contact_email: "",
+  remark: "",
 }); //账号信息表单+个人信息表单
 const orgId = ref(null);
-const successFlag = ref(false)
-
+const successFlag = ref(false);
 
 // 下一步
 const nextStep = () => {
-    platformAccountFormRef.value.submitForm();
-}
+  platformAccountFormRef.value.submitForm();
+};
 //账号信息表单检验触发事件 data为null 校验失败
 const getPlatformAccountFormData = (data) => {
-    if(data) {
-        if(route.query.id) {
-            Object.assign(formData,data);
-            let params = {
-                ...formData,
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-            }
-            $axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
-                .then((res) => {
-                    if (res.data.code == 200) {
-                        successFlag.value = true;
-                        step.value = 3;
-                    }else {
-                        $message.error(res.data.data)
-                    }
-                })
-        }else {
-            Object.assign(formData,data);
-            step.value = 2;
+  if (data) {
+    if (route.query.id) {
+      Object.assign(formData, data);
+      let params = {
+        ...formData,
+        logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+      };
+      axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`, params).then((res) => {
+        if (res.data.code == 200) {
+          successFlag.value = true;
+          step.value = 3;
+        } else {
+          ElMessage.error(res.data.data);
         }
-        
-    }else {
-
+      });
+    } else {
+      Object.assign(formData, data);
+      step.value = 2;
     }
-}
+  } else {
+  }
+};
 //个人信息表单检验触发事件 data为null 校验失败
 const getPlatformPersonFormData = (data) => {
-    if(data) {
-        Object.assign(formData,data);
-        if(route.query.id) {
-            console.log(formData)
-            // let params = {
-                
-            // }
-            // $axios.post(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
-            //     .then((res) => {
-            //     if (res.data.code == 200) {
-            //         successFlag.value = true;
-            //         step.value = 3;
-            //     }else {
-            //         $message.error(res.data.msg)
-            //     }
-            // })
+  if (data) {
+    Object.assign(formData, data);
+    if (route.query.id) {
+      console.log(formData);
+      // let params = {
 
-        }else {
-            const params = {...formData,
-                organization_id: orgId.value,
-                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
-                is_admin: 3,
-                password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString()
-            };
-            $axios.post(`/apaas/system/v5/org/add/user`,params)
-                .then((res) => {
-                if (res.data.code == 200) {
-                    successFlag.value = true;
-                    step.value = 3;
-                }else {
-                    $message.error(res.data.data)
-                }
-            })
+      // }
+      // axios.post(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
+      //     .then((res) => {
+      //     if (res.data.code == 200) {
+      //         successFlag.value = true;
+      //         step.value = 3;
+      //     }else {
+      //         ElMessage.error(res.data.msg)
+      //     }
+      // })
+    } else {
+      const params = {
+        ...formData,
+        organization_id: orgId.value,
+        logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : "",
+        is_admin: 3,
+        password: CryptoJS.AES.encrypt(formData.password, "swuE9cmCZQwrkYRV").toString(),
+      };
+      axios.post(`/apaas/system/v5/org/add/user`, params).then((res) => {
+        if (res.data.code == 200) {
+          successFlag.value = true;
+          step.value = 3;
+        } else {
+          ElMessage.error(res.data.data);
         }
+      });
     }
-}
+  }
+};
 //上一步
 const previousStep = () => {
-    step.value--;
-}
+  step.value--;
+};
 //提交表单
 const submit = () => {
-    plplatformPersonFormRef.value.submitForm();
-}
+  plplatformPersonFormRef.value.submitForm();
+};
 //继续创建 清空表单
 const continueCreate = () => {
-    platformAccountFormRef.value.clearForm();
-    plplatformPersonFormRef.value.clearForm();
-    step.value = 1;
-    successFlag.value = false;
-}
+  platformAccountFormRef.value.clearForm();
+  plplatformPersonFormRef.value.clearForm();
+  step.value = 1;
+  successFlag.value = false;
+};
 //取消
 const cancel = () => {
-    router.go(-1);
-}
+  router.go(-1);
+};
 
-const  getOrgTree = () => {
-    $axios.get(`/apaas/system/v5/org/tree`)
-      .then((res) => {
-      if (res.data.code == 200) {
-          orgId.value = res.data.data[0].organization_id;
-      }else {
-          $message.error(res.data.data)
-      }
-      })
-  }
+const getOrgTree = () => {
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      orgId.value = res.data.data[0].organization_id;
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 const getDetail = () => {
-    $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
-        .then((res) => {
-        if (res.data.code == 200) {
-            const form = res.data.data;
-            console.log(form)
-            platformAccountFormRef.value.setForm({
-                logo: form.logo ? [{url:form.logo}] : [],
-                system_account: form.system_account,
-                contact_phone: form.contact_phone,
-                state: form.state,
-                contact_name: form.contact_name,
-                contact_email: form.contact_email,
-                remark: form.remark,
-                select_role: form.select_role
-            })
-        }else {
-            $message.error(res.data.data)
-        }
-    })
-}
-
-onBeforeMount(() => {
-    getOrgTree()
-    if(route.query.id) {
-        getDetail()
+  axios.get(`/apaas/system/v5/org/user/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      const form = res.data.data;
+      console.log(form);
+      platformAccountFormRef.value.setForm({
+        logo: form.logo ? [{ url: form.logo }] : [],
+        system_account: form.system_account,
+        contact_phone: form.contact_phone,
+        state: form.state,
+        contact_name: form.contact_name,
+        contact_email: form.contact_email,
+        remark: form.remark,
+        select_role: form.select_role,
+      });
+    } else {
+      ElMessage.error(res.data.data);
     }
-})
-onMounted(() => {
-    
-})
+  });
+};
 
+onBeforeMount(() => {
+  getOrgTree();
+  if (route.query.id) {
+    getDetail();
+  }
+});
+onMounted(() => {});
 </script>
 
 <style scoped>
 .flex_cloumn {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 .content_top {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
 }
 /* .content_top::-webkit-scrollbar {
   width: 5px;
@@ -271,81 +281,79 @@ onMounted(() => {
 } */
 
 .content_bottom {
-    height: 68px;
-    line-height: 68px;
-    text-align: right;
-    padding: 0 20px;
-    border-top: 1px solid #e6e9ef;
+  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%;
+  border-bottom: 1px solid #e6e9ef;
+  padding: 38px 16%;
 }
 .content_main {
-    flex: 1;
-    padding: 30px;
-    box-sizing: border-box;
+  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;
+  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;
+  height: 25px;
+  width: 25px;
+  vertical-align: middle;
 }
 .process_end {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .process_end div {
-    text-align: center;
+  text-align: center;
 }
 .step_icon {
-    color: #fff;
-    font-weight: 600;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
+  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;
+  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;
+  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;
+  height: 4px;
 }
 .content_process :deep() .el-step__head.is-finish .el-step__line {
-    background: linear-gradient(to right,#2b4695 50%,#e6e9ef 50%);
+  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%);
+  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
index 05c7649..1b5caee 100644
--- a/src/page/main/system/organization/platform-user/platform-account-form.vue
+++ b/src/page/main/system/organization/platform-user/platform-account-form.vue
@@ -5,53 +5,53 @@
     :model="platformAccountForm"
     :rules="platformAccountFormRules"
     ref="platformAccountRef"
-    style="max-width: 66%"
-  >
+    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>
+      <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="system_account">
+    <el-form-item label="账号" prop="system_account">
       <el-input v-model="platformAccountForm.system_account" />
     </el-form-item>
     <el-form-item label="手机号" prop="contact_phone">
       <el-input v-model="platformAccountForm.contact_phone" />
     </el-form-item>
-     <el-form-item v-if="!formType" label="密码" prop="password">
+    <el-form-item v-if="!formType" label="密码" prop="password">
       <el-input type="password" v-model="platformAccountForm.password" />
     </el-form-item>
-     <el-form-item v-if="!formType" label="确认密码" prop="confirm_password">
+    <el-form-item v-if="!formType" label="确认密码" prop="confirm_password">
       <el-input type="password" v-model="platformAccountForm.confirm_password" />
     </el-form-item>
     <el-form-item label="角色授权" prop="select_role">
       <el-select v-model="platformAccountForm.select_role" multiple placeholder="请选择角色" style="width: 100%">
-        <el-option
-          v-for="item in roleList"
-          :key="item.role_id"
-          :label="item.role_name"
-          :value="item.role_id"
-        />
+        <el-option v-for="item in roleList" :key="item.role_id" :label="item.role_name" :value="item.role_id" />
       </el-select>
     </el-form-item>
-     <el-form-item v-if="formType" label="姓名" prop="contact_name">
+    <el-form-item v-if="formType" label="姓名" prop="contact_name">
       <el-input v-model="platformAccountForm.contact_name" />
     </el-form-item>
     <el-form-item v-if="formType" label="邮箱" prop="contact_email">
-      <el-input v-model="platformAccountForm.contact_email"/>
+      <el-input v-model="platformAccountForm.contact_email" />
     </el-form-item>
-     <el-form-item v-if="formType" label="备注" prop="remark">
+    <el-form-item v-if="formType" label="备注" prop="remark">
       <el-input type="textarea" :rows="3" v-model="platformAccountForm.remark" />
     </el-form-item>
     <el-form-item label="是否启用" prop="state">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="platformAccountForm.state"></bg-switch>
+      <bg-switch :labels="['否', '是']" :values="[0, 1]" v-model="platformAccountForm.state"></bg-switch>
     </el-form-item>
-    
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue'
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, ref, onMounted, onBeforeMount } from "vue";
+import axios from "@/request/http.js";
 const props = defineProps({
   formType: {
     type: Boolean,
@@ -59,35 +59,34 @@ const props = defineProps({
   },
   id: {
     type: String,
-    default: '', 
-  }
+    default: "",
+  },
 });
 const platformAccountForm = reactive({
   logo: [],
-  system_account: '',
-  contact_phone: '',
-  password: '',
-  confirm_password: '',
-  select_role: '',
+  system_account: "",
+  contact_phone: "",
+  password: "",
+  confirm_password: "",
+  select_role: "",
   state: 1,
 
-  contact_name: '',
-  contact_email: '',
-  remark: '',
- 
-})
+  contact_name: "",
+  contact_email: "",
+  remark: "",
+});
 
 const validatePass = (rule, value, callback) => {
   if (value !== platformAccountForm.password) {
-    callback(new Error("密码输入不一致"))
+    callback(new Error("密码输入不一致"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 const checkPhone = (rule, value, callback) => {
   var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
   setTimeout(() => {
-    if (!phone_ruler.test(value)&&value.length!==0) {
+    if (!phone_ruler.test(value) && value.length !== 0) {
       callback(new Error("请输入正确的手机号码"));
     } else {
       callback();
@@ -97,110 +96,99 @@ const checkPhone = (rule, value, callback) => {
 
 const validateSystemAccount = (rule, value, callback) => {
   let params = null;
-  if (props.id){
-    params = {id: parseInt(props.id),system_account: value,}
-  }else {
-    params = {system_account: value}
-  }
-
-  $axios.post(`/apaas/system/v5/user/check/account`,params)
-    .then((res) => {
-      if (res.data.code == 200) {
-        callback()
-      }else {
-        callback(new Error(res.data.data))
-      }
-    })
+  if (props.id) {
+    params = { id: parseInt(props.id), system_account: value };
+  } else {
+    params = { system_account: value };
   }
 
-  const checkPhoneRepet = (rule, value, callback) => {
-  let params = null;
-    if (props.id){
-      params = {id: parseInt(props.id),contact_phone: value,}
-    }else {
-      params = {id: 0,contact_phone: value}
+  axios.post(`/apaas/system/v5/user/check/account`, params).then((res) => {
+    if (res.data.code == 200) {
+      callback();
+    } else {
+      callback(new Error(res.data.data));
     }
+  });
+};
 
-  $axios.post(`/apaas/system/v5/org/check`,params)
-    .then((res) => {
-      if (res.data.code == 200) {
-        callback()
-      }else {
-        callback(new Error(res.data.data))
-      }
-    })
+const checkPhoneRepet = (rule, value, callback) => {
+  let params = null;
+  if (props.id) {
+    params = { id: parseInt(props.id), contact_phone: value };
+  } else {
+    params = { id: 0, contact_phone: value };
   }
 
+  axios.post(`/apaas/system/v5/org/check`, params).then((res) => {
+    if (res.data.code == 200) {
+      callback();
+    } else {
+      callback(new Error(res.data.data));
+    }
+  });
+};
+
 const platformAccountFormRules = reactive({
   system_account: [
-    { required: true, message: '请输入账号', trigger: 'blur' },
-    { validator: validateSystemAccount, trigger: 'blur' },
+    { required: true, message: "请输入账号", trigger: "blur" },
+    { validator: validateSystemAccount, trigger: "blur" },
   ],
   contact_phone: [
-    { required: true, message: '请输入手机号', trigger: 'blur' },
-    { validator: checkPhone, trigger: 'blur' },
-    { validator: checkPhoneRepet, trigger: 'blur' }
-  ],
-  select_role: [
-    { required: true, message: '请选择角色', trigger: 'blur' },
+    { required: true, message: "请输入手机号", trigger: "blur" },
+    { validator: checkPhone, trigger: "blur" },
+    { validator: checkPhoneRepet, trigger: "blur" },
   ],
+  select_role: [{ required: true, message: "请选择角色", trigger: "blur" }],
   password: [
-    { required: true, message: '请输入密码', trigger: 'blur' },
-    {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
+    { required: true, message: "请输入密码", trigger: "blur" },
+    { min: 8, message: "密码长度不得低于8位", trigger: "blur" },
   ],
   confirm_password: [
-    { required: true, message: '请确认密码', trigger: 'blur' },
-    { validator: validatePass, trigger: 'blur' }
+    { required: true, message: "请确认密码", trigger: "blur" },
+    { validator: validatePass, trigger: "blur" },
   ],
-  contact_email: [
-    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
-  ],
-})
+  contact_email: [{ type: "email", message: "请输入正确的邮箱", trigger: "blur" }],
+});
 
-const roleList = ref([])
+const roleList = ref([]);
 
-const platformAccountRef = ref(null)
-const emit = defineEmits(['action'])
+const platformAccountRef = ref(null);
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!platformAccountRef) return
+  if (!platformAccountRef) return;
   await platformAccountRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', platformAccountForm)
+      emit("action", platformAccountForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 
 const clearForm = () => {
-  if (!platformAccountRef) return
-  platformAccountRef.value.resetFields()
-} 
+  if (!platformAccountRef) return;
+  platformAccountRef.value.resetFields();
+};
 
 const setForm = (data) => {
   Object.assign(platformAccountForm, data);
-}
+};
 
 const getRoleList = () => {
-  $axios.get(`/apaas/system/v5/org/select/role?is_admin=3`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        roleList.value = res.data.data;
-      }else {
-         
-      }
-    })
-}
+  axios.get(`/apaas/system/v5/org/select/role?is_admin=3`).then((res) => {
+    if (res.data.code == 200) {
+      roleList.value = res.data.data;
+    } else {
+    }
+  });
+};
 
 onBeforeMount(() => {
   getRoleList();
-})
-
-onMounted(() => {
-    
-})
+});
 
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
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
index ef722c1..029b4f5 100644
--- a/src/page/main/system/organization/platform-user/platform-person-form.vue
+++ b/src/page/main/system/organization/platform-user/platform-person-form.vue
@@ -5,59 +5,54 @@
     :model="platformPersonForm"
     :rules="platformPersonFormRules"
     ref="platformPersonFormRef"
-    style="max-width: 66%"
-  >
+    style="max-width: 66%">
     <el-form-item label="姓名" prop="contact_name">
       <el-input v-model="platformPersonForm.contact_name" />
     </el-form-item>
     <el-form-item label="邮箱" prop="contact_email">
-      <el-input v-model="platformPersonForm.contact_email"/>
+      <el-input v-model="platformPersonForm.contact_email" />
     </el-form-item>
-     <el-form-item label="备注" prop="remark">
+    <el-form-item label="备注" prop="remark">
       <el-input type="textarea" :rows="3" v-model="platformPersonForm.remark" />
     </el-form-item>
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted } from "vue";
 
 const platformPersonForm = reactive({
-  contact_name: '',
-  contact_email: '',
-  remark: '',
-})
+  contact_name: "",
+  contact_email: "",
+  remark: "",
+});
 
 const platformPersonFormRules = reactive({
- contact_email: [
-    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
-  ],
-})
-const platformPersonFormRef = ref(null)
-const emit = defineEmits(['action'])
+  contact_email: [{ type: "email", message: "请输入正确的邮箱", trigger: "blur" }],
+});
+const platformPersonFormRef = ref(null);
+const emit = defineEmits(["action"]);
 
 const submitForm = async () => {
-  if (!platformPersonFormRef) return
+  if (!platformPersonFormRef) return;
   await platformPersonFormRef.value.validate((valid, fields) => {
     if (valid) {
-      emit('action', platformPersonForm)
+      emit("action", platformPersonForm);
     } else {
-      emit('action',null)
+      emit("action", null);
     }
-  })
-}
+  });
+};
 const clearForm = () => {
-  if (!platformPersonFormRef) return
-  platformPersonFormRef.value.resetFields()
-} 
+  if (!platformPersonFormRef) return;
+  platformPersonFormRef.value.resetFields();
+};
 
 const setForm = (data) => {
   Object.assign(platformPersonForm, data);
-}
+};
 
-onMounted(() => {
-   
-})
+onMounted(() => {});
 
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
+defineExpose({ submitForm, clearForm, setForm });
+</script>
diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue
index 14f9267..0636452 100644
--- a/src/page/main/system/organization/tree.vue
+++ b/src/page/main/system/organization/tree.vue
@@ -1,278 +1,353 @@
 <template>
-    <el-tree 
-        ref="treeRef" 
-        class="file-tree" 
-        :data="orgData" 
-        :props="defaultProps" 
-        @node-click="handleNodeClick" 
-        node-key="id"
-        :highlight-current="true"
-        :filter-node-method="filterNode" 
-        :expand-on-click-node="false"
-        :default-expand-all="true">
-         <template #default="{ node, data }">
-           <div class="custom_tree_node">
-             <span
-               class="label-text "
-               
-               :title="data.name"
-               >{{ data.name }}
-             </span>
-             <span v-if="data.data_type === 2" class="tree-action-box first_node" :class="{'first_node_focus': selectData && selectData.id === data.id || !selectData}" @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.name) }" @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">
+  <el-tree
+    ref="treeRef"
+    class="file-tree"
+    :data="orgData"
+    :props="defaultProps"
+    @node-click="handleNodeClick"
+    node-key="id"
+    :highlight-current="true"
+    :filter-node-method="filterNode"
+    :expand-on-click-node="false"
+    :default-expand-all="true">
+    <template #default="{ node, data }">
+      <div class="custom_tree_node">
+        <span class="label-text" :title="data.name">{{ data.name }} </span>
+        <span
+          v-if="data.data_type === 2"
+          class="tree-action-box first_node"
+          :class="{ first_node_focus: (selectData && selectData.id === data.id) || !selectData }"
+          @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.name) }"
+          @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
+      ref="treeActionRef"
+      class="tree-action"
+      v-show="actionFlag"
+      :style="{ top: acTop, left: acLeft, bottom: acBottom }">
+      <!-- 平台用户组织 -->
       <div
-        ref="treeActionRef"
-         class="tree-action"
-         v-show="actionFlag"
-         :style="{ top: acTop, left: acLeft, bottom:acBottom }"
-      >
-        <!-- 平台用户组织 -->
-         <div v-if="selectData && selectData.data_type === 2" class="action" @click="treeAction({type: 'directory',action: 'create',target: null})">新建目录</div>
-         <div v-if="selectData && selectData.data_type === 2" class="action" @click="treeAction({type: 'org',action: 'create',target: null})" >新建组织</div>
-        <!-- 目录 -->
-         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'create',target: 'local'})">新建本级目录</div>
-         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'create',target: 'child'})">新建下级目录</div>
-         <div v-if="selectData && selectData.data_type === 0  && selectData.level !== 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
-         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
-         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
-         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'delete',target: 'local'})">删除</div>
-         <div :class="{'disable': mvDataParent.indexOf(selectData) === 0 || (mvDataParent.indexOf(selectData) === 1 && mvDataParent[0].data_type == 2) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
-         <div :class="{'disable': mvDataParent.indexOf(selectData) === (mvDataParent.length-1) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
-        <!-- 组织 -->
-         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
-         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'edit',target: 'local'})">编辑组织</div>
-         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'delete',target: 'local'})">删除</div>
-         <div :class="{'disable': mvDataParent.indexOf(selectData) === 0 }" v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'mvup',target: 'local'})">上移</div>
-         <div :class="{'disable': mvDataParent.indexOf(selectData) === (mvDataParent.length-1) }" v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'mvdown',target: 'local'})">下移</div>
-       </div>
-    </Teleport>
+        v-if="selectData && selectData.data_type === 2"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'create', target: null })">
+        新建目录
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 2"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'create', target: null })">
+        新建组织
+      </div>
+      <!-- 目录 -->
+      <div
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'create', target: 'local' })">
+        新建本级目录
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'create', target: 'child' })">
+        新建下级目录
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 0 && selectData.level !== 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'create', target: 'local' })">
+        新建本级组织
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'create', target: 'child' })">
+        新建下级组织
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'edit', target: 'local' })">
+        编辑目录
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'delete', target: 'local' })">
+        删除
+      </div>
+      <div
+        :class="{
+          disable:
+            mvDataParent.indexOf(selectData) === 0 ||
+            (mvDataParent.indexOf(selectData) === 1 && mvDataParent[0].data_type == 2),
+        }"
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'mvup', target: 'local' })">
+        上移
+      </div>
+      <div
+        :class="{ disable: mvDataParent.indexOf(selectData) === mvDataParent.length - 1 }"
+        v-if="selectData && selectData.data_type === 0"
+        class="action"
+        @click="treeAction({ type: 'directory', action: 'mvdown', target: 'local' })">
+        下移
+      </div>
+      <!-- 组织 -->
+      <div
+        v-if="selectData && selectData.data_type === 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'create', target: 'local' })">
+        新建本级组织
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'edit', target: 'local' })">
+        编辑组织
+      </div>
+      <div
+        v-if="selectData && selectData.data_type === 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'delete', target: 'local' })">
+        删除
+      </div>
+      <div
+        :class="{ disable: mvDataParent.indexOf(selectData) === 0 }"
+        v-if="selectData && selectData.data_type === 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'mvup', target: 'local' })">
+        上移
+      </div>
+      <div
+        :class="{ disable: mvDataParent.indexOf(selectData) === mvDataParent.length - 1 }"
+        v-if="selectData && selectData.data_type === 1"
+        class="action"
+        @click="treeAction({ type: 'org', action: 'mvdown', target: 'local' })">
+        下移
+      </div>
+    </div>
+  </Teleport>
 </template>
 
 <script setup>
-import { reactive, toRefs, ref } from '@vue/reactivity'
-import { getCurrentInstance, watch, nextTick} from 'vue'
-import { computed, onBeforeMount, onBeforeUnmount } from '@vue/runtime-core'
-import { useRoute, useRouter } from 'vue-router';
-  const route = useRoute()
-  const { proxy } = getCurrentInstance()
-  const { $axios,$message } = proxy
+import { reactive, toRefs, ref, computed, onBeforeMount, onBeforeUnmount, watch, nextTick } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
+const route = useRoute();
 
-  const acTop = ref('');
-  const acLeft = ref('');
-  const acBottom = ref('')
-  const actionFlag = ref(false)
-  const selectData = ref(null)
-  const selectDataParent = ref(null) 
-  const mvDataParent = ref([])
-  const treeRef = ref(null)
-  const treeActionRef = ref(null)
-  const bottomGap = ref(30) //弹窗吸底高度
-  const orgData = ref([])
-  const selectNodeObj = ref(null)
-  const customNodeClass = (data,node) => {
-    if (data.data_type == 0) {
-      return 'noFocus'
-    }else {
-      return ''
-    }
-  }
-  const defaultProps = {
-    label: 'name',
-    children: 'Child',
-    value: 'organization_id',
-    class: customNodeClass,
+const acTop = ref("");
+const acLeft = ref("");
+const acBottom = ref("");
+const actionFlag = ref(false);
+const selectData = ref(null);
+const selectDataParent = ref(null);
+const mvDataParent = ref([]);
+const treeRef = ref(null);
+const treeActionRef = ref(null);
+const bottomGap = ref(30); //弹窗吸底高度
+const orgData = ref([]);
+const selectNodeObj = ref(null);
+const customNodeClass = (data, node) => {
+  if (data.data_type == 0) {
+    return "noFocus";
+  } else {
+    return "";
   }
+};
+const defaultProps = {
+  label: "name",
+  children: "Child",
+  value: "organization_id",
+  class: customNodeClass,
+};
 
-  const  getOrgTree = (data) => {
-    $axios.get(`/apaas/system/v5/org/tree`)
-      .then((res) => {
-      if (res.data.code == 200) {
-          orgData.value = res.data.data || [];
-          console.log(route.query.id)
-          if (route.query.id) {
-            searchItem(orgData.value,route.query.id)
-            data = selectNodeObj.value
-          }
-          if(data) {
-            nextTick(() =>{
-            setCurrentNode(data)
-          })
-          }else {
-            nextTick(() =>{
-            setCurrentNode(orgData.value[0].id)
-          })
-          }
-          
-          
-      }else {
-          $message.error(res.data.data)
+const getOrgTree = (data) => {
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      orgData.value = res.data.data || [];
+      console.log(route.query.id);
+      if (route.query.id) {
+        searchItem(orgData.value, route.query.id);
+        data = selectNodeObj.value;
       }
-      })
-  }
-
-  const searchItem = (data,id) => {
-    data.forEach(e => {
-      if (e.organization_id == id) {
-        selectNodeObj.value = e
-      }else {
-        if (e.Child) {
-          searchItem(e.Child,id)
-        }
+      if (data) {
+        nextTick(() => {
+          setCurrentNode(data);
+        });
+      } else {
+        nextTick(() => {
+          setCurrentNode(orgData.value[0].id);
+        });
       }
-    })
-  }
-  const filterTree =(val) => {
-    treeRef.value.filter(val)
-  }
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
-  const setCurrentNode = (data) => {
-    if(data) {
-      treeRef.value.setCurrentKey(data,true);
-     const curNode = treeRef.value.getCurrentNode();
-     selectData.value = curNode
-     emit('select',{data:ref(curNode),type: 'click'});
-    }else {
-      treeRef.value.setCurrentKey(orgData.value[0].id,true);
-     const curNode = treeRef.value.getCurrentNode();
-     selectData.value = curNode
-     emit('select',{data:ref(curNode),type: 'click'});
+const searchItem = (data, id) => {
+  data.forEach((e) => {
+    if (e.organization_id == id) {
+      selectNodeObj.value = e;
+    } else {
+      if (e.Child) {
+        searchItem(e.Child, id);
+      }
     }
-    
-  }
+  });
+};
+const filterTree = (val) => {
+  treeRef.value.filter(val);
+};
 
-  const filterNode = (value, data) => {
-    if (!value) return true
-    return data.name.includes(value)
+const setCurrentNode = (data) => {
+  if (data) {
+    treeRef.value.setCurrentKey(data, true);
+    const curNode = treeRef.value.getCurrentNode();
+    selectData.value = curNode;
+    emit("select", { data: ref(curNode), type: "click" });
+  } else {
+    treeRef.value.setCurrentKey(orgData.value[0].id, true);
+    const curNode = treeRef.value.getCurrentNode();
+    selectData.value = curNode;
+    emit("select", { data: ref(curNode), type: "click" });
   }
+};
 
-  const showAction = (e, data,node) => {
-    acTop.value = ''
-    acLeft.value = ''
-    acBottom.value = ''
-    var allHeight = document.body.scrollHeight
-    actionFlag.value = true;
-    selectData.value = data;
-    selectDataParent.value = node.parent.data.name ? node.parent.data : null;
-    mvDataParent.value = node.parent.data.Child ? node.parent.data.Child : node.parent.data;
-    const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
-    nextTick().then(()=>{
-    setTimeout(()=>{
-      var height = window.getComputedStyle(treeActionRef.value).height
-      height = parseInt(height)
+const filterNode = (value, data) => {
+  if (!value) return true;
+  return data.name.includes(value);
+};
+
+const showAction = (e, data, node) => {
+  acTop.value = "";
+  acLeft.value = "";
+  acBottom.value = "";
+  var allHeight = document.body.scrollHeight;
+  actionFlag.value = true;
+  selectData.value = data;
+  selectDataParent.value = node.parent.data.name ? node.parent.data : null;
+  mvDataParent.value = node.parent.data.Child ? node.parent.data.Child : node.parent.data;
+  const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
+  nextTick().then(() => {
+    setTimeout(() => {
+      var height = window.getComputedStyle(treeActionRef.value).height;
+      height = parseInt(height);
       //判断弹窗位置是否超过屏幕，超过则吸底展示
-      if(height+rect.y - 17>allHeight-bottomGap.value){
-        console.log(123)
-        acBottom.value = bottomGap.value+ "px";
+      if (height + rect.y - 17 > allHeight - bottomGap.value) {
+        console.log(123);
+        acBottom.value = bottomGap.value + "px";
         acLeft.value = rect.x + 35 + "px";
-      }else{
+      } else {
         acTop.value = rect.y - 17 + "px";
         acLeft.value = rect.x + 35 + "px";
       }
-    })
-  })
-    // acTop.value = rect.y - 17 + "px";
-    // acLeft.value = rect.x + 35 + "px";
-  };
-
-  const isSticky = (data) => {
+    });
+  });
+  // acTop.value = rect.y - 17 + "px";
+  // acLeft.value = rect.x + 35 + "px";
+};
 
-    const canvas = document.createElement("canvas");
-    const context = canvas.getContext("2d");
-    context.font = '14px MicrosoftYaHei';
-    const { width } = context.measureText(data);
-    return width > 255 ? true : false;
-  }
+const isSticky = (data) => {
+  const canvas = document.createElement("canvas");
+  const context = canvas.getContext("2d");
+  context.font = "14px MicrosoftYaHei";
+  const { width } = context.measureText(data);
+  return width > 255 ? true : false;
+};
 
-  const closeAction = ()=>{
-    actionFlag.value = false;
-  }
-  
+const closeAction = () => {
+  actionFlag.value = false;
+};
 
-  const emit = defineEmits(['action','select'])
-  const handleNodeClick = (node,nodeAttr,treeNode,event) => {
-    if (node.data_type !== 0) {
-      selectData.value = node;
-      emit('select',{data: selectData,type: 'click'});
-    }else {
-      nextTick(() => {
-        treeRef.value.setCurrentKey(null)
-      })
-    }
-    //只读则无操作事件
-      closeAction();
+const emit = defineEmits(["action", "select"]);
+const handleNodeClick = (node, nodeAttr, treeNode, event) => {
+  if (node.data_type !== 0) {
+    selectData.value = node;
+    emit("select", { data: selectData, type: "click" });
+  } else {
+    nextTick(() => {
+      treeRef.value.setCurrentKey(null);
+    });
   }
+  //只读则无操作事件
+  closeAction();
+};
 
-  const treeAction = (params) => {
-    emit('select',{data:selectData,type: 'action'});
-    let data = null;
-    if(params.action === 'create') {
-      if(params.target === 'local') {
-        data = selectDataParent;
-      }else if(params.target === 'child') {
-        data = selectData;
-      }else {
-        
-      }
-    }else if(params.action === 'mvup') {
-      // 已经是第一个元素 或者上一个元素是平台组织 则不可上移  平台组织始终在第一个
-      if(mvDataParent.value.indexOf(selectData.value) === 0 || ( mvDataParent.value.indexOf(selectData.value) === 1 && mvDataParent.value[0].data_type == 2) ) {
-        // $message.error('已经是第一个元素，不可上移')
-        return 0;
-      }else {
-        let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) - 1];
-        data = [{id: selectData.value.id,sort: brother.sort},{id: brother.id,sort: selectData.value.sort}]
-      }
-      
-    }else if(params.action === 'mvdown') {
-      if(mvDataParent.value.indexOf(selectData.value) === (mvDataParent.value.length-1)) {
-        // $message.error('已经是最后一个元素，不可下移')
-        return 0;
-      }else {
-        let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) + 1];
-        data = [{id: selectData.value.id,sort: brother.sort},{id: brother.id,sort: selectData.value.sort}]
-      }
-    }else {
+const treeAction = (params) => {
+  emit("select", { data: selectData, type: "action" });
+  let data = null;
+  if (params.action === "create") {
+    if (params.target === "local") {
+      data = selectDataParent;
+    } else if (params.target === "child") {
       data = selectData;
+    } else {
+    }
+  } else if (params.action === "mvup") {
+    // 已经是第一个元素 或者上一个元素是平台组织 则不可上移  平台组织始终在第一个
+    if (
+      mvDataParent.value.indexOf(selectData.value) === 0 ||
+      (mvDataParent.value.indexOf(selectData.value) === 1 && mvDataParent.value[0].data_type == 2)
+    ) {
+      // ElMessage.error('已经是第一个元素，不可上移')
+      return 0;
+    } else {
+      let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) - 1];
+      data = [
+        { id: selectData.value.id, sort: brother.sort },
+        { id: brother.id, sort: selectData.value.sort },
+      ];
     }
-    emit('action',{type: params.type,action: params.action,
-                   data: data});
+  } else if (params.action === "mvdown") {
+    if (mvDataParent.value.indexOf(selectData.value) === mvDataParent.value.length - 1) {
+      // ElMessage.error('已经是最后一个元素，不可下移')
+      return 0;
+    } else {
+      let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) + 1];
+      data = [
+        { id: selectData.value.id, sort: brother.sort },
+        { id: brother.id, sort: selectData.value.sort },
+      ];
+    }
+  } else {
+    data = selectData;
   }
-  
-  onBeforeMount(()=>{
-    //只读则无操作事件
-      window.addEventListener("click", closeAction);
-      window.addEventListener("scroll", closeAction,true);
-      getOrgTree()
-  })
-  
-  onBeforeUnmount(()=>{
-    //只读则无操作事件
-      window.removeEventListener('click', closeAction);
-      window.removeEventListener('scroll', closeAction);
-      
-  })
+  emit("action", { type: params.type, action: params.action, data: data });
+};
+
+onBeforeMount(() => {
+  //只读则无操作事件
+  window.addEventListener("click", closeAction);
+  window.addEventListener("scroll", closeAction, true);
+  getOrgTree();
+});
 
-  defineExpose({getOrgTree, filterTree, setCurrentNode })
+onBeforeUnmount(() => {
+  //只读则无操作事件
+  window.removeEventListener("click", closeAction);
+  window.removeEventListener("scroll", closeAction);
+});
 
+defineExpose({ getOrgTree, filterTree, setCurrentNode });
 </script>
 
 <style scoped>
 .tree-action-box {
-  display: none;  
+  display: none;
   position: absolute;
   right: -5px;
   top: 0px;
@@ -281,8 +356,7 @@ import { useRoute, useRouter } from 'vue-router';
   line-height: 36px;
   text-align: center;
   background-color: #f2f3f7;
-  box-shadow: -3px 0px 8px -3px 
-	rgba(0, 7, 101, 0.15);
+  box-shadow: -3px 0px 8px -3px rgba(0, 7, 101, 0.15);
 }
 .position_sticky {
   position: sticky;
@@ -304,13 +378,11 @@ import { useRoute, useRouter } from 'vue-router';
 }
 .file-tree :deep() .el-tree-node__content .first_node_focus {
   background-color: #f2f3f7;
-  box-shadow: -3px 0px 8px -3px 
-  rgba(0, 7, 101, 0.15);
+  box-shadow: -3px 0px 8px -3px rgba(0, 7, 101, 0.15);
 }
 .file-tree :deep() .el-tree-node__content:hover .first_node {
   background-color: #f2f3f7;
-  box-shadow: -3px 0px 8px -3px 
-	rgba(0, 7, 101, 0.15);
+  box-shadow: -3px 0px 8px -3px rgba(0, 7, 101, 0.15);
 }
 .file-tree :deep() .el-tree-node > .el-tree-node__children {
   overflow: visible;
@@ -323,7 +395,7 @@ import { useRoute, useRouter } from 'vue-router';
 }
 .label-text {
   font-size: 14px;
-	color: #404a62;
+  color: #404a62;
 }
 .tree-action-box:hover + .label-text {
   padding: 8px 0;
@@ -346,8 +418,8 @@ import { useRoute, useRouter } from 'vue-router';
   padding-right: 16px;
 }
 .text_clip {
-      width: 100%;
-    display: inline-block;
+  width: 100%;
+  display: inline-block;
 }
 
 .tree-action .action {
@@ -367,11 +439,11 @@ import { useRoute, useRouter } from 'vue-router';
   color: #3759be;
 }
 
-.tree-action .disable{
+.tree-action .disable {
   cursor: not-allowed;
   color: #616f94;
 }
-.tree-action .disable:hover{
+.tree-action .disable:hover {
   background-color: #fff;
   color: #616f94;
 }
@@ -387,20 +459,20 @@ import { useRoute, useRouter } from 'vue-router';
   z-index: 9;
 }
 
-.file-tree :deep().el-tree-node__content{
-  height: 36px!important;
+.file-tree :deep().el-tree-node__content {
+  height: 36px !important;
 }
 
-.tree-action .disable{
+.tree-action .disable {
   cursor: not-allowed;
   color: #616f94;
 }
-.tree-action .disable:hover{
+.tree-action .disable:hover {
   background-color: #fff;
   color: #616f94;
 }
 
-.file-tree :deep().noFocus:focus>.el-tree-node__content {
+.file-tree :deep().noFocus:focus > .el-tree-node__content {
   background-color: #fff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/organization/user-detail/index.vue b/src/page/main/system/organization/user-detail/index.vue
index bf4f372..880ae48 100644
--- a/src/page/main/system/organization/user-detail/index.vue
+++ b/src/page/main/system/organization/user-detail/index.vue
@@ -10,25 +10,27 @@
     <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><span class="icon_box"></span> 账号信息</div>
+          <div class="dashed_line"></div>
         </div>
         <div class="info_content">
-            <div class="img_box">
-                <img v-if="logo" :src="logo" style="height: 96px;width: 96px;border-radius: 99px" alt="">
-                <img v-else 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="accountInfo"></bg-info>
-            </div>
+          <div class="img_box">
+            <img v-if="logo" :src="logo" style="height: 96px; width: 96px; border-radius: 99px" alt="" />
+            <img
+              v-else
+              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="accountInfo"></bg-info>
+          </div>
         </div>
       </div>
       <div>
         <div class="title">
-          <div><span  class="icon_box"></span> 个人信息</div>
-          <div class="dashed_line">
-          </div>
+          <div><span class="icon_box"></span> 个人信息</div>
+          <div class="dashed_line"></div>
         </div>
         <div class="info_content">
           <div class="img_box"></div>
@@ -43,143 +45,140 @@
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, } from '@vue/reactivity'
-import { getCurrentInstance } from 'vue'
-import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRoute } from 'vue-router';
-
-const { proxy } = getCurrentInstance()
-const { $axios,$message } = proxy
+import { reactive, toRefs, ref, computed, onBeforeMount } from "vue";
+import { getCurrentInstance } from "vue";
+import { useRoute } from "vue-router";
+import axios from "@/request/http.js";
+import { ElMessage } from "element-plus";
 const route = useRoute();
 
 const accountInfo = reactive([
   {
     name: "手机号",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "账号",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "角色",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "所属组织",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "创建人",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "创建账号",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "最后编辑时间",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "创建时间",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
-])
+]);
 
 const personInfo = reactive([
   {
     name: "姓名",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "邮箱",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "证据类型",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "身份证号",
     value: "",
     idCard: true,
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "备注",
     value: "",
     full: true,
-    nameWidth: 130
+    nameWidth: 130,
   },
-])
+]);
 
 const personInfo2 = reactive([
   {
     name: "姓名",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "邮箱",
     value: "",
-    nameWidth: 130
+    nameWidth: 130,
   },
   {
     name: "备注",
     value: "",
     full: true,
-    nameWidth: 130
+    nameWidth: 130,
   },
-])
+]);
 
-const logo = ref('')
+const logo = ref("");
 const accountType = ref(2); //1.业务系统账号 2.组织管理员账号 3.平台用户账号
 const getDetail = () => {
-  $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        const detail = res.data.data;
-        accountInfo[0].value = detail.contact_phone;
-        accountInfo[1].value = detail.system_account;
-        accountInfo[2].value = detail.system_role && detail.system_role.length > 0 ? detail.system_role.join('、') : '';
-        accountInfo[3].value = detail.organization;
-        accountInfo[4].value = detail.created_by;
-        accountInfo[5].value = detail.created_by_account;
-        accountInfo[6].value = detail.updated_time;
-        accountInfo[7].value = detail.created_time
-        personInfo[0].value = detail.contact_name;
-        personInfo[1].value = detail.contact_email;
-        personInfo[2].value = detail.document_type === 1 ? '身份证' : '';
-        personInfo[3].value = detail.document_number;
-        personInfo[4].value = detail.remark;
-        personInfo2[0].value = detail.contact_name;
-        personInfo2[1].value = detail.contact_email;
-        personInfo2[2].value = detail.remark;
-        logo.value = detail.logo;
-        accountType.value = detail.is_admin;
-      }else {
-          $message.error(res.data.data)
-      }
-    })
-}
+  axios.get(`/apaas/system/v5/org/user/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      const detail = res.data.data;
+      accountInfo[0].value = detail.contact_phone;
+      accountInfo[1].value = detail.system_account;
+      accountInfo[2].value = detail.system_role && detail.system_role.length > 0 ? detail.system_role.join("、") : "";
+      accountInfo[3].value = detail.organization;
+      accountInfo[4].value = detail.created_by;
+      accountInfo[5].value = detail.created_by_account;
+      accountInfo[6].value = detail.updated_time;
+      accountInfo[7].value = detail.created_time;
+      personInfo[0].value = detail.contact_name;
+      personInfo[1].value = detail.contact_email;
+      personInfo[2].value = detail.document_type === 1 ? "身份证" : "";
+      personInfo[3].value = detail.document_number;
+      personInfo[4].value = detail.remark;
+      personInfo2[0].value = detail.contact_name;
+      personInfo2[1].value = detail.contact_email;
+      personInfo2[2].value = detail.remark;
+      logo.value = detail.logo;
+      accountType.value = detail.is_admin;
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 onBeforeMount(() => {
-  if(route.query.id) {
-    getDetail()
+  if (route.query.id) {
+    getDetail();
   }
-})
+});
 </script>
 
 <style scoped>
@@ -212,16 +211,15 @@ onBeforeMount(() => {
   flex: 1;
   height: 1px;
   margin: 0 10px;
-	border-bottom: dashed 1px #dadee7;
+  border-bottom: dashed 1px #dadee7;
 }
 
 .icon_box {
   display: inline-block;
   width: 4px;
-	height: 14px;
-	background-color: #3759be;
-	border-radius: 2px;
+  height: 14px;
+  background-color: #3759be;
+  border-radius: 2px;
   margin-right: 5px;
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/role/add/index.vue b/src/page/main/system/role/add/index.vue
index f3d2d75..8e15469 100644
--- a/src/page/main/system/role/add/index.vue
+++ b/src/page/main/system/role/add/index.vue
@@ -4,5 +4,5 @@
 </template>
 
 <script setup>
-import roleForm from './role_form.vue'
+import roleForm from "./role_form.vue";
 </script>
diff --git a/src/page/main/system/role/add/role_form.vue b/src/page/main/system/role/add/role_form.vue
index 449fcc2..b93fbc8 100644
--- a/src/page/main/system/role/add/role_form.vue
+++ b/src/page/main/system/role/add/role_form.vue
@@ -5,17 +5,12 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item> 系统管理 </el-breadcrumb-item>
         <el-breadcrumb-item to="/system/role"> 角色管理 </el-breadcrumb-item>
-        <el-breadcrumb-item> {{route.query.id ? "编辑" : "新建"}} </el-breadcrumb-item>
+        <el-breadcrumb-item> {{ route.query.id ? "编辑" : "新建" }} </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="main_container">
       <div class="top_form bg-scroll">
-        <el-form
-          ref="form"
-          :rules="rules"
-          :model="formData"
-          class="role_form"
-        >
+        <el-form ref="form" :rules="rules" :model="formData" class="role_form">
           <el-form-item prop="role_name" label="角色名称">
             <el-input v-model.trim="formData.role_name" maxlength="50" show-word-limit :disabled="rowType != 0" />
           </el-form-item>
@@ -24,15 +19,14 @@
               class="decs_box"
               type="textarea"
               v-model="formData.role_desc"
-              maxlength="300" 
+              maxlength="300"
               show-word-limit
               :autosize="{ minRows: 5 }"
-              :disabled="rowType != 0" 
-            ></el-input>
+              :disabled="rowType != 0"></el-input>
           </el-form-item>
 
           <el-form-item label="数据权限" prop="data_purview">
-            <el-radio-group v-model="formData.data_purview" :disabled="rowType != 0" >
+            <el-radio-group v-model="formData.data_purview" :disabled="rowType != 0">
               <el-radio :label="3">全平台所有</el-radio>
               <el-radio :label="2">本组织所有</el-radio>
               <el-radio :label="1">仅自己</el-radio>
@@ -43,8 +37,7 @@
               :values="formData.permission_arr"
               :options="permissionData"
               :props="defaultProps"
-              @changeMenu="changeMenu"
-            />
+              @changeMenu="changeMenu" />
           </el-form-item>
           <el-form-item label="是否启用" prop="state" class="state_item">
             <el-switch
@@ -55,39 +48,33 @@
               inline-prompt
               active-text="是"
               inactive-text="否"
-              :disabled="rowType != 0" 
-            />
+              :disabled="rowType != 0" />
           </el-form-item>
-
         </el-form>
       </div>
       <div class="bottom_action">
-        <el-button @click="goList">
-          取消
-        </el-button>
-        <el-button type="primary" @click="saveRole">
-          保存
-        </el-button>
+        <el-button @click="goList"> 取消 </el-button>
+        <el-button type="primary" @click="saveRole"> 保存 </el-button>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRouter, useRoute } from 'vue-router'
-const router = useRouter()
-const route = useRoute()
-const form = ref(null)
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
+const route = useRoute();
+const form = ref(null);
 const checkMenuLength = (rule, value, callback) => {
   if (value.length === 0) {
-    callback(new Error('请选择所需菜单'))
+    callback(new Error("请选择所需菜单"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 
 const roleState = reactive({
   form,
@@ -99,128 +86,108 @@ const roleState = reactive({
     permission_arr: [],
   }, // 表单项
   rules: {
-    role_name: [
-      { required: true, message: "请输入角色名称", trigger: "blur" },
-    ],
-    
-    data_purview: [
-      { required: true, message: "请选择数据权限", trigger: "change" },
-    ],
-    state: [
-      { required: true, message: "请选择是否启用", trigger: "change" },
-    ],
-    permission_arr: [
-      { required: true, type: "array", validator: checkMenuLength, trigger: "change" }
-    ]
+    role_name: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
+
+    data_purview: [{ required: true, message: "请选择数据权限", trigger: "change" }],
+    state: [{ required: true, message: "请选择是否启用", trigger: "change" }],
+    permission_arr: [{ required: true, type: "array", validator: checkMenuLength, trigger: "change" }],
   }, // 表单校验规则
   defaultProps: {
-    name: 'menu_name',
-    value: 'id',
-    children: 'Child',
-    remark: 'remark',
+    name: "menu_name",
+    value: "id",
+    children: "Child",
+    remark: "remark",
   }, // 菜单框默认配置
   permissionData: [], // 菜单数据
   rowType: 0,
-})
+});
 const getMenuTree = () => {
-  axios
-    .get(`/apaas/system/v5/menu/tree`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        roleState.permissionData = res.data.data || []
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 获取菜单数据
+  axios.get(`/apaas/system/v5/menu/tree`).then((res) => {
+    if (res.data.code == 200) {
+      roleState.permissionData = res.data.data || [];
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取菜单数据
 
 const changeMenu = (val) => {
-  roleState.formData.permission_arr = val
-} // 修改选中的菜单
+  roleState.formData.permission_arr = val;
+}; // 修改选中的菜单
 
 const getRoleDetail = () => {
-  axios
-    .get(`/apaas/system/v5/role/detail/${route.query.id}`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        let { role_name, role_desc, data_purview, state, menus } = res.data.data
-        roleState.rowType = res.data.data.role_type
-        let permission_arr = []
-        if (menus && menus.length > 0) {
-          menus.forEach(e => {
-            permission_arr.push(e.id)
-          })
-        }
-        roleState.formData = {
-          role_name,
-          role_desc,
-          data_purview,
-          state,
-          permission_arr:[...permission_arr]
-        }
-        console.log(roleState.formData.permission_arr)
-      }else {
-        ElMessage.error(res.data.data)
+  axios.get(`/apaas/system/v5/role/detail/${route.query.id}`).then((res) => {
+    if (res.data.code == 200) {
+      let { role_name, role_desc, data_purview, state, menus } = res.data.data;
+      roleState.rowType = res.data.data.role_type;
+      let permission_arr = [];
+      if (menus && menus.length > 0) {
+        menus.forEach((e) => {
+          permission_arr.push(e.id);
+        });
       }
-    })
-} // 获取角色详情
+      roleState.formData = {
+        role_name,
+        role_desc,
+        data_purview,
+        state,
+        permission_arr: [...permission_arr],
+      };
+      console.log(roleState.formData.permission_arr);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取角色详情
 
 const saveRole = () => {
-  roleState.form.validate(valid => {
+  roleState.form.validate((valid) => {
     if (valid) {
       let params = {
         role_name: roleState.formData.role_name,
         role_desc: roleState.formData.role_desc,
         state: roleState.formData.state,
         data_purview: roleState.formData.data_purview,
-        menu_ids: [...roleState.formData.permission_arr]
-      }
-      if (!route.query.id) { // 新增
-        axios
-          .put(`/apaas/system/v5/role/create`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              router.push('/system/role')
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
-      }else { // 编辑
-        params.id = +route.query.id
-        axios
-          .post(`/apaas/system/v5/role/update`,params)
-          .then((res) => {
-            if (res.data.code == 200) {
-              ElMessage.success(res.data.msg)
-              router.push('/system/role')
-            }else {
-              ElMessage.error(res.data.data)
-            }
-          })
+        menu_ids: [...roleState.formData.permission_arr],
+      };
+      if (!route.query.id) {
+        // 新增
+        axios.put(`/apaas/system/v5/role/create`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            router.push("/system/role");
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
+      } else {
+        // 编辑
+        params.id = +route.query.id;
+        axios.post(`/apaas/system/v5/role/update`, params).then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+            router.push("/system/role");
+          } else {
+            ElMessage.error(res.data.data);
+          }
+        });
       }
     }
-  })
-} // 新增或编辑角色的保存
+  });
+}; // 新增或编辑角色的保存
 const goList = () => {
-  router.push("/system/role")
-}
+  router.push("/system/role");
+};
 
 onBeforeMount(() => {
-  getMenuTree()
+  getMenuTree();
   if (route.query.id) {
     // 有id表示是编辑，请求详情，回显
-    getRoleDetail()
+    getRoleDetail();
   }
-})
-    
-const {
-  formData,
-  rules,
-  defaultProps,
-  permissionData,
-  rowType,
-} = toRefs(roleState)
+});
+
+const { formData, rules, defaultProps, permissionData, rowType } = toRefs(roleState);
 </script>
 
 <style lang="scss" scoped>
@@ -240,7 +207,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -278,5 +245,4 @@ const {
     }
   }
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/main/system/role/edit/index.vue b/src/page/main/system/role/edit/index.vue
index 7a43686..f583f5d 100644
--- a/src/page/main/system/role/edit/index.vue
+++ b/src/page/main/system/role/edit/index.vue
@@ -4,5 +4,5 @@
 </template>
 
 <script setup>
-import roleForm from '../add/role_form.vue'
-</script>
\ No newline at end of file
+import roleForm from "../add/role_form.vue";
+</script>
diff --git a/src/page/main/system/role/index.vue b/src/page/main/system/role/index.vue
index b328cd3..9b9501c 100644
--- a/src/page/main/system/role/index.vue
+++ b/src/page/main/system/role/index.vue
@@ -8,23 +8,17 @@
       </el-breadcrumb>
     </div>
     <div class="main_container">
-      <bg-filter-group 
-        @search="changeSearch" 
-        v-model="filter.search" 
-        placeholder="请输入角色名称"
-      >
+      <bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入角色名称">
         <template v-slot:left_action>
           <div class="apaas_button">
             <el-button class="register_btn" type="primary" @click="register">
               <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
-                新建
-            </el-button>
-            <el-button class="register_btn" type="primary" @click="deleteRows">
-                批量删除
+              新建
             </el-button>
+            <el-button class="register_btn" type="primary" @click="deleteRows"> 批量删除 </el-button>
             <div class="select_text">
               <span>已选择</span>
-              <span class="num">{{selection.length}}</span>
+              <span class="num">{{ selection.length }}</span>
               <span>项</span>
               <span class="can_click_text" @click="clearRoleSelection">清空</span>
             </div>
@@ -33,36 +27,54 @@
       </bg-filter-group>
       <div class="table_container">
         <div class="table bg-scroll">
-          <bg-table 
-            ref="Bgtable" 
-            :headers="headers" 
-            :rows="tableRows" 
-            :select="true" 
-            :stripe="true" 
+          <bg-table
+            ref="Bgtable"
+            :headers="headers"
+            :rows="tableRows"
+            :select="true"
+            :stripe="true"
             canEdit
-            canEditFlag='state' 
-            @selectAc="selectRows"
-          >
+            canEditFlag="state"
+            @selectAc="selectRows">
             <template v-slot:state="{ row }">
-              <bg-switch 
-                @click="changeUseRow(row)" 
-                :labels="['否','是']" 
-                :values="[0,1]" 
-                v-model="row.state" 
-                :disabled="row.role_type == 1 || row.role_type == 2"
-              />
+              <bg-switch
+                @click="changeUseRow(row)"
+                :labels="['否', '是']"
+                :values="[0, 1]"
+                v-model="row.state"
+                :disabled="row.role_type == 1 || row.role_type == 2" />
             </template>
             <template v-slot:created_time="{ row }">
               {{ row.created_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
             </template>
             <template v-slot:action="{ row }">
-              <bg-table-btn class="can_click_text" :click="()=>{edit_row(row)}">
+              <bg-table-btn
+                class="can_click_text"
+                :click="
+                  () => {
+                    edit_row(row);
+                  }
+                ">
                 编辑
               </bg-table-btn>
-              <bg-table-btn class="can_click_text" :click="()=>{distribute_user(row)}" :disabled="row.cant_allot == 1">
+              <bg-table-btn
+                class="can_click_text"
+                :click="
+                  () => {
+                    distribute_user(row);
+                  }
+                "
+                :disabled="row.cant_allot == 1">
                 分配用户
               </bg-table-btn>
-              <bg-table-btn class="can_click_text" :click="()=>{delete_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
+              <bg-table-btn
+                class="can_click_text"
+                :click="
+                  () => {
+                    delete_row(row);
+                  }
+                "
+                :disabled="row.state == 1 || row.role_type == 1">
                 删除
               </bg-table-btn>
             </template>
@@ -73,23 +85,12 @@
           :size="filter.limit"
           :total="tableTotal"
           @change-page="changePage"
-          @change-size="changeSize"
-        >
+          @change-size="changeSize">
         </bg-pagination>
       </div>
     </div>
     <!-- 删除弹窗 -->
-    <el-dialog
-      class="dialog_box"
-      title="提示"
-      v-model="delDialog"
-      width="400px"
-      :before-close="
-        () => {
-          delDialog = false;
-        }
-      "
-    >
+    <el-dialog class="dialog_box" title="提示" v-model="delDialog" width="400px">
       <div>确定要删除选中的数据吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -99,48 +100,39 @@
       </template>
     </el-dialog>
     <!-- 分配用户 -->
-    <el-dialog
-      class="distribute_dialog"
-      title="分配用户"
-      v-model="distributeDialog"
-      width="1062px"
-      :before-close="
-        () => {
-          distributeDialog = false;
-        }
-      "
-    >
+    <el-dialog class="distribute_dialog" title="分配用户" v-model="distributeDialog" width="1062px">
       <div class="distribute_box">
         <div class="topFilter">
           <div class="left">
             <span>已选择</span>
-            <span class="num">{{userSelection.length}}</span>
+            <span class="num">{{ userSelection.length }}</span>
             <span>项</span>
             <span class="can_click_text" @click="clearUserSelection">清空</span>
           </div>
           <div class="right">
-            <el-select
-              v-model="userFilter.is_admin"
-              placeholder="请选择"
-              style="width: 200px"
-            >
+            <el-select v-model="userFilter.is_admin" placeholder="请选择" style="width: 200px">
               <el-option
                 v-for="(item, index) in userTypeList"
                 :key="'pushOptions' + index"
                 :label="item.name"
-                :value="item.value"
-              >
+                :value="item.value">
               </el-option>
             </el-select>
             <el-cascader
               v-model="userFilter.organization_id"
               :options="orgList"
               placeholder="请选择组织"
-              :props="{ expandTrigger: 'hover', label: 'name', value: 'id', emitPath: false, checkStrictly: true, children: 'Child'}"
+              :props="{
+                expandTrigger: 'hover',
+                label: 'name',
+                value: 'id',
+                emitPath: false,
+                checkStrictly: true,
+                children: 'Child',
+              }"
               :clearable="true"
               collapse-tags
-              style="width: 200px"
-            >
+              style="width: 200px">
               <template #default="{ data }">
                 <span>{{ data.name }}</span>
               </template>
@@ -149,24 +141,22 @@
               v-model.trim="userFilter.search"
               placeholder="请输入内容"
               style="width: 200px"
-              :prefix-icon="Search"
-            />
+              :prefix-icon="Search" />
             <el-button type="primary" @click="searchAction">查询</el-button>
             <el-button type="default" @click="clearAction">重置</el-button>
           </div>
         </div>
         <div class="table_box">
           <div class="user_table bg-scroll">
-            <bg-table 
-              ref="userTable" 
-              :headers="userHeaders" 
-              :rows="userRows" 
-              :select="true" 
+            <bg-table
+              ref="userTable"
+              :headers="userHeaders"
+              :rows="userRows"
+              :select="true"
               :stripe="true"
-              @selectAc="selectUserRows"
-            >
+              @selectAc="selectUserRows">
               <template v-slot:is_admin="{ row }">
-                {{ ["","业务系统账号","组织管理员账号","平台用户账号"][row.is_admin] }}
+                {{ ["", "业务系统账号", "组织管理员账号", "平台用户账号"][row.is_admin] }}
               </template>
             </bg-table>
           </div>
@@ -175,8 +165,7 @@
             :size="userFilter.limit"
             :total="total"
             @change-page="changeUserPage"
-            @change-size="changeUserSize"
-          >
+            @change-size="changeUserSize">
           </bg-pagination>
         </div>
       </div>
@@ -191,36 +180,35 @@
 </template>
 
 <script setup>
-import { Search } from '@element-plus/icons-vue'
-import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
-import axios from '../../../../request/http.js'
-import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
-const router = useRouter()
-const Bgtable = ref(null)
-const userTable = ref(null)
+import { Search } from "@element-plus/icons-vue";
+import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
+import axios from "../../../../request/http.js";
+import { ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
+const router = useRouter();
+const Bgtable = ref(null);
+const userTable = ref(null);
 const state = reactive({
   filter: {
     page: 1,
     limit: 10,
     search: "",
-  }, 
+  },
   headers: [
     {
       label: "角色名",
       prop: "role_name",
-      width: 220
+      width: 220,
     },
     {
       label: "创建人",
       prop: "created_by",
-      
-      width: 220
+      width: 220,
     },
     {
       label: "创建时间",
       prop: "created_time",
-      width: 276
+      width: 276,
     },
     {
       label: "账号数",
@@ -229,12 +217,12 @@ const state = reactive({
     {
       label: "描述",
       prop: "role_desc",
-      minWidth: 346
+      minWidth: 346,
     },
     {
       label: "是否启用",
       prop: "state",
-      width: 95
+      width: 95,
     },
     {
       label: "操作",
@@ -249,7 +237,7 @@ const state = reactive({
   selection: [],
   delDialog: false,
   delType: 1, // 删除类型  1-单条删除 2-批量删除
-})
+});
 const userState = reactive({
   userFilter: {
     is_admin: "",
@@ -261,15 +249,15 @@ const userState = reactive({
   userTypeList: [
     {
       name: "全部类型",
-      value: ""
+      value: "",
     },
     {
       name: "组织管理员账号",
-      value: 2
+      value: 2,
     },
     {
       name: "平台用户账号",
-      value: 3
+      value: 3,
     },
   ],
   orgList: [],
@@ -295,101 +283,95 @@ const userState = reactive({
   total: 0,
   userSelection: [],
   distributeDialog: false, // 分配用户弹窗
-})
+});
 const getRoleRows = () => {
-  let params = {...state.filter}
-  console.log(params)
-  axios
-    .get(`/apaas/system/v5/role/list`,{params})
-    .then((res) => {
-      if (res.data.code == 200) {
-        state.tableRows = res.data.data || []
-        state.tableTotal = res.data.total
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 获取角色列表
+  let params = { ...state.filter };
+  console.log(params);
+  axios.get(`/apaas/system/v5/role/list`, { params }).then((res) => {
+    if (res.data.code == 200) {
+      state.tableRows = res.data.data || [];
+      state.tableTotal = res.data.total;
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取角色列表
 
 const getOrgList = () => {
-  axios
-    .get(`/apaas/system/v5/org/tree`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        console.log(res.data.data)
-        userState.orgList = res.data.data || []
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-} // 获取组织列表
+  axios.get(`/apaas/system/v5/org/tree`).then((res) => {
+    if (res.data.code == 200) {
+      console.log(res.data.data);
+      userState.orgList = res.data.data || [];
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+}; // 获取组织列表
 const changePage = (val) => {
-  state.filter.page = val
-  getRoleRows()
-} // 改变页码
+  state.filter.page = val;
+  getRoleRows();
+}; // 改变页码
 
 const changeSize = (val) => {
-  state.filter.limit = val
-  changePage(1)
-} // 改变每页条数
+  state.filter.limit = val;
+  changePage(1);
+}; // 改变每页条数
 
 const changeSearch = (val) => {
-  state.filter.search = val
-  changePage(1)
-} // 表格关键字筛选
+  state.filter.search = val;
+  changePage(1);
+}; // 表格关键字筛选
 
 const changeUseRow = (row) => {
   if (row.role_type == 1 || row.role_type == 2) {
-    return
+    return;
   }
-  axios
-    .post(`/apaas/system/v5/role/state/${row.id}/${row.state}`)
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
-        row.state = row.state == 0 ? 1 : 0
-      }
-    })
-} // 更改启用禁用状态
+  axios.post(`/apaas/system/v5/role/state/${row.id}/${row.state}`).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      changePage(1);
+    } else {
+      ElMessage.error(res.data.data);
+      row.state = row.state == 0 ? 1 : 0;
+    }
+  });
+}; // 更改启用禁用状态
 
 const selectRows = (data) => {
-  state.selection = data.selection
-} // 表格多选
+  state.selection = data.selection;
+}; // 表格多选
 
 const clearRoleSelection = () => {
-  Bgtable.value.clearTable()
-}
+  Bgtable.value.clearTable();
+};
 
 const register = () => {
-  console.log("新建角色")
-  router.push("/system/role/add")
-} // 新建角色
+  console.log("新建角色");
+  router.push("/system/role/add");
+}; // 新建角色
 
 const edit_row = (row) => {
-  console.log(row,"编辑角色")
+  console.log(row, "编辑角色");
   router.push({
     path: "/system/role/edit",
     query: {
-      id: row.id
-    }
-  })
-} // 编辑角色
+      id: row.id,
+    },
+  });
+}; // 编辑角色
 
 const distribute_user = (row) => {
-  clearAction(1)
-  userState.distributeDialog = true
-  state.actionRow = row
-  getUserList()
-} // 分配角色按钮
+  clearAction(1);
+  userState.distributeDialog = true;
+  state.actionRow = row;
+  getUserList();
+}; // 分配角色按钮
 
 const getUserList = () => {
   nextTick(() => {
-    console.log(userTable)
-    clearUserSelection()
-  })
+    console.log(userTable);
+    clearUserSelection();
+  });
   let params = {
     limit: userState.userFilter.limit,
     page: userState.userFilter.page,
@@ -397,41 +379,39 @@ const getUserList = () => {
     organization_id: userState.userFilter.organization_id,
     is_admin: userState.userFilter.is_admin,
     role_id: state.actionRow.id,
-  }
-  axios
-    .get(`/apaas/system/v5/role/allotment/list`,{params})
-    .then((res) => {
-      if (res.data.code == 200) {
-        console.log(res.data.data)
-        userState.userRows = res.data.data || []
-        userState.total = res.data.total
-        nextTick(() => {
-          userState.userRows.forEach(e => {
-            if(e.is_bind == 1) {
-              console.log(userTable)
-              userTable.value.toggleRowSelection(e,true)
-            }
-          })
-        })
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
+  };
+  axios.get(`/apaas/system/v5/role/allotment/list`, { params }).then((res) => {
+    if (res.data.code == 200) {
+      console.log(res.data.data);
+      userState.userRows = res.data.data || [];
+      userState.total = res.data.total;
+      nextTick(() => {
+        userState.userRows.forEach((e) => {
+          if (e.is_bind == 1) {
+            console.log(userTable);
+            userTable.value.toggleRowSelection(e, true);
+          }
+        });
+      });
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 const changeUserPage = (val) => {
-  userState.userFilter.page = val
-  getUserList()
-}
+  userState.userFilter.page = val;
+  getUserList();
+};
 
 const changeUserSize = (val) => {
-  userState.userFilter.limit = val
-  changeUserPage(1)
-}
+  userState.userFilter.limit = val;
+  changeUserPage(1);
+};
 
 const searchAction = () => {
-  console.log(userState.userFilter)
-  changeUserPage(1)
-}
+  console.log(userState.userFilter);
+  changeUserPage(1);
+};
 
 const clearAction = (type) => {
   userState.userFilter = {
@@ -440,107 +420,87 @@ const clearAction = (type) => {
     search: "",
     limit: 10,
     page: 1,
-  }
+  };
   if (type != 1) {
-    changeUserPage(1)
+    changeUserPage(1);
   }
-}
+};
 
 const clearUserSelection = () => {
-  console.log(userTable.value)
-  userTable.value.clearTable()
-}
+  console.log(userTable.value);
+  userTable.value.clearTable();
+};
 
 const selectUserRows = (data) => {
-  userState.userSelection = data.selection
-}
+  userState.userSelection = data.selection;
+};
 
 const distribute = () => {
-  let user_ids = []
-  userState.userSelection.forEach(e => {
-    user_ids.push(e.id)
-  })
+  let user_ids = [];
+  userState.userSelection.forEach((e) => {
+    user_ids.push(e.id);
+  });
   let params = {
     id: state.actionRow.id,
-    user_ids: user_ids
-  }
-  axios
-    .post(`/apaas/system/v5/role/allotment/user`,params)
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        userState.distributeDialog = false
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-  
-}
+    user_ids: user_ids,
+  };
+  axios.post(`/apaas/system/v5/role/allotment/user`, params).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      userState.distributeDialog = false;
+      changePage(1);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 
 const delete_row = (row) => {
-  state.actionRow = row
-  state.delType = 1
-  state.delDialog = true
-} // 删除角色
+  state.actionRow = row;
+  state.delType = 1;
+  state.delDialog = true;
+}; // 删除角色
 
 const deleteRows = () => {
   if (state.selection.length == 0) {
-    ElMessage.error("请先选择要删除的数据")
-  }else {
-    state.delType = 2
-    state.delDialog = true
+    ElMessage.error("请先选择要删除的数据");
+  } else {
+    state.delType = 2;
+    state.delDialog = true;
   }
-} // 批量删除按钮
+}; // 批量删除按钮
 
 const deleteData = () => {
-  let ids = []
+  let ids = [];
   if (state.delType == 1) {
-    ids.push(state.actionRow.id)
-  }else {
-    state.selection.forEach(e => {
-      ids.push(e.id)
-    })
+    ids.push(state.actionRow.id);
+  } else {
+    state.selection.forEach((e) => {
+      ids.push(e.id);
+    });
   }
   let params = {
-    ids: [...ids]
-  }
-  axios
-    .delete(`/apaas/system/v5/role/delete`,{data: {ids:[...ids]}})
-    .then((res) => {
-      if (res.data.code == 200) {
-        ElMessage.success(res.data.msg)
-        state.delDialog = false
-        changePage(1)
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
+    ids: [...ids],
+  };
+  axios.delete(`/apaas/system/v5/role/delete`, { data: { ids: [...ids] } }).then((res) => {
+    if (res.data.code == 200) {
+      ElMessage.success(res.data.msg);
+      state.delDialog = false;
+      changePage(1);
+    } else {
+      ElMessage.error(res.data.data);
+    }
+  });
+};
 onBeforeMount(() => {
-  getRoleRows()
-  getOrgList()
-})
-    
-const {
-  filter,
-  headers,
-  tableRows,
-  tableTotal,
-  delDialog,
-  selection,
-} = toRefs(state)
+  getRoleRows();
+  getOrgList();
+});
+
+const { filter, headers, tableRows, tableTotal, delDialog, selection } = toRefs(state);
 
-const {
-  userFilter,
-  userTypeList,
-  orgList,
-  userHeaders,
-  userRows,
-  total,
-  userSelection,
-  distributeDialog,
-} =toRefs(userState)
+const { userFilter, userTypeList, orgList, userHeaders, userRows, total, userSelection, distributeDialog } =
+  toRefs(userState);
 </script>
 
 <style lang="scss" scoped>
@@ -560,7 +520,7 @@ const {
     justify-content: flex-start;
     align-items: stretch;
     background-color: #fff;
-    box-shadow: 0px 1px 4px 0px rgba(0,7,101,0.15);
+    box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
     border-radius: 6px;
     margin: 0 0 16px;
     position: relative;
@@ -630,14 +590,13 @@ const {
           max-height: calc(100% - 48px);
           :deep().bg-table {
             .el-scrollbar {
-              --el-scrollbar-bg-color: #fff
+              --el-scrollbar-bg-color: #fff;
             }
             .el-table__empty-block {
-              
               .empty_container {
                 height: calc(100% - 45px);
               }
-            } 
+            }
           }
         }
       }
@@ -647,12 +606,12 @@ const {
 </style>
 <style>
 .distribute_dialog .el-dialog__footer {
-  padding: 16px!important;    
+  padding: 16px !important;
 }
 .distribute_dialog .el-dialog__body {
-  padding: 0px!important;    
+  padding: 0px !important;
 }
 .distribute_dialog {
-  margin-top: 130px!important;    
+  margin-top: 130px !important;
 }
-</style>
\ No newline at end of file
+</style>
-- 
2.26.0