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

update

Browse Source
qianming 3 years ago
parent 3d7c1067ec
commit ff1a5b9d2c
4 changed files with 142 additions and 77 deletions
Show Stats Download Patch File Download Diff File

128
report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js
Unescape Escape View File

@ -173,14 +173,6 @@ export const widgetBarchart = {
{ {
name: 'X轴设置', name: 'X轴设置',
list: [ list: [
{
type: 'el-input-text',
label: '名称',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
@ -189,25 +181,49 @@ export const widgetBarchart = {
placeholder: '', placeholder: '',
value: true, value: true,
}, },
{
type: 'el-input-text',
label: '坐标名',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{ {
type: 'vue-color', type: 'vue-color',
label: '坐标名颜色', label: '坐标名颜色',
name: 'xNameColor', name: 'nameColorX',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff'
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '坐标字号',
name: 'xNameFontSize', name: 'nameFontSizeX',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12 value: 12
}, },
{
type: 'vue-color',
label: '数值颜色',
name: 'Xcolor',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '数值字号',
name: 'fontSizeX',
required: false,
placeholder: '',
value: 12,
},
{ {
type: 'el-slider', type: 'el-slider',
label: '文字角度', label: '数值角度',
name: 'textAngle', name: 'textAngle',
required: false, required: false,
placeholder: '', placeholder: '',
@ -215,7 +231,7 @@ export const widgetBarchart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '文字间隔', label: '数值间隔',
name: 'textInterval', name: 'textInterval',
required: false, required: false,
placeholder: '', placeholder: '',
@ -229,22 +245,6 @@ export const widgetBarchart = {
placeholder: '', placeholder: '',
value: false value: false
}, },
{
type: 'vue-color',
label: '颜色',
name: 'Xcolor',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '字号',
name: 'fontSizeX',
required: false,
placeholder: '',
value: 12,
},
{ {
type: 'vue-color', type: 'vue-color',
label: '轴颜色', label: '轴颜色',
@ -275,14 +275,6 @@ export const widgetBarchart = {
{ {
name: 'Y轴设置', name: 'Y轴设置',
list: [ list: [
{
type: 'el-input-text',
label: '名称',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
@ -291,33 +283,33 @@ export const widgetBarchart = {
placeholder: '', placeholder: '',
value: true, value: true,
}, },
{
type: 'el-input-text',
label: '坐标名',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{ {
type: 'vue-color', type: 'vue-color',
label: '坐标名颜色', label: '坐标名颜色',
name: 'NameColorY', name: 'nameColorY',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '坐标字号',
name: 'NameFontSizeY', name: 'nameFontSizeY',
required: false,
placeholder: '',
value: 12,
},
{
type: 'el-switch',
label: '轴反转',
name: 'reversalY',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: 14,
}, },
{ {
type: 'vue-color', type: 'vue-color',
label: '颜色', label: '数值颜色',
name: 'colorY', name: 'colorY',
required: false, required: false,
placeholder: '', placeholder: '',
@ -325,11 +317,43 @@ export const widgetBarchart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字号', label: '数值字号',
name: 'fontSizeY', name: 'fontSizeY',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12, value: 14,
},
{
type: 'el-slider',
label: '数值角度',
name: 'ytextAngle',
required: false,
placeholder: '',
value: 0
},
{
type: 'el-switch',
label: '缩放',
name: 'scale',
require: false,
placeholder: '',
value: false,
},
{
type: 'el-input-number',
label: '均分',
name: 'splitNumber',
required: false,
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '轴反转',
name: 'reversalY',
required: false,
placeholder: '',
value: false
}, },
{ {
type: 'vue-color', type: 'vue-color',

74
report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js
Unescape Escape View File

@ -173,41 +173,57 @@ export const widgetGradientBarchart = {
{ {
name: 'X轴设置', name: 'X轴设置',
list: [ list: [
{
type: 'el-switch',
label: '显示',
name: 'hideX',
required: false,
placeholder: '',
value: true,
},
{ {
type: 'el-input-text', type: 'el-input-text',
label: '名称', label: '坐标名',
name: 'xName', name: 'xName',
required: false, required: false,
placeholder: '', placeholder: '',
value: '' value: ''
}, },
{ {
type: 'el-switch', type: 'vue-color',
label: '显示', label: '坐标名颜色',
name: 'hideX', name: 'nameColorX',
required: false, required: false,
placeholder: '', placeholder: '',
value: true, value: '#fff',
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字号', label: '坐标字号',
name: 'fontSizeX', name: 'nameFontSizeX',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12, value: 14,
}, },
{ {
type: 'vue-color', type: 'vue-color',
label: '颜色', label: '数值颜色',
name: 'Xcolor', name: 'Xcolor',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
}, },
{
type: 'el-input-number',
label: '数值字号',
name: 'fontSizeX',
required: false,
placeholder: '',
value: 14,
},
{ {
type: 'el-slider', type: 'el-slider',
label: '文字角度', label: '数值角度',
name: 'textAngle', name: 'textAngle',
required: false, required: false,
placeholder: '', placeholder: '',
@ -215,7 +231,7 @@ export const widgetGradientBarchart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '文字间隔', label: '数值间隔',
name: 'textInterval', name: 'textInterval',
required: false, required: false,
placeholder: '', placeholder: '',
@ -258,25 +274,40 @@ export const widgetGradientBarchart = {
{ {
name: 'Y轴设置', name: 'Y轴设置',
list: [ list: [
{
type: 'el-switch',
label: '显示',
name: 'isShowY',
require: false,
placeholder: '',
value: true,
},
{ {
type: 'el-input-text', type: 'el-input-text',
label: '名称', label: '坐标名',
name: 'textNameY', name: 'textNameY',
require: false, require: false,
placeholder: '', placeholder: '',
value: '' value: ''
},{
type: 'vue-color',
label: '坐标名颜色',
name: 'nameColorY',
required: false,
placeholder: '',
value: '#fff',
}, },
{ {
type: 'el-switch', type: 'el-input-number',
label: '显示', label: '坐标字号',
name: 'isShowY', name: 'namefontSizeY',
require: false, required: false,
placeholder: '', placeholder: '',
value: true, value: 14,
}, },
{ {
type: 'vue-color', type: 'vue-color',
label: '颜色', label: '数值颜色',
name: 'colorY', name: 'colorY',
required: false, required: false,
placeholder: '', placeholder: '',
@ -284,15 +315,15 @@ export const widgetGradientBarchart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字号', label: '数值字号',
name: 'fontSizeY', name: 'fontSizeY',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12, value: 14,
}, },
{ {
type: 'el-slider', type: 'el-slider',
label: '文字角度', label: '数值角度',
name: 'ytextAngle', name: 'ytextAngle',
required: false, required: false,
placeholder: '', placeholder: '',
@ -344,7 +375,6 @@ export const widgetGradientBarchart = {
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
} }
], ],
}, },

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

@ -210,6 +210,10 @@ export default {
type: "category", type: "category",
show: optionsCollapse.hideX, // 坐标轴是否显示 show: optionsCollapse.hideX, // 坐标轴是否显示
name: optionsCollapse.xName, // 坐标轴名称 name: optionsCollapse.xName, // 坐标轴名称
nameTextStyle: {
color: optionsCollapse.nameColorX,
fontSize: optionsCollapse.nameFontSizeX
},
nameRotate: optionsCollapse.textAngle, // 文字角度 nameRotate: optionsCollapse.textAngle, // 文字角度
inverse: optionsCollapse.reversalX, // 轴反转 inverse: optionsCollapse.reversalX, // 轴反转
axisLabel: { axisLabel: {
@ -245,6 +249,10 @@ export default {
splitNumber: optionsCollapse.splitNumber,// 均分 splitNumber: optionsCollapse.splitNumber,// 均分
show: optionsCollapse.isShowY, // 坐标轴是否显示 show: optionsCollapse.isShowY, // 坐标轴是否显示
name: optionsCollapse.textNameY, // 坐标轴名称 name: optionsCollapse.textNameY, // 坐标轴名称
nameTextStyle: { // 别名
color: optionsCollapse.nameColorY,
fontSize: optionsCollapse.namefontSizeY
},
inverse: optionsCollapse.reversalY, // 轴反转 inverse: optionsCollapse.reversalY, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,

7
report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue
Unescape Escape View File

@ -165,15 +165,18 @@ export default {
const optionsCollapse = this.optionsSetup; const optionsCollapse = this.optionsSetup;
const yAxis = { const yAxis = {
type: "value", type: "value",
scale : optionsCollapse.scale,
splitNumber: optionsCollapse.splitNumber,// 均分
show: optionsCollapse.isShowY, // 坐标轴是否显示 show: optionsCollapse.isShowY, // 坐标轴是否显示
name: optionsCollapse.textNameY, // 坐标轴名称 name: optionsCollapse.textNameY, // 坐标轴名称
nameTextStyle: { nameTextStyle: {
color: optionsCollapse.NameColorY, color: optionsCollapse.nameColorY,
fontSize: optionsCollapse.NameFontSizeY fontSize: optionsCollapse.nameFontSizeY
}, },
inverse: optionsCollapse.reversalY, // 轴反转 inverse: optionsCollapse.reversalY, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,
rotate: optionsCollapse.ytextAngle, // 文字角度
textStyle: { textStyle: {
color: optionsCollapse.colorY, // x轴 坐标文字颜色 color: optionsCollapse.colorY, // x轴 坐标文字颜色
fontSize: optionsCollapse.fontSizeY fontSize: optionsCollapse.fontSizeY

Write Preview
Loading…
Cancel
Save