From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaPlatformWindow.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index b9ebeec..dd746de 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -26,6 +26,9 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="LED绌洪棽鏂囨锛�" prop="ledContent">
+ <el-input type="text" v-model="form.ledContent" placeholder="璇疯緭鍏ED绌洪棽鏂囨" v-trim />
+ </el-form-item>
<el-form-item label="鍚屾椂浣滀笟鏁伴噺锛�" prop="workingNum">
<el-input type="number" v-model="form.workingNum" placeholder="璇疯緭鍏ュ悓鏃朵綔涓氭暟閲�" v-trim />
</el-form-item>
@@ -68,6 +71,7 @@
startTime: '',
endTime: '',
workingNum: 1,
+ ledContent: '',
workRate: '',
stayTimeoutAlarmTime: '',
workTimeoutAlarmTime: '',
@@ -120,13 +124,13 @@
})
},
loadLedList() {
- deviceList({ type: 2 })
+ deviceList({ type: 2, isdeleted: 0 })
.then(res => {
this.ledList = res || []
})
},
loadBroadcastList() {
- deviceList({ type: 3 })
+ deviceList({ type: 3, isdeleted: 0 })
.then(res => {
this.broadcastList = res || []
})
--
Gitblit v1.9.3