|
@@ -2551,6 +2551,7 @@
|
|
|
this_.loading.batchProcessingFun = true;
|
|
|
|
|
|
baseApi.websocket1(allUrl.websocket.wss,data=>{
|
|
|
+ console.log(data,'--------')
|
|
|
if(data.data.status == '1'){
|
|
|
baseApi.ajax_post_ws(
|
|
|
allUrl.gisMap.lampcontrolDimming,
|
|
@@ -2568,17 +2569,17 @@
|
|
|
)
|
|
|
}
|
|
|
if(data.data.status == '2'){
|
|
|
- if(data.data.code == '0000'){
|
|
|
+ if(data.code == '0000'){
|
|
|
console.log(1,'--')
|
|
|
this_.$notify({
|
|
|
title: 'Successful operation',
|
|
|
- message: 'lamp '+data.data.data.number,
|
|
|
+ message: 'lamp '+data.data.number,
|
|
|
type: 'success'
|
|
|
});
|
|
|
this_.giveCommandJournal.push({
|
|
|
time:this_.GMTToZero2(new Date()),
|
|
|
- text:data.data.msg,
|
|
|
- number:data.data.data.number,
|
|
|
+ text:data.msg,
|
|
|
+ number:data.data.number,
|
|
|
type:true
|
|
|
})
|
|
|
i++;
|
|
@@ -2594,12 +2595,12 @@
|
|
|
}else{
|
|
|
this_.$notify.error({
|
|
|
title: 'Operation failed',
|
|
|
- message: 'Lamp '+data.data.data.number+':'+data.data.msg
|
|
|
+ message: 'Lamp '+data.data.number+':'+data.msg
|
|
|
});
|
|
|
this_.giveCommandJournal.push({
|
|
|
time:this_.GMTToZero2(new Date()),
|
|
|
- text:data.data.msg,
|
|
|
- number:data.data.data.number,
|
|
|
+ text:data.msg,
|
|
|
+ number:data.data.number,
|
|
|
type:false
|
|
|
})
|
|
|
i++;
|