From 74d00bbc8f305dd1126a6ee81113ac2075437b52 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 21 Aug 2023 15:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 4 +-
pages/revenue/component/otherCharts.vue | 29 +++-
pages/revenue/component/yearCharts.vue | 29 +++-
pages/revenue/index.vue | 133 ++++++++++++-------
static/public/fontRevenue/stylesheet.css | 8 ++
static/public/fontRevenue/up9HUFeeQJsE.woff2 | Bin 0 -> 3816 bytes
6 files changed, 149 insertions(+), 54 deletions(-)
create mode 100644 static/public/fontRevenue/stylesheet.css
create mode 100644 static/public/fontRevenue/up9HUFeeQJsE.woff2
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 87cf83d..59520db 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -17,8 +17,8 @@
{{ single }}
-
-
+
+
diff --git a/pages/revenue/component/otherCharts.vue b/pages/revenue/component/otherCharts.vue
index e5aeb5d..e9d6b50 100644
--- a/pages/revenue/component/otherCharts.vue
+++ b/pages/revenue/component/otherCharts.vue
@@ -1,6 +1,7 @@
-
+
+
@@ -11,7 +12,9 @@ var uChartsInstance = {};
export default {
name: "OtherCharts",
data() {
- return {}
+ return {
+ preferPath:''
+ }
},
props: {
success: {
@@ -49,7 +52,7 @@ export default {
width: 64,
height: 64,
series: data.series,
- animation: true,
+ animation: false,
rotate: false,
rotateLock: false,
background: "#FFFFFF",
@@ -81,7 +84,27 @@ export default {
}
}
});
+ setTimeout( ()=>{
+ this.canvasToTempImage('month')
+ },100)
},
+ canvasToTempImage(id){
+ uni.canvasToTempFilePath({
+ canvasId:id,
+ complete:(res)=>{
+ if (res.tempFilePath){
+ uni.getFileSystemManager().readFile({
+ filePath: res.tempFilePath,
+ encoding: 'base64',
+ success: res => {
+ let base64 = 'data:image/png;base64,' + res.data;
+ this.preferPath = base64
+ }
+ })
+ }
+ }
+ },this)
+ },
}
}
diff --git a/pages/revenue/component/yearCharts.vue b/pages/revenue/component/yearCharts.vue
index 4c10cea..ca06a28 100644
--- a/pages/revenue/component/yearCharts.vue
+++ b/pages/revenue/component/yearCharts.vue
@@ -1,6 +1,7 @@
-
+
+
@@ -11,7 +12,9 @@ var uChartsInstance = {};
export default {
name: "YearCharts",
data() {
- return {}
+ return {
+ preferPath:''
+ }
},
props: {
success: {
@@ -45,7 +48,7 @@ export default {
width: 34,
height: 34,
series: data.series,
- animation: true,
+ animation: false,
rotate: false,
rotateLock: false,
background: "#FFFFFF",
@@ -72,6 +75,26 @@ export default {
}
}
});
+ setTimeout( ()=>{
+ this.canvasToTempImage('month')
+ },100)
+ },
+ canvasToTempImage(id){
+ uni.canvasToTempFilePath({
+ canvasId:id,
+ complete:(res)=>{
+ if (res.tempFilePath){
+ uni.getFileSystemManager().readFile({
+ filePath: res.tempFilePath,
+ encoding: 'base64',
+ success: res => {
+ let base64 = 'data:image/png;base64,' + res.data;
+ this.preferPath = base64
+ }
+ })
+ }
+ }
+ },this)
},
}
}
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 87b0eef..557c719 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -3,13 +3,20 @@
-