From 0158a11644824af33be6cba035e8d56336dd0d0d Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 31 Aug 2023 16:58:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=88=86=E6=9E=90-?=
 =?UTF-8?q?=E7=8A=B6=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/components/SequenceGraph/index.vue        | 52 ++++++++++++++++++-
 .../SequenceGraph/sequenceGraphItem.vue       |  2 +
 .../monitoring/equipmentFullParams/index.vue  | 31 +++++++----
 3 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/src/components/SequenceGraph/index.vue b/src/components/SequenceGraph/index.vue
index 3547f147..34da2137 100644
--- a/src/components/SequenceGraph/index.vue
+++ b/src/components/SequenceGraph/index.vue
@@ -7,7 +7,7 @@
 
 <template>
 	<div class="sequence-graph">
-		<SequenceGraphItem />
+		<SequenceGraphItem v-for="eq in Object.keys(list)" :key="eq" />
 	</div>
 </template>
 
@@ -23,7 +23,55 @@ export default {
 		},
 	},
 	data() {
-		return {};
+		return {
+			list: {
+				打孔机: {
+					equipmentId: 1,
+					equipmentName: 'EQ1',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				磨边机: {
+					equipmentId: 12,
+					equipmentName: 'EQ2',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				清洗机: {
+					equipmentId: 13,
+					equipmentName: 'EQ3',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				窑炉: {
+					equipmentId: 14,
+					equipmentName: 'EQ4',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+				AGV: {
+					equipmentId: 15,
+					equipmentName: 'EQ5',
+					status: '',
+					startTime: '',
+					duration: '',
+					startPos: '',
+					relativeDuring: '',
+				},
+			},
+		};
 	},
 	computed: {},
 	methods: {},
diff --git a/src/components/SequenceGraph/sequenceGraphItem.vue b/src/components/SequenceGraph/sequenceGraphItem.vue
index 87433a2c..de882b0c 100644
--- a/src/components/SequenceGraph/sequenceGraphItem.vue
+++ b/src/components/SequenceGraph/sequenceGraphItem.vue
@@ -42,6 +42,8 @@ export default {
 
 <style scoped lang="scss">
 .sequence-graph-item {
+    background: #fff;
+    padding: 12px;
     width: 40px;
     height: 32px;
     display: inline-block;
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index cfae88c8..05c4c16c 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -117,14 +117,15 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'timeVal',
 					width: 350,
-					defaultSelect: [new Date(aWeekAgo), new Date(today)],
+					// defaultSelect: [new Date(aWeekAgo), new Date(today)],
 				},
 				{
 					type: 'button',
@@ -439,9 +440,23 @@ export default {
 	},
 	methods: {
 		/** 查询 */
-		handleQuery() {},
+		async handleQuery() {
+			const { data } = this.$axios({
+				url: '/monitoring/equipment-monitor/runLog',
+				method: 'get',
+				params: this.queryParams,
+			});
+			console.log('data', data);
+		},
 
-		handleSearchBarBtnClick() {},
+		async handleSearchBarBtnClick({ btnName, timeVal }) {
+			if (timeVal && timeVal.length > 0) {
+				this.queryParams.time = timeVal;
+			} else {
+				this.queryParams.time = [];
+			}
+			await this.handleQuery();
+		},
 
 		handleEmitFun(table, val) {
 			console.log('table val', table, val);
@@ -467,15 +482,9 @@ export default {
 
 <style scoped>
 .full-param-page {
-	/* overflow-y: auto; */
-	background: lightblue;
 	position: relative;
 }
 
-/* .full-param-page >>> .baseTable:not(:last-child) {
-	margin-bottom: 18px;
-} */
-
 .tables {
 	display: grid;
 	grid-template-columns: 1fr 1fr;
@@ -483,6 +492,6 @@ export default {
 }
 
 .tables >>> .baseTable {
-    overflow-x: hidden;
+	overflow-x: hidden;
 }
 </style>