ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source
This commit is contained in:
caozehui
2025-03-08 18:06:50 +08:00
parent 661b27abd0 3398b414ca
commit 30d5f3390c
3 changed files with 158 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/api/device/interface/controlSource.ts
View File

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

5
frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
View File

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

302
frontend/src/views/machine/controlSource/index.vue
View File

@@ -1,40 +1,40 @@
<template>
<div>
<el-card style="margin-bottom: 10px" class="cardTop">
<el-form
:inline="true"
label-width="auto"
ref="dialogFormRef"
class="form-five"
>
<el-form-item label='检测源' prop='sourceId' >
<el-select v-model="controlContent.sourceId" collapse-tags placeholder="请选择检测源">
<el-option
<div>
<el-card style="margin-bottom: 10px" class="cardTop">
<el-form
:inline="true"
label-width="auto"
ref="dialogFormRef"
class="form-five"
>
<el-form-item label='检测源' prop='sourceId' >
<el-select v-model="controlContent.sourceId" collapse-tags placeholder="请选择检测源">
<el-option
v-for="(option, index) in pqSourceArray"
:key="index"
:label="option.label"
:value="option.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<div class="formBut">
<el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button>
</div>
</el-form-item>
</el-form>
</el-card>
<el-card v-if="show">
<ControlSourceDetail v-if="secondLevelOptions.length > 0" :options="secondLevelOptions" :formContent="formContent" :formControl="controlContent"
@update:activeName="handleActiveNameChange"
@update:active-index="handleActiveIndexChange"
/>
</el-select>
</el-form-item>
<el-form-item>
<div class="formBut">
<el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button>
</div>
</el-form-item>
</el-form>
</el-card>
<el-card v-if="show">
<ControlSourceDetail v-if="secondLevelOptions.length > 0" :options="secondLevelOptions" :formContent="formContent" :formControl="controlContent"
@update:activeName="handleActiveNameChange"
@update:active-index="handleActiveIndexChange"
v-model:startDisabeld="startDisabeld"
@update:startDisabeld="startDisabeld=$event"
v-model:pauseDisabled="pauseDisabled"
@update:pauseDisabled="pauseDisabled=$event"/>
</el-card>
</div>
v-model:startDisabeld="startDisabeld"
@update:startDisabeld="startDisabeld=$event"
v-model:pauseDisabled="pauseDisabled"
@update:pauseDisabled="pauseDisabled=$event"/>
</el-card>
</div>
</template>
<script setup lang="ts">
import { ref, nextTick, onMounted, onBeforeMount, reactive, watch } from 'vue'
@@ -65,24 +65,25 @@ const pqSourceList=ref<TestSource.ResTestSource[]>([])//获取指定模式下所
const modeStore = useModeStore()
const pqSourceArray = ref<{ label: string; value: string; }[]>()
const formContent = ref<TestScript.ResTestScript>({
id : '9ff96807cf8c7524587982ed8baa8b57',
name: '测试',
type: '1',
valueType: '2973cb938b591b93d0df2547599b87d8',
pattern: modeId.value,
standardName: 'GBT 19862',
standardTime: '2025',
state: 1
})
id : '9ff96807cf8c7524587982ed8baa8b57',
name: '测试',
type: '1',
valueType: '2973cb938b591b93d0df2547599b87d8',
pattern: modeId.value,
standardName: 'GBT 19862',
standardTime: '2025',
state: 1
})
const connectDisabeld = ref(false)
const startDisabeld = ref(true)
const pauseDisabled = ref(true)
const controlContent = ref<controlSource.ResControl>({
userPageId: '',
scriptId: '',
scriptIndex: 0,
sourceId: '',
userPageId: '',
scriptId: '',
scriptIndex: 0,
sourceId: '',
valueType: -1,
})
//开始创建webSocket客户端
const dataSocket = reactive({
@@ -91,58 +92,58 @@ const dataSocket = reactive({
const webMsgSend = ref()//webSocket推送的数据
onMounted(async () => {
// 检查 socketClient.Instance 是否存在
if (!socketClient.Instance) {
console.error('WebSocket 客户端实例不存在');
return;
}
socketClient.Instance.connect();
dataSocket.socketServe = socketClient.Instance;
dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
// 处理来自服务器的消息
//console.log('Received message:', res)
// 根据需要在这里添加更多的处理逻辑
if (res.code === 20000) {
ElMessage.error(message.message)
loading.close()
} else {
webMsgSend.value = res
}
})
// 检查 socketClient.Instance 是否存在
if (!socketClient.Instance) {
console.error('WebSocket 客户端实例不存在');
return;
}
socketClient.Instance.connect();
dataSocket.socketServe = socketClient.Instance;
dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
// 处理来自服务器的消息
//console.log('Received message:', res)
// 根据需要在这里添加更多的处理逻辑
if (res.code === 20000) {
ElMessage.error(message.message)
loading.close()
} else {
webMsgSend.value = res
}
})
const pqSource_Result = await getTestSourceList({
'pattern': "a303b2224845fcc6f60098b8ca73dca7",
datasourceIds: '',
sourceIds: '',
planId: '',
scriptName: '',
errorSysName: '',
sourceName: '',
devIds: [],
id: '',
name: '',
dataSourceId: '',
scriptId: '',
errorSysId: '',
timeCheck: 0,
testState: 0,
reportState: 0,
result: 0,
code: 0,
state: 1
})
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[];
const sourceArray1 = Array.isArray(pqSourceList.value) ? pqSourceList.value : []
// 将 pqSource_Result 转换成 { label, value } 数组
pqSourceArray.value = sourceArray1.map(item => ({
label: item.name || '',
value: item.id
}));
nextTick(async () => {
await treeInfo(modeStore.currentMode)
formContent.value.pattern = modeId.value
show.value = true
})
const pqSource_Result = await getTestSourceList({
'pattern': "a303b2224845fcc6f60098b8ca73dca7",
datasourceIds: '',
sourceIds: '',
planId: '',
scriptName: '',
errorSysName: '',
sourceName: '',
devIds: [],
id: '',
name: '',
dataSourceId: '',
scriptId: '',
errorSysId: '',
timeCheck: 0,
testState: 0,
reportState: 0,
result: 0,
code: 0,
state: 1
})
pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[];
const sourceArray1 = Array.isArray(pqSourceList.value) ? pqSourceList.value : []
// 将 pqSource_Result 转换成 { label, value } 数组
pqSourceArray.value = sourceArray1.map(item => ({
label: item.name || '',
value: item.id
}));
nextTick(async () => {
await treeInfo(modeStore.currentMode)
formContent.value.pattern = modeId.value
show.value = true
})
})
watch(webMsgSend, function (newValue, oldValue) {
@@ -185,7 +186,7 @@ watch(webMsgSend, function (newValue, oldValue) {
console.log('错误信息:',webMsgSend)
startDisabeld.value = true
pauseDisabled.value = true
}
}
break;
@@ -194,7 +195,7 @@ watch(webMsgSend, function (newValue, oldValue) {
case 'connect':
switch (newValue.operateCode) {
case "Source":
ElMessage.error('源连接失败!')
ElMessage.error('源连接失败!')
}
break;
case 'server_error':
@@ -215,59 +216,60 @@ watch(webMsgSend, function (newValue, oldValue) {
})
// 获取树字典
const treeInfo = async (currentMode: string) => {
const data: Dict.ResDictTree = {
name: '',
id: '',
pid: '',
pids: '',
code: 'Script_Indicator_Items',
sort: 0
}
const result = await getDictTreeByCode(data)
const result1 = (await getDictTreeByCode({ ...data, code: 'Script_Error' })).data[0].children
const allOptions = await convertToOptions(result.data as Dict.ResDictTree[])
const setAllTree = await setTree(allOptions[0]?.children, result1)
secondLevelOptions.push(...(setAllTree || []))
modeId.value = dictStore.getDictData('Pattern').find(item => item.name === currentMode)?.id
const data: Dict.ResDictTree = {
name: '',
id: '',
pid: '',
pids: '',
code: 'Script_Indicator_Items',
sort: 0
}
const result = await getDictTreeByCode(data)
const result1 = (await getDictTreeByCode({ ...data, code: 'Script_Error' })).data[0].children
const allOptions = await convertToOptions(result.data as Dict.ResDictTree[])
const setAllTree = await setTree(allOptions[0]?.children, result1)
secondLevelOptions.push(...(setAllTree || []))
modeId.value = dictStore.getDictData('Pattern').find(item => item.name === currentMode)?.id
}
const setTree = async (data, data1) => {
data.forEach(item => {
data1.forEach(item1 => {
if (item.label.replace(/准确度|检测/g, '') == item1.name) {
item.value = item1.id
}
})
data.forEach(item => {
data1.forEach(item1 => {
if (item.label.replace(/准确度|检测/g, '') == item1.name) {
item.value = item1.id
}
})
return data
})
return data
}
// 转换函数
const convertToOptions = (dictTree: Dict.ResDictTree[]): CascaderOption[] => {
return dictTree.map(item => ({
value: item.id,
code: item.code.split('-')[1] || item.code.split('-')[0],
label: item.name,
children: item.children ? convertToOptions(item.children) : undefined
}))
return dictTree.map(item => ({
value: item.id,
code: item.code.split('-')[1] || item.code.split('-')[0],
label: item.name,
children: item.children ? convertToOptions(item.children) : undefined
}))
}
const scriptId = ref('')
const scriptIndex = ref(0)
const handleActiveNameChange = (newActiveName: string) => {
scriptId.value = newActiveName
scriptId.value = newActiveName
}
const handleActiveIndexChange = (newActiveIndex: number) => {
scriptIndex.value = newActiveIndex
scriptIndex.value = newActiveIndex
}
const start = async () => {
controlContent.value.userPageId = 'cdf'
controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
controlContent.value.scriptIndex = scriptIndex.value
await checkSimulate(controlContent.value)
controlContent.value.userPageId = 'cdf'
controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57'
controlContent.value.scriptIndex = scriptIndex.value
controlContent.value.valueType = 2
await checkSimulate(controlContent.value)
}
// 对外映射
@@ -278,32 +280,32 @@ defineExpose({ open })
padding: 10px;
} */
:deep(.cardTop) {
.el-card__body {
padding: 20px 0 0 20px;
}
.el-card__body {
padding: 20px 0 0 20px;
}
}
.formBut {
width: 50%;
display: flex;
justify-content: end;
width: 50%;
display: flex;
justify-content: end;
}
.form-five {
display: flex;
flex-wrap: wrap;
// justify-content: space-between;
.el-form-item {
display: flex;
flex-wrap: wrap;
// justify-content: space-between;
.el-form-item {
display: flex;
width: 22.8%;
width: 22.8%;
.el-form-item__content {
flex: 1;
.el-select,
.el-cascader,
.el-input__inner,
.el-date-editor {
width: 100%;
}
}
.el-form-item__content {
flex: 1;
.el-select,
.el-cascader,
.el-input__inner,
.el-date-editor {
width: 100%;
}
}
}
}
</style>