From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/views/commandManageLog/commandManageLog.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/commandManageLog/commandManageLog.html b/src/main/webapp/views/commandManageLog/commandManageLog.html
index 5c0f551..ea404b8 100644
--- a/src/main/webapp/views/commandManageLog/commandManageLog.html
+++ b/src/main/webapp/views/commandManageLog/commandManageLog.html
@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip property="durationTime" label="鎸佺画鏃堕暱">
</el-table-column>
- <el-table-column property="commandType" label="鎸囦护绫诲瀷">
+ <el-table-column property="commandType$" label="鎸囦护绫诲瀷">
</el-table-column>
<el-table-column property="device" label="璁惧">
</el-table-column>
@@ -118,7 +118,7 @@
data.curr = this.currentPage
data.limit = this.pageSize
$.ajax({
- url: baseUrl + "/commandInfo/list/auth",
+ url: baseUrl + "/commandInfoLog/list/auth",
headers: {
'token': localStorage.getItem('token')
},
--
Gitblit v1.9.1