lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-04-13 10:38:34 +08:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
qianming
2021-09-01 11:07:32 +08:00
parent 3d7c1067ec
commit ff1a5b9d2c
4 changed files with 153 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
/*
* @Descripttion: 柱状图json
* @version:
* @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:21:45
* @LastEditors: qianlishi
@@ -173,14 +173,6 @@ export const widgetBarchart = {
{
name: 'X轴设置',
list: [
{
type: 'el-input-text',
label: '名称',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '显示',
@@ -189,25 +181,49 @@ export const widgetBarchart = {
placeholder: '',
value: true,
},
{
type: 'el-input-text',
label: '坐标名',
name: 'xName',
required: false,
placeholder: '',
value: ''
},
{
type: 'vue-color',
label: '坐标名颜色',
name: 'xNameColor',
name: 'nameColorX',
required: false,
placeholder: '',
value: '#fff'
},
{
type: 'el-input-number',
label: '字体大小',
name: 'xNameFontSize',
label: '坐标字号',
name: 'nameFontSizeX',
required: false,
placeholder: '',
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',
label: '文字角度',
label: '数值角度',
name: 'textAngle',
required: false,
placeholder: '',
@@ -215,7 +231,7 @@ export const widgetBarchart = {
},
{
type: 'el-input-number',
label: '文字间隔',
label: '数值间隔',
name: 'textInterval',
required: false,
placeholder: '',
@@ -229,22 +245,6 @@ export const widgetBarchart = {
placeholder: '',
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',
label: '轴颜色',
@@ -275,14 +275,6 @@ export const widgetBarchart = {
{
name: 'Y轴设置',
list: [
{
type: 'el-input-text',
label: '名称',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{
type: 'el-switch',
label: '显示',
@@ -291,21 +283,69 @@ export const widgetBarchart = {
placeholder: '',
value: true,
},
{
type: 'el-input-text',
label: '坐标名',
name: 'textNameY',
require: false,
placeholder: '',
value: ''
},
{
type: 'vue-color',
label: '坐标名颜色',
name: 'NameColorY',
name: 'nameColorY',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '字体大小',
name: 'NameFontSizeY',
label: '坐标字号',
name: 'nameFontSizeY',
required: false,
placeholder: '',
value: 12,
value: 14,
},
{
type: 'vue-color',
label: '数值颜色',
name: 'colorY',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '数值字号',
name: 'fontSizeY',
required: false,
placeholder: '',
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',
@@ -315,22 +355,6 @@ export const widgetBarchart = {
placeholder: '',
value: false
},
{
type: 'vue-color',
label: '颜色',
name: 'colorY',
required: false,
placeholder: '',
value: '#fff',
},
{
type: 'el-input-number',
label: '字号',
name: 'fontSizeY',
required: false,
placeholder: '',
value: 12,
},
{
type: 'vue-color',
label: '轴颜色',

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

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

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

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

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

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