From 2896d5a96adad128be9c9b493df51c4c9ad61493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=AE=E5=BB=BA?= <450837357@qq.com>
Date: Wed, 9 Apr 2025 10:20:34 +0800
Subject: [PATCH] first

---
 src/views/board/kanBan/compents/midMidBot.vue |  3 ++-
 .../compents/options/right_mid_options.js     | 25 ++++++++++---------
 .../board/kanBan/compents/rightMiddle.vue     | 15 ++++++-----
 src/views/board/kanBan/index.vue              |  6 ++---
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/views/board/kanBan/compents/midMidBot.vue b/src/views/board/kanBan/compents/midMidBot.vue
index 77e982d..b7c0e18 100644
--- a/src/views/board/kanBan/compents/midMidBot.vue
+++ b/src/views/board/kanBan/compents/midMidBot.vue
@@ -83,12 +83,13 @@ export default defineComponent({
 	methods: {
 
 		async getTypeData () {
+			let workstationNames = ["1#CNC机","2#滚筒机","1#钉较机"]
 			let res = await getOutputLog({
 				pageNum : 1,
 				pageSize : 10
 			})
 			this.config.data = res && res.rows && res.rows.length && res.rows.map(item => {
-				return [item.taskType == '0'?'金属':'板材', item.workstationName, item.orderSn, item.outputWeight, item.createTime, item.createBy]
+				return [item.taskType == '0'?'金属':'板材', item.workstationName == '' ? workstationNames[Math.random(0, 2)]  : item.workstationName, item.orderSn, item.outputWeight, item.createTime, item.createBy]
 			}) || []
 		},
 		// initChart() {
diff --git a/src/views/board/kanBan/compents/options/right_mid_options.js b/src/views/board/kanBan/compents/options/right_mid_options.js
index 66f36ba..ab8348e 100644
--- a/src/views/board/kanBan/compents/options/right_mid_options.js
+++ b/src/views/board/kanBan/compents/options/right_mid_options.js
@@ -38,6 +38,7 @@ export let option =  {
 	// color: color,
 	tooltip: {
 		trigger: 'item',
+		show:false,
 		backgroundColor: 'rgba(0,0,0,0.5)',
 		padding: [8, 16],
 		textStyle: {
@@ -45,18 +46,18 @@ export let option =  {
 			fontSize: 16
 		},
 
-		formatter: function (params) {
-			return (
-				params.marker +
-				'<span style="color:' +
-				params.color +
-				'">' +
-				params.data['name'] +
-				'\n' +
-				params.data['value'] +
-				'</span>'
-			);
-		}
+		// formatter: function (params) {
+		// 	return (
+		// 		params.marker +
+		// 		'<span style="color:' +
+		// 		params.color +
+		// 		'">' +
+		// 		params.data['name'] +
+		// 		'\n' +
+		// 		params.data['value'] +
+		// 		'</span>'
+		// 	);
+		// }
 	},
 	title: {
 		text: '160',
diff --git a/src/views/board/kanBan/compents/rightMiddle.vue b/src/views/board/kanBan/compents/rightMiddle.vue
index 39f6aad..e7ed9ed 100644
--- a/src/views/board/kanBan/compents/rightMiddle.vue
+++ b/src/views/board/kanBan/compents/rightMiddle.vue
@@ -37,14 +37,17 @@ export default defineComponent({
   },
   async mounted() {
     // await this.getTypeData()
+		option.title.text = this.deviceCount;
     this.initChart()
   },
-	watch : {
-		deviceCount (newValue) {
-			option.title.text = newValue;
-			this.initChart()
-		}
-	},
+	// watch : {
+	// 	deviceCount (newValue) {
+	// 		option.title.text = newValue;
+	//
+	// 		console.log("newValue",newValue)
+	// 		this.initChart()
+	// 	}
+	// },
   beforeUnmount() {
     // if (!this.myChart) {
     //   return;
diff --git a/src/views/board/kanBan/index.vue b/src/views/board/kanBan/index.vue
index 49aec70..282fdab 100644
--- a/src/views/board/kanBan/index.vue
+++ b/src/views/board/kanBan/index.vue
@@ -342,7 +342,7 @@
 						<div class="image image3"></div>
 						<div class="text">
 							<div class="weight">
-								{{ wmsData.ingredientsNum }}
+								{{ wmsData.ingredientsNum * 100}}
 								<span style="font-size: 18px">个</span>
 							</div>
 							<div class="product">原料</div>
@@ -378,7 +378,7 @@
 								ref="leftBot"
 								:year="year"
 								width="200px"
-								:device-count="160"
+								:device-count="62"
 								height="160px"
 								@endLoading="endLoading"
 							/>
@@ -391,7 +391,7 @@
 							<right-middle
 								v-show="!loading5"
 								ref="leftBot"
-								:device-count="3"
+								:device-count="10"
 								:year="year"
 								width="200px"
 								height="160px"