|
@@ -14,7 +14,7 @@
|
14
|
14
|
</Select>
|
15
|
15
|
<Input
|
16
|
16
|
v-model="searchForm.name"
|
17
|
|
- placeholder="请输入姓名、登录账号、设备号、设备型号"
|
|
17
|
+ placeholder="请输入设备号"
|
18
|
18
|
search
|
19
|
19
|
@on-search="searchList()"
|
20
|
20
|
style="width: 310px"
|
|
@@ -412,7 +412,7 @@ export default {
|
412
|
412
|
title: "提示",
|
413
|
413
|
content: "确定对所选设备进行恢复出厂设置操作吗?",
|
414
|
414
|
onOk: () => {
|
415
|
|
- this.controlRestoreFactory([row.sn], [row.userid]);
|
|
415
|
+ this.controlRestoreFactory([row.sn], row.userid ? [row.userid] : []);
|
416
|
416
|
},
|
417
|
417
|
onCancel: () => {}
|
418
|
418
|
});
|
|
@@ -451,7 +451,9 @@ export default {
|
451
|
451
|
let useridList = [];
|
452
|
452
|
userList.forEach((item) => {
|
453
|
453
|
snList.push(item.sn);
|
454
|
|
- useridList.push(item.userid);
|
|
454
|
+ if (item.userid) {
|
|
455
|
+ useridList.push(item.userid);
|
|
456
|
+ }
|
455
|
457
|
});
|
456
|
458
|
if (name === "1") {
|
457
|
459
|
// 恢复出厂
|
|
@@ -736,6 +738,9 @@ export default {
|
736
|
738
|
},
|
737
|
739
|
// 添加推送日志
|
738
|
740
|
addPushLog(form) {
|
|
741
|
+ if (form.userids && form.userids.length === 0) {
|
|
742
|
+ return;
|
|
743
|
+ }
|
739
|
744
|
logPush_add(form).then((data) => {
|
740
|
745
|
if (data.code === 0) {
|
741
|
746
|
this.$Message.success(data.msg);
|