From 235b0a6512fe5f6bcba743df3f3de016c2fd3f64 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 10 Jan 2025 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/currentData/currentTest.vue |  10 +-
 .../monitoring/deviceParameters/index.vue     | 162 +-----------------
 2 files changed, 14 insertions(+), 158 deletions(-)

diff --git a/src/views/quality/currentData/currentTest.vue b/src/views/quality/currentData/currentTest.vue
index 96b753bb..7211acbd 100644
--- a/src/views/quality/currentData/currentTest.vue
+++ b/src/views/quality/currentData/currentTest.vue
@@ -50,6 +50,11 @@ export default {
 					label: '工单名称',
 					showOverflowtooltip: true,
 				},
+				{
+					prop: 'productionName',
+					label: '产品名称',
+					showOverflowtooltip: true,
+				},
 				...this.dynamicProps,
 				{
 					prop: 'sumInput',
@@ -70,7 +75,7 @@ export default {
 		};
 	},
 	mounted() {
-		// this.getList();
+		this.getList();
 	},
 	methods: {
 		/** 查询列表 */
@@ -105,7 +110,7 @@ export default {
 						},
 						{
 							prop: 'scrapRatio',
-							label: '报废比例',
+							label: '报废比例(%)',
 						},
 					];
 					this.downList.push(obj);
@@ -142,6 +147,7 @@ export default {
 				return {
 					inspectionContent: item.inspectionContent,
 					workOrderName: item.workOrderName,
+					productionName: item.productionName,
 					...keyValuePairs,
 					sumInput: item.sumInput,
 					sumOutput: item.sumOutput,
diff --git a/src/views/quality/monitoring/deviceParameters/index.vue b/src/views/quality/monitoring/deviceParameters/index.vue
index e8646e55..ce1f78c7 100644
--- a/src/views/quality/monitoring/deviceParameters/index.vue
+++ b/src/views/quality/monitoring/deviceParameters/index.vue
@@ -1,10 +1,3 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-08-30 14:02:49
-    description: 设备加工数量
--->
-
 <template>
 	<div style="flex: 1; display: flex; background: #f2f4f9">
 		<div
@@ -21,7 +14,7 @@
 				title="点击切换工厂"
 				@mouseenter="factoryListOpen = true"
 				@mouseleave="factoryListOpen = false">
-				{{ currentFactory?.label || '点我选择设备' }}
+				{{ currentFactory?.label || '点我选择工厂' }}
 				<div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
 					<ul
 						class="factory-list"
@@ -33,7 +26,7 @@
 							:data-value="fc.id"
 							class="factory-list__item"
 							:class="{ 'is-current': fc.id == currentFactory?.id }">
-							<span>
+							<span :data-value="fc.id">
 								{{ fc.label }}
 							</span>
 							<svg-icon
@@ -56,10 +49,6 @@
 					:empty-text="''"
 					icon-class="custom-icon-class"
 					@node-click="handleSidebarItemClick">
-					<!-- <div class="custom-tree-node" slot-scope="{ node, data }">
-						<span class="icon"></span>
-						<span>{{ node.label }}</span>
-					</div> -->
 				</el-tree>
 			</div>
 		</div>
@@ -106,20 +95,16 @@
 						<div v-else class="no-data-bg"></div>
 					</el-col>
 				</el-row>
-
-				<!-- <transition appear name="vvv" mode="out-in"></transition> -->
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-// import Graph from './graph.vue';
 import { getWorkOrderList, getTreeData } from '@/api/quality/deviceParameters';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
 export default {
 	name: 'EquipmentProcessAmount',
-	// components: { Graph },
 	mixins: [tableHeightMixin],
 	props: {},
 	data() {
@@ -139,92 +124,7 @@ export default {
 				{ name: '5', value: 5 },
 				{ name: '6', value: 6 },
 			],
-			sidebarContent: [
-				// {
-				// 	id: 'fc1',
-				// 	name: '工厂',
-				// 	lines: [
-				// 		{
-				// 			name: '产线1',
-				// 			id: 'pl1',
-				// 			sections: [
-				// 				{
-				// 					name: '工段1',
-				// 					id: 'pl1ws1',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl1ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl1ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl1ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 				{
-				// 					name: '工段2',
-				// 					id: 'pl1ws2',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl2ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl2ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl2ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 				{
-				// 					name: '工段3',
-				// 					id: 'pl1ws3',
-				// 					equipments: [
-				// 						{
-				// 							name: '设备1',
-				// 							id: 'pl3ws1--eq1',
-				// 						},
-				// 						{
-				// 							name: '设备2',
-				// 							id: 'pl3ws1--eq2',
-				// 						},
-				// 						{
-				// 							name: '设备3',
-				// 							id: 'pl3ws1--eq3',
-				// 						},
-				// 					],
-				// 				},
-				// 			],
-				// 		},
-				// 		{
-				// 			name: '产线2',
-				// 			id: 'pl2',
-				// 			sections: [
-				// 				{
-				// 					name: '工段1',
-				// 					id: 'pl2ws1',
-				// 				},
-				// 				{
-				// 					name: '工段2',
-				// 					id: 'pl2ws2',
-				// 				},
-				// 				{
-				// 					name: '工段3',
-				// 					id: 'pl2ws3',
-				// 				},
-				// 			],
-				// 		},
-				// 	],
-				// },
-			],
+			sidebarContent: [],
 			tableList: [],
 			queryParams: {
 				id: null,
@@ -241,6 +141,7 @@ export default {
 					param: 'workOrderId',
 					onchange: true,
 					filterable: true,
+					clearable: false
 				},
 				{
 					type: 'datePicker',
@@ -264,20 +165,6 @@ export default {
 				{
 					type: 'separate',
 				},
-				// {
-				// 	type: 'button',
-				// 	btnName: '表格',
-				// 	name: 'table',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '图表',
-				// 	name: 'graph',
-				// 	plain: true,
-				// 	color: 'warning',
-				// },
 				{
 					type: this.$auth.hasPermi('base:equipment-group:export')
 						? 'button'
@@ -291,15 +178,12 @@ export default {
 			tableProps: [
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
-				// { prop: 'externalCode', label: '设备编码' },
 				{ prop: 'equipmentId', label: '设备编码' },
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'totalQuantity', label: '加工数量' },
 			],
 			mode: 'table', // table | graph
 			queryParams: {
-				// pageNo: 1,
-				// pageSize: 999,
 				recordTime: [],
 				equipmentId: null,
 				lineId: null,
@@ -313,28 +197,10 @@ export default {
 			},
 		};
 	},
-	// mounted() {
-	// },
 	computed: {
-		// id() {
-		//   return this.$route.params.equipmentId;
-		// },
-		// code() {
-		//   return this.$route.params.equipmentCode;
-		// },
-		// name() {
-		//   return this.$route.params.equipmentName;
-		// },
 	},
 	mounted() {
 		this.getDict();
-		// if (this.id) this.$set(this.queryParams, 'id', this.id);
-		// if (this.code)
-		//   this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
-		// if (this.name)
-		//   this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
-
-		// this.handleResponse();
 	},
 	methods: {
 		handleSearchBarChanged({ param, value }) {
@@ -349,28 +215,14 @@ export default {
 			}
 		},
 		getDict() {
-			// 获取产品的属性列表
-			// getCustomerList().then((response) => {
-			//   console.log(response);
-			//   this.customerList = response.data
-			//   // this.listQuery.total = response.data.total;
-			// })
-			// getModelList().then((response) => {
-			//   console.log(response);
-			//   this.modelList = response.data
-			//   // this.listQuery.total = response.data.total;
-			// })
 			getWorkOrderList().then((res) => {
 				console.log(res);
-				// console.log(response);
 				this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
 					};
 				});
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
 		},
 		buildProps(table) {
@@ -532,12 +384,9 @@ export default {
 				console.log(res.data);
 				this.sidebarContent = res.data;
 				this.buildTree(res.data);
+				this.currentFactory = null
 				console.log('tree', this.sidebarContent);
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
-			// const { data } = await this.$axios('/base/core-factory/getTreeByWorkOrder');
-			// console.log(data)
 		},
 
 		handleTabClick(tab, event) {
@@ -549,6 +398,7 @@ export default {
 			const fcId = event.target.dataset.value;
 			this.handleSidebarItemClick({ id: fcId, type: '工厂' });
 			this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
+			console.log('factory change', this.currentFactory);
 		},
 
 		handleSidebarItemClick({ label, id, type }) {