From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue | 188 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 159 insertions(+), 29 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
index 30497fb..bba7134 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=='0'">综合</div>
+ <div v-if="scope.row.drillWay=='1'">桌面</div>
+ <div v-if="scope.row.drillWay=='2'">专项</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>
@@ -86,7 +105,102 @@
/>
</div>
</el-tab-pane>
- <el-tab-pane label="已评价" name="second">Config</el-tab-pane>
+ <el-tab-pane label="已评价" name="second">
+ <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>
+ </div>
+ <!-- <div class="button_Right">-->
+ <!-- <el-button @click="upButton">-->
+ <!-- <el-icon>-->
+ <!-- <Upload />-->
+ <!-- </el-icon>-->
+ <!-- </el-button>-->
+ <!-- <el-button>-->
+ <!-- <el-icon>-->
+ <!-- <Download />-->
+ <!-- </el-icon>-->
+ <!-- </el-button>-->
+ <!-- <el-button>-->
+ <!-- <el-icon>-->
+ <!-- <Refresh />-->
+ <!-- </el-icon>-->
+ <!-- </el-button>-->
+ <!-- </div>-->
+ </div>
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ ref="multipleTableRef"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ />
+ <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>
+ <template #default="scope">
+ <div v-if="scope.row.drillWay=='0'">综合</div>
+ <div v-if="scope.row.drillWay=='1'">桌面</div>
+ <div v-if="scope.row.drillWay=='2'">专项</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 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>-->
+ </template>
+ </el-table-column>
+ </el-table>
+ <div class="pages">
+ <el-pagination
+ v-if="tableData.length == 0 ? false : true"
+ v-model:currentPage="pageIndex"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 20, 30]"
+ :pager-count="5"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </el-tab-pane>
</el-tabs>
</el-card>
<ApprovalProgress ref="approvalRef" @myAdd="onMyAdd" />
@@ -121,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";
// 定义接口来定义对象的类型
@@ -145,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
},
});
// 定义表格数据
@@ -158,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;
@@ -205,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);
}
};
// 新增后刷新
@@ -272,7 +402,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr;
// console.log(deletAll.value);
if (val.length == 1) {
danger.value = false;
--
Gitblit v1.9.2