From 817f8b5f25e08499e7e90b38c002e74131d57c17 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 18 四月 2025 14:30:12 +0800 Subject: [PATCH] 修改 --- src/views/hazardousChemicals/overdueWarning/index.vue | 127 ++++++++++++++++++++++++++++-------------- 1 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/views/hazardousChemicals/overdueWarning/index.vue b/src/views/hazardousChemicals/overdueWarning/index.vue index 7fa70a0..e9a98aa 100644 --- a/src/views/hazardousChemicals/overdueWarning/index.vue +++ b/src/views/hazardousChemicals/overdueWarning/index.vue @@ -1,41 +1,53 @@ <template> <div class="app-container"> - <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;font-size: 20px;font-weight: 600"> - <span>当前存在未处理预警 <span style="color: #1890ff;cursor: pointer" @click="toDetail">{{data.untreatedTotal}}</span> 条</span> - <el-button - type="primary" - plain - @click="reset" - style="margin-left: 40px" - >重置</el-button> - </div> -<!--/* <div style="display: flex;justify-content: space-between">*/--> + <div style="display: flex;justify-content: space-between;margin-bottom: 10px;font-size: 20px;font-weight: 600"> + <div style="display: flex;justify-content: space-between"> + <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" > + <el-form-item label="企业名称:" > + <el-select + clearable + v-model="data.queryParams.companyId" + filterable + remote + reserve-keyword + placeholder="请输入企业名称" + remote-show-suffix + :remote-method="getCompanyList" + style="width: 100%" + > + <el-option + v-for="item in data.companyList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> + </el-form-item> + <el-form-item > + <el-button + type="primary" + @click="getList" + >查询</el-button> + <el-button + type="primary" + plain + @click="reset" + >重置</el-button> + </el-form-item> + </el-form> + </div> + <div> + <span>当前存在未处理预警 <span style="color: #1890ff;cursor: pointer" @click="toDetail">{{data.untreatedTotal}}</span> 条</span> + <el-button + type="primary" + plain + @click="reset" + style="margin-left: 40px" + >重置</el-button> + </div> -<!--/* <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >*/--> -<!-- <el-form-item>--> -<!-- <el-button--> -<!-- type="primary"--> -<!-- plain--> -<!-- icon="Plus"--> -<!-- @click="openDialog('add',{})"--> -<!-- >新增</el-button>--> -<!-- </el-form-item>--> -<!-- <el-form-item label="仓库名称:" >--> -<!-- <el-input v-model="data.queryParams.name" placeholder="请输仓库名称"></el-input>--> -<!-- </el-form-item>--> -<!-- <el-form-item >--> -<!-- <el-button--> -<!-- type="primary"--> -<!-- @click="getList"--> -<!-- >查询</el-button>--> -<!-- <el-button--> -<!-- type="primary"--> -<!-- plain--> -<!-- @click="reset"--> -<!-- >重置</el-button>--> -<!-- </el-form-item>--> -<!-- </el-form>--> -<!-- </div>--> + </div> + <!-- 表格数据 --> <el-table v-loading="loading" :data="dataList" :border="true"> <el-table-column label="序号" type="index" align="center" width="80" /> @@ -77,6 +89,7 @@ import {ElMessage, ElMessageBox} from "element-plus"; import {delWarning, getWarning, handleWarning} from "@/api/hazardousChemicals/warning"; import {unWarningCount} from "@/api/hazardousChemicals/count"; +import {getCompany} from "@/api/hazardousChemicals/company"; const { proxy } = getCurrentInstance(); const loading = ref(false); const dialogRef = ref(); @@ -84,18 +97,20 @@ queryParams: { pageNum: 1, pageSize: 10, - state: null + state: null, + companyId: null }, total: 0, dataList: [], - untreatedTotal: 0 + untreatedTotal: 0, + companyList: [] }); const { queryParams, total, dataList } = toRefs(data); const classHourRef = ref(); onMounted(()=>{ getList() - getUnCount() + getCompanyList("") }) onUnmounted(()=>{ @@ -108,6 +123,7 @@ if(res.code == 200){ data.dataList = res.data.list data.total = res.data.total + getUnCount() }else{ ElMessage.warning(res.message) @@ -115,7 +131,10 @@ loading.value = false } const getUnCount = async () => { - const res = await unWarningCount() +const param = { + companyId: data.queryParams.companyId +} + const res = await unWarningCount(param) if(res.code == 200){ data.untreatedTotal = res.data }else{ @@ -124,6 +143,30 @@ } +const getCompanyList = async (val)=>{ + if(val){ + const queryParams = { + name: val + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list + } else { + ElMessage.warning(res.message) + } + }else { + const queryParams = { + pageNum: 1, + pageSize: 10 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list + } else { + ElMessage.warning(res.message) + } + } +} const openDialog = (type, value) => { dialogRef.value.openDialog(type, value); } @@ -133,10 +176,10 @@ data.queryParams = { pageNum: 1, pageSize: 10, - state: null + state: null, + companyId: null } getList() - getUnCount() } const handleDelete = (val) => { ElMessageBox.confirm( @@ -152,7 +195,6 @@ if(res.code == 200){ ElMessage.success('数据删除成功') await getList() - await getUnCount() }else{ ElMessage.warning(res.message) } @@ -179,7 +221,6 @@ if(res.code == 200){ ElMessage.success('处理成功') await getList() - await getUnCount() }else{ ElMessage.warning(res.message) } -- Gitblit v1.9.2