diff --git a/ruoyi-admin/src/main/resources/static/css/board/month.css b/ruoyi-admin/src/main/resources/static/css/board/month.css index 2c9c9ce..7fddd54 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/month.css +++ b/ruoyi-admin/src/main/resources/static/css/board/month.css @@ -1,7 +1,7 @@ body { height: auto; width: auto; - background: url(../../img/board/month/backgroundImg.jpg) no-repeat center fixed; + background: url(../../img/board/month/bg3.jpg) no-repeat center fixed; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; diff --git a/ruoyi-admin/src/main/resources/static/img/board/month/bg3.jpg b/ruoyi-admin/src/main/resources/static/img/board/month/bg3.jpg new file mode 100644 index 0000000..4b33384 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/month/bg3.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/js/board/month.js b/ruoyi-admin/src/main/resources/static/js/board/month.js index 5b3cd5e..ec1a456 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -26,7 +26,7 @@ $(() => { }, document.getElementById("safe"), '','',4) }) autoUpdate(url + "/selectMonthQANumber", INTERVAL, data => { - pieChart(data.map((val, index) => { + pieChartTwo(data.map((val, index) => { if (index == 0) { return { name: val.name, @@ -140,8 +140,8 @@ const today = () => { } const moduleTitle = () => { + // 智能冷柜中央管控平台 const html = ` - 智能冷柜中央管控平台 用户满意度 产品升级 场景升级 diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js index 6f76c5e..431867e 100644 --- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js +++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js @@ -1124,7 +1124,7 @@ const lineChartTwo = function (data, id, unit = '') { color: "#a8aab0", fontStyle: "normal", fontFamily: "微软雅黑", - fontSize: 0.5 * vw, + fontSize: 0.8 * vw, }, }, }, @@ -1331,7 +1331,7 @@ const lineChartThree = function (data, id, unit = '',smooth=false) { color: "#14bd2d", fontStyle: "normal", fontFamily: "微软雅黑", - fontSize: 0.5 * vw, + fontSize: 0.8 * vw, }, }, }, @@ -1363,7 +1363,7 @@ const lineChartThree = function (data, id, unit = '',smooth=false) { color: "#3094ea", fontStyle: "normal", fontFamily: "微软雅黑", - fontSize: 0.5 * vw, + fontSize: 0.8 * vw, }, }, }, @@ -1481,6 +1481,93 @@ const pieChart = function (data, id, unit = '次') { charts.setOption(option); $(window).resize(charts.resize); } +const pieChartTwo = function (data, id, unit = '次') { + let charts = echarts.init(id); + if (!data) { + data = [ + { + value: 285, + name: "类型1", + }, + { + value: 410, + name: "类型2", + }, + { + value: 274, + name: "类型3", + }, + { + value: 235, + name: "类型4", + }, + ] + } + if (data.length === 0) { + data = [{ + value: 0, + name: '' + }] + } + let option = { + tooltip: { + trigger: "item", + formatter: "{b} : {c} ({d}%)", + textStyle: { + fontSize: 0.8 * vw + } + }, + + series: [ + { + name: "访问来源", + type: "pie", + radius: "50%", + center: ["50%", "50%"], + colorBy: 'data', + // color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050' + data: data, + roseType: "radius", + overflow:'break', + label: { + normal: { + formatter: `{b|{b}} \n {c|{c}${unit}}`, + rich: { + c: { + color: "rgb(241,246,104)", + fontSize: 0.75 * vw, + lineHeight: 5, + }, + b: { + color: "rgb(98,137,169)", + fontSize: 0.75 * vw, + height: 1.5 * vw, + }, + }, + }, + }, + emphasis: { + label: { + fontSize: 0.75 * vw + } + }, + labelLine: { + normal: { + lineStyle: { + color: "rgb(98,137,169)", + }, + smooth: true, + length: 20, + length2: 20, + }, + }, + }, + ], + }; + + charts.setOption(option); + $(window).resize(charts.resize); +} // 垂直柱状图 const verticalBarChart = function (data, id, unit = '次') { diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html index 4a673d4..9d85c93 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/month.html +++ b/ruoyi-admin/src/main/resources/templates/broad/month.html @@ -64,10 +64,10 @@
-品牌赋能 -全网协同 -生态终端 -感动用户 + + + +