diff --git a/package.json b/package.json
index 4e7f72f..066b8f7 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
"date-fns": "^2.14.0",
+ "echarts": "^5.5.0",
"enquire.js": "^2.1.6",
"file-saver": "^2.0.5",
"hevue-img-preview": "^6.1.0",
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index 8693509..ff4bc51 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -147,8 +147,7 @@ export default {
.page-content {
position: relative;
- padding: 24px 0 0;
-
+ // padding: 24px 0 0;
&.side {
}
diff --git a/src/pages/Middle/BaseWorkplace/custom/statistics.vue b/src/pages/Middle/BaseWorkplace/custom/statistics.vue
new file mode 100644
index 0000000..91aebf5
--- /dev/null
+++ b/src/pages/Middle/BaseWorkplace/custom/statistics.vue
@@ -0,0 +1,416 @@
+
+
+
+
+
+
+
+
+
+ 按年份
+
+
+ 按月份
+
+
+ 按本月
+
+
+ 按本周
+
+
+ 最近7天
+
+
+ 最近30天
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 按年份
+
+
+ 按月份
+
+
+ 按本月
+
+
+ 按本周
+
+
+ 最近7天
+
+
+ 最近30天
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/router/Middle/Base/BaseWorkplace/router.map.js b/src/router/Middle/Base/BaseWorkplace/router.map.js
index 9bec572..9002e00 100644
--- a/src/router/Middle/Base/BaseWorkplace/router.map.js
+++ b/src/router/Middle/Base/BaseWorkplace/router.map.js
@@ -31,11 +31,11 @@ const BaseWorkplaceRouterMap = {
BaseWorkplaceCustomStat: {
name: '货车列表',
icon: 'idcard',
- path: '/BaseWorkplace/BaseWorkplaceList',
+ path: '/BaseWorkplace/CustomStat',
meta: {
invisible: false, // 不在菜单中显示
},
- component: () => import('@/pages/Middle/transport/Truck/Truck/List'),
+ component: () => import('@/pages/Middle/BaseWorkplace/custom/statistics'),
authority: {
permission: ["BaseWorkplace", "BaseWorkplace-All", "BaseWorkplace-List"],
}
diff --git a/yarn.lock b/yarn.lock
index aa842be..c477e2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -990,6 +990,56 @@
resolved "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz"
integrity sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==
+"@form-create/ant-design-vue@^2.5.34":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/ant-design-vue/-/ant-design-vue-2.5.35.tgz#d541ef9b3b209abdbd1c7c4b63d0137ed147859e"
+ integrity sha512-XFABph6+utkXaQrCT2pMZWWAZ7T0S4ehRw8qArYUe9hQ22CAnJBgTtGb4QeUehP21qFfB8vSxHBthaeNxQ4Wmg==
+ dependencies:
+ "@form-create/component-antdv-frame" "^2.5.35"
+ "@form-create/component-antdv-group" "^2.5.35"
+ "@form-create/component-antdv-upload" "^2.5.35"
+ "@form-create/component-subform" "^2.5.25"
+ "@form-create/core" "^2.5.35"
+ "@form-create/utils" "^2.5.35"
+
+"@form-create/component-antdv-frame@^2.5.35":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/component-antdv-frame/-/component-antdv-frame-2.5.35.tgz#b07180f76754cf929c97cbe325ef786877fb565d"
+ integrity sha512-RTjrRqq1pEmbTRad48lDp+A+hCfFtLT8qoe7SFgDvChs16etl00ZZCllQK6q9iOY+jkBfUmtCSiGs4jS3hgq4A==
+ dependencies:
+ "@form-create/utils" "^2.5.35"
+
+"@form-create/component-antdv-group@^2.5.35":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/component-antdv-group/-/component-antdv-group-2.5.35.tgz#9a3d40ed45051406bcdfbf06dcfb49cae5bae54e"
+ integrity sha512-fxY3bmRmzlvod1xm0LwBCHLjD6PngwUQJu8uhRAQNdYilWG4Q4XoAEskVuk6t/WEaFRp+rnRaoksPkQEXqDk8g==
+ dependencies:
+ "@form-create/utils" "^2.5.35"
+
+"@form-create/component-antdv-upload@^2.5.35":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/component-antdv-upload/-/component-antdv-upload-2.5.35.tgz#f2bd9f8ef66344a7631f521beab43854b44586ab"
+ integrity sha512-bcgzSv+vKOKyH7QOwnLwofBHzA1meg9FUUsmVv8lWO3xcMDJTemEPOTh8HHsk7iCkJlxTgNEZDNvqBUd7o105A==
+ dependencies:
+ "@form-create/utils" "^2.5.35"
+
+"@form-create/component-subform@^2.5.25":
+ version "2.5.25"
+ resolved "https://registry.npmmirror.com/@form-create/component-subform/-/component-subform-2.5.25.tgz#92c8cfa7435edd16bb031a2d1ca407d2569fe391"
+ integrity sha512-puGWWxSOeII4y4mCNxrKF/eH4nY1AQAx87VchzErLmemwF6TtNBLBsJLCCmFAVLYn1koYU5nNu5Y2yG9s2CKlQ==
+
+"@form-create/core@^2.5.35":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/core/-/core-2.5.35.tgz#6e7c52268b9cb0e07af195d263024d24d37b1a0b"
+ integrity sha512-yAnV+kTURBHu+OR0xO2yWRDhFe+xA4ZTfdeOOjN/h9mMgDTZe4ebcAOgwL1ByV3RFnKC9bEjgtZVE52nBawZgg==
+ dependencies:
+ "@form-create/utils" "^2.5.35"
+
+"@form-create/utils@^2.5.35":
+ version "2.5.35"
+ resolved "https://registry.npmmirror.com/@form-create/utils/-/utils-2.5.35.tgz#236baea325a8f99e5b83b97aae3a2814ad7e57a3"
+ integrity sha512-uQcUGV0iBYHRX6Q9cZT5jLZmN6tn5d3MzzpSv4WD7hegzj0aDaLj7VTL+8F/xLFSjW0Yg+oo5TcHfFLjzqtlLA==
+
"@hapi/address@2.x.x":
version "2.1.4"
resolved "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz?cache=0&sync_timestamp=1584145510980&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40hapi%2Faddress%2Fdownload%2F%40hapi%2Faddress-2.1.4.tgz"
@@ -4208,6 +4258,14 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
+echarts@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz#c13945a7f3acdd67c134d8a9ac67e917830113ac"
+ integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==
+ dependencies:
+ tslib "2.3.0"
+ zrender "5.5.0"
+
ee-first@1.1.1, ee-first@~1.1.1:
version "1.1.1"
resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz"
@@ -10344,6 +10402,11 @@ ts-pnp@^1.1.6:
resolved "https://registry.npm.taobao.org/ts-pnp/download/ts-pnp-1.2.0.tgz"
integrity sha1-pQCtCEsHmPHDBxrzkeZZEshrypI=
+tslib@2.3.0:
+ version "2.3.0"
+ resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+ integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
tslib@^1.10.0, tslib@^1.9.0:
version "1.13.0"
resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.13.0.tgz?cache=0&sync_timestamp=1589411820927&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.13.0.tgz"
@@ -11476,3 +11539,10 @@ zepto@^1.2.0:
version "1.2.0"
resolved "https://registry.npm.taobao.org/zepto/download/zepto-1.2.0.tgz"
integrity sha1-4Se9nmb9hGvl6rSME5SIL3wOT5g=
+
+zrender@5.5.0:
+ version "5.5.0"
+ resolved "https://registry.npmmirror.com/zrender/-/zrender-5.5.0.tgz#54d0d6c4eda81a96d9f60a9cd74dc48ea026bc1e"
+ integrity sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==
+ dependencies:
+ tslib "2.3.0"