Merge branch 'release'

This commit is contained in:
caozehui
2025-03-08 18:06:50 +08:00
3 changed files with 158 additions and 152 deletions

View File

@@ -11,5 +11,6 @@ export namespace controlSource {
scriptId: string; scriptId: string;
scriptIndex: number; scriptIndex: number;
sourceId: string; sourceId: string;
valueType:number // 1为绝对值脚本、2为相对值脚本
} }
} }

View File

@@ -252,6 +252,7 @@ const controlContent = ref<controlSource.ResControl>({
scriptId: '', scriptId: '',
scriptIndex: 0, scriptIndex: 0,
sourceId: '', sourceId: '',
valueType:-1
}) })
// 获取树 // 获取树
const getTree = () => { const getTree = () => {
@@ -393,6 +394,7 @@ const startLoading = async () => {
controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.scriptIndex = childActiveIndex.value
controlContent.value.sourceId = props.formControl.sourceId controlContent.value.sourceId = props.formControl.sourceId
controlContent.value.valueType = 2
setTimeout(async () => { setTimeout(async () => {
await startSimulateTest(controlContent.value) await startSimulateTest(controlContent.value)
},3000) },3000)
@@ -405,6 +407,7 @@ const stopLoading = async () => {
controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.scriptIndex = childActiveIndex.value
controlContent.value.sourceId = props.formControl.sourceId controlContent.value.sourceId = props.formControl.sourceId
controlContent.value.valueType = 2
await closeSimulateTest(controlContent.value) await closeSimulateTest(controlContent.value)
emit('update:pauseDisabled', true) emit('update:pauseDisabled', true)
emit('update:startDisabeld', true) emit('update:startDisabeld', true)

View File

@@ -73,7 +73,7 @@ const formContent = ref<TestScript.ResTestScript>({
standardName: 'GBT 19862', standardName: 'GBT 19862',
standardTime: '2025', standardTime: '2025',
state: 1 state: 1
}) })
const connectDisabeld = ref(false) const connectDisabeld = ref(false)
const startDisabeld = ref(true) const startDisabeld = ref(true)
const pauseDisabled = ref(true) const pauseDisabled = ref(true)
@@ -83,6 +83,7 @@ const controlContent = ref<controlSource.ResControl>({
scriptId: '', scriptId: '',
scriptIndex: 0, scriptIndex: 0,
sourceId: '', sourceId: '',
valueType: -1,
}) })
//开始创建webSocket客户端 //开始创建webSocket客户端
const dataSocket = reactive({ const dataSocket = reactive({
@@ -267,6 +268,7 @@ const start = async () => {
controlContent.value.userPageId = 'cdf' controlContent.value.userPageId = 'cdf'
controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
controlContent.value.scriptIndex = scriptIndex.value controlContent.value.scriptIndex = scriptIndex.value
controlContent.value.valueType = 2
await checkSimulate(controlContent.value) await checkSimulate(controlContent.value)
} }