From 4c6a50503d4631c9ee038de65f5e71ef1c5a4ecf Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Fri, 21 Mar 2025 08:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/airqualitycollection/index.vue | 233 +++++++++++------------
 src/views/enterprises/index.vue          |  33 ++--
 src/views/qualification/index.vue        |  27 +--
 src/views/system/jobinfo/index.vue       |  23 +--
 src/views/task/createEnterprise2.vue     |  32 +---
 5 files changed, 157 insertions(+), 191 deletions(-)

diff --git a/src/views/airqualitycollection/index.vue b/src/views/airqualitycollection/index.vue
index 3cbc440..8368321 100644
--- a/src/views/airqualitycollection/index.vue
+++ b/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>
\ No newline at end of file
+.demo-tabs > .el-tabs__content {
+  color: #6b778c;
+  font-size: 32px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue
index 38edfeb..818da92 100644
--- a/src/views/enterprises/index.vue
+++ b/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>
 
 
diff --git a/src/views/qualification/index.vue b/src/views/qualification/index.vue
index cf5702b..3d61e87 100644
--- a/src/views/qualification/index.vue
+++ b/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>
 
   <!-- 表单弹窗：添加/修改 -->
diff --git a/src/views/system/jobinfo/index.vue b/src/views/system/jobinfo/index.vue
index 6aef2a4..4989eb5 100644
--- a/src/views/system/jobinfo/index.vue
+++ b/src/views/system/jobinfo/index.vue
@@ -1,5 +1,6 @@
 <template>
   <ContentWrap>
+    <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="title">
+      <el-form-item label="" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入汇报标题"
@@ -17,7 +18,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="汇报人姓名" prop="jobName">
+      <el-form-item label="" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
           placeholder="请输入汇报人姓名"
@@ -36,15 +37,11 @@
           @click="openForm('create')"
           v-hasPermi="['system:job-info:create']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
         </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="title" />
       <el-table-column label="汇报日期" :formatter="dateFormatter2" align="center" prop="jobDate" />
@@ -99,12 +96,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>
 
   <!-- 表单弹窗：添加/修改 -->
diff --git a/src/views/task/createEnterprise2.vue b/src/views/task/createEnterprise2.vue
index 71f619e..ed5ad69 100644
--- a/src/views/task/createEnterprise2.vue
+++ b/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 {