|
|
@@ -413,6 +413,7 @@
|
|
|
this.searchDeviceName = null;
|
|
|
this.globalUser.deviceName = null;
|
|
|
this.globalUser.clientId = null;
|
|
|
+ this.globalUser.todayDate = this.getCurrentDate();
|
|
|
uni.setNavigationBarTitle({
|
|
|
title: this.$t('equipmentStatusList.title')
|
|
|
});
|
|
|
@@ -442,6 +443,17 @@
|
|
|
getEquipmentTitle(equipment) {
|
|
|
return equipment.name ? equipment.name : equipment.clientId;
|
|
|
},
|
|
|
+ getCurrentDate() {
|
|
|
+ const today = new Date();
|
|
|
+ // 获取年份
|
|
|
+ const year = today.getFullYear();
|
|
|
+ // 获取月份 (注意，JavaScript 的月份是从0开始的，所以要加1)
|
|
|
+ const month = String(today.getMonth() + 1).padStart(2, '0');
|
|
|
+ // 获取日期
|
|
|
+ const day = String(today.getDate()).padStart(2, '0');
|
|
|
+ // 格式化为 "yyyy-MM-dd" 格式
|
|
|
+ return `${year}-${month}-${day}`;
|
|
|
+ },
|
|
|
getEquipmentListData() {
|
|
|
if(this.globalUser.id == 1) {
|
|
|
uni.showToast({
|
|
|
@@ -451,6 +463,7 @@
|
|
|
return;
|
|
|
} else {
|
|
|
this.isLoading = true;
|
|
|
+ console.log('参数', this.globalUser);
|
|
|
this.getEquipmentListByUser(this.globalUser)
|
|
|
.then(data => {
|
|
|
this.merchantList = data;
|
|
|
@@ -462,7 +475,7 @@
|
|
|
} else {
|
|
|
this.btnShow = false;
|
|
|
}
|
|
|
- console.log(this.equipmentList);
|
|
|
+ // console.log(this.equipmentList);
|
|
|
this.isLoading = false;
|
|
|
var listName = data[0].equipmentList;
|
|
|
var times = new Map;
|
|
|
@@ -550,7 +563,7 @@
|
|
|
} else {
|
|
|
this.globalUser.offset = null;
|
|
|
this.globalUser.limit = null;
|
|
|
- console.log(this.globalUser)
|
|
|
+ // console.log(this.globalUser)
|
|
|
this.globalUser.clientId = this.searchClientId;
|
|
|
this.getEquipmentListData();
|
|
|
}
|
|
|
@@ -567,7 +580,7 @@
|
|
|
this.globalUser.limit = null;
|
|
|
this.globalUser.deviceName = this.searchDeviceName;
|
|
|
this.getEquipmentListData();
|
|
|
- console.log(this.globalUser)
|
|
|
+ // console.log(this.globalUser)
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -601,7 +614,7 @@
|
|
|
'token': token
|
|
|
},
|
|
|
success: (res) => {
|
|
|
- console.log(res.data.code);
|
|
|
+ // console.log(res.data.code);
|
|
|
if (res.data.code) {
|
|
|
uni.showModal({
|
|
|
title: that.$t('equipmentStatusList.tip'),
|
|
|
@@ -842,7 +855,7 @@
|
|
|
});
|
|
|
},
|
|
|
network(id) {
|
|
|
- console.log("network");
|
|
|
+ // console.log("network");
|
|
|
var token = uni.getStorageSync("token");
|
|
|
var equipmentId = id;
|
|
|
uni.request({
|
