diff --git a/src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue b/src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue new file mode 100644 index 0000000..73243a7 --- /dev/null +++ b/src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue @@ -0,0 +1,177 @@ + + + diff --git a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue index 109b59f..9b8db4d 100644 --- a/src/views/bigscreenDesigner/designer/components/dynamicForm.vue +++ b/src/views/bigscreenDesigner/designer/components/dynamicForm.vue @@ -183,6 +183,12 @@ :chart-type="item.chartType" @change="changed($event, item.name)" /> + +
+ +
+ +
+
+ + + + diff --git a/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue index 3040869..4fae5a7 100644 --- a/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -135,6 +135,7 @@ export default { show: optionsSetup.hideX, // 坐标轴名称 name: optionsSetup.nameX, + boundaryGap:false, nameTextStyle: { color: optionsSetup.nameColorX, fontSize: optionsSetup.nameFontSizeX @@ -369,7 +370,10 @@ export default { xAxisList = this.setUnique(xAxisList); yAxisList = this.setUnique(yAxisList); for (const i in yAxisList) { - const data = new Array(xAxisList.length).fill(0); + let data = []; + if(optionsSetup.zeroStart){ + data = new Array(xAxisList.length).fill(0); + } for (const j in xAxisList) { for (const k in val) { if (val[k].name == yAxisList[i]) { @@ -379,6 +383,7 @@ export default { } } } + // console.log(data); series.push({ name: yAxisList[i], type: "line", diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue index a6946c8..e606683 100644 --- a/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -10,6 +10,7 @@ import widgetText from "./text/widgetText.vue"; import WidgetMarquee from "./text/widgetMarquee.vue"; import widgetTime from "./text/widgetTime.vue"; import widgetImage from "./div/widgetImage.vue"; +import widgetDtImage from "./div/widgetDtImage"; import widgetSlider from "./div/widgetSlider.vue"; import widgetVideo from "./video/widgetVideo.vue"; import WidgetIframe from "./text/widgetIframe.vue"; @@ -58,6 +59,7 @@ export default { WidgetMarquee, widgetTime, widgetImage, + widgetDtImage, widgetSlider, widgetVideo, WidgetIframe, diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue index 946b50b..35d17a4 100644 --- a/src/views/bigscreenDesigner/designer/widget/widget.vue +++ b/src/views/bigscreenDesigner/designer/widget/widget.vue @@ -47,6 +47,7 @@ import widgetHeatmap from "./heatmap/widgetHeatmap"; import widgetRadar from "./radar/widgetRadar"; import widgetBarLineStackChart from "./barline/widgetBarLineStackChart"; import widgetImage from "./div/widgetImage.vue"; +import widgetDtImage from "./div/widgetDtImage"; import widgetSlider from "./div/widgetSlider.vue"; import widgetBorderBox from "./div/widgetBorderBox.vue"; import widgetDecoration from "./div/widgetDecoration.vue"; @@ -72,6 +73,7 @@ export default { WidgetMarquee, widgetTime, widgetImage, + widgetDtImage, widgetSlider, widgetVideo, WidgetIframe,