|  | @@ -1683,7 +1683,7 @@
 | 
											
												
													
														|  |          <el-button type="primary"  @click='resourceOK()'>{{ $t("HCFD.file.ok")}} </el-button>
 |  |          <el-button type="primary"  @click='resourceOK()'>{{ $t("HCFD.file.ok")}} </el-button>
 | 
											
												
													
														|  |        </div>
 |  |        </div>
 | 
											
												
													
														|  |      </el-dialog>
 |  |      </el-dialog>
 | 
											
												
													
														|  | -    <!-- 求解表面 -->
 |  | 
 | 
											
												
													
														|  | 
 |  | +    <!-- 物面数据 -->
 | 
											
												
													
														|  |       <el-dialog
 |  |       <el-dialog
 | 
											
												
													
														|  |        :visible.sync="dialog.SurfaceGrid_visiable"
 |  |        :visible.sync="dialog.SurfaceGrid_visiable"
 | 
											
												
													
														|  |        class="lg-y-z"
 |  |        class="lg-y-z"
 | 
											
										
											
												
													
														|  | @@ -1716,7 +1716,7 @@
 | 
											
												
													
														|  |                          </el-option>
 |  |                          </el-option>
 | 
											
												
													
														|  |                    </el-select>
 |  |                    </el-select>
 | 
											
												
													
														|  |                  </el-form-item>
 |  |                  </el-form-item>
 | 
											
												
													
														|  | -                          <el-form-item :label=" $t('HCFD.results.scalar') " :label-width="formLabelWidth2">
 |  | 
 | 
											
												
													
														|  | 
 |  | +                          <!-- <el-form-item :label=" $t('HCFD.results.scalar') " :label-width="formLabelWidth2">
 | 
											
												
													
														|  |                            <el-select size="mini" v-model="bScalar" placeholder="请选择">
 |  |                            <el-select size="mini" v-model="bScalar" placeholder="请选择">
 | 
											
												
													
														|  |                            <el-option
 |  |                            <el-option
 | 
											
												
													
														|  |                              v-for="scalar in boundaryScalars"
 |  |                              v-for="scalar in boundaryScalars"
 | 
											
										
											
												
													
														|  | @@ -1726,8 +1726,8 @@
 | 
											
												
													
														|  |                            >
 |  |                            >
 | 
											
												
													
														|  |                            </el-option>
 |  |                            </el-option>
 | 
											
												
													
														|  |                          </el-select>
 |  |                          </el-select>
 | 
											
												
													
														|  | -                    </el-form-item> 
 |  | 
 | 
											
												
													
														|  | -                  <div>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    </el-form-item>  -->
 | 
											
												
													
														|  | 
 |  | +                  <!-- <div>
 | 
											
												
													
														|  |                         <el-form-item :label=" $t('HCFD.results.contour')" :label-width="formLabelWidth2">
 |  |                         <el-form-item :label=" $t('HCFD.results.contour')" :label-width="formLabelWidth2">
 | 
											
												
													
														|  |                           <el-input-number v-model="Surfacenum" @change="SurfaceChange" :min="1" :max="10" label="描述文字"></el-input-number>
 |  |                           <el-input-number v-model="Surfacenum" @change="SurfaceChange" :min="1" :max="10" label="描述文字"></el-input-number>
 | 
											
												
													
														|  |                      </el-form-item>
 |  |                      </el-form-item>
 | 
											
										
											
												
													
														|  | @@ -1744,15 +1744,15 @@
 | 
											
												
													
														|  |                          ></el-checkbox>
 |  |                          ></el-checkbox>
 | 
											
												
													
														|  |                        </el-checkbox-group>
 |  |                        </el-checkbox-group>
 | 
											
												
													
														|  |                      </li>
 |  |                      </li>
 | 
											
												
													
														|  | -                  </div>
 |  | 
 | 
											
												
													
														|  | -                      <el-button
 |  | 
 | 
											
												
													
														|  | 
 |  | +                  </div> -->
 | 
											
												
													
														|  | 
 |  | +                      <!-- <el-button
 | 
											
												
													
														|  |                          size="mini"
 |  |                          size="mini"
 | 
											
												
													
														|  |                          type="primary"
 |  |                          type="primary"
 | 
											
												
													
														|  |                          style="margin:30px 0 30px 40%"
 |  |                          style="margin:30px 0 30px 40%"
 | 
											
												
													
														|  |                          @click="boundaryShow()"
 |  |                          @click="boundaryShow()"
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -                        > {{ $t("HCFD.results.Surface")}} </el-button>
 |  | 
 | 
											
												
													
														|  | -        >
 |  | 
 | 
											
												
													
														|  | 
 |  | +                        > {{ $t("HCFD.results.Surface")}} </el-button> -->
 | 
											
												
													
														|  | 
 |  | +        
 | 
											
												
													
														|  |        </el-form>
 |  |        </el-form>
 | 
											
												
													
														|  |        </div>
 |  |        </div>
 | 
											
												
													
														|  |            </div>
 |  |            </div>
 | 
											
										
											
												
													
														|  | @@ -2378,16 +2378,19 @@
 | 
											
												
													
														|  |          <span class="texttype">选择类型</span>
 |  |          <span class="texttype">选择类型</span>
 | 
											
												
													
														|  |        <div class="divselect">
 |  |        <div class="divselect">
 | 
											
												
													
														|  |        <div>
 |  |        <div>
 | 
											
												
													
														|  | -        <el-radio v-model="radio" label="1">点</el-radio>
 |  | 
 | 
											
												
													
														|  | -        <el-radio v-model="radio" label="2">曲线</el-radio>
 |  | 
 | 
											
												
													
														|  | 
 |  | +         <el-radio-group  v-model="lineType"  @input="inputline()" >
 | 
											
												
													
														|  | 
 |  | +         <el-radio  label="1">点</el-radio>
 | 
											
												
													
														|  | 
 |  | +        <el-radio  label="2">曲线</el-radio>
 | 
											
												
													
														|  | 
 |  | +        </el-radio-group>
 | 
											
												
													
														|  | 
 |  | +       
 | 
											
												
													
														|  |        </div>
 |  |        </div>
 | 
											
												
													
														|  |         
 |  |         
 | 
											
												
													
														|  |          <div>
 |  |          <div>
 | 
											
												
													
														|  |           <el-form-item label="点大小" :label-width="formLabelWidth2" >
 |  |           <el-form-item label="点大小" :label-width="formLabelWidth2" >
 | 
											
												
													
														|  | -      <el-input value="PingYi" autocomplete="off"></el-input>
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <el-input  v-model="linevalue" autocomplete="off"></el-input>
 | 
											
												
													
														|  |        </el-form-item>
 |  |        </el-form-item>
 | 
											
												
													
														|  |           <el-form-item label="曲线大小" :label-width="formLabelWidth2" >
 |  |           <el-form-item label="曲线大小" :label-width="formLabelWidth2" >
 | 
											
												
													
														|  | -      <el-input value="PingYi" autocomplete="off"></el-input>
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <el-input  v-model="linevalue" autocomplete="off"></el-input>
 | 
											
												
													
														|  |        </el-form-item>
 |  |        </el-form-item>
 | 
											
												
													
														|  |          </div>
 |  |          </div>
 | 
											
												
													
														|  |        </div>
 |  |        </div>
 | 
											
										
											
												
													
														|  | @@ -2641,6 +2644,9 @@ export default {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |    data() {
 |  |    data() {
 | 
											
												
													
														|  |      return {
 |  |      return {
 | 
											
												
													
														|  | 
 |  | +      // 折线图的参数
 | 
											
												
													
														|  | 
 |  | +      lineType: "2",
 | 
											
												
													
														|  | 
 |  | +      linevalue:"1",
 | 
											
												
													
														|  |        slice:{
 |  |        slice:{
 | 
											
												
													
														|  |        fw:'1',
 |  |        fw:'1',
 | 
											
												
													
														|  |        slicecheck:'Solid',
 |  |        slicecheck:'Solid',
 | 
											
										
											
												
													
														|  | @@ -3036,7 +3042,7 @@ export default {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |        belementCheckeds: ["Contour"],
 |  |        belementCheckeds: ["Contour"],
 | 
											
												
													
														|  |        boundaryStep: [],
 |  |        boundaryStep: [],
 | 
											
												
													
														|  | -      bStep: 0,
 |  | 
 | 
											
												
													
														|  | 
 |  | +      bStep:'',
 | 
											
												
													
														|  |        boundaryScalars: [],
 |  |        boundaryScalars: [],
 | 
											
												
													
														|  |        bScalar: "cp",
 |  |        bScalar: "cp",
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -3225,6 +3231,7 @@ export default {
 | 
											
												
													
														|  |        //state -1,0 ,1
 |  |        //state -1,0 ,1
 | 
											
												
													
														|  |        //message
 |  |        //message
 | 
											
												
													
														|  |        //type 1 一般 2 下载
 |  |        //type 1 一般 2 下载
 | 
											
												
													
														|  | 
 |  | +      state:'',//求解状态(0-为求解,1-求解成功,-1-是求解失败)
 | 
											
												
													
														|  |        loadObjs: [],
 |  |        loadObjs: [],
 | 
											
												
													
														|  |        loadVVisiable: false,
 |  |        loadVVisiable: false,
 | 
											
												
													
														|  |        loading: false,
 |  |        loading: false,
 | 
											
										
											
												
													
														|  | @@ -3352,6 +3359,14 @@ export default {
 | 
											
												
													
														|  |    //     this.websock.close() //离开路由之后断开websocket连接
 |  |    //     this.websock.close() //离开路由之后断开websocket连接
 | 
											
												
													
														|  |    //   },
 |  |    //   },
 | 
											
												
													
														|  |  methods:{
 |  |  methods:{
 | 
											
												
													
														|  | 
 |  | +  //  折线图对线的控制
 | 
											
												
													
														|  | 
 |  | +  // inputline(){
 | 
											
												
													
														|  | 
 |  | +  //     let val = this.linevalue;
 | 
											
												
													
														|  | 
 |  | +  //     this.$set(this.option.plotOptions.series, "lineWidth", Number(val));
 | 
											
												
													
														|  | 
 |  | +  //     // console.log(this.option.plotOptions.series.lineWidth);
 | 
											
												
													
														|  | 
 |  | +  //     this.$refs.child.showChart("highcharts", this.Option);
 | 
											
												
													
														|  | 
 |  | +  // },
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |    // 上传文件,加载图片 
 |  |    // 上传文件,加载图片 
 | 
											
												
													
														|  |    runugrid(){
 |  |    runugrid(){
 | 
											
												
													
														|  |        this.$parent.startimg("init",'loaddata');
 |  |        this.$parent.startimg("init",'loaddata');
 | 
											
										
											
												
													
														|  | @@ -3421,12 +3436,13 @@ moveTab(){
 | 
											
												
													
														|  |  console.log(val)
 |  |  console.log(val)
 | 
											
												
													
														|  |    },
 |  |    },
 | 
											
												
													
														|  |    //数据加载参数配置obj
 |  |    //数据加载参数配置obj
 | 
											
												
													
														|  | -    hcfdchange(obj,solverConfigid){
 |  | 
 | 
											
												
													
														|  | 
 |  | +    hcfdchange(obj,solverConfigid,datas){
 | 
											
												
													
														|  |         this.parameterObj = JSON.parse(obj);
 |  |         this.parameterObj = JSON.parse(obj);
 | 
											
												
													
														|  |         this.desclist=this.parameterObj.hcfdBoundarys;
 |  |         this.desclist=this.parameterObj.hcfdBoundarys;
 | 
											
												
													
														|  | -       console.log( this.desclist);
 |  | 
 | 
											
												
													
														|  |        sessionStorage.setItem("res", obj);
 |  |        sessionStorage.setItem("res", obj);
 | 
											
												
													
														|  |        this.solverConfigid=solverConfigid;
 |  |        this.solverConfigid=solverConfigid;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +       this.state=datas.state;
 | 
											
												
													
														|  |        sessionStorage.setItem("solverConfigid", solverConfigid);
 |  |        sessionStorage.setItem("solverConfigid", solverConfigid);
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  |  //更新参数配置
 |  |  //更新参数配置
 | 
											
										
											
												
													
														|  | @@ -3514,7 +3530,7 @@ hcfdparam(){
 | 
											
												
													
														|  |       * 更新配置 并求解
 |  |       * 更新配置 并求解
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      async hcfdrun() {
 |  |      async hcfdrun() {
 | 
											
												
													
														|  | -      if (this.solverState == "2") {
 |  | 
 | 
											
												
													
														|  | 
 |  | +      if (this.state == "1") {
 | 
											
												
													
														|  |          //上次求解完成
 |  |          //上次求解完成
 | 
											
												
													
														|  |          MessageBox.confirm(
 |  |          MessageBox.confirm(
 | 
											
												
													
														|  |            "已完成计算,是否放弃上次计算结果,重新计算? 如果不放弃请自行下载上次结果文件!",
 |  |            "已完成计算,是否放弃上次计算结果,重新计算? 如果不放弃请自行下载上次结果文件!",
 | 
											
										
											
												
													
														|  | @@ -3597,12 +3613,27 @@ hcfdparam(){
 | 
											
												
													
														|  |          activecleer(){
 |  |          activecleer(){
 | 
											
												
													
														|  |            this.active=11;
 |  |            this.active=11;
 | 
											
												
													
														|  |          },
 |  |          },
 | 
											
												
													
														|  | 
 |  | +// 获取物面数据的步数
 | 
											
												
													
														|  | 
 |  | +setpnum(){
 | 
											
												
													
														|  | 
 |  | + let params = {
 | 
											
												
													
														|  | 
 |  | +            transCode: "AFT002",
 | 
											
												
													
														|  | 
 |  | +            pid: this.projectId,
 | 
											
												
													
														|  | 
 |  | +            solverConfigId:this.solverConfigid,
 | 
											
												
													
														|  | 
 |  | +          };
 | 
											
												
													
														|  | 
 |  | +           request(params)
 | 
											
												
													
														|  | 
 |  | +        .then((res) => {
 | 
											
												
													
														|  | 
 |  | +          console.log(res)
 | 
											
												
													
														|  | 
 |  | +        let steps= res.steps.split(',');
 | 
											
												
													
														|  | 
 |  | +        console.log(steps);
 | 
											
												
													
														|  | 
 |  | +        this.boundaryStep=steps;
 | 
											
												
													
														|  | 
 |  | +        
 | 
											
												
													
														|  | 
 |  | +            })
 | 
											
												
													
														|  | 
 |  | +},
 | 
											
												
													
														|  |   //模块选择
 |  |   //模块选择
 | 
											
												
													
														|  |    clickgeometry(e,index,key){
 |  |    clickgeometry(e,index,key){
 | 
											
												
													
														|  |    
 |  |    
 | 
											
												
													
														|  |  var e=e||window.Event
 |  |  var e=e||window.Event
 | 
											
												
													
														|  |    console.log(e.screenX)
 |  |    console.log(e.screenX)
 | 
											
												
													
														|  | -   console.log(122222)
 |  | 
 | 
											
												
													
														|  |  this.styX.left=e.clientX+'px';
 |  |  this.styX.left=e.clientX+'px';
 | 
											
												
													
														|  |      this.active=key;
 |  |      this.active=key;
 | 
											
												
													
														|  |      console.log(key);
 |  |      console.log(key);
 | 
											
										
											
												
													
														|  | @@ -3676,9 +3707,6 @@ this.styX.left=e.clientX+'px';
 | 
											
												
													
														|  |         break;
 |  |         break;
 | 
											
												
													
														|  |          case 'four4-1':
 |  |          case 'four4-1':
 | 
											
												
													
														|  |         this.dialog.swap_visiable = true;
 |  |         this.dialog.swap_visiable = true;
 | 
											
												
													
														|  | -       break;
 |  | 
 | 
											
												
													
														|  | -        case 'four4-2':
 |  | 
 | 
											
												
													
														|  | -       this.hcfdrun(true);
 |  | 
 | 
											
												
													
														|  |         break;
 |  |         break;
 | 
											
												
													
														|  |          case 'four44-0':
 |  |          case 'four44-0':
 | 
											
												
													
														|  |            this.hcfdrun();
 |  |            this.hcfdrun();
 | 
											
										
											
												
													
														|  | @@ -3688,6 +3716,7 @@ this.styX.left=e.clientX+'px';
 | 
											
												
													
														|  |        //   case 'four4-4':
 |  |        //   case 'four4-4':
 | 
											
												
													
														|  |        //  break;
 |  |        //  break;
 | 
											
												
													
														|  |         case 'five-0':
 |  |         case 'five-0':
 | 
											
												
													
														|  | 
 |  | +         this.setpnum();
 | 
											
												
													
														|  |           this.dialog.SurfaceGrid_visiable = true;
 |  |           this.dialog.SurfaceGrid_visiable = true;
 | 
											
												
													
														|  |         break;
 |  |         break;
 | 
											
												
													
														|  |         case 'five-1':
 |  |         case 'five-1':
 |