-
-
+
@@ -101,4 +127,4 @@ export default {
height: 260px;
}
}
-
\ No newline at end of file
+
diff --git a/pages/commercialBI/components/format/fillingDegree.vue b/pages/commercialBI/components/format/fillingDegree.vue
index 5c2cb98..d7d49ee 100644
--- a/pages/commercialBI/components/format/fillingDegree.vue
+++ b/pages/commercialBI/components/format/fillingDegree.vue
@@ -1,7 +1,8 @@
@@ -13,7 +14,8 @@ export default {
name: "fillingDegree",
data() {
return {
- width:0
+ width:0,
+ fillDegreePath:''
}
},
props: {
@@ -51,12 +53,12 @@ export default {
rotate: false,
rotateLock: false,
background: "#FFFFFF",
- color: ["#1E80FF", "#456497","#6B85AE","#8095B8","#97A9C6","#ACB9CD","#B8C7DE","#D5DFF0"],
+ color: ["#1E80FF", "#00C2FF","#6B6FFF","#38C275","#F3BC1B","#ED6B5A","#FF9845","#74839D","#ACB9CD","#CAD0DA"],
padding: [5, 5, 5, 5],
dataLabel: true,
enableScroll: false,
title: {
- name: _this.carNumAll,
+ name:'盈足',
fontSize: 16,
color: "#341D00"
},
@@ -64,15 +66,15 @@ export default {
show: true,
position: "bottom",
lineHeight: 25,
- float: 'center'
+ float: 'left'
},
extra: {
ring: {
- ringWidth: 12,
+ ringWidth: 20,
activeOpacity: 0.5,
activeRadius: 10,
- offsetAngle: 0,
+ offsetAngle: -45,
labelWidth: 15,
border: false,
borderWidth: 3,
@@ -80,7 +82,27 @@ export default {
}
}
});
+ setTimeout( ()=>{
+ this.canvasToTempImage('fillDegree')
+ },2000)
},
+ 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.fillDegreePath = base64
+ }
+ })
+ }
+ }
+ },this)
+ },
}
}
@@ -98,4 +120,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/commercialBI/components/guest/businessType.vue b/pages/commercialBI/components/guest/businessType.vue
index 4d8903c..5ffcaa8 100644
--- a/pages/commercialBI/components/guest/businessType.vue
+++ b/pages/commercialBI/components/guest/businessType.vue
@@ -23,7 +23,7 @@ export default {
watch: {
data: {
handler(value) {
- console.log('carDatawatch', value)
+ console.log('fdjsfhsdjkf',value)
this.handleCarData(value)
}
}
@@ -47,11 +47,11 @@ export default {
width: _this.width,
height: 180,
series: data.series,
- animation: true,
+ animation: false,
rotate: false,
rotateLock: false,
background: "#FFFFFF",
- color: ["#1E80FF", "#456497","#748AAE","#ACB9CD","#CAD0DA","#E5E8EF"],
+ color: ["#1E80FF", "#00C2FF","#6B6FFF","#38C275","#74839D","#B8C7DE"],
padding: [5, 5, 5, 5],
dataLabel: false,
enableScroll: false,
@@ -64,10 +64,10 @@ export default {
},
extra: {
ring: {
- ringWidth: 12,
+ ringWidth: 20,
activeOpacity: 0.5,
activeRadius: 10,
- offsetAngle: 0,
+ offsetAngle: -45,
labelWidth: 15,
border: false,
borderWidth: 3,
@@ -88,4 +88,4 @@ export default {
height: 170px;
}
}
-
\ No newline at end of file
+
diff --git a/pages/commercialBI/components/guest/consumPrefer.vue b/pages/commercialBI/components/guest/consumPrefer.vue
index f83f624..d3a49c5 100644
--- a/pages/commercialBI/components/guest/consumPrefer.vue
+++ b/pages/commercialBI/components/guest/consumPrefer.vue
@@ -25,7 +25,6 @@ export default {
watch: {
data: {
handler(value) {
- console.log('carDatawatch', value)
this.handleCarData(value)
}
}
@@ -33,6 +32,7 @@ export default {
methods: {
// 处理传入的数据
handleCarData(value) {
+ console.log('value11111',value)
let res = value
this.drawCharts('prefer', res)
},
@@ -69,7 +69,7 @@ export default {
gridColor: "#CCCCCC",
gridCount: 3,
opacity: 0.2,
- max: 200,
+ max: data.max,
labelShow: true,
border: true
}
@@ -103,10 +103,10 @@ export default {
\ No newline at end of file
+
diff --git a/pages/commercialBI/components/guest/consumptionLevel.vue b/pages/commercialBI/components/guest/consumptionLevel.vue
index c5b54e3..b033dba 100644
--- a/pages/commercialBI/components/guest/consumptionLevel.vue
+++ b/pages/commercialBI/components/guest/consumptionLevel.vue
@@ -6,23 +6,24 @@
{{item.name}}