diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js index 65832e5..e2ea728 100644 --- a/src/mixins/queryform.js +++ b/src/mixins/queryform.js @@ -115,11 +115,11 @@ export default { // widget-radar 雷达图 // widget-select 下拉框 const chartType = params.chartType - if (chartType == "widget-linechart" || - chartType == "widget-barlinechart" - ) { + if (chartType == "widget-linechart") { return this.barOrLineChartFn(params.chartProperties, data); - }else if ( chartType == "widget-barchart") { + }else if (chartType == "widget-barlinechart" ) { + return this.barLineChartFn(params.chartProperties, data); + } else if ( chartType == "widget-barchart") { return this.barOrLineChartFn(params.chartProperties, data); } else if ( chartType == "widget-piechart" || @@ -160,7 +160,7 @@ export default { // console.log(ananysicData); return ananysicData; }, - // 柱状图、折线图、柱线图 + // 柱状图、折线图 barOrLineChartFn(chartProperties, data) { const ananysicData = {}; const xAxisList = []; @@ -195,6 +195,43 @@ export default { // console.log("11111",ananysicData); return ananysicData; }, + //、柱线图 + barLineChartFn(chartProperties, data) { + const ananysicData = {}; + const xAxisList = []; + const series = []; + // legend: { + // data: ['Forest'] + // }, + for (const key in chartProperties) { + const obj = {}; + const seriesData = []; + const value = chartProperties[key]; + obj["type"] = value; + obj["name"] = key; + if(value=='xAxis' || value=='bar'|| value=='line'){ + for (let i = 0; i < data.length; i++) { + if (value.startsWith("xAxis")) { + // 代表为x轴 + xAxisList[i] = data[i][key]; + } else { + // 其他的均为series展示数据 + seriesData[i] = data[i][value]; + } + } + // console.log("seriesData",seriesData); + // console.log("xAxisList",xAxisList); + obj["data"] = seriesData; + if (!obj["type"].startsWith("xAxis")) { + series.push(obj); + } + } + } + ananysicData["xAxis"] = xAxisList; + ananysicData["series"] = series; + console.log("11111",ananysicData); + return ananysicData; + }, //堆叠图 stackChartFn(chartProperties, val) { const ananysicData = {}; diff --git a/src/views/bigscreenDesigner/designer/index.vue b/src/views/bigscreenDesigner/designer/index.vue index bb72613..5636674 100644 --- a/src/views/bigscreenDesigner/designer/index.vue +++ b/src/views/bigscreenDesigner/designer/index.vue @@ -1473,29 +1473,28 @@ export default { }, //输入删除键删除 entryDelete(index){ - this.widgets.splice(index, 1); - //调用删除 - // this.selectMore.push(index); - // this.deletelayerOne(); - }, - deletelayer() { - this.widgets.splice(this.rightClickIndex, 1); - // this.selectMore.push(this.rightClickIndex); - // this.deletelayerOne(); - }, - // 删除 - deletelayerOne() { + // this.widgets.splice(index, 1); this.selectMore = this.setUnique(this.selectMore); //首先复制右选节点，再复制其他选择节点 let widgetsCp = []; if(this.isNotBlankArray(this.selectMore)){ for(let i = 0; i< this.widgets.length;i++){ - if(this.selectMore.indexOf(i)<0){ + if(this.selectMore.indexOf(i)<0 && index!=i){ widgetsCp.push(this.widgets[i]); } } } this.widgets = widgetsCp; + this.setShiftEntFalse(); + }, + deletelayer() { + this.deletelayerMore(); + //this.widgets.splice(this.rightClickIndex, 1); + }, + // 删除 + deletelayerMore() { + //键盘输入删除 + this.entryDelete(this.rightClickIndex); }, // 锁定 lockLayer() { diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js index 6d47d57..27d99fb 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js @@ -23,8 +23,16 @@ export const widgetText = { placeholder: '', value: '文本框', }, + // { + // type: 'el-input-text', + // label: '文本内容', + // name: 'text', + // required: false, + // placeholder: '', + // value: '文本框', + // }, { - type: 'el-input-text', + type: 'el-input-textarea', label: '文本内容', name: 'text', required: false, @@ -99,6 +107,14 @@ export const widgetText = { ], value: 'center' }, + { + type: 'el-switch', + label: '识别换行符', + name: 'whiteSpace', + required: false, + placeholder: '', + value: true, + } ], data:[], // 坐标 diff --git a/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue b/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue index 542381d..28c0a74 100644 --- a/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -79,7 +79,7 @@ export default { yAxisIndex: 0, data: [], itemStyle: { - barBorderRadius: null + barBorderRadius: null, } }, { @@ -131,6 +131,7 @@ export default { methods: { // 修改图标options属性 editorOptions() { + this.setOptionsColor(); this.setOptionsTitle(); this.setOptionsX(); this.setOptionsY(); @@ -140,7 +141,6 @@ export default { this.setOptionsData(); this.setOptionsMargin(); this.setOptionsLegend(); - this.setOptionsColor(); }, // 标题修改 setOptionsTitle() { @@ -421,7 +421,19 @@ export default { for (let i = 0; i < customColor.length; i++) { arrColor.push(customColor[i].color); } - this.options.color = arrColor; + const itemStyle = { + normal: { + color: params => { + return arrColor[params.dataIndex]; + }, + barBorderRadius: optionsSetup.radius + } + }; + for (const key in this.options.series) { + if (this.options.series[key].type == "bar") { + this.options.series[key].itemStyle = itemStyle; + } + } this.options = Object.assign({}, this.options); }, // 数据处理 diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue index 47a291d..7157fde 100644 --- a/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue +++ b/src/views/bigscreenDesigner/designer/widget/text/widgetText.vue @@ -51,7 +51,8 @@ export default { height: this.transStyle.height + "px", left: this.transStyle.left + "px", top: this.transStyle.top + "px", - right: this.transStyle.right + "px" + right: this.transStyle.right + "px", + whiteSpace: this.transStyle.whiteSpace ? "pre-line": "normal" }; }, },