diff --git a/report-ui/src/views/report/bigscreen/designer/form/colorPicker.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/colorPicker.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/colorPicker.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/colorPicker.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/contentMenu.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/contentMenu.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/customColorComponents.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/customColorComponents.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/customColorComponents.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/customColorComponents.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/customUpload.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/customUpload.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/customUpload.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/customUpload.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/dynamicAddTable.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicAddTable.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicComponents.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicComponents.vue diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue b/report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicForm.vue similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue rename to report-ui/src/views/report/bigscreen/designer/designerComponents/dynamicForm.vue diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index bdc5415e..049f7060 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -286,10 +286,10 @@ import { } from "@/api/bigscreen"; import { widgetTools, getToolByCode } from "./tools/index"; import widget from "./widget/widget.vue"; -import dynamicForm from "./form/dynamicForm.vue"; +import dynamicForm from "./designerComponents/dynamicForm.vue"; import draggable from "vuedraggable"; import VueRulerTool from "vue-ruler-tool"; // 大屏设计页面的标尺插件 -import contentMenu from "./form/contentMenu"; +import contentMenu from "./designerComponents/contentMenu"; import { getToken } from "@/utils/auth"; export default { diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-airbubble-map.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-airbubble-map.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-airbubble-map.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-airbubble-map.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-bar-compare.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-compare.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-bar-compare.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-bar-stack.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-bar-stack.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-bar-stack.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barchart.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-barlinechart.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barlinechart.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-funnel.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-funnel.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gauge.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gradient-barchart.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gradient-barchart.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-href.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-href.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-href.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-href.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-iframe.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-iframe.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-iframe.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-iframe.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-image.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-image.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-image.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-image.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-line-compare.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-line-compare.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-line-stack.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-stack.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-line-stack.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-linechart.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-linechart.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-linechart.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-map.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-map.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-map.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-map.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-marquee.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-marquee.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-marquee.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-marquee.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-nightingale.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-nightingale.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-nightingale.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-nightingale.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-percentage.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-pie-percentage.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-piechart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-piechart.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-piechart.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-piechart.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-slider.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-slider.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-slider.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-slider.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-table.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-table.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-text.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-text.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-text.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-text.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-time.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-time.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-time.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-time.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-universal.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-universal.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-universal.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-universal.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-video.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-video.js similarity index 100% rename from report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-video.js rename to report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-video.js diff --git a/report-ui/src/views/report/bigscreen/designer/tools/main.js b/report-ui/src/views/report/bigscreen/designer/tools/main.js index 1e37d575..2bce8560 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/main.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/main.js @@ -4,34 +4,34 @@ * @Author: qianlishi * @Date: 2021-08-29 07:46:46 * @LastEditors: qianlishi - * @LastEditTime: 2021-08-29 07:54:41 + * @LastEditTime: 2021-09-28 13:33:47 */ -import { widgetText } from "./componentsJSON/widget-text" -import { widgetMarquee } from "./componentsJSON/widget-marquee" -import { widgetHref } from "./componentsJSON/widget-href" -import { widgetTime } from "./componentsJSON/widget-time" -import { widgetImage } from "./componentsJSON/widget-image" -import { widgetSliders } from "./componentsJSON/widget-slider" -import { widgetVideo } from "./componentsJSON/widget-video" -import { widgetTable } from "./componentsJSON/widget-table" -import { widgetIframe } from "./componentsJSON/widget-iframe" -import { widgetUniversal } from "./componentsJSON/widget-universal" -import { widgetBarchart } from "./componentsJSON/widget-barchart" -import { widgetGradientBarchart } from "./componentsJSON/widget-gradient-barchart" -import { widgetLinechart } from "./componentsJSON/widget-linechart" -import { widgetBarlinechart } from "./componentsJSON/widget-barlinechart" -import { widgetPiechart } from "./componentsJSON/widget-piechart" -import { widgetFunnel } from "./componentsJSON/widget-funnel" -import { widgetGauge } from "./componentsJSON/widget-gauge" -import { widgetMap } from "./componentsJSON/widget-map" -import { WidgetPieNightingale } from "./componentsJSON/widget-pie-nightingale" -import { widgetPiePercentage } from "./componentsJSON/widget-pie-percentage" -import { widgetAirbubbleMap } from "./componentsJSON/widget-airbubble-map" -import { widgetBarStack } from "./componentsJSON/widget-bar-stack" -import { widgetLineStack } from "./componentsJSON/widget-line-stack" -import { widgetBarCompare } from "./componentsJSON/widget-bar-compare" -import { widgetLineCompare } from "./componentsJSON/widget-line-compare" +import { widgetText } from "./echartsConfigJson/widget-text" +import { widgetMarquee } from "./echartsConfigJson/widget-marquee" +import { widgetHref } from "./echartsConfigJson/widget-href" +import { widgetTime } from "./echartsConfigJson/widget-time" +import { widgetImage } from "./echartsConfigJson/widget-image" +import { widgetSliders } from "./echartsConfigJson/widget-slider" +import { widgetVideo } from "./echartsConfigJson/widget-video" +import { widgetTable } from "./echartsConfigJson/widget-table" +import { widgetIframe } from "./echartsConfigJson/widget-iframe" +import { widgetUniversal } from "./echartsConfigJson/widget-universal" +import { widgetBarchart } from "./echartsConfigJson/widget-barchart" +import { widgetGradientBarchart } from "./echartsConfigJson/widget-gradient-barchart" +import { widgetLinechart } from "./echartsConfigJson/widget-linechart" +import { widgetBarlinechart } from "./echartsConfigJson/widget-barlinechart" +import { widgetPiechart } from "./echartsConfigJson/widget-piechart" +import { widgetFunnel } from "./echartsConfigJson/widget-funnel" +import { widgetGauge } from "./echartsConfigJson/widget-gauge" +import { widgetMap } from "./echartsConfigJson/widget-map" +import { WidgetPieNightingale } from "./echartsConfigJson/widget-pie-nightingale" +import { widgetPiePercentage } from "./echartsConfigJson/widget-pie-percentage" +import { widgetAirbubbleMap } from "./echartsConfigJson/widget-airbubble-map" +import { widgetBarStack } from "./echartsConfigJson/widget-bar-stack" +import { widgetLineStack } from "./echartsConfigJson/widget-line-stack" +import { widgetBarCompare } from "./echartsConfigJson/widget-bar-compare" +import { widgetLineCompare } from "./echartsConfigJson/widget-line-compare" export const widgetTool = [ // type=html类型的组件 diff --git a/report-ui/src/views/report/excelreport/designer/index.vue b/report-ui/src/views/report/excelreport/designer/index.vue index c35206c9..3c171fa7 100644 --- a/report-ui/src/views/report/excelreport/designer/index.vue +++ b/report-ui/src/views/report/excelreport/designer/index.vue @@ -133,7 +133,7 @@ import draggable from "vuedraggable"; import { queryAllDataSet, detail, detailByReportCode } from "@/api/GaeaReport"; import { addReportExcel, editReportExcel } from "@/api/report"; -import ColorPicker from "../../bigscreen/designer/form/colorPicker.vue"; +import ColorPicker from "../../bigscreen/designer/designerComponents/colorPicker.vue"; // import QRCode from 'qrcodejs2' // import JsBarcode from 'jsbarcode' export default {