From 55f90a71028beba2b9b858ed1ae72d750b9e3f2f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 4 Sep 2023 09:41:31 +0800
Subject: [PATCH 01/21] =?UTF-8?q?add=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=89=A9=E4=BD=99=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/efficiency/index.vue   | 29 +++++++++++++++++++
 .../equipment/analysis/exception/index.vue    | 29 +++++++++++++++++++
 .../equipment/analysis/quality/index.vue      | 29 +++++++++++++++++++
 .../equipment/timing-diagram/output/index.vue | 29 +++++++++++++++++++
 .../equipment/timing-diagram/status/index.vue | 29 +++++++++++++++++++
 5 files changed, 145 insertions(+)
 create mode 100644 src/views/equipment/analysis/efficiency/index.vue
 create mode 100644 src/views/equipment/analysis/exception/index.vue
 create mode 100644 src/views/equipment/analysis/quality/index.vue
 create mode 100644 src/views/equipment/timing-diagram/output/index.vue
 create mode 100644 src/views/equipment/timing-diagram/status/index.vue

diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
new file mode 100644
index 00000000..08b33b34
--- /dev/null
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -0,0 +1,29 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备效率分析
+-->
+
+<template>
+    	<div class="app-container">
+            设备效率分析
+        </div>
+</template>
+
+<script>
+export default {
+    name: "EfficiencyAnalysis",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue
new file mode 100644
index 00000000..0acd5fd1
--- /dev/null
+++ b/src/views/equipment/analysis/exception/index.vue
@@ -0,0 +1,29 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备异常分析
+-->
+
+<template>
+    <div class="app-container">
+        设备异常分析
+    </div>
+</template>
+
+<script>
+export default {
+name: "ExceptionAnalysis",
+components: {},
+props: {},
+data() {
+    return {}
+},
+computed: {},
+methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
new file mode 100644
index 00000000..76409721
--- /dev/null
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -0,0 +1,29 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备质量分析
+-->
+
+<template>
+    <div class="app-container">
+        设备质量分析
+    </div>
+</template>
+
+<script>
+export default {
+name: "QualityAnalysis",
+components: {},
+props: {},
+data() {
+    return {}
+},
+computed: {},
+methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue
new file mode 100644
index 00000000..ac1927aa
--- /dev/null
+++ b/src/views/equipment/timing-diagram/output/index.vue
@@ -0,0 +1,29 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备产量时序图
+-->
+
+<template>
+    <div class="app-container">
+        设备产量时序图
+    </div>
+</template>
+
+<script>
+export default {
+name: "SGProduction",
+components: {},
+props: {},
+data() {
+    return {}
+},
+computed: {},
+methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
new file mode 100644
index 00000000..a3fe9e47
--- /dev/null
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -0,0 +1,29 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-09-04 09:34:52
+    description: 设备状态时序图
+-->
+
+<template>
+    <div class="app-container">
+        设备状态时序图
+    </div>
+</template>
+
+<script>
+export default {
+name: "SGStatus",
+components: {},
+props: {},
+data() {
+    return {}
+},
+computed: {},
+methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

From 6f71b6a7c0ed5c4800152e689e6ef2cb5369e208 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 4 Sep 2023 13:54:37 +0800
Subject: [PATCH 02/21] =?UTF-8?q?add=20=E4=BA=A7=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=88=86=E6=9E=90-=E5=9B=BE=E5=BD=A2=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/quality/components/lineChart.vue |  34 +++
 .../equipment/analysis/quality/index.vue      | 280 +++++++++++++++++-
 2 files changed, 301 insertions(+), 13 deletions(-)
 create mode 100644 src/views/equipment/analysis/quality/components/lineChart.vue

diff --git a/src/views/equipment/analysis/quality/components/lineChart.vue b/src/views/equipment/analysis/quality/components/lineChart.vue
new file mode 100644
index 00000000..546f3d2f
--- /dev/null
+++ b/src/views/equipment/analysis/quality/components/lineChart.vue
@@ -0,0 +1,34 @@
+<!-- 
+    filename: lineChart.vue
+    author: liubin
+    date: 2023-09-04 13:45:00
+    description: 
+-->
+
+<template>
+	<div class="line-chart">line LineChart</div>
+</template>
+
+<script>
+export default {
+	name: 'LineChart',
+	components: {},
+	props: ['config'],
+	data() {
+		return {
+            chart: null,
+        };
+	},
+	computed: {},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.line-chart {
+	margin: 24px;
+	padding: 12px;
+	background: #e1e1e1;
+	min-height: 200px;
+}
+</style>
diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
index 76409721..af911c12 100644
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -6,24 +6,278 @@
 -->
 
 <template>
-    <div class="app-container">
-        设备质量分析
-    </div>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun"></base-table>
+
+		<!-- 图形分析 dialog -->
+		<base-dialog
+			dialogTitle="图形视角"
+			:dialogVisible="dialogVisible"
+			width="60%"
+			@close="dialogClose"
+			@cancel="dialogClose"
+			@confirm="dialogClose">
+			<LineChart :config="lineChartConfig" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>
+import LineChart from './components/lineChart.vue';
+
 export default {
-name: "QualityAnalysis",
-components: {},
-props: {},
-data() {
-    return {}
-},
-computed: {},
-methods: {},
-}
+	name: 'QualityAnalysis',
+	components: { LineChart },
+	props: {},
+	data() {
+		return {
+			dialogVisible: false,
+			urls: {
+				page: '/analysis/equipment-analysis/quality',
+			},
+			mode: 'table', // defaults to 'table'
+			searchBarFormConfig: [
+				// 产品
+				{
+					__index: 'product',
+					type: 'select',
+					label: '产品',
+					placeholder: '请选择产品',
+					param: 'productId',
+				},
+				// 产线
+				{
+					__index: 'line',
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					param: 'lineId',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '列表数据',
+				// 	name: 'tableVersion',
+				// 	color: 'text btn-table',
+				// },
+				// {
+				// 	type: 'separate',
+				// },
+				{
+					type: 'button',
+					btnName: '图形分析',
+					name: 'graphVersion',
+					color: 'text btn-graph',
+				},
+			],
+			// 动态的 props
+			tableProps: [
+				{
+					// width: 160,
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'equipmentName',
+					label: '设备名称',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'products',
+					label: '产品名称',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'inQuantity',
+					label: '进片数量',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'outQuantity',
+					label: '出片数量',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'nokQuantity',
+					label: '破损/不合格数',
+					align: 'center',
+				},
+				{
+					// width: 160,
+					prop: 'passRate',
+					label: '合格率',
+					align: 'center',
+				},
+			],
+
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				lineId: null,
+				productId: null,
+				recordTime: [],
+			},
+			list: [],
+		};
+	},
+	computed: {},
+	created() {
+		this.fillLineOptions();
+		this.fillProductOptions();
+		this.getList();
+	},
+	methods: {
+		async fillLineOptions() {
+			const { data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			const cfg = this.searchBarFormConfig.find(
+				(item) => item.__index == 'line'
+			);
+			this.$set(
+				cfg,
+				'selectOptions',
+				data.map((item) => ({
+					id: item.id,
+					name: item.name,
+				}))
+			);
+		},
+
+		async fillProductOptions() {
+			const { data } = await this.$axios({
+				url: '/base/product/listAll',
+				method: 'get',
+			});
+			const cfg = this.searchBarFormConfig.find(
+				(item) => item.__index == 'product'
+			);
+			this.$set(
+				cfg,
+				'selectOptions',
+				data.map((item) => ({
+					id: item.id,
+					name: item.name,
+				}))
+			);
+		},
+
+		async getList() {
+			const { data } = await this.$axios({
+				url: '/analysis/equipment-analysis/quality',
+				method: 'get',
+				params: {
+					lineId: this.queryParams.lineId || null,
+					productId: this.queryParams.productId || null,
+					recordTime: this.queryParams.recordTime || null,
+				},
+			});
+			this.list = data.map((item) => ({
+				...item,
+				products: item.products.join(','),
+			}));
+		},
+
+		handleSearchBarBtnClick(btn) {
+			console.log('handleSearchBarBtnClick', btn);
+			switch (btn.btnName) {
+				case 'search':
+					this.queryParams.lineId = btn.lineId;
+					this.queryParams.productId = btn.productId;
+					this.queryParams.recordTime = btn.recordTime;
+					this.$nextTick(() => {
+						this.getList();
+					});
+					break;
+				case 'tableVersion':
+					this.dialogClose();
+					break;
+				case 'graphVersion':
+					this.dialogShow();
+					break;
+			}
+		},
+
+		handleEmitFun({ action, payload }) {},
+
+		dialogShow() {
+			this.dialogVisible = true;
+		},
+
+		dialogClose() {
+			this.dialogVisible = false;
+		},
+	},
+};
 </script>
-
 <style scoped lang="scss">
+:deep(.searchBar) {
+	.el-button.btn-table {
+		color: rgb(0, 130, 130);
+		border: 1px solid rgb(0, 130, 130);
+		padding: 8px 10px;
+		border: 1px solid rgb(0, 130, 130);
+		padding: 8px 10px;
 
+		&:hover {
+			border-color: #fff;
+			color: #fff;
+			background: rgb(0, 130, 130);
+		}
+	}
+	.el-button.btn-graph {
+		color: rgb(130, 0, 130);
+		border: 1px solid rgb(130, 0, 130);
+		padding: 8px 10px;
+
+		&:hover {
+			border-color: #fff;
+			color: #fff;
+			background: rgb(130, 0, 130);
+		}
+	}
+}
 </style>

From fbd78c6aa519400c54c38e27b80f310eead97222 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 4 Sep 2023 14:35:13 +0800
Subject: [PATCH 03/21] =?UTF-8?q?update=20=E4=BA=A7=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/quality/components/lineChart.vue | 29 ++++++--
 .../equipment/analysis/quality/index.vue      | 68 +++++++++++++++++--
 2 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/src/views/equipment/analysis/quality/components/lineChart.vue b/src/views/equipment/analysis/quality/components/lineChart.vue
index 546f3d2f..f3a93bc8 100644
--- a/src/views/equipment/analysis/quality/components/lineChart.vue
+++ b/src/views/equipment/analysis/quality/components/lineChart.vue
@@ -6,29 +6,44 @@
 -->
 
 <template>
-	<div class="line-chart">line LineChart</div>
+	<div class="line-chart"></div>
 </template>
 
 <script>
+import * as echarts from 'echarts';
+
 export default {
 	name: 'LineChart',
 	components: {},
 	props: ['config'],
 	data() {
 		return {
-            chart: null,
-        };
+			chart: null,
+		};
 	},
 	computed: {},
-	methods: {},
+	mounted() {
+		this.init();
+	},
+	beforeDestroy() {
+		if (this.chart) {
+			this.chart.dispose();
+		}
+	},
+	methods: {
+		init() {
+			console.log('thsi el', this.$el);
+			if (!this.chart) this.chart = echarts.init(this.$el);
+			this.chart.setOption(this.config);
+		},
+	},
 };
 </script>
 
 <style scoped lang="scss">
 .line-chart {
-	margin: 24px;
-	padding: 12px;
+	padding: 0 12px;
 	background: #e1e1e1;
-	min-height: 200px;
+	min-height: 320px;
 }
 </style>
diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
index af911c12..47de831b 100644
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -29,7 +29,7 @@
 			@close="dialogClose"
 			@cancel="dialogClose"
 			@confirm="dialogClose">
-			<LineChart :config="lineChartConfig" />
+			<LineChart v-if="dialogVisible" :config="lineChartConfig" />
 		</base-dialog>
 	</div>
 </template>
@@ -72,8 +72,8 @@ export default {
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
-					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@@ -150,7 +150,67 @@ export default {
 					align: 'center',
 				},
 			],
-
+			lineChartConfig: {
+				grid: {
+					top: 88,
+					left: 56,
+					right: 56,
+					bottom: 56,
+				},
+				legend: {
+					top: 0,
+					left: 0,
+					padding: 5,
+                    icon: 'roundRect',
+                    itemWidth: 12,
+                    itemHeight: 12,
+                    itemGap: 20,
+					textStyle: {
+                        fontSize: 14,
+                        lineHeight: 14
+                    },
+				},
+				xAxis: {
+					type: 'category',
+					data: ['设备1', '设备2', '设备3', '设备4', '设备5'],
+				},
+				yAxis: {
+					type: 'value',
+                    name: '合格率',
+                    nameLocation: 'end',
+                    nameTextStyle: {
+                        fontSize: 14,
+                        align: 'right'
+                    },
+                    nameGap: 26
+				},
+				series: [
+					{
+						name: '产线1',
+						data: [150, 230, 224, 218, 135],
+						type: 'line',
+						smooth: true,
+					},
+					{
+						name: '产线2',
+						data: [111, 224, 42, 11, 24],
+						type: 'line',
+						smooth: true,
+					},
+					{
+						name: '产线3',
+						data: [218, 112, 331, 44, 99],
+						type: 'line',
+						smooth: true,
+					},
+					{
+						name: '产线4',
+						data: [3, 221, 42, 553, 311],
+						type: 'line',
+						smooth: true,
+					},
+				],
+			},
 			// 查询参数
 			queryParams: {
 				pageNo: 1,

From ffedc7c256114044a5a1d10e5580c7d72f91076a Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 4 Sep 2023 14:50:52 +0800
Subject: [PATCH 04/21] =?UTF-8?q?add=20=E8=AE=BE=E5=A4=87=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/exception/index.vue    | 216 ++++++++++++++++--
 1 file changed, 201 insertions(+), 15 deletions(-)

diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue
index 0acd5fd1..47425378 100644
--- a/src/views/equipment/analysis/exception/index.vue
+++ b/src/views/equipment/analysis/exception/index.vue
@@ -6,24 +6,210 @@
 -->
 
 <template>
-    <div class="app-container">
-        设备异常分析
-    </div>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<!-- <method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" /> -->
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+	</div>
 </template>
 
 <script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
 export default {
-name: "ExceptionAnalysis",
-components: {},
-props: {},
-data() {
-    return {}
-},
-computed: {},
-methods: {},
-}
+	name: 'ExceptionAnalysis',
+	mixins: [basicPageMixin],
+	components: {},
+	props: {},
+	data() {
+		return {
+			searchBarKeys: ['name', 'code'],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-group:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-group:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'name', label: '设备分组名称', align: 'center' },
+				{ prop: 'code', label: '检测分组编码', align: 'center' },
+				{ prop: 'remark', label: '备注', align: 'center' },
+				{
+					_action: 'equipment-group-show-alert',
+					label: '报警',
+					align: 'center',
+					subcomponent: {
+						props: ['injectData'],
+						render: function (h) {
+							const _this = this;
+							return h(
+								'el-button',
+								{
+									props: { type: 'text', size: 'mini' },
+									on: {
+										click: function () {
+											console.log('inejctdata', _this.injectData);
+											_this.$emit('emitData', {
+												action: _this.injectData._action,
+												// value: _this.injectData.id,
+												value: _this.injectData,
+											});
+										},
+									},
+								},
+								'查看报警'
+							);
+						},
+					},
+				},
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '分组名称',
+					placeholder: '请输入设备分组名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '分组编码',
+					placeholder: '请输入设备分组编码',
+					param: 'codes',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-group:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '分组名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+				],
+				[
+					{
+						input: true,
+						label: '分组编码',
+						prop: 'code',
+						url: '/base/equipment-group/getCode',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							placeholder: '请输入备注',
+						},
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				code: null,
+				name: null,
+			},
+			// 表单参数
+			form: {},
+		};
+	},
+	computed: {},
+	methods: {
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getEquipmentGroupPage(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+	},
+};
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

From 55e8de1136a6e88d11cfcaa49d196d0d4271e897 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 4 Sep 2023 15:24:22 +0800
Subject: [PATCH 05/21] =?UTF-8?q?update=20=E5=AE=8C=E6=88=90=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=BC=82=E5=B8=B8=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/exception/index.vue    | 193 ++++++++----------
 1 file changed, 86 insertions(+), 107 deletions(-)

diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue
index 47425378..c8246cdb 100644
--- a/src/views/equipment/analysis/exception/index.vue
+++ b/src/views/equipment/analysis/exception/index.vue
@@ -65,57 +65,44 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
+				{ prop: 'lineName', label: '产线', align: 'center' },
+				{ prop: 'sectionName', label: '工段', align: 'center' },
+				{ prop: 'equipmentName', label: '设备', align: 'center' },
 				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '设备分组名称', align: 'center' },
-				{ prop: 'code', label: '检测分组编码', align: 'center' },
-				{ prop: 'remark', label: '备注', align: 'center' },
-				{
-					_action: 'equipment-group-show-alert',
-					label: '报警',
+					width: 188,
+					prop: 'mtbf',
+					label: '平均故障间隔时间[MTBF](h)',
 					align: 'center',
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									props: { type: 'text', size: 'mini' },
-									on: {
-										click: function () {
-											console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												// value: _this.injectData.id,
-												value: _this.injectData,
-											});
-										},
-									},
-								},
-								'查看报警'
-							);
-						},
-					},
 				},
+				{
+					width: 180,
+					prop: 'mttr',
+					label: '平均维修时间[MTTR](h)',
+					align: 'center',
+				},
+				{ prop: 'workTime', label: '工作时长(h)', align: 'center' },
+				{ prop: 'downTime', label: '故障时长(h)', align: 'center' },
+				{ prop: 'downCount', label: '故障次数', align: 'center' },
 			],
 			searchBarFormConfig: [
 				{
-					type: 'input',
-					label: '分组名称',
-					placeholder: '请输入设备分组名称',
-					param: 'name',
+					type: 'select',
+					label: '请选择月份',
+					placeholder: '请选择月份',
+					param: 'month',
+					selectOptions: Array(12)
+						.fill(0)
+						.map((v, i) => ({
+							id: i + 1,
+							name: `${i + 1}月`,
+						})),
 				},
 				{
-					type: 'input',
-					label: '分组编码',
-					placeholder: '请输入设备分组编码',
-					param: 'codes',
+					__index: 'line',
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					param: 'lineId',
 				},
 				{
 					type: 'button',
@@ -123,86 +110,78 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:equipment-group:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
 			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '分组名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-				],
-				[
-					{
-						input: true,
-						label: '分组编码',
-						prop: 'code',
-						url: '/base/equipment-group/getCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							placeholder: '请输入备注',
-						},
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
 			// 查询参数
 			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				code: null,
-				name: null,
+				lineId: null,
+				factoryId: null,
+				recordTime: null,
 			},
-			// 表单参数
-			form: {},
 		};
 	},
 	computed: {},
+	created() {
+		this.fillLineOptions();
+	},
 	methods: {
-		getList() {
+		async fillLineOptions() {
+			const { data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			const cfg = this.searchBarFormConfig.find(
+				(item) => item.__index == 'line'
+			);
+			this.$set(
+				cfg,
+				'selectOptions',
+				data.map((item) => ({
+					id: item.id,
+					name: item.name,
+				}))
+			);
+		},
+
+		async getList() {
 			this.loading = true;
 			// 执行查询
-			getEquipmentGroupPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
+			const { data } = await this.$axios({
+				url: '/analysis/equipment-analysis/efficiency',
+				method: 'get',
+				params: {
+					lineId: this.queryParams.lineId || null,
+					recordTime: this.queryParams.recordTime || null,
+				},
 			});
 		},
+
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					if (btn.month) {
+						this.queryParams.recordTime = [
+							moment()
+								.month(btn.month - 1)
+								.format('YYYY-MM')+'-01 00:00:00',
+							moment()
+								.month(btn.month)
+								.format('YYYY-MM')+'-01 00:00:00',
+						];
+					} else {
+						this.queryParams.recordTime = null;
+					}
+                    this.queryParams.lineId = btn.lineId || null;
+					this.handleQuery();
+					break;
+			}
+		},
+
 		/** 搜索按钮操作 */
 		handleQuery() {
-			this.queryParams.pageNo = 1;
+			// this.queryParams.pageNo = 1;
 			this.getList();
 		},
+
 		/** 重置按钮操作 */
 		resetQuery() {
 			this.resetForm('queryForm');

From e16b6f8ec415cd1ed53b3ec5ab7d4719223d5223 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 5 Sep 2023 16:07:50 +0800
Subject: [PATCH 06/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/timing-diagram/status/index.vue | 384 +++++++++++++++++-
 1 file changed, 372 insertions(+), 12 deletions(-)

diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index a3fe9e47..9ab4bcfa 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -6,24 +6,384 @@
 -->
 
 <template>
-    <div class="app-container">
-        设备状态时序图
-    </div>
+	<div class="app-container">
+		<h1>设备状态时序图</h1>
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<div class="main-area">
+			<div class="legend-row">
+				<div class="legend">
+					<div class="icon running"></div>
+					<div>运行中</div>
+				</div>
+				<div class="legend">
+					<div class="icon waiting"></div>
+					<div>待机</div>
+				</div>
+				<div class="legend">
+					<div class="icon fault"></div>
+					<div>故障</div>
+				</div>
+				<div class="legend">
+					<div class="icon lack"></div>
+					<div>缺料</div>
+				</div>
+				<div class="legend">
+					<div class="icon full"></div>
+					<div>满料</div>
+				</div>
+				<div class="legend">
+					<div class="icon stop"></div>
+					<div>停止运行</div>
+				</div>
+			</div>
+			<div class="graphs" v-if="graphList.length">
+				<!-- <div class="graph">
+					<h2 class="graph-title">设备1</h2>
+					<div class="graph-item running tick" data-time="00:00"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item lack tick" data-time="03:00"></div>
+					<div class="graph-item full tick" data-time="04:00"></div>
+					<div class="graph-item waiting tick" data-time="05:00"></div>
+					<div class="graph-item running tick" data-time="06:00"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item fault tick" data-time="08:00"></div>
+					<div class="graph-item waiting tick" data-time="09:00"></div>
+					<div class="graph-item running tick" data-time="10:00"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item lack tick" data-time="13:00"></div>
+					<div class="graph-item full tick" data-time="14:00"></div>
+					<div class="graph-item running tick" data-time="15:00"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item fault tick" data-time="18:00"></div>
+					<div class="graph-item running tick" data-time="19:00"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item running"></div>
+					<div class="graph-item stop tick" data-time="23:00"></div>
+				</div> -->
+				<div class="graph" v-for="eq in graphList" :key="eq.key">
+					<h2 class="graph-title">{{ eq.key }}</h2>
+					<div
+						v-for="blc in eq"
+						:key="blc.startTime"
+						class="graph-item-fixed tick"
+						:class="{
+							running: blc.status == 0,
+							fault: blc.status == 2,
+							stop: blc.status == 1,
+						}"
+						:style="{ width: blc.duration * 2 + 'px' }"
+						:data-time="new Date(blc.startTime).toLocaleTimeString()"></div>
+				</div>
+				<!-- <div class="graph">
+					<h2 class="graph-title">设备3</h2>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+					<div class="graph-item"></div>
+				</div> -->
+			</div>
+			<h2 v-else>请添加设备</h2>
+		</div>
+	</div>
 </template>
 
 <script>
 export default {
-name: "SGStatus",
-components: {},
-props: {},
-data() {
-    return {}
-},
-computed: {},
-methods: {},
-}
+	name: 'SGStatus',
+	components: {},
+	props: {},
+	data() {
+		return {
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					selectOptions: [],
+					param: 'lineId',
+				},
+				{
+					type: 'select',
+					label: '工段',
+					placeholder: '请选择工段',
+					selectOptions: [],
+					param: 'sectionId',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '设备对比',
+					name: 'compare',
+					color: 'warning',
+					plain: true,
+				},
+			],
+			queryParams: {
+				lineId: null,
+				sectionId: null,
+				recordTime: [],
+			},
+			graphList: [],
+			// demo: [
+			// 	[
+			// 		{
+			// 			equipmentName: '下片机',
+			// 			duration: 30,
+			// 			relativeDuration: 0.6,
+			// 			status: 0,
+			// 			startPos: 0,
+			//             startTime: 1691568181000,
+			// 		},
+			// 		{
+			// 			equipmentName: '下片机',
+			// 			duration: 20,
+			// 			relativeDuration: 0.4,
+			// 			status: 2,
+			// 			startPos: 30,
+			//             startTime: 1691569981000
+			// 		},
+			// 	],
+			// ],
+		};
+	},
+	computed: {},
+	created() {
+		this.initProductline();
+		this.initWorksection();
+		this.getList();
+	},
+	methods: {
+		/** 重置查询条件 */
+		initQuery() {
+			this.queryParams.lineId = null;
+			this.queryParams.sectionId = null;
+			this.queryParams.recordTime = [];
+		},
+
+		/** 对象到数组的转换 */
+		objectToArray(obj) {
+			return Object.keys(obj).map((key) => {
+				obj[key].sort((a, b) => a.startTime - b.startTime);
+				obj[key].key = key;
+				return obj[key];
+			});
+		},
+
+		async getList() {
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/status',
+				method: 'get',
+				params: this.queryParams,
+			});
+			if (code == 0) {
+				this.graphList = this.objectToArray(data);
+				console.log('graph list', this.graphList);
+			}
+		},
+
+		/** 准备产线数据 */
+		async initProductline() {
+			const { code, data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
+		/** 准备工段数据 */
+		async initWorksection() {
+			const { code, data } = await this.$axios({
+				url: '/base/workshop-section/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
+		handleSearchBarBtnClick({ btnName, ...payload }) {
+			switch (btnName) {
+				case 'search':
+					this.queryParams.lineId = payload.lineId || null;
+					this.queryParams.sectionId = payload.sectionId || null;
+					this.queryParams.recordTime = payload.recordTime || null;
+					this.getList();
+					break;
+                case 'compare':
+                    this.$message.info('暂未实现该接口')
+                    break;
+			}
+		},
+	},
+};
 </script>
 
 <style scoped lang="scss">
+.graph {
+	border: 1px solid #ccc;
+	padding: 12px 12px 28px 12px;
+	margin: 64px 0;
+	position: relative;
+	display: flex;
+}
 
+.graph-title {
+	position: absolute;
+	top: -64px;
+	left: -1px;
+	padding: 8px 18px;
+	background: #ccc;
+	font-size: 18px;
+	line-height: 1;
+}
+
+.graph-item,
+.graph-item-fixed {
+	height: 88px;
+	// width: 24px;
+	flex: 1;
+	// border: 1px solid #ccc;
+	position: relative;
+}
+
+.graph-item-fixed {
+	flex: unset;
+}
+
+.graph-item::before,
+.graph-item-fixed::before {
+	position: absolute;
+	bottom: -16px;
+	left: 0;
+	content: attr(data-time);
+	// font-size - js
+	// rotate - js
+	// color - js, default:
+	color: #777;
+	transform-origin: left top;
+	transform: rotate(12deg);
+}
+
+.graph-item-fixed::after,
+.graph-item::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	bottom: -3px;
+	display: inline-block;
+}
+
+.graph-item.tick::after,
+.graph-item-fixed.tick::after {
+	width: 1px;
+	height: 6px;
+	border-left: 1px solid #777;
+}
+
+.running {
+	background-color: #84f04e;
+}
+
+.waiting {
+	background-color: #409eff;
+}
+
+.fault {
+	background-color: #ea5b5b;
+}
+
+.full {
+	background-color: #e6a23c;
+}
+
+.lack {
+	background-color: #a69c8d;
+}
+
+.stop {
+	background-color: #000c;
+}
+
+.legend-row {
+	margin: 12px 0;
+	display: flex;
+	> .legend:not(:last-child) {
+		margin-right: 12px;
+	}
+
+	.legend {
+		display: flex;
+		align-items: center;
+	}
+
+	.icon {
+		width: 16px;
+		height: 16px;
+		margin-right: 8px;
+	}
+}
 </style>

From 2dd40261a44989d5a059a57b0b2159da38d92444 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 5 Sep 2023 16:26:52 +0800
Subject: [PATCH 07/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipment/timing-diagram/status/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 9ab4bcfa..08ac31c9 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -20,25 +20,25 @@
 					<div class="icon running"></div>
 					<div>运行中</div>
 				</div>
-				<div class="legend">
+				<!-- <div class="legend">
 					<div class="icon waiting"></div>
 					<div>待机</div>
-				</div>
+				</div> -->
 				<div class="legend">
 					<div class="icon fault"></div>
 					<div>故障</div>
 				</div>
-				<div class="legend">
+				<!-- <div class="legend">
 					<div class="icon lack"></div>
 					<div>缺料</div>
 				</div>
 				<div class="legend">
 					<div class="icon full"></div>
 					<div>满料</div>
-				</div>
+				</div> -->
 				<div class="legend">
 					<div class="icon stop"></div>
-					<div>停止运行</div>
+					<div>计划停机</div>
 				</div>
 			</div>
 			<div class="graphs" v-if="graphList.length">

From e5fed362341f0a7df3a39d728268f54cb81fd7f0 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 5 Sep 2023 16:30:24 +0800
Subject: [PATCH 08/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E4=BA=A7?=
 =?UTF-8?q?=E9=87=8F=E6=97=B6=E5=BA=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/timing-diagram/output/index.vue | 188 ++++++++++++++++--
 1 file changed, 173 insertions(+), 15 deletions(-)

diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue
index ac1927aa..714639f6 100644
--- a/src/views/equipment/timing-diagram/output/index.vue
+++ b/src/views/equipment/timing-diagram/output/index.vue
@@ -6,24 +6,182 @@
 -->
 
 <template>
-    <div class="app-container">
-        设备产量时序图
-    </div>
+	<div class="app-container">
+		<h1>设备产量时序图</h1>
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<div class="main-area">
+			<div class="legend-row">
+				<div class="legend">
+					<div class="icon running"></div>
+					<div>运行中</div>
+				</div>
+				<!-- <div class="legend">
+					<div class="icon waiting"></div>
+					<div>待机</div>
+				</div> -->
+				<div class="legend">
+					<div class="icon fault"></div>
+					<div>故障</div>
+				</div>
+				<!-- <div class="legend">
+					<div class="icon lack"></div>
+					<div>缺料</div>
+				</div>
+				<div class="legend">
+					<div class="icon full"></div>
+					<div>满料</div>
+				</div> -->
+				<div class="legend">
+					<div class="icon stop"></div>
+					<div>计划停机</div>
+				</div>
+			</div>
+			<div class="graphs" v-if="graphList.length">
+				<div class="graph" v-for="eq in graphList" :key="eq.key">
+					<h2 class="graph-title">{{ eq.key }}</h2>
+					<div
+						v-for="blc in eq"
+						:key="blc.startTime"
+						class="graph-item-fixed tick"
+						:class="{
+							running: blc.status == 0,
+							fault: blc.status == 2,
+							stop: blc.status == 1,
+						}"
+						:style="{ width: blc.duration * 2 + 'px' }"
+						:data-time="new Date(blc.startTime).toLocaleTimeString()"></div>
+				</div>
+			</div>
+			<h2 v-else>请添加设备</h2>
+		</div>
+	</div>
 </template>
 
 <script>
 export default {
-name: "SGProduction",
-components: {},
-props: {},
-data() {
-    return {}
-},
-computed: {},
-methods: {},
-}
+	name: 'SGProduction',
+	components: {},
+	props: {},
+	data() {
+		return {
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					selectOptions: [],
+					param: 'lineId',
+				},
+				{
+					type: 'select',
+					label: '工段',
+					placeholder: '请选择工段',
+					selectOptions: [],
+					param: 'sectionId',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					// format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'recordTime',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '设备对比',
+					name: 'compare',
+					color: 'warning',
+					plain: true,
+				},
+			],
+			queryParams: {
+				lineId: null,
+				sectionId: null,
+				recordTime: [],
+			},
+			graphList: [],
+		};
+	},
+	created() {
+		this.initProductline();
+		this.initWorksection();
+		this.getList();
+	},
+	methods: {
+		/** 重置查询条件 */
+		initQuery() {
+			this.queryParams.lineId = null;
+			this.queryParams.sectionId = null;
+			this.queryParams.recordTime = [];
+		},
+
+		async getList() {
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/status',
+				method: 'get',
+				params: this.queryParams,
+			});
+			if (code == 0) {
+				this.graphList = data;
+				console.log('graph list', this.graphList);
+			}
+		},
+
+		/** 准备产线数据 */
+		async initProductline() {
+			const { code, data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
+		/** 准备工段数据 */
+		async initWorksection() {
+			const { code, data } = await this.$axios({
+				url: '/base/workshop-section/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+	},
+};
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

From edc5d64acc8b5e9c19a05619ac6cf533b49d575b Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 5 Sep 2023 17:01:53 +0800
Subject: [PATCH 09/21] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=95=88=E7=8E=87=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/efficiency/index.vue   | 346 +++++++++++++++++-
 1 file changed, 331 insertions(+), 15 deletions(-)

diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
index 08b33b34..bf318e51 100644
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -6,24 +6,340 @@
 -->
 
 <template>
-    	<div class="app-container">
-            设备效率分析
-        </div>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="500px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
 export default {
-    name: "EfficiencyAnalysis",
-    components: {},
-    props: {},
-    data() {
-        return {}
-    },
-    computed: {},
-    methods: {},
-}
+	name: 'EfficiencyAnalysis',
+	mixins: [basicPageMixin],
+	components: {},
+	props: {},
+	data() {
+		return {
+			searchBarKeys: ['name', 'code'],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-group:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-group:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'name', label: '设备分组名称', align: 'center' },
+				{ prop: 'code', label: '检测分组编码', align: 'center' },
+				{ prop: 'remark', label: '备注', align: 'center' },
+				{
+					_action: 'equipment-group-show-alert',
+					label: '报警',
+					align: 'center',
+					subcomponent: {
+						props: ['injectData'],
+						render: function (h) {
+							const _this = this;
+							return h(
+								'el-button',
+								{
+									props: { type: 'text', size: 'mini' },
+									on: {
+										click: function () {
+											console.log('inejctdata', _this.injectData);
+											_this.$emit('emitData', {
+												action: _this.injectData._action,
+												// value: _this.injectData.id,
+												value: _this.injectData,
+											});
+										},
+									},
+								},
+								'查看报警'
+							);
+						},
+					},
+				},
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '分组名称',
+					placeholder: '请输入设备分组名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '分组编码',
+					placeholder: '请输入设备分组编码',
+					param: 'codes',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-group:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '分组名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+				],
+				[
+					{
+						input: true,
+						label: '分组编码',
+						prop: 'code',
+						url: '/base/equipment-group/getCode',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							placeholder: '请输入备注',
+						},
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				code: null,
+				name: null,
+			},
+			// 表单参数
+			form: {},
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, value }) {
+			const {
+				id: equipmentGroupId,
+				name: equipmentGroupName,
+				code: equipmentGroupCode,
+			} = value;
+			switch (action) {
+				case 'equipment-group-show-alert':
+					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
+					this.$router.push({
+						name: 'EquipmentGroupAlarm',
+						params: {
+							equipmentGroupId,
+							equipmentGroupCode,
+							equipmentGroupName,
+						},
+					});
+					break;
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getEquipmentGroupPage(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: undefined,
+				code: undefined,
+				name: undefined,
+				remark: undefined,
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加设备分组（用于同类型不同厂家的设备区分）';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			getEquipmentGroup(id).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改设备分组（用于同类型不同厂家的设备区分）';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					updateEquipmentGroup(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentGroup(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm(
+					'是否确认删除设备分组（用于同类型不同厂家的设备区分）编号为"' +
+						id +
+						'"的数据项?'
+				)
+				.then(function () {
+					return deleteEquipmentGroup(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm(
+					'是否确认导出所有设备分组（用于同类型不同厂家的设备区分）数据项?'
+				)
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentGroupExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(
+						response,
+						'设备分组（用于同类型不同厂家的设备区分）.xls'
+					);
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

From a505f34abcd7beee74a3f05e3362030c6df83887 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 09:56:05 +0800
Subject: [PATCH 10/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E4=BA=A7?=
 =?UTF-8?q?=E9=87=8F=E6=97=B6=E5=BA=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../output/components/lineChart.vue           |  49 ++++++
 .../equipment/timing-diagram/output/index.vue | 162 +++++++++++++-----
 .../equipment/timing-diagram/status/index.vue |   3 +
 3 files changed, 173 insertions(+), 41 deletions(-)
 create mode 100644 src/views/equipment/timing-diagram/output/components/lineChart.vue

diff --git a/src/views/equipment/timing-diagram/output/components/lineChart.vue b/src/views/equipment/timing-diagram/output/components/lineChart.vue
new file mode 100644
index 00000000..1ca240df
--- /dev/null
+++ b/src/views/equipment/timing-diagram/output/components/lineChart.vue
@@ -0,0 +1,49 @@
+<!-- 
+    filename: lineChart.vue
+    author: liubin
+    date: 2023-09-04 13:45:00
+    description: 
+-->
+
+<template>
+	<div class="line-chart"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+	name: 'LineChart',
+	components: {},
+	props: ['config'],
+	data() {
+		return {
+			chart: null,
+		};
+	},
+	computed: {},
+	mounted() {
+		this.init();
+	},
+	beforeDestroy() {
+		if (this.chart) {
+			this.chart.dispose();
+		}
+	},
+	methods: {
+		init() {
+			console.log('thsi el', this.$el);
+			if (!this.chart) this.chart = echarts.init(this.$el);
+			this.chart.setOption(this.config);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.line-chart {
+	padding: 0 12px;
+	// background: #e1e1e1;
+	min-height: 320px;
+}
+</style>
diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue
index 714639f6..3d78c2bd 100644
--- a/src/views/equipment/timing-diagram/output/index.vue
+++ b/src/views/equipment/timing-diagram/output/index.vue
@@ -15,46 +15,10 @@
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<div class="main-area">
-			<div class="legend-row">
-				<div class="legend">
-					<div class="icon running"></div>
-					<div>运行中</div>
-				</div>
-				<!-- <div class="legend">
-					<div class="icon waiting"></div>
-					<div>待机</div>
-				</div> -->
-				<div class="legend">
-					<div class="icon fault"></div>
-					<div>故障</div>
-				</div>
-				<!-- <div class="legend">
-					<div class="icon lack"></div>
-					<div>缺料</div>
-				</div>
-				<div class="legend">
-					<div class="icon full"></div>
-					<div>满料</div>
-				</div> -->
-				<div class="legend">
-					<div class="icon stop"></div>
-					<div>计划停机</div>
-				</div>
-			</div>
 			<div class="graphs" v-if="graphList.length">
-				<div class="graph" v-for="eq in graphList" :key="eq.key">
+				<div class="graph" v-for="eq,index in graphList" :key="eq.key">
 					<h2 class="graph-title">{{ eq.key }}</h2>
-					<div
-						v-for="blc in eq"
-						:key="blc.startTime"
-						class="graph-item-fixed tick"
-						:class="{
-							running: blc.status == 0,
-							fault: blc.status == 2,
-							stop: blc.status == 1,
-						}"
-						:style="{ width: blc.duration * 2 + 'px' }"
-						:data-time="new Date(blc.startTime).toLocaleTimeString()"></div>
+					<LineChart :key="eq.key + '__linechart'" :config="getRealConfig(index)" />
 				</div>
 			</div>
 			<h2 v-else>请添加设备</h2>
@@ -63,9 +27,11 @@
 </template>
 
 <script>
+import LineChart from './components/lineChart.vue';
+
 export default {
 	name: 'SGProduction',
-	components: {},
+	components: { LineChart },
 	props: {},
 	data() {
 		return {
@@ -119,9 +85,57 @@ export default {
 			queryParams: {
 				lineId: null,
 				sectionId: null,
+				equipmentId: null,
 				recordTime: [],
 			},
 			graphList: [],
+			templateConfig: {
+				grid: {
+					top: 88,
+					left: 56,
+					right: 56,
+					bottom: 56,
+				},
+				legend: {
+					top: 0,
+					left: 0,
+					padding: 5,
+					icon: 'roundRect',
+					itemWidth: 12,
+					itemHeight: 12,
+					itemGap: 20,
+					textStyle: {
+						fontSize: 14,
+						lineHeight: 14,
+					},
+				},
+				xAxis: {
+					type: 'category',
+					data: Array(24)
+						.fill(1)
+						.map((item, index) => `${index}:00`),
+				},
+				yAxis: {
+					type: 'value',
+					name: '产量',
+					nameLocation: 'end',
+					nameTextStyle: {
+						fontSize: 14,
+						align: 'right',
+					},
+					nameGap: 26,
+				},
+				series: [
+					{
+						name: '产线1',
+						data: Array(24)
+							.fill(1)
+							.map(() => Math.random() * 100),
+						type: 'line',
+						smooth: true,
+					},
+				],
+			},
 		};
 	},
 	created() {
@@ -130,25 +144,91 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleSearchBarBtnClick({ btnName, ...payload }) {
+			switch (btnName) {
+				case 'search':
+					this.queryParams.lineId = payload.lineId || null;
+					this.queryParams.sectionId = payload.sectionId || null;
+					this.queryParams.equipmentId = payload.equipmentId || null;
+					this.queryParams.recordTime = payload.recordTime || null;
+					this.getList();
+					break;
+				case 'compare':
+					this.$message.info('暂未实现该接口');
+					break;
+			}
+		},
+
 		/** 重置查询条件 */
 		initQuery() {
 			this.queryParams.lineId = null;
 			this.queryParams.sectionId = null;
+			this.queryParams.equipmentId = null;
 			this.queryParams.recordTime = [];
 		},
 
+		/** 对象到数组的转换 */
+		objectToArray(obj) {
+			return Object.keys(obj).map((key) => {
+				obj[key].sort((a, b) => a.startTime - b.startTime);
+				obj[key].key = key;
+				return obj[key];
+			});
+		},
+
 		async getList() {
 			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
+				url: '/analysis/equipment-analysis/quantity',
 				method: 'get',
 				params: this.queryParams,
 			});
 			if (code == 0) {
-				this.graphList = data;
+				this.graphList = this.objectToArray(data);
+				// const eq1 = [
+				// 	{ totalQuantity: 20, startTime: 1693964578000 },
+				// 	{ totalQuantity: 43, startTime: 1693964678000 },
+				// 	{ totalQuantity: 12, startTime: 1693964778000 },
+				// 	{ totalQuantity: 11, startTime: 1693964878000 },
+				// 	{ totalQuantity: 98, startTime: 1693965478000 },
+				// 	{ totalQuantity: 87, startTime: 1693965578000 },
+				// ];
+				// eq1.key = 'SS1';
+				// const eq2 = [
+				// 	{ totalQuantity: 23, startTime: 1693961578000 },
+				// 	{ totalQuantity: 42, startTime: 1693964578000 },
+				// 	{ totalQuantity: 51, startTime: 1693965578000 },
+				// 	{ totalQuantity: 18, startTime: 1693966578000 },
+				// 	{ totalQuantity: 77, startTime: 1693966778000 },
+				// 	{ totalQuantity: 38, startTime: 1693967578000 },
+				// 	{ totalQuantity: 57, startTime: 1693969578000 },
+				// ];
+				// eq2.key = 'SS2';
+				// this.graphList = [eq1, eq2];
 				console.log('graph list', this.graphList);
 			}
 		},
 
+		/** 获得设备产量 */
+		getEquipmentQuantity(equipmentArr) {
+			return equipmentArr.map((item) => item.totalQuantity);
+		},
+
+		/** 获得设备产量的时间 */
+		getTimeinfo(equipmentArr) {
+			return equipmentArr.map((item) => new Date(item.startTime).toLocaleTimeString());
+		},
+
+		getRealConfig(index) {
+			// if (!this.graphList || this.graphList.length == 0) return;
+			const config = JSON.parse(JSON.stringify(this.templateConfig));
+			// config.legend.data = this.graphList[index].key;
+			config.series[0].name = this.graphList[index]?.key;
+			// console.log("this.graphList?.[index]", this.graphList?.[index]);
+			config.series[0].data = this.getEquipmentQuantity(this.graphList?.[index] || []);
+			config.xAxis.data = this.getTimeinfo(this.graphList?.[index] || []);
+			return config;
+		},
+
 		/** 准备产线数据 */
 		async initProductline() {
 			const { code, data } = await this.$axios({
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 08ac31c9..57eda27c 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -173,6 +173,7 @@ export default {
 			queryParams: {
 				lineId: null,
 				sectionId: null,
+				equipmentId: null,
 				recordTime: [],
 			},
 			graphList: [],
@@ -208,6 +209,7 @@ export default {
 		/** 重置查询条件 */
 		initQuery() {
 			this.queryParams.lineId = null;
+			this.queryParams.equipmentId = null;
 			this.queryParams.sectionId = null;
 			this.queryParams.recordTime = [];
 		},
@@ -270,6 +272,7 @@ export default {
 				case 'search':
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
+					this.queryParams.equipmentId = payload.equipmentId || null;
 					this.queryParams.recordTime = payload.recordTime || null;
 					this.getList();
 					break;

From e42b7035fe1acef94e9f2b5beb0b13f2a24e0d6f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 10:39:32 +0800
Subject: [PATCH 11/21] =?UTF-8?q?update=20=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E5=BA=8F=E5=9B=BE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/timing-diagram/output/index.vue | 73 +++++++++++++++++--
 .../equipment/timing-diagram/status/index.vue | 63 +++++++++++++++-
 2 files changed, 128 insertions(+), 8 deletions(-)

diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue
index 3d78c2bd..50306c55 100644
--- a/src/views/equipment/timing-diagram/output/index.vue
+++ b/src/views/equipment/timing-diagram/output/index.vue
@@ -16,13 +16,36 @@
 
 		<div class="main-area">
 			<div class="graphs" v-if="graphList.length">
-				<div class="graph" v-for="eq,index in graphList" :key="eq.key">
+				<div class="graph" v-for="(eq, index) in graphList" :key="eq.key">
 					<h2 class="graph-title">{{ eq.key }}</h2>
-					<LineChart :key="eq.key + '__linechart'" :config="getRealConfig(index)" />
+					<LineChart
+						:key="eq.key + '__linechart'"
+						:config="getRealConfig(index)" />
 				</div>
 			</div>
 			<h2 v-else>请添加设备</h2>
 		</div>
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			dialogTitle="添加设备"
+			:dialogVisible="open"
+			width="500px"
+			@close="open = false"
+			@cancel="open = false"
+			@confirm="submitForm">
+			<el-select
+				v-if="open"
+				style="width: 100%"
+				v-model="queryParams.equipmentId"
+				placeholder="请选择一个设备">
+				<el-option
+					v-for="eq in eqList"
+					:key="eq.id"
+					:value="eq.id"
+					:label="eq.name"></el-option>
+			</el-select>
+		</base-dialog>
 	</div>
 </template>
 
@@ -88,6 +111,8 @@ export default {
 				equipmentId: null,
 				recordTime: [],
 			},
+			open: false,
+			eqList: [],
 			graphList: [],
 			templateConfig: {
 				grid: {
@@ -141,6 +166,7 @@ export default {
 	created() {
 		this.initProductline();
 		this.initWorksection();
+		this.initEquipment();
 		this.getList();
 	},
 	methods: {
@@ -154,7 +180,7 @@ export default {
 					this.getList();
 					break;
 				case 'compare':
-					this.$message.info('暂未实现该接口');
+					this.open = true;
 					break;
 			}
 		},
@@ -215,7 +241,9 @@ export default {
 
 		/** 获得设备产量的时间 */
 		getTimeinfo(equipmentArr) {
-			return equipmentArr.map((item) => new Date(item.startTime).toLocaleTimeString());
+			return equipmentArr.map((item) =>
+				new Date(item.startTime).toLocaleTimeString()
+			);
 		},
 
 		getRealConfig(index) {
@@ -224,11 +252,29 @@ export default {
 			// config.legend.data = this.graphList[index].key;
 			config.series[0].name = this.graphList[index]?.key;
 			// console.log("this.graphList?.[index]", this.graphList?.[index]);
-			config.series[0].data = this.getEquipmentQuantity(this.graphList?.[index] || []);
+			config.series[0].data = this.getEquipmentQuantity(
+				this.graphList?.[index] || []
+			);
 			config.xAxis.data = this.getTimeinfo(this.graphList?.[index] || []);
 			return config;
 		},
 
+		/** 准备设备数据 */
+		async initEquipment() {
+			const { code, data } = await this.$axios({
+				url: '/base/equipment/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.eqList = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
 		/** 准备产线数据 */
 		async initProductline() {
 			const { code, data } = await this.$axios({
@@ -260,6 +306,23 @@ export default {
 				});
 			}
 		},
+
+		async submitForm() {
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/quantity',
+				method: 'get',
+				params: this.queryParams,
+			});
+			if (code == 0) {
+				const newEqlist = this.objectToArray(data);
+				if (!newEqlist || newEqlist.length == 0) {
+					this.$message.error('该设备没有产量数据');
+					return;
+				}
+				this.graphList.push(newEqlist[0]);
+			}
+			this.open = false;
+		}
 	},
 };
 </script>
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 57eda27c..2aafc1c6 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -113,6 +113,27 @@
 			</div>
 			<h2 v-else>请添加设备</h2>
 		</div>
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			dialogTitle="添加设备"
+			:dialogVisible="open"
+			width="500px"
+			@close="open = false"
+			@cancel="open = false"
+			@confirm="submitForm">
+			<el-select
+				v-if="open"
+				style="width: 100%"
+				v-model="queryParams.equipmentId"
+				placeholder="请选择一个设备">
+				<el-option
+					v-for="eq in eqList"
+					:key="eq.id"
+					:value="eq.id"
+					:label="eq.name"></el-option>
+			</el-select>
+		</base-dialog>
 	</div>
 </template>
 
@@ -177,6 +198,8 @@ export default {
 				recordTime: [],
 			},
 			graphList: [],
+			open: false,
+			eqList: [],
 			// demo: [
 			// 	[
 			// 		{
@@ -203,6 +226,7 @@ export default {
 	created() {
 		this.initProductline();
 		this.initWorksection();
+		this.initEquipment();
 		this.getList();
 	},
 	methods: {
@@ -235,6 +259,22 @@ export default {
 			}
 		},
 
+		/** 准备设备数据 */
+		async initEquipment() {
+			const { code, data } = await this.$axios({
+				url: '/base/equipment/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.eqList = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
 		/** 准备产线数据 */
 		async initProductline() {
 			const { code, data } = await this.$axios({
@@ -276,11 +316,28 @@ export default {
 					this.queryParams.recordTime = payload.recordTime || null;
 					this.getList();
 					break;
-                case 'compare':
-                    this.$message.info('暂未实现该接口')
-                    break;
+				case 'compare':
+					this.open = true;
+					break;
 			}
 		},
+
+		async submitForm() {
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/status',
+				method: 'get',
+				params: this.queryParams,
+			});
+			if (code == 0) {
+				const newEqlist = this.objectToArray(data);
+				if (!newEqlist || newEqlist.length == 0) {
+					this.$message.error('该设备没有状态数据');
+					return;
+				}
+				this.graphList.push(newEqlist[0]);
+			}
+			this.open = false;
+		},
 	},
 };
 </script>

From 052f54833c7c7f153b7a73d17f7d5911c7968ffe Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 11:28:10 +0800
Subject: [PATCH 12/21] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/efficiency/index.vue   | 250 +++++++++---------
 1 file changed, 123 insertions(+), 127 deletions(-)

diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
index bf318e51..5643d3f3 100644
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -15,17 +15,18 @@
 
 		<!-- 列表 -->
 		<base-table
+			class="base-table__margin"
 			:table-props="tableProps"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn
+			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
 				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
+				@clickBtn="handleTableBtnClick" /> -->
 		</base-table>
 
 		<!-- 分页组件 -->
@@ -44,7 +45,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<!-- some thing ... -->
 		</base-dialog>
 	</div>
 </template>
@@ -61,34 +62,99 @@ export default {
 	data() {
 		return {
 			searchBarKeys: ['name', 'code'],
-			tableBtn: [
-				this.$auth.hasPermi('base:equipment-group:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-group:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
+			// tableBtn: [
+			// 	this.$auth.hasPermi('base:equipment-group:update')
+			// 		? {
+			// 				type: 'edit',
+			// 				btnName: '修改',
+			// 		  }
+			// 		: undefined,
+			// 	this.$auth.hasPermi('base:equipment-group:delete')
+			// 		? {
+			// 				type: 'delete',
+			// 				btnName: '删除',
+			// 		  }
+			// 		: undefined,
+			// ].filter((v) => v),
 			tableProps: [
+				{ prop: 'duration', label: '工厂', align: 'center' },
+				{ prop: 'duration', label: '产线', align: 'center' },
+				{ prop: 'duration', label: '工段', align: 'center' },
+				{ prop: 'duration', label: '设备', align: 'center' },
 				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+					label: '有效时间',
+					align: 'center',
+					children: [
+						{
+							width: 128,
+							prop: 'duration',
+							label: '工作时长',
+							align: 'center',
+						},
+						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+					],
 				},
-				{ prop: 'name', label: '设备分组名称', align: 'center' },
-				{ prop: 'code', label: '检测分组编码', align: 'center' },
-				{ prop: 'remark', label: '备注', align: 'center' },
 				{
-					_action: 'equipment-group-show-alert',
-					label: '报警',
+					label: '关机时间',
+					align: 'center',
+					children: [
+						{
+							width: 128,
+							prop: 'duration',
+							label: '停机时长',
+							align: 'center',
+						},
+						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+					],
+				},
+				{
+					label: '中断损失',
+					align: 'center',
+					children: [
+						{
+							width: 128,
+							prop: 'duration',
+							label: '故障时长',
+							align: 'center',
+						},
+						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+						{
+							width: 128,
+							prop: 'duration1',
+							label: '时间开动率',
+							align: 'center',
+						},
+					],
+				},
+				{
+					label: '速度损失',
+					align: 'center',
+					children: [
+						{
+							width: 128,
+							prop: 'duration',
+							label: '实际加工速度',
+							align: 'center',
+						},
+						{
+							width: 128,
+							prop: 'duration1',
+							label: '理论加工速度',
+							align: 'center',
+						},
+						{
+							width: 128,
+							prop: 'duration1',
+							label: '速度开动率',
+							align: 'center',
+						},
+					],
+				},
+				{ prop: 'duration1', label: 'OEE', align: 'center' },
+				{ prop: 'duration1', label: 'TEEP', align: 'center' },
+				{
+					_action: 'view-trend',
+					label: '趋势',
 					align: 'center',
 					subcomponent: {
 						props: ['injectData'],
@@ -109,7 +175,7 @@ export default {
 										},
 									},
 								},
-								'查看报警'
+								'查看趋势'
 							);
 						},
 					},
@@ -117,16 +183,30 @@ export default {
 			],
 			searchBarFormConfig: [
 				{
-					type: 'input',
-					label: '分组名称',
-					placeholder: '请输入设备分组名称',
+					type: 'select',
+					label: '工厂',
+					placeholder: '请选择工厂',
 					param: 'name',
+					selectOptions: [],
 				},
 				{
-					type: 'input',
-					label: '分组编码',
-					placeholder: '请输入设备分组编码',
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
 					param: 'codes',
+					selectOptions: [],
+				},
+				// 选项切换
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'createTime',
 				},
 				{
 					type: 'button',
@@ -138,52 +218,19 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-group:create')
-						? 'button'
-						: '',
-					btnName: '新增',
+					type: 'button',
+					btnName: 'OEE',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
-				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '分组名称',
-						prop: 'name',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						// bind: {
-						// 	disabled: true, // some condition, like detail mode...
-						// }
-					},
-				],
-				[
-					{
-						input: true,
-						label: '分组编码',
-						prop: 'code',
-						url: '/base/equipment-group/getCode',
-					},
-				],
-				[
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							placeholder: '请输入备注',
-						},
-					},
-				],
+				{
+					type: 'button',
+					btnName: 'TEEP',
+					name: 'add',
+					plain: true,
+					color: 'warning',
+				},
 			],
 			// 是否显示弹出层
 			open: false,
@@ -264,16 +311,6 @@ export default {
 			this.open = true;
 			this.title = '添加设备分组（用于同类型不同厂家的设备区分）';
 		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentGroup(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备分组（用于同类型不同厂家的设备区分）';
-			});
-		},
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
@@ -297,47 +334,6 @@ export default {
 				});
 			});
 		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm(
-					'是否确认删除设备分组（用于同类型不同厂家的设备区分）编号为"' +
-						id +
-						'"的数据项?'
-				)
-				.then(function () {
-					return deleteEquipmentGroup(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm(
-					'是否确认导出所有设备分组（用于同类型不同厂家的设备区分）数据项?'
-				)
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentGroupExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(
-						response,
-						'设备分组（用于同类型不同厂家的设备区分）.xls'
-					);
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
 	},
 };
 </script>

From cd437ed7d3e4cdad53f511dad51c9081d9dddaf6 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 14:33:49 +0800
Subject: [PATCH 13/21] =?UTF-8?q?update=20=E6=95=88=E7=8E=87=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/lb/basicPageMixin.js               |   1 -
 .../equipment/analysis/efficiency/index.vue   | 314 +++++++++++-------
 2 files changed, 193 insertions(+), 122 deletions(-)

diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
index 3a59732b..8eab17ff 100644
--- a/src/mixins/lb/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -31,7 +31,6 @@ export default {
 			// dialogFormConfig: [], // 占位
 		};
 	},
-	mounted() {},
 	methods: {
 		// 过滤后端传回的详情数据
 		filterData(data, keys) {
diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
index 5643d3f3..2898a8c2 100644
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -17,10 +17,10 @@
 		<base-table
 			class="base-table__margin"
 			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
 			:table-data="list"
 			@emitFun="handleEmitFun">
+			<!-- :page="queryParams.pageNo"
+			:limit="queryParams.pageSize" -->
 			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -30,28 +30,34 @@
 		</base-table>
 
 		<!-- 分页组件 -->
-		<pagination
+		<!-- <pagination
 			v-show="total > 0"
 			:total="total"
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
+			@pagination="getList" /> -->
 
 		<!-- 对话框(添加 / 修改) -->
 		<base-dialog
-			:dialogTitle="title"
+			:dialogTitle="visualizationOpen ? '设备可视化' : '查看趋势'"
 			:dialogVisible="open"
-			width="500px"
+			:width="visualizationOpen ? '80%' : '700px'"
+			@closed="closed"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<!-- some thing ... -->
+			<div class="visualization" v-if="visualizationOpen">
+				<h1>设备可视化</h1>
+			</div>
+			<div v-if="trendOpen">
+				<h1>查看趋势</h1>
+			</div>
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
+// import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 export default {
@@ -61,7 +67,9 @@ export default {
 	props: {},
 	data() {
 		return {
-			searchBarKeys: ['name', 'code'],
+			open: false,
+			visualizationOpen: false,
+			trendOpen: false,
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:equipment-group:update')
 			// 		? {
@@ -77,21 +85,27 @@ export default {
 			// 		: undefined,
 			// ].filter((v) => v),
 			tableProps: [
-				{ prop: 'duration', label: '工厂', align: 'center' },
-				{ prop: 'duration', label: '产线', align: 'center' },
-				{ prop: 'duration', label: '工段', align: 'center' },
-				{ prop: 'duration', label: '设备', align: 'center' },
+				{ prop: 'factoryName', label: '工厂', align: 'center' },
+				{ prop: 'lineName', label: '产线', align: 'center' },
+				{ prop: 'sectionName', label: '工段', align: 'center' },
+				{ prop: 'equipmentName', label: '设备', align: 'center' },
 				{
 					label: '有效时间',
 					align: 'center',
 					children: [
 						{
 							width: 128,
-							prop: 'duration',
+							prop: 'workTime',
 							label: '工作时长',
 							align: 'center',
 						},
-						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+						{
+							width: 128,
+							prop: 'workRate',
+							label: '百分比',
+							align: 'center',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+						},
 					],
 				},
 				{
@@ -100,11 +114,11 @@ export default {
 					children: [
 						{
 							width: 128,
-							prop: 'duration',
+							prop: 'stopTime',
 							label: '停机时长',
 							align: 'center',
 						},
-						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+						{ width: 128, prop: 'stopRate', label: '百分比', align: 'center' },
 					],
 				},
 				{
@@ -113,16 +127,18 @@ export default {
 					children: [
 						{
 							width: 128,
-							prop: 'duration',
+							prop: 'downTime',
 							label: '故障时长',
 							align: 'center',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
-						{ width: 128, prop: 'duration1', label: '百分比', align: 'center' },
+						{ width: 128, prop: 'downRate', label: '百分比', align: 'center' },
 						{
 							width: 128,
-							prop: 'duration1',
+							prop: 'timeEfficiency',
 							label: '时间开动率',
 							align: 'center',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
@@ -132,26 +148,37 @@ export default {
 					children: [
 						{
 							width: 128,
-							prop: 'duration',
+							prop: 'realProcSpeed',
 							label: '实际加工速度',
 							align: 'center',
 						},
 						{
 							width: 128,
-							prop: 'duration1',
+							prop: 'designProcSpeed',
 							label: '理论加工速度',
 							align: 'center',
 						},
 						{
 							width: 128,
-							prop: 'duration1',
+							prop: 'peEfficiency',
 							label: '速度开动率',
 							align: 'center',
+							filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 						},
 					],
 				},
-				{ prop: 'duration1', label: 'OEE', align: 'center' },
-				{ prop: 'duration1', label: 'TEEP', align: 'center' },
+				{
+					prop: 'oee',
+					label: 'OEE',
+					align: 'center',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
+				{
+					prop: 'teep',
+					label: 'TEEP',
+					align: 'center',
+					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				},
 				{
 					_action: 'view-trend',
 					label: '趋势',
@@ -163,7 +190,7 @@ export default {
 							return h(
 								'el-button',
 								{
-									props: { type: 'text', size: 'mini' },
+									props: { type: 'text' },
 									on: {
 										click: function () {
 											console.log('inejctdata', _this.injectData);
@@ -186,27 +213,54 @@ export default {
 					type: 'select',
 					label: '工厂',
 					placeholder: '请选择工厂',
-					param: 'name',
+					param: 'factoryId',
 					selectOptions: [],
 				},
 				{
 					type: 'select',
 					label: '产线',
 					placeholder: '请选择产线',
-					param: 'codes',
+					param: 'lineId',
 					selectOptions: [],
 				},
 				// 选项切换
 				{
-					type: 'datePicker',
-					label: '时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
+					type: 'select',
+					label: '时间类型',
+					param: 'dateFilterType',
+					defaultSelect: 0,
+					selectOptions: [
+						{ id: 0, name: '按时间段' },
+						{ id: 1, name: '按日期' },
+					],
+					index: 2,
+					extraOptions: [
+						{
+							parent: 'dateFilterType',
+							// 时间段选择
+							type: 'datePicker',
+							label: '时间段',
+							dateType: 'daterange',
+							format: 'yyyy-MM-dd',
+							valueFormat: 'yyyy-MM-dd HH:mm:ss',
+							defaultTime: ['00:00:00', '00:00:00'],
+							rangeSeparator: '-',
+							startPlaceholder: '开始时间',
+							endPlaceholder: '结束时间',
+							param: 'recordTime',
+						},
+						{
+							parent: 'dateFilterType',
+							// 日期选择
+							type: 'datePicker',
+							label: '日期',
+							dateType: 'date',
+							placeholder: '选择日期',
+							format: 'yyyy-MM-dd',
+							valueFormat: 'yyyy-MM-dd',
+							param: 'recordTime',
+						},
+					],
 				},
 				{
 					type: 'button',
@@ -219,121 +273,139 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: 'OEE',
-					name: 'add',
+					btnName: '设备可视化',
+					name: 'visualization',
 					plain: true,
 					color: 'success',
 				},
-				{
-					type: 'button',
-					btnName: 'TEEP',
-					name: 'add',
-					plain: true,
-					color: 'warning',
-				},
+				// {
+				// 	type: 'button',
+				// 	btnName: 'OEE',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: 'TEEP',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'warning',
+				// },
 			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				code: null,
-				name: null,
+				lineId: null,
+				factoryId: null,
+				recordTime: [],
 			},
 			// 表单参数
 			form: {},
+			list: [],
 		};
 	},
 	created() {
+		this.getFactory();
+		this.getLine();
 		this.getList();
 	},
 	methods: {
+		/** 准备工厂数据 */
+		async getFactory() {
+			const { code, data } = await this.$axios({
+				url: '/base/factory/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
+		/** 准备产线数据 */
+		async getLine() {
+			const { code, data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			if (code == 0) {
+				this.searchBarFormConfig[1].selectOptions = data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+			}
+		},
+
 		/** 覆盖 handleEmitFun 的默认实现 */
 		handleEmitFun({ action, value }) {
-			const {
-				id: equipmentGroupId,
-				name: equipmentGroupName,
-				code: equipmentGroupCode,
-			} = value;
 			switch (action) {
-				case 'equipment-group-show-alert':
-					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
-					this.$router.push({
-						name: 'EquipmentGroupAlarm',
-						params: {
-							equipmentGroupId,
-							equipmentGroupCode,
-							equipmentGroupName,
-						},
-					});
+				case 'view-trend':
+					const { id } = value;
+					this.open = true;
+					this.trendOpen = true;
 					break;
 			}
 		},
 		/** 查询列表 */
-		getList() {
+		async getList() {
 			this.loading = true;
-			// 执行查询
-			getEquipmentGroupPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
+			const { code, data } = await this.$axios({
+				url: '/analysis/equipment-analysis/efficiency',
+				method: 'get',
+				params: this.queryParams,
 			});
+			if (code == 0) {
+				console.log('data', data);
+				this.list = data;
+			}
 		},
-		/** 取消按钮 */
+
+		handleSearchBarBtnClick({ btnName, ...payload }) {
+			console.log('handleSearchBarBtnClick', btnName, payload);
+			if (btnName == 'visualization') {
+				// 可视化
+				this.visualizationOpen = true;
+				this.open = true;
+			}
+			if (btnName == 'search') {
+				this.queryParams.factoryId = payload.factoryId || null;
+				this.queryParams.lineId = payload.lineId || null;
+				if (payload.recordTime != null) {
+					if (typeof payload.recordTime == 'string') {
+						if (payload.recordTime.trim() !== '') {
+							this.queryParams.recordTime = [
+								`${payload.recordTime} 00:00:00`,
+								`${payload.recordTime} 23:59:59`,
+							];
+						}
+					} else {
+						this.queryParams.recordTime = payload.recordTime;
+					}
+				} else {
+					this.queryParams.recordTime = null;
+				}
+				this.getList();
+			}
+		},
+
 		cancel() {
 			this.open = false;
-			this.reset();
 		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				code: undefined,
-				name: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备分组（用于同类型不同厂家的设备区分）';
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentGroup(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentGroup(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
+
+		closed() {
+			this.visualizationOpen = false;
+			this.trendOpen = false;
 		},
+
+		submitForm() {},
 	},
 };
 </script>

From d63d49ccc9c5782c91d7f34cdec8a1ea6864e233 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 15:09:48 +0800
Subject: [PATCH 14/21] add pie chart

---
 .../efficiency/components/pieChart.vue        | 98 +++++++++++++++++++
 .../equipment/analysis/efficiency/index.vue   | 12 ++-
 2 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 src/views/equipment/analysis/efficiency/components/pieChart.vue

diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue
new file mode 100644
index 00000000..74db4ada
--- /dev/null
+++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue
@@ -0,0 +1,98 @@
+<!-- 
+    filename: pieChart.vue
+    author: liubin
+    date: 2023-09-06 15:02:49
+    description: 饼图
+-->
+
+<template>
+	<div class="pie-chart" :data-eqname="value.equipmentName || 'Default'"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+	name: 'pieChart',
+	components: {},
+	props: ['value'],
+	data() {
+		return {
+			chart: null,
+			config: {
+				grid: {
+					top: 0,
+					left: 0,
+					right: 0,
+					bottom: 0,
+				},
+				tooltip: {
+					trigger: 'item',
+				},
+				legend: {
+					top: '0%',
+					left: 'center',
+					textStyle: {
+						fontSize: 10,
+					},
+					itemWidth: 10,
+					itemHeight: 10,
+				},
+				series: [
+					{
+						name: this.value.equipmentName || 'Default',
+						type: 'pie',
+						radius: ['40%', '75%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center',
+						},
+						data: ['workTime', 'stopTime', 'downTime'].map((v, index) => ({
+							name: ['工作时长', '停机时长', '故障时长'][index],
+							value: this.value[v],
+						})),
+						// data: [
+						// 	{ value: 1048, name: 'Search Engine' },
+						// 	{ value: 735, name: 'Direct' },
+						// 	{ value: 580, name: 'Email' },
+						// 	{ value: 484, name: 'Union Ads' },
+						// 	{ value: 300, name: 'Video Ads' },
+						// ],
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		if (!this.chart) {
+			this.chart = echarts.init(this.$el);
+			this.$nextTick(() => {
+				this.chart.setOption(this.config);
+			});
+		}
+	},
+	beforeDestroy() {
+		if (this.chart) this.chart.dispose();
+	},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.pie-chart {
+	padding: 12px;
+	min-height: 320px;
+	background: #f1f1f1;
+	position: relative;
+}
+
+.pie-chart::before {
+	content: attr(data-eqname);
+	font-size: 16px;
+	line-height: 1;
+	position: absolute;
+	top: -16px;
+	left: 0;
+}
+</style>
diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
index 2898a8c2..51c76f25 100644
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -47,7 +47,7 @@
 			@cancel="cancel"
 			@confirm="submitForm">
 			<div class="visualization" v-if="visualizationOpen">
-				<h1>设备可视化</h1>
+				<pie-chart v-for="item in list" :key="item.id" :value="item" />
 			</div>
 			<div v-if="trendOpen">
 				<h1>查看趋势</h1>
@@ -59,11 +59,12 @@
 <script>
 // import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import PieChart from './components/pieChart.vue';
 
 export default {
 	name: 'EfficiencyAnalysis',
 	mixins: [basicPageMixin],
-	components: {},
+	components: { PieChart },
 	props: {},
 	data() {
 		return {
@@ -410,4 +411,9 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.visualization {
+	display: grid;
+	grid-template-columns: repeat(3, minmax(240px, 1fr));
+}
+</style>

From fa02c3933d29026cf2727e20b4a3b5bcd69b9c90 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 16:18:59 +0800
Subject: [PATCH 15/21] =?UTF-8?q?remove=20=E4=BA=A7=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E7=9B=91=E6=8E=A7=E5=8F=AF=E8=A7=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipment/analysis/quality/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
index 47de831b..2f9dcae2 100644
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -22,7 +22,7 @@
 			@emitFun="handleEmitFun"></base-table>
 
 		<!-- 图形分析 dialog -->
-		<base-dialog
+		<!-- <base-dialog
 			dialogTitle="图形视角"
 			:dialogVisible="dialogVisible"
 			width="60%"
@@ -30,7 +30,7 @@
 			@cancel="dialogClose"
 			@confirm="dialogClose">
 			<LineChart v-if="dialogVisible" :config="lineChartConfig" />
-		</base-dialog>
+		</base-dialog> -->
 	</div>
 </template>
 
@@ -98,12 +98,12 @@ export default {
 				// {
 				// 	type: 'separate',
 				// },
-				{
-					type: 'button',
-					btnName: '图形分析',
-					name: 'graphVersion',
-					color: 'text btn-graph',
-				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '图形分析',
+				// 	name: 'graphVersion',
+				// 	color: 'text btn-graph',
+				// },
 			],
 			// 动态的 props
 			tableProps: [

From 76100ad07dba9ad8d9fbcd6fbaf4a43a6fe6d262 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 16:37:22 +0800
Subject: [PATCH 16/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=85=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentFullParams/index.vue  | 143 ++++++++++--------
 .../utils/local-data-manager.js               |  29 ++++
 2 files changed, 109 insertions(+), 63 deletions(-)
 create mode 100644 src/views/monitoring/equipmentFullParams/utils/local-data-manager.js

diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 05c4c16c..1dcdd722 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -16,10 +16,18 @@
 			<base-table
 				:key="1 + '__basetable'"
 				:table-props="table1.tableProps"
-				:page="1"
-				:limit="999"
+				:page="table1.pageNo"
+				:limit="table1.pageSize"
 				:table-data="table1.data"
 				@emitFun="(val) => handleEmitFun(table1, val)"></base-table>
+			<pagination
+				v-show="table1.total > 0"
+				:total="table1.total"
+				:page.sync="table1.pageNo"
+				:limit.sync="table1.pageSize"
+				:page-size="table1.pageSize"
+				:page-sizes="[1, 3, 5, 10, 20]"
+				@pagination="(val) => getListFor(table1, val)" />
 			<base-table
 				:key="2 + '__basetable'"
 				:table-props="table2.tableProps"
@@ -86,6 +94,72 @@
 </template>
 
 <script>
+import LocalDataManager from './utils/local-data-manager';
+
+const fakeTable1Data = [
+	{
+		time: 1111111111111111,
+		plcCode: 2,
+		val1: 3,
+		bol1: 4,
+		val2: 5,
+		bol2: 6,
+	},
+	{
+		time: 1,
+		plcCode: 22222222222222,
+		val1: 3,
+		bol1: 4,
+		val2: 5,
+		bol2: 6,
+	},
+	{
+		time: 1,
+		plcCode: 2,
+		val1: 33333333333333,
+		bol1: 4,
+		val2: 5,
+		bol2: 6,
+	},
+	{
+		time: 1,
+		plcCode: 2,
+		val1: 3,
+		bol1: 44444444444444,
+		val2: 5,
+		bol2: 6,
+	},
+	{
+		time: 1,
+		plcCode: 2,
+		val1: 3,
+		bol1: 4,
+		val2: 5555555555555,
+		bol2: 6,
+	},
+	{
+		time: 1,
+		plcCode: 2,
+		val1: 3,
+		bol1: 4,
+		val2: 5,
+		bol2: 6666666666666666666,
+	},
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
+];
+
+const table1LDM = new LocalDataManager(fakeTable1Data, 1, 3);
+
 export default {
 	name: 'EquipmentFullParams',
 	components: {},
@@ -182,67 +256,10 @@ export default {
 						label: '布尔4',
 					},
 				],
-				data: [
-					{
-						time: 1111111111111111,
-						plcCode: 2,
-						val1: 3,
-						bol1: 4,
-						val2: 5,
-						bol2: 6,
-					},
-					{
-						time: 1,
-						plcCode: 22222222222222,
-						val1: 3,
-						bol1: 4,
-						val2: 5,
-						bol2: 6,
-					},
-					{
-						time: 1,
-						plcCode: 2,
-						val1: 33333333333333,
-						bol1: 4,
-						val2: 5,
-						bol2: 6,
-					},
-					{
-						time: 1,
-						plcCode: 2,
-						val1: 3,
-						bol1: 44444444444444,
-						val2: 5,
-						bol2: 6,
-					},
-					{
-						time: 1,
-						plcCode: 2,
-						val1: 3,
-						bol1: 4,
-						val2: 5555555555555,
-						bol2: 6,
-					},
-					{
-						time: 1,
-						plcCode: 2,
-						val1: 3,
-						bol1: 4,
-						val2: 5,
-						bol2: 6666666666666666666,
-					},
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-					{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-				],
+				data: table1LDM.dataList,
+				pageNo: table1LDM.pageNo,
+				pageSize: table1LDM.pageSize,
+				total: table1LDM.total,
 			},
 			table2: {
 				tableProps: [
diff --git a/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js b/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
new file mode 100644
index 00000000..4ef81bbb
--- /dev/null
+++ b/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
@@ -0,0 +1,29 @@
+export default class LocalDataManager {
+    constructor(dataList, pageNo, pageSize) {
+        this._dataListStore = dataList;
+        this._pageNo = pageNo;
+        this._pageSize = pageSize;
+    }
+
+    setPageNo(pageNo) {
+        this._pageNo = pageNo;
+    }
+
+    setPageSize(pageSize) {
+        this._pageSize = pageSize;
+    }
+
+    get dataList() {
+        return this._dataListStore.slice((this._pageNo - 1) * this._pageSize, this._pageNo * this._pageSize);
+    }
+
+    get total() {
+        return this._dataListStore.length;
+    }
+
+    deleteData(id) {
+        const idx = this._dataListStore.findIndex(item => item.id == id);
+        this._dataListStore.splice(idx, 1);
+        // send http request
+    }
+}
\ No newline at end of file

From e2527f2e307933f63dc851f677d11efe7f070a4e Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 6 Sep 2023 16:38:46 +0800
Subject: [PATCH 17/21] =?UTF-8?q?remove=20=E8=AE=BE=E5=A4=87=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E5=88=86=E6=9E=90=E7=9A=84=E6=9F=A5=E7=9C=8B=E8=B6=8B?=
 =?UTF-8?q?=E5=8A=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/analysis/efficiency/index.vue   | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue
index 51c76f25..23ebb70c 100644
--- a/src/views/equipment/analysis/efficiency/index.vue
+++ b/src/views/equipment/analysis/efficiency/index.vue
@@ -180,34 +180,34 @@ export default {
 					align: 'center',
 					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
 				},
-				{
-					_action: 'view-trend',
-					label: '趋势',
-					align: 'center',
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									props: { type: 'text' },
-									on: {
-										click: function () {
-											console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												// value: _this.injectData.id,
-												value: _this.injectData,
-											});
-										},
-									},
-								},
-								'查看趋势'
-							);
-						},
-					},
-				},
+				// {
+				// 	_action: 'view-trend',
+				// 	label: '趋势',
+				// 	align: 'center',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								// value: _this.injectData.id,
+				// 								value: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看趋势'
+				// 			);
+				// 		},
+				// 	},
+				// },
 			],
 			searchBarFormConfig: [
 				{

From c7b32ab34ebe04baaf4ce3aeebc4d6f2bc051f48 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 7 Sep 2023 11:24:07 +0800
Subject: [PATCH 18/21] =?UTF-8?q?add=20=E8=AE=BE=E5=A4=87=E5=85=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentFullParams/index.vue  | 104 ++++-----------
 .../equipmentFullParams/response.js           | 125 ++++++++++++++++++
 2 files changed, 150 insertions(+), 79 deletions(-)
 create mode 100644 src/views/monitoring/equipmentFullParams/response.js

diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 1dcdd722..a822c9fa 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -13,21 +13,23 @@
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<div class="tables">
-			<base-table
-				:key="1 + '__basetable'"
-				:table-props="table1.tableProps"
-				:page="table1.pageNo"
-				:limit="table1.pageSize"
-				:table-data="table1.data"
-				@emitFun="(val) => handleEmitFun(table1, val)"></base-table>
-			<pagination
-				v-show="table1.total > 0"
-				:total="table1.total"
-				:page.sync="table1.pageNo"
-				:limit.sync="table1.pageSize"
-				:page-size="table1.pageSize"
-				:page-sizes="[1, 3, 5, 10, 20]"
-				@pagination="(val) => getListFor(table1, val)" />
+			<div class="custom-table">
+				<!-- <base-table
+					:key="1 + '__basetable'"
+					:table-props="table1.tableProps"
+					:page="table1.pageNo"
+					:limit="table1.pageSize"
+					:table-data="table1.data"
+					@emitFun="(val) => handleEmitFun(table1, val)"></base-table>
+				<pagination
+					v-show="table1.total > 0"
+					:total="table1.total"
+					:page.sync="table1.pageNo"
+					:limit.sync="table1.pageSize"
+					:page-size="table1.pageSize"
+					:page-sizes="[1, 3, 5, 10, 20]"
+					@pagination="(val) => getListFor(table1, val)" /> -->
+			</div>
 			<base-table
 				:key="2 + '__basetable'"
 				:table-props="table2.tableProps"
@@ -95,70 +97,8 @@
 
 <script>
 import LocalDataManager from './utils/local-data-manager';
-
-const fakeTable1Data = [
-	{
-		time: 1111111111111111,
-		plcCode: 2,
-		val1: 3,
-		bol1: 4,
-		val2: 5,
-		bol2: 6,
-	},
-	{
-		time: 1,
-		plcCode: 22222222222222,
-		val1: 3,
-		bol1: 4,
-		val2: 5,
-		bol2: 6,
-	},
-	{
-		time: 1,
-		plcCode: 2,
-		val1: 33333333333333,
-		bol1: 4,
-		val2: 5,
-		bol2: 6,
-	},
-	{
-		time: 1,
-		plcCode: 2,
-		val1: 3,
-		bol1: 44444444444444,
-		val2: 5,
-		bol2: 6,
-	},
-	{
-		time: 1,
-		plcCode: 2,
-		val1: 3,
-		bol1: 4,
-		val2: 5555555555555,
-		bol2: 6,
-	},
-	{
-		time: 1,
-		plcCode: 2,
-		val1: 3,
-		bol1: 4,
-		val2: 5,
-		bol2: 6666666666666666666,
-	},
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-	{ time: 1, plcCode: 2, val1: 3, bol1: 4, val2: 5, bol2: 6 },
-];
-
-const table1LDM = new LocalDataManager(fakeTable1Data, 1, 3);
+import response from './response';
+ 
 
 export default {
 	name: 'EquipmentFullParams',
@@ -456,6 +396,12 @@ export default {
 			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
 	},
 	methods: {
+		getList(dataManager, pageNo, pageSize) {
+			dataManager.setPageNo(pageNo);
+			dataManager.setPageSize(pageSize);
+			return { data: dataManager.dataList, total: dataManager.total };
+		},
+
 		/** 查询 */
 		async handleQuery() {
 			const { data } = this.$axios({
diff --git a/src/views/monitoring/equipmentFullParams/response.js b/src/views/monitoring/equipmentFullParams/response.js
new file mode 100644
index 00000000..35d4eb5f
--- /dev/null
+++ b/src/views/monitoring/equipmentFullParams/response.js
@@ -0,0 +1,125 @@
+export default {
+	"code": 0,
+	"data": [
+		// 一个表格
+		{
+			"data": [
+				// 一行参数
+				{
+					"time": "1694056192800",
+					"plcCode": "PLC_CODE_1",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+						{ "id": 'param-4', "parentId": 0, "dynamicName": "P1V4", "dynamicValue": 15 },
+						{ "id": 'param-5', "parentId": 0, "dynamicName": "P1V5", "dynamicValue": 15 },
+						{ "id": 'param-6', "parentId": 0, "dynamicName": "P1V6", "dynamicValue": 15 },
+					]
+				}
+			],
+			"otherList": [
+				// 一个参数的属性
+				{
+					"id": "attr-1",
+					"plcParamName": "P1V1",
+					"name": "P1V1", // 和 dynamicName 对应
+					"minValue": 1,
+					"maxValue": 100
+				},
+				{
+					"id": "attr-2",
+					"plcParamName": "P1V2",
+					"name": "P1V2",
+					"minValue": 10,
+					"maxValue": 90
+				},
+				{
+					"id": "attr-3",
+					"plcParamName": "P1V3",
+					"name": "P1V3",
+					"minValue": 10,
+					"maxValue": 98
+				},
+				{
+					"id": "attr-4",
+					"plcParamName": "P1V4",
+					"name": "P1V4",
+					"minValue": 10,
+					"maxValue": 90
+				},
+				{
+					"id": "attr-5",
+					"plcParamName": "P1V5",
+					"name": "P1V5",
+					"minValue": 10,
+					"maxValue": 99
+				},
+				{
+					"id": "attr-6",
+					"plcParamName": "P1V6",
+					"name": "P1V6",
+					"minValue": 10,
+					"maxValue": 90
+				},
+			],
+			"nameData": [],
+			"otherMap": []
+		},
+		// 一个表格
+		{
+			"data": [
+				// 一行参数
+				{
+					"time": "1694056100800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694056102800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				}
+			],
+			"otherList": [
+				// 一个参数的属性
+				{
+					"id": "attr-1",
+					"plcParamName": "P1V1",
+					"name": "P1V1", // 和 dynamicName 对应
+					"minValue": 1,
+					"maxValue": 100
+				},
+				{
+					"id": "attr-2",
+					"plcParamName": "P1V2",
+					"name": "P1V2",
+					"minValue": 10,
+					"maxValue": 90
+				},
+				{
+					"id": "attr-3",
+					"plcParamName": "P1V3",
+					"name": "P1V3",
+					"minValue": 10,
+					"maxValue": 98
+				},
+			],
+			"nameData": [],
+			"otherMap": []
+		}
+	]
+}

From 6197b606f13edbbe7b6f4501876fdafa69bba51f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 7 Sep 2023 17:01:22 +0800
Subject: [PATCH 19/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=85=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/equipmentFullParams/index.vue  | 442 ++++++------------
 .../equipmentFullParams/response.js           |  12 +-
 2 files changed, 143 insertions(+), 311 deletions(-)

diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index a822c9fa..004779f0 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -12,93 +12,56 @@
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<div class="tables">
-			<div class="custom-table">
-				<!-- <base-table
-					:key="1 + '__basetable'"
-					:table-props="table1.tableProps"
-					:page="table1.pageNo"
-					:limit="table1.pageSize"
-					:table-data="table1.data"
-					@emitFun="(val) => handleEmitFun(table1, val)"></base-table>
-				<pagination
-					v-show="table1.total > 0"
-					:total="table1.total"
-					:page.sync="table1.pageNo"
-					:limit.sync="table1.pageSize"
-					:page-size="table1.pageSize"
-					:page-sizes="[1, 3, 5, 10, 20]"
-					@pagination="(val) => getListFor(table1, val)" /> -->
-			</div>
-			<base-table
-				:key="2 + '__basetable'"
-				:table-props="table2.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table2.data"
-				@emitFun="(val) => handleEmitFun(table2, val)"></base-table>
-			<base-table
-				:key="3 + '__basetable'"
-				:table-props="table3.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table3.data"
-				@emitFun="(val) => handleEmitFun(table3, val)"></base-table>
-			<base-table
-				:key="4 + '__basetable'"
-				:table-props="table4.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table4.data"
-				@emitFun="(val) => handleEmitFun(table4, val)"></base-table>
-			<base-table
-				:key="5 + '__basetable'"
-				:table-props="table5.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table5.data"
-				@emitFun="(val) => handleEmitFun(table5, val)"></base-table>
-			<base-table
-				:key="6 + '__basetable'"
-				:table-props="table6.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table6.data"
-				@emitFun="(val) => handleEmitFun(table6, val)"></base-table>
-			<base-table
-				:key="7 + '__basetable'"
-				:table-props="table7.tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="table7.data"
-				@emitFun="(val) => handleEmitFun(table7, val)"></base-table>
-		</div>
-		<!-- <div class="tables">
-			<div class="table-wrapper" v-for="table in tableList" :key="table.key">
-				<div class="table-title">PLC 1</div>
+		<!-- <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-s">
+			<div class="custom-table" v-for="table in tableList" :key="table.key">
+				<!-- {{ JSON.stringify(spanMethod) }} -->
 				<base-table
 					:key="table.key + '__basetable'"
 					:table-props="table.tableProps"
-					:page="1"
-					:limit="999"
-					:table-data="table.data"
-					@emitFun="(val) => handleEmitFun(table, val)">
-				</base-table>
+					:table-data="table.list"
+					:span-method="spanMethod"
+					@emitFun="(val) => handleEmitFun(table, val)"></base-table>
 				<pagination
+					:key="table.key + '__pagination'"
 					v-show="table.total > 0"
 					:total="table.total"
-					:page.sync="table.queryParams.pageNo"
-					:limit.sync="table.queryParams.pageSize"
+					:page.sync="table.pageNo"
+					:limit.sync="table.pageSize"
+					:page-size="table.pageSize"
+					:page-sizes="[1, 3, 5, 10, 20]"
 					@pagination="(val) => getListFor(table, val)" />
 			</div>
-		</div> -->
+		</div>
 	</div>
 </template>
 
 <script>
 import LocalDataManager from './utils/local-data-manager';
 import response from './response';
- 
 
 export default {
 	name: 'EquipmentFullParams',
@@ -152,229 +115,16 @@ export default {
 				id: null,
 				time: [new Date(aWeekAgo), new Date(today)],
 			},
-
-			table1: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-					{
-						prop: 'val3',
-						label: '数值3',
-					},
-					{
-						prop: 'bol3',
-						label: '布尔3',
-					},
-					{
-						prop: 'val4',
-						label: '数值4',
-					},
-					{
-						prop: 'bol4',
-						label: '布尔4',
-					},
-				],
-				data: table1LDM.dataList,
-				pageNo: table1LDM.pageNo,
-				pageSize: table1LDM.pageSize,
-				total: table1LDM.total,
-			},
-			table2: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
-			table3: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
-			table4: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
-			table5: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
-			table6: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
-			table7: {
-				tableProps: [
-					{
-						prop: 'time',
-						label: '时间',
-					},
-					{
-						prop: 'plcCode',
-						label: 'PLC编码',
-					},
-					{
-						prop: 'val1',
-						label: '数值1',
-					},
-					{
-						prop: 'bol1',
-						label: '布尔1',
-					},
-					{
-						prop: 'val2',
-						label: '数值2',
-					},
-					{
-						prop: 'bol2',
-						label: '布尔2',
-					},
-				],
-				data: [],
-			},
+			tableList: [
+				{
+					key: 'base-table__key__1',
+					tableProps: [],
+					list: [],
+					pageNo: 1,
+					pageSize: 3,
+					total: 0,
+				},
+			],
 		};
 	},
 	computed: {
@@ -394,14 +144,104 @@ export default {
 			this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
 		if (this.name)
 			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
+
+		this.handleResponse();
 	},
 	methods: {
+		buildProps(table) {
+			console.log('building props', table);
+			// 通过 otherList 来构建 props
+			const { otherList } = table;
+			const props = [
+				{
+					// type: 'index',
+					width: 48,
+					prop: 'index',
+					label: '序号',
+					align: 'center',
+					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
+				},
+				{
+					width: 128,
+					prop: 'time',
+					label: '时间',
+					align: 'center',
+					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
+				},
+				{
+					width: 128,
+					prop: 'plcCode',
+					label: 'PLC编码',
+					align: 'center',
+					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
+				},
+			];
+			const firstLineData = {
+				index: '参考值： [最小]-[最大][/标准]',
+				time: '参考值： [最小]-[最大][/标准]',
+				plcCode: '参考值： [最小]-[最大][/标准]',
+			};
+			otherList.forEach((item) => {
+				props.push({
+					label: item.name,
+					align: 'center',
+					// children: [
+					// 	{
+					// 		prop: item.name,
+					// 		align: 'center',
+					// 		label: `${item.minValue ?? ''}-${item.maxValue ?? ''}${
+					// 			item.defaultValue != null ? '/' + item.defaultValue : ''
+					// 		}`,
+					// 	},
+					// ],
+				});
+				firstLineData[item.name] = `${item.minValue ?? ''}-${
+					item.maxValue ?? ''
+				}${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
+			});
+			console.log('new props:', props);
+			return { props, firstLineData };
+		},
+
+		handleResponse() {
+			const { code, data } = response;
+			if (code == 0) {
+				console.log('response', code, data);
+				data.forEach((table, index) => {
+					console.log('handle index:', index, table);
+					const { props: tableProps, firstLineData } = this.buildProps(table);
+					this.$set(this.tableList, index, {
+						key: 'base-table__key__' + index,
+						tableProps,
+						list: [firstLineData],
+						pageNo: 1,
+						pageSize: 5,
+						total: 0,
+					});
+				});
+			}
+		},
+
+		injectFirstLine(table) {
+			// 给table的第一行注入固定数据
+		},
+
 		getList(dataManager, pageNo, pageSize) {
 			dataManager.setPageNo(pageNo);
 			dataManager.setPageSize(pageSize);
 			return { data: dataManager.dataList, total: dataManager.total };
 		},
 
+		spanMethod({ row, column, rowIndex, columnIndex }) {
+			console.log('span method', row, column, rowIndex, columnIndex);
+			if (rowIndex == 1 && columnIndex == 0) {
+				console.log('herer..............');
+				return [1, 3];
+			}
+			console.log('therer..............');
+			return [1, 1];
+		},
+
 		/** 查询 */
 		async handleQuery() {
 			const { data } = this.$axios({
@@ -425,16 +265,6 @@ export default {
 			console.log('table val', table, val);
 		},
 
-		/** 构造 props */
-		buildProps() {
-			this.tableList.forEach((table) => {
-				this.buildTableProp(table);
-			});
-		},
-
-		/** 构造一个 tableProps - 根据动态结构 */
-		buildTableProp(table) {},
-
 		/** 为某个 table 获取 list 数据 */
 		getListFor(table, val) {
 			console.log('get list for', table, val);
diff --git a/src/views/monitoring/equipmentFullParams/response.js b/src/views/monitoring/equipmentFullParams/response.js
index 35d4eb5f..eb3d89b3 100644
--- a/src/views/monitoring/equipmentFullParams/response.js
+++ b/src/views/monitoring/equipmentFullParams/response.js
@@ -33,7 +33,8 @@ export default {
 					"plcParamName": "P1V2",
 					"name": "P1V2",
 					"minValue": 10,
-					"maxValue": 90
+					"maxValue": 90,
+					"defaultValue": 24
 				},
 				{
 					"id": "attr-3",
@@ -53,15 +54,16 @@ export default {
 					"id": "attr-5",
 					"plcParamName": "P1V5",
 					"name": "P1V5",
-					"minValue": 10,
-					"maxValue": 99
+					"minValue": null,
+					"maxValue": null
 				},
 				{
 					"id": "attr-6",
 					"plcParamName": "P1V6",
 					"name": "P1V6",
-					"minValue": 10,
-					"maxValue": 90
+					"minValue": null,
+					"maxValue": null,
+					"defaultValue": false
 				},
 			],
 			"nameData": [],

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

---
 .../monitoring/equipmentFullParams/index.vue  |  89 +++++++------
 .../equipmentFullParams/response.js           | 120 ++++++++++++++++++
 .../utils/local-data-manager.js               |  13 +-
 3 files changed, 183 insertions(+), 39 deletions(-)

diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 004779f0..ef2c84b8 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -36,13 +36,13 @@
 			"
 			@emitFun="(val) => handleEmitFun(table, val)"></base-table> -->
 
-		<div class="tables-s">
+		<div class="tables">
 			<div class="custom-table" v-for="table in tableList" :key="table.key">
 				<!-- {{ JSON.stringify(spanMethod) }} -->
 				<base-table
 					:key="table.key + '__basetable'"
 					:table-props="table.tableProps"
-					:table-data="table.list"
+					:table-data="table.dataManager?.dataList ?? []"
 					:span-method="spanMethod"
 					@emitFun="(val) => handleEmitFun(table, val)"></base-table>
 				<pagination
@@ -53,8 +53,14 @@
 					:limit.sync="table.pageSize"
 					:page-size="table.pageSize"
 					:page-sizes="[1, 3, 5, 10, 20]"
-					@pagination="(val) => getListFor(table, val)" />
+					@pagination="
+						({ page, limit, current }) =>
+							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>
 </template>
@@ -62,6 +68,7 @@
 <script>
 import LocalDataManager from './utils/local-data-manager';
 import response from './response';
+import moment from 'moment';
 
 export default {
 	name: 'EquipmentFullParams',
@@ -159,47 +166,36 @@ export default {
 					prop: 'index',
 					label: '序号',
 					align: 'center',
-					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
 				},
 				{
-					width: 128,
+					width: 160,
 					prop: 'time',
 					label: '时间',
 					align: 'center',
-					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
 				},
 				{
-					width: 128,
+					width: 200,
 					prop: 'plcCode',
 					label: 'PLC编码',
 					align: 'center',
-					// children: [{ label: '参考值： [最小]-[最大][/标准]' }],
 				},
 			];
 			const firstLineData = {
 				index: '参考值： [最小]-[最大][/标准]',
-				time: '参考值： [最小]-[最大][/标准]',
-				plcCode: '参考值： [最小]-[最大][/标准]',
+				time: null, // 此处必须是空白
+				plcCode: null, // 此处必须是空白
 			};
 			otherList.forEach((item) => {
 				props.push({
 					label: item.name,
 					align: 'center',
-					// children: [
-					// 	{
-					// 		prop: item.name,
-					// 		align: 'center',
-					// 		label: `${item.minValue ?? ''}-${item.maxValue ?? ''}${
-					// 			item.defaultValue != null ? '/' + item.defaultValue : ''
-					// 		}`,
-					// 	},
-					// ],
+					prop: item.name,
+					width: 128,
 				});
 				firstLineData[item.name] = `${item.minValue ?? ''}-${
 					item.maxValue ?? ''
 				}${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
 			});
-			console.log('new props:', props);
 			return { props, firstLineData };
 		},
 
@@ -207,6 +203,8 @@ export default {
 			const { code, data } = response;
 			if (code == 0) {
 				console.log('response', code, data);
+
+				// 处理一个表格
 				data.forEach((table, index) => {
 					console.log('handle index:', index, table);
 					const { props: tableProps, firstLineData } = this.buildProps(table);
@@ -214,31 +212,44 @@ export default {
 						key: 'base-table__key__' + index,
 						tableProps,
 						list: [firstLineData],
+						dataManager: null,
 						pageNo: 1,
 						pageSize: 5,
 						total: 0,
 					});
+
+					// 处理某一表格的各个行
+					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;
+						});
+						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
+					);
 				});
 			}
 		},
 
-		injectFirstLine(table) {
-			// 给table的第一行注入固定数据
-		},
-
-		getList(dataManager, pageNo, pageSize) {
-			dataManager.setPageNo(pageNo);
-			dataManager.setPageSize(pageSize);
-			return { data: dataManager.dataList, total: dataManager.total };
-		},
-
 		spanMethod({ row, column, rowIndex, columnIndex }) {
-			console.log('span method', row, column, rowIndex, columnIndex);
-			if (rowIndex == 1 && columnIndex == 0) {
-				console.log('herer..............');
+			if (rowIndex == 0 && columnIndex == 0) {
 				return [1, 3];
+			} else if (rowIndex == 0 && (columnIndex == 1 || columnIndex == 2)) {
+				return [0, 0];
 			}
-			console.log('therer..............');
 			return [1, 1];
 		},
 
@@ -266,8 +277,10 @@ export default {
 		},
 
 		/** 为某个 table 获取 list 数据 */
-		getListFor(table, val) {
-			console.log('get list for', table, val);
+		getListFor(table, { page, limit, current }) {
+			console.log('get list for', table, { page, limit, current });
+			table.dataManager.pageNo = page ?? current;
+			table.dataManager.pageSize = limit;
 		},
 	},
 };
@@ -287,4 +300,8 @@ export default {
 .tables >>> .baseTable {
 	overflow-x: hidden;
 }
+
+.custom-table {
+	overflow-x: hidden;
+}
 </style>
diff --git a/src/views/monitoring/equipmentFullParams/response.js b/src/views/monitoring/equipmentFullParams/response.js
index eb3d89b3..d984f34e 100644
--- a/src/views/monitoring/equipmentFullParams/response.js
+++ b/src/views/monitoring/equipmentFullParams/response.js
@@ -122,6 +122,126 @@ export default {
 			],
 			"nameData": [],
 			"otherMap": []
+		},
+		// 一个表格
+		{
+			"data": [
+				// 一行参数
+				{
+					"time": "1694056100800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694056102800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694056109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694066109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694067109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694068109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694069109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				},
+				{
+					"time": "1694071109800",
+					"plcCode": "PLC_CODE_2",
+					"data": [
+						// 一个参数值
+						{ "id": 'param-1', "parentId": 0, "dynamicName": "P1V1", "dynamicValue": 15 },
+						{ "id": 'param-2', "parentId": 0, "dynamicName": "P1V2", "dynamicValue": 15 },
+						{ "id": 'param-3', "parentId": 0, "dynamicName": "P1V3", "dynamicValue": 15 },
+
+					]
+				}
+			],
+			"otherList": [
+				// 一个参数的属性
+				{
+					"id": "attr-1",
+					"plcParamName": "P1V1",
+					"name": "P1V1", // 和 dynamicName 对应
+					"minValue": 1,
+					"maxValue": 100
+				},
+				{
+					"id": "attr-2",
+					"plcParamName": "P1V2",
+					"name": "P1V2",
+					"minValue": 10,
+					"maxValue": 90
+				},
+				{
+					"id": "attr-3",
+					"plcParamName": "P1V3",
+					"name": "P1V3",
+					"minValue": 10,
+					"maxValue": 98
+				}
+			],
+			"nameData": [],
+			"otherMap": []
 		}
 	]
 }
diff --git a/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js b/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
index 4ef81bbb..5d8c76fd 100644
--- a/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
+++ b/src/views/monitoring/equipmentFullParams/utils/local-data-manager.js
@@ -5,16 +5,23 @@ export default class LocalDataManager {
         this._pageSize = pageSize;
     }
 
-    setPageNo(pageNo) {
+    set pageNo(pageNo) {
+        console.log('set pageNo', pageNo);
         this._pageNo = pageNo;
     }
 
-    setPageSize(pageSize) {
+    set pageSize(pageSize) {
+        console.log('set pageSize', pageSize);
         this._pageSize = pageSize;
     }
 
     get dataList() {
-        return this._dataListStore.slice((this._pageNo - 1) * this._pageSize, this._pageNo * this._pageSize);
+        const firstLine = this._dataListStore[0];
+        const realDataList = this._dataListStore.slice(1);
+        return [
+            firstLine,
+            ...realDataList.slice((this._pageNo - 1) * this._pageSize, this._pageNo * this._pageSize)
+        ]
     }
 
     get total() {

From b91b8c3d3cd88868c24c61c334ebcd50ac378fdf Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 11 Sep 2023 14:57:55 +0800
Subject: [PATCH 21/21] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentProcessAmount/graph.vue          | 77 ++++++++++++++++---
 .../equipmentProcessAmount/index.vue          |  3 +-
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/views/monitoring/equipmentProcessAmount/graph.vue b/src/views/monitoring/equipmentProcessAmount/graph.vue
index c75926b5..7d6843cb 100644
--- a/src/views/monitoring/equipmentProcessAmount/graph.vue
+++ b/src/views/monitoring/equipmentProcessAmount/graph.vue
@@ -7,7 +7,6 @@
 
 <template>
 	<div class="chart-wrapper">
-		<h4>line graph</h4>
 		<div class="chart" ref="chart"></div>
 	</div>
 </template>
@@ -18,22 +17,65 @@ import * as echarts from 'echarts';
 export default {
 	name: 'LineChartInEquipmentProcessAmount',
 	components: {},
-	props: {},
+	props: ['equipmentList'],
 	data() {
 		return {
 			chart: null,
 			option: {
-				xAxis: {
-					type: 'category',
-					data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+				grid: {
+					top: 64,
+					left: 56,
+					right: 24,
+					bottom: 56,
+				},
+				title: {
+					show: true,
+					text: '各设备加工数量',
+					textStyle: {
+						color: '#232323',
+						fontSize: 16,
+					},
+					left: 'center',
+					top: 24,
 				},
 				yAxis: {
+					type: 'category',
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#ccc',
+						},
+					},
+					axisTick: {
+						show: false,
+					},
+					// data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+					data: [],
+					name: '设备名',
+					nameTextStyle: {
+						fontSize: 14,
+					},
+				},
+				xAxis: {
 					type: 'value',
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#ccc',
+						},
+					},
 				},
 				series: [
 					{
-						data: [120, 200, 150, 80, 70, 110, 130],
+						// data: [120, 200, 150, 80, 70, 110, 130],
+						data: [],
 						type: 'bar',
+						barWidth: 20,
+						label: {
+							show: true,
+							distance: 50,
+							formatter: '{c}',
+						},
 						showBackground: true,
 						backgroundStyle: {
 							color: 'rgba(180, 180, 180, 0.2)',
@@ -44,13 +86,29 @@ export default {
 		};
 	},
 	mounted() {
+		// console.log('this.eq list', this.equipmentList);
 		if (!this.chart) this.chart = echarts.init(this.$refs.chart);
-		this.chart.setOption(this.option);
+
+		this.$nextTick(() => {
+			this.chart.setOption(this.updateConfig(this.option));
+		});
 	},
 	beforeDestroy() {
 		this.chart.dispose();
 	},
-	methods: {},
+	methods: {
+		updateConfig(config) {
+			let nameData = [];
+			let valueData = [];
+			this.equipmentList.map((eq) => {
+				nameData.push(eq.equipmentName);
+				valueData.push(eq.totalQuantity);
+			});
+			config.yAxis.data = nameData;
+			config.series[0].data = valueData;
+			return config;
+		},
+	},
 };
 </script>
 
@@ -58,8 +116,7 @@ export default {
 .chart-wrapper {
 	height: 100%;
 	flex: 1;
-	background: #f1f1f1;
-	padding: 12px;
+	// background: #f9f9f9;
 }
 
 .chart {
diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue
index ccbe715e..4119be8d 100644
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ b/src/views/monitoring/equipmentProcessAmount/index.vue
@@ -48,7 +48,8 @@
 
 					<div class="graph" style="height: 56vh;" v-else>
 						<!-- graph  -->
-						<Graph />
+						<Graph v-if="list.length" :equipment-list="list" />
+						<div v-else style="color: #c7c7c7; text-align: center; margin-top: 20px;">没有设备</div>
 					</div>
 				</transition>
 			</div>