微调
This commit is contained in:
@@ -9,11 +9,11 @@
|
||||
<span>检测用时:{{ timeView }}</span>
|
||||
</div>
|
||||
<el-progress
|
||||
style="width: 50%; margin-right: 15px;"
|
||||
style="width: 60%; margin-right: 4%;"
|
||||
:percentage="percentage"
|
||||
:color="customColors"/>
|
||||
|
||||
<div style="width: 12%">
|
||||
<div style="width: 15%">
|
||||
<el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()">
|
||||
<el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
|
||||
<component :is="Refresh"/>
|
||||
@@ -1260,7 +1260,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_Start`,
|
||||
desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
})
|
||||
}
|
||||
}, 1000)
|
||||
@@ -1268,7 +1268,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_End`,
|
||||
desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
data: [{
|
||||
chnResult: [1, 1, 1, 1],
|
||||
deviceId: "3250a0ff180845cc8885da4ff628261e",
|
||||
@@ -1281,7 +1281,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_Start`,
|
||||
desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
})
|
||||
}
|
||||
}, 3000)
|
||||
@@ -1289,7 +1289,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_End`,
|
||||
desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
data: [{
|
||||
chnResult: [1, 1, 1, 1],
|
||||
deviceId: "3250a0ff180845cc8885da4ff628261e",
|
||||
@@ -1302,7 +1302,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_Start`,
|
||||
desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
|
||||
})
|
||||
}
|
||||
}, 6000)
|
||||
@@ -1310,7 +1310,7 @@ const todoItem = (code: string) => {
|
||||
if (testStatus.value !== 'paused') {
|
||||
emit('update:webMsgSend', {
|
||||
requestId: `${code}_End`,
|
||||
desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
|
||||
data: [{
|
||||
chnResult: [1, 1, 1, 1],
|
||||
deviceId: "3250a0ff180845cc8885da4ff628261e",
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>
|
||||
<el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
|
||||
<el-button type="primary"
|
||||
v-if="ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout'"
|
||||
v-if="ActiveStatue!=='success'&& ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue!=='test_recheck' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout'"
|
||||
disabled>
|
||||
<el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
|
||||
<component :is="Refresh"/>
|
||||
@@ -273,7 +273,7 @@ watch(ActiveStatue, function (newValue, oldValue) {
|
||||
// stepsActiveIndex.value = stepsTotalNum.value + 2
|
||||
nextStepText.value = '检测失败'
|
||||
}
|
||||
if (newValue === 'success' && stepsActive.value === stepsTotalNum.value-1) {
|
||||
if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value-1) {
|
||||
stepsActiveIndex.value += 2
|
||||
nextStepText.value = '检测完成'
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user