From 986d1ea05b6917bfc650638202c54087e656cca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 7 May 2025 14:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/package-lock.json | 27 +++++ ant-design-vue-jeecg/package.json | 1 + .../src/components/ChartCard.vue | 2 +- .../src/views/dashboard/Analysis.vue | 4 +- .../src/views/dashboard/Delivery.vue | 91 +++++++++++++++ .../src/views/dashboard/IndexChart.vue | 110 +++++++++++++----- .../src/views/dashboard/Vehicle.vue | 91 +++++++++++++++ 7 files changed, 294 insertions(+), 32 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/dashboard/Delivery.vue create mode 100644 ant-design-vue-jeecg/src/views/dashboard/Vehicle.vue diff --git a/ant-design-vue-jeecg/package-lock.json b/ant-design-vue-jeecg/package-lock.json index 8ad154f..6df72da 100644 --- a/ant-design-vue-jeecg/package-lock.json +++ b/ant-design-vue-jeecg/package-lock.json @@ -39,6 +39,7 @@ "vue-photo-preview": "^1.1.3", "vue-print-nb-jeecg": "^1.0.12", "vue-router": "^3.0.1", + "vue-seamless-scroll": "^1.1.23", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", "vuex": "^3.1.0", @@ -7655,6 +7656,11 @@ "ms": "2.0.0" } }, + "node_modules/comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -21558,6 +21564,14 @@ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz", "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg==" }, + "node_modules/vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmjs.org/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "dependencies": { + "comutils": "^1.1.9" + } + }, "node_modules/vue-splitpane": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/vue-splitpane/-/vue-splitpane-1.0.6.tgz", @@ -29189,6 +29203,11 @@ } } }, + "comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -40484,6 +40503,14 @@ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz", "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg==" }, + "vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmjs.org/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "requires": { + "comutils": "^1.1.9" + } + }, "vue-splitpane": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/vue-splitpane/-/vue-splitpane-1.0.6.tgz", diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 89557ce..6d9fd18 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -41,6 +41,7 @@ "vue-photo-preview": "^1.1.3", "vue-print-nb-jeecg": "^1.0.12", "vue-router": "^3.0.1", + "vue-seamless-scroll": "^1.1.23", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", "vuex": "^3.1.0", diff --git a/ant-design-vue-jeecg/src/components/ChartCard.vue b/ant-design-vue-jeecg/src/components/ChartCard.vue index a03b31d..655d993 100644 --- a/ant-design-vue-jeecg/src/components/ChartCard.vue +++ b/ant-design-vue-jeecg/src/components/ChartCard.vue @@ -31,7 +31,7 @@ default: '' }, total: { - type: String, + type: String | Number, default: '' }, loading: { diff --git a/ant-design-vue-jeecg/src/views/dashboard/Analysis.vue b/ant-design-vue-jeecg/src/views/dashboard/Analysis.vue index 2e16b22..de5a28f 100644 --- a/ant-design-vue-jeecg/src/views/dashboard/Analysis.vue +++ b/ant-design-vue-jeecg/src/views/dashboard/Analysis.vue @@ -1,7 +1,7 @@ diff --git a/ant-design-vue-jeecg/src/views/dashboard/Delivery.vue b/ant-design-vue-jeecg/src/views/dashboard/Delivery.vue new file mode 100644 index 0000000..9fffc60 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/dashboard/Delivery.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue b/ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue index 60ac1f5..a628d23 100644 --- a/ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue +++ b/ant-design-vue-jeecg/src/views/dashboard/IndexChart.vue @@ -2,11 +2,11 @@
- + -
+ - + -
+ - + -
+ - + -
+ @@ -67,39 +67,41 @@
-
+ + +
- + - - + + + - + - + - - + + - +
- +
@@ -149,6 +151,10 @@ import Trend from '@/components/Trend' import { getLoginfo,getVisitInfo } from '@/api/api' + import { getAction } from '@/api/manage' + import moment from 'dayjs' + import Vehicle from './Vehicle.vue' + import Delivery from './Delivery.vue' const rankList = [] for (let i = 0; i < 7; i++) { @@ -177,10 +183,16 @@ Bar, Trend, LineChartMultid, - HeadInfo + HeadInfo, + Vehicle, + Delivery }, data() { return { + model: {}, + param: [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')], + VehicleList: [], + DeliveryList: [], loading: true, center: null, rankList, @@ -188,10 +200,17 @@ loginfo:{}, visitFields:['ip','visit'], visitInfo:[], - indicator: + indicator: , + url:{ + getCount: '/vehicleinout/vehicleInOut/getCount', + getVehicle: '/vehicleinout/vehicleInOut/getVehicle', + getDelivery: '/deliverydemand/deliveryDemand/getDelivery' + } } }, created() { + this.getCount(); + this.getVehicleDelivery(); setTimeout(() => { this.loading = !this.loading }, 1000) @@ -213,6 +232,39 @@ } }) }, + getCount(){ + getAction(this.url.getCount).then(res => { + if (res.success) { + this.model = res.result; + } + }) + }, + getVehicleDelivery(){ + if (!this.param[0] || !this.param[1]) { + this.$message.warn("时间不能为空"); + return; + } + let vehicleParam = { + beginDate: this.param[0], + endDate: this.param[1] + } + this.getVehicle(vehicleParam); + this.getDelivery(vehicleParam); + }, + getVehicle(vehicleParam){ + getAction(this.url.getVehicle, vehicleParam).then(res => { + if (res.success) { + this.VehicleList = res.result.records; + } + }) + }, + getDelivery(vehicleParam){ + getAction(this.url.getDelivery, vehicleParam).then(res => { + if (res.success) { + this.DeliveryList = res.result.records; + } + }) + } } } diff --git a/ant-design-vue-jeecg/src/views/dashboard/Vehicle.vue b/ant-design-vue-jeecg/src/views/dashboard/Vehicle.vue new file mode 100644 index 0000000..2e281c0 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/dashboard/Vehicle.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file