wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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

This commit is contained in:
gongjiale 2022-10-13 21:37:53 +08:00
parent aecfba1391 9243c94e8d
commit d06bf23062
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
back/src/views/modules/ability/components/combine-ability.vue
View File

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

14
front/src/views/abilityStatistics/components/ResourceAggregation.vue
View File

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