diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop.js
new file mode 100644
index 0000000..f3bd9c4
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop.js
@@ -0,0 +1,159 @@
+/*
+ * @Descripttion: 水位图
+ */
+export const widgetDigitalFlop= {
+ code: 'widget-digital-flop',
+ type: 'text',
+ tabName: '文本栏',
+ label: '数字翻牌器',
+ icon: 'iconshujujieruKafkajiqun',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '数字翻牌器',
+ },
+ {
+ type: 'el-input-text',
+ label: '数字数值',
+ name: 'numberText',
+ required: false,
+ placeholder: '',
+ value: '0',
+ },
+ {
+ type: 'el-select-static',
+ label: '主数据源数据',
+ name: 'slectedDataType',
+ require: false,
+ placeholder: '',
+ selectOptions: [],
+ value: '',
+ },
+ {
+ type: 'el-input-text',
+ label: '内容模版',
+ name: 'content',
+ required: false,
+ placeholder: '',
+ value: '数字{nt}',
+ },
+ {
+ type: 'el-switch',
+ label: '千位符显示',
+ name: 'isFormatterNum',
+ required: false,
+ placeholder: '',
+ value: false
+ },
+ {
+ type: 'el-input-number',
+ label: '小数位数',
+ name: 'toFixed',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-select',
+ label: '水平对齐方式',
+ name: 'textAlign',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ {code: 'center', name: '居中'},
+ {code: 'left', name: '左对齐'},
+ {code: 'right', name: '右对齐'}
+ ],
+ value: 'center'
+ },
+ {
+ type: 'el-input-number',
+ label: '动效帧数',
+ name: 'animationFrame',
+ required: false,
+ placeholder: '',
+ value: 100,
+ },
+ [
+ {
+ name: '文字样式设置',
+ list: [
+ {
+ type: 'vue-color',
+ label: '颜色',
+ name: 'fill',
+ required: false,
+ placeholder: '',
+ value: '#3de7c9'
+ },
+ {
+ type: 'el-input-number',
+ label: '字体大小',
+ name: 'fontSize',
+ required: false,
+ placeholder: '',
+ value: 30,
+ },
+ {
+ type: 'el-select',
+ label: '字体粗细',
+ name: 'fontWeight',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ {code: 'normal', name: '正常'},
+ {code: 'bold', name: '粗体'},
+ {code: 'bolder', name: '更粗'},
+ {code: 'lighter', name: '更细'},
+ ],
+ value: 'normal'
+ },
+ ],
+ }
+ ]
+ ],
+ // 数据
+ data: [],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 200,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 200,
+ },
+ ],
+ }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
index e56cc30..da3c8e6 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-iframe.js
@@ -29,7 +29,7 @@ export const widgetIframe = {
name: 'iframeAdress',
required: false,
placeholder: '',
- value: 'https://ajreport.beliefteam.cn/index.html',
+ value: '',
},
],
// 数据
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-scroll-ranking-board.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-scroll-ranking-board.js
new file mode 100644
index 0000000..48074aa
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-scroll-ranking-board.js
@@ -0,0 +1,191 @@
+/*
+ * @Descripttion: 排名轮播表
+ */
+export const widgetScrollRankingBoard= {
+ code: 'widget-scroll-ranking-board',
+ type: 'text',
+ tabName: '文本栏',
+ label: '排名轮播表',
+ icon: 'icon511tongji_shutu',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '排名轮播表',
+ },
+ {
+ type: 'el-input-number',
+ label: '表行数',
+ name: 'rowNum',
+ required: false,
+ placeholder: '',
+ value: 5,
+ },
+ {
+ type: 'el-input-number',
+ label: '滚动间隔(毫秒)',
+ name: 'waitTime',
+ required: false,
+ placeholder: '',
+ value: 2500,
+ },
+ {
+ type: 'el-select',
+ label: '动画效果',
+ name: 'carousel',
+ required: false,
+ placeholder: '',
+ selectOptions: [
+ {code: 'single', name: '单条'},
+ {code: 'page', name: '整页'}
+ ],
+ value: 'single'
+ },
+ {
+ type: 'el-input-text',
+ label: '数值单位',
+ name: 'unit',
+ required: false,
+ placeholder: '',
+ value: '',
+ },
+ {
+ type: 'el-switch',
+ label: '自动排序',
+ name: 'sort',
+ required: false,
+ placeholder: '',
+ value: true
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ ],
+ // 数据
+ 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: 30000
+ },
+ {
+ type: 'el-button',
+ label: '静态数据',
+ name: 'staticData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'staticData',
+ value: [
+ {
+ name: '周口',
+ value: 55
+ },
+ {
+ name: '南阳',
+ value: 120
+ },
+ {
+ name: '西峡',
+ value: 78
+ },
+ {
+ name: '驻马店',
+ value: 66
+ },
+ {
+ name: '新乡',
+ value: 80
+ },
+ {
+ name: '信阳',
+ value: 45
+ },
+ {
+ name: '漯河',
+ value: 29
+ }
+ ],
+ },
+ {
+ type: 'dycustComponents',
+ label: '',
+ name: 'dynamicData',
+ required: false,
+ placeholder: '',
+ relactiveDom: 'dataType',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-scroll-ranking-board',
+ dictKey: 'TEXT_PROPERTIES',
+ value: '',
+ },
+ ],
+ // 坐标
+ position: [
+ {
+ type: 'el-input-number',
+ label: '左边距',
+ name: 'left',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-input-number',
+ label: '上边距',
+ name: 'top',
+ required: false,
+ placeholder: '',
+ value: 10,
+ },
+ {
+ type: 'el-input-number',
+ label: '宽度',
+ name: 'width',
+ required: false,
+ placeholder: '该容器在1920px大屏中的宽度',
+ value: 600,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 300,
+ },
+ ],
+ }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-water-level-pond.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-water-level-pond.js
index e0e4185..f3cd5c7 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/div/widget-water-level-pond.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-water-level-pond.js
@@ -3,8 +3,8 @@
*/
export const widgetWaterLevelPond= {
code: 'widget-water-level-pond',
- type: 'html',
- tabName: '图层',
+ type: 'text',
+ tabName: '文本栏',
label: '水位图',
icon: 'iconshouji',
options: {
@@ -80,6 +80,14 @@ export const widgetWaterLevelPond= {
placeholder: '',
value: '{value}%',
},
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
[{
name: '水位图配色',
list: [
diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js
index 48b1aae..d7f4502 100644
--- a/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/src/views/bigscreenDesigner/designer/tools/main.js
@@ -43,14 +43,15 @@ import { widgetHeatmap } from "./configure/heatmap/widget-heatmap";
import { widgetRadar } from "./configure/radarCharts/widget-radar";
import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack";
import { widgetProgress } from "./configure/percentCharts/widget-progress";
-import {widgetWaterLevelPond} from "./configure/div/widget-water-level-pond";
+import {widgetWaterLevelPond} from "./configure/texts/widget-water-level-pond";
+import {widgetDigitalFlop} from "./configure/texts/widget-digital-flop";
+import {widgetScrollRankingBoard} from "./configure/texts/widget-scroll-ranking-board";
export const widgetTool = [
//图层
widgetBorderBox,
widgetDecoration,
- widgetCapsuleChart,
// widgetDiv,
widgetImage,
widgetSliders,
@@ -59,11 +60,15 @@ export const widgetTool = [
widgetMarquee,
widgetHref,
widgetTime,
+ widgetIframe,
widgetVideo,
+ widgetWaterLevelPond,
+ widgetDigitalFlop,
widgetTable,
- widgetIframe,
+ widgetScrollRankingBoard,
// widgetUniversal,
widgetBarchart,
+ widgetCapsuleChart,
widgetGradientBarchart,
widgetLinechart,
widgetBarlinechart,
@@ -87,6 +92,4 @@ export const widgetTool = [
widgetRadar,
widgetBarLineStack,
widgetProgress,
- widgetWaterLevelPond
-
]
diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue
index eb36d80..4d1138e 100644
--- a/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -47,7 +47,9 @@ import widgetBorderBox from "./div/widgetBorderBox";
import widgetProgress from "./percent/widgetProgress";
import widgetDecoration from "./div/widgetDecoration";
import widgetCapsuleChart from "./bar/widgetCapsuleChart";
-import widgetWaterLevelPond from "./div/widgetWaterLevelPond";
+import widgetWaterLevelPond from "./text/widgetWaterLevelPond";
+import widgetDigitalFlop from "./text/widgetDigitalFlop";
+import widgetScrollRankingBoard from "./text/widgetScrollRankingBoard";
export default {
@@ -89,7 +91,9 @@ export default {
widgetDecoration,
widgetCapsuleChart,
widgetProgress,
- widgetWaterLevelPond
+ widgetWaterLevelPond,
+ widgetDigitalFlop,
+ widgetScrollRankingBoard
},
model: {
prop: "value",
diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue
new file mode 100644
index 0000000..84d50ee
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetScrollRankingBoard.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetScrollRankingBoard.vue
new file mode 100644
index 0000000..987dd80
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/text/widgetScrollRankingBoard.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetWaterLevelPond.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetWaterLevelPond.vue
index e37e417..fdbbacb 100644
--- a/src/views/bigscreenDesigner/designer/widget/div/widgetWaterLevelPond.vue
+++ b/src/views/bigscreenDesigner/designer/widget/text/widgetWaterLevelPond.vue
@@ -1,8 +1,10 @@
-
+
+
+