tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 代码合并

Browse Source
main
wu.jian2 2 years ago
parent 8fc2069fd5 1cb1d9fbbf
commit e268755053
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File

14
data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue
Unescape Escape View File

@ -17,8 +17,9 @@
<div class="table-box">
<el-table
ref="table"
max-height="500"
v-loading="loading"
class="bs-table bs-el-table"
class="bs-table bs-el-table fixed-header-table"
:data="dataList"
>
<el-table-column
@ -220,8 +221,9 @@ export default {
.bs-data-view-dialog{
/deep/.el-dialog__body{
background-color: var(--bs-background-2) !important;
overflow: auto!important;
max-height: calc(90vh - 500px) !important;
overflow: hidden;
//max-height: calc(90vh - 300px) !important;
max-height: 540px!important;
}
.table-box{
height: 100%;
@ -275,13 +277,13 @@ export default {
}
/* 自定义滚动条样式 */
/deep/.el-table__body-wrapper::-webkit-scrollbar {
width: 3px; /* 滚动条宽度 */
height: 8px;
width: 6px; /* 滚动条宽度 */
height: 6px;
}
/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #888; /* 滚动条拖动块颜色 */
height: 3px;
height: 100px;
border-radius: 5px;
}

16
data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
Unescape Escape View File

@ -66,7 +66,7 @@ const setting = [
field: 'seriesCustom_barColor',
// 对应options中的字段
optionField: 'seriesCustom.barColor',
value: ['#1370a7', '#4ebebe', '#3864ab', '#9c9c46', '#a6404b', '#ac582c', '#719c33', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
value: ['#1370a7', '#4ebebe', '#3864ab', '#9c9c46', '#a6404b', '#ac582c', '#719c33', '#945FB9', '#FF9845', '#1E9493'],
tabName: 'custom',
groupName: 'graph'
},
@ -90,7 +90,7 @@ const setting = [
field: 'seriesCustom_shadowColor',
// 对应options中的字段
optionField: 'seriesCustom.shadowColor',
value: ['#082442', '#0e2e3c', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
value: ['#082442', '#0e2e3c', '#082442', '#0e2e3c', '#082442', '#0e2e3c', '#082442', '#0e2e3c', '#082442', '#0e2e3c'],
tabName: 'custom',
groupName: 'graph'
},
@ -106,6 +106,18 @@ const setting = [
tabName: 'custom',
groupName: 'graph'
},
{
label: '底部阴影颜色',
// 设置组件类型
type: 'colorPicker',
// 字段
field: 'graphic_children_style_fill',
// 对应options中的字段
optionField: 'graphic.children.style.fill',
value: '#3f4867',
tabName: 'custom',
groupName: 'graph'
},
{
label: '数据标签',
type: 'switch', // 设置组件类型

12
data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
Unescape Escape View File

@ -81,6 +81,18 @@ const setting = [
tabName: 'custom',
groupName: 'graph'
},
{
label: '底部阴影颜色',
// 设置组件类型
type: 'colorPicker',
// 字段
field: 'graphic_children_style_fill',
// 对应options中的字段
optionField: 'graphic.children.style.fill',
value: '#3f4867',
tabName: 'custom',
groupName: 'graph'
},
{
label: '数据标签',
type: 'switch', // 设置组件类型

50
data-room-ui/packages/EchartsRender/index.vue
Unescape Escape View File

@ -118,18 +118,19 @@ export default {
const chartDom = document.getElementById(this.chatId)
this.chart = echarts.init(chartDom)
config.option && this.chart.setOption(config.option)
this.observeChart(chartDom, this.chart, config.option)
this.observeChart(chartDom, this.chart)
},
/**
* 控制底部阴影大小
*/
observeChart (container, myChart, option) {
observeChart (container, myChart) {
const resizeObserver = new ResizeObserver(entries => {
myChart.resize()
// entries[0].contentRect.width:此时监测的盒子的宽度
// entries[0].contentRect.height:此时监测的盒子的高度
const width = entries[0].contentRect.width
const height = entries[0].contentRect.height
const option = this.config.option
// 调整长方形的大小
option.graphic.children[0].shape.width = width * 0.9
// 调整多边形的大小
@ -214,6 +215,10 @@ export default {
option.push(beforeChange[index])
}
)
} else if (optionField[0] === 'graphic') {
option.graphic.children.forEach(item => {
item.style.fill = set.value
})
} else {
optionField.forEach((field, index) => {
if (index === optionField.length - 1) {
@ -232,10 +237,11 @@ export default {
return config
},
dataFormatting (config, data) {
console.log('config', config);
// config = this.config
// 数据返回成功则赋值
if (data.success) {
data = data.data
config = this.transformSettingToOption(config, 'data')
// 获取到后端返回的数据，有则赋值
const option = config.option
const setting = config.setting
@ -248,6 +254,7 @@ export default {
}
}
config.option = this.echartsOptionFormatting(config, data)
config = this.transformSettingToOption(config, 'data')
} else {
// 数据返回失败则赋前端的模拟数据
// config.option.data = this.plotList?.find(plot => plot.name === config.name)?.option?.data || config?.option?.data
@ -332,7 +339,7 @@ export default {
symbolPosition: 'end',
z: 15,
zlevel: 2,
color: 'rgba(2, 175, 249,1)',
color: '#ffff33',
data: seriesData
},
{
@ -341,23 +348,6 @@ export default {
barGap: '20%',
barWidth: barWidth,
color: '#115ba6',
// itemStyle: {
// normal: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
// {
// offset: 0,
// color: '#115ba6'
// },
// {
// offset: 1,
// color: '#1db0dd'
// }
// ]),
// opacity: 0.8,
// shadowColor: 'rgba(0, 0, 0, 0.5)', // 阴影颜色
// shadowBlur: 0 // 阴影模糊值
// }
// },
label: {
show: false
@ -387,11 +377,7 @@ export default {
data: shadowData,
zlevel: 1,
barWidth: barWidth,
itemStyle: {
normal: {
color: 'rgba(9, 44, 76,.8)'
}
}
color: 'rgba(9, 44, 76,.8)'
},
{
id: 'shadowTopColor' + seriesFieldItem,
@ -437,18 +423,6 @@ export default {
item.barWidth = seriesCustom.barWidth
}
})
// 颜色配置
// ids.forEach(id => {
// if (id !== 'barWidth') {
// let index = 0
// _config.option.series.forEach(item => {
// if (item.id.includes(id)) {
// item.color = _config.option.seriesCustom[id][index]
// index++
// }
// })
// }
// })
// 如果是基础柱状图
if (!isGroup) {
_config.option.series.forEach(item => {

Write Preview
Loading…
Cancel
Save