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 bfd85adbec
commit a43f966c69
5 changed files with 213 additions and 161 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,6 +1,6 @@
/* /*
* @Descripttion: 主线图 * @Descripttion: 主线图
* @version: * @version:
* @Author: qianlishi * @Author: qianlishi
* @Date: 2021-08-29 07:26:48 * @Date: 2021-08-29 07:26:48
* @LastEditors: qianlishi * @LastEditors: qianlishi
@ -218,14 +218,6 @@ export const widgetBarlinechart = {
{ {
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: '显示',
@ -234,61 +226,69 @@ export const widgetBarlinechart = {
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: 14,
}, },
{ {
type: 'el-slider', type: 'vue-color',
label: '文字角度', label: '数值颜色',
name: 'textAngle', name: 'Xcolor',
required: false, required: false,
placeholder: '', placeholder: '',
value: 0 value: '#fff',
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '文字间隔', label: '数值字号',
name: 'textInterval', name: 'fontSizeX',
required: false, required: false,
placeholder: '', placeholder: '',
value: 0 value: 14,
}, },
{ {
type: 'el-switch', type: 'el-slider',
label: '轴反转', label: '数值角度',
name: 'reversalX', name: 'textAngle',
required: false, required: false,
placeholder: '', placeholder: '',
value: 0 value: 0
}, },
{ {
type: 'vue-color', type: 'el-input-number',
label: '颜色', label: '数值间隔',
name: 'Xcolor', name: 'textInterval',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: ''
}, },
{ {
type: 'el-input-number', type: 'el-switch',
label: '字号', label: '轴反转',
name: 'fontSizeX', name: 'reversalX',
required: false, required: false,
placeholder: '', placeholder: '',
value: 16, value: false
}, },
{ {
type: 'vue-color', type: 'vue-color',
@ -313,56 +313,95 @@ export const widgetBarlinechart = {
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
} }
], ],
}, },
{ {
name: 'Y轴设置', name: 'Y轴设置',
list: [ list: [
{
type: 'el-switch',
label: '左显示',
name: 'isShowYLeft',
require: false,
placeholder: '',
value: true,
},
{ {
type: 'el-input-text', type: 'el-input-text',
label: '名称', label: '左坐标名',
name: 'textNameY', name: 'textNameYLeft',
require: false, require: false,
placeholder: '', placeholder: '',
value: '' value: ''
}, },
{
type: 'vue-color',
label: '左坐标名颜色',
name: 'nameColorYLeft',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '左坐标字号',
name: 'namefontSizeYLeft',
required: false,
placeholder: '',
value: 14,
},
{
type: 'el-input-number',
label: '左均分',
name: 'splitNumberLeft',
required: false,
placeholder: '',
value: ''
},
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '右显示',
name: 'isShowY', name: 'isShowYRight',
require: false, require: false,
placeholder: '', placeholder: '',
value: true, value: true,
}, },
{
type: 'el-input-text',
label: '右坐标名',
name: 'textNameYRight',
require: false,
placeholder: '',
value: ''
},
{ {
type: 'vue-color', type: 'vue-color',
label: '坐标名颜色', label: '右坐标名颜色',
name: 'NameColorY', name: 'nameColorYRight',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff',
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '右坐标字号',
name: 'NameFontSizeY', name: 'namefontSizeYRight',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12 value: 14,
}, },
{ {
type: 'el-switch', type: 'el-input-number',
label: '轴反转', label: '右均分',
name: 'reversalY', name: 'splitNumberRight',
required: false, required: false,
placeholder: '', placeholder: '',
value: 0 value: ''
}, },
{ {
type: 'vue-color', type: 'vue-color',
label: '颜色', label: '数值颜色',
name: 'colorY', name: 'colorY',
required: false, required: false,
placeholder: '', placeholder: '',
@ -370,36 +409,28 @@ export const widgetBarlinechart = {
}, },
{ {
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: 'vue-color', type: 'el-switch',
label: '轴颜色', label: '轴反转',
name: 'lineColorY', name: 'reversalY',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: false
}, },
{ {
type: 'el-switch',
label: '分割线显示',
name: 'isShowSplitLineY',
require: false,
placeholder: '',
value: false,
}, {
type: 'vue-color', type: 'vue-color',
label: '分割线颜色', label: '轴颜色',
name: 'splitLineColorY', name: 'lineColorY',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
},
}
], ],
}, },
{ {
@ -538,7 +569,7 @@ export const widgetBarlinechart = {
label: '', label: '',
name: 'customColor', name: 'customColor',
required: false, required: false,
value: [{color: '#00F4FFFF'}, {color: '#42fffd'}], value: [{color: '#00F4FFFF'}, {color: '#e68b55'}],
}, },
], ],
}, },
@ -631,4 +662,4 @@ export const widgetBarlinechart = {
}, },
], ],
} }
} }

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

@ -368,7 +368,8 @@ export const widgetGradientBarchart = {
require: false, require: false,
placeholder: '', placeholder: '',
value: false, value: false,
}, { },
{
type: 'vue-color', type: 'vue-color',
label: '分割线颜色', label: '分割线颜色',
name: 'splitLineColorY', name: 'splitLineColorY',

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

@ -1,6 +1,6 @@
/* /*
* @Descripttion: 折线图json * @Descripttion: 折线图json
* @version: * @version:
* @Author: qianlishi * @Author: qianlishi
* @Date: 2021-08-29 07:24:48 * @Date: 2021-08-29 07:24:48
* @LastEditors: qianlishi * @LastEditors: qianlishi
@ -109,7 +109,7 @@ export const widgetLinechart = {
name: 'textColor', name: 'textColor',
required: false, required: false,
placeholder: '', placeholder: '',
value: '##FFD700' value: '#fff'
}, },
{ {
type: 'el-select', type: 'el-select',
@ -127,7 +127,7 @@ export const widgetLinechart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '字体字号',
name: 'textFontSize', name: 'textFontSize',
required: false, required: false,
placeholder: '', placeholder: '',
@ -178,7 +178,7 @@ export const widgetLinechart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '字体字号',
name: 'subTextFontSize', name: 'subTextFontSize',
required: false, required: false,
placeholder: '', placeholder: '',
@ -189,41 +189,57 @@ export const widgetLinechart = {
{ {
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',
label: '坐标字号',
name: 'nameFontSizeX',
required: false,
placeholder: '',
value: 14,
}, },
{ {
type: 'vue-color', type: 'vue-color',
label: '坐标名颜色', label: '数值颜色',
name: 'xNameColor', name: 'Xcolor',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff',
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体大小', label: '数值字号',
name: 'xNameFontSize', name: 'fontSizeX',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12 value: 14,
}, },
{ {
type: 'el-slider', type: 'el-slider',
label: '文字角度', label: '数值角度',
name: 'textAngle', name: 'textAngle',
required: false, required: false,
placeholder: '', placeholder: '',
@ -231,11 +247,11 @@ export const widgetLinechart = {
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
label: '文字间隔', label: '数值间隔',
name: 'textInterval', name: 'textInterval',
required: false, required: false,
placeholder: '', placeholder: '',
value: 0 value: ''
}, },
{ {
type: 'el-switch', type: 'el-switch',
@ -245,22 +261,6 @@ export const widgetLinechart = {
placeholder: '', placeholder: '',
value: false value: false
}, },
{
type: 'vue-color',
label: '颜色',
name: 'Xcolor',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-text',
label: '字号',
name: 'fontSizeX',
required: false,
placeholder: '',
value: 12,
},
{ {
type: 'vue-color', type: 'vue-color',
label: '轴颜色', label: '轴颜色',
@ -284,21 +284,12 @@ export const widgetLinechart = {
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
} }
], ],
}, },
{ {
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: '显示',
@ -308,44 +299,76 @@ export const widgetLinechart = {
value: true, value: true,
}, },
{ {
type: 'vue-color', type: 'el-input-text',
label: '坐标名颜色', label: '坐标名',
name: 'NameColorY', name: 'textNameY',
required: false, require: false,
placeholder: '', placeholder: '',
value: '#fff' value: ''
}, },
{ {
type: 'el-input-text', type: 'vue-color',
label: '字体大小', label: '坐标名颜色',
name: 'NameFontSizeY', name: 'nameColorY',
required: false, required: false,
placeholder: '', placeholder: '',
value: 12 value: '#fff',
}, },
{ {
type: 'el-switch', type: 'el-input-number',
label: '轴反转', label: '坐标字号',
name: 'reversalY', name: 'namefontSizeY',
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: '',
value: '#fff', value: '#fff',
}, },
{ {
type: 'el-input-text', 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',
@ -362,14 +385,14 @@ export const widgetLinechart = {
require: false, require: false,
placeholder: '', placeholder: '',
value: false, value: false,
}, { },
{
type: 'vue-color', type: 'vue-color',
label: '分割线颜色', label: '分割线颜色',
name: 'splitLineColorY', name: 'splitLineColorY',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff', value: '#fff',
} }
], ],
}, },

43
report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue
Unescape Escape View File

@ -171,14 +171,14 @@ export default {
show: optionsCollapse.hideX, // 坐标轴是否显示 show: optionsCollapse.hideX, // 坐标轴是否显示
name: optionsCollapse.xName, // 坐标轴名称 name: optionsCollapse.xName, // 坐标轴名称
nameTextStyle: { nameTextStyle: {
color: optionsCollapse.xNameColor, color: optionsCollapse.nameColorX,
fontSize: optionsCollapse.xNameFontSize fontSize: optionsCollapse.nameFontSizeX
}, },
nameRotate: optionsCollapse.textAngle, // 文字角度 nameRotate: optionsCollapse.textAngle, // 文字角度
inverse: optionsCollapse.reversalX, // 轴反转 inverse: optionsCollapse.reversalX, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,
interval: optionsCollapse.textInterval, // 文字角度 interval: optionsCollapse.textInterval, // 文字间隔
rotate: optionsCollapse.textAngle, // 文字角度 rotate: optionsCollapse.textAngle, // 文字角度
textStyle: { textStyle: {
color: optionsCollapse.Xcolor, // x轴 坐标文字颜色 color: optionsCollapse.Xcolor, // x轴 坐标文字颜色
@ -206,46 +206,45 @@ export default {
const yAxis = [ const yAxis = [
{ {
type: "value", type: "value",
show: optionsCollapse.isShowY, // 坐标轴是否显示 splitNumber: optionsCollapse.splitNumberLeft,// 均分
name: optionsCollapse.textNameY, // 坐标轴名称 show: optionsCollapse.isShowYLeft, // 坐标轴是否显示
nameTextStyle: { name: optionsCollapse.textNameYLeft, // 坐标轴名称
color: optionsCollapse.NameColorY, nameTextStyle: { // 别名
fontSize: optionsCollapse.NameFontSizeY color: optionsCollapse.nameColorYLeft,
fontSize: optionsCollapse.namefontSizeYLeft
}, },
inverse: optionsCollapse.reversalY, // 轴反转 inverse: optionsCollapse.reversalY, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,
textStyle: { textStyle: {
color: optionsCollapse.colorY, // x轴 坐标文字颜色 color: optionsCollapse.colorY, // y轴 坐标文字颜色
fontSize: optionsCollapse.fontSizeY fontSize: optionsCollapse.fontSizeY
} }
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: "#fff" color: optionsCollapse.lineColorY
} }
}, },
splitLine: { splitLine: {
show: optionsCollapse.isShowSplitLineY, show: false,
lineStyle: {
color: optionsCollapse.splitLineColorY
}
} }
}, },
{ {
type: "value", type: "value",
show: optionsCollapse.isShowY, // 坐标轴是否显示 splitNumber: optionsCollapse.splitNumberRight,// 均分
name: optionsCollapse.textNameY, // 坐标轴名称 show: optionsCollapse.isShowYRight, // 坐标轴是否显示
nameTextStyle: { name: optionsCollapse.textNameYRight, // 坐标轴名称
color: optionsCollapse.NameColorY, nameTextStyle: { // 别名
fontSize: optionsCollapse.NameFontSizeY color: optionsCollapse.nameColorYRight,
fontSize: optionsCollapse.namefontSizeYRight
}, },
inverse: optionsCollapse.reversalY, // 轴反转 inverse: optionsCollapse.reversalY, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,
textStyle: { textStyle: {
color: optionsCollapse.colorY, // x轴 坐标文字颜色 color: optionsCollapse.colorY, // y轴 坐标文字颜色
fontSize: optionsCollapse.fontSizeY fontSize: optionsCollapse.fontSizeY
} }
}, },
@ -257,13 +256,9 @@ export default {
}, },
splitLine: { splitLine: {
show: false, show: false,
lineStyle: {
color: optionsCollapse.splitLineColorY
}
} }
} }
]; ];
this.options.yAxis = yAxis; this.options.yAxis = yAxis;
}, },
// 折线设置 // 折线设置

16
report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue
Unescape Escape View File

@ -136,14 +136,14 @@ export default {
show: optionsCollapse.hideX, // 坐标轴是否显示 show: optionsCollapse.hideX, // 坐标轴是否显示
name: optionsCollapse.xName, // 坐标轴名称 name: optionsCollapse.xName, // 坐标轴名称
nameTextStyle: { nameTextStyle: {
color: optionsCollapse.xNameColor, color: optionsCollapse.nameColorX,
fontSize: optionsCollapse.xNameFontSize fontSize: optionsCollapse.nameFontSizeX
}, },
nameRotate: optionsCollapse.textAngle, // 文字角度 nameRotate: optionsCollapse.textAngle, // 文字角度
inverse: optionsCollapse.reversalX, // 轴反转 inverse: optionsCollapse.reversalX, // 轴反转
axisLabel: { axisLabel: {
show: true, show: true,
interval: optionsCollapse.textInterval, // 文字角度 interval: optionsCollapse.textInterval, // 文字间隔
rotate: optionsCollapse.textAngle, // 文字角度 rotate: optionsCollapse.textAngle, // 文字角度
textStyle: { textStyle: {
color: optionsCollapse.Xcolor, // x轴 坐标文字颜色 color: optionsCollapse.Xcolor, // x轴 坐标文字颜色
@ -170,15 +170,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, // y轴 坐标文字颜色 color: optionsCollapse.colorY, // y轴 坐标文字颜色
fontSize: optionsCollapse.fontSizeY fontSize: optionsCollapse.fontSizeY
@ -197,7 +200,6 @@ export default {
} }
} }
}; };
this.options.yAxis = yAxis; this.options.yAxis = yAxis;
}, },
// 折线设置 // 折线设置

Write Preview
Loading…
Cancel
Save