From fce93bddd4a984c9f06d1f5de9b10ac46b83fd98 Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Wed, 31 Jul 2024 10:50:24 +0800
Subject: [PATCH] =?UTF-8?q?30=E5=A4=A9=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/json/1.json    | 40 +++++++-----------
 src/pages/json/2.json    | 33 ---------------
 src/pages/workReport.vue | 91 ++++++++++------------------------------
 3 files changed, 37 insertions(+), 127 deletions(-)
 delete mode 100644 src/pages/json/2.json

diff --git a/src/pages/json/1.json b/src/pages/json/1.json
index 83e162e..96781fb 100644
--- a/src/pages/json/1.json
+++ b/src/pages/json/1.json
@@ -1,16 +1,10 @@
 {
-	"expend":{
-		"categories": [
-			"1月",
-			"2月",
-			"2月",
-			"4月",
-			"5月"
-		],
+	"sumNumber":{
+		"categories": [],
 		"series": [
 			{
-				"name": "支出情况",
-				"data": [1201,2501.5,985,1760,2013.85],
+				"name": "总数",
+				"data": [],
 				"type": "line",
 				"style": "curve",
 				"color": "#4ECDB6",
@@ -18,21 +12,15 @@
 			}
 		],
 		"yAxis":[
-			{"calibration":true,"position":"left","title":"单位/元","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
+			{"calibration":true,"position":"left","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
 		]
 	},
-	"income":{
-		"categories": [
-			"1月",
-			"2月",
-			"2月",
-			"4月",
-			"5月"
-		],
+	"totalQualityNumber":{
+		"categories": [],
 		"series": [
 			{
-				"name": "收入情况",
-				"data": [1601,1840.5,1900,1760,1500.85],
+				"name": "合格数",
+				"data": [],
 				"type": "line",
 				"style": "curve",
 				"color": "#4ECDB6",
@@ -40,10 +28,10 @@
 			}
 		],
 		"yAxis":[
-			{"calibration":true,"position":"left","title":"单位/元","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
+			{"calibration":true,"position":"left","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
 		]
 	},
-	"remaining":{
+	"totalWasteNumber":{
 		"categories": [
 			"1月",
 			"2月",
@@ -53,8 +41,8 @@
 		],
 		"series": [
 			{
-				"name": "结余情况",
-				"data": [815,712.5,378,450,600.85],
+				"name": "废品数",
+				"data": [],
 				"type": "line",
 				"style": "curve",
 				"color": "#4ECDB6",
@@ -62,7 +50,7 @@
 			}
 		],
 		"yAxis":[
-			{"calibration":true,"position":"left","title":"单位/元","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
+			{"calibration":true,"position":"left","titleFontSize":12,"unit":"","tofix":0,"min":0,"disableGrid":true}
 		]
 	}
 }
\ No newline at end of file
diff --git a/src/pages/json/2.json b/src/pages/json/2.json
deleted file mode 100644
index 1d899cf..0000000
--- a/src/pages/json/2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"series": [
-		{
-			"data":[
-				{
-					"name": "住房相关",
-					"value": 3200,
-					"color":"#4DCCB3"
-				}, 
-				{
-					"name": "食品酒水",
-					"value": 1020,
-					"color":"#5A77EC"
-				}, 
-				{
-					"name": "娱乐休闲",
-					"value": 500,
-					"color":"#4E94EC"
-				},
-				{
-					"name": "交流通讯",
-					"value": 214.5,
-					"color":"#4FD4EB"
-				},
-				{
-					"name": "其他",
-					"value": 320.13,
-					"color":"#B5ED21"
-				} 
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/src/pages/workReport.vue b/src/pages/workReport.vue
index d63c99c..b03967f 100644
--- a/src/pages/workReport.vue
+++ b/src/pages/workReport.vue
@@ -55,8 +55,8 @@
 				</view>
 				<view class="charts-box" style="height: 200px;">
 					<qiun-data-charts type="line" canvasId="finance_a" :canvas2d="isCanvas2d" :reshow="delayload"
-						:opts="{ xAxis: { itemCount: 12, disableGrid: true }, yAxis: { disableGrid: true, data: [{ disabled: true }] } }"
-						:chartData="historyData" />
+						:opts="{ xAxis: { itemCount: historyData.length, disableGrid: true,  labelCount: 5 }, yAxis: { disableGrid: true, data: [{ disabled: true }] } }"
+						:chartData="historyData"/>
 				</view>
 			</view>
       <view class="row_block">
@@ -99,8 +99,7 @@
 
 <script setup>
 import dataOne from '@/pages/json/1.json';
-import expendDetail from '@/pages/json/2.json';
-import {getDayReportTime, getLastMonthSum, getReportTime, getSumReportTime, getThisMonthSum} from "@/api/mes/report";
+import { getDayReportTime, getLastMonthSum, getReportTime, getSumReportTime, getThisMonthSum } from "@/api/mes/report";
 import useUserStore from "@/store/modules/user";
 import Config from '@/pages/js/config'
 import { ref } from 'vue';
@@ -120,7 +119,7 @@ const isCanvas2d = ref(Config.ISCANVAS2D)
 let expendCount = 0;
 let delayload = ref(false);
 let historyData = ref({});
-const reportTime = ref({})
+const reportTime = ref([])
 const lastMonthSum = ref({});
 const thisMonthSum = ref({});
 const sumReportTime = ref({})
@@ -145,7 +144,8 @@ const historyBtn = ref([
 ]);
 
 const filterHistoryData = () => {
-  let type = historyBtn.value.filter(x => x.state == 1)[0].type;
+  getReportTimeList()
+  let type = historyBtn.value.filter(x => x.state === 1)[0].type;
   switch (type) {
     case "sumNumber":
       historyData.value = dataOne.sumNumber;
@@ -158,19 +158,7 @@ const filterHistoryData = () => {
       break;
   }
 }
-const getData =()=> {
-    filterHistoryData();
-    for (let i = 0; i < expendDetail.series.length; i++) {
-      expendDetail.series[i].format = "pieDemo";
-    }
-    let length = expendDetail.series[0].data.length;
-    for (let i = 0; i < length; i++) {
-      expendCount += expendDetail.series[0].data[i].value;
-    }
-    setTimeout(() => {
-      delayload.value = true;
-    }, 1000);
-  }
+
 const  changeHistoryBtn = (type) => {
     for (let i = 0; i < historyBtn.value.length; i++) {
       if (historyBtn.value[i].type === type) {
@@ -185,6 +173,20 @@ const  changeHistoryBtn = (type) => {
 const getReportTimeList = ()=>{
   getReportTime(userId.value).then(response => {
     reportTime.value = response.data;
+    dataOne.sumNumber.categories = []
+    dataOne.sumNumber.series[0].data = []
+    dataOne.totalQualityNumber.categories = []
+    dataOne.totalQualityNumber.series[0].data = []
+    dataOne.totalWasteNumber.categories = []
+    dataOne.totalWasteNumber.series[0].data = []
+    reportTime.value.forEach(item=>{
+      dataOne.sumNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
+      dataOne.sumNumber.series[0].data.push(item.sumNumber)
+      dataOne.totalQualityNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
+      dataOne.totalQualityNumber.series[0].data.push(item.totalQualityNumber)
+      dataOne.totalWasteNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
+      dataOne.totalWasteNumber.series[0].data.push(item.totalWasteNumber)
+    })
   });
 }
 
@@ -217,12 +219,12 @@ const getDayReportTimeList = ()=>{
 }
 
 onLoad(() => {
-  getData();
+  filterHistoryData()
   getReportTimeList()
   getLastMonthSumList()
   getThisMonthSumList()
   getSumReportTimeList()
-  getDayReportTimeList();
+  getDayReportTimeList()
 });
 </script>
 
@@ -262,53 +264,6 @@ onLoad(() => {
 			}
 		}
 
-		.extend_message {
-			margin-top: 20rpx;
-			color: #ccc;
-			display: flex;
-
-			text {
-				color: #ff9900;
-			}
-		}
-
-		.level_bar {
-			width: 100%;
-			height: 40rpx;
-			border-radius: 40rpx;
-			overflow: hidden;
-			display: flex;
-			color: #ccc;
-			font-size: 20rpx;
-			text-align: right;
-			line-height: 40rpx;
-
-			view {
-				border-right: 2rpx solid #fff;
-				position: relative;
-			}
-
-			.name {
-				position: absolute;
-				top: -30rpx;
-				right: -40rpx;
-			}
-
-			.range {
-				position: absolute;
-				bottom: 30rpx;
-				right: -40rpx;
-			}
-
-			.default_bar {
-				background-color: #A0DFCD;
-			}
-
-			.active_bar {
-				background-color: #02AE7A;
-			}
-		}
-
 		.right_btn {
 			float: right;
 			display: flex;