From f2f3a9e850136eebf1b1613bd7451ba03a0692ef Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 11 Sep 2023 15:24:11 +0800
Subject: [PATCH 1/7] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=85=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentFullParams/index.vue  | 105 +++++++-----------
 yarn.lock                                     |  58 ++++++++++
 2 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index ef2c84b8..5c2e99a3 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -12,31 +12,7 @@
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- <base-table
-			:table-props="[
-				{ type: 'index', label: '序号' },
-				{ prop: 'name', label: '设备名称', align: 'center' },
-				{ prop: 'code', label: '设备代码', align: 'center' },
-				{ prop: 'time', label: '时间', align: 'center' },
-			]"
-			:table-data="[
-				{ index: 1, name: '1', code: 'c1', time: '2021-08-31 09:14:19' },
-				{ index: 2, name: '2', code: 'c2', time: '2021-08-31 09:14:19' },
-				{ index: 3, name: '3', code: 'c3', time: '2021-08-31 09:14:19' },
-				{ index: 4, name: '4', code: 'c4', time: '2021-08-31 09:14:19' },
-				{ index: 5, name: '5', code: 'c5', time: '2021-08-31 09:14:19' },
-			]"
-			:span-method="
-				({ rowIndex, columnIndex }) => {
-					if (rowIndex == 1 && columnIndex == 0) {
-						return [1, 3];
-					}
-					return [1, 1];
-				}
-			"
-			@emitFun="(val) => handleEmitFun(table, val)"></base-table> -->
-
-		<div class="tables">
+		<div v-if="tableList.length" class="tables">
 			<div class="custom-table" v-for="table in tableList" :key="table.key">
 				<!-- {{ JSON.stringify(spanMethod) }} -->
 				<base-table
@@ -58,16 +34,14 @@
 							getListFor(table, { page, limit, current })
 					" />
 			</div>
-			<!-- v-show="table.dataManager?.total > 0"
-				:total="table.dataManager?.total || 0" -->
-			<!-- @size-change="($event) => handleSizeChange(table, $event)" -->
 		</div>
+		<div v-else style="margin-top: 20px; color: #c7c7c7; text-align: center;">暂无数据</div>
 	</div>
 </template>
 
 <script>
 import LocalDataManager from './utils/local-data-manager';
-import response from './response';
+// import response from './response';
 import moment from 'moment';
 
 export default {
@@ -123,14 +97,14 @@ export default {
 				time: [new Date(aWeekAgo), new Date(today)],
 			},
 			tableList: [
-				{
-					key: 'base-table__key__1',
-					tableProps: [],
-					list: [],
-					pageNo: 1,
-					pageSize: 3,
-					total: 0,
-				},
+				// {
+				// 	key: 'base-table__key__1',
+				// 	tableProps: [],
+				// 	list: [],
+				// 	pageNo: 1,
+				// 	pageSize: 3,
+				// 	total: 0,
+				// },
 			],
 		};
 	},
@@ -152,7 +126,7 @@ export default {
 		if (this.name)
 			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
 
-		this.handleResponse();
+		// this.handleResponse();
 	},
 	methods: {
 		buildProps(table) {
@@ -199,11 +173,9 @@ export default {
 			return { props, firstLineData };
 		},
 
-		handleResponse() {
+		handleResponse(response) {
 			const { code, data } = response;
 			if (code == 0) {
-				console.log('response', code, data);
-
 				// 处理一个表格
 				data.forEach((table, index) => {
 					console.log('handle index:', index, table);
@@ -220,26 +192,28 @@ export default {
 
 					// 处理某一表格的各个行
 					const { data } = table;
-					data.forEach((row, idx) => {
-						const listItem = {
-							index: idx + 1,
-							time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
-							plcCode: row.plcCode,
-						};
-						row.data.forEach((column) => {
-							listItem[column.dynamicName] = column.dynamicValue;
+					if (data) {
+						data.forEach((row, idx) => {
+							const listItem = {
+								index: idx + 1,
+								time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
+								plcCode: row.plcCode,
+							};
+							row.data.forEach((column) => {
+								listItem[column.dynamicName] = column.dynamicValue;
+							});
+							this.tableList[index].list.push(listItem);
+							this.tableList[index].total++;
 						});
-						this.tableList[index].list.push(listItem);
-						this.tableList[index].total++;
-					});
 
-					// 处理分页
-					const { pageNo, pageSize, list } = this.tableList[index];
-					this.tableList[index].dataManager = new LocalDataManager(
-						list,
-						pageNo,
-						pageSize
-					);
+						// 处理分页
+						const { pageNo, pageSize, list } = this.tableList[index];
+						this.tableList[index].dataManager = new LocalDataManager(
+							list,
+							pageNo,
+							pageSize
+						);
+					}
 				});
 			}
 		},
@@ -255,12 +229,13 @@ export default {
 
 		/** 查询 */
 		async handleQuery() {
-			const { data } = this.$axios({
-				url: '/monitoring/equipment-monitor/runLog',
-				method: 'get',
-				params: this.queryParams,
-			});
-			console.log('data', data);
+			this.handleResponse(
+				await this.$axios({
+					url: '/monitoring/equipment-monitor/runLog',
+					method: 'get',
+					params: this.queryParams,
+				})
+			);
 		},
 
 		async handleSearchBarBtnClick({ btnName, timeVal }) {
diff --git a/yarn.lock b/yarn.lock
index ea7b06e2..6b2f0736 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1859,6 +1859,11 @@ address@^1.1.2:
   resolved "https://registry.npmmirror.com/address/-/address-1.2.1.tgz"
   integrity sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==
 
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
+
 aes-decrypter@1.0.3:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
@@ -2739,6 +2744,14 @@ caseless@~0.12.0:
   resolved "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+  dependencies:
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
+
 chalk@2.3.0:
   version "2.3.0"
   resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
@@ -2999,6 +3012,11 @@ code-brick-zj@^1.0.2:
   resolved "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz#f9f5fa97faa65262e887a3a15014827ac95b1fea"
   integrity sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==
 
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
@@ -3324,6 +3342,11 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
+crc-32@~1.2.0, crc-32@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
@@ -4849,6 +4872,11 @@ forwarded@0.2.0:
   resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
@@ -9131,6 +9159,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
 sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
@@ -10461,11 +10496,21 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
@@ -10522,6 +10567,19 @@ xhr@2.4.0:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+  dependencies:
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
 xml-js@1.6.11:
   version "1.6.11"
   resolved "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"

From 6f0040a0ae25a0926984ef49c494054c77e6f47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 11 Sep 2023 16:09:07 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/core/base/workshopSection.js          |   7 +
 .../core/analysis/balanceAnalysis/index.vue   | 159 +++++++++++++++++
 .../core/analysis/yieldAnalysis/index.vue     | 152 +++++++++++++++++
 src/views/core/base/productionLine/index.vue  |   2 +-
 .../sectionStatisticsSearch/index.vue         | 160 ++++++++++++++++++
 5 files changed, 479 insertions(+), 1 deletion(-)
 create mode 100644 src/views/core/analysis/balanceAnalysis/index.vue
 create mode 100644 src/views/core/analysis/yieldAnalysis/index.vue
 create mode 100644 src/views/core/monitoring/sectionStatisticsSearch/index.vue

diff --git a/src/api/core/base/workshopSection.js b/src/api/core/base/workshopSection.js
index b460590f..b864282d 100644
--- a/src/api/core/base/workshopSection.js
+++ b/src/api/core/base/workshopSection.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-08-28 14:29:51
+ * @LastEditTime: 2023-08-31 14:33:46
+ * @LastEditors: zhp
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建产线工段
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
new file mode 100644
index 00000000..e0de210b
--- /dev/null
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -0,0 +1,159 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-09-11 14:21:21
+ * @LastEditTime: 2023-09-11 14:26:04
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+
+const tableProps = [
+	{
+		prop: 'productionLineName',
+		label: '产线名称',
+		align: 'center',
+	},
+  {
+    prop: '',
+    label: '工段名称',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '进片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '出片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗面积/m²',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗比例/%',
+    align: 'center',
+  }
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineBindProductLogPage,
+			},
+			tableProps,
+			tableData: [],
+      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'productionLineId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'createTime',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		this.getArr();
+	},
+	methods: {
+		getArr() {
+			const params = {
+				page: 1,
+				limit: 500,
+			};
+			this.optionArrUrl.forEach((item, index) => {
+				item(params).then((response) => {
+					this.formConfig[index].selectOptions = response.data.list;
+				});
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.productionLineId = val.productionLineId;
+					this.listQuery.productId = val.productId;
+					this.listQuery.createTime = val.createTime;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue
new file mode 100644
index 00000000..ee6a5ce5
--- /dev/null
+++ b/src/views/core/analysis/yieldAnalysis/index.vue
@@ -0,0 +1,152 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+
+const tableProps = [
+	{
+		prop: 'productionLineName',
+		label: '产线',
+		align: 'center',
+	},
+  {
+    prop: '',
+    label: '合计',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '进片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '出片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗面积/m²',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗比例/%',
+    align: 'center',
+  }
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineBindProductLogPage,
+			},
+			tableProps,
+			tableData: [],
+      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'productionLineId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'createTime',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		this.getArr();
+	},
+	methods: {
+		getArr() {
+			const params = {
+				page: 1,
+				limit: 500,
+			};
+			this.optionArrUrl.forEach((item, index) => {
+				item(params).then((response) => {
+					this.formConfig[index].selectOptions = response.data.list;
+				});
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.productionLineId = val.productionLineId;
+					this.listQuery.productId = val.productId;
+					this.listQuery.createTime = val.createTime;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/core/base/productionLine/index.vue b/src/views/core/base/productionLine/index.vue
index a3e27792..29ac73d2 100644
--- a/src/views/core/base/productionLine/index.vue
+++ b/src/views/core/base/productionLine/index.vue
@@ -195,7 +195,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 10;.7
 					this.listQuery.name = val.name;
 					this.getDataList();
 					break;
diff --git a/src/views/core/monitoring/sectionStatisticsSearch/index.vue b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
new file mode 100644
index 00000000..e09e0ea3
--- /dev/null
+++ b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
@@ -0,0 +1,160 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData" />
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import basicPage from '../../mixins/basic-page';
+import { parseTime } from '../../mixins/code-filter';
+import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getProductionLinePage } from '@/api/core/base/productionLine';
+import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+
+const tableProps = [
+	{
+		prop: 'productionLineName',
+		label: '产线名称',
+		align: 'center',
+	},
+  {
+    prop: '',
+    label: '工段名称',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '进片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '出片数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗数量/片',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗面积/m²',
+    align: 'center',
+  },
+  {
+    prop: '',
+    label: '损耗比例/%',
+    align: 'center',
+  }
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getLineBindProductLogPage,
+			},
+			tableProps,
+			tableData: [],
+      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'productionLineId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '工段',
+					selectOptions: [],
+					param: 'productId',
+					defaultSelect: '',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'createTime',
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+				},
+			],
+		};
+	},
+	components: {
+	},
+	created() {
+		this.getArr();
+	},
+	methods: {
+		getArr() {
+			const params = {
+				page: 1,
+				limit: 500,
+			};
+			this.optionArrUrl.forEach((item, index) => {
+				item(params).then((response) => {
+					this.formConfig[index].selectOptions = response.data.list;
+				});
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.productionLineId = val.productionLineId;
+					this.listQuery.productId = val.productId;
+					this.listQuery.createTime = val.createTime;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

From 2f18299b0bc51efd02a92e0cff4bfa6e6a09d38f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 11 Sep 2023 16:47:12 +0800
Subject: [PATCH 3/7] add dialogForm of equipmentbind

---
 .../base/equipmentBindSection/dialogForm.vue  | 223 ++++++++++++++++++
 src/views/base/equipmentBindSection/index.vue |   8 +-
 2 files changed, 227 insertions(+), 4 deletions(-)
 create mode 100644 src/views/base/equipmentBindSection/dialogForm.vue

diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue
new file mode 100644
index 00000000..089fea6c
--- /dev/null
+++ b/src/views/base/equipmentBindSection/dialogForm.vue
@@ -0,0 +1,223 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for equipmentBindSection only
+-->
+
+<template>
+	<el-form ref="form" :model="form" label-width="100px" v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="productionLineId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="form.productionLineId"
+						placeholder="请选择产线"
+						@change="handleProductlineChange">
+						<el-option
+							v-for="opt in productionLineList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="工段"
+					prop="workshopSectionId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="form.workshopSectionId"
+						placeholder="请选择工段"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in worksectionList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="设备"
+					prop="equipmentId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="form.equipmentId"
+						placeholder="请选择设备"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in equipmentList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="工段排序" prop="sort">
+					<el-input
+						v-model="form.sort"
+						@change="$emit('update', form)"
+						placeholder="请输入工段排序" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="产线数据类型" prop="lineDataType">
+					<el-select
+						v-model="form.lineDataType"
+						placeholder="请选择产线数据类型"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in [
+								{ label: '无类型', value: 0 },
+								{ label: '进口统计', value: 1 },
+								{ label: '出口统计', value: 2 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="工段数据类型" prop="sectionDataType">
+					<el-select
+						v-model="form.sectionDataType"
+						placeholder="请选择工段数据类型"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in [
+								{ label: '无类型', value: 0 },
+								{ label: '进口统计', value: 1 },
+								{ label: '出口统计', value: 2 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+			productionLineList: [],
+			equipmentList: [],
+			worksectionList: [],
+		};
+	},
+	computed: {
+		form: {
+			get() {
+				return {
+                    productionLineId: this.dataForm.productionLineId,
+                    workshopSectionId: this.dataForm.workshopSectionId,
+                    equipmentId: this.dataForm.equipmentId,
+                    sort: this.dataForm.sort,
+                    lineDataType: this.dataForm.lineDataType,
+                    sectionDataType: this.dataForm.sectionDataType,
+                };
+			},
+			set(val) {
+				console.log('set form', val);
+			},
+		},
+	},
+	mounted() {
+		Promise.all([this.getProductLineList(), this.getEquipmentList()]).then(
+			() => {
+				this.formLoading = false;
+			}
+		);
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleProductlineChange(id) {
+			console.log('产线变化了!!!', id, this.form);
+			await this.getWorksectionList(id);
+			this.$emit('update', { ...this.form, workshopSectionId: null });
+		},
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+		// 获取产线列表
+		async getProductLineList() {
+			const response = await this.$axios('/base/production-line/listAll');
+			this.productionLineList = response.data.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		// 获取设备列表
+		async getEquipmentList() {
+			const response = await this.$axios(
+				'/base/equipment/page?pageNo=1&pageSize=100'
+			);
+			this.equipmentList = response.data.list.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		// 获取工段列表
+		async getWorksectionList(plId) {
+			const response = await this.$axios(
+				'/base/workshop-section/listByParentId',
+				{
+					params: {
+						id: plId,
+					},
+				}
+			);
+			this.worksectionList = response.data.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue
index cd653693..a18dd588 100644
--- a/src/views/base/equipmentBindSection/index.vue
+++ b/src/views/base/equipmentBindSection/index.vue
@@ -53,10 +53,10 @@ import {
 } from '@/api/base/equipmentBindSection';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
+import DialogForm from './dialogForm.vue';
 export default {
 	name: 'EquipmentBindSection',
-	components: {},
+	components: { DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -181,8 +181,8 @@ export default {
 						select: true,
 						label: '工段',
 						url: '/base/workshop-section/listByParentId', // 根据产线获取
-            // depends: '__product_line', // 依赖产线获取数据
-            depends: 'productionLineId',
+						// depends: '__product_line', // 依赖产线获取数据
+						depends: 'productionLineId',
 						prop: 'workshopSectionId',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},

From 529889fd074a72751afd354796826c2a306ebe72 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 12 Sep 2023 11:09:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?update=20=E5=B7=A5=E6=AE=B5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BB=91=E5=AE=9A=20dialogForm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/equipmentBindSection/dialogForm.vue  | 58 +++++++++----------
 src/views/base/equipmentBindSection/index.vue |  2 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue
index 089fea6c..91645365 100644
--- a/src/views/base/equipmentBindSection/dialogForm.vue
+++ b/src/views/base/equipmentBindSection/dialogForm.vue
@@ -6,7 +6,11 @@
 -->
 
 <template>
-	<el-form ref="form" :model="form" label-width="100px" v-loading="formLoading">
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
@@ -14,7 +18,7 @@
 					prop="productionLineId"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
-						v-model="form.productionLineId"
+						v-model="dataForm.productionLineId"
 						placeholder="请选择产线"
 						@change="handleProductlineChange">
 						<el-option
@@ -32,9 +36,9 @@
 					prop="workshopSectionId"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
-						v-model="form.workshopSectionId"
+						v-model="dataForm.workshopSectionId"
 						placeholder="请选择工段"
-						@change="$emit('update', form)">
+						@change="$emit('update', dataForm)">
 						<el-option
 							v-for="opt in worksectionList"
 							:key="opt.value"
@@ -51,9 +55,9 @@
 					prop="equipmentId"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
-						v-model="form.equipmentId"
+						v-model="dataForm.equipmentId"
 						placeholder="请选择设备"
-						@change="$emit('update', form)">
+						@change="$emit('update', dataForm)">
 						<el-option
 							v-for="opt in equipmentList"
 							:key="opt.value"
@@ -66,8 +70,8 @@
 			<el-col :span="12">
 				<el-form-item label="工段排序" prop="sort">
 					<el-input
-						v-model="form.sort"
-						@change="$emit('update', form)"
+						v-model="dataForm.sort"
+						@change="$emit('update', dataForm)"
 						placeholder="请输入工段排序" />
 				</el-form-item>
 			</el-col>
@@ -76,9 +80,9 @@
 			<el-col :span="12">
 				<el-form-item label="产线数据类型" prop="lineDataType">
 					<el-select
-						v-model="form.lineDataType"
+						v-model="dataForm.lineDataType"
 						placeholder="请选择产线数据类型"
-						@change="$emit('update', form)">
+						@change="$emit('update', dataForm)">
 						<el-option
 							v-for="opt in [
 								{ label: '无类型', value: 0 },
@@ -94,9 +98,9 @@
 			<el-col :span="12">
 				<el-form-item label="工段数据类型" prop="sectionDataType">
 					<el-select
-						v-model="form.sectionDataType"
+						v-model="dataForm.sectionDataType"
 						placeholder="请选择工段数据类型"
-						@change="$emit('update', form)">
+						@change="$emit('update', dataForm)">
 						<el-option
 							v-for="opt in [
 								{ label: '无类型', value: 0 },
@@ -134,25 +138,9 @@ export default {
 			productionLineList: [],
 			equipmentList: [],
 			worksectionList: [],
+			dataFormCache: null,
 		};
 	},
-	computed: {
-		form: {
-			get() {
-				return {
-                    productionLineId: this.dataForm.productionLineId,
-                    workshopSectionId: this.dataForm.workshopSectionId,
-                    equipmentId: this.dataForm.equipmentId,
-                    sort: this.dataForm.sort,
-                    lineDataType: this.dataForm.lineDataType,
-                    sectionDataType: this.dataForm.sectionDataType,
-                };
-			},
-			set(val) {
-				console.log('set form', val);
-			},
-		},
-	},
 	mounted() {
 		Promise.all([this.getProductLineList(), this.getEquipmentList()]).then(
 			() => {
@@ -160,6 +148,14 @@ export default {
 			}
 		);
 	},
+	watch: {
+		'dataForm.productionLineId': {
+			handler: async function (plId) {
+				if (plId) await this.getWorksectionList(plId);
+			},
+			immediate: true,
+		},
+	},
 	methods: {
 		/** 模拟透传 ref  */
 		validate(cb) {
@@ -169,9 +165,9 @@ export default {
 			return this.$refs.form.resetFields(args);
 		},
 		async handleProductlineChange(id) {
-			console.log('产线变化了!!!', id, this.form);
 			await this.getWorksectionList(id);
-			this.$emit('update', { ...this.form, workshopSectionId: null });
+			this.dataForm.workshopSectionId = null;
+			this.$emit('update', this.dataForm);
 		},
 		// getCode
 		async getCode(url) {
diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue
index a18dd588..cb46db05 100644
--- a/src/views/base/equipmentBindSection/index.vue
+++ b/src/views/base/equipmentBindSection/index.vue
@@ -37,7 +37,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 	</div>
 </template>

From b17bc0e1629541ff733ca2c1392e7a6a47ab7d18 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 12 Sep 2023 11:12:05 +0800
Subject: [PATCH 5/7] update build:prod PUBLIC_PATH

---
 .env.prod | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.prod b/.env.prod
index a1415ed3..4c6133c8 100644
--- a/.env.prod
+++ b/.env.prod
@@ -8,7 +8,9 @@ VUE_APP_TITLE = 芋道管理系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://192.168.0.33:8888/'
+
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'
 

From f341ec7b3012939da2af368a0a7e647e3ddb8911 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 13 Sep 2023 12:24:52 +0800
Subject: [PATCH 6/7] update router mode

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 1d64f59b..ca26742b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -247,7 +247,7 @@ Router.prototype.push = function push(location) {
 
 export default new Router({
   base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
-  mode: 'history', // 去掉url中的#
+  mode: 'hash', // 去掉url中的#
   scrollBehavior: () => ({y: 0}),
   routes: constantRoutes
 })

From e8cc1fc50b32559fd6e1c07a9c2635805dde76d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 13 Sep 2023 16:00:43 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  10 +-
 src/api/core/analysis/index.js                |  24 ++
 src/api/core/monitoring/index.js              |  16 +
 src/assets/images/pay/icon/alipay_app.svg     |   2 +-
 src/views/base/equipmentPlcConnect/http.js    |   9 +-
 src/views/core/analysis/LineChart.vue         |  93 +++++
 .../core/analysis/balanceAnalysis/index.vue   | 331 ++++++++++--------
 .../core/analysis/yieldAnalysis/index.vue     | 233 +++++++-----
 .../sectionStatisticsSearch/index.vue         |  79 +++--
 9 files changed, 534 insertions(+), 263 deletions(-)
 create mode 100644 src/api/core/analysis/index.js
 create mode 100644 src/api/core/monitoring/index.js
 create mode 100644 src/views/core/analysis/LineChart.vue

diff --git a/.env.dev b/.env.dev
index e5856184..ab61468a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,10 +1,10 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-09-11 15:55:29
- # @LastEditors: DY
- # @Description: 
-### 
+ # @LastEditTime: 2023-09-12 14:01:15
+ # @LastEditors: zhp
+ # @Description:
+###
 # 开发环境配置
 ENV = 'development'
 
@@ -12,7 +12,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js
new file mode 100644
index 00000000..af791ff5
--- /dev/null
+++ b/src/api/core/analysis/index.js
@@ -0,0 +1,24 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2023-09-13 09:53:45
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getYieldAnalysisPageData(data) {
+  return request({
+    url: '/analysis/production-analysis/getOutput',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCT(data) {
+  return request({
+    url: '/analysis/production-analysis/getCT',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/core/monitoring/index.js b/src/api/core/monitoring/index.js
new file mode 100644
index 00000000..13eb6963
--- /dev/null
+++ b/src/api/core/monitoring/index.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-12 14:07:04
+ * @LastEditTime: 2023-09-13 09:46:44
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function getSectionDataSearch(data) {
+  return request({
+    url: '/monitoring/production-monitor/getSectionDataSearch',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/assets/images/pay/icon/alipay_app.svg b/src/assets/images/pay/icon/alipay_app.svg
index ebf11883..c77a3d9f 100644
--- a/src/assets/images/pay/icon/alipay_app.svg
+++ b/src/assets/images/pay/icon/alipay_app.svg
@@ -1 +1 @@
-<svg t="1627279997305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11904" width="40" height="40"><path d="M938.7008 669.525333L938.7008 249.412267c0-90.555733-73.5232-164.078933-164.1472-164.078933L249.378133 85.333333c-90.555733 0-164.078933 73.48906699-164.078933 164.078933l0 525.2096c0 90.555733 73.454933 164.078933 164.07893301 164.078933l525.20959999 0c80.725333 0 147.8656-58.368 161.553067-135.099733-43.52-18.8416-232.106667-100.283733-330.376533-147.182933-74.786133 90.589867-153.088 144.930133-271.121067 144.930133s-196.81279999-72.704-187.357867-161.655467c6.2464-58.402133 46.2848-153.9072 220.296533-137.5232 91.682133 8.6016 133.666133 25.736533 208.418133 50.414933 19.3536-35.4304 35.4304-74.513067 47.616-116.0192L292.0448 436.565333l0-32.8704 164.0448 0 0-58.9824L256 344.712533l1e-8-36.181333 200.12373299 0L456.123733 223.3344c0 0 1.809067-13.312 16.520533-13.31200001l82.056533 1e-8 0 98.474667 213.333333 0 0 36.181333-213.333333 1e-8 0 58.98239999 174.045867 0c-16.00853301 65.1264-40.277333 124.962133-70.690133 177.220267C708.608 599.176533 938.7008 669.525333 938.7008 669.525333L938.7008 669.525333 938.7008 669.525333 938.7008 669.525333zM321.57013299 744.994133c-124.7232 0-144.452267-78.7456-137.83039999-111.65013299 6.5536-32.733867 42.666667-75.502933 112.0256-75.50293301 79.6672 0 151.04 20.445867 236.714667 62.088533C472.302933 698.333867 398.370133 744.994133 321.57013299 744.994133L321.57013299 744.994133 321.57013299 744.994133zM321.57013299 744.994133" fill="#1296db" p-id="11905"></path></svg>
\ No newline at end of file
+<svg t="1627279997305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11904" width="40" height="40"><path d="M938.7008 669.525333L938.7008 249.412267c0-90.555733-73.5232-164.078933-164.1472-164.078933L249.378133 85.333333c-90.555733 0-164.078933 73.48906699-164.078933 164.078933l0 525.2096c0 90.555733 73.454933 164.078933 164.07893301 164.078933l525.20959999 0c80.725333 0 147.8656-58.368 161.553067-135.099733-43.52-18.8416-232.106667-100.283733-330.376533-147.182933-74.786133 90.589867-153.088 144.930133-271.121067 144.930133s-196.81279999-72.704-187.357867-161.655467c6.2464-58.402133 46.2848-153.9072 220.296533-137.5232 91.682133 8.6016 133.666133 25.736533 208.418133 50.414933 19.3536-35.4304 35.4304-74.513067 47.616-116.0192L292.0448 436.565333l0-32.8704 164.0448 0 0-58.9824L256 344.712533l1e-8-36.181333 200.12373299 0L456.123733 223.3344c0 0 1.809067-13.312 16.520533-13.31200001l82.056533 1e-8 0 98.474667 213.333333 0 0 36.181333-213.333333 1e-8 0 58.98239999 174.045867 0c-16.00853301 65.1264-40.277333 124.962133-70.690133 177.220267C708.608 599.176533 938.7008 669.525333 938.7008 669.525333L938.7008 669.525333 938.7008 669.525333 938.7008 669.525333zM321.57013299 744.994133c-124.7232 0-144.452267-78.7456-137.83039999-111.65013299 6.5536-32.733867 42.666667-75.502933 112.0256-75.50293301 79.6672 0 151.04 20.445867 236.714667 62.088533C472.302933 698.333867 398.370133 744.994133 321.57013299 744.994133L321.57013299 744.994133 321.57013299 744.994133zM321.57013299 744.994133" fill="#1296db" p-id="11905"></path></svg>
diff --git a/src/views/base/equipmentPlcConnect/http.js b/src/views/base/equipmentPlcConnect/http.js
index 16544450..b87d0ed7 100644
--- a/src/views/base/equipmentPlcConnect/http.js
+++ b/src/views/base/equipmentPlcConnect/http.js
@@ -1,6 +1,13 @@
+/*
+ * @Author: zhp
+ * @Date: 2023-09-11 16:18:44
+ * @LastEditTime: 2023-09-12 14:25:01
+ * @LastEditors: zhp
+ * @Description:  
+ */
 import Mock from 'mockjs';
 
-const baseURL = 'http://192.168.1.49:48080/admin-api';
+const baseURL = 'http://192.168.1.188:48080/admin-api';
 
 Mock.setup({
 	timeout: 200,
diff --git a/src/views/core/analysis/LineChart.vue b/src/views/core/analysis/LineChart.vue
new file mode 100644
index 00000000..49c1565f
--- /dev/null
+++ b/src/views/core/analysis/LineChart.vue
@@ -0,0 +1,93 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-09-13 09:02:25
+ * @LastEditTime: 2023-09-13 10:33:20
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+// import resize from './mixins/resize'
+
+export default {
+  // mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    // autoResize: {
+    //   type: Boolean,
+    //   default: true
+    // }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  // watch: {
+  //   chartData: {
+  //     deep: true,
+  //     handler(val) {
+  //       this.setOptions(val)
+  //     }
+  //   }
+  // },
+  mounted() {
+    // this.$nextTick(() => {
+    //   this.initChart()
+    // })
+  },
+  // beforeDestroy() {
+  //   if (!this.chart) {
+  //     return
+  //   }
+  //   this.chart.dispose()
+  //   this.chart = null
+  // },
+  methods: {
+    initChart(xData, yData,lineName) {
+      console.log(xData,yData);
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(xData, yData, lineName)
+    },
+    setOptions(xData, yData, lineName) {
+      let seriesData = []
+        lineName.forEach((item,index) => {
+          seriesData.push({
+            name: item,
+            data: yData[index],
+            type: 'line',
+          })
+        })
+      this.chart.setOption({
+        xAxis: {
+          type: 'category',
+          data: xData
+        },
+        legend: {
+          data:lineName
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: seriesData
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index e0de210b..a3a2ca3f 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -1,159 +1,200 @@
-<!--
- * @Author: zhp
- * @Date: 2023-09-11 14:21:21
- * @LastEditTime: 2023-09-11 14:26:04
- * @LastEditors: zhp
- * @Description:
--->
 <template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData" />
-		<pagination
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
+    <line-chart ref="lineChart" />
+    <!-- <pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
+			@pagination="getDataList" /> -->
+  </div>
 </template>
 
 <script>
-import basicPage from '../../mixins/basic-page';
+// import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getCT } from '@/api/core/analysis/index';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+import lineChart from '../LineChart'
+// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
-const tableProps = [
-	{
-		prop: 'productionLineName',
-		label: '产线名称',
-		align: 'center',
-	},
-  {
-    prop: '',
-    label: '工段名称',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '进片数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '出片数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗面积/m²',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗比例/%',
-    align: 'center',
-  }
-];
+// const tableProps = [
+// 	// {
+//   //   prop: 'lineName',
+// 	// 	label: '产线',
+// 	// 	align: 'center',
+// 	// },
+//   // {
+//   //   prop: 'sum',
+//   //   label: '合计',
+//   //   align: 'center',
+//   // },
+//   // {
+//   //   prop: 'dynamicValue',
+//   //   label: 'dynamicName',
+//   //   align: 'center',
+//   //   children:[
+
+//   //   ]
+//   // }
+// ];
 
 export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getLineBindProductLogPage,
-			},
-			tableProps,
-			tableData: [],
-      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
-			formConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'productionLineId',
-					defaultSelect: '',
-					filterable: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
-				},
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-				},
-			],
-		};
-	},
-	components: {
-	},
-	created() {
-		this.getArr();
-	},
-	methods: {
-		getArr() {
-			const params = {
-				page: 1,
-				limit: 500,
-			};
-			this.optionArrUrl.forEach((item, index) => {
-				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
-				});
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.productionLineId = val.productionLineId;
-					this.listQuery.productId = val.productId;
-					this.listQuery.createTime = val.createTime;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
+  components: {
+    lineChart,
+  },
+  // mixins: [basicPage],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: getCT,
+      },
+      tableProps: [],
+      dataListLoading: false,
+      tableData: [],
+      listQuery: {
+        // time: ''
+        endTime: undefined,
+        lineId:undefined,
+        startTime:undefined
+      },
+      xData: [],
+      yData: [],
+      optionArrUrl: [getProductionLinePage],
+      formConfig: [
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          param: 'lineIds',
+          defaultSelect: '',
+          multiple: true,
+          filterable: true,
+        },
+        {
+          type: 'datePicker',
+          label: '时间',
+          dateType: 'datetime',
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'time',
+        },
+        {
+          type: 'button',
+          btnName: '搜索',
+          name: 'search',
+          color: 'primary',
+        }
+      ],
+    };
+  },
+  created() {
+    this.getArr();
+  },
+  methods: {
+    getArr() {
+      const params = {
+        page: 1,
+        limit: 500,
+      };
+      this.optionArrUrl.forEach((item, index) => {
+        item(params).then((response) => {
+          this.formConfig[index].selectOptions = response.data.list
+        });
+      });
+    },
+    getData() {
+      this.listQuery.lineId = '1672847052717821953'
+      this.listQuery.startTime = '1693497600000';
+      this.listQuery.endTime = '1693843200000';
+      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+        console.log(res)
+        let arr = [
+          {
+            prop: 'sectionName',
+            label: '工段',
+            align: 'center',
+          },
+          {
+            prop: 'equName',
+            label: '设备',
+            align: 'center',
+          },
+        ]
+        let eqArr= []
+        res.data.data.forEach((ele, index) => {
+          console.log(ele);
+          eqArr.push(ele.equName)
+        })
+        console.log(eqArr)
+        // console.log(res.data.nameData.slice(1))
+        res.data.nameData.forEach(item => {
+          if (eqArr[0] === item.parentId) {
+            const props = {
+              'prop': item.name,
+              'label': item.name,
+              'align': 'center'
+            }
+          }
+          arr[2].children.push(props)
+        })
+        let obj = {
+          lineName: res.data.data[0].lineName,
+          sum: res.data.data[0].sum,
+        }
+        res.data.data[0].data[0].children.forEach((item, index) => {
+          console.log(item)
+          // let data = 'data' + Number(index+1)
+          obj['' + item.dynamicName + ''] = item.dynamicValue
+        })
+        this.tableData = [obj]
+        console.log(this.tableData)
+        console.log(arr)
+        this.tableProps = arr
+        let xData = []
+
+        res.data.nameData.forEach(item => {
+          xData.push(item.name)
+          // arr[2].children.push(props)
+        })
+        let yData = []
+        res.data.data[0].data[0].children.forEach((item, index) => {
+          // console.log(item)
+          yData.push(item.dynamicValue)
+          // let data = 'data' + Number(index+1)
+          // obj['' + item.dynamicName + ''] = item.dynamicValue
+        })
+        console.log(this.yData)
+        this.$refs.lineChart.initChart(xData, yData)
+        // this.total = response.data.total;
+        // this.dataListLoading = false;
+      });
+    },
+    buttonClick(val) {
+      // console.log(val)
+      switch (val.btnName) {
+        case 'search':
+          // this.listQuery.pageNo = 1;
+          // this.listQuery.pageSize = 10;
+          this.getData()
+          break;
+        case 'reset':
+          this.$refs.searchBarForm.resetForm();
+          this.listQuery = {
+            pageSize: 10,
+            pageNo: 1,
+            total: 1,
+          };
+          this.getDataList();
+          break;
+        default:
+          console.log(val);
+      }
+    },
+  },
 };
 </script>
diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue
index ee6a5ce5..ed38a9fb 100644
--- a/src/views/core/analysis/yieldAnalysis/index.vue
+++ b/src/views/core/analysis/yieldAnalysis/index.vue
@@ -1,114 +1,95 @@
 <template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData" />
-		<pagination
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData" />
+    <line-chart ref="lineChart" />
+    <!-- <pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
+			@pagination="getDataList" /> -->
+  </div>
 </template>
 
 <script>
-import basicPage from '../../mixins/basic-page';
+// import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getYieldAnalysisPageData } from '@/api/core/analysis/index';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
-import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
+import lineChart from '../LineChart'
+// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
-const tableProps = [
-	{
-		prop: 'productionLineName',
-		label: '产线',
-		align: 'center',
-	},
-  {
-    prop: '',
-    label: '合计',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '进片数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '出片数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗数量/片',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗面积/m²',
-    align: 'center',
-  },
-  {
-    prop: '',
-    label: '损耗比例/%',
-    align: 'center',
-  }
-];
+// const tableProps = [
+// 	// {
+//   //   prop: 'lineName',
+// 	// 	label: '产线',
+// 	// 	align: 'center',
+// 	// },
+//   // {
+//   //   prop: 'sum',
+//   //   label: '合计',
+//   //   align: 'center',
+//   // },
+//   // {
+//   //   prop: 'dynamicValue',
+//   //   label: 'dynamicName',
+//   //   align: 'center',
+//   //   children:[
+
+//   //   ]
+//   // }
+// ];
 
 export default {
-	mixins: [basicPage],
+  components: {
+    lineChart,
+  },
+	// mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getLineBindProductLogPage,
+        getDataListURL: getYieldAnalysisPageData,
 			},
-			tableProps,
-			tableData: [],
-      optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
+      tableProps:[],
+      dataListLoading:false,
+      tableData: [],
+      listQuery: {
+        lineIds: [],
+        time: ''
+      },
+      xData: [],
+      yData:[],
+      optionArrUrl: [getProductionLinePage ],
 			formConfig: [
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-					param: 'productionLineId',
-					defaultSelect: '',
+          param: 'lineIds',
+          defaultSelect: '',
+          multiple:true,
 					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
-					dateType: 'daterange',
+					dateType: 'datetime',
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					param: 'createTime',
+          param: 'time',
 				},
 				{
 					type: 'button',
 					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-				},
+				}
 			],
 		};
 	},
-	components: {
-	},
 	created() {
 		this.getArr();
 	},
@@ -120,19 +101,109 @@ export default {
 			};
 			this.optionArrUrl.forEach((item, index) => {
 				item(params).then((response) => {
-					this.formConfig[index].selectOptions = response.data.list;
+					this.formConfig[index].selectOptions = response.data.list
 				});
 			});
-		},
-		buttonClick(val) {
+    },
+    getData() {
+      // this.listQuery.lineIds = ['1672847052717821953']
+      // this.listQuery.productId = val.productId;
+      // this.listQuery.time = '1694486098000';
+      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+        let arr = [
+          	{
+              prop: 'lineName',
+          		label: '产线',
+          		align: 'center',
+          	},
+            {
+              prop: 'sum',
+              label: '合计',
+              align: 'center',
+            },
+            {
+              prop: res.data.nameData[0].name,
+              label: res.data.nameData[0].name,
+              align: 'center',
+              children:[
+
+              ]
+            }
+        ]
+        console.log(res.data.nameData.slice(1))
+        res.data.nameData.slice(1).forEach(item => {
+          const props = {
+            'prop': item.name,
+            'label': item.name,
+            'align': 'center'
+          }
+          arr[2].children.push(props)
+        })
+        let tableDataArr =[]
+        res.data.data.forEach(item => {
+          let obj = {}
+          obj.lineName= item.lineName,
+           obj.sum= item.sum,
+          item.data.forEach((ele, index) => {
+            // console.log(ele)
+            ele.children.forEach((e) => {
+              console.log(e.dynamicName)
+              obj['' + e.dynamicName + ''] = e.dynamicValue
+              console.log(obj['' + e.dynamicName + '']);
+            })
+          })
+          tableDataArr.push(obj)
+        });
+        this.tableData = tableDataArr
+        console.log(this.tableData)
+        console.log(arr)
+        this.tableProps = arr
+        let xData = []
+
+        res.data.nameData.slice(1).forEach(item => {
+          xData.push(item.name)
+          // arr[2].children.push(props)
+        })
+        let yAllData = []
+        let lineName = []
+        res.data.data.forEach(item => {
+          let yData = []
+          lineName.push(item.lineName)
+          // let obj = {}
+          // obj.lineName = item.lineName,
+          //   obj.sum = item.sum,
+          item.data.forEach((ele, index) => {
+              // console.log(ele)
+            ele.children.forEach((e) => {
+              // let yData = []
+              yData.push(e.dynamicValue)
+              })
+            })
+          yAllData.push(yData)
+        });
+        console.log(lineName)
+        // res.data.data[0].data[0].children.forEach((item, index) => {
+        //   // console.log(item)
+        //   yData.push(item.dynamicValue)
+        //   // let data = 'data' + Number(index+1)
+        //   // obj['' + item.dynamicName + ''] = item.dynamicValue
+        // })
+        // console.log(this.yData)
+        this.$refs.lineChart.initChart(xData, yAllData, lineName)
+        // this.total = response.data.total;
+        // this.dataListLoading = false;
+      });
+    },
+    buttonClick(val) {
+      // console.log(val)
 			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.productionLineId = val.productionLineId;
-					this.listQuery.productId = val.productId;
-					this.listQuery.createTime = val.createTime;
-					this.getDataList();
+        case 'search':
+          this.listQuery.lineIds = val.lineIds ? val.lineIds :undefined
+          // this.listQuery.productId = val.productId;
+          this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined
+					// this.listQuery.pageNo = 1;
+          // this.listQuery.pageSize = 10;
+          this.getData()
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
diff --git a/src/views/core/monitoring/sectionStatisticsSearch/index.vue b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
index e09e0ea3..dfb69b59 100644
--- a/src/views/core/monitoring/sectionStatisticsSearch/index.vue
+++ b/src/views/core/monitoring/sectionStatisticsSearch/index.vue
@@ -7,78 +7,82 @@
 		<base-table
 			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
 			:table-data="tableData" />
-		<pagination
+		<!-- <pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
 			:total="listQuery.total"
-			@pagination="getDataList" />
+			@pagination="getDataList" /> -->
 	</div>
 </template>
 
 <script>
-import basicPage from '../../mixins/basic-page';
+// import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import { getLineBindProductLogPage } from '@/api/core/base/lineBindProductLog';
+import { getSectionDataSearch } from '@/api/core/monitoring';
 import { getProductionLinePage } from '@/api/core/base/productionLine';
 import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
 
 const tableProps = [
 	{
-		prop: 'productionLineName',
+    prop: 'proLineName',
 		label: '产线名称',
 		align: 'center',
 	},
   {
-    prop: '',
+    prop: 'sectionName',
     label: '工段名称',
     align: 'center',
   },
   {
-    prop: '',
+    prop: 'inputNum',
     label: '进片数量/片',
     align: 'center',
   },
   {
-    prop: '',
+    prop: 'outputNum',
     label: '出片数量/片',
     align: 'center',
   },
   {
-    prop: '',
+    prop: 'lossNum',
     label: '损耗数量/片',
     align: 'center',
   },
   {
-    prop: '',
+    prop: 'lossArea',
     label: '损耗面积/m²',
     align: 'center',
   },
   {
-    prop: '',
+    prop: 'lossRate',
     label: '损耗比例/%',
     align: 'center',
   }
 ];
 
 export default {
-	mixins: [basicPage],
+	// mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getLineBindProductLogPage,
+        getDataListURL: getSectionDataSearch,
 			},
 			tableProps,
-			tableData: [],
+      tableData: [],
+      listQuery: {
+        proLineId:undefined,
+        sectionId: undefined,
+        startTime: undefined,
+        endTime: undefined,
+      },
       optionArrUrl: [getProductionLinePage, getWorkshopSectionPage],
 			formConfig: [
 				{
 					type: 'select',
 					label: '产线',
 					selectOptions: [],
-					param: 'productionLineId',
+          param: 'proLineId',
 					defaultSelect: '',
 					filterable: true,
 				},
@@ -86,7 +90,7 @@ export default {
 					type: 'select',
 					label: '工段',
 					selectOptions: [],
-					param: 'productId',
+          param: 'sectionId',
 					defaultSelect: '',
 					filterable: true,
 				},
@@ -99,7 +103,7 @@ export default {
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-					param: 'createTime',
+					param: 'timeSlot',
 				},
 				{
 					type: 'button',
@@ -118,7 +122,8 @@ export default {
 	components: {
 	},
 	created() {
-		this.getArr();
+    this.getArr();
+    this.getDataList()
 	},
 	methods: {
 		getArr() {
@@ -131,16 +136,30 @@ export default {
 					this.formConfig[index].selectOptions = response.data.list;
 				});
 			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.productionLineId = val.productionLineId;
-					this.listQuery.productId = val.productId;
-					this.listQuery.createTime = val.createTime;
-					this.getDataList();
+    },
+    getDataList() {
+      // this.listQuery.proLineId = '1672847052717821953';
+      // this.listQuery.startTime = '1690626657000'
+      // this.listQuery.endTime = '1693564257000'
+      this.urlOptions.getDataListURL(this.listQuery).then(res => {
+        this.tableData = res.data
+        // this.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    buttonClick(val) {
+      console.log(val)
+      switch (val.btnName) {
+        case 'search':
+          console.log(val.timeSlot);
+
+					// this.listQuery.pageNo = 1;
+          // this.listQuery.pageSize = 10;
+          this.listQuery.proLineId = val.proLineId ? val.proLineId : undefined
+          this.listQuery.sectionId = val.sectionId ? val.sectionId : undefined
+          this.listQuery.startTime = val.timeSlot ? new Date(val.timeSlot[0]).getTime() : undefined
+          this.listQuery.endTime = val.timeSlot ? new Date(val.timeSlot[1]).getTime() : undefined
+          this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();