From 5e7cb579bba5f5b5d33c5b128e2516bcd62b0b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=AE=E5=BB=BA?= <450837357@qq.com>
Date: Tue, 8 Apr 2025 13:51:13 +0800
Subject: [PATCH] first

---
 src/views/board/kanBan/compents/midMidBot.vue | 78 +++++++++++++------
 .../board/kanBan/compents/midTopOther.vue     |  2 +-
 .../compents/options/right_top_options.js     |  8 +-
 src/views/board/kanBan/index.vue              | 36 ++++-----
 src/views/storage/stockControl/index.vue      |  6 +-
 5 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/src/views/board/kanBan/compents/midMidBot.vue b/src/views/board/kanBan/compents/midMidBot.vue
index adcb53b..77e982d 100644
--- a/src/views/board/kanBan/compents/midMidBot.vue
+++ b/src/views/board/kanBan/compents/midMidBot.vue
@@ -1,5 +1,6 @@
 <template>
-	<div :style="{ height: height, width: width }" />
+<!--	<div :style="{ height: height, width: width }" />-->
+	<dv-scroll-board :config="config" style="width:900px;height:240px" />
 </template>
 
 <script>
@@ -7,6 +8,7 @@ import * as echarts from 'echarts';
 import { defineComponent } from 'vue';
 import resize from './dashboard/mixins/resize';
 import {option} from './options/mid_bot_options';
+import { getOutputLog } from '~/src/service/api/produre/workRecords/index';
 export default defineComponent({
 	mixins: [resize],
 	props: {
@@ -32,6 +34,17 @@ export default defineComponent({
 	},
 	data() {
 		return {
+			config: {
+				header: ['工单类型', '机台', '订单编号', '报工数量','报工时间','报工人'],
+				headerBGC: 'transparent',
+				oddRowBGC: '#011B42',
+				evenRowBGC: '#020D29',
+				data: [
+				],
+				index: true,
+				columnWidth: [80],
+				align: ['center']
+			},
 			// myChart: null,
 			loading: true,
 			dataForCount: [],
@@ -41,24 +54,25 @@ export default defineComponent({
 	},
 	async mounted() {
 		// await this.getTypeData()
-		this.chartOptions =JSON.parse(JSON.stringify(option))
+		// this.chartOptions =JSON.parse(JSON.stringify(option))
 		// this.initChart()
+		this.getTypeData()
+
+		setInterval(() => {
+			this.getTypeData()
+		}, 500000)
 	},
-	watch : {
-		productionData : {
-			handler (newValue) {
-				console.log('this.chartOptions ==>',this.chartOptions);
-				let series1Data = newValue.wiredrawingNumWeek.map(item => item.putNum);
-				let series2Data = newValue.wiredrawingNumWeek.map(item => item.outNum);
-				let xAxisData = newValue.wiredrawingNumWeek.map(item => item.date);
-				this.chartOptions.xAxis.data = xAxisData;
-				this.chartOptions.series[0].data = series1Data;
-				this.chartOptions.series[1].data = series2Data;
-			this.initChart();
-		},
-		deep : true
-		}
-	},
+	// watch : {
+	// 	productionData : {
+	// 		handler (newValue) {
+	// 			this.config.data = newValue.outputLogs && newValue.outputLogs.length && newValue.outputLogs.map(item => {
+	// 				return [item.taskType == '0'?'金属':'板材', item.workstationName, item.orderSn, item.outputWeight, item.createTime, item.createBy]
+	// 			}) || []
+	// 		// this.initChart();
+	// 	},
+	// 	deep : true
+	// 	}
+	// },
 	beforeUnmount() {
 		// if (!this.myChart) {
 		// 	return;
@@ -67,14 +81,30 @@ export default defineComponent({
 		// this.myChart = null;
 	},
 	methods: {
-		initChart() {
-			let myChart = echarts.init(this.$el);
-			myChart.setOption(this.chartOptions);
-			this.$nextTick(() => {
-				myChart.resize()
-				this.$emit('endLoading', 11)
+
+		async getTypeData () {
+			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]
+			}) || []
+		},
+		// initChart() {
+		// 	let myChart = echarts.init(this.$el);
+		// 	myChart.setOption(this.chartOptions);
+		// 	this.$nextTick(() => {
+		// 		myChart.resize()
+		// 		this.$emit('endLoading', 11)
+		// 	})
+		// }
 	}
 });
 </script>
+
+<style scoped>
+.dv-scroll-board .header{
+		background-color: transparent;
+	}
+</style>
diff --git a/src/views/board/kanBan/compents/midTopOther.vue b/src/views/board/kanBan/compents/midTopOther.vue
index 79cf3f0..7d19031 100644
--- a/src/views/board/kanBan/compents/midTopOther.vue
+++ b/src/views/board/kanBan/compents/midTopOther.vue
@@ -42,7 +42,7 @@ export default defineComponent({
 	async mounted() {
 		this.chartOptions = JSON.parse(JSON.stringify(option));
 		this.chartOptions.title[0].text = this.chartData.week;
-		this.chartOptions.title[1].text = this.chartData.carryNum;
+		this.chartOptions.title[1].text = this.chartData && this.chartData.carryNum || 0;
 		this.initChart()
 	},
 	// watch : {
diff --git a/src/views/board/kanBan/compents/options/right_top_options.js b/src/views/board/kanBan/compents/options/right_top_options.js
index bdb28fd..a3a3a8c 100644
--- a/src/views/board/kanBan/compents/options/right_top_options.js
+++ b/src/views/board/kanBan/compents/options/right_top_options.js
@@ -20,7 +20,7 @@ export let option= {
 				if (params[i].seriesName !== "") {
 					str +=
 						params[i].seriesName + "：" +
-						params[i].value + 'kg'
+						params[i].value
 					"<br/>";
 				}
 			}
@@ -28,7 +28,7 @@ export let option= {
 		}
 	},
 	legend: {
-		data: ['成品入库', '成品出库'],
+		data: ['入库', '出库'],
 		icon: 'rect',
 		itemWidth: 14,
 		itemHeight: 14,
@@ -80,7 +80,7 @@ export let option= {
 	],
 	series: [
 		{
-			name: '成品入库',
+			name: '入库',
 			type: 'bar',
 			itemStyle: {
 				borderWidth: 1,
@@ -120,7 +120,7 @@ export let option= {
 			data: []
 		},
 		{
-			name: '成品出库',
+			name: '出库',
 			type: 'bar',
 			itemStyle: {
 				borderWidth: 1,
diff --git a/src/views/board/kanBan/index.vue b/src/views/board/kanBan/index.vue
index 5af6a8f..49aec70 100644
--- a/src/views/board/kanBan/index.vue
+++ b/src/views/board/kanBan/index.vue
@@ -239,28 +239,28 @@
 				<mid-mid-bot v-show="!loading2" :year="year" :production-data="productionData" width="900px" height="180px" />
 			</div>
 
-			<div class="mid_area mid_bot_country_area">
-				<div class="total_count"></div>
-				<div class="cunt_count">0</div>
-				<div class="cunt_count">0</div>
-
-				<div class="cunt_count">0</div>
-				<!-- <div class="douhao"></div> -->
-				<div class="cunt_count">0</div>
-				<div class="cunt_count">0</div>
-
-				<div class="cunt_count">2</div>
-				<!-- <div class="douhao"></div> -->
-				<div class="cunt_count">1</div>
-				<div class="cunt_count">6</div>
-				<div class="cunt_count">2</div>
-				<div class="unit"></div>
-			</div>
+<!--			<div class="mid_area mid_bot_country_area">-->
+<!--				<div class="total_count"></div>-->
+<!--				<div class="cunt_count">0</div>-->
+<!--				<div class="cunt_count">0</div>-->
+
+<!--				<div class="cunt_count">0</div>-->
+<!--				&lt;!&ndash; <div class="douhao"></div> &ndash;&gt;-->
+<!--				<div class="cunt_count">0</div>-->
+<!--				<div class="cunt_count">0</div>-->
+
+<!--				<div class="cunt_count">2</div>-->
+<!--				&lt;!&ndash; <div class="douhao"></div> &ndash;&gt;-->
+<!--				<div class="cunt_count">1</div>-->
+<!--				<div class="cunt_count">6</div>-->
+<!--				<div class="cunt_count">2</div>-->
+<!--				<div class="unit"></div>-->
+<!--			</div>-->
 
 			<div class="mid_area mid_bot_end_area">
 				<div class="item">
 					<div class="top">
-						<span style="font-size: 22px; font-weight: bolder; color: #fff">{{ productionData.wiredrawingNumWeek && productionData.wiredrawingNumWeek[productionData.wiredrawingNumWeek.length - 1].carryNum || 0 }}</span>
+						<span style="font-size: 22px; font-weight: bolder; color: #fff">{{ productionData.wiredrawingNumWeek && productionData.wiredrawingNumWeek.length && productionData.wiredrawingNumWeek[productionData.wiredrawingNumWeek.length - 1].carryNum || 0 }}</span>
 					</div>
 					<div class="bottom">
 						<div class="left"></div>
diff --git a/src/views/storage/stockControl/index.vue b/src/views/storage/stockControl/index.vue
index aa0ba55..9d68320 100644
--- a/src/views/storage/stockControl/index.vue
+++ b/src/views/storage/stockControl/index.vue
@@ -179,7 +179,11 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
   {
     title: '所在仓库',
     key: 'warehouseName'
-  }
+  },
+	{
+		title: '日期',
+		key: 'createTime'
+	}
 ]);
 
 const checked = ref<(string | number)[]>([]);