From d0d78b9fbe144326f136ee048bb59d314413032e Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 27 五月 2025 08:45:29 +0800 Subject: [PATCH] 修改导出 --- src/views/analyse/identify/components/identifyQuery.vue | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/views/analyse/identify/components/identifyQuery.vue b/src/views/analyse/identify/components/identifyQuery.vue index 7aed26a..5ca0561 100644 --- a/src/views/analyse/identify/components/identifyQuery.vue +++ b/src/views/analyse/identify/components/identifyQuery.vue @@ -38,7 +38,7 @@ <div class="checkUnit-point"> <el-tabs class="active" v-model="identifyQueryState.activeName"> <el-tab-pane label="辨识信息" name="identify"> - <div style="padding-bottom: 10px" v-if="identifyQueryState.identifyForm.planExecStatus === 2"> + <div style="padding-bottom: 10px"> <el-button size="default" type="primary" @click="openIdentifyDialog('新增', '')"> <el-icon> <ele-FolderAdd /> @@ -62,7 +62,6 @@ <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopNode" label="节点" show-overflow-tooltip align="center"></el-table-column> <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopParam" label="参数" show-overflow-tooltip align="center"></el-table-column> <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopParamDesc" label="参数描述" show-overflow-tooltip align="center"></el-table-column> - <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopNode" label="节点" show-overflow-tooltip align="center"></el-table-column> <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopGuide" label="引导词" show-overflow-tooltip align="center"></el-table-column> <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopDeviation" label="偏差" show-overflow-tooltip align="center"></el-table-column> <el-table-column v-if="identifyQueryState.identifyForm.identificationMethod == 4" prop="hazopPossibleCauses" label="可能原因" show-overflow-tooltip align="center"></el-table-column> @@ -76,6 +75,11 @@ <span>{{scope.row.result == 1?'有风险':scope.row.result == 2?'无风险':'--'}}</span> </template> </el-table-column> + <el-table-column label="辨识人" show-overflow-tooltip align="center"> + <template #default="scope"> + <span>{{scope.row.updateByUser?scope.row.updateByUser:scope.row.createByUser}}</span> + </template> + </el-table-column> <el-table-column label="操作" width="150" align="center"> <template #default="scope"> <el-button size="default" text type="primary" @click="openIdentifyDialog('查看', scope.row)">查看</el-button> @@ -152,10 +156,9 @@ const showIdentifyQuery = (title: string, value: IdentifyType, planList: PlanType [], personList: AllPersonListType []) => { identifyQueryState.identifyQueryVisible = true; identifyQueryState.identifyForm = value; - identifyQueryState.list = value.factorQueryDTOList identifyQueryState.planList = planList; identifyQueryState.personList = personList - identifyQueryState.list = value.factorQueryDTOList; + identifyQueryState.list = value.factorQueryDTOList // getAssessInfo(identifyQueryState.identifyQueryForm.id); for(let i in identifyQueryState.identifyQueryForm){ if(isValidKey(i, identifyQueryState.identifyQueryForm)){ @@ -192,7 +195,7 @@ identifyQueryState.identifyQueryForm.identificationMethod = identifyQueryState.currentMethod, identifyQueryState.currentMethod = identifyQueryState.currentMethod, emit('refresh') - getIdentifyData() + await getIdentifyData() }else{ ElMessage({ type: 'warning', -- Gitblit v1.9.2