From f91c24d2b2b513716ffe9f4259a8a343c841bb00 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期六, 30 七月 2022 18:10:28 +0800
Subject: [PATCH] 数据对接
---
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue | 189 ++++++++++++++++++++++++----------------------
1 files changed, 99 insertions(+), 90 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
index 6aabd99..30497fb 100644
--- a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
+++ b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
@@ -3,7 +3,7 @@
<el-card shadow="hover">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="待评价" name="first">
- <div class="button_Line">
+ <div class="button_Line mb15">
<div class="button_Left">
<el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
<el-icon>
@@ -11,23 +11,23 @@
</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 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"
@@ -39,13 +39,13 @@
type="selection"
width="55"
/>
- <el-table-column prop="teamName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="teamLevel" label="演练地点" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="teamDescription" label="演练方式" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="phone" label="演练级别" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="attachments" label="计划演练日期" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="attachments" label="演练记录日期" show-overflow-tooltip sortable></el-table-column>
- <el-table-column prop="attachments" label="应急预案" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="emergencyPlanName" 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="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>
@@ -53,10 +53,10 @@
<EditPen />
</el-icon>评价
</el-button>
- <el-button size="small" text type="primary" @click="onFlowChart(scope.row)">
- 审批进度
- </el-button>
- <el-button size="small" text type="primary" @click="onEdit('详情',scope.row.id)">
+<!-- <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>查看评价
@@ -89,11 +89,10 @@
<el-tab-pane label="已评价" name="second">Config</el-tab-pane>
</el-tabs>
</el-card>
-<!-- <ApprovalProgress ref="approvalRef" />-->
- <FlowChart ref="flowRef" />
- <RectificationDialog ref="rectificationRef" />
- <OpenEdit ref="editRef" />
- <upData ref="upShow"></upData>
+ <ApprovalProgress ref="approvalRef" @myAdd="onMyAdd" />
+<!-- <FlowChart ref="flowRef" />-->
+ <RectificationDialog ref="rectificationRef" @myAdd="onMyAdds" />
+<!-- <upData ref="upShow"></upData>-->
</div>
</template>
@@ -106,58 +105,44 @@
defineComponent
} from 'vue';
import {
- ElTable,
ElMessage,
ElMessageBox,
TabsPaneContext,
} from 'element-plus';
import {
Plus,
- Upload,
- Download,
- Refresh,
+ // Upload,
+ // Download,
+ // Refresh,
+ Delete,
EditPen,
} from '@element-plus/icons-vue'
-import FlowChart from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/flowChart.vue'
-// import ApprovalProgress from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/approvalProgress.vue';
-import OpenEdit from '/@/views/contingencyManagement/panManagement/component/openEdit.vue';
-import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
+// import FlowChart from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/flowChart.vue'
+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'
// 定义接口来定义对象的类型
-interface TableDataRow {
- // userName: string;
- // userNickname: string;
- // roleSign: string;
- // department: string[];
- // phone: string;
- // email: string;
- // sex: string;
- // password: string;
- // overdueTime: Date;
- // // describe: string;
- // createTime: string;
-}
+// interface TableDataRow {
+// }
export default defineComponent({
name: 'systemUser',
components: {
- OpenEdit,
EditPen,
Plus,
- Upload,
- Download,
- Refresh,
- UpData,
- // ApprovalProgress,
+ // Upload,
+ // Download,
+ // Refresh,
+ // UpData,
+ Delete,
+ ApprovalProgress,
RectificationDialog,
- FlowChart
+ // FlowChart
},
setup() {
-
const activeName = ref('first')
-
const handleClick = (tab: TabsPaneContext, event: Event) => {
console.log(tab, event)
}
@@ -189,35 +174,47 @@
};
// 上传
- const upShow=ref()
- const upButton=()=>{
- upShow.value.openDialog()
- }
+ // const upShow=ref()
+ // const upButton=()=>{
+ // upShow.value.openDialog()
+ // }
// 审批进度弹窗
- const flowRef = ref();
- const onFlowChart = (row: TableDataRow) => {
- flowRef.value.openDialog(row);
- };
- // // 查看整改弹窗
- // const editRef = ref();
- // const onOpenEdit = () => {
- // editRef.value.openDialog('演练实施评价',false);
+ // const flowRef = ref();
+ // const onFlowChart = (row: TableDataRow) => {
+ // flowRef.value.openDialog(row);
// };
// 打开修改弹窗
const rectificationRef = ref();
const onEdit = (val: string, row: object) => {
- if (val == '详情') {
- rectificationRef.value.openDialog('查看演练实施评价',row,true);
- } else {
+ if (val == '修改') {
rectificationRef.value.openDialog('修改演练实施评价',row,false);
+ } else {
+ // rectificationRef.value.openDialog('修改演练实施评价',row,false);
+ }
+ };
+ const onMyAdds = (e: boolean) => {
+ if (e) {
+ listApi();
+ } else {
+ listApi();
}
};
// 审批进度弹窗
- // const approvalRef = ref();
- // const onApprovalProgress = () => {
- // approvalRef.value.openDialog();
- // };
+ const approvalRef = ref();
+ const onApprovalProgress = (val: string, row: object) => {
+ if (val == '详情') {
+ approvalRef.value.openDialog('查看演练实施评价', row, true);
+ }
+ };
+ // 新增后刷新
+ const onMyAdd = (e: boolean) => {
+ if (e) {
+ listApi();
+ } else {
+ listApi();
+ }
+ };
// 整改弹窗
// const rectificationRef = ref();
// const onEdit = () => {
@@ -253,7 +250,6 @@
})
.catch(() => {});
};
-
// 分页
const pageIndex = ref();
const pageSize = ref();
@@ -292,22 +288,26 @@
return {
activeName,
handleClick,
- upButton,
- upShow,
+ // upButton,
+ // upShow,
tableData,
// onOpenEdit, //编辑
pageIndex,
pageSize,
handleSizeChange,
handleCurrentChange,
- // onApprovalProgress,
- // approvalRef,
+ onApprovalProgress,
+ approvalRef,
onEdit,
rectificationRef,
- onFlowChart,
- flowRef,
+ // onFlowChart,
+ // flowRef,
onDeleteAll,
+ danger,
+ total,
handleSelectionChange,
+ onMyAdd,
+ onMyAdds,
};
},
});
@@ -326,6 +326,15 @@
flex-direction: row;
justify-content: space-between;
}
+//表头
+::v-deep .el-table th.el-table__cell {
+ background-color: #f6f7fa;
+ font-weight: 400;
+ color: #909399;
+}
+.el-table .sort-caret.ascending{
+ border-bottom-color: #c0c4cc;
+}
//分页
.pages{
display: flex;
--
Gitblit v1.9.2