diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 71e584cf..1623ee52 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -422,7 +422,7 @@ @click="addColor" /> settingItem.field === \'wordField\').value\n' + 'if (wordFieldValue) {\n' + ' option.colorField = wordFieldValue\n' + '}' +// 数据处理脚本 +const dataHandler = '' + // 图表配置 new Line('domName', option) const option = { // 数据将要放入到哪个字段中 @@ -611,13 +147,13 @@ const option = { // 图表内边距 appendPadding: [0, 0, 0, 0], data, - wordField: 'x', + wordField: 'name', weightField: 'value', - colorField: 'category', + colorField: 'name', color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], wordStyle: { fontFamily: 'Verdana', - fontSize: [24, 80] + fontSize: [12, 60] }, fontSizeMin: 24, fontSizeMax: 80, diff --git a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js index be5aa501..e00d41ca 100644 --- a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023111401' +const version = '2023111501' // 分类 const category = 'Radar' // 标题 @@ -231,6 +231,15 @@ const setting = [ tabName: 'custom', groupName: 'legend' }, + { + label: 'y轴最小值', + type: 'inputNumber', + field: 'yAxis_min', + optionField: 'yAxis.min', + value: 0, + tabName: 'custom', + groupName: 'yAxis' + }, // 内边距 appendPadding { label: '', @@ -245,28 +254,17 @@ const setting = [ // 模拟数据 const data = [ - { item: 'Design', user: 'a', score: 70 }, - { item: 'Design', user: 'b', score: 30 }, - { item: 'Development', user: 'a', score: 60 }, - { item: 'Development', user: 'b', score: 70 }, - { item: 'Marketing', user: 'a', score: 50 }, - { item: 'Marketing', user: 'b', score: 60 }, - { item: 'Users', user: 'a', score: 40 }, - { item: 'Users', user: 'b', score: 50 }, - { item: 'Test', user: 'a', score: 60 }, - { item: 'Test', user: 'b', score: 70 }, - { item: 'Language', user: 'a', score: 70 }, - { item: 'Language', user: 'b', score: 50 }, - { item: 'Technology', user: 'a', score: 50 }, - { item: 'Technology', user: 'b', score: 40 }, - { item: 'Support', user: 'a', score: 30 }, - { item: 'Support', user: 'b', score: 40 }, - { item: 'Sales', user: 'a', score: 60 }, - { item: 'Sales', user: 'b', score: 40 }, - { item: 'UX', user: 'a', score: 50 }, - { item: 'UX', user: 'b', score: 60 } + { name: '支撑及时性', star: 300, type: '当前得分' }, + { name: '基本能力', star: 450, type: '当前得分' }, + { name: '支撑规范性', star: 200, type: '当前得分' }, + { name: '满意度', star: 420, type: '当前得分' }, + { name: '工作质量', star: 380, type: '当前得分' }, + { name: '支撑及时性', star: 380, type: '平均得分' }, + { name: '基本能力', star: 420, type: '平均得分' }, + { name: '支撑规范性', star: 300, type: '平均得分' }, + { name: '满意度', star: 350, type: '平均得分' }, + { name: '工作质量', star: 400, type: '平均得分' } ] - // 配置处理脚本 const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' + '\n if (option.legendEnable) {\n' + @@ -284,9 +282,9 @@ const option = { appendPadding: [0, 0, 0, 0], renderer: 'canvas', data, - xField: 'item', - yField: 'score', - seriesField: 'user', + xField: 'name', + yField: 'star', + seriesField: 'type', legendEnable: false, legendLayout: 'vertical', legendPosition: 'top', @@ -325,6 +323,7 @@ const option = { size: 2 }, yAxis: { + min: 0, label: false, grid: { alternateColor: 'rgba(0, 0, 0, 0.04)' diff --git a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js index 8c9ebbc1..a3e85013 100644 --- a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js @@ -1,6 +1,6 @@ // 配置版本号 -const version = '2023111401' +const version = '2023111501' // 分类 const category = 'Radar' // 标题 @@ -214,6 +214,15 @@ const setting = [ tabName: 'custom', groupName: 'grid' }, + { + label: 'y轴最小值', + type: 'inputNumber', + field: 'yAxis_min', + optionField: 'yAxis.min', + value: 0, + tabName: 'custom', + groupName: 'yAxis' + }, // 内边距 appendPadding { label: '', @@ -228,13 +237,11 @@ const setting = [ // 模拟数据 const data = [ - { name: 'G2', star: 10371 }, - { name: 'G6', star: 7380 }, - { name: 'F2', star: 7414 }, - { name: 'L7', star: 2140 }, - { name: 'X6', star: 660 }, - { name: 'AVA', star: 885 }, - { name: 'G2Plot', star: 1626 } + { name: '支撑及时性', star: 300 }, + { name: '基本能力', star: 450 }, + { name: '支撑规范性', star: 200 }, + { name: '满意度', star: 420 }, + { name: '工作质量', star: 380 }, ] // 配置处理脚本 @@ -290,6 +297,7 @@ const option = { yAxis: { // line: null, tickLine: null, + min: 0, label: false, grid: { line: { diff --git a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js index 030b2faf..14d282ee 100644 --- a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js @@ -551,155 +551,22 @@ const setting = [ // 模拟数据 const data = [ - { - country: '北美', - date: 1965, - value: 1390.5 - }, - { - country: '北美', - date: 1966, - value: 1469.5 - }, - { - country: '北美', - date: 1967, - value: 1521.7 - }, - { - country: '北美', - date: 1968, - value: 1615.9 - }, - { - country: '北美', - date: 1969, - value: 1703.7 - }, - { - country: '中南美', - date: 1965, - value: 109.2 - }, - { - country: '中南美', - date: 1966, - value: 115.7 - }, - { - country: '中南美', - date: 1967, - value: 120.5 - }, - { - country: '中南美', - date: 1968, - value: 128 - }, - { - country: '中南美', - date: 1969, - value: 134.4 - }, - { - country: '欧洲', - date: 1965, - value: 1058.1 - }, - { - country: '欧洲', - date: 1966, - value: 1089.7 - }, - { - country: '欧洲', - date: 1967, - value: 1121.7 - }, - { - country: '欧洲', - date: 1968, - value: 1196.6 - }, - { - country: '欧洲', - date: 1969, - value: 1285.5 - }, - { - country: 'CIS 地区', - date: 1965, - value: 593.3 - }, - { - country: 'CIS 地区', - date: 1966, - value: 630.9 - }, - { - country: 'CIS 地区', - date: 1967, - value: 663.2 - }, - { - country: 'CIS 地区', - date: 1968, - value: 687.8 - }, - { - country: 'CIS 地区', - date: 1969, - value: 719 - }, { - country: '中东', - date: 1965, - value: 48.3 - }, - { - country: '中东', - date: 1966, - value: 50.4 - }, - { - country: '中东', - date: 1967, - value: 52.7 - }, - { - country: '中东', - date: 1968, - value: 55.6 - }, - { - country: '中东', - date: 1969, - value: 58.5 - }, - { - country: '非洲', - date: 1965, - value: 60.6 - }, - { - country: '非洲', - date: 1966, - value: 63.3 - }, - { - country: '非洲', - date: 1967, - value: 64 - }, - { - country: '非洲', - date: 1968, - value: 67.4 - }, - { - country: '非洲', - date: 1969, - value: 68.9 - } + { date: '2016年', value: 100, type: '已处理' }, + { date: '2017年', value: 200, type: '已处理' }, + { date: '2018年', value: 300, type: '已处理' }, + { date: '2019年', value: 200, type: '已处理' }, + { date: '2020年', value: 100, type: '已处理' }, + { date: '2021年', value: 200, type: '已处理' }, + { date: '2022年', value: 300, type: '已处理' }, + { date: '2023年', value: 400, type: '已处理' }, + { date: '2016年', value: 400, type: '未处理' }, + { date: '2017年', value: 100, type: '未处理' }, + { date: '2018年', value: 200, type: '未处理' }, + { date: '2019年', value: 300, type: '未处理' }, + { date: '2020年', value: 200, type: '未处理' }, + { date: '2021年', value: 100, type: '未处理' }, + { date: '2022年', value: 200, type: '未处理' }, + { date: '2023年', value: 300, type: '未处理' } ] // 配置处理脚本 @@ -723,7 +590,7 @@ const option = { xField: 'date', yField: 'value', color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], - seriesField: 'country', + seriesField: 'type', smooth: false, legendEnable: false, legendLayout: 'vertical', diff --git a/data-room-ui/packages/G2Plots/饼图/基础饼图.js b/data-room-ui/packages/G2Plots/饼图/基础饼图.js index f315f83c..6f7cd869 100644 --- a/data-room-ui/packages/G2Plots/饼图/基础饼图.js +++ b/data-room-ui/packages/G2Plots/饼图/基础饼图.js @@ -270,6 +270,10 @@ const option = { } }, color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], + pieStyle: { + stroke: '#000000', + lineWidth: 0 + }, label: { autoRotate: true, type: 'inner',