Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
This commit is contained in:
@@ -454,7 +454,7 @@ const startLoading = async () => {
|
||||
ElMessage.success({message:'启动中...',duration:5000})
|
||||
// 启动加载逻辑
|
||||
controlContent.value.userPageId = 'cdf'
|
||||
//controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
|
||||
controlContent.value.scriptId = props.formControl.scriptId
|
||||
controlContent.value.scriptIndex = childActiveIndex.value
|
||||
controlContent.value.sourceId = props.formControl.sourceId
|
||||
setTimeout(async () => {
|
||||
@@ -466,7 +466,7 @@ const startLoading = async () => {
|
||||
const stopLoading = async () => {
|
||||
// 启动加载逻辑
|
||||
controlContent.value.userPageId = 'cdf'
|
||||
//controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
|
||||
controlContent.value.scriptId = props.formControl.scriptId
|
||||
controlContent.value.scriptIndex = childActiveIndex.value
|
||||
controlContent.value.sourceId = props.formControl.sourceId
|
||||
await closeSimulateTest(controlContent.value)
|
||||
@@ -480,10 +480,11 @@ const startTimeCount = () => {
|
||||
// Loading效果展示
|
||||
showLoading.value = true
|
||||
|
||||
hour.value = 0
|
||||
minute.value = 0
|
||||
second.value = 0
|
||||
if (!timer) {
|
||||
hour.value = 0
|
||||
minute.value = 0
|
||||
second.value = 0
|
||||
timeCount.value = 0
|
||||
timer = setInterval(() => {
|
||||
timeCount.value = timeCount.value + 1
|
||||
secondToTime(timeCount.value)
|
||||
@@ -501,6 +502,7 @@ const secondToTime = (secd: number) => {
|
||||
const stopTimeCount = () => {
|
||||
if (timer) {
|
||||
clearInterval(timer)
|
||||
timer = null
|
||||
}
|
||||
//Loading效果关闭
|
||||
showLoading.value = false
|
||||
|
||||
Reference in New Issue
Block a user