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/contingency/index.vue | 444 ++++++++++++++++++++++++++----------------------------
1 files changed, 214 insertions(+), 230 deletions(-)
diff --git a/src/views/contingencyManagement/contingency/index.vue b/src/views/contingencyManagement/contingency/index.vue
index 4d71a26..22a783a 100644
--- a/src/views/contingencyManagement/contingency/index.vue
+++ b/src/views/contingencyManagement/contingency/index.vue
@@ -2,22 +2,22 @@
<div class="system-user-container">
<el-card shadow="hover">
<div class="system-user-search mb15">
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
+ <el-form :inline="true" class="demo-form-inline">
<el-form-item>
- <el-input size="default" v-model="formInline.teamName" placeholder="队伍名称"> </el-input>
+ <el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称"> </el-input>
</el-form-item>
<el-form-item>
- <el-select size="default" v-model="formInline.teamType" placeholder="请选择队伍级别">
- <el-option label="公司" value="shanghai"></el-option>
- <el-option label="分厂-车间" value="beijing"></el-option>
- <el-option label="工序-班组等" value="beijing"></el-option>
+ <el-select size="default" v-model="listQuery.searchParams.teamLevel" placeholder="请选择队伍级别">
+ <el-option label="公司" value="1"></el-option>
+ <el-option label="分厂-车间" value="2"></el-option>
+ <el-option label="工序-班组等" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button size="default" type="primary" class="ml10" @click="onSubmit">
查询
</el-button>
- <el-button size="default" class="ml10" @click="submitReset">
+ <el-button size="default" class="ml10" @click="submitReset">
重置
</el-button>
</el-form-item>
@@ -25,67 +25,74 @@
</div>
<div class="button_Line">
<div class="button_Left">
- <el-button size="default" type="primary" @click="onOpenAdd('新建')">
+ <el-button size="default" type="primary" @click="onOpenAdd">
<el-icon>
<Plus />
</el-icon>新建
</el-button>
- <el-button size="default" type="warning" plain disabled>
+ <el-button size="default" type="warning" plain :disabled="warning">
<el-icon>
<Edit />
</el-icon>修改
</el-button>
- <el-button size="default" type="danger" plain disabled>
+ <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 class="button_Right">-->
+<!-- <el-button size="default" @click="upButton">-->
+<!-- <el-icon>-->
+<!-- <Upload />-->
+<!-- </el-icon>-->
+<!-- </el-button>-->
+<!-- <el-button size="default">-->
+<!-- <el-icon>-->
+<!-- <Download />-->
+<!-- </el-icon>-->
+<!-- </el-button>-->
+<!-- <el-button size="default">-->
+<!-- <el-icon>-->
+<!-- <Refresh />-->
+<!-- </el-icon>-->
+<!-- </el-button>-->
+<!-- </div>-->
</div>
<el-table
- :data="tableData.data"
+ :data="tableData"
style="width: 100%"
ref="multipleTableRef"
+ @selection-change="handleSelectionChange"
>
<el-table-column
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="teamPhone" label="负责人手机" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="teamLevel" label="队伍级别" show-overflow-tooltip sortable>
+ <template #default="scope">
+ <span v-if="scope.row.teamLevel == 1">公司</span>
+ <span v-if="scope.row.teamLevel == 2">分厂-车间</span>
+ <span v-if="scope.row.teamLevel == 3">工序-班组等</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="teamDesc" label="队伍描述" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="principalPhone" 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="200" align="center" fixed="right">
<template #default="scope">
- <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenSee(scope.row)">
+ <el-button size="small" text type="primary" @click="onEdit('详情',scope.row.id)">
<el-icon style="margin-right: 5px;">
<View />
</el-icon>查看
</el-button>
- <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenEdit(scope.row)">
+ <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 type="primary" @click="onRowDel(scope.row)">
+ <el-button size="small" text type="primary" @click="onRowDel(scope.row.id)">
<el-icon>
<Delete />
</el-icon>删除
@@ -93,30 +100,31 @@
</template>
</el-table-column>
</el-table>
- <el-pagination
- @size-change="onHandleSizeChange"
- @current-change="onHandleCurrentChange"
- class="mt15"
- :pager-count="5"
- :page-sizes="[10, 20, 30]"
- v-model:current-page="formInline.pageIndex"
- background
- v-model:page-size="formInline.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="tableData.total"
- >
- </el-pagination>
+ <div class="pages">
+ <el-pagination
+ v-if="tableData.length == 0 ? false : true"
+ @size-change="onHandleSizeChange"
+ @current-change="onHandleCurrentChange"
+ class="mt15"
+ :pager-count="5"
+ :page-sizes="[10, 20, 30]"
+ v-model:currentPage="pageIndex"
+ background
+ v-model:page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ >
+ </el-pagination>
+ </div>
</el-card>
- <OpenSee ref="seeRef" />
- <OpenAdd ref="addRef" />
- <OpenEdit ref="editRef" />
+ <OpenAdd ref="addRef" @myAdd="onMyAdd" />
<upData ref="upShow"></upData>
</div>
</template>
<script lang="ts">
import {
- toRefs,
+ // toRefs,
reactive,
onMounted,
ref,
@@ -125,241 +133,215 @@
import {
ElMessageBox,
ElMessage,
- ElTable,
} from 'element-plus';
import { Plus,
Edit,
Delete,
- Upload,
- Download,
- Refresh,
+ // Upload,
+ // Download,
+ // Refresh,
View,
EditPen,
} from '@element-plus/icons-vue'
-import OpenAdd from '/@/views/contingencyManagement/contingency/component/openAdd.vue';
-import OpenEdit from '/@/views/contingencyManagement/contingency/component/openEdit.vue';
-import OpenSee from '/@/views/contingencyManagement/contingency/component/openSee.vue';
-import UpData from '/@/views/contingencyManagement/contingency/component/upData.vue';
-import {contingencyApi} from "/@/api/contingency";
+import OpenAdd from '../../contingencyManagement/contingency/component/openAdd.vue'
+import UpData from '../../contingencyManagement/contingency/component/upData.vue';
+import {contingencyApi} from "../../../api/contingencyManagement/contingency";
-// 定义表格数据类型
-interface User {
- teamName: string
- teamLevel: string
- teamDescription: string
- teamPhone: string
- telephone: string;
- describe: string;
- responsibleDepartment: string
- teamLeader: string
-
-}
-
-// 定义接口来定义对象的类型
-interface TableDataRow {
- // teamName: string;
- // teamLevel: string;
- // teamDescription: string;
- // teamPhone: string;
- // attachments: string;
-}
-
-//
-interface TableDataState {
- tableData: {
- data: Array<TableDataRow>;
- total: number;
- loading: boolean;
- param: {
- pageIndex: number;
- pageSize: number;
- }
- };
-}
export default defineComponent({
name: 'systemUser',
components: {
OpenAdd,
- OpenSee,
- OpenEdit,
View,
EditPen,
Plus,
Edit,
Delete,
- Upload,
- Download,
- Refresh,
+ // Upload,
+ // Download,
+ // Refresh,
UpData,
contingencyApi
},
setup() {
- // 定义表单搜索
- const formInline = reactive({
+ // 列表参数
+ const listQuery = reactive({
pageIndex: 1,
pageSize: 10,
searchParams: {
- teamName: "",
- teamType: "",
- }
+ teamName: "",
+ teamLevel: "",
+ }
})
- // 搜索按钮
- const onSubmit = async () => {
- // let res = await contingencyApi().getTeamManagementList(formInline)
- // if(res.data.code === '200'){
- // state.tableData.data = res.data.data;
- // state.tableData.total = state.tableData.data.length;
- // }else{
- // ElMessage({
- // type:'warning',
- // message:res.data.msg
- // })
- // }
- }
-
- const multipleTableRef = ref<InstanceType<typeof ElTable>>()
- const multipleSelection = ref<User[]>([])
-
- // 上传
- const upShow=ref()
- const upButton=()=>{
- upShow.value.openDialog()
- }
// 定义表格数据
- const state = reactive<TableDataState>({
- tableData: {
- data: [],
- total: 0,
- loading: false,
- },
- })
- // 初始化表格数据
- const initTableData = async () => {
- let res = await contingencyApi().getTeamManagementList(formInline)
+ const tableData = ref([]);
+ // 列表数据请求
+ const onSubmit = async () => {
+ let res = await contingencyApi().getTeamManagementList(listQuery)
if(res.data.code === '200'){
- state.tableData.data = res.data.data;
- state.tableData.total = state.tableData.data.length;
+ tableData.value = res.data.data;
+ pageIndex.value = res.data.pageIndex;
+ pageSize.value = res.data.pageSize;
+ total.value = res.data.total;
}else{
ElMessage({
- type:'warning',
+ showClose: true,
+ type:'error',
message:res.data.msg
})
}
+ }
+ // 重置
+ const submitReset = () => {
+ listQuery.searchParams.teamName = '';
+ listQuery.searchParams.teamLevel = '';
+ onSubmit();
};
- // const tableData: User[] = [
- // {
- // teamName: '应急救援组',
- // teamLevel: '公司',
- // teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
- // telephone: '051383830321',
- // teamPhone: '13603812900',
- // describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
- // '(2)负责现场被困人员、受伤人员抢救工作；\n' +
- // '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
- // '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
- // responsibleDepartment: '仪表班',
- // teamLeader: '王磊',
- // },
- // {
- // teamName: '应急救援组',
- // teamLevel: '公司',
- // teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
- // telephone: '051383830321',
- // teamPhone: '13603812900',
- // describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
- // '(2)负责现场被困人员、受伤人员抢救工作；\n' +
- // '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
- // '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
- // responsibleDepartment: '仪表班',
- // teamLeader: '王磊',
- // },
- // {
- // teamName: '应急救援组',
- // teamLevel: '公司',
- // teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
- // telephone: '051383830321',
- // teamPhone: '13603812900',
- // describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
- // '(2)负责现场被困人员、受伤人员抢救工作；\n' +
- // '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
- // '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
- // responsibleDepartment: '仪表班',
- // teamLeader: '王磊',
- // },
- // {
- // teamName: '应急救援组',
- // teamLevel: '公司',
- // teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
- // telephone: '051383830321',
- // teamPhone: '13603812900',
- // describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
- // '(2)负责现场被困人员、受伤人员抢救工作；\n' +
- // '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
- // '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
- // responsibleDepartment: '仪表班',
- // teamLeader: '王磊',
- // }
- // ]
- //查看用户弹窗
- const seeRef = ref();
- const onOpenSee = (row: TableDataRow) => {
- seeRef.value.openDialog(row);
+ const warning = ref(true);
+ const danger = ref(true);
+ const deleteAll = ref();
+ const handleSelectionChange = (val: any) => {
+ let valId = JSON.parse(JSON.stringify(val));
+ let arr = [];
+ for (let i = 0; i < valId.length; i++) {
+ arr.push(valId[i].id);
+ }
+ deleteAll.value = arr;
+ if (val.length == 1) {
+ warning.value = false;
+ danger.value = false;
+ } else if (val.length == 0) {
+ warning.value = true;
+ danger.value = true;
+ } else {
+ warning.value = true;
+ danger.value = false;
+ }
};
- // 打开新增用户弹窗
+
+ // 上传
+ // const upShow=ref()
+ // const upButton=()=>{
+ // upShow.value.openDialog()
+ // }
+ // 打开新增应急队伍弹窗
const addRef = ref();
const onOpenAdd = () => {
- addRef.value.openDialog();
+ addRef.value.openDialog('新建应急队伍管理');
};
- // 打开修改用户弹窗
- const editRef = ref();
- const onOpenEdit = (row: TableDataRow) => {
- editRef.value.openDialog(row);
+ // 新增后刷新
+ const onMyAdd = (e: boolean) => {
+ if (e) {
+ onSubmit();
+ } else {
+ onSubmit();
+ }
+ };
+ // 打开修改应急队伍弹窗
+ const onEdit = (val: string, row: object) => {
+ if (val == '详情') {
+ addRef.value.openDialog('查看应急队伍管理',row,true);
+ } else {
+ addRef.value.openDialog('修改应急队伍管理',row,false);
+ }
};
// 删除用户
- const onRowDel = (row: TableDataRow) => {
- ElMessageBox.confirm(`此操作将永久删除账户名称：“${row}”，是否继续?`, '提示', {
+ const onRowDel = (data: any) => {
+ ElMessageBox.confirm('确定删除所选项吗?', '提示', {
confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }).then(() => {
+ contingencyApi()
+ .deleteEmergencyTeam([data])
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'success',
+ });
+ onSubmit();
+ } else {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'error',
+ });
+ onSubmit();
+ }
+ });
+ }).catch(() => {});
+ };
+ // 多选删除
+ const onDeleteAll = () => {
+ ElMessageBox.confirm('确定删除所选项吗?', '提示', {
+ confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- ElMessage.success('删除成功');
+ contingencyApi()
+ .deleteEmergencyTeam(deleteAll.value)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'success',
+ });
+ onSubmit();
+ } else {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'error',
+ });
+ onSubmit();
+ }
+ });
})
.catch(() => {});
};
+ // 分页
+ const pageIndex = ref();
+ const pageSize = ref();
+ const total = ref();
// 分页改变
const onHandleSizeChange = (val: number) => {
- formInline.pageSize = val;
+ listQuery.pageSize = val;
+ onSubmit();
};
const onHandleCurrentChange = (val: number) => {
- formInline.pageIndex = val;
+ listQuery.pageIndex = val;
+ onSubmit();
};
- // // 分页改变
// 页面加载时
onMounted(() => {
- initTableData();
+ onSubmit();
});
return {
- // value,
- // options,
- formInline,
+ listQuery,
onSubmit,
- multipleSelection,
- multipleTableRef,
- upButton,
- upShow,
- // tableData,
- onOpenSee, //查看
- seeRef,
- onOpenEdit, //编辑
- editRef,
+ // upButton,
+ // upShow,
onOpenAdd, //新增
addRef,
+ pageIndex,
+ pageSize,
+ total,
+ onEdit,
+ handleSelectionChange,
+ submitReset,
onRowDel,
+ onMyAdd,
+ tableData,
+ onDeleteAll,
onHandleSizeChange,
onHandleCurrentChange,
- ...toRefs(state),
+ deleteAll,
+ warning,
+ danger,
};
},
});
@@ -377,14 +359,16 @@
display: flex;
flex-direction: row;
justify-content: space-between;
+ margin-bottom: 10px;
}
- .pages{
- padding-top: 20px;
- display: flex;
- justify-content: flex-end;
- }
-.el-form .el-form-item:last-of-type{
- margin-bottom: 22px!important;
+//分页
+.pages{
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 15px;
+}
+.el-form .el-form-item{
+ margin-bottom: 0px!important;
}
//弹窗底部边框线
::v-deep .el-dialog__footer{
--
Gitblit v1.9.2