diff --git a/src/views/screen/Dashboard.vue b/src/views/screen/Dashboard.vue index 7d987c0..152c83a 100644 --- a/src/views/screen/Dashboard.vue +++ b/src/views/screen/Dashboard.vue @@ -62,9 +62,11 @@ 二次网供压 二次网回压
- - - + + +
@@ -503,7 +505,7 @@ function updateChartCounty() { distance: 0, align: 'left', color: '#ffffff', - formatter: (params: any) => `{icon|} ${values[params.dataIndex]}`, // 数值左边加图标 + formatter: (params: any) => `{icon|} ${values[params.dataIndex]}`+ 'kw', // 数值左边加图标 rich: { icon: { height: 14, // 图标高度 @@ -524,7 +526,7 @@ function updateChartCounty() { // area-7 的雷达图更新函数 function updateRadarChart() { if (!chartRadar) return; - const names = countyList.value.map(i => i.raw?.view028 ?? '未知'); + const names = countyList.value.map(i => i.raw?.view028.replace('锅炉房', '') + '\n' + i.raw?.view037 + 'm³/h'); const values = countyList.value.map(i => (i.raw?.view037 ? Number(i.raw.view037) : 0)); const maxVal = values.length ? Math.max(...values) * 1.15 : 100; @@ -558,14 +560,23 @@ function updateRadarChart() { indicator: names.map(name => ({ name, max: maxVal })), splitNumber: 0, center: ['50%', '45%'], - radius: '57%', + radius: '68%', + nameGap:40, name: { + rich: { + padding: [20, 20, 20, 20] + }, + offset: 15, textStyle: { color: '#f4f4f4', fontSize: 12, borderRadius: 3, - padding: [3, 5] - } + padding: [3, 5], + align: 'center', + verticalAlign: 'middle', + distance: 20 + }, + lineHeight: 14 }, splitLine: { lineStyle: { color: 'rgba(50,150,200,0.3)' } }, splitArea: { show: true, areaStyle: { color: ['rgba(15,40,70,0.5)', 'rgba(20,50,80,0.3)'] } }, @@ -1024,11 +1035,11 @@ function closeModal() { async function detailFunc(record) { console.log(record); console.log(modalType); - if(modalType.value == 2){ + if (modalType.value == 2) { modalVisible3.value = true; await nextTick() registerModal3.value.init(record) - }else{ + } else { modalVisible2.value = true; await nextTick() registerModal.value.init(record) diff --git a/src/views/screen/start.png b/src/views/screen/start.png new file mode 100644 index 0000000..9fa2bb8 Binary files /dev/null and b/src/views/screen/start.png differ diff --git a/src/views/screen/start.svg b/src/views/screen/start.svg new file mode 100644 index 0000000..9c27592 --- /dev/null +++ b/src/views/screen/start.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/screen/stop.png b/src/views/screen/stop.png new file mode 100644 index 0000000..ec0c8fd Binary files /dev/null and b/src/views/screen/stop.png differ diff --git a/src/views/screen/stop.svg b/src/views/screen/stop.svg new file mode 100644 index 0000000..34bb170 --- /dev/null +++ b/src/views/screen/stop.svg @@ -0,0 +1 @@ + \ No newline at end of file