diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index ef30ad7..d5191f7 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3943555 */ - src: url('iconfont.woff2?t=1679275935231') format('woff2'), - url('iconfont.woff?t=1679275935231') format('woff'), - url('iconfont.ttf?t=1679275935231') format('truetype'); + src: url('iconfont.woff2?t=1679377698528') format('woff2'), + url('iconfont.woff?t=1679377698528') format('woff'), + url('iconfont.ttf?t=1679377698528') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-icon-fold:before { + content: "\e749"; +} + +.icon-icon-12:before { + content: "\e748"; +} + .icon-waterprint:before { content: "\e747"; } diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index d3e0d7d..4da2d9b 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index aab9bdf..a7f521e 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 699058c..dc68f18 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 2c1ce82..7d765f0 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -37,6 +37,26 @@ export const Dashboard: React.FC = () => { var echarts = require("echarts"); let myChart = echarts.init(document.getElementById("chartCircle")); myChart.setOption({ + title: { + textAlign: "center", + x: "49.5%", + y: "29%", + text: num, //主标题 + subtext: "总资源数", //副标题 + textStyle: { + //标题样式 + fontSize: 24, + fontWeight: "bolder", + color: "#333", + }, + subtextStyle: { + //副标题样式 + fontSize: 14, + fontWeight: "bolder", + color: "rgba(0, 0, 0, 0.45)", + formatter: "", + }, + }, legend: [ { selectedMode: true, // 图例选择的模式,控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择,可以设成 false 关闭。 @@ -51,7 +71,16 @@ export const Dashboard: React.FC = () => { }, ], tooltip: { - show: true, // 是否显示提示框 + trigger: "item", + formatter: " {b}: {c} ", + }, + label: { + formatter: " {b}: {c} ", + rich: { + per: { + color: "#000", + }, + }, }, series: [ { @@ -69,7 +98,22 @@ export const Dashboard: React.FC = () => { disabled: true, }, label: { - show: false, + normal: { + show: true, + color: "#4c4a4a", + formatter: "{active|{c}}" + "\n\r" + "{total| {b} }", + rich: { + total: { + fontSize: 15, + color: "#454c5c", + }, + active: { + fontSize: 15, + color: "#6c7a89", + lineHeight: 30, + }, + }, + }, }, data: data, }, @@ -289,7 +333,7 @@ export const Dashboard: React.FC = () => {