diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts index 6b98584..f6f1e42 100644 --- a/src/utils/echartMethod.ts +++ b/src/utils/echartMethod.ts @@ -26,13 +26,15 @@ export const yMethod = (arr: any) => { return [min, max] } // 导出csv文件 -const convertToCSV = (title: object,data) => { +const convertToCSV = (title: object,data:any) => { + console.log("🚀 ~ convertToCSV ~ data:", data) let csv = ''; // 添加列头 - csv += ' ,'+title.join(',') + '\n'; + csv += ','+title.join(',') + '\n'; // 遍历数据并添加到CSV字符串中 - data.forEach(item => { - csv += `${item.x},${item.y}\n`; + data.map(item => { + csv += item.join(',') + '\n'; + }); return csv; } diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue index f9680f0..51590cb 100644 --- a/src/views/govern/device/control/detail.vue +++ b/src/views/govern/device/control/detail.vue @@ -251,12 +251,22 @@ const init = () => { myTool1: { show: true, title: '下载csv', - icon: 'path://M733.549304 0l116.434359 116.23452-226.402521 226.40252 57.053835 57.068109 226.459617-226.445342 120.616689 120.41685V0H733.549304zM689.513507 619.855586l-57.068108 57.068109 224.232847 224.232847-122.64362 122.843458h293.676657V729.838022l-114.007751 114.207588-224.190025-224.190024zM338.197775 404.144414l57.068109-57.068109L171.033037 122.843458 293.676657 0H0v294.161978l114.022025-114.207588 224.17575 224.190024zM347.076305 624.294851L120.616689 850.754468 0 730.323343v293.676657h294.161978l-116.420084-116.23452 226.40252-226.40252-57.068109-57.068109z', + + icon: 'path://M588.8 551.253333V512H352v39.253333h236.373333z m0 78.933334v-39.253334H352v39.253334h236.373333z m136.533333 78.933333V334.933333l-157.866666-157.866666H273.066667A59.306667 59.306667 0 0 0 213.333333 236.373333v551.253334a59.306667 59.306667 0 0 0 59.306667 59.306666h274.773333v42.666667H853.333333v-180.48zM568.746667 234.666667l100.266666 100.693333h-81.066666a20.053333 20.053333 0 0 1-19.626667-20.053333z m-20.48 573.013333H273.066667a19.2 19.2 0 0 1-17.493334-19.626667V236.373333a19.2 19.2 0 0 1 19.626667-19.626666h256v98.133333a58.88 58.88 0 0 0 58.88 59.306667h96.426667v334.933333h-98.133334v-39.68H352v39.68h196.266667z m100.266666 23.04a37.973333 37.973333 0 0 1-32 15.786667 38.826667 38.826667 0 0 1-32.426666-15.786667 53.76 53.76 0 0 1-10.24-32.853333 42.666667 42.666667 0 0 1 42.666666-47.786667 35.84 35.84 0 0 1 37.546667 29.866667h-12.8a23.893333 23.893333 0 0 0-24.746667-19.2c-17.066667 0-29.013333 14.08-29.013333 35.84s11.52 37.546667 28.586667 37.546666a26.453333 26.453333 0 0 0 26.453333-25.6h12.8a39.253333 39.253333 0 0 1-7.253333 22.186667z m59.733334 15.786667a35.84 35.84 0 0 1-40.106667-34.56H682.666667a23.893333 23.893333 0 0 0 26.88 23.04c12.8 0 22.613333-6.4 22.613333-15.786667s-4.266667-11.52-14.506667-13.653333l-21.333333-5.12c-17.066667-4.266667-24.32-11.52-24.32-23.893334s12.8-26.453333 34.133333-26.453333a31.573333 31.573333 0 0 1 35.413334 30.293333h-13.653334a19.626667 19.626667 0 0 0-22.613333-18.773333c-12.8 0-20.48 5.12-20.48 12.8s5.12 11.093333 17.066667 13.653333l14.933333 2.986667a42.666667 42.666667 0 0 1 20.906667 8.96 23.893333 23.893333 0 0 1 7.68 17.92c-0.426667 17.066667-14.506667 28.16-37.12 28.16z m88.746666 0h-14.506666l-32.426667-92.16h14.08l19.626667 59.733333 6.4 20.053333c0-9.386667 3.413333-12.8 5.546666-20.053333l19.2-59.733333h14.08z', onclick: (e) => { - echartsData.value - console.log("🚀 ~ init ~ echartsData.value:", echartsData.value.options.series.map(item => item.name)) - exportCSV(echartsData.value.options.series.map(item => item.name),dataList, 'aaa.csv') - // downloadCSV(dataList, 'data.csv'); + + console.log("🚀 ~ init ~ echartsData.value:", echartsData.value.options.series.map(item => item.data)) + + let list = echartsData.value.options.series.map(item => item.data) + let dataList = list[0].map((item, index) => { + const value1 = list[1] && list[1][index] ? list[1][index][1] : null; + const value2 = list[2] && list[2][index] ? list[2][index][1] : null; + const value3 = list[3] && list[3][index] ? list[3][index][1] : null; + + return [item[0], item[1], value1, value2,value3]; + }); + exportCSV(echartsData.value.options.series.map(item => item.name), dataList, echartsData.value.title.text + '.csv') + } } } @@ -271,12 +281,7 @@ const init = () => { loading.value = false }) } -const dataList = [ - { x: 'A', y: 10 }, - { x: 'B', y: 20 }, - { x: 'C', y: 30 } - // ... 其他数据点 -]; +