ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
Raod 3 years ago
parent 1bf7694bf7 1525595546
commit 4eb6ab77d1
3 changed files with 106 additions and 79 deletions
Show Stats Download Patch File Download Diff File

127
report-ui/src/views/report/bigscreen/designer/tools.js
Unescape Escape View File

@ -2250,6 +2250,26 @@ const widgetTools = [
},
],
},
{
name: '提示语设置',
list: [
{
type: 'el-input-number',
label: '字体大小',
name: 'tipsFontSize',
required: false,
placeholder: '',
value: 16
},
{
type: 'vue-color',
label: '字体颜色',
name: 'lineColor',
required: false,
placeholder: '',
},
],
},
{
name: '坐标轴边距设置',
list: [
@ -5707,15 +5727,7 @@ const widgetTools = [
name: 'maxWidth',
required: false,
placeholder: '',
value: 10,
},
{
type: 'el-slider',
label: '圆角',
name: 'radius',
require: false,
placeholder: '',
value: 5,
value: 20,
},
],
},
@ -5824,14 +5836,6 @@ const widgetTools = [
{
name: 'X轴设置',
list: [
{
type: 'el-input-text',
label: '名称',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '显示',
@ -5840,9 +5844,17 @@ const widgetTools = [
placeholder: '',
value: true,
},
{
type: 'el-input-text',
label: 'X轴别名',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{
type: 'vue-color',
label: '坐标名颜色',
label: '别名颜色',
name: 'xNameColor',
required: false,
placeholder: '',
@ -5850,16 +5862,24 @@ const widgetTools = [
},
{
type: 'el-input-number',
label: '字体大小',
label: '别名字号',
name: 'xNameFontSize',
required: false,
placeholder: '',
value: 12
value: 14
},
{
type: 'el-switch',
label: '轴反转',
name: 'reversalX',
required: false,
placeholder: '',
value: false
},
{
type: 'el-slider',
label: '文字角度',
name: 'textAngle',
name: 'textAngleX',
required: false,
placeholder: '',
value: 0
@ -5872,17 +5892,9 @@ const widgetTools = [
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '轴反转',
name: 'reversalX',
required: false,
placeholder: '',
value: false
},
{
type: 'vue-color',
label: '颜色',
label: '文字颜色',
name: 'Xcolor',
required: false,
placeholder: '',
@ -5890,11 +5902,11 @@ const widgetTools = [
},
{
type: 'el-input-number',
label: '字号',
label: '文字字号',
name: 'fontSizeX',
required: false,
placeholder: '',
value: 12,
value: 14,
},
{
type: 'vue-color',
@ -5926,14 +5938,6 @@ const widgetTools = [
{
name: 'Y轴设置',
list: [
{
type: 'el-input-text',
label: '名称',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '显示',
@ -5942,9 +5946,17 @@ const widgetTools = [
placeholder: '',
value: true,
},
{
type: 'el-input-text',
label: 'Y轴别名',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{
type: 'vue-color',
label: '坐标名颜色',
label: '别名颜色',
name: 'NameColorY',
required: false,
placeholder: '',
@ -5952,11 +5964,11 @@ const widgetTools = [
},
{
type: 'el-input-number',
label: '字体大小',
label: '别名字号',
name: 'NameFontSizeY',
required: false,
placeholder: '',
value: 12,
value: 14,
},
{
type: 'el-switch',
@ -5966,9 +5978,17 @@ const widgetTools = [
placeholder: '',
value: false
},
{
type: 'el-slider',
label: '文字角度',
name: 'textAngleY',
required: false,
placeholder: '',
value: 0
},
{
type: 'vue-color',
label: '颜色',
label: '文字颜色',
name: 'colorY',
required: false,
placeholder: '',
@ -5976,11 +5996,11 @@ const widgetTools = [
},
{
type: 'el-input-number',
label: '字号',
label: '文字字号',
name: 'fontSizeY',
required: false,
placeholder: '',
value: 12,
value: 14,
},
{
type: 'vue-color',
@ -6056,9 +6076,10 @@ const widgetTools = [
{
type: 'el-input-number',
label: '字体大小',
name: 'fontSize',
name: 'tipsFontSize',
required: false,
placeholder: '',
value: 16
},
{
type: 'vue-color',
@ -6069,7 +6090,7 @@ const widgetTools = [
},
],
},
{
/*{
name: '坐标轴边距设置',
list: [
{
@ -6102,8 +6123,8 @@ const widgetTools = [
value: 10,
},
],
},
{
},*/
/*{
name: '图例操作',
list: [
{
@ -6145,11 +6166,11 @@ const widgetTools = [
required: false,
placeholder: '',
selectOptions: [
{code: 'center', name: '居中'},
{code: 'left', name: '左对齐'},
{code: 'right', name: '右对齐'},
//{code: 'mid', name: '居中'},
],
value: 'left'
value: 'center'
},
{
type: 'el-select',
@ -6176,7 +6197,7 @@ const widgetTools = [
value: 'horizontal'
},
],
},
},*/
/*{
name: '自定义配色',
list: [

33
report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
Unescape Escape View File

@ -98,12 +98,12 @@ export default {
this.setOptionsY();
this.setOptionsTop();
this.setOptionsTooltip();
this.setOptionsMargin();
this.setOptionsLegend();
//this.setOptionsMargin();
//this.setOptionsLegend();
//this.setOptionsColor();
this.setOptionsData();
},
// 标题修改 对应数据内容例如ABC等的调整
// 标题修改
setOptionsTitle() {
const optionsCollapse = this.optionsSetup;
const title = {};
@ -135,7 +135,7 @@ export default {
color: optionsCollapse.xNameColor,
fontSize: optionsCollapse.xNameFontSize
},
nameRotate: optionsCollapse.textAngle, // 文字角度
nameRotate: optionsCollapse.textAngleX, // 文字角度
inverse: optionsCollapse.reversalX, // 轴反转
axisLabel: {
show: true,
@ -175,6 +175,7 @@ export default {
inverse: optionsCollapse.reversalY, // y轴反转
axisLabel: {
show: true,
rotate: optionsCollapse.textAngleY,// 文字角度
textStyle: {
color: optionsCollapse.colorY, // y轴 坐标文字颜色
fontSize: optionsCollapse.fontSizeY
@ -195,11 +196,10 @@ export default {
};
this.options.yAxis = yAxis;
},
// 数值设定 or 柱体设置 数值设定字体大小，默认值没回显
// 数值设定 or 柱体设置
setOptionsTop() {
const optionsCollapse = this.optionsSetup;
const series = this.options.series;
for (const key in series) {
if (series[key].type == "bar") {
series[key].label = {
@ -211,13 +211,11 @@ export default {
fontWeight: optionsCollapse.fontWeight
};
series[key].barWidth = optionsCollapse.maxWidth;
console.log(series[key].barWidth)
series[key].barMinHeight = optionsCollapse.minHeight;
}
}
this.options.series = series;
},
// tooltip 设置
// tooltip 提示语设置，鼠标放置显示
setOptionsTooltip() {
const optionsCollapse = this.optionsSetup;
const tooltip = {
@ -225,7 +223,7 @@ export default {
show: true,
textStyle: {
color: optionsCollapse.lineColor,
fontSize: optionsCollapse.fontSize
fontSize: optionsCollapse.tipsFontSize
}
};
this.options.tooltip = tooltip;
@ -329,11 +327,20 @@ export default {
series.push({
name: yAxisList[i],
type: "bar",
data: data ,
data: data,
barGap: "0%",
/*itemStyle: {
barWidth : optionsSetup.maxWidth,
label : {
show: optionsSetup.isShow,
position: "top",
distance: 10,
fontSize: optionsSetup.fontSize,
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.fontWeight
},
itemStyle: {
borderRadius: null
}*/
}
})
}
this.options.series = series

3
report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue
Unescape Escape View File

@ -283,12 +283,11 @@ export default {
fontWeight: optionsCollapse.fontWeight
};
series[key].barWidth = optionsCollapse.maxWidth;
//series[key].barMinHeight = optionsCollapse.minHeight;
}
}
this.options.series = series;
},
// tooltip 设置
// tooltip 提示语设置
setOptionsTooltip() {
const optionsCollapse = this.optionsSetup;
const tooltip = {

Write Preview
Loading…
Cancel
Save