|
@@ -665,10 +665,11 @@ let params = {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
request(params)
|
|
request(params)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
|
+ this.loadingopen();
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.loadingend(this.loadingopen());
|
|
this.loadingend(this.loadingopen());
|
|
console.log(1111);
|
|
console.log(1111);
|
|
- }, 90000);
|
|
|
|
|
|
+ },30000);
|
|
|
|
|
|
})
|
|
})
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
@@ -695,14 +696,14 @@ let params = {
|
|
},
|
|
},
|
|
websocketonmessage(e){ //数据接收
|
|
websocketonmessage(e){ //数据接收
|
|
// console.log(e);
|
|
// console.log(e);
|
|
- this.loadingopen();
|
|
|
|
|
|
+
|
|
try{
|
|
try{
|
|
|
|
|
|
let eadata=e.data
|
|
let eadata=e.data
|
|
var rdata=JSON.parse(e.data)
|
|
var rdata=JSON.parse(e.data)
|
|
console.log(rdata);
|
|
console.log(rdata);
|
|
if(rdata.hasOwnProperty("img")){
|
|
if(rdata.hasOwnProperty("img")){
|
|
- this.loadingend(this.loadingopen());
|
|
|
|
|
|
+ // this.loadingend(this.loadingopen());
|
|
this.$refs.TFileStream.imgtupian=true;
|
|
this.$refs.TFileStream.imgtupian=true;
|
|
this.$refs.TFileStream.fetchData(rdata);
|
|
this.$refs.TFileStream.fetchData(rdata);
|
|
this.$refs.monitor.container_show=false;
|
|
this.$refs.monitor.container_show=false;
|