大屏二级菜单

report-ui/src/views/bigscreenDesigner/designer/index.vue

@@ -12,24 +12,34 @@
       class="layout-left"
       :style="{ width: widthLeftForTools + 'px' }"
     >
-      <el-tabs type="border-card" :stretch="true">
+      <el-tabs class="layout-left" type="border-card" :stretch="true">
         <!-- 左侧组件栏-->
         <el-tab-pane label="工具栏">
-          <!-- <el-divider content-position="center">html</el-divider>-->
-          <li
-            v-for="widget in widgetTools"
-            :key="widget.code"
-            draggable="true"
-            @dragstart="dragStart(widget.code)"
-            @dragend="dragEnd()"
-          >
-            <div class="tools-item">
-              <span class="tools-item-icon">
-                <i class="iconfont" :class="widget.icon"></i>
-              </span>
-              <span class="tools-item-text">{{ widget.label }}</span>
-            </div>
-          </li>
+          <span slot="label"><i class="el-icon-date icon"></i>工具栏</span>
+          <div class="chart-type">
+            <el-tabs class="type-left" tab-position="left">
+              <el-tab-pane
+                v-for="(item, index) in widgetTools"
+                :key="index"
+                :label="item.name"
+              >
+                <li
+                  v-for="(it, idx) in item.list"
+                  :key="idx"
+                  draggable="true"
+                  @dragstart="dragStart(it.code)"
+                  @dragend="dragEnd()"
+                >
+                  <div class="tools-item">
+                    <span class="tools-item-icon">
+                      <i class="iconfont" :class="it.icon"></i>
+                    </span>
+                    <span class="tools-item-text">{{ it.label }}</span>
+                  </div>
+                </li>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
         </el-tab-pane>
         <!-- 左侧图层-->
         <el-tab-pane label="图层">
@@ -170,7 +180,7 @@
         class="workbench-container"
         :style="{
           width: bigscreenWidthInWorkbench + 'px',
-          height: bigscreenHeightInWorkbench + 'px'
+          height: bigscreenHeightInWorkbench + 'px',
         }"
         @mousedown="handleMouseDown"
       >
@@ -197,7 +207,7 @@
               'background-repeat': 'initial',
               'background-attachment': 'initial',
               'background-origin': 'initial',
-              'background-clip': 'initial'
+              'background-clip': 'initial',
             }"
             @click.self="setOptionsOnClickScreen"
             @drop="widgetOnDragged($event)"
@@ -235,7 +245,7 @@
           <dynamicForm
             ref="formData"
             :options="widgetOptions.setup"
-            @onChanged="val => widgetValueChanged('setup', val)"
+            @onChanged="(val) => widgetValueChanged('setup', val)"
           />
         </el-tab-pane>
         <el-tab-pane
@@ -246,7 +256,7 @@
           <dynamicForm
             ref="formData"
             :options="widgetOptions.data"
-            @onChanged="val => widgetValueChanged('data', val)"
+            @onChanged="(val) => widgetValueChanged('data', val)"
           />
         </el-tab-pane>
         <el-tab-pane
@@ -257,7 +267,7 @@
           <dynamicForm
             ref="formData"
             :options="widgetOptions.position"
-            @onChanged="val => widgetValueChanged('position', val)"
+            @onChanged="(val) => widgetValueChanged('position', val)"
           />
         </el-tab-pane>
       </el-tabs>
@@ -281,7 +291,7 @@ import {
   insertDashboard,
   detailDashboard,
   importDashboard,
-  exportDashboard
+  exportDashboard,
 } from "@/api/bigscreen";
 import { widgetTools, getToolByCode } from "./tools/index";
 import widget from "./widget/widget.vue";
@@ -299,7 +309,7 @@ export default {
     VueRulerTool,
     widget,
     dynamicForm,
-    contentMenu
+    contentMenu,
   },
   data() {
     return {
@@ -330,7 +340,7 @@ export default {
         backgroundImage: "", // 大屏背景图片
         refreshSeconds: null, // 大屏刷新时间间隔
         presetLine: [], // 辅助线
-        presetLineVisible: true // 辅助线是否显示
+        presetLineVisible: true, // 辅助线是否显示
       },
       // 大屏的标记
       screenCode: "",
@@ -348,12 +358,12 @@ export default {
               height: 100,
               left: 0,
               top: 0,
-              zIndex: 0
-            }
+              zIndex: 0,
+            },
           },
           // options属性是从工具栏中拿到的tools中拿到
-          options: []
-        }
+          options: [],
+        },
       ], // 工作区中拖放的组件
 
       // 当前激活组件
@@ -362,16 +372,16 @@ export default {
       widgetOptions: {
         setup: [], // 配置
         data: [], // 数据
-        position: [] // 坐标
+        position: [], // 坐标
       },
       flagWidgetClickStopPropagation: false, // 点击组件时阻止事件冒泡传递到画布click事件上
       styleObj: {
         left: 0,
-        top: 0
+        top: 0,
       },
       visibleContentMenu: false,
       rightClickIndex: -1,
-      activeName: "first"
+      activeName: "first",
     };
   },
   computed: {
@@ -380,7 +390,7 @@ export default {
     },
     headers() {
       return {
-        Authorization: getToken() // 直接从本地获取token就行
+        Authorization: getToken(), // 直接从本地获取token就行
       };
     },
     // 左侧折叠切换时，动态计算中间区的宽度
@@ -407,9 +417,7 @@ export default {
       return Math.min(widthScale, heightScale);
     },
     workbenchTransform() {
-      return `scale(${this.bigscreenScaleInWorkbench}, ${
-        this.bigscreenScaleInWorkbench
-      })`;
+      return `scale(${this.bigscreenScaleInWorkbench}, ${this.bigscreenScaleInWorkbench})`;
     },
     // 大屏在设计模式的大小
     bigscreenWidthInWorkbench() {
@@ -419,7 +427,7 @@ export default {
       return (
         this.getPXUnderScale(this.bigscreenHeight) + this.widthPaddingTools
       );
-    }
+    },
   },
   watch: {
     widgets: {
@@ -430,8 +438,8 @@ export default {
           this.revoke.push(this.widgets);
         });
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   created() {
     /* 以下是记录历史的 */
@@ -476,7 +484,7 @@ export default {
         const obj = {};
         obj.icon = getToolByCode(val[i].type).icon;
         const options = val[i].options["setup"];
-        options.forEach(el => {
+        options.forEach((el) => {
           if (el.name == "layerName") {
             obj.label = el.value;
           }
@@ -512,7 +520,7 @@ export default {
         backgroundImage: (data && data.backgroundImage) || "",
         height: (data && data.height) || "1080",
         title: (data && data.title) || "",
-        width: (data && data.width) || "1920"
+        width: (data && data.width) || "1920",
       };
     },
     handleInitEchartsData(data) {
@@ -524,7 +532,7 @@ export default {
         obj.value = {
           setup: widgets[i].value.setup,
           data: widgets[i].value.data,
-          position: widgets[i].value.position
+          position: widgets[i].value.position,
         };
         const tool = this.deepClone(getToolByCode(widgets[i].type));
         const option = tool.options;
@@ -545,7 +553,7 @@ export default {
           } else if (Object.prototype.toString.call(item) == "[object Array]") {
             for (let j = 0; j < item.length; j++) {
               const list = item[j].list;
-              list.forEach(el => {
+              list.forEach((el) => {
                 if (key == el.name) {
                   el.value = data.setup[key];
                 }
@@ -585,9 +593,9 @@ export default {
           width: this.dashboard.width,
           height: this.dashboard.height,
           backgroundColor: this.dashboard.backgroundColor,
-          backgroundImage: this.dashboard.backgroundImage
+          backgroundImage: this.dashboard.backgroundImage,
         },
-        widgets: this.widgets
+        widgets: this.widgets,
       };
       const { code, data } = await insertDashboard(screenData);
       if (code == "200") {
@@ -598,7 +606,7 @@ export default {
     viewScreen() {
       let routeUrl = this.$router.resolve({
         path: "/bigscreen/viewer",
-        query: { reportCode: this.$route.query.reportCode }
+        query: { reportCode: this.$route.query.reportCode },
       });
       window.open(routeUrl.href, "_blank");
     },
@@ -608,15 +616,15 @@ export default {
 
       const param = {
         reportCode: this.$route.query.reportCode,
-        showDataSet: val
+        showDataSet: val,
       };
-      exportDashboard(param).then(res => {
+      exportDashboard(param).then((res) => {
         const that = this;
         const type = res.type;
         if (type == "application/json") {
           let reader = new FileReader();
           reader.readAsText(res, "utf-8");
-          reader.onload = function() {
+          reader.onload = function () {
             const data = JSON.parse(reader.result);
             that.$message.error(data.message);
           };
@@ -645,19 +653,19 @@ export default {
       if (response.code == "200") {
         this.$message({
           message: "导入成功！",
-          type: "success"
+          type: "success",
         });
       } else {
         this.$message({
           message: response.message,
-          type: "error"
+          type: "error",
         });
       }
     },
     handleError(err) {
       this.$message({
         message: "上传失败！",
-        type: "error"
+        type: "error",
       });
     },
 
@@ -704,10 +712,10 @@ export default {
             height: 0,
             left: 0,
             top: 0,
-            zIndex: 0
-          }
+            zIndex: 0,
+          },
         },
-        options: tool.options
+        options: tool.options,
       };
       // 处理默认值
       const widgetJsonValue = this.handleDefaultValue(widgetJson);
@@ -739,7 +747,7 @@ export default {
             ) {
               for (let j = 0; j < item.length; j++) {
                 const list = item[j].list;
-                list.forEach(el => {
+                list.forEach((el) => {
                   widgetJson.value.setup[el.name] = el.value;
                 });
               }
@@ -789,7 +797,7 @@ export default {
       }
       this.widgetIndex = obj.index;
       this.widgets[obj.index].value.position = obj;
-      this.widgets[obj.index].options.position.forEach(el => {
+      this.widgets[obj.index].options.position.forEach((el) => {
         for (const key in obj) {
           if (el.name == key) {
             el.value = obj[key];
@@ -835,7 +843,7 @@ export default {
         if (this.bigscreenHeight != this.dashboard.height) {
           this.bigscreenHeight = this.dashboard.height;
         }
-        this.widgetOptions.setup.forEach(el => {
+        this.widgetOptions.setup.forEach((el) => {
           if (el.name == "width") {
             el.value = this.bigscreenWidth;
           } else if (el.name == "height") {
@@ -864,7 +872,7 @@ export default {
         this.styleObj = {
           left: left + "px",
           top: top + "px",
-          display: "block"
+          display: "block",
         };
       }
       this.visibleContentMenu = true;
@@ -948,8 +956,8 @@ export default {
       } else {
         this.widgets.unshift(this.widgets.splice(this.rightClickIndex, 1)[0]);
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -1353,4 +1361,92 @@ li {
 /deep/ .vue-ruler-v {
   opacity: 0.3;
 }
+.layout-left {
+  width: 200px;
+  background: #242a30;
+  overflow-x: hidden;
+  overflow-y: auto;
+  .chart-type {
+    display: flex;
+    flex-direction: row;
+    overflow: hidden;
+    .type-left {
+      width: 100%;
+      height: calc(100vh - 80px);
+      text-align: center;
+      /deep/.el-tabs__header {
+        width: 30%;
+        margin-right: 0;
+        .el-tabs__nav-wrap {
+          &::after {
+            background: transparent;
+          }
+          .el-tabs__item {
+            text-align: center;
+            width: 100% !important;
+            color: #fff;
+            padding: 0;
+            font-size: 12px !important;
+          }
+        }
+      }
+      /deep/.el-tabs__content {
+        width: 70%;
+      }
+    }
+  }
+  //工具栏一个元素
+  .tools-item {
+    display: flex;
+    position: relative;
+    width: 100%;
+    height: 48px;
+    align-items: center;
+    -webkit-box-align: center;
+    padding: 0 6px;
+    cursor: pointer;
+    font-size: 12px;
+    margin-bottom: 1px;
+
+    .tools-item-icon {
+      color: #409eff;
+      margin-right: 10px;
+      width: 53px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      display: block;
+      border: 1px solid #3a4659;
+      background: #282a30;
+    }
+    .tools-item-text {
+      font-size: 12px !important;
+    }
+  }
+  /deep/.el-tabs__content {
+    padding: 0;
+  }
+}
+/* 设置滚动条的样式 */
+
+::-webkit-scrollbar {
+  width: 0;
+}
+
+/* 滚动槽 */
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
+}
+
+/* 滚动条滑块 */
+
+::-webkit-scrollbar-thumb {
+  background: rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
+}
+
+::-webkit-scrollbar-thumb:window-inactive {
+  background: rgba(255, 0, 0, 0.4);
+}
 </style>

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js

@@ -0,0 +1,660 @@
+/*
+ * @Descripttion: 柱状对比图 json
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:39:35
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-09-28 14:09:58
+ */
+export const widgetBarCompare = {
+  code: 'widgetBarCompareChart',
+  type: 'barChart',
+  tabName: '柱状图',
+  label: '柱状对比图',
+  icon: 'iconduibitupu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '柱状对比图',
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      [
+        {
+          name: '柱体设置',
+          list: [
+            {
+              type: 'el-slider',
+              label: '最大宽度',
+              name: 'maxWidth',
+              required: false,
+              placeholder: '',
+              value: 15,
+            },
+            {
+              type: 'el-slider',
+              label: '圆角',
+              name: 'radius',
+              require: false,
+              placeholder: '',
+              value: 5,
+            },
+          ],
+        },
+        {
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '标题',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: '',
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#FFD700'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+          ],
+        },
+        {
+          name: '图例操作',
+          list: [
+            {
+              type: 'el-switch',
+              label: '图例显示',
+              name: 'isShowLegend',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '图例名称',
+              name: 'legendName',
+              required: false,
+              placeholder: '多值以' | '隔开',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'legendColor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'legendFontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-input-number',
+              label: '图例宽度',
+              name: 'legendWidth',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-select',
+              label: '横向位置',
+              name: 'lateralPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-select',
+              label: '纵向位置',
+              name: 'longitudinalPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
+              ],
+              value: 'top'
+            },
+            {
+              type: 'el-select',
+              label: '布局前置',
+              name: 'layoutFront',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
+              ],
+              value: 'horizontal'
+            },
+          ],
+        },
+        {
+          name: '左X轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'hideXLeft',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-number',
+              label: '数值间隔',
+              name: 'splitNumberLeft',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '数值颜色',
+              name: 'XcolorLeft',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '数值字号',
+              name: 'fontSizeXLeft',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'el-switch',
+              label: '刻度线',
+              name: 'tickLineLeft',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-switch',
+              label: 'X轴线',
+              name: 'xLineLeft',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorXLeft',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-switch',
+              label: '竖分割线',
+              name: 'SplitLineLeft',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'SplitLineColorLeft',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '分割线宽度',
+              name: 'SplitLinefontSizeLeft',
+              required: false,
+              placeholder: '',
+              value: 1,
+            },
+            {
+              type: 'el-switch',
+              label: '边框线',
+              name: 'frameLineLeft',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+          ],
+        },
+        {
+          name: '右X轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'hideXRight',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-number',
+              label: '数值间隔',
+              name: 'splitNumberRight',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '数值颜色',
+              name: 'XcolorRight',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '数值字号',
+              name: 'fontSizeXRight',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'el-switch',
+              label: '刻度线',
+              name: 'tickLineRight',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-switch',
+              label: 'X轴线',
+              name: 'xLineRight',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorXRight',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-switch',
+              label: '竖分割线',
+              name: 'SplitLineRight',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'SplitLineColorRight',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '分割线宽度',
+              name: 'SplitLinefontSizeRight',
+              required: false,
+              placeholder: '',
+              value: 1,
+            },
+            {
+              type: 'el-switch',
+              label: '边框线',
+              name: 'frameLineRight',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+          ],
+        },
+        {
+          name: 'Y轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'hideY',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              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-select',
+              label: '数值对齐',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-switch',
+              label: '刻度线',
+              name: 'tickLineY',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-switch',
+              label: 'Y轴线',
+              name: 'lineY',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+          ],
+        },
+        {
+          name: '数值设定',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShow',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 14
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+          ],
+        },
+        {
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipsFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
+        },
+        {
+          name: '坐标轴边距设置',
+          list: [
+            {
+              type: 'el-slider',
+              label: '左右边距(像素)',
+              name: 'marginLeftRight',
+              required: false,
+              placeholder: '',
+              value: 10,
+            },
+            {
+              type: 'el-slider',
+              label: '顶边距(像素)',
+              name: 'marginTop',
+              required: false,
+              placeholder: '',
+              value: 40,
+            },
+            {
+              type: 'el-slider',
+              label: '底边距(像素)',
+              name: 'marginBottom',
+              required: false,
+              placeholder: '',
+              value: 10,
+            },
+          ],
+        },
+        {
+          name: '自定义配色',
+          list: [
+            {
+              type: 'customColor',
+              label: '',
+              name: 'customColor',
+              required: false,
+              value: [{ color: '#36c5e7' }, { color: '#e68b55' }],
+            },
+          ],
+        },
+      ],
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [
+          { "axis": "07-25", "name": "success", "data": "2" },
+          { "axis": "07-25", "name": "fail", "data": "10" },
+          { "axis": "07-26", "name": "success", "data": "5" },
+          { "axis": "07-26", "name": "fail", "data": "20" },
+          { "axis": "07-27", "name": "success", "data": "15" },
+          { "axis": "07-27", "name": "fail", "data": "30" },
+          { "axis": "07-28", "name": "success", "data": "10" },
+          { "axis": "07-28", "name": "fail", "data": "12" },
+          { "axis": "07-29", "name": "success", "data": "9" },
+          { "axis": "07-29", "name": "fail", "data": "16" },
+        ],
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        chartType: 'widget-stackchart',
+        dictKey: 'STACK_PROPERTIES',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 500,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 250,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-bar-line-stack.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js

@@ -4,7 +4,8 @@
  */
 export const widgetBarLineStack = {
   code: 'widgetBarLineStackChart',
-  type: 'chart',
+  type: 'barChart',
+  tabName: '柱状图',
   label: '柱线堆叠图',
   icon: 'iconzhuxiantu',
   options: {
@@ -127,10 +128,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -141,9 +142,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'italic', name: 'italic斜体'},
-                {code: 'oblique', name: 'oblique斜体'},
+                { code: 'normal', name: '正常' },
+                { code: 'italic', name: 'italic斜体' },
+                { code: 'oblique', name: 'oblique斜体' },
               ],
               value: 'normal'
             },
@@ -154,9 +155,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -191,10 +192,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -205,9 +206,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'italic', name: 'italic斜体'},
-                {code: 'oblique', name: 'oblique斜体'},
+                { code: 'normal', name: '正常' },
+                { code: 'italic', name: 'italic斜体' },
+                { code: 'oblique', name: 'oblique斜体' },
               ],
               value: 'normal'
             },
@@ -263,9 +264,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -276,8 +277,8 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -288,8 +289,8 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -570,10 +571,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -621,10 +622,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -693,7 +694,7 @@ export const widgetBarLineStack = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
             },
           ],
         },
@@ -737,16 +738,16 @@ export const widgetBarLineStack = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"axis": "2021-07", "name": "A", "bar": "12", "line": "20"},
-          {"axis": "2021-07", "name": "B", "bar": "20", "line": "12"},
-          {"axis": "2021-08", "name": "A", "bar": "0", "line": "8"},
-          {"axis": "2021-08", "name": "B", "bar": "5", "line": "3"},
-          {"axis": "2021-09", "name": "A", "bar": "15", "line": "9"},
-          {"axis": "2021-09", "name": "B", "bar": "30", "line": "19"},
-          {"axis": "2021-10", "name": "A", "bar": "10", "line": "27"},
-          {"axis": "2021-10", "name": "B", "bar": "24", "line": "6"},
-          {"axis": "2021-11", "name": "A", "bar": "23", "line": "29"},
-          {"axis": "2021-11", "name": "B", "bar": "8", "line": "9"},
+          { "axis": "2021-07", "name": "A", "bar": "12", "line": "20" },
+          { "axis": "2021-07", "name": "B", "bar": "20", "line": "12" },
+          { "axis": "2021-08", "name": "A", "bar": "0", "line": "8" },
+          { "axis": "2021-08", "name": "B", "bar": "5", "line": "3" },
+          { "axis": "2021-09", "name": "A", "bar": "15", "line": "9" },
+          { "axis": "2021-09", "name": "B", "bar": "30", "line": "19" },
+          { "axis": "2021-10", "name": "A", "bar": "10", "line": "27" },
+          { "axis": "2021-10", "name": "B", "bar": "24", "line": "6" },
+          { "axis": "2021-11", "name": "A", "bar": "23", "line": "29" },
+          { "axis": "2021-11", "name": "B", "bar": "8", "line": "9" },
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-bar-stack.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js

@@ -8,7 +8,8 @@
  */
 export const widgetBarStack =  {
     code: 'widgetBarStackChart',
-    type: 'chart',
+    type: 'barChart',
+    tabName: '柱状图',
     label: '柱状堆叠图',
     icon: 'iconbianzu23',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-barchart.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js

@@ -8,7 +8,8 @@
  */
 export const widgetBarchart = {
   code: 'widget-barchart',
-  type: 'chart',
+  type: 'barChart',
+  tabName: '柱状图',
   label: '柱状图',
   icon: 'iconzhuzhuangtu',
   options: {
@@ -102,10 +103,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -124,9 +125,9 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -153,10 +154,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -422,10 +423,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -494,7 +495,7 @@ export const widgetBarchart = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
             },
           ],
         },
@@ -538,11 +539,11 @@ export const widgetBarchart = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"axis": "苹果", "data": 1000},
-          {"axis": "三星", "data": 2229},
-          {"axis": "小米", "data": 3879},
-          {"axis": "oppo", "data": 2379},
-          {"axis": "vivo", "data": 4079},
+          { "axis": "苹果", "data": 1000 },
+          { "axis": "三星", "data": 2229 },
+          { "axis": "小米", "data": 3879 },
+          { "axis": "oppo", "data": 2379 },
+          { "axis": "vivo", "data": 4079 },
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-barlinechart.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 07:26:48
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:11:57
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:39:29
  */
 export const widgetBarlinechart = {
   code: 'widget-barlinechart',
-  type: 'chart',
+  type: 'barlineChart',
+  tabName: '柱线图',
   label: '柱线图',
   icon: 'iconzhuxiantu',
   options: {
@@ -147,10 +148,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -169,9 +170,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'left'
             },
@@ -198,10 +199,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -265,9 +266,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -278,8 +279,8 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -290,8 +291,8 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -557,10 +558,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -608,10 +609,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -680,7 +681,7 @@ export const widgetBarlinechart = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{color: '#00F4FFFF'}, {color: '#e68b55'}],
+              value: [{ color: '#00F4FFFF' }, { color: '#e68b55' }],
             },
           ],
         },
@@ -724,18 +725,18 @@ export const widgetBarlinechart = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"axis": "1月", "bar": 2.6, "line": 2},
-          {"axis": "2月", "bar": 5.9, "line": 2.2},
-          {"axis": "3月", "bar": 9, "line": 3.3},
-          {"axis": "4月", "bar": 26.4, "line": 4.5},
-          {"axis": "5月", "bar": 28.7, "line": 6.3},
-          {"axis": "6月", "bar": 70.7, "line": 10.2},
-          {"axis": "7月", "bar": 175.6, "line": 20.3},
-          {"axis": "8月", "bar": 182.2, "line": 23.4},
-          {"axis": "9月", "bar": 48.7, "line": 23},
-          {"axis": "10月", "bar": 18.8, "line": 16.5},
-          {"axis": "11月", "bar": 6, "line": 12},
-          {"axis": "12月", "bar": 2.3, "line": 6.2},
+          { "axis": "1月", "bar": 2.6, "line": 2 },
+          { "axis": "2月", "bar": 5.9, "line": 2.2 },
+          { "axis": "3月", "bar": 9, "line": 3.3 },
+          { "axis": "4月", "bar": 26.4, "line": 4.5 },
+          { "axis": "5月", "bar": 28.7, "line": 6.3 },
+          { "axis": "6月", "bar": 70.7, "line": 10.2 },
+          { "axis": "7月", "bar": 175.6, "line": 20.3 },
+          { "axis": "8月", "bar": 182.2, "line": 23.4 },
+          { "axis": "9月", "bar": 48.7, "line": 23 },
+          { "axis": "10月", "bar": 18.8, "line": 16.5 },
+          { "axis": "11月", "bar": 6, "line": 12 },
+          { "axis": "12月", "bar": 2.3, "line": 6.2 },
         ]
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-gradient-barchart.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js

@@ -8,7 +8,8 @@
  */
 export const widgetGradientBarchart = {
   code: 'widget-gradient-color-barchart',
-  type: 'chart',
+  type: 'barlineChart',
+  tabName: '柱线图',
   label: '柱状图-渐变色',
   icon: 'iconzhuzhuangtu',
   options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-more-bar-line.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: foming
  * @Date:
- * @LastEditors:
- * @LastEditTime:
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:39:52
  */
 export const widgetMoreBarLine = {
   code: 'widgetMoreBarLineChart',
-  type: 'chart',
+  type: 'barlineChart',
+  tabName: '柱线图',
   label: '多柱线图',
   icon: 'iconzhuxiantu',
   options: {
@@ -139,10 +140,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -161,9 +162,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'left'
             },
@@ -190,10 +191,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -223,7 +224,7 @@ export const widgetMoreBarLine = {
               label: '图例名称',
               name: 'legendName',
               required: false,
-              placeholder: '多值以'|'隔开',
+              placeholder: '多值以' | '隔开',
               value: ''
             },
             {
@@ -257,9 +258,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -270,8 +271,8 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -282,8 +283,8 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -525,10 +526,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -576,10 +577,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -649,9 +650,9 @@ export const widgetMoreBarLine = {
               name: 'customColor',
               required: false,
               value: [
-                {color: '#4bdfff'},
-                {color: '#55f49c'},
-                {color: '#ffa43a'},
+                { color: '#4bdfff' },
+                { color: '#55f49c' },
+                { color: '#ffa43a' },
               ],
             },
           ],
@@ -696,14 +697,14 @@ export const widgetMoreBarLine = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"date": "2014", "unsales": 400, "manus": 300, "sales": 4.2,},
-          {"date": "2015", "unsales": 400, "manus": 500, "sales": 3.6,},
-          {"date": "2016", "unsales": 300, "manus": 500, "sales": 5.8,},
-          {"date": "2017", "unsales": 300, "manus": 500, "sales": 3.4,},
-          {"date": "2018", "unsales": 400, "manus": 400, "sales": 2.5,},
-          {"date": "2019", "unsales": 400, "manus": 500, "sales": 5.8,},
-          {"date": "2020", "unsales": 300, "manus": 400, "sales": 7.6,},
-          {"date": "2021", "unsales": 300, "manus": 600, "sales": 3.4,},
+          { "date": "2014", "unsales": 400, "manus": 300, "sales": 4.2, },
+          { "date": "2015", "unsales": 400, "manus": 500, "sales": 3.6, },
+          { "date": "2016", "unsales": 300, "manus": 500, "sales": 5.8, },
+          { "date": "2017", "unsales": 300, "manus": 500, "sales": 3.4, },
+          { "date": "2018", "unsales": 400, "manus": 400, "sales": 2.5, },
+          { "date": "2019", "unsales": 400, "manus": 500, "sales": 5.8, },
+          { "date": "2020", "unsales": 300, "manus": 400, "sales": 7.6, },
+          { "date": "2021", "unsales": 300, "manus": 600, "sales": 3.4, },
         ]
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-decorate-pie.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/decorateCharts/widget-decorate-pie.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: foming
  * @Date:
- * @LastEditors:
- * @LastEditTime:
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:40:07
  */
 export const widgetDecoratePie = {
   code: 'widgetDecoratePieChart',
-  type: 'chart',
+  type: 'decorate',
+  tabName: '装饰图',
   label: '装饰饼图',
   icon: 'iconicon_tubiao_bingtu',
   options: {
@@ -396,9 +397,9 @@ export const widgetDecoratePie = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'four', name: '十字星'},
-                {code: 'five', name: '五角星'},
-                {code: 'six', name: '六芒星'},
+                { code: 'four', name: '十字星' },
+                { code: 'five', name: '五角星' },
+                { code: 'six', name: '六芒星' },
               ],
               value: 'six'
             },

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-funnel.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/funnelCharts/widget-funnel.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 07:29:23
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:12:37
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:40:21
  */
 export const widgetFunnel = {
   code: 'widget-funnel',
-  type: 'chart',
+  type: 'funnel',
+  tabName: '漏斗图',
   label: '漏斗图',
   icon: 'iconloudoutu',
   options: {
@@ -73,10 +74,10 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -95,9 +96,9 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -124,10 +125,10 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -175,10 +176,10 @@ export const widgetFunnel = {
               require: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -226,9 +227,9 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -239,8 +240,8 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -251,8 +252,8 @@ export const widgetFunnel = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -287,7 +288,7 @@ export const widgetFunnel = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{color: '#0CD2E6'}, {color: '#00BFA5'}, {color: '#FFC722'}, {color: '#886EFF'}, {color: '#008DEC'}],
+              value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
             },
           ],
         },
@@ -331,11 +332,11 @@ export const widgetFunnel = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"value": 2, "name": "访问"},
-          {"value": 5, "name": "咨询"},
-          {"value": 20, "name": "订单"},
-          {"value": 40, "name": "点击"},
-          {"value": 125, "name": "展现"}
+          { "value": 2, "name": "访问" },
+          { "value": 5, "name": "咨询" },
+          { "value": 20, "name": "订单" },
+          { "value": 40, "name": "点击" },
+          { "value": 125, "name": "展现" }
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-heatmap.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: whw
  * @Date: 2021-11-3
- * @LastEditors: whw
- * @LastEditTime: 2021-11-3
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:40:35
  */
 export const widgetHeatmap = {
   code: 'widget-heatmap',
-  type: 'chart',
+  type: 'heatmap',
+  tabName: '热力图',
   label: '热力图',
   icon: 'iconrelitu',
   options: {
@@ -65,10 +66,10 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -87,9 +88,9 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -116,10 +117,10 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -329,10 +330,10 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -451,9 +452,9 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -464,8 +465,8 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -476,8 +477,8 @@ export const widgetHeatmap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -491,7 +492,7 @@ export const widgetHeatmap = {
               label: '',
               name: 'legendColorList',
               required: false,
-              value: [{color: '#abd9e9'}, {color: '#74add1'}, {color: '#4575b4'}, {color: '#313695'}],
+              value: [{ color: '#abd9e9' }, { color: '#74add1' }, { color: '#4575b4' }, { color: '#313695' }],
             },
           ],
         },
@@ -535,106 +536,106 @@ export const widgetHeatmap = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"axis": "0", "yaxis": "0", "num": 3320},
-          {"axis": "0", "yaxis": "1", "num": 1561},
-          {"axis": "0", "yaxis": "2", "num": 3194},
-          {"axis": "0", "yaxis": "3", "num": 2899},
-          {"axis": "0", "yaxis": "4", "num": 2363},
-          {"axis": "0", "yaxis": "5", "num": 3945},
-          {"axis": "0", "yaxis": "6", "num": 2051},
-          {"axis": "0", "yaxis": "7", "num": 3657},
-          {"axis": "0", "yaxis": "8", "num": 3304},
-          {"axis": "0", "yaxis": "9", "num": 2990},
-          {"axis": "1", "yaxis": "9", "num": 2663},
-          {"axis": "1", "yaxis": "0", "num": 378},
-          {"axis": "1", "yaxis": "1", "num": 4076},
-          {"axis": "1", "yaxis": "2", "num": 3178},
-          {"axis": "1", "yaxis": "3", "num": 1501},
-          {"axis": "1", "yaxis": "4", "num": 1660},
-          {"axis": "1", "yaxis": "5", "num": 726},
-          {"axis": "1", "yaxis": "6", "num": 4148},
-          {"axis": "1", "yaxis": "7", "num": 720},
-          {"axis": "1", "yaxis": "8", "num": 430},
-          {"axis": "2", "yaxis": "9", "num": 2983},
-          {"axis": "2", "yaxis": "0", "num": 1917},
-          {"axis": "2", "yaxis": "1", "num": 1188},
-          {"axis": "2", "yaxis": "2", "num": 3581},
-          {"axis": "2", "yaxis": "3", "num": 1781},
-          {"axis": "2", "yaxis": "4", "num": 4725},
-          {"axis": "2", "yaxis": "5", "num": 4077},
-          {"axis": "2", "yaxis": "6", "num": 299},
-          {"axis": "2", "yaxis": "7", "num": 4828},
-          {"axis": "2", "yaxis": "8", "num": 1778},
-          {"axis": "3", "yaxis": "9", "num": 3171},
-          {"axis": "3", "yaxis": "0", "num": 2944},
-          {"axis": "3", "yaxis": "1", "num": 763},
-          {"axis": "3", "yaxis": "2", "num": 1678},
-          {"axis": "3", "yaxis": "3", "num": 1765},
-          {"axis": "3", "yaxis": "4", "num": 2949},
-          {"axis": "3", "yaxis": "5", "num": 966},
-          {"axis": "3", "yaxis": "6", "num": 4622},
-          {"axis": "3", "yaxis": "7", "num": 2818},
-          {"axis": "3", "yaxis": "8", "num": 3913},
-          {"axis": "4", "yaxis": "9", "num": 4382},
-          {"axis": "4", "yaxis": "0", "num": 1670},
-          {"axis": "4", "yaxis": "1", "num": 4532},
-          {"axis": "4", "yaxis": "2", "num": 2116},
-          {"axis": "4", "yaxis": "3", "num": 2383},
-          {"axis": "4", "yaxis": "4", "num": 510},
-          {"axis": "4", "yaxis": "5", "num": 33},
-          {"axis": "4", "yaxis": "6", "num": 4974},
-          {"axis": "4", "yaxis": "7", "num": 3627},
-          {"axis": "4", "yaxis": "8", "num": 2737},
-          {"axis": "5", "yaxis": "9", "num": 656},
-          {"axis": "5", "yaxis": "0", "num": 3689},
-          {"axis": "5", "yaxis": "1", "num": 713},
-          {"axis": "5", "yaxis": "2", "num": 3551},
-          {"axis": "5", "yaxis": "3", "num": 3159},
-          {"axis": "5", "yaxis": "4", "num": 4150},
-          {"axis": "5", "yaxis": "5", "num": 1416},
-          {"axis": "5", "yaxis": "6", "num": 3021},
-          {"axis": "5", "yaxis": "7", "num": 1778},
-          {"axis": "5", "yaxis": "8", "num": 863},
-          {"axis": "6", "yaxis": "9", "num": 772},
-          {"axis": "6", "yaxis": "0", "num": 1675},
-          {"axis": "6", "yaxis": "1", "num": 1323},
-          {"axis": "6", "yaxis": "2", "num": 2023},
-          {"axis": "6", "yaxis": "3", "num": 43},
-          {"axis": "6", "yaxis": "4", "num": 4964},
-          {"axis": "6", "yaxis": "5", "num": 4781},
-          {"axis": "6", "yaxis": "6", "num": 2608},
-          {"axis": "6", "yaxis": "7", "num": 2278},
-          {"axis": "6", "yaxis": "8", "num": 3285},
-          {"axis": "7", "yaxis": "9", "num": 1977},
-          {"axis": "7", "yaxis": "0", "num": 882},
-          {"axis": "7", "yaxis": "1", "num": 2434},
-          {"axis": "7", "yaxis": "2", "num": 4694},
-          {"axis": "7", "yaxis": "3", "num": 3022},
-          {"axis": "7", "yaxis": "4", "num": 1798},
-          {"axis": "7", "yaxis": "5", "num": 2503},
-          {"axis": "7", "yaxis": "6", "num": 693},
-          {"axis": "7", "yaxis": "7", "num": 275},
-          {"axis": "7", "yaxis": "8", "num": 3774},
-          {"axis": "8", "yaxis": "9", "num": 1386},
-          {"axis": "8", "yaxis": "0", "num": 1212},
-          {"axis": "8", "yaxis": "1", "num": 1982},
-          {"axis": "8", "yaxis": "2", "num": 1509},
-          {"axis": "8", "yaxis": "3", "num": 94},
-          {"axis": "8", "yaxis": "4", "num": 2082},
-          {"axis": "8", "yaxis": "5", "num": 3930},
-          {"axis": "8", "yaxis": "6", "num": 4528},
-          {"axis": "8", "yaxis": "7", "num": 1861},
-          {"axis": "8", "yaxis": "8", "num": 4582},
-          {"axis": "9", "yaxis": "9", "num": 3038},
-          {"axis": "9", "yaxis": "0", "num": 4038},
-          {"axis": "9", "yaxis": "1", "num": 357},
-          {"axis": "9", "yaxis": "2", "num": 306},
-          {"axis": "9", "yaxis": "3", "num": 479},
-          {"axis": "9", "yaxis": "4", "num": 823},
-          {"axis": "9", "yaxis": "5", "num": 3442},
-          {"axis": "9", "yaxis": "6", "num": 904},
-          {"axis": "9", "yaxis": "7", "num": 399},
-          {"axis": "9", "yaxis": "8", "num": 4869},
+          { "axis": "0", "yaxis": "0", "num": 3320 },
+          { "axis": "0", "yaxis": "1", "num": 1561 },
+          { "axis": "0", "yaxis": "2", "num": 3194 },
+          { "axis": "0", "yaxis": "3", "num": 2899 },
+          { "axis": "0", "yaxis": "4", "num": 2363 },
+          { "axis": "0", "yaxis": "5", "num": 3945 },
+          { "axis": "0", "yaxis": "6", "num": 2051 },
+          { "axis": "0", "yaxis": "7", "num": 3657 },
+          { "axis": "0", "yaxis": "8", "num": 3304 },
+          { "axis": "0", "yaxis": "9", "num": 2990 },
+          { "axis": "1", "yaxis": "9", "num": 2663 },
+          { "axis": "1", "yaxis": "0", "num": 378 },
+          { "axis": "1", "yaxis": "1", "num": 4076 },
+          { "axis": "1", "yaxis": "2", "num": 3178 },
+          { "axis": "1", "yaxis": "3", "num": 1501 },
+          { "axis": "1", "yaxis": "4", "num": 1660 },
+          { "axis": "1", "yaxis": "5", "num": 726 },
+          { "axis": "1", "yaxis": "6", "num": 4148 },
+          { "axis": "1", "yaxis": "7", "num": 720 },
+          { "axis": "1", "yaxis": "8", "num": 430 },
+          { "axis": "2", "yaxis": "9", "num": 2983 },
+          { "axis": "2", "yaxis": "0", "num": 1917 },
+          { "axis": "2", "yaxis": "1", "num": 1188 },
+          { "axis": "2", "yaxis": "2", "num": 3581 },
+          { "axis": "2", "yaxis": "3", "num": 1781 },
+          { "axis": "2", "yaxis": "4", "num": 4725 },
+          { "axis": "2", "yaxis": "5", "num": 4077 },
+          { "axis": "2", "yaxis": "6", "num": 299 },
+          { "axis": "2", "yaxis": "7", "num": 4828 },
+          { "axis": "2", "yaxis": "8", "num": 1778 },
+          { "axis": "3", "yaxis": "9", "num": 3171 },
+          { "axis": "3", "yaxis": "0", "num": 2944 },
+          { "axis": "3", "yaxis": "1", "num": 763 },
+          { "axis": "3", "yaxis": "2", "num": 1678 },
+          { "axis": "3", "yaxis": "3", "num": 1765 },
+          { "axis": "3", "yaxis": "4", "num": 2949 },
+          { "axis": "3", "yaxis": "5", "num": 966 },
+          { "axis": "3", "yaxis": "6", "num": 4622 },
+          { "axis": "3", "yaxis": "7", "num": 2818 },
+          { "axis": "3", "yaxis": "8", "num": 3913 },
+          { "axis": "4", "yaxis": "9", "num": 4382 },
+          { "axis": "4", "yaxis": "0", "num": 1670 },
+          { "axis": "4", "yaxis": "1", "num": 4532 },
+          { "axis": "4", "yaxis": "2", "num": 2116 },
+          { "axis": "4", "yaxis": "3", "num": 2383 },
+          { "axis": "4", "yaxis": "4", "num": 510 },
+          { "axis": "4", "yaxis": "5", "num": 33 },
+          { "axis": "4", "yaxis": "6", "num": 4974 },
+          { "axis": "4", "yaxis": "7", "num": 3627 },
+          { "axis": "4", "yaxis": "8", "num": 2737 },
+          { "axis": "5", "yaxis": "9", "num": 656 },
+          { "axis": "5", "yaxis": "0", "num": 3689 },
+          { "axis": "5", "yaxis": "1", "num": 713 },
+          { "axis": "5", "yaxis": "2", "num": 3551 },
+          { "axis": "5", "yaxis": "3", "num": 3159 },
+          { "axis": "5", "yaxis": "4", "num": 4150 },
+          { "axis": "5", "yaxis": "5", "num": 1416 },
+          { "axis": "5", "yaxis": "6", "num": 3021 },
+          { "axis": "5", "yaxis": "7", "num": 1778 },
+          { "axis": "5", "yaxis": "8", "num": 863 },
+          { "axis": "6", "yaxis": "9", "num": 772 },
+          { "axis": "6", "yaxis": "0", "num": 1675 },
+          { "axis": "6", "yaxis": "1", "num": 1323 },
+          { "axis": "6", "yaxis": "2", "num": 2023 },
+          { "axis": "6", "yaxis": "3", "num": 43 },
+          { "axis": "6", "yaxis": "4", "num": 4964 },
+          { "axis": "6", "yaxis": "5", "num": 4781 },
+          { "axis": "6", "yaxis": "6", "num": 2608 },
+          { "axis": "6", "yaxis": "7", "num": 2278 },
+          { "axis": "6", "yaxis": "8", "num": 3285 },
+          { "axis": "7", "yaxis": "9", "num": 1977 },
+          { "axis": "7", "yaxis": "0", "num": 882 },
+          { "axis": "7", "yaxis": "1", "num": 2434 },
+          { "axis": "7", "yaxis": "2", "num": 4694 },
+          { "axis": "7", "yaxis": "3", "num": 3022 },
+          { "axis": "7", "yaxis": "4", "num": 1798 },
+          { "axis": "7", "yaxis": "5", "num": 2503 },
+          { "axis": "7", "yaxis": "6", "num": 693 },
+          { "axis": "7", "yaxis": "7", "num": 275 },
+          { "axis": "7", "yaxis": "8", "num": 3774 },
+          { "axis": "8", "yaxis": "9", "num": 1386 },
+          { "axis": "8", "yaxis": "0", "num": 1212 },
+          { "axis": "8", "yaxis": "1", "num": 1982 },
+          { "axis": "8", "yaxis": "2", "num": 1509 },
+          { "axis": "8", "yaxis": "3", "num": 94 },
+          { "axis": "8", "yaxis": "4", "num": 2082 },
+          { "axis": "8", "yaxis": "5", "num": 3930 },
+          { "axis": "8", "yaxis": "6", "num": 4528 },
+          { "axis": "8", "yaxis": "7", "num": 1861 },
+          { "axis": "8", "yaxis": "8", "num": 4582 },
+          { "axis": "9", "yaxis": "9", "num": 3038 },
+          { "axis": "9", "yaxis": "0", "num": 4038 },
+          { "axis": "9", "yaxis": "1", "num": 357 },
+          { "axis": "9", "yaxis": "2", "num": 306 },
+          { "axis": "9", "yaxis": "3", "num": 479 },
+          { "axis": "9", "yaxis": "4", "num": 823 },
+          { "axis": "9", "yaxis": "5", "num": 3442 },
+          { "axis": "9", "yaxis": "6", "num": 904 },
+          { "axis": "9", "yaxis": "7", "num": 399 },
+          { "axis": "9", "yaxis": "8", "num": 4869 },
         ]
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-line-compare.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: foming
  * @Date: 2021-08-29 07:39:35
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:15:42
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:40:44
  */
 export const widgetLineCompare = {
   code: 'widgetLineCompareChart',
-  type: 'chart',
+  type: 'lineChart',
+  tabName: '折线图',
   label: '折线对比图',
   icon: 'iconzhexian',
   options: {
@@ -118,10 +119,10 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -140,9 +141,9 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -164,7 +165,7 @@ export const widgetLineCompare = {
               label: '图例名称',
               name: 'legendName',
               required: false,
-              placeholder: '多值以'|'隔开',
+              placeholder: '多值以' | '隔开',
               value: ''
             },
             {
@@ -198,9 +199,9 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -211,8 +212,8 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'top', name: '顶部'},
-                {code: 'bottom', name: '底部'},
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
               ],
               value: 'top'
             },
@@ -223,8 +224,8 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'vertical', name: '竖排'},
-                {code: 'horizontal', name: '横排'},
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
               ],
               value: 'horizontal'
             },
@@ -341,7 +342,7 @@ export const widgetLineCompare = {
               require: false,
               placeholder: '',
               value: ''
-            },{
+            }, {
               type: 'vue-color',
               label: '坐标名颜色',
               name: 'nameColorYTop',
@@ -457,7 +458,7 @@ export const widgetLineCompare = {
               require: false,
               placeholder: '',
               value: ''
-            },{
+            }, {
               type: 'vue-color',
               label: '坐标名颜色',
               name: 'nameColorYBottom',
@@ -589,10 +590,10 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -616,8 +617,8 @@ export const widgetLineCompare = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'line', name: '线形'},
-                {code: 'cross', name: '十字形'},
+                { code: 'line', name: '线形' },
+                { code: 'cross', name: '十字形' },
               ],
               value: 'line'
             },
@@ -676,7 +677,7 @@ export const widgetLineCompare = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{color: '#36c5e7'}, {color: '#e68b55'}],
+              value: [{ color: '#36c5e7' }, { color: '#e68b55' }],
             },
           ],
         },
@@ -720,16 +721,16 @@ export const widgetLineCompare = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"axis":"07-25","name":"success","data":"2"},
-          {"axis":"07-25","name":"fail","data":"10"},
-          {"axis":"07-26","name":"success","data":"5"},
-          {"axis":"07-26","name":"fail","data":"20"},
-          {"axis":"07-27","name":"success","data":"15"},
-          {"axis":"07-27","name":"fail","data":"30"},
-          {"axis":"07-28","name":"success","data":"10"},
-          {"axis":"07-28","name":"fail","data":"12"},
-          {"axis":"07-29","name":"success","data":"9"},
-          {"axis":"07-29","name":"fail","data":"16"},
+          { "axis": "07-25", "name": "success", "data": "2" },
+          { "axis": "07-25", "name": "fail", "data": "10" },
+          { "axis": "07-26", "name": "success", "data": "5" },
+          { "axis": "07-26", "name": "fail", "data": "20" },
+          { "axis": "07-27", "name": "success", "data": "15" },
+          { "axis": "07-27", "name": "fail", "data": "30" },
+          { "axis": "07-28", "name": "success", "data": "10" },
+          { "axis": "07-28", "name": "fail", "data": "12" },
+          { "axis": "07-29", "name": "success", "data": "9" },
+          { "axis": "07-29", "name": "fail", "data": "16" },
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js

@@ -0,0 +1,680 @@
+/*
+ * @Descripttion: 折线堆叠图 json
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:38:17
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-09-28 14:16:28
+ */
+export const widgetLineStack = {
+  code: 'widgetLineStackChart',
+  type: 'lineChart',
+  tabName: '折线图',
+  label: '折线堆叠图',
+  icon: 'iconduidietu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '折线堆叠图',
+      },
+      {
+        type: 'el-switch',
+        label: '竖展示',
+        name: 'verticalShow',
+        required: false,
+        placeholder: '',
+        value: false,
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      [
+        {
+          name: '折线设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标记点',
+              name: 'markPoint',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-slider',
+              label: '点大小',
+              name: 'pointSize',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
+            {
+              type: 'el-switch',
+              label: '平滑曲线',
+              name: 'smoothCurve',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-switch',
+              label: '面积堆积',
+              name: 'area',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-slider',
+              label: '面积厚度',
+              name: 'areaThickness',
+              required: false,
+              placeholder: '',
+              value: 5,
+            },
+            {
+              type: 'el-slider',
+              label: '线条宽度',
+              name: 'lineWidth',
+              required: false,
+              placeholder: '',
+              value: 4,
+            },
+          ],
+        },
+        {
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '标题',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: '',
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#FFD700'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-input-text',
+              label: '副标题',
+              name: 'subText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: 'rgba(30, 144, 255, 1)'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'subTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'subTextFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+          ],
+        },
+        {
+          name: '图例操作',
+          list: [
+            {
+              type: 'el-switch',
+              label: '图例显示',
+              name: 'isShowLegend',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '图例名称',
+              name: 'legendName',
+              required: false,
+              placeholder: '多值以' | '隔开',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'legendColor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'legendFontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-input-number',
+              label: '图例宽度',
+              name: 'legendWidth',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-select',
+              label: '横向位置',
+              name: 'lateralPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-select',
+              label: '纵向位置',
+              name: 'longitudinalPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
+              ],
+              value: 'top'
+            },
+            {
+              type: 'el-select',
+              label: '布局前置',
+              name: 'layoutFront',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
+              ],
+              value: 'horizontal'
+            },
+          ],
+        },
+        {
+          name: 'X轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'hideX',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: 'X轴别名',
+              name: 'xName',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '别名颜色',
+              name: 'xNameColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-input-number',
+              label: '别名字号',
+              name: 'xNameFontSize',
+              required: false,
+              placeholder: '',
+              value: 14
+            },
+            {
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
+            {
+              type: 'el-input-number',
+              label: '文字间隔',
+              name: 'textInterval',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'Xcolor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSizeX',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorX',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-switch',
+              label: '分割线显示',
+              name: 'isShowSplitLineX',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'splitLineColorX',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+
+            }
+          ],
+        },
+        {
+          name: 'Y轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShowY',
+              require: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: 'Y轴别名',
+              name: 'textNameY',
+              require: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '别名颜色',
+              name: 'NameColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '别名字号',
+              name: 'NameFontSizeY',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalY',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
+            {
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeY',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            }, {
+              type: 'el-switch',
+              label: '分割线显示',
+              name: 'isShowSplitLineY',
+              require: false,
+              placeholder: '',
+              value: false,
+            }, {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'splitLineColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+
+            }
+          ],
+        },
+        {
+          name: '数值设定',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShow',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 14
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+          ],
+        },
+        {
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipsFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
+        },
+        {
+          name: '坐标轴边距设置',
+          list: [
+            {
+              type: 'el-slider',
+              label: '左边距(像素)',
+              name: 'marginLeft',
+              required: false,
+              placeholder: '',
+              value: 10,
+            }, {
+              type: 'el-slider',
+              label: '顶边距(像素)',
+              name: 'marginTop',
+              required: false,
+              placeholder: '',
+              value: 50,
+            }, {
+              type: 'el-slider',
+              label: '右边距(像素)',
+              name: 'marginRight',
+              required: false,
+              placeholder: '',
+              value: 40,
+            }, {
+              type: 'el-slider',
+              label: '底边距(像素)',
+              name: 'marginBottom',
+              required: false,
+              placeholder: '',
+              value: 10,
+            },
+          ],
+        },
+        {
+          name: '自定义配色',
+          list: [
+            {
+              type: 'customColor',
+              label: '',
+              name: 'customColor',
+              required: false,
+              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
+            },
+          ],
+        },
+      ],
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [
+          { "axis": "2021-07-25", "name": "A", "data": "12" },
+          { "axis": "2021-07-25", "name": "B", "data": "20" },
+          { "axis": "2021-07-26", "name": "B", "data": "5" },
+          { "axis": "2021-07-27", "name": "A", "data": "15" },
+          { "axis": "2021-07-27", "name": "B", "data": "30" },
+        ],
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        chartType: 'widget-stackchart',
+        dictKey: 'STACK_PROPERTIES',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 500,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 250,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-linechart.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js

@@ -8,7 +8,8 @@
  */
 export const widgetLinechart = {
   code: 'widget-linechart',
-  type: 'chart',
+  type: 'lineChart',
+  tabName: '折线图',
   label: '折线图',
   icon: 'icontubiaozhexiantu',
   options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-airbubble-map.js

@@ -3,12 +3,13 @@
  * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 07:35:32
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:10:01
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:41:02
  */
 export const widgetAirbubbleMap = {
   code: 'widgetAirBubbleMap',
-  type: 'chart',
+  type: 'mapChart',
+  tabName: '中国地图',
   label: '气泡地图',
   icon: 'iconzhongguoditu',
   options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-line-map.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-line-map.js

@@ -8,7 +8,8 @@
  */
 export const widgetLineMap = {
   code: 'widgetLineMap',
-  type: 'chart',
+  type: 'mapChart',
+  tabName: '中国地图',
   label: '路线地图',
   icon: 'iconzhongguoditu',
   options: {
@@ -64,10 +65,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -86,9 +87,9 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
               ],
               value: 'center'
             },
@@ -115,10 +116,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -182,10 +183,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -241,10 +242,10 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -260,8 +261,8 @@ export const widgetLineMap = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'arrow', name: '箭头'},
-                {code: 'plane', name: '飞机'},
+                { code: 'arrow', name: '箭头' },
+                { code: 'plane', name: '飞机' },
               ],
               value: 'arrow'
             },
@@ -380,36 +381,36 @@ export const widgetLineMap = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {source: '北京市', target: '上海市', value: 95},
-          {source: '北京市', target: '广州市', value: 90},
-          {source: '北京市', target: '大连市', value: 80},
-          {source: '北京市', target: '南宁市', value: 70},
-          {source: '北京市', target: '南昌市', value: 60},
-          {source: '北京市', target: '拉萨市', value: 50},
-          {source: '北京市', target: '长春市', value: 40},
-          {source: '北京市', target: '包头市', value: 30},
-          {source: '北京市', target: '重庆市', value: 20},
-          {source: '北京市', target: '常州市', value: 10},
-          {source: '上海市', target: '包头市', value: 95},
-          {source: '上海市', target: '昆明市', value: 90},
-          {source: '上海市', target: '广州市', value: 80},
-          {source: '上海市', target: '郑州市', value: 70},
-          {source: '上海市', target: '长春市', value: 60},
-          {source: '上海市', target: '重庆市', value: 50},
-          {source: '上海市', target: '长沙市', value: 40},
-          {source: '上海市', target: '北京市', value: 30},
-          {source: '上海市', target: '丹东市', value: 20},
-          {source: '上海市', target: '大连市', value: 10},
-          {source: '广州市', target: '福州市', value: 95},
-          {source: '广州市', target: '太原市', value: 90},
-          {source: '广州市', target: '长春市', value: 80},
-          {source: '广州市', target: '重庆市', value: 70},
-          {source: '广州市', target: '西安市', value: 60},
-          {source: '广州市', target: '成都市', value: 50},
-          {source: '广州市', target: '常州市', value: 40},
-          {source: '广州市', target: '北京市', value: 30},
-          {source: '广州市', target: '北海市', value: 20},
-          {source: '广州市', target: '海口市', value: 10},
+          { source: '北京市', target: '上海市', value: 95 },
+          { source: '北京市', target: '广州市', value: 90 },
+          { source: '北京市', target: '大连市', value: 80 },
+          { source: '北京市', target: '南宁市', value: 70 },
+          { source: '北京市', target: '南昌市', value: 60 },
+          { source: '北京市', target: '拉萨市', value: 50 },
+          { source: '北京市', target: '长春市', value: 40 },
+          { source: '北京市', target: '包头市', value: 30 },
+          { source: '北京市', target: '重庆市', value: 20 },
+          { source: '北京市', target: '常州市', value: 10 },
+          { source: '上海市', target: '包头市', value: 95 },
+          { source: '上海市', target: '昆明市', value: 90 },
+          { source: '上海市', target: '广州市', value: 80 },
+          { source: '上海市', target: '郑州市', value: 70 },
+          { source: '上海市', target: '长春市', value: 60 },
+          { source: '上海市', target: '重庆市', value: 50 },
+          { source: '上海市', target: '长沙市', value: 40 },
+          { source: '上海市', target: '北京市', value: 30 },
+          { source: '上海市', target: '丹东市', value: 20 },
+          { source: '上海市', target: '大连市', value: 10 },
+          { source: '广州市', target: '福州市', value: 95 },
+          { source: '广州市', target: '太原市', value: 90 },
+          { source: '广州市', target: '长春市', value: 80 },
+          { source: '广州市', target: '重庆市', value: 70 },
+          { source: '广州市', target: '西安市', value: 60 },
+          { source: '广州市', target: '成都市', value: 50 },
+          { source: '广州市', target: '常州市', value: 40 },
+          { source: '广州市', target: '北京市', value: 30 },
+          { source: '广州市', target: '北海市', value: 20 },
+          { source: '广州市', target: '海口市', value: 10 },
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-gauge.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js

@@ -8,7 +8,8 @@
  */
 export const widgetGauge = {
   code: 'widget-gauge',
-  type: 'chart',
+  type: 'percent',
+  tabName: '百分比',
   label: '仪表盘',
   icon: 'iconyibiaopan',
   options: {
@@ -276,10 +277,10 @@ export const widgetGauge = {
               required: false,
               placeholder: '',
               selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
               ],
               value: 'normal'
             },
@@ -325,7 +326,7 @@ export const widgetGauge = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          {"num":50}
+          { "num": 50 }
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-pie-percentage.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-pie-percentage.js

@@ -8,7 +8,8 @@
  */
 export const widgetPiePercentage = {
     code: 'widgetPiePercentageChart',
-    type: 'chart',
+    type: 'percent',
+    tabName: '百分比',
     label: '百分比图',
     icon: 'iconbaifenbi',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js

@@ -0,0 +1,405 @@
+/*
+ * @Descripttion: 南丁格尔玫瑰图 json
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:32:40
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:41:37
+ */
+export const widgetPieNightingale = {
+  code: 'WidgetPieNightingaleRoseArea',
+  type: 'pieChart',
+  tabName: '饼图',
+  label: '南丁格尔玫瑰图',
+  icon: 'iconnandinggeermeiguitu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '南丁格尔玫瑰图',
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      {
+        type: 'el-select',
+        label: '饼图模式',
+        name: 'nightingleRosetype',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          { code: 'area', name: '面积模式' },
+          { code: 'radius', name: '半径模式' },
+        ],
+        value: 'area'
+      },
+      [
+        {
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-text',
+              label: '标题',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'left'
+            },
+            {
+              type: 'el-input-text',
+              label: '副标题',
+              name: 'subText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'subTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'subTextFontSize',
+              required: false,
+              placeholder: '',
+              value: 12
+            },
+          ],
+        },
+        {
+          name: '数值设定',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShow',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-switch',
+              label: '数值',
+              name: 'numberValue',
+              require: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-switch',
+              label: '百分比',
+              name: 'percentage',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+          ],
+        },
+        {
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipsFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
+        },
+        {
+          name: '图例操作',
+          list: [
+            {
+              type: 'el-switch',
+              label: '图例',
+              name: 'isShowLegend',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'legendColor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'legendFontSize',
+              required: false,
+              placeholder: '',
+              value: 16,
+            },
+            {
+              type: 'el-input-number',
+              label: '图例宽度',
+              name: 'legendWidth',
+              required: false,
+              placeholder: '',
+              value: 15,
+            },
+            {
+              type: 'el-select',
+              label: '横向位置',
+              name: 'lateralPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-select',
+              label: '纵向位置',
+              name: 'longitudinalPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
+              ],
+              value: 'top'
+            },
+            {
+              type: 'el-select',
+              label: '布局前置',
+              name: 'layoutFront',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
+              ],
+              value: 'horizontal'
+            },
+          ],
+        },
+        {
+          name: '自定义配色',
+          list: [
+            {
+              type: 'customColor',
+              label: '',
+              name: 'customColor',
+              required: false,
+              value: [{ color: '#FF801C' }, { color: '#F5FF46' }, { color: '#00FE65' }, { color: '#00FEFF' }, { color: '#ffa800' }]
+            },
+          ],
+        },
+      ],
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [{ "value": 1048, "name": "搜索引擎" }, { "value": 735, "name": "直接访问" }, { "value": 580, "name": "邮件营销" }, { "value": 484, "name": "联盟广告" }, { "value": 300, "name": "视频广告" }],
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        chartType: 'widget-piechart',
+        dictKey: 'PIE_PROPERTIES',
+        relactiveDomValue: 'dynamicData',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 400,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 200,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js

@@ -0,0 +1,405 @@
+/*
+ * @Descripttion: 饼图
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:28:20
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-09-28 14:19:19
+ */
+export const widgetPiechart = {
+  code: 'widget-piechart',
+  type: 'pieChart',
+  tabName: '饼图',
+  label: '饼图',
+  icon: 'iconicon_tubiao_bingtu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '饼图',
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      {
+        type: 'el-select',
+        label: '饼图样式',
+        name: 'piechartStyle',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          { code: 'shixin', name: '实心饼图' },
+          { code: 'kongxin', name: '空心饼图' },
+        ],
+        value: 'shixin'
+      },
+      [
+        {
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-text',
+              label: '标题',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'left'
+            },
+            {
+              type: 'el-input-text',
+              label: '副标题',
+              name: 'subText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'subTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'subTextFontSize',
+              required: false,
+              placeholder: '',
+              value: 12
+            },
+          ],
+        },
+        {
+          name: '数值设定',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShow',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-switch',
+              label: '数值',
+              name: 'numberValue',
+              require: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-switch',
+              label: '百分比',
+              name: 'percentage',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+          ],
+        },
+        {
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
+        },
+        {
+          name: '图例操作',
+          list: [
+            {
+              type: 'el-switch',
+              label: '图例',
+              name: 'isShowLegend',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'legendColor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-text',
+              label: '字体字号',
+              name: 'legendFontSize',
+              required: false,
+              placeholder: '',
+              value: 16,
+            },
+            {
+              type: 'el-input-number',
+              label: '图例宽度',
+              name: 'legendWidth',
+              required: false,
+              placeholder: '',
+              value: 15,
+            },
+            {
+              type: 'el-select',
+              label: '横向位置',
+              name: 'lateralPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-select',
+              label: '纵向位置',
+              name: 'longitudinalPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'top', name: '顶部' },
+                { code: 'bottom', name: '底部' },
+              ],
+              value: 'top'
+            },
+            {
+              type: 'el-select',
+              label: '布局前置',
+              name: 'layoutFront',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'vertical', name: '竖排' },
+                { code: 'horizontal', name: '横排' },
+              ],
+              value: 'horizontal'
+            },
+          ],
+        },
+        {
+          name: '自定义配色',
+          list: [
+            {
+              type: 'customColor',
+              label: '',
+              name: 'customColor',
+              required: false,
+              value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
+            },
+          ],
+        },
+      ],
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [{ "value": 1048, "name": "搜索引擎" }, { "value": 735, "name": "直接访问" }, { "value": 580, "name": "邮件营销" }, { "value": 484, "name": "联盟广告" }, { "value": 300, "name": "视频广告" }]
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        chartType: 'widget-piechart',
+        relactiveDomValue: 'dynamicData',
+        dictKey: 'PIE_PROPERTIES',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 400,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 200,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-href.js

@@ -0,0 +1,158 @@
+/*
+ * @Descripttion: 超链接文本
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:03:58
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-09-28 14:14:21
+ */
+export const widgetHref = {
+  code: 'widget-href',
+  type: 'text',
+  tabName: '文本栏',
+  label: '超链接',
+  icon: 'iconchaolianjie',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '超链接',
+      },
+      {
+        type: 'el-input-text',
+        label: '文本内容',
+        name: 'text',
+        required: false,
+        placeholder: '',
+        value: '超链接',
+      },
+      {
+        type: 'el-input-number',
+        label: '字体字号',
+        name: 'fontSize',
+        required: false,
+        placeholder: '',
+        value: '26',
+      },
+      {
+        type: 'vue-color',
+        label: '字体颜色',
+        name: 'color',
+        required: false,
+        placeholder: '',
+        value: '#FAD400',
+      },
+      {
+        type: 'el-input-number',
+        label: '字体间距',
+        name: 'letterSpacing',
+        required: false,
+        placeholder: '',
+        value: '0',
+      },
+      {
+        type: 'vue-color',
+        label: '字体背景',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: 'rgba(115,170,229,.5)',
+      },
+      {
+        type: 'el-select',
+        label: '文字粗细',
+        name: 'fontWeight',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          { code: 'normal', name: '正常' },
+          { code: 'bold', name: '粗体' },
+          { code: 'bolder', name: '特粗体' },
+          { code: 'lighter', name: '细体' }
+        ],
+        value: 'normal'
+      },
+      {
+        type: 'el-select',
+        label: '对齐方式',
+        name: 'textAlign',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          { code: 'center', name: '居中' },
+          { code: 'left', name: '左对齐' },
+          { code: 'right', name: '右对齐' },
+        ],
+        value: 'center'
+      },
+      {
+        type: 'el-radio-group',
+        label: '跳转方式',
+        name: 'jumpMode',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          {
+            code: 'self',
+            name: '本窗口',
+          },
+          {
+            code: 'other',
+            name: '新窗口',
+          },
+        ],
+        value: 'self',
+      },
+      {
+        type: 'el-input-text',
+        label: '超链地址',
+        name: 'linkAdress',
+        required: false,
+        placeholder: '',
+        value: 'http://www.baidu.com',
+      },
+    ],
+    // 数据
+    data: [],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 100,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 40,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js

@@ -0,0 +1,73 @@
+/*
+ * @Descripttion: iframe json
+ * @version:
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:17:55
+ * @LastEditors: qianlishi
+ * @LastEditTime: 2021-09-28 14:14:39
+ */
+export const widgetIframe = {
+  code: 'widget-iframe',
+  type: 'text',
+  tabName: '文本栏',
+  label: '内联框架',
+  icon: 'iconkuangjia',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: 'iframe',
+      },
+      {
+        type: 'el-input-text',
+        label: '地址',
+        name: 'iframeAdress',
+        required: false,
+        placeholder: '',
+        value: 'https://ajreport.beliefteam.cn/index.html',
+      },
+    ],
+    // 数据
+    data: [],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 300,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 200,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-image.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-image.js

@@ -8,7 +8,8 @@
  */
 export const widgetImage = {
     code: 'widget-image',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '图片',
     icon: 'icontupian',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-marquee.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-marquee.js

@@ -8,7 +8,8 @@
  */
 export const widgetMarquee = {
     code: 'widget-marquee',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '滚动文本',
     icon: 'iconhengxiangwenzi',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-radar.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js

@@ -3,7 +3,8 @@
  */
 export const widgetRadar = {
   code: 'widget-radar',
-  type: 'html',
+  type: 'text',
+  tabName: '文本栏',
   label: '雷达图',
   icon: 'iconleidatu',
   options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-slider.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-slider.js

@@ -8,7 +8,8 @@
  */
 export const widgetSliders =  {
     code: 'widget-slider',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '轮播图片',
     icon: 'slider',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-table.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js

@@ -8,7 +8,8 @@
  */
 export const widgetTable = {
     code: 'widget-table',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '表格',
     icon: 'iconbiaoge',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-text.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js

@@ -8,7 +8,8 @@
  */
 export const widgetText =  {
     code: 'widget-text',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '文本',
     icon: 'iconziyuan',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-time.js → report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-time.js

@@ -8,7 +8,8 @@
  */
 export const widgetTime =  {
     code: 'widget-time',
-    type: 'html',
+    type: 'text',
+    tabName: '文本栏',
     label: '当前时间',
     icon: 'iconshijian',
     options: {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-video.js

@@ -0,0 +1,73 @@
+/*
+ * @Descripttion: 视频json
+ * @version: 
+ * @Author: qianlishi
+ * @Date: 2021-08-29 07:10:22
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:42:46
+ */
+export const widgetVideo = {
+  code: 'widget-video',
+  type: 'text',
+  tabName: '文本栏',
+  label: '视频',
+  icon: 'iconshipin',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: 'video',
+      },
+      {
+        type: 'el-input-text',
+        label: '地址',
+        name: 'videoAdress',
+        required: false,
+        placeholder: '',
+        value: 'https://www.w3school.com.cn//i/movie.ogg',
+      },
+    ],
+    // 数据
+    data: [],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 300,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 200,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-bar-compare.js

@@ -1,659 +0,0 @@
-/*
- * @Descripttion: 柱状对比图 json
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:39:35
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:09:58
- */
-export const widgetBarCompare = {
-    code: 'widgetBarCompareChart',
-    type: 'chart',
-    label: '柱状对比图',
-    icon: 'iconduibitupu',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '柱状对比图',
-        },
-        {
-          type: 'vue-color',
-          label: '背景颜色',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: ''
-        },
-        [
-          {
-            name: '柱体设置',
-            list: [
-              {
-                type: 'el-slider',
-                label: '最大宽度',
-                name: 'maxWidth',
-                required: false,
-                placeholder: '',
-                value: 15,
-              },
-              {
-                type: 'el-slider',
-                label: '圆角',
-                name: 'radius',
-                require: false,
-                placeholder: '',
-                value: 5,
-              },
-            ],
-          },
-          {
-            name: '标题设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标题',
-                name: 'isNoTitle',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '标题',
-                name: 'titleText',
-                required: false,
-                placeholder: '',
-                value: '',
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'textColor',
-                required: false,
-                placeholder: '',
-                value: '#FFD700'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'textFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'textFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体位置',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-            ],
-          },
-          {
-            name: '图例操作',
-            list: [
-              {
-                type: 'el-switch',
-                label: '图例显示',
-                name: 'isShowLegend',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '图例名称',
-                name: 'legendName',
-                required: false,
-                placeholder: '多值以'|'隔开',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'legendColor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'legendFontSize',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-input-number',
-                label: '图例宽度',
-                name: 'legendWidth',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-select',
-                label: '横向位置',
-                name: 'lateralPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-select',
-                label: '纵向位置',
-                name: 'longitudinalPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'top', name: '顶部'},
-                  {code: 'bottom', name: '底部'},
-                ],
-                value: 'top'
-              },
-              {
-                type: 'el-select',
-                label: '布局前置',
-                name: 'layoutFront',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'vertical', name: '竖排'},
-                  {code: 'horizontal', name: '横排'},
-                ],
-                value: 'horizontal'
-              },
-            ],
-          },
-          {
-            name: '左X轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'hideXLeft',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-number',
-                label: '数值间隔',
-                name: 'splitNumberLeft',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '数值颜色',
-                name: 'XcolorLeft',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '数值字号',
-                name: 'fontSizeXLeft',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'el-switch',
-                label: '刻度线',
-                name: 'tickLineLeft',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'el-switch',
-                label: 'X轴线',
-                name: 'xLineLeft',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorXLeft',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-switch',
-                label: '竖分割线',
-                name: 'SplitLineLeft',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'SplitLineColorLeft',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '分割线宽度',
-                name: 'SplitLinefontSizeLeft',
-                required: false,
-                placeholder: '',
-                value: 1,
-              },
-              {
-                type: 'el-switch',
-                label: '边框线',
-                name: 'frameLineLeft',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-            ],
-          },
-          {
-            name: '右X轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'hideXRight',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-number',
-                label: '数值间隔',
-                name: 'splitNumberRight',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '数值颜色',
-                name: 'XcolorRight',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '数值字号',
-                name: 'fontSizeXRight',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'el-switch',
-                label: '刻度线',
-                name: 'tickLineRight',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'el-switch',
-                label: 'X轴线',
-                name: 'xLineRight',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorXRight',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-switch',
-                label: '竖分割线',
-                name: 'SplitLineRight',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'SplitLineColorRight',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '分割线宽度',
-                name: 'SplitLinefontSizeRight',
-                required: false,
-                placeholder: '',
-                value: 1,
-              },
-              {
-                type: 'el-switch',
-                label: '边框线',
-                name: 'frameLineRight',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-            ],
-          },
-          {
-            name: 'Y轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'hideY',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                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-select',
-                label: '数值对齐',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-switch',
-                label: '刻度线',
-                name: 'tickLineY',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'el-switch',
-                label: 'Y轴线',
-                name: 'lineY',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-            ],
-          },
-          {
-            name: '数值设定',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShow',
-                required: false,
-                placeholder: '',
-                value: true
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSize',
-                required: false,
-                placeholder: '',
-                value: 14
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'fontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '提示语设置',
-            list: [
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'tipsFontSize',
-                required: false,
-                placeholder: '',
-                value: 16
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'tipsColor',
-                required: false,
-                placeholder: '',
-                value: '#00FEFF'
-              },
-            ],
-          },
-          {
-            name: '坐标轴边距设置',
-            list: [
-              {
-                type: 'el-slider',
-                label: '左右边距(像素)',
-                name: 'marginLeftRight',
-                required: false,
-                placeholder: '',
-                value: 10,
-              },
-              {
-                type: 'el-slider',
-                label: '顶边距(像素)',
-                name: 'marginTop',
-                required: false,
-                placeholder: '',
-                value: 40,
-              },
-              {
-                type: 'el-slider',
-                label: '底边距(像素)',
-                name: 'marginBottom',
-                required: false,
-                placeholder: '',
-                value: 10,
-              },
-            ],
-          },
-          {
-            name: '自定义配色',
-            list: [
-              {
-                type: 'customColor',
-                label: '',
-                name: 'customColor',
-                required: false,
-                value: [{color: '#36c5e7'}, {color: '#e68b55'}],
-              },
-            ],
-          },
-        ],
-      ],
-      // 数据
-      data: [
-        {
-          type: 'el-radio-group',
-          label: '数据类型',
-          name: 'dataType',
-          require: false,
-          placeholder: '',
-          selectValue: true,
-          selectOptions: [
-            {
-              code: 'staticData',
-              name: '静态数据',
-            },
-            {
-              code: 'dynamicData',
-              name: '动态数据',
-            },
-          ],
-          value: 'staticData',
-        },
-        {
-          type: 'el-input-number',
-          label: '刷新时间(毫秒)',
-          name: 'refreshTime',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          value: 5000
-        },
-        {
-          type: 'el-button',
-          label: '静态数据',
-          name: 'staticData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'staticData',
-          value: [
-            {"axis":"07-25","name":"success","data":"2"},
-            {"axis":"07-25","name":"fail","data":"10"},
-            {"axis":"07-26","name":"success","data":"5"},
-            {"axis":"07-26","name":"fail","data":"20"},
-            {"axis":"07-27","name":"success","data":"15"},
-            {"axis":"07-27","name":"fail","data":"30"},
-            {"axis":"07-28","name":"success","data":"10"},
-            {"axis":"07-28","name":"fail","data":"12"},
-            {"axis":"07-29","name":"success","data":"9"},
-            {"axis":"07-29","name":"fail","data":"16"},
-          ],
-        },
-        {
-          type: 'dycustComponents',
-          label: '',
-          name: 'dynamicData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          chartType: 'widget-stackchart',
-          dictKey: 'STACK_PROPERTIES',
-          value: '',
-        },
-      ],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 500,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 250,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-href.js

@@ -1,157 +0,0 @@
-/*
- * @Descripttion: 超链接文本
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:03:58
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:14:21
- */
-export const widgetHref =  {
-    code: 'widget-href',
-    type: 'html',
-    label: '超链接',
-    icon: 'iconchaolianjie',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '超链接',
-        },
-        {
-          type: 'el-input-text',
-          label: '文本内容',
-          name: 'text',
-          required: false,
-          placeholder: '',
-          value: '超链接',
-        },
-        {
-          type: 'el-input-number',
-          label: '字体字号',
-          name: 'fontSize',
-          required: false,
-          placeholder: '',
-          value: '26',
-        },
-        {
-          type: 'vue-color',
-          label: '字体颜色',
-          name: 'color',
-          required: false,
-          placeholder: '',
-          value: '#FAD400',
-        },
-        {
-          type: 'el-input-number',
-          label: '字体间距',
-          name: 'letterSpacing',
-          required: false,
-          placeholder: '',
-          value: '0',
-        },
-        {
-          type: 'vue-color',
-          label: '字体背景',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: 'rgba(115,170,229,.5)',
-        },
-        {
-          type: 'el-select',
-          label: '文字粗细',
-          name: 'fontWeight',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {code: 'normal', name: '正常'},
-            {code: 'bold', name: '粗体'},
-            {code: 'bolder', name: '特粗体'},
-            {code: 'lighter', name: '细体'}
-          ],
-          value: 'normal'
-        },
-        {
-          type: 'el-select',
-          label: '对齐方式',
-          name: 'textAlign',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {code: 'center', name: '居中'},
-            {code: 'left', name: '左对齐'},
-            {code: 'right', name: '右对齐'},
-          ],
-          value: 'center'
-        },
-        {
-          type: 'el-radio-group',
-          label: '跳转方式',
-          name: 'jumpMode',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {
-              code: 'self',
-              name: '本窗口',
-            },
-            {
-              code: 'other',
-              name: '新窗口',
-            },
-          ],
-          value: 'self',
-        },
-        {
-          type: 'el-input-text',
-          label: '超链地址',
-          name: 'linkAdress',
-          required: false,
-          placeholder: '',
-          value: 'http://www.baidu.com',
-        },
-      ],
-      // 数据
-      data: [],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 100,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 40,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js

@@ -1,72 +0,0 @@
-/*
- * @Descripttion: iframe json
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:17:55
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:14:39
- */
-export const widgetIframe =  {
-    code: 'widget-iframe',
-    type: 'html',
-    label: '内联框架',
-    icon: 'iconkuangjia',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: 'iframe',
-        },
-        {
-          type: 'el-input-text',
-          label: '地址',
-          name: 'iframeAdress',
-          required: false,
-          placeholder: '',
-          value: 'https://ajreport.beliefteam.cn/index.html',
-        },
-      ],
-      // 数据
-      data: [],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 300,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 200,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-line-stack.js

@@ -1,679 +0,0 @@
-/*
- * @Descripttion: 折线堆叠图 json
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:38:17
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:16:28
- */
-export const widgetLineStack =   {
-    code: 'widgetLineStackChart',
-    type: 'chart',
-    label: '折线堆叠图',
-    icon: 'iconduidietu',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '折线堆叠图',
-        },
-        {
-          type: 'el-switch',
-          label: '竖展示',
-          name: 'verticalShow',
-          required: false,
-          placeholder: '',
-          value: false,
-        },
-        {
-          type: 'vue-color',
-          label: '背景颜色',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: ''
-        },
-        [
-          {
-            name: '折线设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标记点',
-                name: 'markPoint',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-slider',
-                label: '点大小',
-                name: 'pointSize',
-                required: false,
-                placeholder: '',
-                value: 5,
-              },
-              {
-                type: 'el-switch',
-                label: '平滑曲线',
-                name: 'smoothCurve',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-switch',
-                label: '面积堆积',
-                name: 'area',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-slider',
-                label: '面积厚度',
-                name: 'areaThickness',
-                required: false,
-                placeholder: '',
-                value: 5,
-              },
-              {
-                type: 'el-slider',
-                label: '线条宽度',
-                name: 'lineWidth',
-                required: false,
-                placeholder: '',
-                value: 4,
-              },
-            ],
-          },
-          {
-            name: '标题设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标题',
-                name: 'isNoTitle',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '标题',
-                name: 'titleText',
-                required: false,
-                placeholder: '',
-                value: '',
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'textColor',
-                required: false,
-                placeholder: '',
-                value: '#FFD700'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'textFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'textFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体位置',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-input-text',
-                label: '副标题',
-                name: 'subText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: 'rgba(30, 144, 255, 1)'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'subTextFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'subTextFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-            ],
-          },
-          {
-            name: '图例操作',
-            list: [
-              {
-                type: 'el-switch',
-                label: '图例显示',
-                name: 'isShowLegend',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '图例名称',
-                name: 'legendName',
-                required: false,
-                placeholder: '多值以'|'隔开',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'legendColor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'legendFontSize',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-input-number',
-                label: '图例宽度',
-                name: 'legendWidth',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-select',
-                label: '横向位置',
-                name: 'lateralPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-select',
-                label: '纵向位置',
-                name: 'longitudinalPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'top', name: '顶部'},
-                  {code: 'bottom', name: '底部'},
-                ],
-                value: 'top'
-              },
-              {
-                type: 'el-select',
-                label: '布局前置',
-                name: 'layoutFront',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'vertical', name: '竖排'},
-                  {code: 'horizontal', name: '横排'},
-                ],
-                value: 'horizontal'
-              },
-            ],
-          },
-          {
-            name: 'X轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'hideX',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: 'X轴别名',
-                name: 'xName',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '别名颜色',
-                name: 'xNameColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-input-number',
-                label: '别名字号',
-                name: 'xNameFontSize',
-                required: false,
-                placeholder: '',
-                value: 14
-              },
-              {
-                type: 'el-switch',
-                label: '轴反转',
-                name: 'reversalX',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-slider',
-                label: '文字角度',
-                name: 'textAngleX',
-                required: false,
-                placeholder: '',
-                value: 0
-              },
-              {
-                type: 'el-input-number',
-                label: '文字间隔',
-                name: 'textInterval',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '文字颜色',
-                name: 'Xcolor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSizeX',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorX',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-switch',
-                label: '分割线显示',
-                name: 'isShowSplitLineX',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'splitLineColorX',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-
-              }
-            ],
-          },
-          {
-            name: 'Y轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShowY',
-                require: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: 'Y轴别名',
-                name: 'textNameY',
-                require: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '别名颜色',
-                name: 'NameColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '别名字号',
-                name: 'NameFontSizeY',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'el-switch',
-                label: '轴反转',
-                name: 'reversalY',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-slider',
-                label: '文字角度',
-                name: 'textAngleY',
-                required: false,
-                placeholder: '',
-                value: 0
-              },
-              {
-                type: 'vue-color',
-                label: '文字颜色',
-                name: 'colorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '文字字号',
-                name: 'fontSizeY',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              }, {
-                type: 'el-switch',
-                label: '分割线显示',
-                name: 'isShowSplitLineY',
-                require: false,
-                placeholder: '',
-                value: false,
-              }, {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'splitLineColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-
-              }
-            ],
-          },
-          {
-            name: '数值设定',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShow',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSize',
-                required: false,
-                placeholder: '',
-                value: 14
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'fontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '提示语设置',
-            list: [
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'tipsFontSize',
-                required: false,
-                placeholder: '',
-                value: 16
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'tipsColor',
-                required: false,
-                placeholder: '',
-                value: '#00FEFF'
-              },
-            ],
-          },
-          {
-            name: '坐标轴边距设置',
-            list: [
-              {
-                type: 'el-slider',
-                label: '左边距(像素)',
-                name: 'marginLeft',
-                required: false,
-                placeholder: '',
-                value: 10,
-              }, {
-                type: 'el-slider',
-                label: '顶边距(像素)',
-                name: 'marginTop',
-                required: false,
-                placeholder: '',
-                value: 50,
-              }, {
-                type: 'el-slider',
-                label: '右边距(像素)',
-                name: 'marginRight',
-                required: false,
-                placeholder: '',
-                value: 40,
-              }, {
-                type: 'el-slider',
-                label: '底边距(像素)',
-                name: 'marginBottom',
-                required: false,
-                placeholder: '',
-                value: 10,
-              },
-            ],
-          },
-          {
-            name: '自定义配色',
-            list: [
-              {
-                type: 'customColor',
-                label: '',
-                name: 'customColor',
-                required: false,
-                value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
-              },
-            ],
-          },
-        ],
-      ],
-      // 数据
-      data: [
-        {
-          type: 'el-radio-group',
-          label: '数据类型',
-          name: 'dataType',
-          require: false,
-          placeholder: '',
-          selectValue: true,
-          selectOptions: [
-            {
-              code: 'staticData',
-              name: '静态数据',
-            },
-            {
-              code: 'dynamicData',
-              name: '动态数据',
-            },
-          ],
-          value: 'staticData',
-        },
-        {
-          type: 'el-input-number',
-          label: '刷新时间(毫秒)',
-          name: 'refreshTime',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          value: 5000
-        },
-        {
-          type: 'el-button',
-          label: '静态数据',
-          name: 'staticData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'staticData',
-          value: [
-            {"axis":"2021-07-25","name":"A","data":"12"},
-            {"axis":"2021-07-25","name":"B","data":"20"},
-            {"axis":"2021-07-26","name":"B","data":"5"},
-            {"axis":"2021-07-27","name":"A","data":"15"},
-            {"axis":"2021-07-27","name":"B","data":"30"},
-          ],
-        },
-        {
-          type: 'dycustComponents',
-          label: '',
-          name: 'dynamicData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          chartType: 'widget-stackchart',
-          dictKey: 'STACK_PROPERTIES',
-          value: '',
-        },
-      ],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 500,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 250,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-pie-nightingale.js

@@ -1,404 +0,0 @@
-/*
- * @Descripttion: 南丁格尔玫瑰图 json
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:32:40
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:18:05
- */
-export const widgetPieNightingale = {
-    code: 'WidgetPieNightingaleRoseArea',
-    type: 'chart',
-    label: '南丁格尔玫瑰图',
-    icon: 'iconnandinggeermeiguitu',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '南丁格尔玫瑰图',
-        },
-        {
-          type: 'vue-color',
-          label: '背景颜色',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: ''
-        },
-        {
-          type: 'el-select',
-          label: '饼图模式',
-          name: 'nightingleRosetype',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {code: 'area', name: '面积模式'},
-            {code: 'radius', name: '半径模式'},
-          ],
-          value: 'area'
-        },
-        [
-          {
-            name: '标题设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标题',
-                name: 'isNoTitle',
-                required: false,
-                placeholder: '',
-                value: true
-              },
-              {
-                type: 'el-input-text',
-                label: '标题',
-                name: 'titleText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'textColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'textFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'textFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体位置',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'left'
-              },
-              {
-                type: 'el-input-text',
-                label: '副标题',
-                name: 'subText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'subTextFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'subTextFontSize',
-                required: false,
-                placeholder: '',
-                value: 12
-              },
-            ],
-          },
-          {
-            name: '数值设定',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShow',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-switch',
-                label: '数值',
-                name: 'numberValue',
-                require: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-switch',
-                label: '百分比',
-                name: 'percentage',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSize',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'fontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '提示语设置',
-            list: [
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'tipsFontSize',
-                required: false,
-                placeholder: '',
-                value: 16
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'tipsColor',
-                required: false,
-                placeholder: '',
-                value: '#00FEFF'
-              },
-            ],
-          },
-          {
-            name: '图例操作',
-            list: [
-              {
-                type: 'el-switch',
-                label: '图例',
-                name: 'isShowLegend',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'legendColor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'legendFontSize',
-                required: false,
-                placeholder: '',
-                value: 16,
-              },
-              {
-                type: 'el-input-number',
-                label: '图例宽度',
-                name: 'legendWidth',
-                required: false,
-                placeholder: '',
-                value: 15,
-              },
-              {
-                type: 'el-select',
-                label: '横向位置',
-                name: 'lateralPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-select',
-                label: '纵向位置',
-                name: 'longitudinalPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'top', name: '顶部'},
-                  {code: 'bottom', name: '底部'},
-                ],
-                value: 'top'
-              },
-              {
-                type: 'el-select',
-                label: '布局前置',
-                name: 'layoutFront',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'vertical', name: '竖排'},
-                  {code: 'horizontal', name: '横排'},
-                ],
-                value: 'horizontal'
-              },
-            ],
-          },
-          {
-            name: '自定义配色',
-            list: [
-              {
-                type: 'customColor',
-                label: '',
-                name: 'customColor',
-                required: false,
-                value: [{color: '#FF801C'}, {color: '#F5FF46'}, {color: '#00FE65'}, {color: '#00FEFF'}, {color: '#ffa800'}]
-              },
-            ],
-          },
-        ],
-      ],
-      // 数据
-      data: [
-        {
-          type: 'el-radio-group',
-          label: '数据类型',
-          name: 'dataType',
-          require: false,
-          placeholder: '',
-          selectValue: true,
-          selectOptions: [
-            {
-              code: 'staticData',
-              name: '静态数据',
-            },
-            {
-              code: 'dynamicData',
-              name: '动态数据',
-            },
-          ],
-          value: 'staticData',
-        },
-        {
-          type: 'el-input-number',
-          label: '刷新时间(毫秒)',
-          name: 'refreshTime',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          value: 5000
-        },
-        {
-          type: 'el-button',
-          label: '静态数据',
-          name: 'staticData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'staticData',
-          value: [{"value": 1048,"name": "搜索引擎"},{"value": 735, "name": "直接访问"},{"value": 580, "name": "邮件营销"},{"value": 484,"name":"联盟广告"},{"value":300,"name":"视频广告"}],
-        },
-        {
-          type: 'dycustComponents',
-          label: '',
-          name: 'dynamicData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          chartType: 'widget-piechart',
-          dictKey: 'PIE_PROPERTIES',
-          relactiveDomValue: 'dynamicData',
-          value: '',
-        },
-      ],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 400,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 200,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-piechart.js

@@ -1,404 +0,0 @@
-/*
- * @Descripttion: 饼图
- * @version:
- * @Author: qianlishi
- * @Date: 2021-08-29 07:28:20
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:19:19
- */
-export const widgetPiechart =   {
-    code: 'widget-piechart',
-    type: 'chart',
-    label: '饼图',
-    icon: 'iconicon_tubiao_bingtu',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '饼图',
-        },
-        {
-          type: 'vue-color',
-          label: '背景颜色',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: ''
-        },
-        {
-          type: 'el-select',
-          label: '饼图样式',
-          name: 'piechartStyle',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {code: 'shixin', name: '实心饼图'},
-            {code: 'kongxin', name: '空心饼图'},
-          ],
-          value: 'shixin'
-        },
-        [
-          {
-            name: '标题设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标题',
-                name: 'isNoTitle',
-                required: false,
-                placeholder: '',
-                value: true
-              },
-              {
-                type: 'el-input-text',
-                label: '标题',
-                name: 'titleText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'textColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'textFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'textFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体位置',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'left'
-              },
-              {
-                type: 'el-input-text',
-                label: '副标题',
-                name: 'subText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'subTextFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'subTextFontSize',
-                required: false,
-                placeholder: '',
-                value: 12
-              },
-            ],
-          },
-          {
-            name: '数值设定',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShow',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-switch',
-                label: '数值',
-                name: 'numberValue',
-                require: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-switch',
-                label: '百分比',
-                name: 'percentage',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSize',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'fontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '提示语设置',
-            list: [
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'tipFontSize',
-                required: false,
-                placeholder: '',
-                value: 16
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'tipsColor',
-                required: false,
-                placeholder: '',
-                value: '#00FEFF'
-              },
-            ],
-          },
-          {
-            name: '图例操作',
-            list: [
-              {
-                type: 'el-switch',
-                label: '图例',
-                name: 'isShowLegend',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'legendColor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-text',
-                label: '字体字号',
-                name: 'legendFontSize',
-                required: false,
-                placeholder: '',
-                value: 16,
-              },
-              {
-                type: 'el-input-number',
-                label: '图例宽度',
-                name: 'legendWidth',
-                required: false,
-                placeholder: '',
-                value: 15,
-              },
-              {
-                type: 'el-select',
-                label: '横向位置',
-                name: 'lateralPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-select',
-                label: '纵向位置',
-                name: 'longitudinalPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'top', name: '顶部'},
-                  {code: 'bottom', name: '底部'},
-                ],
-                value: 'top'
-              },
-              {
-                type: 'el-select',
-                label: '布局前置',
-                name: 'layoutFront',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'vertical', name: '竖排'},
-                  {code: 'horizontal', name: '横排'},
-                ],
-                value: 'horizontal'
-              },
-            ],
-          },
-          {
-            name: '自定义配色',
-            list: [
-              {
-                type: 'customColor',
-                label: '',
-                name: 'customColor',
-                required: false,
-                value: [{color: '#0CD2E6'}, {color: '#00BFA5'}, {color: '#FFC722'}, {color: '#886EFF'}, {color: '#008DEC'}],
-              },
-            ],
-          },
-        ],
-      ],
-      // 数据
-      data: [
-        {
-          type: 'el-radio-group',
-          label: '数据类型',
-          name: 'dataType',
-          require: false,
-          placeholder: '',
-          selectValue: true,
-          selectOptions: [
-            {
-              code: 'staticData',
-              name: '静态数据',
-            },
-            {
-              code: 'dynamicData',
-              name: '动态数据',
-            },
-          ],
-          value: 'staticData',
-        },
-        {
-          type: 'el-input-number',
-          label: '刷新时间(毫秒)',
-          name: 'refreshTime',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          value: 5000
-        },
-        {
-          type: 'el-button',
-          label: '静态数据',
-          name: 'staticData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'staticData',
-          value: [{"value": 1048,"name": "搜索引擎"},{"value": 735, "name": "直接访问"},{"value": 580, "name": "邮件营销"},{"value": 484,"name":"联盟广告"},{"value":300,"name":"视频广告"}]
-        },
-        {
-          type: 'dycustComponents',
-          label: '',
-          name: 'dynamicData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          chartType: 'widget-piechart',
-          relactiveDomValue: 'dynamicData',
-          dictKey: 'PIE_PROPERTIES',
-          value: '',
-        },
-      ],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 400,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 200,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-video.js

@@ -1,72 +0,0 @@
-/*
- * @Descripttion: 视频json
- * @version: 
- * @Author: qianlishi
- * @Date: 2021-08-29 07:10:22
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-09-28 14:20:47
- */
-export const widgetVideo =  {
-    code: 'widget-video',
-    type: 'html',
-    label: '视频',
-    icon: 'iconshipin',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: 'video',
-        },
-        {
-          type: 'el-input-text',
-          label: '地址',
-          name: 'videoAdress',
-          required: false,
-          placeholder: '',
-          value: 'https://www.w3school.com.cn//i/movie.ogg',
-        },
-      ],
-      // 数据
-      data: [],
-      // 坐标
-      position: [
-        {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
-        },
-        {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 300,
-        },
-        {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 200,
-        },
-      ],
-    }
-  }

report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-word-cloud.js

@@ -1,416 +0,0 @@
-export const widgetWordCloud = {
-  code: 'widgetWordCloud',
-  type: 'chart',
-  label: '词云图',
-  icon: 'iconciyuntu',
-  options: {
-    // 配置
-    setup: [
-      {
-        type: 'el-input-text',
-        label: '图层名称',
-        name: 'layerName',
-        required: false,
-        placeholder: '',
-        value: '词云图',
-      },
-      {
-        type: 'vue-color',
-        label: '背景颜色',
-        name: 'background',
-        required: false,
-        placeholder: '',
-        value: ''
-      },
-      [
-        {
-          name: '标题设置',
-          list: [
-            {
-              type: 'el-switch',
-              label: '标题',
-              name: 'isNoTitle',
-              required: false,
-              placeholder: '',
-              value: true
-            },
-            {
-              type: 'el-input-text',
-              label: '标题',
-              name: 'titleText',
-              required: false,
-              placeholder: '',
-              value: ''
-            },
-            {
-              type: 'vue-color',
-              label: '字体颜色',
-              name: 'textColor',
-              required: false,
-              placeholder: '',
-              value: '#fff'
-            },
-            {
-              type: 'el-select',
-              label: '字体粗细',
-              name: 'textFontWeight',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
-              ],
-              value: 'normal'
-            },
-            {
-              type: 'el-input-number',
-              label: '字体字号',
-              name: 'textFontSize',
-              required: false,
-              placeholder: '',
-              value: 20
-            },
-            {
-              type: 'el-select',
-              label: '字体位置',
-              name: 'textAlign',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                {code: 'center', name: '居中'},
-                {code: 'left', name: '左对齐'},
-                {code: 'right', name: '右对齐'},
-              ],
-              value: 'left'
-            },
-            {
-              type: 'el-input-text',
-              label: '副标题',
-              name: 'subText',
-              required: false,
-              placeholder: '',
-              value: ''
-            },
-            {
-              type: 'vue-color',
-              label: '字体颜色',
-              name: 'subTextColor',
-              required: false,
-              placeholder: '',
-              value: ''
-            },
-            {
-              type: 'el-select',
-              label: '字体粗细',
-              name: 'subTextFontWeight',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                {code: 'normal', name: '正常'},
-                {code: 'bold', name: '粗体'},
-                {code: 'bolder', name: '特粗体'},
-                {code: 'lighter', name: '细体'}
-              ],
-              value: 'normal'
-            },
-            {
-              type: 'el-input-number',
-              label: '字体字号',
-              name: 'subTextFontSize',
-              required: false,
-              placeholder: '',
-              value: 12
-            },
-          ],
-        },
-        {
-          name: '词云范围',
-          list: [
-            {
-              type: 'el-input-number',
-              label: '最大范围',
-              name: 'maxRangeSize',
-              required: false,
-              placeholder: '',
-              value: 25
-            },
-            {
-              type: 'el-input-number',
-              label: '最小范围',
-              name: 'minRangeSize',
-              required: false,
-              placeholder: '',
-              value: 2
-            },
-          ],
-        },
-        {
-          name: '词云角度',
-          list: [
-            {
-              type: 'el-input-number',
-              label: '最大角度',
-              name: 'maxRotationRange',
-              required: false,
-              placeholder: '',
-              value: 90
-            },
-            {
-              type: 'el-input-number',
-              label: '最小角度',
-              name: 'minRotationRange',
-              required: false,
-              placeholder: '',
-              value: -45
-            },
-          ],
-        },
-        {
-          name: '提示语设置',
-          list: [
-            {
-              type: 'el-input-number',
-              label: '字体字号',
-              name: 'tipsFontSize',
-              required: false,
-              placeholder: '',
-              value: 16
-            },
-            {
-              type: 'vue-color',
-              label: '字体颜色',
-              name: 'tipsColor',
-              required: false,
-              placeholder: '',
-              value: '#00FEFF'
-            },
-          ],
-        },
-      ],
-    ],
-    // 数据
-    data: [
-      {
-        type: 'el-radio-group',
-        label: '数据类型',
-        name: 'dataType',
-        require: false,
-        placeholder: '',
-        selectValue: true,
-        selectOptions: [
-          {
-            code: 'staticData',
-            name: '静态数据',
-          },
-          {
-            code: 'dynamicData',
-            name: '动态数据',
-          },
-        ],
-        value: 'staticData',
-      },
-      {
-        type: 'el-input-number',
-        label: '刷新时间(毫秒)',
-        name: 'refreshTime',
-        relactiveDom: 'dataType',
-        relactiveDomValue: 'dynamicData',
-        value: 60000
-      },
-      {
-        type: 'el-button',
-        label: '静态数据',
-        name: 'staticData',
-        required: false,
-        placeholder: '',
-        relactiveDom: 'dataType',
-        relactiveDomValue: 'staticData',
-        value: [
-          {name: "占道", value: 284},
-          {name: "水质", value: 71},
-          {name: "无水", value: 71},
-          {name: "停供", value: 21},
-          {name: "停气", value: 11},
-          {name: "占道", value: 11},
-          {name: "Nancy", value: 520},
-          {name: "Jayfee", value: 666},
-          {name: "生活资源", value: 999},
-          {name: "供热管理", value: 888},
-          {name: "供气质量", value: 777},
-          {name: "社会保障", value: 407},
-          {name: "交通运输", value: 516},
-          {name: "城市交通", value: 515},
-          {name: "环境保护", value: 483},
-          {name: "城乡建设", value: 449},
-          {name: "公共安全", value: 406},
-          {name: "供热管理", value: 375},
-          {name: "市容环卫", value: 355},
-          {name: "粉尘污染", value: 335},
-          {name: "噪声污染", value: 324},
-          {name: "医疗卫生", value: 284},
-          {name: "供热发展", value: 254},
-          {name: "房地产管理", value: 462},
-          {name: "生活噪音", value: 253},
-          {name: "城市供电", value: 223},
-          {name: "大气污染", value: 223},
-          {name: "房屋安全", value: 223},
-          {name: "文化活动", value: 223},
-          {name: "拆迁管理", value: 223},
-          {name: "公共设施", value: 223},
-          {name: "供气质量", value: 223},
-          {name: "供电管理", value: 223},
-          {name: "燃气管理", value: 152},
-          {name: "教育管理", value: 152},
-          {name: "医疗纠纷", value: 152},
-          {name: "执法监督", value: 152},
-          {name: "设备安全", value: 152},
-          {name: "政务建设", value: 152},
-          {name: "宏观经济", value: 152},
-          {name: "教育管理", value: 112},
-          {name: "社会保障", value: 112},
-          {name: "分类列表", value: 112},
-          {name: "农业生产", value: 112},
-          {name: "物业服务", value: 92},
-          {name: "物业管理", value: 92},
-          {name: "低保管理", value: 92},
-          {name: "执法争议", value: 72},
-          {name: "占道堆放", value: 71},
-          {name: "地上设施", value: 71},
-          {name: "主网原因", value: 71},
-          {name: "集中供热", value: 71},
-          {name: "客运管理", value: 71},
-          {name: "治安案件", value: 71},
-          {name: "群众健身", value: 41},
-          {name: "市场收费", value: 41},
-          {name: "生产资金", value: 41},
-          {name: "生产噪声", value: 41},
-          {name: "农村低保", value: 41},
-          {name: "劳动争议", value: 41},
-          {name: "医疗事故", value: 21},
-          {name: "基础教育", value: 21},
-          {name: "职业教育", value: 21},
-          {name: "拆迁补偿", value: 21},
-          {name: "设施维护", value: 21},
-          {name: "市场外溢", value: 11},
-          {name: "占道经营", value: 11},
-          {name: "树木管理", value: 11},
-          {name: "供气质量", value: 11},
-          {name: "燃气管理", value: 11},
-          {name: "市容环卫", value: 11},
-          {name: "新闻传媒", value: 11},
-          {name: "人才招聘", value: 11},
-          {name: "市场环境", value: 11},
-          {name: "城市交通", value: 11},
-          {name: "物业服务", value: 11},
-          {name: "物业管理", value: 11},
-          {name: "园林绿化", value: 11},
-          {name: "有线电视", value: 11},
-          {name: "社会治安", value: 11},
-          {name: "林业资源", value: 11},
-          {name: "体育活动", value: 11},
-          {name: "低保管理", value: 11},
-          {name: "劳动争议", value: 11},
-          {name: "粉煤灰污染", value: 284},
-          {name: "人行道管理", value: 71},
-          {name: "身份证管理", value: 71},
-          {name: "房地产开发", value: 11},
-          {name: "经营性收费", value: 11},
-          {name: "一次供水问题", value: 11},
-          {name: "工业粉尘污染", value: 71},
-          {name: "工业排放污染", value: 41},
-          {name: "破坏森林资源", value: 41},
-          {name: "生活用水管理", value: 688},
-          {name: "一次供水问题", value: 588},
-          {name: "公交运输管理", value: 386},
-          {name: "自然资源管理", value: 355},
-          {name: "土地资源管理", value: 304},
-          {name: "生活用水管理", value: 112},
-          {name: "供热单位影响", value: 253},
-          {name: "二次供水问题", value: 112},
-          {name: "城市公共设施", value: 92},
-          {name: "拆迁政策咨询", value: 92},
-          {name: "县区、开发区", value: 152},
-          {name: "文娱市场管理", value: 72},
-          {name: "商业烟尘污染", value: 72},
-          {name: "供热单位影响", value: 71},
-          {name: "压力容器安全", value: 71},
-          {name: "劳动合同争议", value: 41},
-          {name: "物业资质管理", value: 21},
-          {name: "农村基础设施", value: 11},
-          {name: "行政事业收费", value: 11},
-          {name: "房屋配套问题", value: 11},
-          {name: "公交运输管理", value: 11},
-          {name: "社会福利及事务", value: 11},
-          {name: "食品安全与卫生", value: 11},
-          {name: "物业服务与管理", value: 112},
-          {name: "文体与教育管理", value: 406},
-          {name: "社会保障与福利", value: 429},
-          {name: "出租车运营管理", value: 385},
-          {name: "物业服务与管理", value: 304},
-          {name: "房屋质量与安全", value: 223},
-          {name: "劳动报酬与福利", value: 41},
-          {name: "食品安全与卫生", value: 11},
-          {name: "房屋与图纸不符", value: 11},
-          {name: "其他行政事业收费", value: 11},
-          {name: "农村土地规划管理", value: 254},
-          {name: "社会保障保险管理", value: 92},
-          {name: "城市交通秩序管理", value: 72},
-          {name: "户籍管理及身份证", value: 11},
-          {name: "公路（水路）交通", value: 11},
-          {name: "国有公交（大巴）管理", value: 71},
-          {name: "有线电视安装及调试维护", value: 11},
-          {name: "市政府工作部门（含部门管理机构、直属单位）", value: 11},
-        ],
-      },
-      {
-        type: 'dycustComponents',
-        label: '',
-        name: 'dynamicData',
-        required: false,
-        placeholder: '',
-        relactiveDom: 'dataType',
-        chartType: 'widget-piechart',
-        dictKey: 'PIE_PROPERTIES',
-        relactiveDomValue: 'dynamicData',
-        value: '',
-      },
-    ],
-    // 坐标
-    position: [
-      {
-        type: 'el-input-number',
-        label: '左边距',
-        name: 'left',
-        required: false,
-        placeholder: '',
-        value: 0,
-      },
-      {
-        type: 'el-input-number',
-        label: '上边距',
-        name: 'top',
-        required: false,
-        placeholder: '',
-        value: 0,
-      },
-      {
-        type: 'el-input-number',
-        label: '宽度',
-        name: 'width',
-        required: false,
-        placeholder: '该容器在1920px大屏中的宽度',
-        value: 500,
-      },
-      {
-        type: 'el-input-number',
-        label: '高度',
-        name: 'height',
-        required: false,
-        placeholder: '该容器在1080px大屏中的高度',
-        value: 300,
-      },
-    ],
-  }
-}

report-ui/src/views/bigscreenDesigner/designer/tools/configure/wordcloudCharts/widget-word-cloud.js

@@ -0,0 +1,417 @@
+export const widgetWordCloud = {
+  code: 'widgetWordCloud',
+  type: 'wordCloud',
+  tabName: '词云图',
+  label: '词云图',
+  icon: 'iconciyuntu',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '词云图',
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      [
+        {
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true
+            },
+            {
+              type: 'el-input-text',
+              label: '标题',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'center', name: '居中' },
+                { code: 'left', name: '左对齐' },
+                { code: 'right', name: '右对齐' },
+              ],
+              value: 'left'
+            },
+            {
+              type: 'el-input-text',
+              label: '副标题',
+              name: 'subText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'subTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                { code: 'normal', name: '正常' },
+                { code: 'bold', name: '粗体' },
+                { code: 'bolder', name: '特粗体' },
+                { code: 'lighter', name: '细体' }
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'subTextFontSize',
+              required: false,
+              placeholder: '',
+              value: 12
+            },
+          ],
+        },
+        {
+          name: '词云范围',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '最大范围',
+              name: 'maxRangeSize',
+              required: false,
+              placeholder: '',
+              value: 25
+            },
+            {
+              type: 'el-input-number',
+              label: '最小范围',
+              name: 'minRangeSize',
+              required: false,
+              placeholder: '',
+              value: 2
+            },
+          ],
+        },
+        {
+          name: '词云角度',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '最大角度',
+              name: 'maxRotationRange',
+              required: false,
+              placeholder: '',
+              value: 90
+            },
+            {
+              type: 'el-input-number',
+              label: '最小角度',
+              name: 'minRotationRange',
+              required: false,
+              placeholder: '',
+              value: -45
+            },
+          ],
+        },
+        {
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipsFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
+        },
+      ],
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 60000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [
+          { name: "占道", value: 284 },
+          { name: "水质", value: 71 },
+          { name: "无水", value: 71 },
+          { name: "停供", value: 21 },
+          { name: "停气", value: 11 },
+          { name: "占道", value: 11 },
+          { name: "Nancy", value: 520 },
+          { name: "Jayfee", value: 666 },
+          { name: "生活资源", value: 999 },
+          { name: "供热管理", value: 888 },
+          { name: "供气质量", value: 777 },
+          { name: "社会保障", value: 407 },
+          { name: "交通运输", value: 516 },
+          { name: "城市交通", value: 515 },
+          { name: "环境保护", value: 483 },
+          { name: "城乡建设", value: 449 },
+          { name: "公共安全", value: 406 },
+          { name: "供热管理", value: 375 },
+          { name: "市容环卫", value: 355 },
+          { name: "粉尘污染", value: 335 },
+          { name: "噪声污染", value: 324 },
+          { name: "医疗卫生", value: 284 },
+          { name: "供热发展", value: 254 },
+          { name: "房地产管理", value: 462 },
+          { name: "生活噪音", value: 253 },
+          { name: "城市供电", value: 223 },
+          { name: "大气污染", value: 223 },
+          { name: "房屋安全", value: 223 },
+          { name: "文化活动", value: 223 },
+          { name: "拆迁管理", value: 223 },
+          { name: "公共设施", value: 223 },
+          { name: "供气质量", value: 223 },
+          { name: "供电管理", value: 223 },
+          { name: "燃气管理", value: 152 },
+          { name: "教育管理", value: 152 },
+          { name: "医疗纠纷", value: 152 },
+          { name: "执法监督", value: 152 },
+          { name: "设备安全", value: 152 },
+          { name: "政务建设", value: 152 },
+          { name: "宏观经济", value: 152 },
+          { name: "教育管理", value: 112 },
+          { name: "社会保障", value: 112 },
+          { name: "分类列表", value: 112 },
+          { name: "农业生产", value: 112 },
+          { name: "物业服务", value: 92 },
+          { name: "物业管理", value: 92 },
+          { name: "低保管理", value: 92 },
+          { name: "执法争议", value: 72 },
+          { name: "占道堆放", value: 71 },
+          { name: "地上设施", value: 71 },
+          { name: "主网原因", value: 71 },
+          { name: "集中供热", value: 71 },
+          { name: "客运管理", value: 71 },
+          { name: "治安案件", value: 71 },
+          { name: "群众健身", value: 41 },
+          { name: "市场收费", value: 41 },
+          { name: "生产资金", value: 41 },
+          { name: "生产噪声", value: 41 },
+          { name: "农村低保", value: 41 },
+          { name: "劳动争议", value: 41 },
+          { name: "医疗事故", value: 21 },
+          { name: "基础教育", value: 21 },
+          { name: "职业教育", value: 21 },
+          { name: "拆迁补偿", value: 21 },
+          { name: "设施维护", value: 21 },
+          { name: "市场外溢", value: 11 },
+          { name: "占道经营", value: 11 },
+          { name: "树木管理", value: 11 },
+          { name: "供气质量", value: 11 },
+          { name: "燃气管理", value: 11 },
+          { name: "市容环卫", value: 11 },
+          { name: "新闻传媒", value: 11 },
+          { name: "人才招聘", value: 11 },
+          { name: "市场环境", value: 11 },
+          { name: "城市交通", value: 11 },
+          { name: "物业服务", value: 11 },
+          { name: "物业管理", value: 11 },
+          { name: "园林绿化", value: 11 },
+          { name: "有线电视", value: 11 },
+          { name: "社会治安", value: 11 },
+          { name: "林业资源", value: 11 },
+          { name: "体育活动", value: 11 },
+          { name: "低保管理", value: 11 },
+          { name: "劳动争议", value: 11 },
+          { name: "粉煤灰污染", value: 284 },
+          { name: "人行道管理", value: 71 },
+          { name: "身份证管理", value: 71 },
+          { name: "房地产开发", value: 11 },
+          { name: "经营性收费", value: 11 },
+          { name: "一次供水问题", value: 11 },
+          { name: "工业粉尘污染", value: 71 },
+          { name: "工业排放污染", value: 41 },
+          { name: "破坏森林资源", value: 41 },
+          { name: "生活用水管理", value: 688 },
+          { name: "一次供水问题", value: 588 },
+          { name: "公交运输管理", value: 386 },
+          { name: "自然资源管理", value: 355 },
+          { name: "土地资源管理", value: 304 },
+          { name: "生活用水管理", value: 112 },
+          { name: "供热单位影响", value: 253 },
+          { name: "二次供水问题", value: 112 },
+          { name: "城市公共设施", value: 92 },
+          { name: "拆迁政策咨询", value: 92 },
+          { name: "县区、开发区", value: 152 },
+          { name: "文娱市场管理", value: 72 },
+          { name: "商业烟尘污染", value: 72 },
+          { name: "供热单位影响", value: 71 },
+          { name: "压力容器安全", value: 71 },
+          { name: "劳动合同争议", value: 41 },
+          { name: "物业资质管理", value: 21 },
+          { name: "农村基础设施", value: 11 },
+          { name: "行政事业收费", value: 11 },
+          { name: "房屋配套问题", value: 11 },
+          { name: "公交运输管理", value: 11 },
+          { name: "社会福利及事务", value: 11 },
+          { name: "食品安全与卫生", value: 11 },
+          { name: "物业服务与管理", value: 112 },
+          { name: "文体与教育管理", value: 406 },
+          { name: "社会保障与福利", value: 429 },
+          { name: "出租车运营管理", value: 385 },
+          { name: "物业服务与管理", value: 304 },
+          { name: "房屋质量与安全", value: 223 },
+          { name: "劳动报酬与福利", value: 41 },
+          { name: "食品安全与卫生", value: 11 },
+          { name: "房屋与图纸不符", value: 11 },
+          { name: "其他行政事业收费", value: 11 },
+          { name: "农村土地规划管理", value: 254 },
+          { name: "社会保障保险管理", value: 92 },
+          { name: "城市交通秩序管理", value: 72 },
+          { name: "户籍管理及身份证", value: 11 },
+          { name: "公路（水路）交通", value: 11 },
+          { name: "国有公交（大巴）管理", value: 71 },
+          { name: "有线电视安装及调试维护", value: 11 },
+          { name: "市政府工作部门（含部门管理机构、直属单位）", value: 11 },
+        ],
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        chartType: 'widget-piechart',
+        dictKey: 'PIE_PROPERTIES',
+        relactiveDomValue: 'dynamicData',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 500,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 300,
+      },
+    ],
+  }
+}

report-ui/src/views/bigscreenDesigner/designer/tools/index.js

@@ -3,8 +3,8 @@
  * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 06:43:07
- * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-11 10:35:35
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:35:42
  */
 import { widgetTool } from "./main"
 const screenConfig = {
@@ -66,9 +66,30 @@ const screenConfig = {
     position: [],
   }
 }
-const widgetTools = [
-  ...widgetTool
-]
+
+export const converArr = (data) => {
+  let tempArr = [], newArr = []
+  for (let i = 0; i < data.length; i++) {
+    const item = data[i]
+    if (tempArr.indexOf(item.type) === -1) {
+      newArr.push({
+        name: item.tabName,
+        type: item.type,
+        list: [item]
+      })
+      tempArr.push(item.type);
+    } else {
+      for (let j = 0; j < newArr.length; j++) {
+        if (newArr[j].type == item.type) {
+          newArr[j].list.push(item)
+        }
+      }
+    }
+  }
+  return newArr
+}
+
+const widgetTools = converArr([...widgetTool])
 
 const getToolByCode = function (code) {
   // 获取大屏底层设置属性
@@ -76,10 +97,8 @@ const getToolByCode = function (code) {
     return screenConfig
   }
   // 获取组件
-  let item = widgetTools.find(function (item, index, arrs) {
-    return item.code === code
+  return [...widgetTool].find((item) => {
+    return item.code == code
   })
-  return item
 }
-console.log(widgetTools)
-export {widgetTools, getToolByCode}
+export { widgetTools, getToolByCode }

report-ui/src/views/bigscreenDesigner/designer/tools/main.js

@@ -3,41 +3,41 @@
  * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 07:46:46
- * @LastEditors: qianlishi
- * @LastEditTime: 2021-12-13 14:23:59
+ * @LastEditors: qianlishi qianlishi@anji-plus.com
+ * @LastEditTime: 2022-11-07 15:34:02
  */
 
-import {widgetText} from "./configure/widget-text"
-import {widgetMarquee} from "./configure/widget-marquee"
-import {widgetHref} from "./configure/widget-href"
-import {widgetTime} from "./configure/widget-time"
-import {widgetImage} from "./configure/widget-image"
-import {widgetSliders} from "./configure/widget-slider"
-import {widgetVideo} from "./configure/widget-video"
-import {widgetTable} from "./configure/widget-table"
-import {widgetIframe} from "./configure/widget-iframe"
-import {widgetUniversal} from "./configure/widget-universal"
-import {widgetBarchart} from "./configure/widget-barchart"
-import {widgetGradientBarchart} from "./configure/widget-gradient-barchart"
-import {widgetLinechart} from "./configure/widget-linechart"
-import {widgetBarlinechart} from "./configure/widget-barlinechart"
-import {widgetPiechart} from "./configure/widget-piechart"
-import {widgetFunnel} from "./configure/widget-funnel"
-import {widgetGauge} from "./configure/widget-gauge"
-import {widgetLineMap} from "./configure/widget-line-map"
-import {widgetPieNightingale} from "./configure/widget-pie-nightingale"
-import {widgetPiePercentage} from "./configure/widget-pie-percentage"
-import {widgetAirbubbleMap} from "./configure/widget-airbubble-map"
-import {widgetBarStack} from "./configure/widget-bar-stack"
-import {widgetLineStack} from "./configure/widget-line-stack"
-import {widgetBarCompare} from "./configure/widget-bar-compare"
-import {widgetLineCompare} from "./configure/widget-line-compare"
-import {widgetDecoratePie} from "./configure/widget-decorate-pie";
-import {widgetMoreBarLine} from "./configure/widget-more-bar-line";
-import {widgetWordCloud} from "./configure/widget-word-cloud";
-import {widgetHeatmap} from "./configure/widget-heatmap";
-import {widgetRadar} from "./configure/widget-radar";
-import {widgetBarLineStack} from "./configure/widget-bar-line-stack";
+import { widgetText } from "./configure/texts/widget-text"
+import { widgetMarquee } from "./configure/texts/widget-marquee"
+import { widgetHref } from "./configure/texts/widget-href"
+import { widgetTime } from "./configure/texts/widget-time"
+import { widgetImage } from "./configure/texts/widget-image"
+import { widgetSliders } from "./configure/texts/widget-slider"
+import { widgetVideo } from "./configure/texts/widget-video"
+import { widgetTable } from "./configure/texts/widget-table"
+import { widgetIframe } from "./configure/texts/widget-iframe"
+import { widgetUniversal } from "./configure/widget-universal"
+import { widgetBarchart } from "./configure/barCharts/widget-barchart"
+import { widgetGradientBarchart } from "./configure/barlineChart/widget-gradient-barchart"
+import { widgetLinechart } from "./configure/lineCharts/widget-linechart"
+import { widgetBarlinechart } from "./configure/barlineChart/widget-barlinechart"
+import { widgetPiechart } from "./configure/pieCharts/widget-piechart"
+import { widgetFunnel } from "./configure/funnelCharts/widget-funnel"
+import { widgetGauge } from "./configure/percentCharts/widget-gauge"
+import { widgetLineMap } from "./configure/mapCharts/widget-line-map"
+import { widgetPieNightingale } from "./configure/pieCharts/widget-pie-nightingale"
+import { widgetPiePercentage } from "./configure/percentCharts/widget-pie-percentage"
+import { widgetAirbubbleMap } from "./configure/mapCharts/widget-airbubble-map"
+import { widgetBarStack } from "./configure/barCharts/widget-bar-stack"
+import { widgetLineStack } from "./configure/lineCharts/widget-line-stack"
+import { widgetBarCompare } from "./configure/barCharts/widget-bar-compare"
+import { widgetLineCompare } from "./configure/lineCharts/widget-line-compare"
+import { widgetDecoratePie } from "./configure/decorateCharts/widget-decorate-pie";
+import { widgetMoreBarLine } from "./configure/barlineChart/widget-more-bar-line";
+import { widgetWordCloud } from "./configure/wordcloudCharts/widget-word-cloud";
+import { widgetHeatmap } from "./configure/heatmap/widget-heatmap";
+import { widgetRadar } from "./configure/texts/widget-radar";
+import { widgetBarLineStack } from "./configure/barCharts/widget-bar-line-stack";
 
 export const widgetTool = [
   // type=html类型的组件