diff --git a/config/dev.env.js b/config/dev.env.js index 43bb744..d1355f8 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,8 +4,8 @@ const prodEnv = require('./prod.env') //是否开发状态 const isDev = true; //开发API地址 - const devAdrress='"http://weberp.xlyprint.cn/xlyReport"'; -//const devAdrress='"http://127.0.0.1:8080/xlyReport"'; +const devAdrress='"http://weberp.xlyprint.cn/xlyReport"'; +// const devAdrress='"http://127.0.0.1:8080/xlyReport"'; //正式打包API地址 const ipAdrress='"http://"+location.host+"/xlyReport"'; diff --git a/package.json b/package.json index 7de6ca1..7f0aed5 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@ckeditor/ckeditor5-build-decoupled-document": "^23.1.0", + "@jiaminghi/c-render": "^0.4.3", "@jiaminghi/data-view": "^2.10.0", "@smallwei/avue": "^2.8.23", "axios": "0.18.0", @@ -48,6 +49,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@jiaminghi/charts": "^0.2.18", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-helper-vue-jsx-merge-props": "2.0.3", diff --git a/src/views/bigscreenDesigner/designer/components/LabelTag.vue b/src/views/bigscreenDesigner/designer/components/LabelTag.vue new file mode 100644 index 0000000..7861e67 --- /dev/null +++ b/src/views/bigscreenDesigner/designer/components/LabelTag.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js index 295494c..6a56bf5 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js @@ -794,8 +794,8 @@ export const widgetLineStack = { placeholder: '', relactiveDom: 'dataType', relactiveDomValue: 'dynamicData', - chartType: 'widget-stackchart', - dictKey: 'STACK_PROPERTIES', + chartType: 'widget-linechart_stack', + dictKey: 'LINE_STACK_PROPERTIES', value: '', }, ], diff --git a/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js index 67ba2fa..e137393 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-active-ring-chart.js @@ -90,20 +90,127 @@ export const widgetActiveRingChart= { placeholder: '', value: '' }, - [{ - name: '环颜色', - list: [ - { - type: 'customColor', - label: '', - name: 'customColor', - required: false, - value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }], - }, - ], - }], [ { + name: '标题设置', + list: [ + { + type: 'el-switch', + label: '标题显示', + name: 'isNoTitle', + required: false, + placeholder: '', + value: false, + }, + { + type: 'el-input-text', + label: '标题名', + name: 'titleText', + required: false, + placeholder: '', + value: '标题名', + }, + { + type: 'vue-color', + label: '字体颜色', + name: 'textColor', + required: false, + placeholder: '', + value: '#FFD700' + }, + { + type: 'el-input-number', + label: '字体字号', + name: 'textFontSize', + required: false, + placeholder: '', + value: 20 + }, + { + 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-select', + label: '字体风格', + name: 'textFontStyle', + required: false, + placeholder: '', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'italic', name: 'italic斜体' }, + { code: 'oblique', name: 'oblique斜体' }, + ], + value: 'normal' + }, + { + 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: 'isNoTipTitle', + required: false, + placeholder: '', + value: false, + }, + { + type: 'el-input-number', + label: '字体字号', + name: 'tipFontSize', + required: false, + placeholder: '', + value: 16 + }, + { + type: 'vue-color', + label: '字体颜色', + name: 'tipsColor', + required: false, + placeholder: '', + value: '#00FEFF' + }, + { + type: 'el-select', + label: '字体位置', + name: 'tipsAlign', + required: false, + placeholder: '', + selectOptions: [ + { code: 'up', name: '头部' }, + { code: 'down', name: '底部' } + + ], + value: 'down' + } + ], + }, + { name: '数字翻牌器样式', list: [ { @@ -137,12 +244,22 @@ export const widgetActiveRingChart= { value: 'normal' }, ], + }, + { + 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', diff --git a/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-radio-piechart.js b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-radio-piechart.js new file mode 100644 index 0000000..1e048aa --- /dev/null +++ b/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-radio-piechart.js @@ -0,0 +1,451 @@ +/* + * @Descripttion: 空心饼图 + */ +export const widgetRadioPiechart= { + code: 'widget-radio-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: '#FFD700' + }, + { + type: 'el-input-number', + label: '字体字号', + name: 'textFontSize', + required: false, + placeholder: '', + value: 20 + }, + { + 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-select', + label: '字体风格', + name: 'textFontStyle', + required: false, + placeholder: '', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'italic', name: 'italic斜体' }, + { code: 'oblique', name: 'oblique斜体' }, + ], + 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-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-input-number', + label: '字体字号', + name: 'subTextFontSize', + required: false, + placeholder: '', + value: 20 + }, + { + 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-select', + label: '字体风格', + name: 'subTextFontStyle', + required: false, + placeholder: '', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'italic', name: 'italic斜体' }, + { code: 'oblique', name: 'oblique斜体' }, + ], + value: 'normal' + }, + ], + }, + { + name: '数值设定', + list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShow', + required: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '标题', + name: 'isShowTitle', + require: 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: 'el-slider', + label: '图例占比', + name: 'piechartSize', + required: false, + placeholder: '', + value: 70, + }, + { + type: 'el-slider', + label: '环形宽度', + name: 'randWidth', + required: false, + placeholder: '', + value: 40, + }, + { + 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: 'center', 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: 3600000 + }, + { + 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, + }, + ], + } +} diff --git a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop-single.js b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop-single.js index 0436426..ba44b12 100644 --- a/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop-single.js +++ b/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-digital-flop-single.js @@ -36,14 +36,6 @@ export const widgetDigitalFlopSingle= { value: '', }, { - type: 'el-input-text', - label: '内容模版', - name: 'content', - required: false, - placeholder: '', - value: '数字{nt}', - }, - { type: 'el-switch', label: '千位符显示', name: 'isFormatterNum', @@ -54,31 +46,38 @@ export const widgetDigitalFlopSingle= { { type: 'el-input-number', label: '小数位数', - name: 'toFixed', + name: 'decimals', required: false, placeholder: '', - value: 0, + value: 2, }, { - type: 'el-select', - label: '水平对齐方式', - name: 'textAlign', + type: 'el-input-number', + label: '动效帧数', + name: 'duration', required: false, placeholder: '', - selectOptions: [ - {code: 'center', name: '居中'}, - {code: 'left', name: '左对齐'}, - {code: 'right', name: '右对齐'} - ], - value: 'center' + value: 3000, }, { - type: 'el-input-number', - label: '动效帧数', - name: 'animationFrame', + type: 'el-input-text', + label: '文本', + name: 'numberText', required: false, placeholder: '', - value: 100, + value: '', + }, + { + type: 'el-select', + label: '文本位置', + name: 'numberTextFix', + required: false, + placeholder: '', + selectOptions: [ + {code: 'prefix', name: '前缀'}, + {code: 'suffix', name: '后缀'} + ], + value: 'prefix' }, [ { @@ -87,7 +86,7 @@ export const widgetDigitalFlopSingle= { { type: 'vue-color', label: '颜色', - name: 'fill', + name: 'color', required: false, placeholder: '', value: '#3de7c9' diff --git a/src/views/bigscreenDesigner/designer/tools/main.js b/src/views/bigscreenDesigner/designer/tools/main.js index bc2ac33..121167b 100644 --- a/src/views/bigscreenDesigner/designer/tools/main.js +++ b/src/views/bigscreenDesigner/designer/tools/main.js @@ -17,6 +17,7 @@ import { widgetGradientBarchart } from "./configure/barCharts/widget-gradient-ba import { widgetLinechart } from "./configure/lineCharts/widget-linechart" import { widgetBarlinechart } from "./configure/barlineCharts/widget-barlinechart" import { widgetPiechart } from "./configure/pieCharts/widget-piechart" +import {widgetRadioPiechart} from "./configure/pieCharts/widget-radio-piechart" import { widgetFunnel } from "./configure/funnelCharts/widget-funnel" import { widgetGauge } from "./configure/percentCharts/widget-gauge" import { widgetLineMap } from "./configure/mapCharts/widget-line-map" @@ -93,5 +94,6 @@ export const widgetTool = [ widgetBorderBoxFloat, widgetDigitalFlopSingle, widgetSvg, - widgetRotateRanking + widgetRotateRanking, + widgetRadioPiechart ] diff --git a/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue index ce11611..3040869 100644 --- a/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -276,20 +276,24 @@ export default { const optionsSetup = this.optionsSetup; const dataZoom ={}; const dataZoomList =[]; - dataZoom.type= 'slider'; - dataZoom.show= optionsSetup.isShowZoom;//显示滚动条 - dataZoom.zoomLock=false;//锁定滚动条缩放,(固定滚动条长度) - dataZoom.left=optionsSetup.bottomLeft+'%';//离左边的百分比距离 - dataZoom.bottom=optionsSetup.bottomZoom;//距离底部距离 - dataZoom.start=optionsSetup.startZoom;//开始位置 - dataZoom.end=optionsSetup.endZoom;//结束位置 - dataZoom.showDataShadow=true; //屏蔽折线图,true为显示折线图 - // dataZoom.barBorderRadius=optionsSetup.borderRadiusZoom; - dataZoom.borderColor=optionsSetup.borderColorZoom; - dataZoom.height=optionsSetup.heightZoom; - dataZoom.backgroundColor=optionsSetup.backgroundColorZoom; - dataZoomList.push(dataZoom); - this.options.dataZoom=dataZoomList; + if(this.isNotBlank(optionsSetup.isShowZoom) && optionsSetup.isShowZoom){ + dataZoom.type= 'slider'; + dataZoom.show= optionsSetup.isShowZoom;//显示滚动条 + dataZoom.zoomLock=false;//锁定滚动条缩放,(固定滚动条长度) + dataZoom.left=optionsSetup.bottomLeft+'%';//离左边的百分比距离 + dataZoom.bottom=optionsSetup.bottomZoom;//距离底部距离 + dataZoom.start=optionsSetup.startZoom;//开始位置 + dataZoom.end=optionsSetup.endZoom;//结束位置 + dataZoom.showDataShadow=true; //屏蔽折线图,true为显示折线图 + // dataZoom.barBorderRadius=optionsSetup.borderRadiusZoom; + dataZoom.borderColor=optionsSetup.borderColorZoom; + dataZoom.height=optionsSetup.heightZoom; + dataZoom.backgroundColor=optionsSetup.backgroundColorZoom; + dataZoomList.push(dataZoom); + this.options.dataZoom=dataZoomList; + }else{ + this.options.dataZoom=null; + } this.options={...this.options}; }, // 图例名称设置 @@ -440,64 +444,65 @@ export default { }); }, renderingFn(optionsSetup, val) { + this.staticDataFn(val); //颜色 - const customColor = optionsSetup.customColor; - const arrColor = []; - for (let i = 0; i < customColor.length; i++) { - arrColor.push(customColor[i].color); - } - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } - const series = []; - const legendName = []; - for (const i in val.series) { - if (val.series[i].type == "line") { - series.push({ - name: val.series[i].name, - type: "line", - data: val.series[i].data, - width: optionsSetup.lineWidth, - symbol: optionsSetup.symbol, - showSymbol: optionsSetup.markPoint, - symbolSize: optionsSetup.pointSize, - symbolColor: arrColor[i], - smooth: optionsSetup.smoothCurve, - // 线条 - lineStyle: { - color: arrColor[i], - width: optionsSetup.lineWidth, - }, - //点 - itemStyle: { - color: arrColor[i], - }, - areaStyle: this.getOptionArea(), - // 标题部分 - label: { - show: optionsSetup.isShow, - position: "top", - distance: 10, - fontSize: optionsSetup.fontSize, - color: optionsSetup.subTextColor, - fontWeight: optionsSetup.fontWeight, - }, - }) - } - legendName.push(val.series[i].name); - } - this.options.series = series; - this.options.legend['data'] = legendName; - this.setOptionsLegendName(legendName); + // const customColor = optionsSetup.customColor; + // const arrColor = []; + // for (let i = 0; i < customColor.length; i++) { + // arrColor.push(customColor[i].color); + // } + // // x轴 + // if (optionsSetup.verticalShow) { + // this.options.xAxis.data = []; + // this.options.yAxis.data = val.xAxis; + // this.options.xAxis.type = "value"; + // this.options.yAxis.type = "category"; + // } else { + // this.options.xAxis.data = val.xAxis; + // this.options.yAxis.data = []; + // this.options.xAxis.type = "category"; + // this.options.yAxis.type = "value"; + // } + // const series = []; + // const legendName = []; + // for (const i in val.series) { + // if (val.series[i].type == "line") { + // series.push({ + // name: val.series[i].name, + // type: "line", + // data: val.series[i].data, + // width: optionsSetup.lineWidth, + // symbol: optionsSetup.symbol, + // showSymbol: optionsSetup.markPoint, + // symbolSize: optionsSetup.pointSize, + // symbolColor: arrColor[i], + // smooth: optionsSetup.smoothCurve, + // // 线条 + // lineStyle: { + // color: arrColor[i], + // width: optionsSetup.lineWidth, + // }, + // //点 + // itemStyle: { + // color: arrColor[i], + // }, + // areaStyle: this.getOptionArea(), + // // 标题部分 + // label: { + // show: optionsSetup.isShow, + // position: "top", + // distance: 10, + // fontSize: optionsSetup.fontSize, + // color: optionsSetup.subTextColor, + // fontWeight: optionsSetup.fontWeight, + // }, + // }) + // } + // legendName.push(val.series[i].name); + // } + // this.options.series = series; + // this.options.legend['data'] = legendName; + // this.setOptionsLegendName(legendName); } } }; diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue index af946e9..c6092bc 100644 --- a/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetActiveRingChart.vue @@ -2,23 +2,29 @@ 动态环图 --> diff --git a/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue b/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue new file mode 100644 index 0000000..305df3c --- /dev/null +++ b/src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/bigscreenDesigner/designer/widget/temp.vue b/src/views/bigscreenDesigner/designer/widget/temp.vue index 88461f9..a6946c8 100644 --- a/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -48,6 +48,7 @@ import widgetActiveRingChart from "./pie/widgetActiveRingChart"; import widgetConicalColumnChart from "./funnel/widgetConicalColumnChart"; import widgetDigitalFlopSingle from "./text/widgetDigitalFlopSingle"; import widgetSvg from "./div/widgetSvg"; +import widgetRadioPiechart from "./pie/widgetRadioPiechart"; export default { name: "WidgetTemp", @@ -65,6 +66,7 @@ export default { widgetLinechart, widgetBarlinechart, WidgetPiechart, + widgetRadioPiechart, WidgetFunnel, WidgetGauge, WidgetPieNightingaleRoseArea, diff --git a/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlopSingle.vue b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlopSingle.vue index 11cbf07..32cbb97 100644 --- a/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlopSingle.vue +++ b/src/views/bigscreenDesigner/designer/widget/text/widgetDigitalFlopSingle.vue @@ -1,22 +1,28 @@