+
-
@@ -55,26 +55,47 @@
],
options1: {
title: '某商店近年营业总额',
- bgColor: '#009688',
- titleColor: '#ffffff',
- fillColor: '#e0f2f1',
- axisColor: '#ffffff',
- contentColor: '#999'
+ autoWidth: true, // 设置宽高自适应
+ showValue: false,
+ bgColor: '#F9EFCC',
+ fillColor: '#00887C',
+ contentColor: 'rgba(46,199,201,0.3)',
+ yEqual: 7
},
options2: {
+ title: '某商店近年营业总额',
+ bgColor: '#D5E4EB',
+ titleColor: '#00887C',
+ fillColor: 'red',
+ contentColor: 'rgba(46,199,201,0.3)'
+ },
+ options3: {
+ title: '某商店各商品年度销量',
+ bgColor: '#829dca',
+ titleColor: '#ffffff',
+ legendColor: '#ffffff',
+ radius: 120
+ },
+ options4: {
title: '某商店各商品年度销量',
- bgColor: '#607d8b',
+ bgColor: '#829daa',
titleColor: '#ffffff',
- legendColor: '#ffffff'
+ legendColor: '#ffffff',
+ radius: 120,
+ innerRadius:80
}
})
}
```
### element-ui ###
From d2b0a2e777f9c65bbc8f8a2377f8ecb95ffa1d2f Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Fri, 31 Aug 2018 09:34:54 +0800
Subject: [PATCH 11/92] =?UTF-8?q?'=E6=9B=B4=E6=96=B0package-lock.json'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index 5c07e468..e3a0be5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6007,7 +6007,7 @@
"integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==",
"dev": true,
"requires": {
- "url-parse": "1.4.1"
+ "url-parse": "1.4.3"
}
},
"os-browserify": {
From 77b67eedb96777e799a277fcafd3d6636c0c8349 Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Fri, 31 Aug 2018 09:37:35 +0800
Subject: [PATCH 12/92] =?UTF-8?q?'=E6=9B=B4=E6=96=B0package-lock.json'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e3a0be5e..8980750e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9345,7 +9345,7 @@
"faye-websocket": "0.11.1",
"inherits": "2.0.3",
"json3": "3.3.2",
- "url-parse": "1.4.1"
+ "url-parse": "1.4.3"
},
"dependencies": {
"faye-websocket": {
@@ -10065,8 +10065,8 @@
}
},
"url-parse": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz",
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
"integrity": "sha512-x95Td74QcvICAA0+qERaVkRpTGKyBHHYdwL2LXZm5t/gBtCB9KQSO/0zQgSTYEV1p0WcvSg79TLNPSvd5IDJMQ==",
"dev": true,
"requires": {
From 38a5d315aa8f369aaf032e222918a36d8d2cdc8c Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Mon, 10 Sep 2018 11:17:53 +0800
Subject: [PATCH 13/92] =?UTF-8?q?'=E8=B0=83=E6=95=B4table=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/page/BaseTable.vue | 19 +++++++++++++------
static/css/main.css | 4 ++--
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/components/page/BaseTable.vue b/src/components/page/BaseTable.vue
index 7961f5e5..a71b2347 100644
--- a/src/components/page/BaseTable.vue
+++ b/src/components/page/BaseTable.vue
@@ -15,23 +15,23 @@
搜索