|
@@ -184,12 +184,14 @@
|
|
.then(data => {
|
|
.then(data => {
|
|
// this.merchantList = data;
|
|
// this.merchantList = data;
|
|
// console.log("1223");
|
|
// console.log("1223");
|
|
|
|
+ this.equipmentNameList = [];
|
|
var listName = data[0].equipmentList;
|
|
var listName = data[0].equipmentList;
|
|
var equipmentNameList = this.equipmentNameList;
|
|
var equipmentNameList = this.equipmentNameList;
|
|
var co = {};
|
|
var co = {};
|
|
co["value"] = 'all';
|
|
co["value"] = 'all';
|
|
co["label"] = this.$t('common.allDevice');
|
|
co["label"] = this.$t('common.allDevice');
|
|
equipmentNameList.push(co);
|
|
equipmentNameList.push(co);
|
|
|
|
+ console.log("设备1", equipmentNameList);
|
|
for (var i = 0; i < listName.length; i++) {
|
|
for (var i = 0; i < listName.length; i++) {
|
|
var cov = {};
|
|
var cov = {};
|
|
cov["value"] = listName[i].id;
|
|
cov["value"] = listName[i].id;
|
|
@@ -198,6 +200,7 @@
|
|
equipmentNameList.push(cov);
|
|
equipmentNameList.push(cov);
|
|
}
|
|
}
|
|
this.equipmentNameList = equipmentNameList;
|
|
this.equipmentNameList = equipmentNameList;
|
|
|
|
+ console.log("设备2", equipmentNameList);
|
|
var listId = data[0].id;
|
|
var listId = data[0].id;
|
|
if (listId != null && listId != '1') {
|
|
if (listId != null && listId != '1') {
|
|
uni.setStorageSync("listName", listName);
|
|
uni.setStorageSync("listName", listName);
|
|
@@ -430,7 +433,9 @@
|
|
if (code == clientId) {
|
|
if (code == clientId) {
|
|
n++;
|
|
n++;
|
|
var id = list[i].id;
|
|
var id = list[i].id;
|
|
- this.equipmentIds.push(id);
|
|
|
|
|
|
+ if (!this.equipmentIds.includes(id)) {
|
|
|
|
+ this.equipmentIds.push(id);
|
|
|
|
+ }
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -555,9 +560,12 @@
|
|
.then(res => {
|
|
.then(res => {
|
|
uni.showToast({
|
|
uni.showToast({
|
|
title: res.message,
|
|
title: res.message,
|
|
- duration: 2000
|
|
|
|
|
|
+ duration: 2000,
|
|
|
|
+ success: uni.navigateBack({
|
|
|
|
+ url: 'alarmClockList'
|
|
|
|
+ }),
|
|
});
|
|
});
|
|
- uni.stopPullDownRefresh();
|
|
|
|
|
|
+
|
|
}, _ => void uni.stopPullDownRefresh());
|
|
}, _ => void uni.stopPullDownRefresh());
|
|
},
|
|
},
|
|
delet() {
|
|
delet() {
|