From f0590c087c7e0e9e95e058d772a6cf832b76d4e7 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 28 Feb 2024 10:15:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Decharts=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BI/components/personnel.vue | 39 +------------------ src/views/BI/js/echarts1.js | 16 +++----- src/views/BI/js/echarts2.js | 10 ++--- src/views/BI/js/echarts4.js | 20 ++++------ src/views/BI/js/echarts5.js | 10 ++--- .../components/full_staff_training.vue | 8 ---- .../components/hidden_danger_situation.vue | 8 +--- 7 files changed, 22 insertions(+), 89 deletions(-) diff --git a/src/views/BI/components/personnel.vue b/src/views/BI/components/personnel.vue index 8e715ad..5b36d8f 100644 --- a/src/views/BI/components/personnel.vue +++ b/src/views/BI/components/personnel.vue @@ -76,44 +76,7 @@ const data = reactive({ }, ], eleType: 0, - block2OptionsList: [ - { - label: "滞留报警", - count: 0, - }, - { - label: "越界报警", - count: 235, - }, - { - label: "超员报警", - count: 569, - }, - { - label: "缺员报警", - count: 569, - }, - { - label: "静止报警", - count: 423, - }, - { - label: "串岗报警", - count: 789, - }, - { - label: "一键告警", - count: 236, - }, - { - label: "聚集告警", - count: 214, - }, - { - label: "作业告警", - count: 852, - }, - ], + block2OptionsList: [], block3List: [ { name: "赵一诺", diff --git a/src/views/BI/js/echarts1.js b/src/views/BI/js/echarts1.js index e1aab14..4b18c12 100644 --- a/src/views/BI/js/echarts1.js +++ b/src/views/BI/js/echarts1.js @@ -57,10 +57,8 @@ function echarts1(id, legend, echartCount) { type: "shadow", }, axisLabel: { - textStyle: { - color: "#B3CFFF", // x轴文本颜色 - fontSize: 10, - }, + color: "#B3CFFF", // x轴文本颜色 + fontSize: 10, formatter(params) { // const res = xWrapText(params, 6); xWrapText(params, 6); @@ -84,10 +82,8 @@ function echarts1(id, legend, echartCount) { }, axisLabel: { formatter: "{value}%", - textStyle: { - color: "#B3CFFF", // x轴文本颜色 - fontSize: 12, - }, + color: "#B3CFFF", // x轴文本颜色 + fontSize: 12, }, name: "", nameTextStyle: { @@ -119,7 +115,7 @@ function echarts1(id, legend, echartCount) { opacity: 1, }, ]), - barBorderRadius: [0, 0, 0, 0], + borderRadius: [0, 0, 0, 0], }, data: echartCount, }, @@ -148,7 +144,7 @@ function echarts1(id, legend, echartCount) { opacity: 1, }, ]), - barBorderRadius: [0, 0, 0, 0], + borderRadius: [0, 0, 0, 0], }, data: echartCount, barGap: 0, diff --git a/src/views/BI/js/echarts2.js b/src/views/BI/js/echarts2.js index 4b74fe2..4b6dede 100644 --- a/src/views/BI/js/echarts2.js +++ b/src/views/BI/js/echarts2.js @@ -34,10 +34,8 @@ function echarts2(id, month, accumulated, currentMonth) { }, axisLabel: { // 坐标轴刻度标签的相关设置 - textStyle: { - color: "#d1e6eb", - margin: 15, - }, + color: "#d1e6eb", + margin: 15, interval: 0, rotate: 30, }, @@ -64,9 +62,7 @@ function echarts2(id, month, accumulated, currentMonth) { }, axisLabel: { margin: 20, - textStyle: { - color: "#d1e6eb", - }, + color: "#d1e6eb", }, axisTick: { show: false, diff --git a/src/views/BI/js/echarts4.js b/src/views/BI/js/echarts4.js index f5aa0ea..fd607a1 100644 --- a/src/views/BI/js/echarts4.js +++ b/src/views/BI/js/echarts4.js @@ -52,12 +52,8 @@ function echarts4(id) { axisLabel: { show: true, // rotate: -1, - textStyle: { - fontSize: 14, - // fontFamily: PangMenZhengDao, - - color: "#fff", - }, + fontSize: 14, + color: "#fff", }, axisTick: { show: false, @@ -93,11 +89,8 @@ function echarts4(id) { }, axisLabel: { show: true, - textStyle: { - fontSize: 12, - // fontFamily: PangMenZhengDao, - color: "#ffffff", - }, + fontSize: 12, + color: "#ffffff", }, splitArea: { areaStyle: { @@ -187,8 +180,9 @@ function echarts4(id) { return colorList[params.dataIndex]; }, opacity: 0.7, - // 鼠标移入柱子上 透明度变为 1 - emphasis: { + }, + emphasis: { + itemStyle: { opacity: 1, }, }, diff --git a/src/views/BI/js/echarts5.js b/src/views/BI/js/echarts5.js index 01cc9e2..8a16838 100644 --- a/src/views/BI/js/echarts5.js +++ b/src/views/BI/js/echarts5.js @@ -41,10 +41,8 @@ function echarts2(id, data) { }, axisLabel: { // 坐标轴刻度标签的相关设置 - textStyle: { - color: "#d1e6eb", - margin: 15, - }, + color: "#d1e6eb", + margin: 15, }, axisTick: { show: false, @@ -69,9 +67,7 @@ function echarts2(id, data) { }, axisLabel: { margin: 20, - textStyle: { - color: "#d1e6eb", - }, + color: "#d1e6eb", }, axisTick: { show: false, diff --git a/src/views/large_screen_data_display/components/full_staff_training.vue b/src/views/large_screen_data_display/components/full_staff_training.vue index d0f8d08..7c3fc30 100644 --- a/src/views/large_screen_data_display/components/full_staff_training.vue +++ b/src/views/large_screen_data_display/components/full_staff_training.vue @@ -32,14 +32,6 @@ const fnInitEcharts = (data) => { type: "shadow", }, }, - legend: { - data: ["各培训类型学习人数"], - top: "15", - textStyle: { - color: "#2aaef2", - }, - orient: "horizontal", - }, grid: { top: "25%", right: "3%", diff --git a/src/views/large_screen_data_display/components/hidden_danger_situation.vue b/src/views/large_screen_data_display/components/hidden_danger_situation.vue index 03f2c62..d5e284d 100644 --- a/src/views/large_screen_data_display/components/hidden_danger_situation.vue +++ b/src/views/large_screen_data_display/components/hidden_danger_situation.vue @@ -65,9 +65,7 @@ const fnInitEcharts = (data) => { }, axisLabel: { interval: 0, - textStyle: { - color: "#fff", - }, + color: "#fff", fontSize: 12, margin: 15, }, @@ -87,9 +85,7 @@ const fnInitEcharts = (data) => { }, }, axisLabel: { - textStyle: { - color: "#fff", - }, + color: "#fff", }, splitLine: { show: false, From a863a386e012265a2a2d6447fce63a4a04ca0734 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 28 Feb 2024 10:27:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0BI=E9=A1=B5?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=81=E8=AF=81=E4=BD=9C=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=B0=E6=9C=9F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/header/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue index 18a046a..17bcc6d 100644 --- a/src/layout/header/index.vue +++ b/src/layout/header/index.vue @@ -4,7 +4,7 @@