From d82fea0db7790e93ccc6d19aa9deb815759678ec Mon Sep 17 00:00:00 2001
From: Iruka <1017819588@qq.com>
Date: Fri, 20 Dec 2024 19:13:48 +0800
Subject: [PATCH] .

---
 api/iotlog/datavalve.js            | 10 ++++++++++
 api/{system => iotlog}/userlog.js  |  0
 pages/work/operation-log/index.vue | 30 +++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 api/iotlog/datavalve.js
 rename api/{system => iotlog}/userlog.js (100%)

diff --git a/api/iotlog/datavalve.js b/api/iotlog/datavalve.js
new file mode 100644
index 0000000..792f203
--- /dev/null
+++ b/api/iotlog/datavalve.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function getlist(data) {
+	return request({
+		url: '/iotlog/data_valve/list',
+		method: 'get',
+		data: data
+	})
+}
\ No newline at end of file
diff --git a/api/system/userlog.js b/api/iotlog/userlog.js
similarity index 100%
rename from api/system/userlog.js
rename to api/iotlog/userlog.js
diff --git a/pages/work/operation-log/index.vue b/pages/work/operation-log/index.vue
index 0e1ccb6..dd08774 100644
--- a/pages/work/operation-log/index.vue
+++ b/pages/work/operation-log/index.vue
@@ -52,15 +52,18 @@
 	<u-popup mode="center" :show="showPop" @close="showPop = false">
 		<view class="popup-content" style="width: 70vw;height: 50vh;">
 			<u-steps direction="column" :current="popData.length">
-				<u-steps-item v-for="item in popData" :title="item.operUser" :desc="item.occurTime" />
+				<!-- <u-steps-item v-for="item in popData" :title="item.operUser" :desc="item.occurTime" /> -->
+				<up-steps-item title="发送命令" desc="10:30"></up-steps-item>
+				<up-steps-item title="服务器至MQ" desc="10:30"></up-steps-item>
+				<up-steps-item title="MQ至IOT平台" desc="10:30"></up-steps-item>
+				<up-steps-item title="设备数据上报" desc="10:30"></up-steps-item>
 			</u-steps>
 		</view>
 	</u-popup>
 </template>
 <script>
-	import {
-		getlist
-	} from "@/api/system/userlog.js"
+	import * as userlog from "@/api/iotlog/userlog.js"
+	import * as datavalve from "@/api/iotlog/datavalve.js"
 
 	export default {
 		data() {
@@ -96,18 +99,27 @@
 			queryList(pageNo, pageSize) {
 				this.queryParams.pageNum = pageNo;
 				console.error("queryList:", this.queryParams);
-				getlist(this.queryParams).then(res => {
+				userlog.getlist(this.queryParams).then(res => {
 					console.error("queryList:", res);
 					this.$refs.paging.completeByTotal(res.rows, res.total);
 				});
 			},
-			openPop(item) {
+			async openPop(item) {
 				this.showPop = true;
-				getlist({
+				let popData = [];
+				const userlogRes = await userlog.getlist({
 					traceId: item.traceId
-				}).then(res => {
-					this.popData = res.rows.sort(this.compareDataNew("logNum"));
 				});
+				console.error("userlogRes:", userlogRes);
+				const datavalveRes = await datavalve.getlist({
+					traceId: item.traceId
+				});
+
+				console.error("datavalveRes:", datavalveRes);
+				// this.showPop = true;
+				// .then(res => {
+				// 	this.popData = res.rows.sort(this.compareDataNew("logNum"));
+				// });
 			},
 			// 数据排序
 			compareDataNew(file1) {