diff --git a/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js index 075c2b3..b8e06f2 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-active-ring-chart.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js @@ -3,7 +3,7 @@ */ export const widgetActiveRingChart= { code: 'widget-active-ring-chart', - type: 'percent', + type: 'pieChart', tabName: '百分比', label: '动态环图', icon: 'iconicon_tubiao_bingtu', @@ -24,7 +24,7 @@ export const widgetActiveRingChart= { name: 'radius', required: false, placeholder: '', - value: 50, + value: 75, }, { type: 'el-slider', @@ -32,7 +32,7 @@ export const widgetActiveRingChart= { name: 'activeRadius', required: false, placeholder: '', - value: 55, + value: 85, }, { type: 'el-input-number', @@ -40,7 +40,7 @@ export const widgetActiveRingChart= { name: 'lineWidth', required: false, placeholder: '', - value: 20, + value: 40, }, { type: 'el-input-number', @@ -98,7 +98,7 @@ export const widgetActiveRingChart= { label: '', name: 'customColor', required: false, - value: [{ color: '#1E90FF'},{ color: '#77FF00' },{ color: '#7700BB' },{ color: '#FF0088' },{ color: '#CC00CC' }], + value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }], }, ], }], @@ -190,7 +190,7 @@ export const widgetActiveRingChart= { relactiveDom: 'dataType', relactiveDomValue: 'dynamicData', chartType: 'widget-active-ring-chart', - dictKey: 'TEXT_PROPERTIES', + dictKey: 'PIE_PROPERTIES', value: '', }, ], diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js index 1b06b2a..1ba0daf 100644 --- a/src/views/bigscreenDesigner/designer/tools/main.js +++ b/src/views/bigscreenDesigner/designer/tools/main.js @@ -46,7 +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"; +import {widgetActiveRingChart} from "./configure/pieCharts/widget-active-ring-chart"; export const widgetTool = [ diff --git a/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue index e47528a..837f6c3 100644 --- a/src/views/bigscreenDesigner/designer/widget/percent/widgetActiveRingChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue @@ -20,10 +20,10 @@ export default { return { //返回图标数据 options: { - radius:'50%',//环半径 - activeRadius:'55%',//环半径(动态) + radius:'75%',//环半径 + activeRadius:'85%',//环半径(动态) data:[],//环数据 - lineWidth:20,//环数据 + lineWidth:40,//环数据 activeTimeGap:3000,//切换间隔(ms) color:[],//环颜色 digitalFlopStyle: { @@ -43,7 +43,7 @@ export default { }, computed: { styleObj() { - return { + const style ={ position: this.ispreview ? "absolute" : "static", width: this.optionsStyle.width + "px", height: this.optionsStyle.height + "px", @@ -51,6 +51,7 @@ export default { top: this.optionsStyle.top + "px", background: this.optionsSetup.background }; + return style; }, }, watch: { @@ -100,7 +101,7 @@ export default { fontStyle.fill=optionsSetup.fill; fontStyle.fontSize=optionsSetup.fontSize; fontStyle.fontWeight=optionsSetup.fontWeight; - this.options.digitalFlopToFixed = fontStyle; + this.options.digitalFlopStyle = fontStyle; }, // 配置修改 setOptionsConfig() { @@ -114,6 +115,7 @@ export default { this.options.animationFrame = optionsSetup.animationFrame; this.options.showOriginValue = optionsSetup.showOriginValue; //改变options + // console.log("配置修改:",this.styleObj); this.options={...this.options}; }, //数据类型 @@ -153,3 +155,10 @@ export default { }; + diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue index 48aab90..8748226 100644 --- a/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -50,7 +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"; +import widgetActiveRingChart from "./pie/widgetActiveRingChart"; export default { diff --git a/src/views/bigscreenDesigner/designer/widget/widget.vue b/src/views/bigscreenDesigner/designer/widget/widget.vue index 61394fe..20c4518 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"; +import widgetActiveRingChart from "./pie/widgetActiveRingChart"; export default { name: "Widget", components: {