|
@@ -507,10 +507,7 @@ linezhexian(num){
|
|
|
this.$refs.TFileStream.imgtupian=false;
|
|
|
this.$refs.monitor.container_show=false;
|
|
|
this.solverConfigid=res.solverConfigid;
|
|
|
- setTimeout(function(){
|
|
|
- that.initWebSocket();
|
|
|
- },500)
|
|
|
-
|
|
|
+ this.startimg("init",'loaddata');
|
|
|
// }
|
|
|
}else{
|
|
|
|
|
@@ -546,15 +543,15 @@ linezhexian(num){
|
|
|
let data= JSON.parse(this.objopp);
|
|
|
this.numsteps=data.nmlParam.steps;
|
|
|
this.exlodingfalse(false)
|
|
|
- that.$refs.TFileStream.imgtupian=true;
|
|
|
+ this.startimg("init",'loaddata');
|
|
|
that.$refs.monitor.container_show=true;
|
|
|
})
|
|
|
}else if(val=='FEMLab(结构力学)'){
|
|
|
let data=res;
|
|
|
- this.logs='FEMLab(结构力学)';
|
|
|
this.$refs.fem.femchange(res.parameterObj,res.solverConfigid,data);
|
|
|
this.solverConfigid=res.solverConfigid;
|
|
|
- that.$refs.TFileStream.imgtupian=false;
|
|
|
+ this.logs='FEMLab(结构力学)';
|
|
|
+ this.startimg("init",'loaddata');
|
|
|
that.$refs.monitor.container_show=false;
|
|
|
|
|
|
|
|
@@ -644,7 +641,6 @@ let params = {
|
|
|
this.loading = true;
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
- this.logs='HCFD'
|
|
|
if(res.returnCode=='000000000'){
|
|
|
this.startimgloaddata(action2)
|
|
|
}else{
|
|
@@ -670,7 +666,8 @@ let params = {
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
setTimeout(() => {
|
|
|
- this.loadingend(this.loadingopen())
|
|
|
+ // this.loadingend(this.loadingopen());
|
|
|
+ console.log(1111);
|
|
|
}, 30000);
|
|
|
|
|
|
})
|
|
@@ -698,7 +695,7 @@ let params = {
|
|
|
},
|
|
|
websocketonmessage(e){ //数据接收
|
|
|
|
|
|
- this.loadingopen();
|
|
|
+
|
|
|
// setTimeout(() => {
|
|
|
// this.loadingend(this.loadingopen());
|
|
|
// // loading.close();
|
|
@@ -708,18 +705,19 @@ let params = {
|
|
|
const redata = JSON.parse(e.data);
|
|
|
|
|
|
if(redata.hasOwnProperty("img")){
|
|
|
+ this.loadingopen();
|
|
|
if(redata.img=''||redata.img==null||redata.img==undefined||redata.img==false){
|
|
|
- console.log(11111)
|
|
|
+
|
|
|
|
|
|
}else{
|
|
|
- console.log(2222)
|
|
|
+
|
|
|
}
|
|
|
this.$refs.TFileStream.imgtupian=true;
|
|
|
this.$refs.TFileStream.fetchData(redata);
|
|
|
this.$refs.monitor.container_show=false;
|
|
|
}
|
|
|
|
|
|
- // 云图的参数返回 存储
|
|
|
+ // HCFD云图的参数返回 存储
|
|
|
console.log(redata);
|
|
|
if(redata.action=='ResultImport'){
|
|
|
let data=JSON.parse(redata.paramJson);
|