更改色度值,去掉调用数量

This commit is contained in:
guoyue 2022-07-01 14:03:31 +08:00
parent 02639e6696
commit e7bc4e8f0c
5 changed files with 50 additions and 22 deletions

View File

@ -30,6 +30,12 @@ export default {
type: Array, type: Array,
default: () => [] default: () => []
}, },
colorArray: {
type: Array,
default: () => [
'#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1',
]
},
}, },
watch: { watch: {
dataList: { dataList: {
@ -62,9 +68,6 @@ export default {
this.myChart = chartDom && echarts.init(chartDom); this.myChart = chartDom && echarts.init(chartDom);
let lengendArr = this.dataListCopy.filter(v => v.name); let lengendArr = this.dataListCopy.filter(v => v.name);
let colorArray = [
'#fe845e', '#ff3e55', '#d5c438', '#ff9999', '#9c78ed', '#48c760', '#48c6c7', '#0058e1',
]
let total = 0; let total = 0;
this.dataListCopy.map(v => { this.dataListCopy.map(v => {
@ -129,7 +132,7 @@ export default {
"type": "pie", "type": "pie",
"center": ["50%", "40%"], "center": ["50%", "40%"],
"radius": ["50%", "63%"], "radius": ["50%", "63%"],
"color": colorArray, "color": this.colorArray,
"startAngle": 135, "startAngle": 135,
label: { label: {
show: false show: false

View File

@ -12,9 +12,16 @@
</div> </div>
</div> </div>
<div class="list-box" v-if="dataInfo.list.length > 0"> <div class="list-box" v-if="dataInfo.list.length > 0">
<div class="list-item" v-for="(item, i) in dataInfo.list" :key="i">
{{ item[dataInfo.nameStr] || '--' }} <div v-for="(item, i) in dataInfo.list" :key="i">
<el-tooltip effect="dark" :content="item[dataInfo.nameStr]" placement="top">
<div class="list-item ellipsis">
{{ item[dataInfo.nameStr] || '--' }}
</div>
</el-tooltip>
</div> </div>
<div class="more"> <div class="more">
查看更多 > 查看更多 >
</div> </div>
@ -49,6 +56,13 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ellipsis {
//
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.no-margin-left { .no-margin-left {
margin-left: 0; margin-left: 0;
} }

View File

@ -19,7 +19,9 @@
<div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i"> <div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
<div class="left"> <div class="left">
<div class="row-index">{{ i + 3 }}</div> <div class="row-index">{{ i + 3 }}</div>
<div class="name-text">{{ data.name || '--' }}</div> <el-tooltip effect="dark" :content="data.name" placement="top">
<div class="name-text ellipsis">{{ data.name || '--' }}</div>
</el-tooltip>
</div> </div>
<div class="count-text">{{ formatCount(data.count) }}</div> <div class="count-text">{{ formatCount(data.count) }}</div>
</div> </div>
@ -100,6 +102,13 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ellipsis {
//
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.flex-row-between { .flex-row-between {
display: flex; display: flex;
width: 100%; width: 100%;
@ -164,6 +173,7 @@ export default {
font-size: 16px; font-size: 16px;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 70px; margin-top: 70px;
width: 150px;
} }
.count { .count {
@ -185,6 +195,7 @@ export default {
font-size: 16px; font-size: 16px;
color: #464545; color: #464545;
margin-left: 10px; margin-left: 10px;
width: 430px;
} }

View File

@ -23,7 +23,7 @@ export default {
title: "名称", title: "名称",
key: "name", key: "name",
dataIndex: "name", dataIndex: "name",
width: 220 width: 250
}, },
{ {
title: "类型", title: "类型",
@ -35,7 +35,7 @@ export default {
title: "单位", title: "单位",
key: "deptContacts", key: "deptContacts",
dataIndex: "deptContacts", dataIndex: "deptContacts",
width: 114 width: 144
}, },
{ {
title: "时间", title: "时间",
@ -47,14 +47,8 @@ export default {
title: "当前申请数", title: "当前申请数",
key: "applyCount", key: "applyCount",
dataIndex: "applyCount", dataIndex: "applyCount",
width: 115 width: 145
}, },
{
title: "调用数量",
key: "visit",
dataIndex: "visit",
width: 90
}
], ],
data: [ data: [

View File

@ -8,11 +8,14 @@
style="margin-left: 0"></dept-todo-view> style="margin-left: 0"></dept-todo-view>
</div> </div>
<div class="flex-row-start dept-chart-box"> <div class="flex-row-start dept-chart-box">
<dept-chart-view id="shelves" title="部门上架" v-loading="loadingResource" :dataList="resourceData"> <dept-chart-view id="shelves" title="部门上架" v-loading="loadingResource" :dataList="resourceData"
:colorArray="resourceColor">
</dept-chart-view> </dept-chart-view>
<dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData"> <dept-chart-view id="apply" title="部门申请" v-loading="loadingApply" :dataList="applyData"
:colorArray="applyColor">
</dept-chart-view> </dept-chart-view>
<dept-chart-view id="demand" title="部门需求" v-loading="loadingRequire" :dataList="requireData"> <dept-chart-view id="demand" title="部门需求" v-loading="loadingRequire" :dataList="requireData"
:colorArray="requireColor">
</dept-chart-view> </dept-chart-view>
</div> </div>
</div> </div>
@ -65,12 +68,15 @@ export default {
list: [], list: [],
nameStr: 'processDefinitionName' nameStr: 'processDefinitionName'
}, },
// //
resourceData: [], resourceData: [],
// resourceColor: ['#7b2cff', '#fd5151', , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'],
//
applyData: [], applyData: [],
// applyColor: ["#5085f2", "#e75fc3", "#f87be2", "#f2719a", "#fca4bb", "#f59a8f", "#fdb301", "#57e7ec", "#cf9ef1"],
//
requireData: [], requireData: [],
requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A',],
loadingToDo: false, loadingToDo: false,
loadingHasToDo: false, loadingHasToDo: false,
loadingResource: false, loadingResource: false,