微调
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
v-if="!isPause&&activeIndex < TEST_TOTAL"
|
||||
:disabled="activeIndex===0"
|
||||
:icon="VideoPause"
|
||||
@click="handlePauseOrContinue">暂停检测
|
||||
@click="ts = 'paused'">暂停检测
|
||||
</el-button>
|
||||
|
||||
<el-button type="success" v-if="activeIndex >= TEST_TOTAL" :icon="Check" disabled>检测完成</el-button>
|
||||
@@ -20,7 +20,7 @@
|
||||
type="warning"
|
||||
v-if="isPause && activeIndex < TEST_TOTAL"
|
||||
:icon="Refresh"
|
||||
@click="handlePauseOrContinue"
|
||||
@click="ts='process'"
|
||||
>继续检测
|
||||
</el-button>
|
||||
<el-button type="text" :icon="InfoFilled" @click="showTestLog">检测项进度</el-button>
|
||||
@@ -107,7 +107,7 @@
|
||||
<dataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef"/>
|
||||
</template>
|
||||
<script lang="tsx" setup name="test">
|
||||
import {Check, Refresh, VideoPause,InfoFilled} from '@element-plus/icons-vue'
|
||||
import {Check, InfoFilled, Refresh, VideoPause} from '@element-plus/icons-vue'
|
||||
import resultPopup from './resultPopup.vue'
|
||||
import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingleTestPopup.vue'
|
||||
import {reactive, ref} from "vue";
|
||||
@@ -859,7 +859,6 @@ const handlePauseOrContinue = () => {
|
||||
})
|
||||
|
||||
pauseTimer()
|
||||
ts.value = "paused"
|
||||
} else {
|
||||
startData.value = new Date();
|
||||
|
||||
@@ -869,7 +868,6 @@ const handlePauseOrContinue = () => {
|
||||
})
|
||||
|
||||
resumeTimer()
|
||||
ts.value = "process"
|
||||
}
|
||||
isPause.value = !isPause.value;
|
||||
};
|
||||
@@ -2165,7 +2163,7 @@ const handleClick = (deviceItem: any, chnNum: number) => {
|
||||
const props = defineProps({
|
||||
testStatus: {
|
||||
type: String,
|
||||
default: 'wait'
|
||||
default: 'waiting'
|
||||
}
|
||||
})
|
||||
const testStatus = toRef(props, 'testStatus');
|
||||
@@ -2173,8 +2171,6 @@ const ts = ref('');
|
||||
|
||||
//监听goods_sn的变化
|
||||
watch(testStatus, function (newValue, oldValue) {
|
||||
console.log('testStatus', newValue, oldValue)
|
||||
// ts.value = props.testStatus;
|
||||
if (newValue == 'start') {
|
||||
ts.value = 'process'
|
||||
startTimer()
|
||||
|
||||
Reference in New Issue
Block a user