Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-mobile

env/.env.production

@@ -6,4 +6,4 @@ VITE_DELETE_CONSOLE = true
 VITE_SHOW_SOURCEMAP = false
 
 # 后台请求地址
-# VITE_SERVER_BASEURL = 'https://prod.xxx.com'
+VITE_SERVER_BASEURL = 'http://39.164.159.226:8088'

src/App.ku.vue

@@ -11,8 +11,7 @@ onShow(() => {
   // 所以这里需要判断一下，如果是 '/' 就当做首页，也要显示 tabbar
   if (path === '/') {
     isCurrentPageTabbar.value = true
-  }
-  else {
+  } else {
     isCurrentPageTabbar.value = isPageTabbar(path)
   }
 })
@@ -21,6 +20,10 @@ const helloKuRoot = ref('Hello AppKuVue')
 
 const exposeRef = ref('this is form app.Ku.vue')
 
+const handleAIClick = () => {
+  console.log('点击了')
+}
+
 defineExpose({
   exposeRef,
 })
@@ -32,9 +35,32 @@ defineExpose({
     <view class="hidden text-center">
       {{ helloKuRoot }}，这里可以配置全局的东西
     </view>
-
     <KuRootView />
-
     <FgTabbar v-if="isCurrentPageTabbar" />
+    <view class="ai-icon" @click="handleAIClick">
+      <image src="/src/assets/AIimgs.gif" mode="aspectFit" />
+    </view>
   </view>
 </template>
+
+<style lang="scss" scoped>
+.ai-icon {
+  position: fixed;
+  bottom: 110rpx;
+  right: 20rpx;
+  z-index: 9999;
+  width: 120rpx;
+  height: 120rpx;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.ai-icon image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+</style>

src/components/jiayiList/index.vue

@@ -76,9 +76,16 @@ function navigateToDetail(item) {
     urlParams += `&delayId=${item.delayId}`
   }
   if (item.detailType === 'task') {
-    uni.navigateTo({
-      url: `/pages/schedule/details/index?taskId=${item.taskId}`
-    })
+    if(item.taskId){
+      uni.navigateTo({
+        url: `/pages/schedule/details/index?id=${item.taskId}`
+      })
+    } else {
+      uni.showToast({
+        title: '任务ID不存在',
+        icon: 'none',
+      })
+    }
   } else {
     uni.navigateTo({
       url: `/pages/archive/order/detail${urlParams}`
@@ -151,9 +158,9 @@ function getStatusStyle(statusName: string) {
           </view>
           
           <!-- 第三行：用户名和创建时间 -->
-          <view class="flex justify-between items-center">
-            <text class="text-sm text-gray-600">{{ item.userName }}</text>
-            <text class="text-sm text-gray-600">{{ item.createTime }}</text>
+          <view class="flex items-center">
+            <text class="text-sm text-gray-600 flex-1 min-w-0 overflow-hidden text-ellipsis whitespace-nowrap pr-2">{{ item.userName }}</text>
+            <text class="text-sm text-gray-600 w-20 text-right">{{ item.createTime.split(' ')[0] }}</text>
           </view>
         </view>
       </wd-card>
@@ -240,7 +247,7 @@ function getStatusStyle(statusName: string) {
 
 .action-buttons {
   position: fixed;
-  bottom: 32rpx;
+  bottom:150rpx;
   right: 32rpx;
   display: flex;
   flex-direction: column;

src/pages/archive/HSSE/HSSEDrill.vue

@@ -1,13 +1,314 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '应急演练'
 })
+const typeDataData = ref<any>({
+  HSSEDrill: 'hsse_management',
+})
+// 应急演练数据接口
+interface HSSEDrill {
+  id: number
+  checkName: string
+  isTask: number
+  foundProblem: string
+  tags: string
+  suggestion: string
+  mainHarm: string
+  riskLevel: number
+  rectifyDeadline: string
+  problemImages: string
+  ccTo: string
+  registerType: string
+  checkStartTime: string
+  checkEndTime: string
+  stationId: number
+  executorName: string
+  createType: number
+  completionStatus: number
+}
+
+// 任务列表数据
+const listData = ref<HSSEDrill[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+// 筛选相关变量
+const filterStationId = ref('')
+const filterCheckStartTime = ref('')
+const filterCheckEndTime = ref('')
+const taskName = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '逾期完成' },
+  { value: '2', label: '按时完成' }
+])
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  
+  if (type === 'start') {
+    filterCheckStartTime.value = formattedDate
+  } else {
+    filterCheckEndTime.value = formattedDate
+  }
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    // 构建请求参数
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    // 添加筛选条件
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterCheckStartTime.value) {
+      params.checkStartTime = filterCheckStartTime.value
+    }
+    if (filterCheckEndTime.value) {
+      params.checkEndTime = filterCheckEndTime.value
+    }
+    if (taskName.value) {
+      params.taskName = taskName.value
+    }
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    
+    const response = await http.get<{ rows: any[], total: number }>('/formEmergencyDrill/drill/list', params)
+    const newData = response.rows || []
+    
+    // 转换数据格式为组件所需的格式
+    const formattedData = newData.map(item => ({
+      detailType: 'hsseDrill',
+      id: item.id,
+      taskId: item.id,
+      button: '',
+      title: item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: item.completionStatus === 0 ? 'bg-green-100 text-green-800' : item.completionStatus === 1 ? 'bg-red-100 text-red-800' : item.completionStatus === 2 ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800',
+      userName: item.executorName + '/' + item.stationName || '',
+      createTime: item.processTime || item.checkTime || '',
+      createType: item.createType || 0,
+      completionStatus: item.completionStatus || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    // 检查是否还有更多数据
+    hasMore.value = (newData || []).length === 10
+    // 增加页码
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+// 处理刷新
+function handleRefresh() {
+  fetchTaskList()
+}
+
+// 处理加载更多
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+// 筛选相关方法
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  // 重新获取数据，应用筛选条件
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  // 清空所有筛选条件
+  filterStationId.value = ''
+  filterCheckStartTime.value = ''
+  filterCheckEndTime.value = ''
+  taskName.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+}
+
+// 页面加载时获取数据
+onMounted(() => {})
+
+// 页面显示时刷新数据
+onPageShow(() => {
+  // 从详情页返回时刷新数据
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">应急演练页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 检查名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text> 
+            <wd-input v-model="taskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 检查开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">检查开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterCheckStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 检查结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">检查结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterCheckEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/HSSE/HSSELedger.vue

@@ -1,13 +1,353 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '安全隐患台账'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  HSSELedger:'hsse_management',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    // params.isComplete = 0
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formHiddenDangerRegister/register/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorIdName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
+// 导航到新增页面
+function navigateToAddPage() {
+  uni.navigateTo({
+    url: '/pages/archive/HSSE/addHSSELedger'
+  })
+}
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">安全隐患台账页面</text>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
+    
+    <!-- 底部悬浮新增按钮 -->
+    <view class="fixed bottom-0 left-0 right-0">
+      <wd-button 
+        type="primary" 
+        size="large" 
+        @click="navigateToAddPage"
+        class="w-full"
+      >
+        新增
+      </wd-button>
     </view>
   </view>
-</template>
+</template>

src/pages/archive/HSSE/addHSSELedger.vue

@@ -0,0 +1,428 @@
+<script setup lang="ts">
+import { ref, onMounted, reactive } from 'vue'
+import { http } from '@/utils/request'
+
+// 页面配置
+uni.setNavigationBarTitle({
+  title: '添加隐患台账'
+})
+
+// 表单数据
+const formData = reactive({
+  stationId: '',
+  checkName: '',
+  isTask:1,
+  foundProblem: '',
+  tags: '',
+  suggestion: '',
+  mainHarm: '',
+  riskLevel: 0,
+  rectifyDeadline: '',
+  problemImages: '',
+  ccTo: '',
+  executorId: ''
+})
+
+// 加油站列表
+const stationList = ref<any[]>([])
+// 加油站选择器列
+const stationColumns = ref<any[]>([])
+
+// 下拉框数据
+const riskLevelList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '低' },
+  { value: '1', label: '中' },
+  { value: '2', label: '高' }
+])
+const isTaskList = ref<Array<{ value: string; label: string }>>([
+  { value: '1', label: '是' }
+])
+const tagsList = ref<Array<{ value: string; label: string }>>([])
+
+// 用户列表（用于执行人选择）
+const executorList = ref<any[]>([])
+// 执行人选择器列
+const executorColumns = ref<any[]>([])
+
+// 用户列表（用于抄送人选择）
+const userList = ref<any[]>([])
+// 抄送人选择器列
+const userColumns = ref<any[]>([])
+// 选中的用户
+const selectedUsers = ref<any[]>([])
+
+// 附件上传
+const uploadFiles = ref<any[]>([])
+const uploadLoading = ref(false)
+
+// 页面状态
+const loading = ref(false)
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response
+    // 转换为选择器列格式
+    stationColumns.value = response.map(item => ({
+      value: item.id,
+      label: item.stationName
+    }))
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+    uni.showToast({
+      title: '获取加油站列表失败',
+      icon: 'none'
+    })
+  }
+}
+
+// 获取执行人列表
+async function fetchExecutorList() {
+  try {
+    if (!formData.stationId) {
+      return
+    }
+    const response = await http.get<any[]>('/system/user/stationList', {
+      stationId: formData.stationId
+    })
+    executorList.value = response
+    console.log(response)
+    
+    // 转换为选择器列格式
+    executorColumns.value = response.map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+     // 转换为选择器列格式
+    userColumns.value = response.map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  } catch (error) {
+    console.error('获取执行人列表失败:', error)
+    uni.showToast({
+      title: '获取执行人列表失败',
+      icon: 'none'
+    })
+  }
+}
+
+
+
+// 获取标签列表
+async function fetchTagsList() {
+  try {
+    const response = await http.get<any[]>('/system/dict/data/type/ledger_tag')
+    // 转换为选择器列格式
+    tagsList.value = response.map(item => ({
+      value: item.dictCode,
+      label: item.dictLabel
+    }))
+  } catch (error) {
+    console.error('获取标签列表失败:', error)
+    uni.showToast({
+      title: '获取标签列表失败',
+      icon: 'none'
+    })
+  }
+}
+
+// 处理加油站选择
+function handleStationConfirm({ value }: { value: string }) {
+  formData.stationId = value
+  fetchExecutorList()
+}
+
+// 处理执行人选择
+function handleExecutorConfirm({ value }: { value: string }) {
+  formData.executorId = value
+}
+
+// 处理风险度选择
+function handleRiskLevelConfirm({ value }: { value: string }) {
+  formData.riskLevel = parseInt(value)
+}
+
+// 处理是否转任务选择
+function handleIsTaskConfirm({ value }: { value: string }) {
+  formData.isTask = parseInt(value)
+}
+
+// 处理标签选择
+function handleTagsConfirm({ value }: { value: string }) {
+  formData.tags = value
+}
+
+// 处理时间选择
+function handleDateConfirm(date: any) {
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    const hours = String(dateObj.getHours()).padStart(2, '0')
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0')
+    const seconds = String(dateObj.getSeconds()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    const hours = String(dateObj.getHours()).padStart(2, '0')
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0')
+    const seconds = String(dateObj.getSeconds()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+  }
+  formData.rectifyDeadline = formattedDate
+}
+
+// 处理附件上传
+async function handleSuccess(data: any) {
+  console.log('上传成功:', data.fileList)
+
+  // 更新上传文件列表
+  uploadFiles.value = data.fileList
+  // 更新附件字段，取 fileName
+  const fileNames = uploadFiles.value.map(f => {
+    try {
+      const response = JSON.parse(f.response)
+      return response.data.fileName
+    } catch (error) {
+      console.error('解析文件响应失败:', error)
+      return ''
+    }
+  }).filter(Boolean)
+  console.log('fileNames:', fileNames)
+  formData.problemImages = fileNames.join(',')
+}
+
+// 处理附件删除
+function handleRemoveFile(file: any) {
+  const index = uploadFiles.value.findIndex(f => f.url === file.url)
+  if (index !== -1) {
+    uploadFiles.value.splice(index, 1)
+    // 更新附件字段，取 fileName
+    const fileNames = uploadFiles.value.map(f => {
+      try {
+        const response = JSON.parse(f.response)
+        return response.data.fileName
+      } catch (error) {
+        console.error('解析文件响应失败:', error)
+        return ''
+      }
+    }).filter(Boolean)
+    
+    formData.problemImages = fileNames.join(',')
+  }
+}
+
+
+// 提交表单
+async function submitForm() {
+  // 验证表单
+  if (!formData.stationId) {
+    uni.showToast({ title: '请选择检查油站', icon: 'none' })
+    return
+  }
+  if (!formData.checkName) {
+    uni.showToast({ title: '请填写检查名称', icon: 'none' })
+    return
+  }
+  if (!formData.foundProblem) {
+    uni.showToast({ title: '请填写发现问题描述', icon: 'none' })
+    return
+  }
+  if (!formData.rectifyDeadline) {
+    uni.showToast({ title: '请选择整改截止时间', icon: 'none' })
+    return
+  }
+  
+  loading.value = true
+  formData.ccTo = formData.ccTo.join(',')
+  try {
+    // 提交表单数据
+    await http.post('/formHiddenDangerRegister/register', formData)
+    uni.showToast({
+      title: '添加隐患台账成功',
+      icon: 'success'
+    })
+    
+    // 跳转回上一页
+    setTimeout(() => {
+      uni.navigateBack()
+    }, 1500)
+  } catch (error) {
+    console.error('提交表单失败:', error)
+    uni.showToast({
+      title: '提交表单失败',
+      icon: 'none'
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  fetchStationList()
+  fetchTagsList()
+})</script>
+
+<template>
+  <view class="page min-h-screen bg-gray-100">
+    <view class="bg-white rounded-lg p-4 shadow-sm">
+      <!-- 检查油站 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">
+          <text class="text-red-500">*</text> 检查油站
+        </text>
+        <wd-picker 
+          :columns="[stationColumns]" 
+          v-model="formData.stationId" 
+          @confirm="handleStationConfirm"
+        />
+      </view>
+      
+      <!-- 检查名称 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">
+          <text class="text-red-500">*</text> 检查名称
+        </text>
+        <wd-input v-model="formData.checkName" placeholder="请输入检查名称" />
+      </view>
+      
+      <!-- 执行人 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">执行人</text>
+        <wd-picker 
+          :columns="[executorColumns]" 
+          v-model="formData.executorId" 
+          @confirm="handleExecutorConfirm"
+        />
+      </view>
+      
+      <!-- 是否转任务 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">是否转任务</text>
+        <wd-picker 
+          :columns="[isTaskList]" 
+          v-model="formData.isTask" 
+          @confirm="handleIsTaskConfirm"
+        />
+      </view>
+      
+      <!-- 发现问题描述 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">
+          <text class="text-red-500">*</text> 发现问题描述
+        </text>
+        <wd-input 
+          v-model="formData.foundProblem" 
+          placeholder="请输入发现问题描述" 
+          type="textarea" 
+          rows="4"
+        />
+      </view>
+      
+      <!-- 标签 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">标签</text>
+        <wd-picker 
+          :columns="[tagsList]" 
+          v-model="formData.tags" 
+          @confirm="handleTagsConfirm"
+        />
+      </view>
+      
+      <!-- 处理建议 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">处理建议</text>
+        <wd-input 
+          v-model="formData.suggestion" 
+          placeholder="请输入处理建议" 
+          type="textarea" 
+          rows="3"
+        />
+      </view>
+      
+      <!-- 主要危害描述 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">主要危害描述</text>
+        <wd-input 
+          v-model="formData.mainHarm" 
+          placeholder="请输入主要危害描述" 
+          type="textarea" 
+          rows="3"
+        />
+      </view>
+      
+      <!-- 风险度 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">风险度</text>
+        <wd-picker 
+          :columns="[riskLevelList]" 
+          v-model="formData.riskLevel" 
+          @confirm="handleRiskLevelConfirm"
+        />
+      </view>
+      
+      <!-- 整改截止时间 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">
+          <text class="text-red-500">*</text> 整改截止时间
+        </text>
+        <wd-calendar 
+          v-model="formData.rectifyDeadline" 
+          @confirm="handleDateConfirm" 
+        />
+      </view>
+      
+      <!-- 问题图片 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">问题图片</text>
+        <wd-upload 
+          v-model:file-list="uploadFiles" 
+          action="/common/upload"
+          @success="handleSuccess" 
+          @remove="handleRemoveFile"
+          :loading="uploadLoading"
+          multiple
+          accept="image/*"
+        />
+      </view>
+      
+
+      
+      <!-- 抄送人 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">抄送人</text>
+        <wd-select-picker 
+          v-model="formData.ccTo" 
+          :columns="userColumns" 
+          placeholder="请选择人员"
+        />
+      </view>
+      
+      <!-- 提交按钮 -->
+      <view class="mt-8 flex justify-center">
+        <wd-button 
+          type="primary" 
+          size="large" 
+          @click="submitForm"
+          :loading="loading"
+        >
+          添加隐患台账
+        </wd-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.page {
+  padding-bottom: 100rpx;
+}
+</style>

src/pages/archive/cpns/checkTask.vue

@@ -57,7 +57,9 @@ const typeDataData = ref<any>({
   financeInspect:"financial",
   personnelInspect:"human_resources",
   visitorInspect:"visitor_feedback",
-  visitorTemporary:"visitor_feedback"
+  visitorTemporary:"visitor_feedback",
+  headOfficeInspect:'headquarters_area',
+  headOfficeAreaInspect:'headquarters_area',
 })
 // 下拉框数据
 const stationList = ref<Array<{ value: string; label: string }>>([])
@@ -172,9 +174,13 @@ async function fetchTaskList(isLoadMore = false) {
     }
     // params.isComplete = 0
     params.directoryType = typeDataData.value[perms.value]
-    if (perms.value === 'operatExcept') {
-      params.isAbnormal = 1
+    if (perms.value === 'headOfficeInspect') {
+       params.type='headquarters_check'
     }
+    if (perms.value === 'headOfficeAreaInspect') {
+      params.type='area_check'
+    }
+
     const response = await http.get<{ rows: any[], total: number }>('/taskCheck/check/list', params)
     const newData = response.rows || []   
     
@@ -188,7 +194,7 @@ async function fetchTaskList(isLoadMore = false) {
       statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
       statusClass: item.completionStatus === 0 ? 'bg-yellow-100 text-yellow-800' : item.completionStatus === 1 ? 'bg-red-100 text-red-800' : 'bg-green-100 text-green-800',
       userName: item.executorName+ '/' + item.stationName || '',
-      createTime: item.createTime || '',
+      createTime: item.processTime || item.createTime || '',
     }))
     
     if (isLoadMore) {
@@ -264,20 +270,6 @@ function handleReset() {
       @reset="handleReset"
       @load-more="handleLoadMore"
     >
-      <template #default="{ item }">
-        <view class="p-4 bg-white border-b border-gray-200">
-          <view class="flex justify-between items-center mb-2">
-            <text class="text-lg font-medium">{{ item.taskName }}</text>
-            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
-              {{ item.statusName }}
-            </text>
-          </view>
-          <view class="flex justify-between items-center text-sm text-gray-600">
-            <text>执行人：{{ item.executorName }}</text>
-            <text>{{ item.createTime }}</text>
-          </view>
-        </view>
-      </template>
       <template #filter-content>
         <view class="p-4">
           <view class="text-lg font-medium mb-4">筛选条件</view>

src/pages/archive/headOffice/headOfficeAreaInspect.vue

@@ -1,12 +1,333 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '片区检查'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  headOfficeAreaInspect:'headquarters_area',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formMeetingRecords/records/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">片区检查页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/headOffice/headOfficeAreaMeet.vue

@@ -1,12 +1,333 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
-  title: '片区会议'
+  title: '油站例会'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  headOfficeAreaMeet:'headquarters_area',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formMeetingRecords/records/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">片区会议页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/headOffice/headOfficeInspect.vue

@@ -1,12 +1,333 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '总部检查'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  headOfficeInspect:'headquarters_area',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formMeetingRecords/records/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">总部检查页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/headOffice/headOfficeStation.vue

@@ -1,12 +1,333 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '油站抽检'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  headOfficeStation:'headquarters_area',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formParticipationRecord/record/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">油站抽检页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/index.vue

@@ -2,7 +2,11 @@
 import { onMounted, ref } from 'vue'
 import { http } from '@/utils/request'
 import { toLoginPage } from '@/utils/toLoginPage'
+import { onPageShow } from '@dcloudio/uni-app'
 
+onPageShow(() => {
+  fetchMenuData()
+})
 
 definePage({
   // 使用 type: "home" 属性设置首页，其他页面不需要设置，默认为page
@@ -101,7 +105,6 @@ async function fetchMenuData() {
     loading.value = false
   }
 }
-
 // 处理菜单项点击
 function handleMenuItemClick(menu: MenuItem) {
   console.log(menu)
@@ -124,12 +127,6 @@ function handleMenuItemClick(menu: MenuItem) {
     })
   }
 }
-onMounted(async () => {
-  // fetchMenuData()
-})
-onLoad(async () => {
-  fetchMenuData()
-})
 </script>
 
 <template>

src/pages/archive/operat/operatComplain.vue

@@ -1,13 +1,298 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '客户投诉'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+}
+const typeDataData = ref<any>({
+  operatComplain:'operational',
+})
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '逾期完成' },
+  { value: '2', label: '按时完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/taskCustomerComplaint/complaint/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.complaintChannelName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorIdName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">客户投诉页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
-</template>
+</template>

src/pages/archive/operat/operatLicenses.vue

@@ -1,13 +1,337 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '证照任务管理'
 })
+
+// 证照任务数据接口
+interface LicenseTask {
+  id: number
+  licenseName: string
+  taskType: string
+  taskName: string
+  executorName: string
+  stationId: number
+  createType: number
+  deadline: string
+  processTime: string
+  completionStatus: number
+}
+const typeDataData = ref<any>({
+  operatLicenses:'operational',
+})
+// 任务列表数据
+const listData = ref<LicenseTask[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const filterLicenseName = ref('')
+const filterTaskType = ref('')
+
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '逾期完成' },
+  { value: '2', label: '按时完成' }
+])
+const taskTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '年审任务', label: '年审任务' },
+  { value: '换证任务', label: '换证任务' }
+])
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    // 构建请求参数
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    // 添加筛选条件
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    if (filterLicenseName.value) {
+      params.licenseName = filterLicenseName.value
+    }
+    if (filterTaskType.value) {
+      params.taskType = filterTaskType.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formLicense/license/list', params)
+    const newData = response.rows || []
+    
+    // 转换数据格式为组件所需的格式
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: item.completionStatus === 0 ? 'bg-green-100 text-green-800' : item.completionStatus === 1 ? 'bg-red-100 text-red-800' : 'bg-green-100 text-green-800',
+      userName: item.executorIdName || '',
+      createTime: item.deadline || '',
+      licenseName: item.licenseName || '',
+      taskType: item.taskType || ''
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    // 检查是否还有更多数据
+    hasMore.value = (newData || []).length === 10
+    // 增加页码
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+// 处理刷新
+function handleRefresh() {
+  fetchTaskList()
+}
+
+// 处理加载更多
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+// 筛选相关方法
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  // 重新获取数据，应用筛选条件
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  // 清空所有筛选条件
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+  filterLicenseName.value = ''
+  filterTaskType.value = ''
+}
+
+// 页面加载时获取数据
+onMounted(() => {})
+
+// 页面显示时刷新数据
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">证照任务管理页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 证照名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">证照名称</text>
+            <wd-input v-model="filterLicenseName" placeholder="请输入证照名称" />
+          </view>
+          
+          <!-- 任务类型 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务类型</text>
+            <wd-picker 
+              :columns="[taskTypeList]" 
+              v-model="filterTaskType" 
+            />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/operat/operatManage.vue

@@ -8,7 +8,9 @@ import { http } from '@/utils/request'
 definePage({
   title: '管理计划'
 })
-
+const typeDataData = ref<any>({
+  operatManage:'operational',
+})
 onPageShow(() => {
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
@@ -152,6 +154,7 @@ async function fetchTaskList(isLoadMore = false) {
     if (filterTaskName.value) {
       params.taskName = filterTaskName.value
     }
+    params.directoryType = typeDataData.value[perms.value]
     // params.isComplete = 0
     const response = await http.get<{ rows: any[], total: number }>('/formManagementPlan/plan/list', params)
     const newData = response.rows || []   

src/pages/archive/operat/operatMeet.vue

@@ -1,13 +1,333 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '油站例会'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  operatMeet:'operational',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formMeetingRecords/records/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">油站例会页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
-</template>
+</template>

src/pages/archive/operat/operatPlan.vue

@@ -8,7 +8,9 @@ import { http } from '@/utils/request'
 definePage({
   title: '经营计划'
 })
-
+const typeDataData = ref<any>({
+  operatPlan:'operational',
+})
 onPageShow(() => {
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
@@ -152,6 +154,7 @@ async function fetchTaskList(isLoadMore = false) {
     if (filterTaskName.value) {
       params.taskName = filterTaskName.value
     }
+    params.directoryType = typeDataData.value[perms.value]
     // params.isComplete = 0
     const response = await http.get<{ rows: any[], total: number }>('/formBusinessPlan/plan/list', params)
     const newData = response.rows || []   

src/pages/archive/operat/operatPrice.vue

@@ -51,14 +51,7 @@ const filterSurveyDateStart = ref('')
 const filterSurveyDateEnd = ref('')
 const filterTaskName = ref('')
 const typeDataData = ref<any>({
-  operatInspect:'operational',
-  operatExcept:'operational',
-  HSSEInspect: 'hsse_management',
-  qualityInspect:'data_quality',
-  financeInspect:"financial",
-  personnelInspect:"human_resources",
-  visitorInspect:"visitor_feedback",
-  visitorTemporary:"visitor_feedback"
+  operatPrice:'operational',
 })
 // 下拉框数据
 const stationList = ref<Array<{ value: string; label: string }>>([])
@@ -182,9 +175,7 @@ async function fetchTaskList(isLoadMore = false) {
     }
     // params.isComplete = 0
     params.directoryType = typeDataData.value[perms.value]
-    if (perms.value === 'operatExcept') {
-      params.isAbnormal = 1
-    }
+
     const response = await http.get<{ data: any[], total: number }>('/formCompetitorMarketingSurvey/survey/list', params)
     const newData = response.data || []   
     

src/pages/archive/operat/operatSales.vue

@@ -48,14 +48,7 @@ const filterSurveyDateStart = ref('')
 const filterSurveyDateEnd = ref('')
 const filterTaskName = ref('')
 const typeDataData = ref<any>({
-  operatInspect:'operational',
-  operatExcept:'operational',
-  HSSEInspect: 'hsse_management',
-  qualityInspect:'data_quality',
-  financeInspect:"financial",
-  personnelInspect:"human_resources",
-  visitorInspect:"visitor_feedback",
-  visitorTemporary:"visitor_feedback"
+  operatSales:'operational',
 })
 // 下拉框数据
 const stationList = ref<Array<{ value: string; label: string }>>([])
@@ -162,9 +155,6 @@ async function fetchTaskList(isLoadMore = false) {
       params.taskName = filterTaskName.value
     }
     params.directoryType = typeDataData.value[perms.value]
-    if (perms.value === 'operatExcept') {
-      params.isAbnormal = 1
-    }
     const response = await http.get<{ data: any[], total: number }>('/formCompetitorSalesSurvey/survey/list', params)
     const newData = response.rows || []   
     

src/pages/archive/operat/operatTeam.vue

@@ -1,13 +1,317 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '班组日志'
 })
+
+// 班组日志数据接口
+interface TeamLog {
+  id: number
+  taskName: string
+  executorName: string
+  stationId: number
+  createType: number
+  deadline: string
+  processTime: string
+  completionStatus: number
+  shiftDate: string
+  shiftId: string
+  weather: string
+  shiftLeaderName: string
+  shiftMembers: string
+}
+
+// 任务列表数据
+const listData = ref<TeamLog[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+const typeDataData = ref<any>({
+  operatTeam:'operational',
+})
+
+
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+const shiftIdList = ref<Array<{ value: string; label: string }>>([
+  { value: '早班', label: '早班' },
+  { value: '中班', label: '中班' },
+  { value: '晚班', label: '晚班' }
+])
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end' | 'shift') {
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else if (type === 'end') {
+    filterProcessEndTime.value = formattedDate
+  }
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    // 构建请求参数
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    // 添加筛选条件
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    const response = await http.get<{ rows: any[], total: number }>('/formTeamShiftLog/log/list', params)
+    const newData = response.rows || []
+    
+    // 转换数据格式为组件所需的格式
+    const formattedData = newData.map(item => ({
+      detailType: 'tasd',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: item.completionStatus === 0 ? 'bg-green-100 text-green-800' : item.completionStatus === 1 ? 'bg-red-100 text-red-800' : 'bg-green-100 text-green-800', 
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.processTime || item.shiftDate || '',
+      shiftId: item.shiftId || '',
+      weather: item.weather || '',
+      shiftLeaderName: item.shiftLeaderName || ''
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    // 检查是否还有更多数据
+    hasMore.value = (newData || []).length === 10
+    // 增加页码
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+// 处理刷新
+function handleRefresh() {
+  fetchTaskList()
+}
+
+// 处理加载更多
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+// 筛选相关方法
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  // 重新获取数据，应用筛选条件
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  // 清空所有筛选条件
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
+// 页面加载时获取数据
+onMounted(() => {})
+
+// 页面显示时刷新数据
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">班组日志页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/operat/operatTurnIn.vue

@@ -48,14 +48,7 @@ const filterSurveyStartTime = ref('')
 const filterSurveyEndTime = ref('')
 const filterTaskName = ref('')
 const typeDataData = ref<any>({
-  operatInspect:'operational',
-  operatExcept:'operational',
-  HSSEInspect: 'hsse_management',
-  qualityInspect:'data_quality',
-  financeInspect:"financial",
-  personnelInspect:"human_resources",
-  visitorInspect:"visitor_feedback",
-  visitorTemporary:"visitor_feedback"
+  operatTurnIn:'operational',
 })
 // 下拉框数据
 const stationList = ref<Array<{ value: string; label: string }>>([])

src/pages/archive/operat/operatWeek.vue

@@ -48,14 +48,7 @@ const filterCreateType = ref('')
 const filterCompletionStatus = ref('')
 const filterTaskName = ref('')
 const typeDataData = ref<any>({
-  operatInspect:'operational',
-  operatExcept:'operational',
-  HSSEInspect: 'hsse_management',
-  qualityInspect:'data_quality',
-  financeInspect:"financial",
-  personnelInspect:"human_resources",
-  visitorInspect:"visitor_feedback",
-  visitorTemporary:"visitor_feedback"
+  operatWeek:'operational',
 })
 // 下拉框数据
 const stationList = ref<Array<{ value: string; label: string }>>([])
@@ -161,9 +154,7 @@ async function fetchTaskList(isLoadMore = false) {
       params.taskName = filterTaskName.value
     }
     params.directoryType = typeDataData.value[perms.value]
-    if (perms.value === 'operatExcept') {
-      params.isAbnormal = 1
-    }
+
     const response = await http.get<{ rows: any[], total: number }>('/formOperationalWeeklyReport/report/list', params)
     const newData = response.rows || []   
     

src/pages/archive/order/creatOrder.vue

@@ -13,9 +13,16 @@ const formData = reactive({
   phone: '',
   content: '',
   attachments: '',
-  isSubmit: true
+  isSubmit: true,
+  urgency: '1'
 })
 
+// 紧急程度选项
+const urgencyOptions = ref([
+  { value: '1', label: '一般' },
+  { value: '2', label: '紧急' }
+])
+
 // 工单类型树形数据
 const ticketTypeTree = ref<any[]>([])
 // 选中的工单类型
@@ -111,6 +118,7 @@ async function fetchOrderDetail() {
     formData.content = response.content || ''
     formData.attachments = response.attachments || ''
     formData.isSubmit = false
+    formData.urgency = response.urgency || '1'
     
     // 处理附件
     if (response.attachmentsUrl) {
@@ -263,7 +271,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <view class="page min-h-screen bg-gray-100 p-4">
+  <view class="page min-h-screen bg-gray-100">
     <view class="bg-white rounded-lg p-4 shadow-sm">
       <!-- 工单类型 -->
       <view class="mb-6">
@@ -355,6 +363,16 @@ onMounted(() => {
         />
       </view>
       
+      <!-- 紧急程度 -->
+      <view class="mb-6">
+        <text class="block mb-2 font-medium">紧急程度</text>
+        <wd-picker 
+          :columns="[urgencyOptions]" 
+          v-model="formData.urgency" 
+          style="border-bottom: 1px solid rgba(0, 0, 0, 0.1);"
+        />
+      </view>
+      
       <!-- 是否提交 -->
       <view class="mb-6">
         <text class="block mb-2 font-medium">是否提交</text>

src/pages/archive/quality/qualityAdditive.vue

@@ -1,12 +1,334 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
-  title: '添加剂库存表'
+  title: '添加剂库存'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  qualityAdditive:'data_quality',
+})
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+
+    const response = await http.get<{ rows: any[], total: number }>('/formAdditiveInventory/inventory/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">添加剂库存表页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/quality/qualityOilGun.vue

@@ -1,13 +1,336 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
-  title: '油枪自检损益表'
+  title: '油枪自检'
+})
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  qualityOilGun:'data_quality',
 })
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    if (perms.value === 'operatExcept') {
+      params.isAbnormal = 1
+    }
+    const response = await http.get<{ rows: any[], total: number }>('/formGunSelfCheck/check/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">油枪自检损益表页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/quality/qualityTestWater.vue

@@ -1,13 +1,336 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
-  title: '添加剂库存'
+  title: '量缸试水记录'
+})
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+const typeDataData = ref<any>({
+  qualityTestWater:'data_quality',
 })
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    params.directoryType = typeDataData.value[perms.value]
+    if (perms.value === 'operatExcept') {
+      params.isAbnormal = 1
+    }
+    const response = await http.get<{ rows: any[], total: number }>('/formTankWater/water/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
 
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">添加剂库存</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/station/stationCar.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">车辆信息</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationExtinguisher.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">灭火器档案页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationFilter.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">过滤器档案页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationFirstAidKit.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">急救箱档案页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationHandover.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">站长交接</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationLicenses.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">证照档案页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationOilGun.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">油枪管理页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationOpponent.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">竞争对手档案</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/station/stationProtection.vue

@@ -4,9 +4,16 @@ definePage({
 })
 </script>
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">应急防护档案页面</text>
+  <view class="page min-h-screen bg-gradient-to-br from-blue-50 to-indigo-50 flex items-center justify-center p-8">
+    <view class="text-center max-w-md">
+      <view class="w-24 h-24 bg-blue-100 rounded-full flex items-center justify-center mx-auto mb-8 animate-pulse">
+        <wd-icon name="laptop" size="48" color="#3b82f6" />
+      </view>
+      <text class="text-2xl font-bold text-gray-800 mb-4 block">功能开发中</text>
+      <text class="text-gray-500 mb-8 block">该功能正在紧张开发中，敬请期待！</text>
+      <view class="flex justify-center space-x-4">
+        <wd-button size="small" type="default" @click="uni.navigateBack()">返回</wd-button>
+      </view>
     </view>
   </view>
 </template>

src/pages/archive/temporary/temporaryStation.vue

@@ -1,12 +1,335 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '场站新增'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    
+    if (perms.value === 'temporaryStation') {
+      params.taskType = 'oil_station_add'
+      params.taskStatusStr = '3'
+    }
+    
+    const response = await http.get<{ rows: any[], total: number }>('/scheduleTasks/tasks/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">场站新增页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/archive/temporary/temporaryVisitor.vue

@@ -1,12 +1,334 @@
 <script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onPageShow } from '@dcloudio/uni-app'
+
+import JiayiList from '@/components/jiayiList/index.vue'
+import { http } from '@/utils/request'
+
 definePage({
   title: '访客新增'
 })
+
+onPageShow(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options.perms) {
+    perms.value = currentPage.options.perms as string
+    console.log('收到的 perms 参数:', perms.value)
+    fetchTaskList()
+    fetchStationList()
+  }
+})
+
+// 任务数据接口
+interface Task {
+  id: number
+  taskName: string
+  completionStatus: number
+  executorName: string
+  createTime: string
+  stationId: number
+  createType: number
+  processTime: string
+  meetingTheme: string
+  meetingHost: string
+  meetingLocation: string
+  attendeesCount: number
+  totalCount: number
+}
+
+// 任务列表数据
+const listData = ref<Task[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageNum = ref(1)
+const hasMore = ref(true)
+const perms = ref('')
+
+// 筛选相关变量
+const filterStationId = ref('')
+const filterProcessStartTime = ref('')
+const filterProcessEndTime = ref('')
+const filterCreateType = ref('')
+const filterCompletionStatus = ref('')
+const filterTaskName = ref('')
+// 下拉框数据
+const stationList = ref<Array<{ value: string; label: string }>>([])
+const createTypeList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '系统' },
+  { value: '1', label: '新增' }
+])
+const completionStatusList = ref<Array<{ value: string; label: string }>>([
+  { value: '0', label: '待完成' },
+  { value: '1', label: '按时完成' },
+  { value: '2', label: '逾期完成' }
+])
+
+// 时间选择器相关
+const showStartTimePicker = ref(true)
+const showEndTimePicker = ref(true)
+const calendarValue = ref('')
+
+// 获取加油站列表
+async function fetchStationList() {
+  try {
+    const response = await http.get<any[]>('/sysStation/station/selectAllSysStationList')
+    stationList.value = response.map(item => ({
+      value: item.id.toString(),
+      label: item.stationName || ''
+    }))
+    console.log(stationList.value)
+  } catch (error) {
+    console.error('获取加油站列表失败:', error)
+  }
+}
+
+// 处理时间选择确认
+function handleConfirm(date: any, type: 'start' | 'end') {
+  console.log('确认日期:', date)
+  
+  let formattedDate = ''
+  if (typeof date === 'object' && date.value) {
+    const dateObj = new Date(date.value)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'number') {
+    const dateObj = new Date(date)
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    formattedDate = `${year}-${month}-${day} 00:00:00`
+  } else if (typeof date === 'string') {
+    if (date.includes('T')) {
+      formattedDate = date.replace('T', ' ').substring(0, 19)
+    } else if (date.length === 10) {
+      formattedDate = date + ' 00:00:00'
+    } else {
+      formattedDate = date
+    }
+  }
+  console.log(formattedDate)
+  if (type === 'start') {
+    filterProcessStartTime.value = formattedDate
+  } else {
+    filterProcessEndTime.value = formattedDate
+  }
+  
+  calendarValue.value = formattedDate
+}
+
+// 获取任务列表数据
+async function fetchTaskList(isLoadMore = false) {
+  if (isLoadMore) {
+    loadingMore.value = true
+  } else {
+    loading.value = true
+    pageNum.value = 1
+    hasMore.value = true
+  }
+  try {
+    const params = {
+      pageSize: 10,
+      pageNum: pageNum.value,
+    }
+    if (filterStationId.value) {
+      params.stationId = filterStationId.value
+    }
+    if (filterProcessStartTime.value) {
+      params.processStartTime = filterProcessStartTime.value
+    }
+    
+    if (filterProcessEndTime.value) {
+      params.processEndTime = filterProcessEndTime.value
+    }
+    
+    if (filterCreateType.value) {
+      params.createType = filterCreateType.value
+    }
+    
+    if (filterCompletionStatus.value) {
+      params.completionStatus = filterCompletionStatus.value
+    }
+    
+    if (filterTaskName.value) {
+      params.taskName = filterTaskName.value
+    }
+    if (perms.value === 'temporaryVisitor') {
+      params.taskType = 'visitor_add'
+      params.taskStatusStr = '3'
+    }
+
+    const response = await http.get<{ rows: any[], total: number }>('/scheduleTasks/tasks/list', params)
+    const newData = response.rows || []   
+    
+    const formattedData = newData.map(item => ({
+      detailType: 'task',
+      id: item.id,
+      taskId: item.taskId,
+      button: '',
+      title: item.meetingTheme || item.taskName || '',
+      statusName: item.completionStatus === 0 ? '待完成' : item.completionStatus === 1 ? '逾期完成' : '按时完成',
+      statusClass: completionStatusList.value.find(status => status.value === item.completionStatus)?.value === '0' ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800',
+      userName: item.executorName+ '/' + item.stationName || '',
+      createTime: item.createTime || '',
+      meetingHost: item.meetingHost || '',
+      meetingLocation: item.meetingLocation || '',
+      attendeesCount: item.attendeesCount || 0,
+      totalCount: item.totalCount || 0
+    }))
+    
+    if (isLoadMore) {
+      listData.value = [...(listData.value || []), ...formattedData]
+    } else {
+      listData.value = formattedData
+    }
+    hasMore.value = (newData || []).length === 10
+    pageNum.value++
+  }
+  catch (error) {
+    uni.showToast({
+      title: '获取任务列表失败',
+      icon: 'none',
+    })
+  }
+  finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function handleRefresh() {
+  fetchTaskList()
+}
+
+function handleLoadMore() {
+  if (!loadingMore.value && hasMore.value) {
+    fetchTaskList(true)
+  }
+}
+
+function handleFilter() {
+  console.log('筛选数据')
+}
+
+function handleFilterConfirm() {
+  console.log('筛选确定')
+  fetchTaskList()
+}
+
+function handleFilterCancel() {
+  console.log('筛选取消')
+}
+
+function handleReset() {
+  console.log('重置筛选条件')
+  filterStationId.value = ''
+  filterProcessStartTime.value = ''
+  filterProcessEndTime.value = ''
+  filterCreateType.value = ''
+  filterCompletionStatus.value = ''
+  filterTaskName.value = ''
+}
+
 </script>
+
 <template>
-  <view class="page">
-    <view class="flex items-center justify-center h-full">
-      <text class="text-lg">访客新增页面</text>
-    </view>
+  <view class="page min-h-screen bg-gray-100">
+    <JiayiList
+      :data="listData"
+      @refresh="handleRefresh"
+      @filter="handleFilter"
+      @filter-confirm="handleFilterConfirm"
+      @filter-cancel="handleFilterCancel"
+      @reset="handleReset"
+      @load-more="handleLoadMore"
+    >
+      <template #default="{ item }">
+        <view class="p-4 bg-white border-b border-gray-200">
+          <view class="flex justify-between items-center mb-2">
+            <text class="text-lg font-medium">{{ item.title }}</text>
+            <text class="text-sm px-2 py-1 rounded" :class="item.statusClass">
+              {{ item.statusName }}
+            </text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>主持人：{{ item.meetingHost }}</text>
+            <text>地点：{{ item.meetingLocation }}</text>
+          </view>
+          <view class="flex justify-between items-center text-sm text-gray-600 mb-2">
+            <text>参会人数：{{ item.attendeesCount }}/{{ item.totalCount }}</text>
+            <text>{{ item.createTime }}</text>
+          </view>
+          <view class="flex justify-start items-center text-sm text-gray-600">
+            <text>执行人：{{ item.executorName }}</text>
+          </view>
+        </view>
+      </template>
+      <template #filter-content>
+        <view class="p-4">
+          <view class="text-lg font-medium mb-4">筛选条件</view>
+          
+          <!-- 任务名称搜索 -->
+          <view class="mb-4">
+            <text class="block mb-2">任务名称</text>
+            <wd-input v-model="filterTaskName" placeholder="请输入任务名称" />
+          </view>
+          
+          <!-- 加油站下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">加油站</text>
+            <wd-picker 
+              :columns="[stationList]" 
+              v-model="filterStationId" 
+            />
+          </view>
+          
+          <!-- 开始时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">开始时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessStartTime" 
+                @confirm="(date) => handleConfirm(date, 'start')" 
+                v-if="showStartTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 结束时间选择 -->
+          <view class="mb-4">
+            <text class="block mb-2">结束时间</text>
+            <view class="relative">
+              <wd-calendar 
+                v-model="filterProcessEndTime" 
+                @confirm="(date) => handleConfirm(date, 'end')" 
+                v-if="showEndTimePicker"
+              />
+            </view>
+          </view>
+          
+          <!-- 创建类型下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">创建类型</text>
+            <wd-picker 
+              :columns="[createTypeList]" 
+              v-model="filterCreateType" 
+            />
+          </view>
+          
+          <!-- 完成状态下拉框 -->
+          <view class="mb-4">
+            <text class="block mb-2">完成状态</text>
+            <wd-picker 
+              :columns="[completionStatusList]" 
+              v-model="filterCompletionStatus" 
+            />
+          </view>
+          
+        </view>
+      </template>
+    </JiayiList>
   </view>
 </template>

src/pages/schedule/view/addgasstation/index.vue

@@ -242,30 +242,35 @@ function handleSubmit() {
             .map((item) => JSON.parse(item.response).data.fileName)
             .filter(Boolean)
             .join(','),
-            executorIds: model.value.executorIds.map((item) =>JSON.parse(item)),
+          executorIds: model.value.executorIds.map((item) => JSON.parse(item)),
           // executors: model.value.executorIds.map((item) =>
           //   String(JSON.parse(item).userId)
           // ),
           ccReceivers: model.value.ccReceivers.join(','),
-
           // ccReceiversName: model.value.ccReceivers.map((item) =>
           //   String(JSON.parse(item).userId)
           // ),
         }
-        if (model.value.formType === 'photo' || model.value.formType === 'inspection') {
+        if (
+          model.value.formType === 'photo' ||
+          model.value.formType === 'inspection'
+        ) {
           delete submitData.templateId
         } else if (model.value.formType === '3') {
           // delete submitData.taskName
           // submitData.formType = ''
-          submitData.taskName = getTemplateListOptions.value.find((item) => item.id === Number(model.value.templateId))?.taskName || ''
+          submitData.taskName =
+            getTemplateListOptions.value.find(
+              (item) => item.id === Number(model.value.templateId)
+            )?.taskName || ''
         }
-        if(getoptions.value==='新增油站'){
+        if (getoptions.value === '新增油站') {
           //  submitData['executorIds']=model.value.executorIds.map((item) => JSON.parse(item))
-           delete submitData.stationId
-        }else if(getoptions.value==='新增访客'){
+          delete submitData.stationId
+        } else if (getoptions.value === '新增访客') {
           //  submitData['executorId']=model.value.executorIds.map((item) => JSON.parse(item))
           //  delete submitData.executorIds
-           submitData.stationId=model.value.stationId.join(',')
+          submitData.stationId = model.value.stationId.join(',')
         }
         const res = (await addtodoaskslist(submitData)) as any
         if (res?.code === 200) {

src/pages/schedule/view/index.vue

@@ -26,7 +26,7 @@ interface CalendarDate {
 const mainloing = ref(false)
 const GasStationId = ref('')
 const currentMonth = ref(new Date())
-const isExpanded = ref(true)
+const isExpanded = ref(false)
 const radioActive = ref('日')
 const selectedDate = ref(new Date())
 const overduedaylist = ref([]) as any // 逾期任务列表