From 7df64634d3d7b292713eebfa008c40b3f5f9f65f Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Tue, 20 Sep 2022 15:57:03 +0800
Subject: [PATCH] 修改
---
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue | 141 +++++++++++++++++++++++++++++++---------------
1 files changed, 94 insertions(+), 47 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
index 8106119..936a7e1 100644
--- a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
+++ b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
@@ -5,11 +5,11 @@
<el-tab-pane label="待评价" name="first">
<div class="button_Line mb15">
<div class="button_Left">
- <el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
- <el-icon>
- <Delete />
- </el-icon>删除
- </el-button>
+ <!--<el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">-->
+ <!--<el-icon>-->
+ <!--<Delete />-->
+ <!--</el-icon>删除-->
+ <!--</el-button>-->
</div>
<!-- <div class="button_Right">-->
<!-- <el-button @click="upButton">-->
@@ -39,36 +39,55 @@
type="selection"
width="55"
/>
- <el-table-column prop="emergencyPlanName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="drillName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="drillAddress" label="演练地点" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="drillWay" label="演练方式" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="drillWay" label="演练方式" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <div v-if="scope.row.drillWay==1">综合</div>
+ <div v-if="scope.row.drillWay==2">桌面</div>
+ <div v-if="scope.row.drillWay==3">专项</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <div v-if="scope.row.drillLevel==1">公司级</div>
+ <div v-if="scope.row.drillLevel==2">分厂级</div>
+ <div v-if="scope.row.drillLevel==3">车间级</div>
+ </template>
+ </el-table-column>
<el-table-column prop="drillPlanDate" label="计划演练日期" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="drillRecordDate" label="演练记录日期" show-overflow-tooltip sortable></el-table-column>
<!-- <el-table-column prop="attachments" label="应急预案" show-overflow-tooltip sortable></el-table-column>-->
<el-table-column label="操作" width="260" align="center" fixed="right">
<template #default="scope">
- <el-button size="small" text disabled>
+ <!--<el-button size="small" text disabled>-->
+ <!--<el-icon style="margin-right: 5px;">-->
+ <!--<EditPen />-->
+ <!--</el-icon>评价-->
+ <!--</el-button>-->
+<!-- <el-button size="small" text type="primary" @click="onFlowChart(scope.row.id)">-->
+<!-- 审批进度-->
+<!-- </el-button>-->
+ <!--<el-button size="small" text type="primary" @click="onApprovalProgress('详情',scope.row.id)">-->
+ <!--<el-icon style="margin-right: 5px;">-->
+ <!--<EditPen />-->
+ <!--</el-icon>查看评价-->
+ <!--</el-button>-->
+
+ <el-button size="small" text type="primary" @click="onApprovalProgress('评价',scope.row.id)">
<el-icon style="margin-right: 5px;">
<EditPen />
</el-icon>评价
</el-button>
-<!-- <el-button size="small" text type="primary" @click="onFlowChart(scope.row.id)">-->
-<!-- 审批进度-->
-<!-- </el-button>-->
- <el-button size="small" text type="primary" @click="onApprovalProgress('详情',scope.row.id)">
- <el-icon style="margin-right: 5px;">
- <EditPen />
- </el-icon>查看评价
- </el-button>
- <el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">
- <el-icon style="margin-right: 5px;">
- <EditPen />
- </el-icon>整改
- </el-button>
- <el-button size="small" text disabled @click="onOpenEdit(scope.row)">
- 查看整改
- </el-button>
+
+ <!--<el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">-->
+ <!--<el-icon style="margin-right: 5px;">-->
+ <!--<EditPen />-->
+ <!--</el-icon>整改-->
+ <!--</el-button>-->
+ <!--<el-button size="small" text disabled @click="onOpenEdit(scope.row)">-->
+ <!--查看整改-->
+ <!--</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -120,39 +139,51 @@
@selection-change="handleSelectionChange"
>
<el-table-column
- type="selection"
- width="55"
+ type="selection"
+ width="55"
/>
- <el-table-column prop="emergencyPlanName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="drillName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="drillAddress" label="演练地点" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="drillWay" label="演练方式" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="drillWay" label="演练方式" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <div v-if="scope.row.drillWay==1">综合</div>
+ <div v-if="scope.row.drillWay==2">桌面</div>
+ <div v-if="scope.row.drillWay==3">专项</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <div v-if="scope.row.drillLevel==1">公司级</div>
+ <div v-if="scope.row.drillLevel==2">分厂级</div>
+ <div v-if="scope.row.drillLevel==3">车间级</div>
+ </template>
+ </el-table-column>
<el-table-column prop="drillPlanDate" label="计划演练日期" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="drillRecordDate" label="演练记录日期" show-overflow-tooltip sortable></el-table-column>
<!-- <el-table-column prop="attachments" label="应急预案" show-overflow-tooltip sortable></el-table-column>-->
<el-table-column label="操作" width="260" align="center" fixed="right">
<template #default="scope">
- <el-button size="small" text disabled>
- <el-icon style="margin-right: 5px;">
- <EditPen />
- </el-icon>评价
- </el-button>
+ <!--<el-button size="small" text disabled>-->
+ <!--<el-icon style="margin-right: 5px;">-->
+ <!--<EditPen />-->
+ <!--</el-icon>评价-->
+ <!--</el-button>-->
<!-- <el-button size="small" text type="primary" @click="onFlowChart(scope.row.id)">-->
<!-- 审批进度-->
<!-- </el-button>-->
- <el-button size="small" text type="primary" @click="onApprovalProgress('详情',scope.row.id)">
+ <el-button size="small" text type="primary" @click="onApprovalProgress('查看评价',scope.row.id)">
<el-icon style="margin-right: 5px;">
<EditPen />
</el-icon>查看评价
</el-button>
- <el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">
- <el-icon style="margin-right: 5px;">
- <EditPen />
- </el-icon>整改
- </el-button>
- <el-button size="small" text disabled @click="onOpenEdit(scope.row)">
- 查看整改
- </el-button>
+ <!--<el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">-->
+ <!--<el-icon style="margin-right: 5px;">-->
+ <!--<EditPen />-->
+ <!--</el-icon>整改-->
+ <!--</el-button>-->
+ <!--<el-button size="small" text disabled @click="onOpenEdit(scope.row)">-->
+ <!--查看整改-->
+ <!--</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -204,7 +235,8 @@
import ApprovalProgress from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/approvalProgress.vue';
// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
import RectificationDialog from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/rectificationDialog.vue';
-import {emergencyDrillEvaluationApi} from '/@/api/emergencyDrillEvaluation'
+import {emergencyDrillEvaluationApi} from '/@/api/contingencyManagement/emergencyDrillEvaluation'
+import {emergencyDrillExecuteApi} from "/@/api/contingencyManagement/emergencyDrillExecute";
// 定义接口来定义对象的类型
@@ -228,12 +260,20 @@
const activeName = ref('first')
const handleClick = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event)
+ if(tab.props.name=='first'){
+ listQuery.searchParams.status=false
+ listApi()
+ }else if(tab.props.name=='second'){
+ listQuery.searchParams.status=true
+ listApi()
+ }
}
// 列表参数
const listQuery = reactive({
pageIndex: 1,
pageSize: 10,
searchParams: {
+ status:false
},
});
// 定义表格数据
@@ -241,7 +281,8 @@
// 列表数据请求
const listApi = async () => {
- let res = await emergencyDrillEvaluationApi().getEmergencyDrillEvaluationList(listQuery);
+ // let res = await emergencyDrillEvaluationApi().getEmergencyDrillEvaluationList(listQuery);
+ let res = await emergencyDrillExecuteApi().getEmergencyDrillExecuteList(listQuery);
if (res.data.code == 200) {
tableData.value = res.data.data;
pageIndex.value = res.data.pageIndex;
@@ -288,6 +329,12 @@
const onApprovalProgress = (val: string, row: object) => {
if (val == '详情') {
approvalRef.value.openDialog('查看演练实施评价', row, true);
+ }
+ if (val == '评价') {
+ approvalRef.value.openDialog('演练实施评价', row, false);
+ }
+ if (val == '查看评价') {
+ approvalRef.value.openDialog('演练实施查看评价', row, true);
}
};
// 新增后刷新
@@ -452,4 +499,4 @@
min-width: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2