修改正式检测,使其能按照通道进行页面展示

This commit is contained in:
caozehui
2024-12-20 10:19:58 +08:00
parent ebc2ac1a41
commit 93b67fe845
8 changed files with 2206 additions and 2172 deletions

View File

@@ -25,7 +25,7 @@
v-for="(item, index) in checkStatus"
:label="item.label"
:value="item.id"
:key="index"
v-show="shouldShowOption(item)"
></el-option>
@@ -37,7 +37,7 @@
v-for="(item, index) in checkResult"
:label="item.label"
:value="item.id"
:key="index"
v-show="shouldShowOption(item)"
></el-option>
@@ -49,7 +49,7 @@
v-for="(item, index) in checkReportStatus"
:label="item.label"
:value="item.id"
:key="index"
v-show="shouldShowOption(item)"
></el-option>
@@ -100,7 +100,7 @@
>归档</el-button>
<!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
>设备新增</el-button> -->
<el-button type="primary" :icon="Odometer" @click="handleTest('系数校准')" v-if="form.activeTabs === 0"
>系数校准</el-button>
</el-form-item>
@@ -114,8 +114,7 @@
:icon="View"
@click="openDrawer('查看', scope.row)"
v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
>查看</el-button
>
>查看</el-button>
<el-button
type="primary"
@@ -123,8 +122,7 @@
:icon="Download"
@click="openDrawer('报告下载', scope.row)"
v-if="form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1"
>报告下载</el-button
>
>报告下载</el-button>
<!-- <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
<el-dropdown trigger='click'>
@@ -147,8 +145,7 @@
:icon="Postcard"
@click="openDrawer('生成', scope.row)"
v-if="form.activeTabs === 3"
>报告生成</el-button
>
>报告生成</el-button>
<!-- <el-button
type="primary"
link
@@ -164,24 +161,23 @@
@click="openDrawer('归档', scope.row)"
v-if="form.activeTabs === 4"
:disabled = "scope.row.checkState != 2"
>归档</el-button
>
>归档</el-button>
<el-button
type="primary"
link
:icon="PieChart"
@click="openDrawer('检测数据查询', scope.row)"
v-if="form.activeTabs === 5"
>检测数据查询</el-button
>
>检测数据查询</el-button>
<el-button
type="primary"
link
:icon="Switch"
@click="openDrawer('误差体系更换', scope.row)"
v-if="form.activeTabs === 5 && scope.row.documentState === 1"
>误差体系更换</el-button
>
>误差体系更换</el-button>
<div class='cn-render-buttons' v-if="form.activeTabs === 5 && scope.row.documentState === 1">
<el-dropdown trigger='click'>
@@ -208,23 +204,20 @@
</ProTable>
<!-- 检测过程对话框 -->
<!-- <testPopup
<!-- <testPopup
:visible="dialogFormVisible"
:formData="dialogForm"
:dialogTitle="dialogTitle"
@update:visible="dialogFormVisible = $event"
/> -->
<TestPopup ref="testPopup"></TestPopup>
<TestPopup ref="testPopup"></TestPopup>
<reportPopup
:visible="reportDialogVisible"
@update:visible="reportDialogVisible = $event"
></reportPopup>
<dataCheckPopup
:visible="dataCheckDialogVisible"
@update:visible="dataCheckDialogVisible = $event"
></dataCheckPopup>
<dataCheckPopup ref="dataCheckPopupRef"/>
<dataCheckChangeErrSysPopup
:visible="dataCheckChangeErrSysDialogVisible"
@@ -236,7 +229,7 @@
@update:visible="matchDialogVisible = $event"
></matchPopup>
<!--系数校准-->>
<!--系数校准-->
<ChannelsTest ref="channelsTest"></ChannelsTest>
</div>
</template>
@@ -255,7 +248,7 @@ import { getPlanList } from "@/api/plan/planList";
import deviceDataList from '@/api/device/device/deviceData'
import TestPopup from "./testPopup.vue";
import reportPopup from "./reportPopup.vue";
import dataCheckPopup from "./dataCheckPopup.vue";
import dataCheckPopup from "./dataCheckSingleChannelSingleTestPopup.vue";
import dataCheckChangeErrSysPopup from "./dataCheckChangeErrSysPopup.vue";
import { getBoundPqDevList } from '@/api/plan/plan.ts'
import { onMounted, reactive, ref, watch } from "vue";
@@ -273,7 +266,9 @@ const value1 = ref("");
const value2 = ref("");
const tableHeight = ref(0);
const reportDialogVisible = ref(false)
const dataCheckDialogVisible = ref(false)
const dataCheckPopupRef=ref<InstanceType<typeof dataCheckPopup>>()
const dataCheckChangeErrSysDialogVisible = ref(false)
const matchDialogVisible = ref(false)
const dialogTitle = ref('手动检测')
@@ -404,7 +399,7 @@ const getTableList = async (params: any) => {
}else{
checkStateList.value = checkStateTable.value
}
return getBoundPqDevList({'planId': props.id, 
return getBoundPqDevList({'planId': props.id,
'checkStateList': checkStateList.value,
'checkResult': form.value.checkResult,
'reportState': form.value.checkReportStatus,
@@ -866,7 +861,8 @@ const openDrawer = (title: string, row: any) => {
if(title === '检测数据查询')
{
dataCheckDialogVisible.value = true;
let device={}
dataCheckPopupRef.value?.open(device)
}
if (title === '误差体系更换')
{