|
@@ -2096,33 +2096,34 @@
|
|
|
<div class="heigeinput">
|
|
|
<el-form-item label="颜色">
|
|
|
<div class="saninput titleinput"> R
|
|
|
- <el-input v-model="r" autocomplete="off"></el-input>G
|
|
|
- <el-input v-model="g" autocomplete="off"></el-input>B
|
|
|
- <el-input v-model="b" autocomplete="off"></el-input>
|
|
|
+ <el-input v-model="colorobj.R" autocomplete="off"></el-input>G
|
|
|
+ <el-input v-model="colorobj.G" autocomplete="off"></el-input>B
|
|
|
+ <el-input v-model="colorobj.B" autocomplete="off"></el-input>
|
|
|
<el-color-picker
|
|
|
v-model="lineColor"
|
|
|
show-alpha
|
|
|
+ @change="colorchange()"
|
|
|
:predefine="predefineColors">
|
|
|
</el-color-picker>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<div class="yiinpu heigeinput">
|
|
|
<el-form-item label="透明度" :label-width="formLabelWidth2">
|
|
|
- <el-input v-model="form.name" autocomplete="off"></el-input>
|
|
|
+ <el-input v-model="colorobj.transparency" autocomplete="off"></el-input>
|
|
|
<span style="width:80px">值范围0~1</span>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="radio_text text_color liangf">
|
|
|
<div class="classfelx" style="text-align: center;">
|
|
|
<el-radio
|
|
|
- v-model="radio"
|
|
|
- label="on"
|
|
|
+ v-model="colorobj.showHideState"
|
|
|
+ label="0"
|
|
|
>hide</el-radio>
|
|
|
</div>
|
|
|
<div class="classfelx">
|
|
|
<el-radio
|
|
|
- v-model="radio"
|
|
|
- label="off"
|
|
|
+ v-model="colorobj.showHideState"
|
|
|
+ label="1"
|
|
|
>show</el-radio
|
|
|
>
|
|
|
</div>
|
|
@@ -2168,7 +2169,7 @@
|
|
|
:label="item.title"
|
|
|
:name="item.name"
|
|
|
>
|
|
|
- {{item.content}}
|
|
|
+ <!-- {{item.content}} -->
|
|
|
<Addtabs :is=item.content> {{item.content}}</Addtabs>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
@@ -2180,7 +2181,7 @@
|
|
|
<el-button @click="dialog.Slice_Surface= false"
|
|
|
>{{ $t("HCFD.file.cancel")}}</el-button
|
|
|
>
|
|
|
- <el-button type="primary" @click="dialog.Slice_Surface= false"
|
|
|
+ <el-button type="primary" @click=" liceOK();dialog.Slice_Surface= false"
|
|
|
>{{ $t("HCFD.file.ok")}}</el-button
|
|
|
>
|
|
|
<el-button type="primary" @click="dialog.Slice_Surface = false"
|
|
@@ -2664,7 +2665,13 @@ export default {
|
|
|
bmScalars:[],
|
|
|
nameTypes:''
|
|
|
},
|
|
|
-
|
|
|
+ colorobj:{
|
|
|
+ R:'0',
|
|
|
+ G:'0',
|
|
|
+ B:'0',
|
|
|
+ showHideState:'1',
|
|
|
+ transparency:'',
|
|
|
+ },
|
|
|
vectorobj:{
|
|
|
dataU:'r',
|
|
|
dataV:'r',
|
|
@@ -3444,7 +3451,7 @@ pointclick(){
|
|
|
this.editableTabs.push({
|
|
|
title:newTabName,
|
|
|
name: newTabName,
|
|
|
- content:"Addtabs",
|
|
|
+ content:'Addtabs',
|
|
|
});
|
|
|
this.editableTabsValue = newTabName;
|
|
|
console.log( this.editableTabs);
|
|
@@ -3487,6 +3494,9 @@ moveTab(){
|
|
|
|
|
|
this.editableTabsValue = activeName;
|
|
|
this.editableTabs = tabs.filter(tab => tab.name !== targetName);
|
|
|
+},
|
|
|
+liceOK(){
|
|
|
+
|
|
|
},
|
|
|
changedesc1(val){
|
|
|
this.desclist=JSON.parse(val);
|
|
@@ -3719,11 +3729,12 @@ bStepok(num,action){
|
|
|
dataU:this.vectorobj.dataU,
|
|
|
dataV:this.vectorobj.dataV,
|
|
|
dataW:this.vectorobj.dataW,
|
|
|
- scaleFactor:this.vectorobj.scaleFactor
|
|
|
+ scaleFactor:this.vectorobj.scaleFactor,
|
|
|
+
|
|
|
}
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
- this.outlinedata();
|
|
|
+
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
})
|
|
@@ -3796,13 +3807,53 @@ bmScalarschange(val){
|
|
|
|
|
|
},
|
|
|
//实体的颜色的控制
|
|
|
-colorsolid(){
|
|
|
-
|
|
|
- let str=this.lineColor.slice(5,-1)
|
|
|
- let a=str.lice(0,)
|
|
|
+colorchange(val){
|
|
|
+console.log(this.lineColor)
|
|
|
+if(this.lineColor!=null){
|
|
|
+ let str=this.lineColor.slice(5,-1)
|
|
|
let colorstr=str.split(",");
|
|
|
- const obj = {...colorstr} ;
|
|
|
- console.log(colorstr);
|
|
|
+ this.colorobj.R=colorstr[0];
|
|
|
+ this.colorobj.G=colorstr[1];
|
|
|
+ this.colorobj.B=colorstr[2];
|
|
|
+ this.colorobj.transparency=colorstr[3];
|
|
|
+ console.log(colorstr);
|
|
|
+}
|
|
|
+
|
|
|
+},
|
|
|
+colorsolid(){
|
|
|
+let r=(Number(this.colorobj.R)/255).toFixed(4);
|
|
|
+let g=(Number(this.colorobj.G)/255).toFixed(4);
|
|
|
+let b=(Number(this.colorobj.B)/255).toFixed(4);
|
|
|
+;
|
|
|
+
|
|
|
+ const params = {
|
|
|
+ transCode: 'AFT001',
|
|
|
+ pid:this.project.projectId,
|
|
|
+ solverConfigId:this.solverConfigid,
|
|
|
+ action:'SolidSurfaceDisplay',
|
|
|
+ paramJson:'',
|
|
|
+ step:this.bStep,
|
|
|
+ scalarName:this.outlineobj.scalarName,
|
|
|
+ level:'',
|
|
|
+ range0:this.outlineobj.range0,
|
|
|
+ range1:this.outlineobj.range1,
|
|
|
+ isVolume:this.isVolume,
|
|
|
+ dataU:this.vectorobj.dataU,
|
|
|
+ dataV:this.vectorobj.dataV,
|
|
|
+ dataW:this.vectorobj.dataW,
|
|
|
+ scaleFactor:this.vectorobj.scaleFactor,
|
|
|
+ r:r,
|
|
|
+ g:g,
|
|
|
+ b:b,
|
|
|
+ transparency: this.colorobj.transparency,
|
|
|
+ showHideState:this.colorobj.showHideState,
|
|
|
+ }
|
|
|
+ request(params)
|
|
|
+ .then((res) => {
|
|
|
+ console.log(res)
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ })
|
|
|
},
|
|
|
//
|
|
|
//模块选择
|
|
@@ -3902,9 +3953,11 @@ this.styX.left=e.clientX+'px';
|
|
|
this.dialog.VolumeGrid_visiable = true;
|
|
|
break;
|
|
|
case 'five7-0':
|
|
|
+ this.outlinedata();
|
|
|
this.dialog.contour_visiable = true;
|
|
|
break;
|
|
|
case 'five7-1':
|
|
|
+ this.outlinedata();
|
|
|
this.dialog.Line_visiable = true;
|
|
|
break;
|
|
|
case 'five7-2':
|