From 645ba2843fb8d6bcec9ce63a56831feedbf8f0a9 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Mon, 11 Sep 2023 15:53:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  11 +-
 package.json                                  |   3 +-
 src/views/core/monitoring/auto/index.vue      | 296 ++++++++++++++++++
 src/views/core/monitoring/data/index.vue      | 205 ++++++++++++
 .../monitoring/sectionStatistics/index.vue    | 240 ++++++++++++++
 5 files changed, 752 insertions(+), 3 deletions(-)
 create mode 100644 src/views/core/monitoring/auto/index.vue
 create mode 100644 src/views/core/monitoring/data/index.vue
 create mode 100644 src/views/core/monitoring/sectionStatistics/index.vue

diff --git a/.env.dev b/.env.dev
index 9e1d10f4..9c122cee 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,3 +1,10 @@
+###
+ # @Author: Do not edit
+ # @Date: 2023-08-29 09:40:39
+ # @LastEditTime: 2023-08-29 09:59:47
+ # @LastEditors: DY
+ # @Description: 
+### 
 # 开发环境配置
 ENV = 'development'
 
@@ -5,8 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.33:48080'
-VUE_APP_BASE_API = 'http://192.168.1.188:48080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/package.json b/package.json
index b7ef11cc..29018f12 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "crypto-js": "^4.0.0",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
@@ -74,6 +74,7 @@
     "vue-video-player": "^5.0.2",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.2",
+    "xlsx": "^0.18.5",
     "xml-js": "1.6.11"
   },
   "devDependencies": {
diff --git a/src/views/core/monitoring/auto/index.vue b/src/views/core/monitoring/auto/index.vue
new file mode 100644
index 00000000..6b90674a
--- /dev/null
+++ b/src/views/core/monitoring/auto/index.vue
@@ -0,0 +1,296 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2023-09-11 15:52:20
+ * @LastEditors: DY
+ * @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"
+			:selectWidth="55"
+			:table-data="tableData"
+			@selection-change="selectChange"
+			>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<!-- <div>
+			<el-button @click="down()">1111</el-button>
+			<el-table :data="tableData1" stripe style="width: 100%">
+				<el-table-column prop="date" label="日期" width="180" />
+				<el-table-column prop="name" label="姓名" />
+				<el-table-column prop="address" label="地址" />
+			</el-table>
+		</div> -->
+	</div>
+</template>
+
+<script>
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getFactoryPage,
+	exportFactoryExcel,
+} from '@/api/core/base/factory';
+import * as XLSX from 'xlsx'
+import FileSaver from 'file-saver'
+
+const tableData1 = [
+	{
+		date: '2016-05-03',
+		name: 'fom',
+		address: 'No'
+	},
+	{
+		date: '2016-05-02',
+		name: 'fom',
+		address: '189'
+	},
+	{
+		date: '2016-0225-03',
+		name: 'fom',
+		address: 'Ndddo'
+	},
+	{
+		date: '2016-04445-02',
+		name: 'fom',
+		address: '18edd9'
+	}
+]
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '报表类型',
+		align: 'center',
+	},
+	{
+		prop: 'createTime',
+		label: '统计开始时间',
+		align: 'center',
+		filter: parseTime,
+	},
+	{
+		prop: 'createTime3',
+		label: '统计结束时间',
+		align: 'center',
+		filter: parseTime,
+	},
+	{
+		prop: 'name',
+		label: '产线名称',
+		align: 'center',
+	},
+	{
+		prop: 'address',
+		label: '投入数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark44',
+		label: '产出数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark23',
+		label: '产出面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark145',
+		label: '损耗数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark22',
+		label: '损耗面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark1',
+		label: '损耗比例%',
+		align: 'center',
+	}
+];
+
+export default {
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getFactoryPage,
+				exportURL: exportFactoryExcel,
+			},
+			urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData1,
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+			tableProps,
+			tableBtn: [],
+			// tableBtn: [
+			// 	this.$auth.hasPermi(`base:factory:update`)
+			// 		? {
+			// 				type: 'edit',
+			// 				btnName: '编辑',
+			// 		  }
+			// 		: undefined,
+      //     this.$auth.hasPermi(`base:factory:delete`)
+			// 		? {
+			// 				type: 'delete',
+			// 				btnName: '删除',
+			// 		  }
+			// 		: undefined,
+			// ].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+          param: 'line'
+				},
+				{
+					type: 'select',
+					label: '报表类型',
+					selectOptions: [],
+					param: 'name',
+				},
+				{
+          type: 'datePicker',
+          label: '统计开始时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-ddTHH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				}
+			],
+		};
+	},
+	created() {},
+	methods: {
+		down() {
+			//选中导出时可更改此处数组
+      const selectedData = this.tableData1.slice(0, 2)
+			console.log('你好', selectedData, this.tableData1)
+			//构建导出的表格数据
+			const exportData = [
+				{date: '日期', name: '姓名', address: '地址'},
+				...selectedData
+			]
+			//注意表格上绑定id， 获取dom元素
+			const worksheet = XLSX.utils.json_to_sheet(exportData, { skipHeader: true })
+			const workbook = XLSX.utils.book_new()
+			XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1")
+			const workbookOutput = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' })
+			try {
+				FileSaver.saveAs(new Blob([workbookOutput], { type: 'application/octet-stream' }), 'hihi.xlsx')
+			} catch (e) {
+				console.log(e)
+			}
+    },
+		selectChange(val) {
+      console.log(val)
+      this.selectedList = val
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.code = val.code;
+					this.getDataList();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+		handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+	},
+};
+</script>
diff --git a/src/views/core/monitoring/data/index.vue b/src/views/core/monitoring/data/index.vue
new file mode 100644
index 00000000..5ca3f08e
--- /dev/null
+++ b/src/views/core/monitoring/data/index.vue
@@ -0,0 +1,205 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2023-08-31 15:15:31
+ * @LastEditors: DY
+ * @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"
+			:selectWidth="55"
+			:table-data="tableData"
+			@selection-change="selectChange"
+			>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import {
+	getFactoryPage,
+	exportFactoryExcel,
+} from '@/api/core/base/factory';
+
+const tableProps = [
+	{
+		prop: 'name',
+		label: '产线名称',
+		align: 'center',
+	},
+	{
+		prop: 'address',
+		label: '投入数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark44',
+		label: '产出数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark23',
+		label: '产出面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark145',
+		label: '损耗数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark22',
+		label: '损耗面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark1',
+		label: '损耗比例%',
+		align: 'center',
+	}
+];
+
+export default {
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getFactoryPage,
+				exportURL: exportFactoryExcel,
+			},
+			urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+			tableProps,
+			tableBtn: [],
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+          param: 'line'
+				},
+				{
+          type: 'datePicker',
+          label: '时间范围',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-ddTHH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				}
+			],
+		};
+	},
+	created() {},
+	methods: {
+		selectChange(val) {
+      console.log(val)
+      this.selectedList = val
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.code = val.code;
+					this.getDataList();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+		handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+	},
+};
+</script>
diff --git a/src/views/core/monitoring/sectionStatistics/index.vue b/src/views/core/monitoring/sectionStatistics/index.vue
new file mode 100644
index 00000000..0aeaf6ad
--- /dev/null
+++ b/src/views/core/monitoring/sectionStatistics/index.vue
@@ -0,0 +1,240 @@
+<!--
+ * @Author: Do not edit
+ * @Date: 2023-08-29 14:59:29
+ * @LastEditTime: 2023-08-31 15:31:40
+ * @LastEditors: DY
+ * @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"
+			:selectWidth="55"
+			:table-data="tableData"
+			@selection-change="selectChange"
+			>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+	</div>
+</template>
+
+<script>
+import { parseTime } from '../../mixins/code-filter';
+import {
+	getFactoryPage,
+	exportFactoryExcel,
+} from '@/api/core/base/factory';
+
+const tableProps = [
+	{
+		prop: 'code',
+		label: '产线类型',
+		align: 'center',
+	},
+	{
+		prop: 'createTime',
+		label: '统计开始时间',
+		align: 'center',
+		filter: parseTime,
+	},
+	{
+		prop: 'createTime3',
+		label: '统计结束时间',
+		align: 'center',
+		filter: parseTime,
+	},
+	{
+		prop: 'name',
+		label: '产线名称',
+		align: 'center',
+	},
+	{
+		prop: 'name1',
+		label: '工段名称',
+		align: 'center',
+	},
+	{
+		prop: 'address',
+		label: '投入数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark44',
+		label: '产出数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark23',
+		label: '产出面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark145',
+		label: '损耗数量/片',
+		align: 'center',
+	},
+	{
+		prop: 'remark22',
+		label: '损耗面积/㎡',
+		align: 'center',
+	},
+	{
+		prop: 'remark1',
+		label: '损耗比例%',
+		align: 'center',
+	}
+];
+
+export default {
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getFactoryPage,
+				exportURL: exportFactoryExcel,
+			},
+			urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+			tableProps,
+			tableBtn: [],
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+          param: 'line'
+				},
+				{
+					type: 'select',
+					label: '工段',
+					selectOptions: [],
+          param: 'section'
+				},
+				{
+					type: 'select',
+					label: '报表类型',
+					selectOptions: [],
+					param: 'name',
+				},
+				{
+          type: 'datePicker',
+          label: '统计开始时间',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-ddTHH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
+        },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				}
+			],
+		};
+	},
+	created() {},
+	methods: {
+		selectChange(val) {
+      console.log(val)
+      this.selectedList = val
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name;
+					this.listQuery.code = val.code;
+					this.getDataList();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		// 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+		handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+	},
+};
+</script>

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/2] =?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>