Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

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;
   }

front/src/views/abilityStatistics/components/ResourceAggregation.vue

@@ -454,13 +454,21 @@
         data: [],
       },
       xAxis: {
-        name: '部门数量（个）',
+        name: '上架数量区间',
         data: [],
       },
-      yAxis: {},
+      yAxis: {
+        name: '部门数量（个）',
+      },
+      grid: {
+        height: '65%',
+        width: '63%',
+        left: '10%',
+        bottom: 30,
+      },
       series: [
         {
-          name: '上架数量区间',
+          name: '',
           type: 'bar',
           barWidth: 35,
           barGap: '-100%',