diff --git a/report-ui/src/mixins/queryform.js b/report-ui/src/mixins/queryform.js
index 732187f9..c368c32b 100644
--- a/report-ui/src/mixins/queryform.js
+++ b/report-ui/src/mixins/queryform.js
@@ -105,7 +105,7 @@ export default {
// 解析不同图标的数据
analysisChartsData(params, data) {
// widget-barchart 柱线图、widget-linechart 折线图、 widget-barlinechart 柱线图
- // widget-piechart 饼图、widget-hollow-piechart 空心饼图、widget-funnel 漏斗图
+ // widget-piechart 饼图、widget-funnel 漏斗图
// widget-gauge 仪表盘
// widget-text 文本框
// widge-table 表格(数据不要转)
@@ -118,7 +118,6 @@ export default {
return this.barOrLineChartFn(params.chartProperties, data);
} else if (
chartType == "widget-piechart" ||
- chartType == "widget-hollow-piechart" ||
chartType == "widget-funnel"
) {
return this.piechartFn(params.chartProperties, data);
@@ -158,7 +157,7 @@ export default {
ananysicData["series"] = series;
return ananysicData;
},
- // 饼图或者空心饼图或者漏斗图
+ // 饼图、漏斗图
piechartFn(chartProperties, data) {
const ananysicData = [];
for (let i = 0; i < data.length; i++) {
diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 0c20aa2d..d5f5e94d 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -4072,388 +4072,6 @@ const widgetTools = [
],
},
},
- {
- code: 'widget-hollow-piechart',
- type: 'chart',
- label: '空心饼图',
- icon: 'icon020kongxinbingtu',
- 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: ''
- },
- {
- 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: ''
- },
- ],
- },
- {
- name: '数值设定',
- list: [
- {
- type: 'el-switch',
- label: '显示',
- name: 'isShow',
- required: false,
- placeholder: '',
- value: true,
- },
- {
- type: 'el-switch',
- label: '数值',
- name: 'numberValue',
- require: false,
- placeholder: '',
- value: false,
- },
- {
- type: 'el-switch',
- label: '百分比',
- name: 'percentage',
- require: false,
- placeholder: '',
- value: true,
- },
- {
- type: 'el-input-number',
- label: '字体大小',
- name: 'fontSize',
- required: false,
- placeholder: '',
- value: ''
- },
- {
- 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: 'fontSize',
- required: false,
- placeholder: '',
- value: ''
- },
- {
- type: 'vue-color',
- label: '网格线颜色',
- name: 'lineColor',
- required: false,
- placeholder: '',
- value: ''
- },
- ],
- },
- {
- name: '图例操作',
- list: [
- {
- type: 'el-switch',
- label: '图例',
- name: 'isShowLegend',
- required: false,
- placeholder: '',
- value: true,
- },
- {
- type: 'vue-color',
- label: '字体颜色',
- name: 'lengedColor',
- required: false,
- placeholder: '',
- value: '#fff',
- },
- {
- type: 'el-input-number',
- label: '字体大小',
- name: 'lengedFontSize',
- required: false,
- placeholder: '',
- value: 16,
- },
- {
- type: 'el-input-number',
- label: '图例宽度',
- name: 'lengedWidth',
- required: false,
- placeholder: '',
- value: 10,
- },
- {
- type: 'el-select',
- label: '横向位置',
- name: 'lateralPosition',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'left', name: '左对齐'},
- {code: 'right', name: '右对齐'},
- ],
- value: ''
- },
- {
- type: 'el-select',
- label: '纵向位置',
- name: 'longitudinalPosition',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'top', name: '顶部'},
- {code: 'bottom', name: '底部'},
- ],
- value: ''
- },
- {
- type: 'el-select',
- label: '布局前置',
- name: 'layoutFront',
- required: false,
- placeholder: '',
- selectOptions: [
- {code: 'vertical', name: '竖排'},
- {code: 'horizontal', name: '横排'},
- ],
- value: ''
- },
- ],
- },
- {
- 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: 'px',
- 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: 'px',
- relactiveDom: 'dataType',
- chartType: 'widget-hollow-piechart',
- relactiveDomValue: 'dynamicData',
- value: '',
- },
- ],
- // 坐标
- position: [
- {
- type: 'el-input-number',
- label: '左边距',
- name: 'left',
- required: false,
- placeholder: 'px',
- value: 0,
- },
- {
- type: 'el-input-number',
- label: '上边距',
- name: 'top',
- required: false,
- placeholder: 'px',
- 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,
- },
- ],
- },
- },
{
code: 'widget-funnel',
type: 'chart',
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieRoundChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieRoundChart.vue
deleted file mode 100644
index 5ec28ba6..00000000
--- a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieRoundChart.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
index 5705783c..819fc466 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/temp.vue
@@ -24,7 +24,6 @@ import widgetLinechart from "./widgetLinechart.vue";
import widgetBarlinechart from "./widgetBarlinechart";
import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue";
import WidgetPiechart from "./widgetPiechart.vue";
-import WidgetHollowPiechart from "./widgetHollowPiechart.vue";
import WidgetFunnel from "./widgetFunnel.vue";
import WidgetGauge from "./widgetGauge.vue";
import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose";
@@ -48,7 +47,6 @@ export default {
widgetLinechart,
widgetBarlinechart,
WidgetPiechart,
- WidgetHollowPiechart,
WidgetFunnel,
WidgetGauge,
WidgetPieNightingaleRoseArea,
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
index b23ff655..890adae2 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
@@ -34,7 +34,6 @@ import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue";
import widgetLinechart from "./widgetLinechart.vue";
import widgetBarlinechart from "./widgetBarlinechart";
import WidgetPiechart from "./widgetPiechart.vue";
-import WidgetHollowPiechart from "./widgetHollowPiechart.vue";
import WidgetFunnel from "./widgetFunnel.vue";
import WidgetGauge from "./widgetGauge.vue";
import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose";
@@ -58,7 +57,6 @@ export default {
widgetLinechart,
widgetBarlinechart,
WidgetPiechart,
- WidgetHollowPiechart,
WidgetFunnel,
WidgetGauge,
WidgetPieNightingaleRoseArea,
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue
deleted file mode 100644
index 11009570..00000000
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-
-
-
-
-
-
-