diff --git a/src/components/api-type/grpc.vue b/src/components/api-type/grpc.vue
index 454ddac94e1e50f120fbde4ab454570c68e7efcb..05b742fa0b8967fb0bcb9df32abea5a06b38ab40 100644
--- a/src/components/api-type/grpc.vue
+++ b/src/components/api-type/grpc.vue
@@ -29,7 +29,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/components/api-type/mq.vue b/src/components/api-type/mq.vue
index eecbf234783f3f362bd349efd9a64542d3dd5d5c..fee7ca47feb95273fd9854230f6f723e8ded75ef 100644
--- a/src/components/api-type/mq.vue
+++ b/src/components/api-type/mq.vue
@@ -71,7 +71,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/components/api-type/socket.vue b/src/components/api-type/socket.vue
index 8e34138c5a9694daf47b1178c33c21df3ef71def..f0bff8c97374d14fbfaf623bb66059d24d51cf8b 100644
--- a/src/components/api-type/socket.vue
+++ b/src/components/api-type/socket.vue
@@ -28,7 +28,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/components/api-type/ui.vue b/src/components/api-type/ui.vue
index 5bd5944a1b19886541d2a0bb74439c01e04632aa..17cd0df69ba3e809190fdc7640b7fbf11ba17db8 100644
--- a/src/components/api-type/ui.vue
+++ b/src/components/api-type/ui.vue
@@ -75,7 +75,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/components/api-type/web-sdk.vue b/src/components/api-type/web-sdk.vue
index 5dda403d77a304581ff60ed6a99db4394962ad42..f756038f28a8cf56d378a6589c5bb6691e0fa017 100644
--- a/src/components/api-type/web-sdk.vue
+++ b/src/components/api-type/web-sdk.vue
@@ -41,7 +41,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/components/api-type/websocket.vue b/src/components/api-type/websocket.vue
index 7083f41f54edbc0386e0a733f3fac23b70c6de3f..acca009a1c2bf0d116e5c25c8d4ac75903d7bd29 100644
--- a/src/components/api-type/websocket.vue
+++ b/src/components/api-type/websocket.vue
@@ -28,7 +28,7 @@
 
     <!-- 测试结果弹窗 -->
     <el-dialog
-      custom-class="dialog_box result_box"
+      class="dialog_box result_box"
       title="提示"
       v-model="showDialog"
       width="400px"
diff --git a/src/msg-sdk/lib/msg.vue b/src/msg-sdk/lib/msg.vue
index b9485a3d26417ebbaec3c93c5f4e6f2590a4c362..a6e2f087b0d295d4abb139afd286e1966b61ecff 100644
--- a/src/msg-sdk/lib/msg.vue
+++ b/src/msg-sdk/lib/msg.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="msg-container-bdx12"  @click.stop>
-    <el-dialog title="详情" v-model="dialogVisible" width="640px"  custom-class="dialog_box1">
+    <el-dialog title="详情" v-model="dialogVisible" width="640px"  class="dialog_box1">
       <div>
         <detail-table2 :list="detailData">
           <template v-slot:action="{data}">
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index 4127babf01ac772270a53e171c7b08cc37cf6d74..460689ebd9b2f4092dd53e8b52cc66a99d4bfac1 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -83,7 +83,7 @@
     </div>
     <!-- 新建/编辑弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       :title=" addType == 1 ? '新建' : '编辑'"
       v-model="addDialog"
       width="758px"
@@ -148,7 +148,7 @@
     </el-dialog>
     <!-- 删除弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       title="提示"
       v-model="dialogDelete"
       width="400px"
diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue
index bfc91734dbfc77e1da49132bf0859afcd33dcd4c..49e8831d15b3e25a0580ce2b81d4f6ef278602cf 100644
--- a/src/page/main/develop/menu/index.vue
+++ b/src/page/main/develop/menu/index.vue
@@ -93,7 +93,7 @@
     </div>
     <!-- 删除弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       title="提示"
       v-model="delDialog"
       width="400px"
diff --git a/src/page/main/home-config/banner/index.vue b/src/page/main/home-config/banner/index.vue
index 52700492fcbbe06a35df1214bcfce6d368bdbd1f..536fbabd8a7a392130af986ca764884e0de16ae7 100644
--- a/src/page/main/home-config/banner/index.vue
+++ b/src/page/main/home-config/banner/index.vue
@@ -39,7 +39,7 @@
     </div>
     <!-- 删除弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       title="提示"
       v-model="dialogDelete"
       width="400px"
@@ -202,7 +202,6 @@ const moveRow = (row,type) => {
       sort: row.sort
     }
   ]
-  console.log(params)
   axios
     .post(`/apaas/system/v5/banner/sort`,[...params])
     .then((res) => {
diff --git a/src/page/main/home-config/recommend/edit/index.vue b/src/page/main/home-config/recommend/edit/index.vue
index c531f3123f3c693bce8398379ab06aedadcc6c4c..8e536994c528697b771729ba4b491beeb8b10341 100644
--- a/src/page/main/home-config/recommend/edit/index.vue
+++ b/src/page/main/home-config/recommend/edit/index.vue
@@ -4,7 +4,7 @@
     <bg-breadcrumb></bg-breadcrumb>
     <div class="main_container">
       <div class="content_top bg-scroll">
-        <type-form ref="typeFormRef" @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>
@@ -34,7 +34,7 @@
       </div>
     </div>
     <el-dialog
-      custom-class="select_dialog"
+      class="select_dialog"
       title="选择能力"
       v-model="selectDialog"
       width="1220px"
@@ -58,7 +58,7 @@
                 v-for="(item, index) in typeList"
                 :key="'typeList' + index"
                 :label="item.name"
-                :value="item.value"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -76,7 +76,7 @@
               </template>
             </el-cascader>
             <el-input
-              v-model.trim="dialogFilter.search"
+              v-model.trim="dialogFilter.keyword"
               placeholder="请输入内容"
               style="width: 240px"
               :prefix-icon="Search"
@@ -140,33 +140,19 @@ const state = reactive({
     logo: [],
     state: 1
   },
-  emptyArr: ["","","","","","","","",""],
   selectArr: ["","","","","","","","",""],
   selectDialog: false,
   dialogFilter: {
-    openness: "",
-    organization_id: "",
-    search: "",
+    openness: [],
+    organization_id: [],
+    keyword: "",
     limit: 15,
     page: 1,
     collation: 0,
   },
   orgList: [],
-  typeList: [
-    // {
-    //   name: "全部",
-    //   value: ""
-    // },
-    {
-      name: "共享",
-      value: 1
-    },
-    {
-      name: "开放",
-      value: 2
-    }
-  ],
-  total: 40,
+  typeList: [],
+  total: 0,
   collationArr: [
     {
       name:'综合排序',
@@ -185,6 +171,7 @@ const state = reactive({
       value:3,
     },
   ],
+  businessList: [],
   list: [],
   selectArrNew: []
 })
@@ -229,262 +216,38 @@ const changeType = (val) => {
 const getAbilityList = () => {
   let params = {
     ...state.dialogFilter,
-    business_type_id: state.formData.business_type_id
+    business_type: state.formData.business_type_id
   }
-  console.log(params)
-  state.list= [
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 1,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      ability_id: "5228116e-db80-42ed-9c31-5d681ed434ca",
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试112101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 2,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101",
-      ability_id: "cf7d0496-9b65-460a-ba07-82ae10fbbe3d",
-    },
-    {
-      ability_logo: "",
-      ability_name: "测试1121s01",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 3,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101",
-      ability_id: "00c5fc87-861e-4a58-ade5-03058364ad1e",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 4,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      ability_id: "e71240fe-2305-4637-bbb5-316f2cdb77ee",
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 5,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      ability_id: "ea1488f5-3912-4c83-8b38-98a7dcdafc5f",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      ability_id: "70c371d3-7b7a-4c66-a40f-30d83ac567b3",
-      id: 6,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      ability_id: "346237c3-9c21-4cf8-ae1d-3d8692ad0255",
-      id: 7,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      ability_id: "f8039680-7978-4561-982d-96b799459368",
-      id: 8,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 9,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 10,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 11,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 12,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 13,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-    {
-      ability_logo: "",
-      ability_name: "冒烟测试1冒烟测试冒烟测试12101",
-      ability_type: 0,
-      browse_count: 118,
-      call_count: 666,
-      develop: "比格",
-      develop_id: "0e9f31d8-117c-4be4-bdfb-9af1bddd852e",
-      id: 14,
-      include_mock_service: true,
-      openness: "开放",
-      openness_id: "9de06ba6-6ee2-4449-91d9-31a1c7554311",
-      score: 1.9,
-      sort_weight: 228.2733180765668,
-      synopsis: "冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101冒烟测试112101",
-    },
-  ]
-  state.selectArrNew = []
-  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)
-          }
-        }
-      })
+  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
-  getAbilityList()
+  console.log(state.dialogFilter)
+  clearAction()
 }
 
 const deleteItem = (item) => {
@@ -531,6 +294,7 @@ const changeSize = (val) => {
 
 const changeCollation = (val) => {
   state.dialogFilter.collation = val
+  changePage(1)
 }
 
 const clearSelection = () => {
@@ -540,15 +304,16 @@ const clearSelection = () => {
   state.selectArrNew = []
 }
 const searchAction = () => {
-  console.log(state.dialogFilter)
+  changePage(1)
 }
 
 const clearAction = () => {
   state.dialogFilter = {
-    openness: "",
-    organization_id: "",
-    search: "",
+    openness: [],
+    organization_id: [],
+    keyword: "",
     collation: 0,
+    limit: 15,
   }
   changePage(1)
 }
@@ -654,7 +419,28 @@ const cancel = () => {
   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)
+      }
+    })
+}
+
 onBeforeMount(() => {
+  getTypeList()
   getOrgList()
   if (route.query.id) {
     getDetail(route.query.id)
@@ -664,7 +450,6 @@ onBeforeMount(() => {
 const {
   formData,
   selectArr,
-  emptyArr,
   selectDialog,
   dialogFilter,
   typeList,
@@ -674,6 +459,7 @@ const {
   selection,
   list,
   selectArrNew,
+  businessList,
 } = toRefs(state)
 
 </script>
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 9cde442c9adac48a177093fbe7707672ccd02f9b..d651b0966d5411d19c4bb1b9ede2aea804826432 100644
--- a/src/page/main/home-config/recommend/edit/type-form.vue
+++ b/src/page/main/home-config/recommend/edit/type-form.vue
@@ -7,12 +7,12 @@
     class="form"
   >
     <el-form-item label="能力类型" prop="business_type_id">
-      <el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType">
+      <el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType" :disabled="route.query.id">
         <el-option
-          v-for="item in TypeList"
+          v-for="item in props.businessList"
           :key="item.dict_id"
           :label="item.name"
-          :value="item.dict_id"
+          :value="item.id"
         />
       </el-select>
     </el-form-item>
@@ -30,6 +30,12 @@ import { useRoute, useRouter } from 'vue-router'
 const router = useRouter()
 const route = useRoute()
 const form = ref(null)
+const props = defineProps({
+  businessList: {
+    type: Array,
+    default: []
+  }
+})
 const state = reactive({
   formData: {
     business_type_id: "",
@@ -43,7 +49,6 @@ const state = reactive({
       { required: true, message: '请上传图标', trigger: 'change' },
     ],
   },
-  TypeList: [],
 })
 
 const emit = defineEmits(['action','changeType'])
@@ -73,31 +78,13 @@ const setForm = (data) => {
   Object.assign(state.formData, data);
 }
 
-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.TypeList = e.list || [];
-          }
-        })
-      }else {
-        ElMessage.error(res.data.data)
-      }
-    })
-}
-
 onBeforeMount(() => {
-  getTypeList()
+
 })
     
 const {
   formData,
   formRules,
-  TypeList,
 } = toRefs(state)
 
 defineExpose({ submitForm, clearForm, setForm })
diff --git a/src/page/main/home-config/recommend/index.vue b/src/page/main/home-config/recommend/index.vue
index 710ccf6889799ad8bf0c754d8606284a2cdff7fc..433280d87fb93af71ea1b00f843e17d3d79a75c3 100644
--- a/src/page/main/home-config/recommend/index.vue
+++ b/src/page/main/home-config/recommend/index.vue
@@ -24,8 +24,8 @@
             :isIndex="true"
             :stripe="true"
           >
-            <template v-slot:state="{ row }">
-              <bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
+            <template v-slot:recommend_state="{ row }">
+              <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)" />
@@ -36,7 +36,7 @@
     </div>
     <!-- 删除弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       title="提示"
       v-model="dialogDelete"
       width="400px"
@@ -69,7 +69,7 @@ const state = reactive({
   headers: [
     {
       label: "能力类型",
-      prop: "ability_type",
+      prop: "business_type_name",
     },
     {
       label: "创建人",
@@ -77,11 +77,11 @@ const state = reactive({
     },
     {
       label: "更新时间",
-      prop: "update_time",
+      prop: "created_time",
     },
     {
       label: "是否启用",
-      prop: "state",
+      prop: "recommend_state",
     },
     {
       label: "操作",
@@ -96,73 +96,23 @@ const state = reactive({
 })
 
 const getRoleRows = () => {
-  state.tableRows = [
-    {
-      id: 1,
-      ability_type: "数据服务",
-      created_user: "admin",
-      update_time: "2022-11-29 14:30:34",
-      state: 1,
-      sort: 1,
-    },
-    {
-      id: 2,
-      ability_type: "视频服务",
-      created_user: "admin",
-      update_time: "2022-11-29 14:30:34",
-      state: 0,
-      sort: 2,
-    },
-    {
-      id: 3,
-      ability_type: "综合服务",
-      created_user: "admin",
-      update_time: "2022-11-29 14:30:34",
-      state: 1,
-      sort: 3,
-    },
-    {
-      id: 4,
-      ability_type: "融合服务",
-      created_user: "admin",
-      update_time: "2022-11-29 14:30:34",
-      state: 0,
-      sort: 4,
-    },
-    {
-      id: 5,
-      ability_type: "时空服务",
-      created_user: "admin",
-      update_time: "2022-11-29 14:30:34",
-      state: 1,
-      sort: 5,
-    },
-  ]
-  if (state.tableRows.length > 0) {
-    state.tableRows.forEach(e => {
-      e.canMoveUp = true
-      e.canMoveDown = true
+  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)
+      }
     })
-    state.tableRows[0].canMoveUp = false
-    state.tableRows[state.tableRows.length - 1].canMoveDown = false
-  }
-  // axios
-  //   .get(`/apaas/service/v5/ability/query/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) => {
@@ -170,12 +120,12 @@ const getOperations = (row) => {
     {
       name: "编辑",
       callback: () => edit_row(row),
-      disabled: row.state == 1,
+      disabled: row.recommend_state == 1,
     },
     {
       name: "删除",
       callback: () => delete_row(row),
-      disabled: row.state == 1,
+      disabled: row.recommend_state == 1,
     },
     {
       name: "上移",
@@ -197,17 +147,34 @@ const addBanner = () => {
 
 const edit_row = (row) => {
   console.log("去编辑")
+  router.push({
+    path: "/home-config/recommend/edit",
+    query: {
+      id: row.id
+    }
+  })
 }
 
 const delete_row = (row) => {
   state.actionRow = row
   state.dialogDelete = true
-  console.log("删除")
 }
 
 const deleteData = () => {
-  console.log("确定删除",state.actionRow)
-  state.dialogDelete = false
+  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)
+      }
+    })
 }
 
 const moveRow = (row,type) => {
@@ -233,24 +200,33 @@ const moveRow = (row,type) => {
       sort: row.sort
     }
   ]
-  console.log(params)
-  // axios
-  //   .put(``,[...params])
-  //   .then((res) => {
-  //     if (res.data.code == 200) {
-  //       ElMessage.success(res.data.msg)
-  //       getRoleRows()
-  //     }else {
-  //       ElMessage.error(res.data.data)
-  //     }
-  //   })
-  //   .catch((err) => {
-  //     console.log(err)
-  //   })
+  axios
+    .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)
+      }
+    })
+    .catch((err) => {
+      console.log(err)
+    })
 }
 
 const changeUseRow = (row) => {
-  console.log(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
+      }
+    })
 }
 
 onBeforeMount(() => {
diff --git a/src/page/main/system/role/index.vue b/src/page/main/system/role/index.vue
index c26447ebb9ba3b872fecdb4b9e3fd217837aa123..c611e98d8ad1a4190b24249f67ef9e17ed9f6e25 100644
--- a/src/page/main/system/role/index.vue
+++ b/src/page/main/system/role/index.vue
@@ -80,7 +80,7 @@
     </div>
     <!-- 删除弹窗 -->
     <el-dialog
-      custom-class="dialog_box"
+      class="dialog_box"
       title="提示"
       v-model="delDialog"
       width="400px"
@@ -100,7 +100,7 @@
     </el-dialog>
     <!-- 分配用户 -->
     <el-dialog
-      custom-class="distribute_dialog"
+      class="distribute_dialog"
       title="分配用户"
       v-model="distributeDialog"
       width="1062px"