From 4da0436c701569718c12af77269a43c0d875b039 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sat, 28 Jan 2023 08:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/supervise/thresholdanalysis.js | 24 +-
base-ui/src/router/index.js | 6 +
base-ui/src/views/reportCenter/goodsOnWay.vue | 178 +++--------
.../src/views/reportCenter/salesReport.vue | 127 ++------
base-ui/src/views/risk/thresholdAnalysis.vue | 301 +++++++++---------
5 files changed, 245 insertions(+), 391 deletions(-)
diff --git a/base-ui/src/api/supervise/thresholdanalysis.js b/base-ui/src/api/supervise/thresholdanalysis.js
index f4d3e174..d72e4338 100644
--- a/base-ui/src/api/supervise/thresholdanalysis.js
+++ b/base-ui/src/api/supervise/thresholdanalysis.js
@@ -1,16 +1,20 @@
import request from '@/utils/request'
-// 库房提供的采购订单表
+// 阀值分析表
export default {
-
- // 查询分页列表
- listPage: function(params) {
+ initData(data) {
return request({
url: '/risk/getThresholdAnalysis',
- method: 'post',
- data: params,
- headers: { 'Content-Type': 'application/json' }
+ method: 'get',
+ params: data
})
- }
-
-
+ },
+
+ initData2(data) {
+ return request({
+ url: '/reportCenter/getTest',
+ method: 'get',
+ params: data
+ })
+ },
+
}
diff --git a/base-ui/src/router/index.js b/base-ui/src/router/index.js
index 3b3d0b4d..aca98c3d 100644
--- a/base-ui/src/router/index.js
+++ b/base-ui/src/router/index.js
@@ -209,6 +209,12 @@ export const constantRoutes = [
component: () => import('@/views/reportCenter/goodsOnWay.vue'),
name: 'goodsOnWay',
meta: {title: '在途商品管理表',noCache: true}
+ },
+ {
+ path: '/reportCenter/test',
+ component: () => import('@/views/reportCenter/test.vue'),
+ name: 'test',
+ meta: {titcle: '测试数据',noCache: true}
}
]
},
diff --git a/base-ui/src/views/reportCenter/goodsOnWay.vue b/base-ui/src/views/reportCenter/goodsOnWay.vue
index 0d252811..2a3f3a05 100644
--- a/base-ui/src/views/reportCenter/goodsOnWay.vue
+++ b/base-ui/src/views/reportCenter/goodsOnWay.vue
@@ -29,10 +29,14 @@
- •订单总额{{listGoodsOnWays.orderAmount}}
- •实际到货价值{{listGoodsOnWays.arrivedGoodsValue}}
- •在途货价值{{listGoodsOnWays.onWayGoodsValue}}
- •超出价值{{listGoodsOnWays.exceedGoodsValue}}
+ •订单总额{{listGoodsOnWays.orderAmount}}
+ •实际到货价值{{listGoodsOnWays.arrivedGoodsValue}}
+ •在途货价值{{listGoodsOnWays.onWayGoodsValue}}
+ •超出价值{{listGoodsOnWays.exceedGoodsValue}}
@@ -97,131 +101,17 @@
date: "",
},
nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(),
- listGoodsOnWays: {
- orderAmount: "",
- arrivedGoodsValue: "",
- onWayGoodsValue: "",
- exceedGoodsValue: "",
- },
- listArrivedEarlyWarning: [{
- num: '1',
- supplierName: '中粮可口可乐饮料(河北)有限公司',
- allArrivedDate: '2022.12.29',
- isDelay: '是'
- },
- {
- num: '2',
- supplierName: '中顺洁柔纸业股份有限公司',
- allArrivedDate: '2022.12.27',
- isDelay: '否'
- },
- {
- num: '3',
- supplierName: '今麦郎食品股份有限公司石家庄分公司',
- allArrivedDate: '2022.12.23',
- isDelay: '否'
- },
- {
- num: '4',
- supplierName: '农夫山泉股份有限公司',
- allArrivedDate: '2022.12.25',
- isDelay: '是'
- },
- {
- num: '5',
- supplierName: '北京百事可乐饮料有限公司',
- allArrivedDate: '2022.12.12',
- isDelay: '否'
- },
- {
- num: '6',
- supplierName: '今麦郎食品股份有限公司石家庄分公司',
- allArrivedDate: '2022.12.02',
- isDelay: '是'
- },
- {
- num: '7',
- supplierName: '农夫山泉股份有限公司',
- allArrivedDate: '2022.12.09',
- isDelay: '否'
- },
- {
- num: '8',
- supplierName: '北京百事可乐饮料有限公司',
- allArrivedDate: '2022.12.20',
- isDelay: '是'
- },
- ],
- analysisChartData: {
- legend: {
- top: 'bottom'
- },
- toolbox: {
- show: true,
- feature: {
- mark: {
- show: true
- },
- // 数据图标
- dataView: {
- show: false,
- readOnly: false
- },
- // 刷新图标
- restore: {
- show: false
- },
- // 下载图标
- saveAsImage: {
- show: false
- }
- }
- },
- series: [{
- name: 'Nightingale Chart',
- type: 'pie',
- radius: [30, 150],
- center: ['50%', '50%'],
- roseType: 'area',
- itemStyle: {
- borderRadius: 8
- },
- data: [{
- "value": 2313123,
- "name": "订单总额"
- },
- {
- "value": 4359354,
- "name": "实际到货价值"
- },
- {
- "value": 2313123,
- "name": "在途货价值"
- },
- {
- "value": 2313123,
- "name": "超出价值"
- }
- ]
- }]
- }
+ listGoodsOnWays: {},
+ listArrivedEarlyWarning: [],
}
},
created() {
// 初始化变量
- console.log('33333')
this.loadList()
},
- // beforeDestroy() {
- // if (this.myCharta) {
- // this.myCharta.dispose()
- // this.myCharta = null
- // }
- // },
mounted() {
// 初始化按钮
this.$refs['btnbar'].setButtonList(this.btnList)
- //
},
methods: {
// 搜索条件效果
@@ -249,15 +139,14 @@
loadList() {
this.tableLoading = true
let _this = this
- console.log('22222')
+ console.log('22222')
req.initData(_this.queryParams).then((resp) => {
if (resp.success) {
console.log('1111', resp.data)
const data = resp.data
_this.listGoodsOnWays = data.listGoodsOnWays
_this.listArrivedEarlyWarning = data.listArrivedEarlyWarning
- _this.analysisChartData = data.analysisChartData
- this.drawLine()
+ this.drawLine(data.analysisChartData)
this.tableLoading = false
} else {
@@ -271,12 +160,49 @@
})
},
// 饼状图图初始化
- drawLine() {
+ drawLine(obj) {
+
// 基于准备好的dom,初始化echarts实例
var myChart = echarts.init(document.getElementById('main'));
// 绘制图表
- console.log('option', this.analysisChartData)
- myChart.setOption(this.analysisChartData);
+ console.log('option', obj)
+ myChart.setOption({
+ legend: {
+ top: 'bottom'
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: {
+ show: true
+ },
+ // 数据图标
+ dataView: {
+ show: false,
+ readOnly: false
+ },
+ // 刷新图标
+ restore: {
+ show: false
+ },
+ // 下载图标
+ saveAsImage: {
+ show: false
+ }
+ }
+ },
+ series: [{
+ name: 'Nightingale Chart',
+ type: 'pie',
+ radius: [30, 150],
+ center: ['50%', '50%'],
+ roseType: 'area',
+ itemStyle: {
+ borderRadius: 8
+ },
+ data: obj
+ }]
+ })
},
dosearch() {
diff --git a/base-ui/src/views/reportCenter/salesReport.vue b/base-ui/src/views/reportCenter/salesReport.vue
index dd4445a9..6496d5ae 100644
--- a/base-ui/src/views/reportCenter/salesReport.vue
+++ b/base-ui/src/views/reportCenter/salesReport.vue
@@ -56,35 +56,10 @@
-
-