From 9243c94e8d44a64bfa0479d6064e362601df0411 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 13 Oct 2022 21:35:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ability/components/combine-ability.vue  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index a17660eb..78c068b4 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -16,18 +16,17 @@
               </el-transfer>
             </div>
             <div v-else-if="type==='数据资源'"  class="dataTransfer">
-              <el-transfer v-model="selectedArray" filter-placeholder="请输入名称"
+              <el-transfer v-model="selectedArray" filterable :filter-method="filterMethod" filter-placeholder="请输入名称"
                     :titles="nameArray" :props="{
                         key: 'id',
                         label: 'name',
-                    }" :data="transferData"
-                     @change="handleChange">
+                    }" :data="transferData">
                 </el-transfer>
-                <el-input
+                <!-- <el-input
                   v-model="searchValue"
                   placeholder="请输入名称"
                 ></el-input>
-                <el-button @click="rest" class="restClick">重置</el-button>
+                <el-button @click="rest" class="restClick">重置</el-button> -->
             </div>
             <el-pagination
               v-if="type==='数据资源'"
@@ -314,7 +313,7 @@ export default {
       return item.name && item.name.indexOf(query) > -1
     },
     confirmSubmitHandle () {
-      debugger
+      console.log('tttttt',this.selectedArray)
       if(this.type === "数据资源"){
        //通过选中的数据去查找原始列表数据
       let selectedObjectList = [];
@@ -494,7 +493,7 @@ export default {
     position: absolute;
     font-size: 14px;
     display: inline-block;
-    width: 30%;
+    width: 80%;
     top: 52px;
     left: 12px;
   }

From aecfba1391471a177e2dc0b743f8493f37e64890 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 13 Oct 2022 21:37:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SharingSituation.vue                  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index fa70bfe6..9b3a5d98 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@@ -205,21 +205,21 @@
       res.data.data.map((item) => {
         switch (item.type) {
           case '应用资源':
-            dataLists.value[1] = item
-            break
-          case '业务组件':
             dataLists.value[0] = item
             break
+          case '业务组件':
+            dataLists.value[3] = item
+            break
           case '图层服务':
-            dataLists.value[2] = item
+            dataLists.value[1] = item
             break
           case '开发组件':
-            dataLists.value[3] = item
+            dataLists.value[2] = item
             break
           case '智能算法':
             dataLists.value[4] = item
             break
-            case '会客厅':
+          case '会客厅':
             dataLists.value[5] = item
             break
           default: