From c58356986807f96d064e831baaf6c2173e2d4087 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 13 Oct 2022 21:28:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceAggregation.vue               | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 5f4ebb97..fda59640 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -457,10 +457,18 @@
         name: '部门数量（个）',
         data: [],
       },
-      yAxis: {},
+      yAxis: {
+        name: '上架数量区间',
+      },
+      grid: {
+        height: '65%',
+        width: '63%',
+        left: '10%',
+        bottom: 30,
+      },
       series: [
         {
-          name: '上架数量区间',
+          name: '',
           type: 'bar',
           barWidth: 35,
           barGap: '-100%',

From 1a530271c509c6a0b0f972b359ecbfcfbc70aa2d Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 13 Oct 2022 21:34:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/components/ResourceAggregation.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index fda59640..186c98e0 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -454,11 +454,11 @@
         data: [],
       },
       xAxis: {
-        name: '部门数量（个）',
+        name: '上架数量区间',
         data: [],
       },
       yAxis: {
-        name: '上架数量区间',
+        name: '部门数量（个）',
       },
       grid: {
         height: '65%',

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 3/3] =?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;
   }