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/implementationOfEmergencyDrill/index.vue | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue index 222687e..767809d 100644 --- a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue +++ b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue @@ -42,13 +42,25 @@ 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="planId" label="应急预案" show-overflow-tooltip sortable></el-table-column> + <el-table-column prop="emergencyPlanName" 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 type="primary" @click="onEdit('详情',scope.row.id)"> @@ -114,7 +126,7 @@ } from '@element-plus/icons-vue' import OpenAdd from '/@/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue'; import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue'; -import {emergencyDrillExecuteApi} from "/@/api/emergencyDrillExecute"; +import {emergencyDrillExecuteApi} from "/@/api/contingencyManagement/emergencyDrillExecute"; export default defineComponent({ name: 'systemUser', -- Gitblit v1.9.2