diff --git a/resources/frontend/src/views/Login.vue b/resources/frontend/src/views/Login.vue index 057b767..c98f9cc 100644 --- a/resources/frontend/src/views/Login.vue +++ b/resources/frontend/src/views/Login.vue @@ -1,209 +1,206 @@ diff --git a/resources/frontend/src/views/dataCenter/gmvStatistics.vue b/resources/frontend/src/views/dataCenter/gmvStatistics.vue index 303da24..f4a1a19 100644 --- a/resources/frontend/src/views/dataCenter/gmvStatistics.vue +++ b/resources/frontend/src/views/dataCenter/gmvStatistics.vue @@ -260,10 +260,10 @@ export default { this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD') } else if(this.time_type == 'seven') { this.endTime = this.dayValue - this.startTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD') + this.startTime = dayjs(this.dayValue).subtract(7, 'day').format('YYYY-MM-DD') } else if(this.time_type == 'thirty') { this.endTime = this.dayValue - this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD') + this.startTime = dayjs(this.dayValue).subtract(30, 'day').format('YYYY-MM-DD') } this.fetchData() }, diff --git a/resources/frontend/src/views/dataCenter/lossStatistics.vue b/resources/frontend/src/views/dataCenter/lossStatistics.vue index 201365c..6ee1c55 100644 --- a/resources/frontend/src/views/dataCenter/lossStatistics.vue +++ b/resources/frontend/src/views/dataCenter/lossStatistics.vue @@ -2,72 +2,286 @@
- - - - - +
@@ -91,5 +305,8 @@ export default { font-size: 12px; } } + .echartBox{ + width: 100%; + height: 480px; + } - \ No newline at end of file diff --git a/resources/frontend/src/views/dataCenter/skuStatistics.vue b/resources/frontend/src/views/dataCenter/skuStatistics.vue index b5e37d1..fde76a8 100644 --- a/resources/frontend/src/views/dataCenter/skuStatistics.vue +++ b/resources/frontend/src/views/dataCenter/skuStatistics.vue @@ -2,7 +2,7 @@
@@ -74,8 +84,7 @@
- - + @@ -106,6 +115,7 @@ diff --git a/resources/frontend/src/views/goods/combination.vue b/resources/frontend/src/views/goods/combination.vue index b510d67..d0dbece 100644 --- a/resources/frontend/src/views/goods/combination.vue +++ b/resources/frontend/src/views/goods/combination.vue @@ -89,9 +89,7 @@ ]"> - +
- 商品种类: + 商品品种:
- 规格编码: + 商品编码:
@@ -35,7 +35,7 @@ - + @@ -58,7 +58,7 @@
- + diff --git a/resources/frontend/src/views/supplyChain/lossRecord.vue b/resources/frontend/src/views/supplyChain/lossRecord.vue index 1be7a4b..b1d864f 100644 --- a/resources/frontend/src/views/supplyChain/lossRecord.vue +++ b/resources/frontend/src/views/supplyChain/lossRecord.vue @@ -7,7 +7,7 @@
- 规格编码: + 商品编码:
@@ -35,7 +35,7 @@ - + @@ -74,7 +74,7 @@
- + @@ -100,7 +100,7 @@ - + diff --git a/resources/frontend/src/views/supplyChain/procureLog.vue b/resources/frontend/src/views/supplyChain/procureLog.vue index e440dcc..8a30f1d 100644 --- a/resources/frontend/src/views/supplyChain/procureLog.vue +++ b/resources/frontend/src/views/supplyChain/procureLog.vue @@ -7,7 +7,7 @@
- 规格编码: + 商品编码:
@@ -35,7 +35,7 @@ - + @@ -84,7 +84,7 @@
- + @@ -113,7 +113,7 @@ - +