diff --git a/src/style/fix.less b/src/style/fix.less index 804b909d..5d5e9bdd 100644 --- a/src/style/fix.less +++ b/src/style/fix.less @@ -31,6 +31,7 @@ .el-tabs__nav-wrap::after {height: 1px;} .el-table th.is-sortable {transition: .1s;} .el-table th.is-sortable:hover {background: #eee;} +.el-col .el-card {margin-bottom: 15px;} /* 覆盖tinymce样式 */ .sceditor .tox-tinymce {border: 1px solid #DCDFE6;} diff --git a/src/views/vab/chart.vue b/src/views/vab/chart.vue index b165f032..797d8d2c 100644 --- a/src/views/vab/chart.vue +++ b/src/views/vab/chart.vue @@ -1,9 +1,38 @@ @@ -26,8 +55,8 @@ return { option: { title: { - text: 'Echarts Demo', - subtext: '优雅的经过scEcharts组件封装', + text: 'Bar Demo', + subtext: '基础柱状图', }, grid: { top: '80px' @@ -45,12 +74,153 @@ series: [{ data: [120, 200, 150, 80, 70, 110, 130], type: 'bar', - barWidth: '20px', + barWidth: '15px', }, { data: [110, 180, 120, 120, 60, 90, 110], type: 'bar', - barWidth: '20px', + barWidth: '15px', + }] + }, + option2: { + title: { + text: 'Line Demo', + subtext: '基础折线图', + }, + grid: { + top: '80px' + }, + tooltip: { + trigger: 'axis' + }, + xAxis: { + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + type: 'value' + }, + series: [{ + data: [120, 200, 150, 80, 70, 110, 130], + type: 'line', + }, + { + data: [110, 180, 120, 120, 60, 90, 110], + type: 'line', + }] + }, + option3: { + title: { + text: 'Pie Demo', + subtext: '基础饼图', + }, + tooltip: { + trigger: 'item' + }, + series: [ + { + name: '访问来源', + type: 'pie', + radius: ['40%', '70%'], + center: ['50%', '60%'], + label: false, + data: [ + {value: 1048, name: '搜索引擎'}, + {value: 735, name: '直接访问'}, + {value: 580, name: '邮件营销'}, + {value: 484, name: '联盟广告'}, + {value: 300, name: '视频广告'} + ] + } + ] + }, + option4: { + title: { + text: 'Radar Demo', + subtext: '基础雷达(属性)图', + }, + tooltip: { + trigger: 'item' + }, + radar: { + radius: 100, + center: ['50%', '55%'], + indicator: [ + { name: '销售', max: 6500}, + { name: '管理', max: 16000}, + { name: '信息技术', max: 30000}, + { name: '客服', max: 38000}, + { name: '研发', max: 52000}, + { name: '市场', max: 25000} + ] + }, + series: [{ + name: "SCUI", + type: 'radar', + areaStyle: {}, + data: [ + { + value: [4200, 3000, 20000, 35000, 50000, 18000], + } + ] + }] + }, + option5: { + title: { + text: 'Kline Demo', + subtext: '基础K线图', + }, + grid: { + top: '80px' + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross' + } + }, + xAxis: { + data: ['2017-10-23', '2017-10-24', '2017-10-25', '2017-10-26', '2017-10-27', '2017-10-28', '2017-10-29', '2017-10-30'], + }, + yAxis: { + scale: true, + }, + series: [{ + type: 'k', + data: [ + [2213.19,2199.31,2191.85,2224.63], + [2203.89,2177.91,2173.86,2210.58], + [2170.78,2174.12,2161.14,2179.65], + [2179.05,2205.5,2179.05,2222.81], + [2212.5,2231.17,2212.5,2236.07], + [2227.86,2235.57,2219.44,2240.26], + [2242.39,2246.3,2235.42,2255.21], + [2246.96,2232.97,2221.38,2247.86] + ] + }] + }, + option6: { + title: { + text: 'Gauge Demo', + subtext: '基础仪表盘', + }, + series: [{ + center: ['50%', '60%'], + type: 'gauge', + anchor: { + show: true, + showAbove: true, + size: 20, + itemStyle: { + borderWidth: 5 + } + }, + progress: { + show: true + }, + data: [{ + value: 70 + }] }] } }