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

update

Browse Source
qianming 4 years ago
parent e8a86fe649
commit dd07f598c6
5 changed files with 118 additions and 86 deletions
Show Stats Download Patch File Download Diff File

34
report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js
Unescape Escape View File

@ -48,7 +48,7 @@ export const widgetLineCompare = {
name: 'pointSize', name: 'pointSize',
required: false, required: false,
placeholder: '', placeholder: '',
value: 10, value: 5,
}, },
{ {
type: 'el-switch', type: 'el-switch',
@ -80,7 +80,7 @@ export const widgetLineCompare = {
name: 'lineWidth', name: 'lineWidth',
required: false, required: false,
placeholder: '', placeholder: '',
value: 4, value: 2,
}, },
], ],
}, },
@ -281,7 +281,7 @@ export const widgetLineCompare = {
name: 'scaleYTop', name: 'scaleYTop',
required: false, required: false,
placeholder: '', placeholder: '',
value: true, value: false,
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
@ -397,7 +397,7 @@ export const widgetLineCompare = {
name: 'scaleYBottom', name: 'scaleYBottom',
required: false, required: false,
placeholder: '', placeholder: '',
value: true, value: false,
}, },
{ {
type: 'el-input-number', type: 'el-input-number',
@ -520,19 +520,31 @@ export const widgetLineCompare = {
name: '提示语设置', name: '提示语设置',
list: [ list: [
{ {
type: 'el-input-number', type: 'el-switch',
label: '字体大小', label: '显示',
name: 'tipsFontSize', name: 'tipShow',
required: false, required: false,
placeholder: '', placeholder: '',
value: 16 value: true,
}, },
{ {
type: 'vue-color', type: 'el-select',
label: '字体颜色', label: '类型',
name: 'lineColor', name: 'tipType',
required: false, required: false,
placeholder: '', placeholder: '',
selectOptions: [
{code: 'line', name: '线形'},
{code: 'cross', name: '十字形'},
],
value: 'line'
},
{
type: 'vue-color',
label: '颜色',
name: 'tipColor',
required: false,
placeholder: '#e68b55',
}, },
], ],
}, },

6
report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js
Unescape Escape View File

@ -1,6 +1,6 @@
/* /*
* @Descripttion: 折线堆叠图 json * @Descripttion: 折线堆叠图 json
* @version: * @version:
* @Author: qianlishi * @Author: qianlishi
* @Date: 2021-08-29 07:38:17 * @Date: 2021-08-29 07:38:17
* @LastEditors: qianlishi * @LastEditors: qianlishi
@ -56,7 +56,7 @@ export const widgetLineStack = {
name: 'pointSize', name: 'pointSize',
required: false, required: false,
placeholder: '', placeholder: '',
value: 10, value: 5,
}, },
{ {
type: 'el-switch', type: 'el-switch',
@ -669,4 +669,4 @@ export const widgetLineStack = {
}, },
], ],
} }
} }

162
report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue
Unescape Escape View File

@ -33,18 +33,18 @@ export default {
axisPointer: { axisPointer: {
type: 'line', type: 'line',
lineStyle: { lineStyle: {
color: 'ffffff', color: '#ffffff',
type: 'dashed', type: 'dashed',
}, },
}, },
/*axisPointer: { /*axisPointer: {
type: 'cross', type: 'cross',
lineStyle: { lineStyle: {
color: 'ffffff', color: '#ffffff',
type: 'dashed', type: 'dashed',
}, },
crossStyle: { crossStyle: {
color: 'ffffff', color: '#ffffff',
} }
},*/ },*/
}, },
@ -182,6 +182,9 @@ export default {
type: 'line', type: 'line',
xAxisIndex: 0, xAxisIndex: 0,
yAxisIndex: 0, yAxisIndex: 0,
showSymbol: true,// 标记点
symbol: 'circle',
symbolSize: 5,
smooth: true, // 曲线，折线 smooth: true, // 曲线，折线
itemStyle: { itemStyle: {
color: '#36c5e7', color: '#36c5e7',
@ -190,7 +193,7 @@ export default {
color: '#36c5e7', color: '#36c5e7',
width: 2, width: 2,
}, },
label: { label: { // 数值
position: 'top', position: 'top',
distance: 10, distance: 10,
show: true, show: true,
@ -204,6 +207,9 @@ export default {
type: 'line', type: 'line',
xAxisIndex: 1, xAxisIndex: 1,
yAxisIndex: 1, yAxisIndex: 1,
showSymbol: true,// 标记点
symbol: 'circle',
symbolSize: 5,
smooth: true, // 曲线，折线 smooth: true, // 曲线，折线
itemStyle: { itemStyle: {
color: '#e68b55', color: '#e68b55',
@ -212,7 +218,7 @@ export default {
color: '#e68b55', color: '#e68b55',
width: 2, width: 2,
}, },
label: { label: {// 数值
position: 'bottom', position: 'bottom',
distance: 10, distance: 10,
show: true, show: true,
@ -267,11 +273,11 @@ export default {
this.setOptionsX(); this.setOptionsX();
this.setOptionsYTop(); this.setOptionsYTop();
this.setOptionsYBottom(); this.setOptionsYBottom();
// this.setOptionsTop(); this.setOptionsTop();
// this.setOptionsTooltip(); this.setOptionsTooltip();
this.setOptionsGrid(); this.setOptionsGrid();
// this.setOptionsLegend(); this.setOptionsLegend();
// this.setOptionsColor(); this.setOptionsColor();
this.setOptionsData(); this.setOptionsData();
}, },
// 标题修改 // 标题修改
@ -427,57 +433,77 @@ export default {
} }
this.options.yAxis[1] = yAxis this.options.yAxis[1] = yAxis
}, },
// 数值设定、柱体设置 // 数值设定 折线设置
setOptionsTop() { setOptionsTop() {
const optionsSetup = this.optionsSetup; const optionsSetup = this.optionsSetup;
const series = this.options.series; const series = this.options.series
// 折线
for (const key in series) { for (const key in series) {
if (series[key].type == "bar") { series[key].showSymbol = optionsSetup.markPoint
series[0].label = { series[key].symbolSize = optionsSetup.pointSize
normal: { series[key].smooth = optionsSetup.smoothCurve
show: optionsSetup.isShow, if (optionsSetup.area) {
position: 'insideLeft', series[key].areaStyle = {
textStyle: { opacity: optionsSetup.areaThickness / 100
fontSize: optionsSetup.fontSize, }
color: optionsSetup.subTextColor, } else {
fontWeight: optionsSetup.fontWeight series[key].areaStyle = {
} opacity: 0
}, }
emphasis: { }
show: false, }
}, // 数值
}, if (series[0].type == 'line') {
series[1].label = { series[0].label = {
normal: { position: 'top',
show: optionsSetup.isShow, distance: 10,
color: 'red', show: optionsSetup.isShow,
position: 'insideRight', color: optionsSetup.subTextColor,
textStyle: { fontSize: optionsSetup.fontSize,
fontSize: optionsSetup.fontSize, fontWeight: optionsSetup.fontWeight
color: optionsSetup.subTextColor, }
fontWeight: optionsSetup.fontWeight series[1].label = {
} position: 'bottom',
}, distance: 10,
emphasis: { show: optionsSetup.isShow,
show: false, color: optionsSetup.subTextColor,
}, fontSize: optionsSetup.fontSize,
}, fontWeight: optionsSetup.fontWeight
series[key].barWidth = optionsSetup.maxWidth;
} }
} }
this.options.series = series;
}, },
// tooltip 提示语设置 // tooltip 提示语设置
setOptionsTooltip() { setOptionsTooltip() {
const optionsSetup = this.optionsSetup; const optionsSetup = this.optionsSetup;
const tooltip = { let tooltip = {}
trigger: "item", if (optionsSetup.tipType == "line") {
show: true, tooltip = {
textStyle: { show: optionsSetup.tipShow,
color: optionsSetup.lineColor, trigger: 'axis',
fontSize: optionsSetup.fontSize axisPointer: {
type: optionsSetup.tipType,
lineStyle: {
color: optionsSetup.tipColor,
type: 'dashed',
},
},
} }
}; } else {
tooltip = {
show: optionsSetup.tipShow,
trigger: 'axis',
axisPointer: {
type: optionsSetup.tipType,
lineStyle: {
color: optionsSetup.tipColor,
type: 'dashed',
},
crossStyle: {
color: optionsSetup.tipColor,
}
},
}
}
this.options.tooltip = tooltip; this.options.tooltip = tooltip;
}, },
// 边距设置 // 边距设置
@ -517,31 +543,27 @@ export default {
}; };
legend.itemWidth = optionsSetup.lengedWidth; legend.itemWidth = optionsSetup.lengedWidth;
}, },
// 颜色修改、圆角修改 // 颜色修改、宽度修改
setOptionsColor() { setOptionsColor() {
const optionsSetup = this.optionsSetup; const optionsSetup = this.optionsSetup;
const customColor = optionsSetup.customColor; const customColor = optionsSetup.customColor;
if (!customColor) return; const series = this.options.series
const itemStyleLeft = { const arrColor = [];
normal: { for (let i = 0; i < customColor.length; i++) {
color: customColor[0].color, arrColor.push(customColor[i].color);
barBorderRadius: [optionsSetup.radius, 0, 0, optionsSetup.radius]
},
emphasis: {
show: false,
},
} }
const itemStyleRight = { if (!customColor) return;
normal: { for (const key in series) {
color: customColor[1].color, const itemStyle = {
barBorderRadius: [0, optionsSetup.radius, optionsSetup.radius, 0] color: arrColor[key],
}, }
emphasis: { const lineStyle = {
show: false, color: arrColor[key],
}, width: optionsSetup.lineWidth,
}
this.options.series[key].itemStyle = itemStyle
this.options.series[key].lineStyle = lineStyle
} }
this.options.series[0].itemStyle = itemStyleLeft;
this.options.series[1].itemStyle = itemStyleRight;
}, },
// 数据解析 // 数据解析
setOptionsData() { setOptionsData() {

1
report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineStackChart.vue
Unescape Escape View File

@ -319,7 +319,6 @@ export default {
symbol: 'circle', symbol: 'circle',
showSymbol: optionsSetup.markPoint, showSymbol: optionsSetup.markPoint,
symbolSize: optionsSetup.pointSize, symbolSize: optionsSetup.pointSize,
symbolColor: arrColor[i],
smooth: optionsSetup.smoothCurve, smooth: optionsSetup.smoothCurve,
// 线条 // 线条
lineStyle: { lineStyle: {

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

@ -277,7 +277,6 @@ export default {
fontSize: optionsCollapse.fontSize fontSize: optionsCollapse.fontSize
}; };
legend.itemWidth = optionsCollapse.lengedWidth; legend.itemWidth = optionsCollapse.lengedWidth;
console.log(legend);
}, },
// 图例颜色修改 // 图例颜色修改
setOptionsColor() { setOptionsColor() {

Write Preview
Loading…
Cancel
Save