|
|
@@ -1101,13 +1101,13 @@
|
|
|
<div class="line">
|
|
|
<div class="linetext">方法</div>
|
|
|
</div>
|
|
|
- <el-radio-group
|
|
|
- v-model="parameterObj.eigv_method.value"
|
|
|
+ <el-radio-group style="display:flex"
|
|
|
+ v-model="parameterObj.eigv_method.value"
|
|
|
>
|
|
|
- <el-radio label="1">{{
|
|
|
+ <el-radio label="1" class="text_content">{{
|
|
|
$t("FEM.solution.inverse")
|
|
|
}}</el-radio>
|
|
|
- <el-radio label="2">{{
|
|
|
+ <el-radio label="2" class="text_content">{{
|
|
|
$t("FEM.solution.lanczos")
|
|
|
}}</el-radio>
|
|
|
</el-radio-group>
|
|
|
@@ -1987,6 +1987,7 @@ import p16 from '@/assets/icon/result_stream.png'
|
|
|
import p17 from '@/assets/icon/animation.png'
|
|
|
import p18 from '@/assets/icon/result_curve.png'
|
|
|
import p19 from '@/assets/hcfd_images/run.png'
|
|
|
+import { number } from 'echarts/lib/export';
|
|
|
|
|
|
export default {
|
|
|
components:{geometry,meshindex,result,toolindex,filesload,vueUploader,Addtabs},
|
|
|
@@ -1998,6 +1999,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,
|
|
|
+ femstate:-1,
|
|
|
isVolume:"",
|
|
|
outlineobj:{
|
|
|
scalarName:'',
|
|
|
@@ -2408,7 +2410,6 @@ this.init();
|
|
|
init() {
|
|
|
//this.project.projectId = this.pid; //获取url 参数
|
|
|
this.project.projectId = this.pid;
|
|
|
- console.log(this.project.projectId);
|
|
|
this.project.lesseeId = this.$store.getters.lesseeId; //获取url 参数
|
|
|
},
|
|
|
handfiles(file) {
|
|
|
@@ -2453,12 +2454,18 @@ this.init();
|
|
|
});
|
|
|
},
|
|
|
//数据加载参数配置obj
|
|
|
- femchange(obj,solverConfigid){
|
|
|
- console.log( this.parameterObj);
|
|
|
+ femchange(obj,solverConfigid,data){
|
|
|
+
|
|
|
+ this.femstate=data.state;
|
|
|
this.parameterObj = JSON.parse(obj);//JSON.parse(obj);
|
|
|
sessionStorage.setItem("res", obj);
|
|
|
this.femsolverConfigid=solverConfigid;
|
|
|
- console.log(this.femsolverConfigid);
|
|
|
+ if(this.femstate==0){//求解状态（0-求解中，1-求解成功，-1-没有求解）
|
|
|
+ this.$emit("exlodingfalse",true)
|
|
|
+ this.getwebsocket()
|
|
|
+ }else{
|
|
|
+ this.$emit("exlodingfalse",false)
|
|
|
+ }
|
|
|
if(this.parameterObj.f_static.value==true){
|
|
|
this.bxval='0';
|
|
|
}else if(this.parameterObj.eigenv.value=true){
|
|
|
@@ -2501,43 +2508,47 @@ femparam(){
|
|
|
solverConfigId:this.femsolverConfigid,
|
|
|
};
|
|
|
request(params)
|
|
|
- .then((res) => {this.getwebsocket()})
|
|
|
+ .then((res) => {
|
|
|
+ this.getwebsocket();
|
|
|
+ this.$emit("exlodingfalse",true)
|
|
|
+ })
|
|
|
.catch((err) => {
|
|
|
this.runShow='hidden'
|
|
|
- if (err.returnCode == "EB8100017") {
|
|
|
- //资源未分配
|
|
|
- MessageBox.confirm("你还未分配资源?", "提示", {
|
|
|
- confirmButtonText: "分配资源",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- let errUril =
|
|
|
- // window.location.protocol +
|
|
|
- // "//" +
|
|
|
- // window.location.host +
|
|
|
- // "/" +
|
|
|
- _this.$store.getters.proUrl +
|
|
|
- "?projectId=" +
|
|
|
- _this.project.projectId;
|
|
|
- let params2 = {
|
|
|
- transCode: "A00118",
|
|
|
- lesseeId:_this.$store.getters.lesseeId
|
|
|
- };
|
|
|
- request(params2)
|
|
|
- .then((res) => {
|
|
|
- window.location.href =
|
|
|
- errUril + "&authCode=" + res.authCode;
|
|
|
- })
|
|
|
- .catch((err) => {});
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- Message({
|
|
|
- type: "info",
|
|
|
- message: "已取消",
|
|
|
- });
|
|
|
- });
|
|
|
- }
|
|
|
+ this.$emit("exlodingfalse",false)
|
|
|
+ // if (err.returnCode == "EB8100017") {
|
|
|
+ // //资源未分配
|
|
|
+ // MessageBox.confirm("你还未分配资源?", "提示", {
|
|
|
+ // confirmButtonText: "分配资源",
|
|
|
+ // cancelButtonText: "取消",
|
|
|
+ // type: "warning",
|
|
|
+ // })
|
|
|
+ // .then(() => {
|
|
|
+ // let errUril =
|
|
|
+ // // window.location.protocol +
|
|
|
+ // // "//" +
|
|
|
+ // // window.location.host +
|
|
|
+ // // "/" +
|
|
|
+ // _this.$store.getters.proUrl +
|
|
|
+ // "?projectId=" +
|
|
|
+ // _this.project.projectId;
|
|
|
+ // let params2 = {
|
|
|
+ // transCode: "A00118",
|
|
|
+ // lesseeId:_this.$store.getters.lesseeId
|
|
|
+ // };
|
|
|
+ // request(params2)
|
|
|
+ // .then((res) => {
|
|
|
+ // window.location.href =
|
|
|
+ // errUril + "&authCode=" + res.authCode;
|
|
|
+ // })
|
|
|
+ // .catch((err) => {});
|
|
|
+ // })
|
|
|
+ // .catch(() => {
|
|
|
+ // Message({
|
|
|
+ // type: "info",
|
|
|
+ // message: "已取消",
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // }
|
|
|
});
|
|
|
},
|
|
|
//
|
|
|
@@ -2811,16 +2822,22 @@ this.styX.left=e.clientX+'px';
|
|
|
|
|
|
//连接建立之后执行send方法发送数据this.newlog();
|
|
|
// if(this.lsolverState=='1'||this.numzhexian=='1'){
|
|
|
- this.getLogs();
|
|
|
- this.historydata()
|
|
|
+
|
|
|
// }
|
|
|
+ console.log(this.femstate);
|
|
|
+ if(this.femstate==0){//判断状态为进行中
|
|
|
+ this.$emit("exlodingfalse",true)
|
|
|
+ }else{
|
|
|
+ this.getLogs();
|
|
|
+ this.historydata()
|
|
|
+ }
|
|
|
},
|
|
|
websocketonerror() {
|
|
|
//连接建立失败重连
|
|
|
this.websock.close();
|
|
|
+ this.$emit("exlodingfalse",false)
|
|
|
},
|
|
|
websocketonmessage(e) {
|
|
|
- console.log(e);
|
|
|
//数据接收
|
|
|
try{
|
|
|
const redata = JSON.parse(e.data);
|
|
|
@@ -2841,7 +2858,7 @@ this.styX.left=e.clientX+'px';
|
|
|
type: "error",
|
|
|
message: "websock断开连接",
|
|
|
});
|
|
|
-
|
|
|
+ this.$emit("exlodingfalse",false)
|
|
|
this.websock.close();
|
|
|
|
|
|
},
|
|
|
@@ -2871,6 +2888,10 @@ line-height: 30px;
|
|
|
padding: 10px 13px;
|
|
|
|
|
|
}
|
|
|
+.text_content{
|
|
|
+ flex: 1;
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
.imgzong{
|
|
|
padding-top: 4px;
|
|
|
.radiocontent{
|
