|
@@ -1950,15 +1950,15 @@
|
|
<div class="block1" style="dispaly:flex">
|
|
<div class="block1" style="dispaly:flex">
|
|
<div class="listbtn">
|
|
<div class="listbtn">
|
|
<el-button plain class="anniu" @click="lowclick()">low</el-button>
|
|
<el-button plain class="anniu" @click="lowclick()">low</el-button>
|
|
- <el-slider :max='Number(animationobj.laststep)' :step="median" v-model.number="value1" @change="sliderchange" style="width:50%;margin: 0 10px 0 15px;"></el-slider>
|
|
|
|
|
|
+ <el-slider :max='Number(animationobj.laststep)' :min="Number(animationobj.firststep)" :step="median" v-model.number="value1" @change="sliderchange" style="width:50%;margin: 0 10px 0 15px;"></el-slider>
|
|
<el-button plain class="anniu" @click="Quickclick()">Quick</el-button>
|
|
<el-button plain class="anniu" @click="Quickclick()">Quick</el-button>
|
|
</div>
|
|
</div>
|
|
<div class="listbtn anbtn">
|
|
<div class="listbtn anbtn">
|
|
<el-button plain class="anniu" @click="Startclick()">Start</el-button>
|
|
<el-button plain class="anniu" @click="Startclick()">Start</el-button>
|
|
- <el-button plain class="anniu" @click="Lastclick()">Last</el-button>
|
|
|
|
|
|
+ <el-button plain class="anniu" @click="Lastclick();signnum=false;">Last</el-button>
|
|
<el-button plain class="anniu" @click="Playstop()">Play/stop</el-button>
|
|
<el-button plain class="anniu" @click="Playstop()">Play/stop</el-button>
|
|
- <el-button plain class="anniu" @click="Nextclick()">Next</el-button>
|
|
|
|
- <el-button plain class="anniu" @click="Endclick()">End</el-button>
|
|
|
|
|
|
+ <el-button plain class="anniu" @click="Nextclick();signnum=false;">Next</el-button>
|
|
|
|
+ <el-button plain class="anniu" @click="Endclick();signnum=false;">End</el-button>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -2091,7 +2091,7 @@ export default {
|
|
range0:'',
|
|
range0:'',
|
|
range1:'',
|
|
range1:'',
|
|
leixing:'',
|
|
leixing:'',
|
|
- level:'1',
|
|
|
|
|
|
+ level:'10',
|
|
bmScalars:[],
|
|
bmScalars:[],
|
|
nameTypes:'',
|
|
nameTypes:'',
|
|
scalarmax:'',
|
|
scalarmax:'',
|
|
@@ -2168,7 +2168,7 @@ export default {
|
|
tabIndex: 0,
|
|
tabIndex: 0,
|
|
variableNamearr:[],
|
|
variableNamearr:[],
|
|
|
|
|
|
- value1: 0,
|
|
|
|
|
|
+ value1:3,
|
|
loadObjs: [],
|
|
loadObjs: [],
|
|
lesseeId:'',
|
|
lesseeId:'',
|
|
disOK:true,
|
|
disOK:true,
|
|
@@ -2701,8 +2701,8 @@ outlinedata(val){
|
|
this.outlineobj.scalarName=ytdata.scalarName;
|
|
this.outlineobj.scalarName=ytdata.scalarName;
|
|
this.vSalar=ytdata.scalarName;
|
|
this.vSalar=ytdata.scalarName;
|
|
this.outlineobj.scalarmax=ytdata.scalarrange;
|
|
this.outlineobj.scalarmax=ytdata.scalarrange;
|
|
- this.outlineobj.range0=ytdata.range0;
|
|
|
|
- this.outlineobj.range1=ytdata.range1;
|
|
|
|
|
|
+ // this.outlineobj.range0=ytdata.range0;
|
|
|
|
+ // this.outlineobj.range1=ytdata.range1;
|
|
let ress=ytdata.scalarNames;
|
|
let ress=ytdata.scalarNames;
|
|
if(ress==undefined){
|
|
if(ress==undefined){
|
|
Message({
|
|
Message({
|
|
@@ -2711,8 +2711,9 @@ if(ress==undefined){
|
|
});
|
|
});
|
|
}else{
|
|
}else{
|
|
this.outlineobj.bmScalars=Array.from(ress.split(","));
|
|
this.outlineobj.bmScalars=Array.from(ress.split(","));
|
|
- this.outlineobj.nameTypes=ytdata.nameTypes
|
|
|
|
|
|
+ this.outlineobj.nameTypes=ytdata.nameTypes;
|
|
this.strnumchange(ytdata.nameTypes);
|
|
this.strnumchange(ytdata.nameTypes);
|
|
|
|
+ this.outlinemax(this.vSalar)
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2758,7 +2759,7 @@ vectorOK(){
|
|
index:newTabName,
|
|
index:newTabName,
|
|
type:"line",
|
|
type:"line",
|
|
variableName:'',
|
|
variableName:'',
|
|
- level:'',
|
|
|
|
|
|
+ level:'10',
|
|
normal_x:'',
|
|
normal_x:'',
|
|
normal_y :'',
|
|
normal_y :'',
|
|
normal_z:'',
|
|
normal_z:'',
|
|
@@ -3297,16 +3298,15 @@ this.hideZones=(this.checkList).toString()
|
|
this.bStepok("animation",'','')
|
|
this.bStepok("animation",'','')
|
|
},
|
|
},
|
|
Startclick(){
|
|
Startclick(){
|
|
- this.lowbool=false;
|
|
|
|
- this.Quickbool=false;
|
|
|
|
- this.Startbool=true;
|
|
|
|
- this.sign=='Start';
|
|
|
|
- let that=this;
|
|
|
|
- this.numan=true;
|
|
|
|
|
|
+ let that=this;
|
|
|
|
+ this.countnum=Number(this.animationobj.firststep)-this.median;
|
|
this.value1= Number(this.animationobj.currentstep);
|
|
this.value1= Number(this.animationobj.currentstep);
|
|
- console.log(this.numan)
|
|
|
|
- this.timesleep(500)
|
|
|
|
- },
|
|
|
|
|
|
+ this.sign=='Start';
|
|
|
|
+ setTimeout(function(){
|
|
|
|
+ that.signnum=true;
|
|
|
|
+ that.numan=true;
|
|
|
|
+ that.timesleep(500)
|
|
|
|
+ },300)},
|
|
stepfun(){
|
|
stepfun(){
|
|
for(let i=0;i<=this.femSteplist.length-1;i++){
|
|
for(let i=0;i<=this.femSteplist.length-1;i++){
|
|
if(this.femSteplist[i]==this.animationobj.currentstep){
|
|
if(this.femSteplist[i]==this.animationobj.currentstep){
|
|
@@ -3327,20 +3327,6 @@ this.bStepok("animation",'','')
|
|
}else{
|
|
}else{
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- // if(this.sign=='Start'&&this.signnum==true&&this.Startbool==true){
|
|
|
|
- // await sleep(time);
|
|
|
|
- // this.jiekou(this.femSteplist[i]);
|
|
|
|
- // }else{
|
|
|
|
- // console.log(2222)
|
|
|
|
- // break;
|
|
|
|
- // }
|
|
|
|
- // if(this.sign=='Quick'&&this.signnum==true&&this.Quickbool==true){
|
|
|
|
- // await sleep(time);
|
|
|
|
- // this.jiekou(this.femSteplist[i]);
|
|
|
|
- // }else{
|
|
|
|
- // console.log(3333)
|
|
|
|
- // break;
|
|
|
|
- // }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
timer(time);
|
|
timer(time);
|
|
@@ -3353,22 +3339,30 @@ this.bStepok("animation",'','')
|
|
},
|
|
},
|
|
//Low/2
|
|
//Low/2
|
|
lowclick(){
|
|
lowclick(){
|
|
- this.lowbool=true;
|
|
|
|
- this.Quickbool=false;
|
|
|
|
- this.Startbool =false;
|
|
|
|
- this.numan=true;
|
|
|
|
-
|
|
|
|
- console.log(this.numan)
|
|
|
|
- this.sign='Low';
|
|
|
|
- this.timesleep(2000)
|
|
|
|
|
|
+ let that=this;
|
|
|
|
+ that.sign='Low';
|
|
|
|
+ if(this.signnum==true){
|
|
|
|
+ this.signnum=false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ setTimeout(function(){
|
|
|
|
+ that.signnum=true;
|
|
|
|
+ that.numan=true;
|
|
|
|
+ that.timesleep(2000)
|
|
|
|
+ },300)
|
|
},
|
|
},
|
|
Quickclick(){
|
|
Quickclick(){
|
|
- this.lowbool=false;
|
|
|
|
- this.Quickbool=true;
|
|
|
|
- this.Startbool =false;
|
|
|
|
- this.numan=true;
|
|
|
|
- this.sign='Quick';
|
|
|
|
- this.timesleep(100)
|
|
|
|
|
|
+ let that=this;
|
|
|
|
+ that.sign='Quick';
|
|
|
|
+ if(this.signnum==true){
|
|
|
|
+ this.signnum=false;
|
|
|
|
+ }
|
|
|
|
+ setTimeout(function(){
|
|
|
|
+ that.signnum=true;
|
|
|
|
+ that.numan=true;
|
|
|
|
+ that.timesleep(100)
|
|
|
|
+ },300)
|
|
|
|
+
|
|
|
|
|
|
},
|
|
},
|
|
//上一个
|
|
//上一个
|
|
@@ -3382,7 +3376,6 @@ this.bStepok("animation",'','')
|
|
}else{
|
|
}else{
|
|
console.log(this.median)
|
|
console.log(this.median)
|
|
this.animationobj.currentstep= (this.value1)-this.median;
|
|
this.animationobj.currentstep= (this.value1)-this.median;
|
|
- console.log( this.animationobj.currentstep);
|
|
|
|
this.jiekou( this.animationobj.currentstep);
|
|
this.jiekou( this.animationobj.currentstep);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3403,12 +3396,9 @@ this.bStepok("animation",'','')
|
|
},
|
|
},
|
|
// 点击一下循环,再点击一下停止备注记录长度在循环
|
|
// 点击一下循环,再点击一下停止备注记录长度在循环
|
|
Playstop(){
|
|
Playstop(){
|
|
- if(this.numan==true){
|
|
|
|
- this.signnum=false;
|
|
|
|
- this.numan=false;
|
|
|
|
- }else{
|
|
|
|
- // this.numan=true;
|
|
|
|
- if( this.sign=='Low'){
|
|
|
|
|
|
+ if(this.numan==false){
|
|
|
|
+
|
|
|
|
+ if( this.sign=='Low'){
|
|
this.lowclick()
|
|
this.lowclick()
|
|
this.signnum=true;
|
|
this.signnum=true;
|
|
}else if(this.sign=='Quick'){
|
|
}else if(this.sign=='Quick'){
|
|
@@ -3419,6 +3409,11 @@ this.bStepok("animation",'','')
|
|
this.Startclick();
|
|
this.Startclick();
|
|
}else{
|
|
}else{
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ this.signnum=false;
|
|
|
|
+ this.numan=false;
|
|
|
|
+ // this.numan=true;
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|
|
// this.numan++;
|
|
// this.numan++;
|