diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 60b3262..7d8eae9 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -19,3 +19,11 @@
     responseType: 'blob',
   })
 }
+// 到期提醒趋势
+export function remindTrend(params: object) {
+  return request({
+    url: '/equipment/remind/trend',
+    method: 'get',
+    params,
+  })
+}

diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 60b3262..7d8eae9 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -19,3 +19,11 @@
     responseType: 'blob',
   })
 }
+// 到期提醒趋势
+export function remindTrend(params: object) {
+  return request({
+    url: '/equipment/remind/trend',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 73bfbf4..a32473e 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -23,6 +23,8 @@
   meterIdentify: string
   checkDateStart: string
   checkDateEnd: string
+  sort: string
+  orderBy: string
 }
 // 设备信息对象
 export interface IlistObjType {

diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 60b3262..7d8eae9 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -19,3 +19,11 @@
     responseType: 'blob',
   })
 }
+// 到期提醒趋势
+export function remindTrend(params: object) {
+  return request({
+    url: '/equipment/remind/trend',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 73bfbf4..a32473e 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -23,6 +23,8 @@
   meterIdentify: string
   checkDateStart: string
   checkDateEnd: string
+  sort: string
+  orderBy: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f962ae8..10be007 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -58,6 +58,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
+  sort: '',
+  orderBy: '',
 })
 const columns = ref([
   {
@@ -140,17 +142,6 @@
     align: 'center',
   },
 ])
-// 排序条件发生变化
-const sortChange = ({ column }: any) => {
-  if (column.order === 'ascending') {
-    console.log(column.prop)
-    console.log('升序')
-  }
-  else if (column.order === 'descending') {
-    console.log(column.prop)
-    console.log('倒叙')
-  }
-}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 // 聚合表格实例
@@ -178,6 +169,21 @@
     listLoading.value = false
   })
 }
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    listQuery.sort = 'asc'
+    // console.log(column.prop)
+    // console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    listQuery.sort = 'desc'
+    // console.log(column.prop)
+    // console.log('倒叙')
+  }
+  listQuery.orderBy = column.prop
+  fetchData()
+}
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
@@ -280,6 +286,8 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
+  listQuery.sort = ''
+  listQuery.orderBy = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()

diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 60b3262..7d8eae9 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -19,3 +19,11 @@
     responseType: 'blob',
   })
 }
+// 到期提醒趋势
+export function remindTrend(params: object) {
+  return request({
+    url: '/equipment/remind/trend',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 73bfbf4..a32473e 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -23,6 +23,8 @@
   meterIdentify: string
   checkDateStart: string
   checkDateEnd: string
+  sort: string
+  orderBy: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f962ae8..10be007 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -58,6 +58,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
+  sort: '',
+  orderBy: '',
 })
 const columns = ref([
   {
@@ -140,17 +142,6 @@
     align: 'center',
   },
 ])
-// 排序条件发生变化
-const sortChange = ({ column }: any) => {
-  if (column.order === 'ascending') {
-    console.log(column.prop)
-    console.log('升序')
-  }
-  else if (column.order === 'descending') {
-    console.log(column.prop)
-    console.log('倒叙')
-  }
-}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 // 聚合表格实例
@@ -178,6 +169,21 @@
     listLoading.value = false
   })
 }
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    listQuery.sort = 'asc'
+    // console.log(column.prop)
+    // console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    listQuery.sort = 'desc'
+    // console.log(column.prop)
+    // console.log('倒叙')
+  }
+  listQuery.orderBy = column.prop
+  fetchData()
+}
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
@@ -280,6 +286,8 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
+  listQuery.sort = ''
+  listQuery.orderBy = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
diff --git a/src/views/tested/device/remind/components/trend.vue b/src/views/tested/device/remind/components/trend.vue
new file mode 100644
index 0000000..94759ec
--- /dev/null
+++ b/src/views/tested/device/remind/components/trend.vue
@@ -0,0 +1,72 @@
+<!-- 到期提醒趋势 -->
+<script lang="ts" setup name="RemindTrend">
+import { remindTrend } from '@/api/eqpt/device/remind'
+const height = ref(document.body.clientHeight - 335)
+window.addEventListener('resize', () => {
+  const bodyHeight = document.body.clientHeight - 335
+  height.value = bodyHeight
+})
+const loadingMonth = ref(true)
+const dataMonth = ref([])
+const xAxisMonth = ref([])
+const loadingYear = ref(true)
+const dataYear = ref([])
+const xAxisYear = ref([])
+const fetchData = () => {
+  remindTrend({ type: 'month' }).then((res) => {
+    // 数据，格式为[{name:'系列名',data:[0,0,0,...0], color:'可选'},...]
+    xAxisMonth.value = res.data.map((item: any) => item.name)
+    dataMonth.value = [{
+      name: '月趋势',
+      data: res.data.map((item: any) => item.count),
+      color: '#2d8cf0',
+    }]
+    loadingMonth.value = false
+  })
+  remindTrend({ type: 'year' }).then((res) => {
+    // 数据，格式为[{name:'系列名',data:[0,0,0,...0], color:'可选'},...]
+    xAxisYear.value = res.data.map((item: any) => item.name)
+    dataYear.value = [{
+      name: '年趋势',
+      data: res.data.map((item: any) => item.count),
+      color: '#19be6b',
+    }]
+    loadingYear.value = false
+  })
+}
+fetchData()
+</script>
+
+<template>
+  <div style="padding: 10px;position: reactive;">
+    <!-- 月趋势 -->
+    <div :style="`height:${height / 2}px;width:100%;position: relative;`" class="container">
+      <div v-if="!loadingMonth" class="title">
+        未来1月在用设备到期趋势
+      </div>
+      <line-chart :loading="loadingMonth" :x-axis-data="xAxisMonth" :data="dataMonth" />
+    </div>
+    <!-- 年趋势 -->
+    <div :style="`height:${height / 2}px;width:100%;position: relative;margin-top:15px;`" class="container">
+      <div v-if="!loadingYear" class="title">
+        未来1年在用设备到期趋势
+      </div>
+      <line-chart :loading="loadingYear" :x-axis-data="xAxisYear" :data="dataYear" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  // position: ;
+
+  .title {
+    font-size: 18px;
+    font-weight: 700;
+    text-align: center;
+    position: absolute;
+    width: 100%;
+    top: 15px;
+  }
+}
+</style>

diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 60b3262..7d8eae9 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -19,3 +19,11 @@
     responseType: 'blob',
   })
 }
+// 到期提醒趋势
+export function remindTrend(params: object) {
+  return request({
+    url: '/equipment/remind/trend',
+    method: 'get',
+    params,
+  })
+}
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 73bfbf4..a32473e 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -23,6 +23,8 @@
   meterIdentify: string
   checkDateStart: string
   checkDateEnd: string
+  sort: string
+  orderBy: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f962ae8..10be007 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -58,6 +58,8 @@
   meterIdentify: '', // 计量标识
   checkDateEnd: '',
   checkDateStart: '',
+  sort: '',
+  orderBy: '',
 })
 const columns = ref([
   {
@@ -140,17 +142,6 @@
     align: 'center',
   },
 ])
-// 排序条件发生变化
-const sortChange = ({ column }: any) => {
-  if (column.order === 'ascending') {
-    console.log(column.prop)
-    console.log('升序')
-  }
-  else if (column.order === 'descending') {
-    console.log(column.prop)
-    console.log('倒叙')
-  }
-}
 // 切换表格标识   true:普通表格  false:聚合表格
 const tableFlage = ref(true)
 // 聚合表格实例
@@ -178,6 +169,21 @@
     listLoading.value = false
   })
 }
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    listQuery.sort = 'asc'
+    // console.log(column.prop)
+    // console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    listQuery.sort = 'desc'
+    // console.log(column.prop)
+    // console.log('倒叙')
+  }
+  listQuery.orderBy = column.prop
+  fetchData()
+}
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
@@ -280,6 +286,8 @@
   listQuery.checkDateEnd = ''
   listQuery.taskId = ''
   listQuery.meterIdentify = ''
+  listQuery.sort = ''
+  listQuery.orderBy = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
diff --git a/src/views/tested/device/remind/components/trend.vue b/src/views/tested/device/remind/components/trend.vue
new file mode 100644
index 0000000..94759ec
--- /dev/null
+++ b/src/views/tested/device/remind/components/trend.vue
@@ -0,0 +1,72 @@
+<!-- 到期提醒趋势 -->
+<script lang="ts" setup name="RemindTrend">
+import { remindTrend } from '@/api/eqpt/device/remind'
+const height = ref(document.body.clientHeight - 335)
+window.addEventListener('resize', () => {
+  const bodyHeight = document.body.clientHeight - 335
+  height.value = bodyHeight
+})
+const loadingMonth = ref(true)
+const dataMonth = ref([])
+const xAxisMonth = ref([])
+const loadingYear = ref(true)
+const dataYear = ref([])
+const xAxisYear = ref([])
+const fetchData = () => {
+  remindTrend({ type: 'month' }).then((res) => {
+    // 数据，格式为[{name:'系列名',data:[0,0,0,...0], color:'可选'},...]
+    xAxisMonth.value = res.data.map((item: any) => item.name)
+    dataMonth.value = [{
+      name: '月趋势',
+      data: res.data.map((item: any) => item.count),
+      color: '#2d8cf0',
+    }]
+    loadingMonth.value = false
+  })
+  remindTrend({ type: 'year' }).then((res) => {
+    // 数据，格式为[{name:'系列名',data:[0,0,0,...0], color:'可选'},...]
+    xAxisYear.value = res.data.map((item: any) => item.name)
+    dataYear.value = [{
+      name: '年趋势',
+      data: res.data.map((item: any) => item.count),
+      color: '#19be6b',
+    }]
+    loadingYear.value = false
+  })
+}
+fetchData()
+</script>
+
+<template>
+  <div style="padding: 10px;position: reactive;">
+    <!-- 月趋势 -->
+    <div :style="`height:${height / 2}px;width:100%;position: relative;`" class="container">
+      <div v-if="!loadingMonth" class="title">
+        未来1月在用设备到期趋势
+      </div>
+      <line-chart :loading="loadingMonth" :x-axis-data="xAxisMonth" :data="dataMonth" />
+    </div>
+    <!-- 年趋势 -->
+    <div :style="`height:${height / 2}px;width:100%;position: relative;margin-top:15px;`" class="container">
+      <div v-if="!loadingYear" class="title">
+        未来1年在用设备到期趋势
+      </div>
+      <line-chart :loading="loadingYear" :x-axis-data="xAxisYear" :data="dataYear" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  // position: ;
+
+  .title {
+    font-size: 18px;
+    font-weight: 700;
+    text-align: center;
+    position: absolute;
+    width: 100%;
+    top: 15px;
+  }
+}
+</style>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 63937cb..3eeb19d 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="RemindList">
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import trend from './components/trend.vue'
 import { exportRemind, getRemindList } from '@/api/eqpt/device/remind'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { getTaskList } from '@/api/eqpt/device/task'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   certificateValidEnd: '',
@@ -13,6 +16,11 @@
   equipmentNo: '',
   usePosition: '',
   usageStatus: '',
+  manufactureNo: '',
+  tastEndTime: '',
+  taskStartTime: '',
+  taskId: '',
+  model: '',
   offset: 1,
   limit: 20,
 })
@@ -62,9 +70,19 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  // {
+  //   text: '备注',
+  //   value: 'remark',
+  //   align: 'center',
+  // },
   {
-    text: '备注',
-    value: 'remark',
+    text: '参试任务',
+    value: 'taskNames',
+    align: 'center',
+  },
+  {
+    text: '参试任务时间',
+    value: 'taskTimes',
     align: 'center',
   },
 ])
@@ -103,14 +121,35 @@
 }, {
   deep: true,
 })
+const datetimerange1 = ref()
+watch(() => datetimerange1.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.taskStartTime = `${newVal[0]} 00:00:00`
+    listQuery.tastEndTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.taskStartTime = ''
+    listQuery.tastEndTime = ''
+  }
+}, {
+  deep: true,
+})
 const reset = () => {
   range.value = []
+  datetimerange1.value = []
+  listQuery.tastEndTime = ''
+  listQuery.taskStartTime = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
   listQuery.equipmentName = ''
+  listQuery.manufactureNo = ''
   listQuery.equipmentNo = ''
   listQuery.usePosition = ''
   listQuery.usageStatus = ''
+  listQuery.model = ''
+  listQuery.taskId = ''
+  listQuery.limit = 20
+  listQuery.offset = 1
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -182,12 +221,37 @@
 }
 // 设备使用状态
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
+// 任务列表
+const taskList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchStatusList = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+  })
+  // 参试任务
+  getTaskList({ limit: 9999, offset: 1 }).then((res) => {
+    taskList.value = res.data.rows.map((item: any) => ({ name: item.taskName, value: item.id, id: item.id }))
+  })
 }
 fetchStatusList()
+// 列表图表切换
+const showTable = ref(true)
+const changeTable = () => {
+  showTable.value = !showTable.value
+}
 </script>
 
 <template>
@@ -198,30 +262,56 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
+        </el-select>
       </search-item>
       <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item> -->
+      <search-item>
         <el-input v-model.trim="listQuery.usePosition" placeholder="所属岗位" clearable />
       </search-item>
       <search-item>
+        <el-date-picker
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+        />
+      </search-item>
+      <search-item>
         <!-- <el-input v-model.trim="listQuery.usageStatus" placeholder="使用状态" clearable /> -->
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
-          v-model="range" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="参试任务开始时间" end-placeholder="参试任务结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <icon-button icon="icon-change" title="切换" @click="changeTable" />
+        <icon-button v-if="showTable" icon="icon-export" title="导出" @click="exportList" />
       </template>
       <!-- 普通表格 -->
       <normal-table
+        v-if="showTable"
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
@@ -238,6 +328,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <trend v-else />
     </table-container>
   </app-container>
 </template>