Compare commits

...

3 Commits

Author SHA1 Message Date
DX 43549e89d4 Merge remote-tracking branch 'origin/master' 2 weeks ago
DX 5330b81936 页面样式修改 2 weeks ago
DX 4c6a50503d 页面样式修改 2 weeks ago
  1. 233
      src/views/airqualitycollection/index.vue
  2. 32
      src/views/enterpriseinspections/index.vue
  3. 33
      src/views/enterprises/index.vue
  4. 27
      src/views/qualification/index.vue
  5. 181
      src/views/system/jobinfo/index.vue
  6. 32
      src/views/task/createEnterprise2.vue

233
src/views/airqualitycollection/index.vue

@ -1,120 +1,105 @@
<template>
<!-- 列表 -->
<ContentWrap>
<div class="tabs">
<section class="flex flex-col gap-20px">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane
v-for="dict in getIntDictOptions(DICT_TYPE.AIR_COLLECTION_TYPE)"
<el-tab-pane
v-for="dict in getIntDictOptions(DICT_TYPE.AIR_COLLECTION_TYPE)"
:key="dict.value"
:label="dict.label"
:label="dict.label"
:name="dict.value"
>
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
size="large"
label-width="68px"
label-position="right"
>
<el-form-item label="站点" prop="siteName">
<el-input
v-model="queryParams.siteName"
placeholder="请输入站点名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item >
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<UploadExcel
v-model="fileUrls"
:file-type="['xlsx', 'xls']"
:file-size="1"
class="mr-5px"
:type="activeName"
/>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<template #empty>
<el-empty description="暂无数据" />
</template>
<el-table-column label="站点名称" align="center" prop="siteName" />
<el-table-column
label="时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
:cell-style="{ borderBottom: '1px solid #EBEEF5' }"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
/>
<el-table-column label="数据类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.AIR_COLLECTION_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="PM2.s(ugim3)" align="center" prop="pm25" />
<el-table-column label="PMo(ug/m3)" align="center" prop="pm10" />
<el-table-column label="sOz(ug/m3)" align="center" prop="so2" />
<el-table-column label="NOz(ug/m3)" align="center" prop="no2" />
<el-table-column label="NO(Hg/m3)" align="center" prop="no" />
<el-table-column label="NOx(Hg/m3)" align="center" prop="nOx" />
<el-table-column label="CO(mg/m3)" align="center" prop="co" />
<el-table-column label="Oз(ug/m3)" align="center" prop="o3" />
<!-- <el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:quality-collection:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['system:quality-collection:delete']"
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
size="large"
label-width="68px"
label-position="right"
>
删除
</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-tab-pane>
<el-form-item label="站点" prop="siteName">
<el-input
v-model="queryParams.siteName"
placeholder="请输入站点名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
>
<el-button @click="resetQuery"
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
>
<UploadExcel
v-model="fileUrls"
:file-type="['xlsx', 'xls']"
:file-size="1"
class="mr-5px"
:type="activeName"
/>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<template #empty>
<el-empty description="暂无数据" />
</template>
<el-table-column label="站点名称" align="center" prop="siteName" />
<el-table-column
label="时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
:cell-style="{ borderBottom: '1px solid #EBEEF5' }"
:header-cell-style="{
borderBottom: '1px solid #EBEEF5',
backgroundColor: '#F5F7FA'
}"
/>
<el-table-column label="数据类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.AIR_COLLECTION_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="PM2.s(ugim3)" align="center" prop="pm25" />
<el-table-column label="PMo(ug/m3)" align="center" prop="pm10" />
<el-table-column label="sOz(ug/m3)" align="center" prop="so2" />
<el-table-column label="NOz(ug/m3)" align="center" prop="no2" />
<el-table-column label="NO(Hg/m3)" align="center" prop="no" />
<el-table-column label="NOx(Hg/m3)" align="center" prop="nOx" />
<el-table-column label="CO(mg/m3)" align="center" prop="co" />
<el-table-column label="Oз(ug/m3)" align="center" prop="o3" />
</el-table>
<!-- 分页 -->
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</el-tab-pane>
</el-tabs>
</div>
</section>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
@ -130,7 +115,6 @@ import QualityCollectionForm from './QualityCollectionForm.vue'
const activeName = ref(1)
import { UploadExcel } from '@/components/UploadFile'
/** 空气质量采集 列表 */
defineOptions({ name: 'QualityCollection' })
@ -156,7 +140,7 @@ const queryParams = reactive({
o3: undefined,
remark: undefined,
remark2: undefined,
createTime: [],
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
@ -231,23 +215,18 @@ onMounted(() => {
})
</script>
<style>
.tabs {
display: flex;
flex-direction: column;
.tabs {
display: flex;
flex-direction: column;
::v-deep(.el-form-item__label) {
display: inline-flex;
}
}
.demo-tabs > .el-tabs__content {
color: #6b778c;
font-size: 32px;
font-weight: 600;
::v-deep(.el-form-item__label) {
display: inline-flex;
}
}
</style>
.demo-tabs > .el-tabs__content {
color: #6b778c;
font-size: 32px;
font-weight: 600;
}
</style>

32
src/views/enterpriseinspections/index.vue

@ -1,5 +1,6 @@
<template>
<ContentWrap style="align-items: center; display: flex; padding: 25px 20px;">
<ContentWrap style="padding: 10px">
<section class="flex flex-col gap-20px">
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
@ -8,7 +9,7 @@
:inline="true"
label-width="68px"
>
<el-form-item label="任务标题" prop="taskId">
<el-form-item label="" prop="taskId">
<el-input
v-model="queryParams.taskName"
placeholder="请输入任务标题"
@ -17,7 +18,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="企业名称" prop="enterpriseId">
<el-form-item label="" prop="enterpriseId">
<el-input
v-model="queryParams.enterpriseName"
placeholder="请输入企业名称"
@ -47,7 +48,7 @@
@click="openForm('create')"
v-hasPermi="['system:enterprise-inspections:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
<Icon icon="ep:circle-plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
@ -60,10 +61,7 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
@ -102,13 +100,19 @@
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 分页 -->
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->

33
src/views/enterprises/index.vue

@ -1,5 +1,6 @@
<template>
<ContentWrap>
<section class="flex flex-col gap-20px">
<!-- 搜索工作栏 -->
<el-form
:model="queryParams"
@ -9,7 +10,7 @@
size="large"
class="formClass"
>
<el-form-item label="企业名称" prop="enterprisesName">
<el-form-item label="" prop="enterprisesName">
<el-input
v-model="queryParams.enterprisesName"
placeholder="请输入企业名称"
@ -17,7 +18,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="企业类型" prop="type">
<el-form-item label="" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择企业类型"
@ -32,7 +33,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="所属区域" prop="region">
<el-form-item label="" prop="region">
<el-select
v-model="queryParams.region"
placeholder="请选择企业所属区域"
@ -48,7 +49,7 @@
</el-select>
</el-form-item>
<el-form-item label="企业注册号" prop="registrationNumber">
<el-form-item label="" prop="registrationNumber">
<el-input
v-model="queryParams.registrationNumber"
placeholder="请输入企业注册号"
@ -57,7 +58,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="成立时间" prop="establishmentDate">
<el-form-item label="" prop="establishmentDate">
<el-date-picker
v-model="queryParams.establishmentDate"
value-format="YYYY-MM-DD HH:mm:ss"
@ -69,7 +70,7 @@
/>
</el-form-item>
<el-form-item label="企业状态" prop="enterprisesStatus">
<el-form-item label="" prop="enterprisesStatus">
<el-select
v-model="queryParams.enterprisesStatus"
placeholder="请选择企业状态"
@ -104,10 +105,6 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :cell-style="{'text-align': 'left'}">
<el-table-column label="企业名称" align="left" fixed="left" prop="enterprisesName" width="200" />
<el-table-column label="专管员" align="left" prop="inviterName" fixed="left" />
@ -164,12 +161,16 @@
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
</ContentWrap>

27
src/views/qualification/index.vue

@ -1,5 +1,6 @@
<template>
<ContentWrap>
<section class="flex flex-col gap-20px">
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
@ -9,7 +10,7 @@
label-width="98px"
size="large"
>
<el-form-item label="企业名称" prop="qualificationName">
<el-form-item label="" prop="qualificationName">
<el-input
v-model="queryParams.enterpriseName"
placeholder="请输入企业名称"
@ -18,7 +19,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="资质名称" prop="qualificationName" >
<el-form-item label="" prop="qualificationName" >
<el-select
v-model="queryParams.qualificationName"
placeholder="请选择资质名称"
@ -33,7 +34,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="资质到期日期" prop="expiryDate">
<el-form-item label="" prop="expiryDate">
<el-date-picker
v-model="queryParams.expiryDate"
value-format="YYYY-MM-DD HH:mm:ss"
@ -45,8 +46,8 @@
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:circle-plus" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@ -66,10 +67,6 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="企业名称" align="center" prop="enterpriseName" />
<el-table-column label="资质名称" align="center" prop="qualificationName" >
@ -102,12 +99,16 @@
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
<el-pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->

181
src/views/system/jobinfo/index.vue

@ -1,85 +1,111 @@
<template>
<ContentWrap>
<section class="flex flex-col gap-20px">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryFormRef" :inline="true" @submit.prevent>
<el-form-item label="" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入汇报标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary" plain>
<Icon icon="ep:search" class="mr-5px" />
查询
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入汇报标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="" prop="jobName">
<el-input
v-model="queryParams.jobName"
placeholder="请输入汇报人姓名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['system:job-info:create']"
>
<Icon icon="ep:circle-plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="汇报标题" align="center" prop="title" />
<el-table-column label="汇报日期" :formatter="dateFormatter2" align="center" prop="jobDate" />
<el-table-column label="汇报人姓名" align="center" prop="jobName" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="PDF文件" align="center" prop="pdfUrl">
<template #default="scope">
<el-button
v-if="scope.row.pdfUrl"
link
type="primary"
@click="handleOpenPdf(scope.row.pdfUrl)"
>
查看PDF
</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
</el-form-item>
<el-form-item class="ml-auto">
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('create')"
v-hasPermi="['system:job-info:create']"
@click="handleDetail(scope.row.id)"
v-hasPermi="['system:job-info:update']"
>
<Icon icon="ep:circle-plus" class="mr-5px" /> 新增
生成
</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
<el-table-column label="汇报标题" prop="title" />
<el-table-column label="汇报日期" :formatter="dateFormatter2" prop="jobDate" />
<el-table-column label="汇报人" prop="jobName" />
<el-table-column
label="创建时间"
prop="createTime"
:formatter="dateFormatter"
/>
<el-table-column label="操作选项" align="center" width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:job-info:update']"
>
编辑
</el-button>
<el-button
link
type="primary"
v-hasPermi="['system:job-info:update']"
>
下载
</el-button>
<!-- <el-button-->
<!-- link-->
<!-- type="danger"-->
<!-- @click="handleDelete(scope.row.id)"-->
<!-- v-hasPermi="['system:job-info:delete']"-->
<!-- >-->
<!-- 删除-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['system:job-info:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['system:job-info:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<el-pagination
:total="total"
:show-page-size="false"
layout="total, prev, pager, next"
v-model:current-page="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
@change="getList"
class="ml-auto"
/>
</section>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
@ -87,7 +113,7 @@
</template>
<script setup lang="ts">
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download'
import { JobInfoApi, JobInfoVO } from '@/api/system/jobinfo'
import JobInfoForm from './JobInfoForm.vue'
@ -106,7 +132,7 @@ const queryParams = reactive({
pageSize: 10,
title: undefined,
jobName: undefined,
createTime: []
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
@ -144,6 +170,7 @@ const openForm = (type: string, id?: number) => {
/** 生成按钮操作 */
const handleDetail = async (id: number) => {
try {
//
await JobInfoApi.jobDetail(id)
message.success('生成成功')
@ -189,4 +216,4 @@ const handleExport = async () => {
onMounted(() => {
getList()
})
</script>
</script>

32
src/views/task/createEnterprise2.vue

@ -5,6 +5,7 @@
title="筛选企业"
width="1200px"
style="padding: 40px; "
top="5vh"
:close-on-click-modal="false"
append-to-body
>
@ -18,7 +19,6 @@
:model="enterprise.queryParams"
ref="queryFormRef"
:inline="true"
label-width="0"
size="large"
class="search-form"
>
@ -92,7 +92,7 @@
<el-table-column type="selection" :reserve-selection="true" />
<el-table-column property="enterprisesName" label="企业名称" />
<el-table-column property="region" label="区域">
<el-table-column property="region" label="所属区域">
<template #default="scope">
{{
getStrDictOptions(DICT_TYPE.ENTERPRISES_AREA).find(
@ -101,7 +101,7 @@
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="行业">
<el-table-column property="enterprisesName" label="行业类别">
<template #default="scope">
{{
scope.row.tagListName &&
@ -112,29 +112,12 @@
}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="生态">
<el-table-column property="inviterName" label="执法人员" >
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 2)
.map((item) => item.label)
.join(', ')
}}
</template>
{{scope.row.inviterName}} | {{scope.row.inviterNameDept}}
</template>
</el-table-column>
<el-table-column property="enterprisesName" label="类型">
<template #default="scope">
{{
scope.row.tagListName &&
scope.row.tagListName
.filter((item) => item.value == 4)
.map((item) => item.label)
.join(', ')
}}
</template>
</el-table-column>
<el-table-column property="inviterName" label="执法人员" />
</el-table>
<!-- 分页 -->
@ -319,6 +302,7 @@ defineExpose({ open })
grid-template-columns: repeat(3, 1fr);
gap: 24px;
margin-bottom: 20px;
width: 100%;
}
.form-item {

Loading…
Cancel
Save