This commit is contained in:
caozehui
2025-02-25 16:18:22 +08:00
parent 5004e319b6
commit 3f7756b417
2 changed files with 11 additions and 11 deletions

View File

@@ -9,11 +9,11 @@
<span>检测用时{{ timeView }}</span> <span>检测用时{{ timeView }}</span>
</div> </div>
<el-progress <el-progress
style="width: 50%; margin-right: 15px;" style="width: 60%; margin-right: 4%;"
:percentage="percentage" :percentage="percentage"
:color="customColors"/> :color="customColors"/>
<div style="width: 12%"> <div style="width: 15%">
<el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()"> <el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()">
<el-icon class="loading-box" style="color: #fff;margin-right: 8px;"> <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
<component :is="Refresh"/> <component :is="Refresh"/>
@@ -662,7 +662,7 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
} else { } else {
let result = getResult(devices) let result = getResult(devices)
if (desc.length > 150) { if (desc.length > 150) {
desc = desc.substring(0, 150) + '...' desc = desc.substring(0,150) + '...'
} }
if (result === 1) { if (result === 1) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}${desc}检测结束:符合`}) testLogList.push({type: 'info', log: `${new Date().toLocaleString()}${desc}检测结束:符合`})
@@ -1260,7 +1260,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_Start`, 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) }, 1000)
@@ -1268,7 +1268,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_End`, 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: [{ data: [{
chnResult: [1, 1, 1, 1], chnResult: [1, 1, 1, 1],
deviceId: "3250a0ff180845cc8885da4ff628261e", deviceId: "3250a0ff180845cc8885da4ff628261e",
@@ -1281,7 +1281,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_Start`, 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) }, 3000)
@@ -1289,7 +1289,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_End`, 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: [{ data: [{
chnResult: [1, 1, 1, 1], chnResult: [1, 1, 1, 1],
deviceId: "3250a0ff180845cc8885da4ff628261e", deviceId: "3250a0ff180845cc8885da4ff628261e",
@@ -1302,7 +1302,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_Start`, 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) }, 6000)
@@ -1310,7 +1310,7 @@ const todoItem = (code: string) => {
if (testStatus.value !== 'paused') { if (testStatus.value !== 'paused') {
emit('update:webMsgSend', { emit('update:webMsgSend', {
requestId: `${code}_End`, 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: [{ data: [{
chnResult: [1, 1, 1, 1], chnResult: [1, 1, 1, 1],
deviceId: "3250a0ff180845cc8885da4ff628261e", deviceId: "3250a0ff180845cc8885da4ff628261e",

View File

@@ -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="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" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
<el-button type="primary" <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> disabled>
<el-icon class="loading-box" style="color: #fff;margin-right: 8px;"> <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
<component :is="Refresh"/> <component :is="Refresh"/>
@@ -273,7 +273,7 @@ watch(ActiveStatue, function (newValue, oldValue) {
// stepsActiveIndex.value = stepsTotalNum.value + 2 // stepsActiveIndex.value = stepsTotalNum.value + 2
nextStepText.value = '检测失败' nextStepText.value = '检测失败'
} }
if (newValue === 'success' && stepsActive.value === stepsTotalNum.value-1) { if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value-1) {
stepsActiveIndex.value += 2 stepsActiveIndex.value += 2
nextStepText.value = '检测完成' nextStepText.value = '检测完成'
} }