标准设备,比对模式被检设备
This commit is contained in:
@@ -64,6 +64,10 @@
|
||||
>重置
|
||||
</el-button
|
||||
>
|
||||
<el-button
|
||||
type='primary'
|
||||
:icon='Clock' @click="handleTest2">通道配对
|
||||
</el-button>
|
||||
<!-- :disabled='!scope.isSelected' -->
|
||||
<el-button
|
||||
type='primary'
|
||||
@@ -233,6 +237,8 @@
|
||||
<SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
|
||||
<!-- 省平台-填写温度湿度弹窗 -->
|
||||
<WriteTHPopup ref="writeTHPopupRef" @openTestDialog2="openTestDialog2"></WriteTHPopup>
|
||||
<!-- 比对模式-通道配对弹窗 -->
|
||||
<DeviceConnectionPopup ref="deviceConnectionPopupRef" ></DeviceConnectionPopup>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
@@ -272,7 +278,6 @@ import {onBeforeMount, onMounted, reactive, ref, watch} from 'vue'
|
||||
import {useDictStore} from '@/stores/modules/dict'
|
||||
import ChannelsTest from './channelsTest.vue'
|
||||
import {useModeStore,useAppSceneStore} from '@/stores/modules/mode' // 引入模式 store
|
||||
|
||||
import {useCheckStore} from '@/stores/modules/check'
|
||||
import {CheckData} from '@/api/check/interface'
|
||||
import socketClient from '@/utils/webSocketClient'
|
||||
@@ -285,7 +290,7 @@ import {getPqDev} from '@/api/device/device/index.ts'
|
||||
import {ResultEnum} from '@/enums/httpEnum'
|
||||
import SelectTestItemPopup from "@/views/home/components/selectTestItemPopup.vue";
|
||||
import WriteTHPopup from "@/views/home/components/writeTHPopup.vue";
|
||||
import { fa } from 'element-plus/es/locale'
|
||||
import DeviceConnectionPopup from '@/views/home/components/deviceConnectionPopup.vue'
|
||||
|
||||
const dictStore = useDictStore()
|
||||
const checkStore = useCheckStore()
|
||||
@@ -303,7 +308,7 @@ const reportDialogVisible = ref(false)
|
||||
const dataCheckPopupRef = ref<InstanceType<typeof dataCheckPopup>>()
|
||||
const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
|
||||
const writeTHPopupRef = ref<InstanceType<typeof WriteTHPopup>>()
|
||||
|
||||
const deviceConnectionPopupRef = ref<InstanceType<typeof DeviceConnectionPopup>>()
|
||||
const matchDialogVisible = ref(false)
|
||||
const dialogTitle = ref('手动检测')
|
||||
const checkStateTable = ref<number[]>([0, 1, 2])
|
||||
@@ -531,7 +536,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
|
||||
sortable: true,
|
||||
},
|
||||
{
|
||||
prop: 'reCheckNum',
|
||||
prop: 'recheckNum',
|
||||
label: '检测次数',
|
||||
minWidth: 100,
|
||||
sortable: true,
|
||||
@@ -597,10 +602,10 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
|
||||
return '不合格'
|
||||
} else if (scope.row.factorCheckResult === 1) {
|
||||
return '合格'
|
||||
} else if (scope.row.factorCheckResult === 2) {
|
||||
return '/'
|
||||
} else {
|
||||
return '未检'
|
||||
}
|
||||
return ''
|
||||
|
||||
},
|
||||
},
|
||||
{prop: 'operation', label: '操作', fixed: 'right', minWidth: 200, isShow: operationShow},
|
||||
@@ -845,6 +850,11 @@ const addDevice = (val: string) => {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const handleTest2 = () => {
|
||||
deviceConnectionPopupRef.value?.open()
|
||||
}
|
||||
|
||||
const handleTest = async (val: string) => {
|
||||
|
||||
if (devNum == 0) {
|
||||
|
||||
Reference in New Issue
Block a user