diff --git a/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
index 5403e54..56a702b 100644
--- a/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
+++ b/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-capsule-chart.js
@@ -51,7 +51,7 @@ export const widgetCapsuleChart = {
name: 'customColor',
required: false,
//'#e062ae', '#fb7293', '#e690d1', '#32c5e9', '#96bfff'
- value: [{ color: '#e062ae' }, { color: '#fb7293' }, { color: '#e690d1' }, { color: '#32c5e9' }, { color: '#96bfff' }],
+ value: [{ color: '#0044BB' }, { color: '#5500DD' }, { color: '#FF0088' }, { color: '#00AA00' }, { color: '#C63300' }],
},
],
}],
diff --git a/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js
new file mode 100644
index 0000000..075c2b3
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js
@@ -0,0 +1,233 @@
+/*
+ * @Descripttion: 动态环图
+ */
+export const widgetActiveRingChart= {
+ code: 'widget-active-ring-chart',
+ type: 'percent',
+ tabName: '百分比',
+ label: '动态环图',
+ icon: 'iconicon_tubiao_bingtu',
+ options: {
+ // 配置
+ setup: [
+ {
+ type: 'el-input-text',
+ label: '图层名称',
+ name: 'layerName',
+ required: false,
+ placeholder: '',
+ value: '动态环图',
+ },
+ {
+ type: 'el-slider',
+ label: '环半径(%)',
+ name: 'radius',
+ required: false,
+ placeholder: '',
+ value: 50,
+ },
+ {
+ type: 'el-slider',
+ label: '环半径(动态)(%)',
+ name: 'activeRadius',
+ required: false,
+ placeholder: '',
+ value: 55,
+ },
+ {
+ type: 'el-input-number',
+ label: '环线条宽度',
+ name: 'lineWidth',
+ required: false,
+ placeholder: '',
+ value: 20,
+ },
+ {
+ type: 'el-input-number',
+ label: '切换间隔(ms)',
+ name: 'activeTimeGap',
+ required: false,
+ placeholder: '',
+ value: 3000,
+ },
+ {
+ type: 'el-input-number',
+ label: '小数位数',
+ name: 'digitalFlopToFixed',
+ required: false,
+ placeholder: '',
+ value: 0,
+ },
+ {
+ type: 'el-input-text',
+ label: '数字翻牌器单位',
+ name: 'digitalFlopUnit',
+ required: false,
+ placeholder: '单位',
+ value: '',
+ },
+ {
+ type: 'el-input-number',
+ label: '动画帧数',
+ name: 'animationFrame',
+ required: false,
+ placeholder: '',
+ value: 50,
+ },
+ {
+ type: 'el-switch',
+ label: '显示原始值',
+ name: 'showOriginValue',
+ required: false,
+ placeholder: '',
+ value: false,
+ },
+ {
+ type: 'vue-color',
+ label: '背景颜色',
+ name: 'background',
+ required: false,
+ placeholder: '',
+ value: ''
+ },
+ [{
+ name: '环颜色',
+ list: [
+ {
+ type: 'customColor',
+ label: '',
+ name: 'customColor',
+ required: false,
+ value: [{ color: '#1E90FF'},{ color: '#77FF00' },{ color: '#7700BB' },{ color: '#FF0088' },{ color: '#CC00CC' }],
+ },
+ ],
+ }],
+ [
+ {
+ 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: [
+ {
+ 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',
+ relactiveDomValue: 'dynamicData',
+ chartType: 'widget-active-ring-chart',
+ 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: 300,
+ },
+ {
+ type: 'el-input-number',
+ label: '高度',
+ name: 'height',
+ required: false,
+ placeholder: '该容器在1080px大屏中的高度',
+ value: 300,
+ },
+ ],
+ }
+}
diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js
index d7f4502..1b06b2a 100644
--- a/src/views/bigscreenDesigner/designer/tools/main.js
+++ b/src/views/bigscreenDesigner/designer/tools/main.js
@@ -46,6 +46,7 @@ import { widgetProgress } from "./configure/percentCharts/widget-progress";
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";
+import {widgetActiveRingChart} from "./configure/percentCharts/widget-active-ring-chart";
export const widgetTool = [
@@ -92,4 +93,5 @@ export const widgetTool = [
widgetRadar,
widgetBarLineStack,
widgetProgress,
+ widgetActiveRingChart
]
diff --git a/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue
new file mode 100644
index 0000000..e47528a
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue
index 4d1138e..48aab90 100644
--- a/src/views/bigscreenDesigner/designer/widget/temp.vue
+++ b/src/views/bigscreenDesigner/designer/widget/temp.vue
@@ -50,6 +50,7 @@ import widgetCapsuleChart from "./bar/widgetCapsuleChart";
import widgetWaterLevelPond from "./text/widgetWaterLevelPond";
import widgetDigitalFlop from "./text/widgetDigitalFlop";
import widgetScrollRankingBoard from "./text/widgetScrollRankingBoard";
+import widgetActiveRingChart from "./percent/widgetActiveRingChart";
export default {
@@ -93,7 +94,8 @@ export default {
widgetProgress,
widgetWaterLevelPond,
widgetDigitalFlop,
- widgetScrollRankingBoard
+ widgetScrollRankingBoard,
+ widgetActiveRingChart
},
model: {
prop: "value",
diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue
index 84d50ee..dceb107 100644
--- a/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue
+++ b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlop.vue
@@ -2,9 +2,9 @@
数字翻牌器
-->
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue
index 92feee3..61394fe 100644
--- a/src/views/bigscreenDesigner/designer/widget/widget.vue
+++ b/src/views/bigscreenDesigner/designer/widget/widget.vue
@@ -55,7 +55,7 @@ import widgetProgress from "./percent/widgetProgress";
import widgetWaterLevelPond from "./text/widgetWaterLevelPond";
import widgetDigitalFlop from "./text/widgetDigitalFlop";
import widgetScrollRankingBoard from "./text/widgetScrollRankingBoard";
-
+import widgetActiveRingChart from "./percent/widgetActiveRingChart";
export default {
name: "Widget",
components: {
@@ -97,7 +97,9 @@ export default {
widgetProgress,
widgetWaterLevelPond,
widgetDigitalFlop,
- widgetScrollRankingBoard
+ widgetScrollRankingBoard,
+ widgetActiveRingChart
+
},
model: {
prop: "value",