diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index da9ecad..13abe50 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -180,7 +180,7 @@ - + diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index da9ecad..13abe50 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -180,7 +180,7 @@ - + diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index b0be4c5..659a406 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -4,6 +4,20 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' import { getInfoListPage } from '@/api/eqpt/device/info' +const $props = defineProps({ + // 使用状态列表 + // 主要用于 状态管理时 过滤不同的设备使用状态 + needStatus: { + type: Boolean, + default: true, + }, + // 不同设备状态 + // 主要用于 状态管理时 过滤不同的设备使用状态 + statusType: { + type: String, + default: '', + }, +}) const emits = defineEmits(['add']) const dialogFormVisible = ref(false) // 查询条件 @@ -80,7 +94,15 @@ const fetchData = () => { select.value = -1 loadingTable.value = true - getInfoListPage(listQuery.value, '全部').then((response) => { + // 判断是否需要加入设备使用状态查询条件 + const data = { + ...listQuery.value, + usageStatusList: [], + } + // if ($props.needStatus) { + // statusType + // } + getInfoListPage(data, '全部').then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -155,7 +177,7 @@ - + diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index da9ecad..13abe50 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -180,7 +180,7 @@ - + diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index b0be4c5..659a406 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -4,6 +4,20 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' import { getInfoListPage } from '@/api/eqpt/device/info' +const $props = defineProps({ + // 使用状态列表 + // 主要用于 状态管理时 过滤不同的设备使用状态 + needStatus: { + type: Boolean, + default: true, + }, + // 不同设备状态 + // 主要用于 状态管理时 过滤不同的设备使用状态 + statusType: { + type: String, + default: '', + }, +}) const emits = defineEmits(['add']) const dialogFormVisible = ref(false) // 查询条件 @@ -80,7 +94,15 @@ const fetchData = () => { select.value = -1 loadingTable.value = true - getInfoListPage(listQuery.value, '全部').then((response) => { + // 判断是否需要加入设备使用状态查询条件 + const data = { + ...listQuery.value, + usageStatusList: [], + } + // if ($props.needStatus) { + // statusType + // } + getInfoListPage(data, '全部').then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -155,7 +177,7 @@ - + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index b4c31f5..54370fb 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -404,7 +404,7 @@ - + diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue index da9ecad..13abe50 100644 --- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue +++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue @@ -180,7 +180,7 @@ - + diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue index b0be4c5..659a406 100644 --- a/src/views/tested/device/group/components/selectDevice.vue +++ b/src/views/tested/device/group/components/selectDevice.vue @@ -4,6 +4,20 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' import { getInfoListPage } from '@/api/eqpt/device/info' +const $props = defineProps({ + // 使用状态列表 + // 主要用于 状态管理时 过滤不同的设备使用状态 + needStatus: { + type: Boolean, + default: true, + }, + // 不同设备状态 + // 主要用于 状态管理时 过滤不同的设备使用状态 + statusType: { + type: String, + default: '', + }, +}) const emits = defineEmits(['add']) const dialogFormVisible = ref(false) // 查询条件 @@ -80,7 +94,15 @@ const fetchData = () => { select.value = -1 loadingTable.value = true - getInfoListPage(listQuery.value, '全部').then((response) => { + // 判断是否需要加入设备使用状态查询条件 + const data = { + ...listQuery.value, + usageStatusList: [], + } + // if ($props.needStatus) { + // statusType + // } + getInfoListPage(data, '全部').then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -155,7 +177,7 @@ - + diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index b4c31f5..54370fb 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -404,7 +404,7 @@ - + diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue index 218573f..f749c8e 100644 --- a/src/views/tested/status/delay/components/edit.vue +++ b/src/views/tested/status/delay/components/edit.vue @@ -268,7 +268,7 @@