diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: string
 }
 // 设备信息对象
 export interface IlistObjType {

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 3af1845..20148da 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -14,6 +14,10 @@
     type: String,
     default: '100px',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
 })
 const $emits = defineEmits(['delete'])
 const $route = useRoute()
@@ -60,7 +64,7 @@
     <slot />
     <a v-for="item in urlList" :key="item.url + item.name" class="link" :href="item.url" type="primary" style="margin-right: 10px;" target="_blank">
       {{ item.minioFileName }}
-      <span v-if="!$route.path.includes('detail')" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
+      <span v-if="!$route.path.includes('detail') && $props.showClose" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
     </a>
   </div>
 </template>

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 3af1845..20148da 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -14,6 +14,10 @@
     type: String,
     default: '100px',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
 })
 const $emits = defineEmits(['delete'])
 const $route = useRoute()
@@ -60,7 +64,7 @@
     <slot />
     <a v-for="item in urlList" :key="item.url + item.name" class="link" :href="item.url" type="primary" style="margin-right: 10px;" target="_blank">
       {{ item.minioFileName }}
-      <span v-if="!$route.path.includes('detail')" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
+      <span v-if="!$route.path.includes('detail') && $props.showClose" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
     </a>
   </div>
 </template>
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 0db38a6..f9b05e5 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -40,6 +40,7 @@
   technicalTargetList: [], // 技术指标
   updateTime: '',
   equipmentType: '',
+  inspectable: [] as any,
 }) // 表单
 // 设备名称验证规则
 const checkCycle = (rule: any, value: any, callback: any) => {
@@ -53,13 +54,20 @@
     callback()
   }
 }
+// 表单验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentType: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
+  // category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   checkCycle: [{ required: true, validator: checkCycle, trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
+// 当计量站可检时，设备分类必填
+watch(() => ruleForm.value.inspectable, (newVal) => {
+  if (newVal?.length) {
+    rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
+  }
+}, { deep: true })
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -76,8 +84,15 @@
   else {
     const data = JSON.parse($route.query.row as string)
     // detailGroup({ groupId: data.id }).then((res) => {
-    ruleForm.value = data
     // })
+    ruleForm.value = data
+    // 计量站是否可检
+    if (data.inspectable) {
+      ruleForm.value.inspectable = data.inspectable.split(',')
+    }
+    else {
+      ruleForm.value.inspectable = []
+    }
   }
 }
 onMounted(() => {
@@ -107,8 +122,12 @@
           ruleForm.value.helpInstruction = '/'
         }
         ruleForm.value.technicalTargetList = tableRef.value.list
+        const data = {
+          ...ruleForm.value,
+          inspectable: ruleForm.value.inspectable.join(','),
+        }
         if ($route.params.type === 'create') {
-          handlerFunApi('create', ruleForm.value).then((res) => {
+          handlerFunApi('create', data).then((res) => {
             ElMessage.success('添加成功')
             close()
           })
@@ -116,7 +135,7 @@
         else {
           // ruleForm.value.technicalTargetList = tableRef.value.list
           console.log(ruleForm.value)
-          handlerFunApi('update', ruleForm.value).then((res) => {
+          handlerFunApi('update', data).then((res) => {
             ElMessage.success('修改成功')
             close()
           })
@@ -216,7 +235,7 @@
         :model="ruleForm"
         :rules="rules" label-position="right" label-width="110px" class="form"
         :disabled="dialogStatus === 'detail'"
-        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
@@ -232,24 +251,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+              <el-input v-model="ruleForm.equipmentName" placeholder="设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+              <el-input v-model="ruleForm.model" placeholder="规格型号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
             <el-form-item label="辅助字段" prop="helpInstruction">
-              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+              <el-input v-model="ruleForm.helpInstruction" placeholder="辅助字段" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" clearable placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -281,8 +300,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
+        <el-row :gutter="24" class="marg" style="display: flex;justify-content: space-between;">
+          <el-col :span="12">
             <el-form-item label="使用说明书" prop="instructionsFile">
               <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
               <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
@@ -292,11 +311,19 @@
               </el-button>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="计量站是否可检" prop="inspectable">
+              <el-select v-model.trim="ruleForm.inspectable" clearable multiple placeholder="计量站是否可检" style="width: 100%;">
+                <el-option label="西昌可检" value="1" />
+                <el-option label="海口可检" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+              <el-input v-model="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,5 +336,13 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 3af1845..20148da 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -14,6 +14,10 @@
     type: String,
     default: '100px',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
 })
 const $emits = defineEmits(['delete'])
 const $route = useRoute()
@@ -60,7 +64,7 @@
     <slot />
     <a v-for="item in urlList" :key="item.url + item.name" class="link" :href="item.url" type="primary" style="margin-right: 10px;" target="_blank">
       {{ item.minioFileName }}
-      <span v-if="!$route.path.includes('detail')" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
+      <span v-if="!$route.path.includes('detail') && $props.showClose" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
     </a>
   </div>
 </template>
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 0db38a6..f9b05e5 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -40,6 +40,7 @@
   technicalTargetList: [], // 技术指标
   updateTime: '',
   equipmentType: '',
+  inspectable: [] as any,
 }) // 表单
 // 设备名称验证规则
 const checkCycle = (rule: any, value: any, callback: any) => {
@@ -53,13 +54,20 @@
     callback()
   }
 }
+// 表单验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentType: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
+  // category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   checkCycle: [{ required: true, validator: checkCycle, trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
+// 当计量站可检时，设备分类必填
+watch(() => ruleForm.value.inspectable, (newVal) => {
+  if (newVal?.length) {
+    rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
+  }
+}, { deep: true })
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -76,8 +84,15 @@
   else {
     const data = JSON.parse($route.query.row as string)
     // detailGroup({ groupId: data.id }).then((res) => {
-    ruleForm.value = data
     // })
+    ruleForm.value = data
+    // 计量站是否可检
+    if (data.inspectable) {
+      ruleForm.value.inspectable = data.inspectable.split(',')
+    }
+    else {
+      ruleForm.value.inspectable = []
+    }
   }
 }
 onMounted(() => {
@@ -107,8 +122,12 @@
           ruleForm.value.helpInstruction = '/'
         }
         ruleForm.value.technicalTargetList = tableRef.value.list
+        const data = {
+          ...ruleForm.value,
+          inspectable: ruleForm.value.inspectable.join(','),
+        }
         if ($route.params.type === 'create') {
-          handlerFunApi('create', ruleForm.value).then((res) => {
+          handlerFunApi('create', data).then((res) => {
             ElMessage.success('添加成功')
             close()
           })
@@ -116,7 +135,7 @@
         else {
           // ruleForm.value.technicalTargetList = tableRef.value.list
           console.log(ruleForm.value)
-          handlerFunApi('update', ruleForm.value).then((res) => {
+          handlerFunApi('update', data).then((res) => {
             ElMessage.success('修改成功')
             close()
           })
@@ -216,7 +235,7 @@
         :model="ruleForm"
         :rules="rules" label-position="right" label-width="110px" class="form"
         :disabled="dialogStatus === 'detail'"
-        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
@@ -232,24 +251,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+              <el-input v-model="ruleForm.equipmentName" placeholder="设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+              <el-input v-model="ruleForm.model" placeholder="规格型号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
             <el-form-item label="辅助字段" prop="helpInstruction">
-              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+              <el-input v-model="ruleForm.helpInstruction" placeholder="辅助字段" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" clearable placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -281,8 +300,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
+        <el-row :gutter="24" class="marg" style="display: flex;justify-content: space-between;">
+          <el-col :span="12">
             <el-form-item label="使用说明书" prop="instructionsFile">
               <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
               <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
@@ -292,11 +311,19 @@
               </el-button>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="计量站是否可检" prop="inspectable">
+              <el-select v-model.trim="ruleForm.inspectable" clearable multiple placeholder="计量站是否可检" style="width: 100%;">
+                <el-option label="西昌可检" value="1" />
+                <el-option label="海口可检" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+              <el-input v-model="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,5 +336,13 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 4dd6dac..5985bc6 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   equipmentType: '',
@@ -187,7 +188,7 @@
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -204,11 +205,22 @@
     getDeviceNameList({ equipmentType: newVal }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: newVal }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
   else {
+    // 设备名称
     getDeviceNameList({ equipmentType: '' }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: '' }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
 }, {
   deep: true,
@@ -303,9 +315,10 @@
         <template #columns>
           <el-table-column label="使用说明书" align="center">
             <template #default="scope">
-              <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
+              <!-- <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
                 {{ scope.row.instructionsFile }}
-              </el-link>
+              </el-link> -->
+              <show-photo :minio-file-name="scope.row.instructionsFile" :show-close="false" @delete="() => {}" />
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 3af1845..20148da 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -14,6 +14,10 @@
     type: String,
     default: '100px',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
 })
 const $emits = defineEmits(['delete'])
 const $route = useRoute()
@@ -60,7 +64,7 @@
     <slot />
     <a v-for="item in urlList" :key="item.url + item.name" class="link" :href="item.url" type="primary" style="margin-right: 10px;" target="_blank">
       {{ item.minioFileName }}
-      <span v-if="!$route.path.includes('detail')" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
+      <span v-if="!$route.path.includes('detail') && $props.showClose" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
     </a>
   </div>
 </template>
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 0db38a6..f9b05e5 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -40,6 +40,7 @@
   technicalTargetList: [], // 技术指标
   updateTime: '',
   equipmentType: '',
+  inspectable: [] as any,
 }) // 表单
 // 设备名称验证规则
 const checkCycle = (rule: any, value: any, callback: any) => {
@@ -53,13 +54,20 @@
     callback()
   }
 }
+// 表单验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentType: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
+  // category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   checkCycle: [{ required: true, validator: checkCycle, trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
+// 当计量站可检时，设备分类必填
+watch(() => ruleForm.value.inspectable, (newVal) => {
+  if (newVal?.length) {
+    rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
+  }
+}, { deep: true })
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -76,8 +84,15 @@
   else {
     const data = JSON.parse($route.query.row as string)
     // detailGroup({ groupId: data.id }).then((res) => {
-    ruleForm.value = data
     // })
+    ruleForm.value = data
+    // 计量站是否可检
+    if (data.inspectable) {
+      ruleForm.value.inspectable = data.inspectable.split(',')
+    }
+    else {
+      ruleForm.value.inspectable = []
+    }
   }
 }
 onMounted(() => {
@@ -107,8 +122,12 @@
           ruleForm.value.helpInstruction = '/'
         }
         ruleForm.value.technicalTargetList = tableRef.value.list
+        const data = {
+          ...ruleForm.value,
+          inspectable: ruleForm.value.inspectable.join(','),
+        }
         if ($route.params.type === 'create') {
-          handlerFunApi('create', ruleForm.value).then((res) => {
+          handlerFunApi('create', data).then((res) => {
             ElMessage.success('添加成功')
             close()
           })
@@ -116,7 +135,7 @@
         else {
           // ruleForm.value.technicalTargetList = tableRef.value.list
           console.log(ruleForm.value)
-          handlerFunApi('update', ruleForm.value).then((res) => {
+          handlerFunApi('update', data).then((res) => {
             ElMessage.success('修改成功')
             close()
           })
@@ -216,7 +235,7 @@
         :model="ruleForm"
         :rules="rules" label-position="right" label-width="110px" class="form"
         :disabled="dialogStatus === 'detail'"
-        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
@@ -232,24 +251,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+              <el-input v-model="ruleForm.equipmentName" placeholder="设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+              <el-input v-model="ruleForm.model" placeholder="规格型号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
             <el-form-item label="辅助字段" prop="helpInstruction">
-              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+              <el-input v-model="ruleForm.helpInstruction" placeholder="辅助字段" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" clearable placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -281,8 +300,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
+        <el-row :gutter="24" class="marg" style="display: flex;justify-content: space-between;">
+          <el-col :span="12">
             <el-form-item label="使用说明书" prop="instructionsFile">
               <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
               <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
@@ -292,11 +311,19 @@
               </el-button>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="计量站是否可检" prop="inspectable">
+              <el-select v-model.trim="ruleForm.inspectable" clearable multiple placeholder="计量站是否可检" style="width: 100%;">
+                <el-option label="西昌可检" value="1" />
+                <el-option label="海口可检" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+              <el-input v-model="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,5 +336,13 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 4dd6dac..5985bc6 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   equipmentType: '',
@@ -187,7 +188,7 @@
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -204,11 +205,22 @@
     getDeviceNameList({ equipmentType: newVal }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: newVal }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
   else {
+    // 设备名称
     getDeviceNameList({ equipmentType: '' }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: '' }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
 }, {
   deep: true,
@@ -303,9 +315,10 @@
         <template #columns>
           <el-table-column label="使用说明书" align="center">
             <template #default="scope">
-              <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
+              <!-- <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
                 {{ scope.row.instructionsFile }}
-              </el-link>
+              </el-link> -->
+              <show-photo :minio-file-name="scope.row.instructionsFile" :show-close="false" @delete="() => {}" />
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 6e93a28..e54fea3 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -240,11 +240,11 @@
     useStatusList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = res.data
   })

diff --git a/src/api/system/installation.ts b/src/api/system/installation.ts
index 4288976..bc33926 100644
--- a/src/api/system/installation.ts
+++ b/src/api/system/installation.ts
@@ -35,10 +35,9 @@
   })
 }
 // 列表 - 不分页
-export function getLocationList(data: any) {
+export function getLocationList() {
   return request({
     url: '/system/location/list',
-    method: 'post',
-    data,
+    method: 'get',
   })
 }
diff --git a/src/views/system/expire/device.vue b/src/views/system/expire/device.vue
index 34f42a8..b25a74b 100644
--- a/src/views/system/expire/device.vue
+++ b/src/views/system/expire/device.vue
@@ -114,11 +114,11 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 8c8b950..72f1130 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -131,7 +131,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index f24eb12..6b6cf27 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -116,7 +116,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="handler('create', {})" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" /> -->
       </template>
 
       <div class="table-area">
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c9e74e7..138a543 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -148,7 +148,7 @@
 const allList = ref<any[]>([])
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 22c6431..d310206 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -21,6 +21,8 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -171,9 +173,13 @@
 // 辅助字段
 const helpList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
 const fetchSelectData = async () => {
   // 规格型号及辅助字段
-  const res = await getModelAllList({})
+  const res = await getModelAllList({ equipmentType: $route.query.equipmentType })
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -195,10 +201,19 @@
     deviceQualityList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
     deviceNameList.value = res.data
     console.log(res.data, '设备名称')
   })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
 }
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
@@ -875,7 +890,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用岗位" prop="usePosition">
-                <el-input v-model.trim="ruleForm.usePosition" />
+                <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
+                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                  <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -910,21 +928,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="24">
-              <el-form-item label="组别信息" prop="groupInfos">
-                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+          <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos.length" :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item v-for="(item, index) in ruleForm.groupInfos" :key="index" :label="`组别信息${index + 1}`" prop="groupInfos">
+                <el-input v-model.trim="item.groupName" style="width: 100%;" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="安装位置" prop="installLocation">
-                <el-input v-model.trim="ruleForm.installLocation" />
+                <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
+                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                  <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-input v-model.trim="ruleForm.installLocationExt" />
+            <el-col :span="6">
+              <el-form-item label="详细位置">
+                <el-input v-model.trim="ruleForm.installLocationExt" />
+              </el-form-item>
             </el-col>
           </el-row>
           <!-- <el-row :gutter="24" class="marg">
@@ -941,12 +964,12 @@
           <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
             <el-col :span="18">
               <el-form-item label="参试任务" prop="fileNo">
-                <el-table :data="ruleForm.taskInfos">
-                  <el-table-column label="任务名称" prop="taskName" />
-                  <el-table-column label="开始时间" prop="startTime" />
-                  <el-table-column label="结束时间" prop="taskName" />
-                  <el-table-column label="备注" prop="remark" />
-                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                <el-table :data="ruleForm.taskInfos" border stripe>
+                  <el-table-column label="任务名称" prop="taskName" align="center" />
+                  <el-table-column label="开始时间" prop="startTime" align="center" />
+                  <el-table-column label="结束时间" prop="taskName" align="center" />
+                  <el-table-column label="备注" prop="remark" align="center" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70" align="center">
                     <template #default=" scope ">
                       <el-button
                         link type="danger" size="small"
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index a32473e..0807e07 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -25,6 +25,8 @@
   checkDateEnd: string
   sort: string
   orderBy: string
+  manufacturer?: string
+  groupName?: 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 472ae0a..e21ec50 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,6 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -16,7 +17,8 @@
 import task from '@/views/tested/device/task/index.vue'
 import { underlineToHump } from '@/utils/structure'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
-
+import { getLocationList } from '@/api/system/installation'
+import { getPostList } from '@/api/system/post'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -74,6 +76,8 @@
   checkDateStart: '',
   sort: '',
   orderBy: '',
+  manufacturer: '', // 生产厂家
+  groupName: '', // 分组
 })
 const columns = ref([
   // {
@@ -260,7 +264,7 @@
 // 获取使用状态列表
 const useStatusList = ref()
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 再用信息
@@ -269,6 +273,12 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 安装位置
+const installLocationList = ref<any[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 负责人
+const userList = ref<any[]>([])
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
@@ -284,13 +294,13 @@
     deviceTypeList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: $props.equipmentType }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: $props.equipmentType }).then((res) => {
     allList.value = res.data
-    modelList.value = Array.from(new Set(res.data.filter(item => item.model).map(item => item.model)))
+    modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
   })
   // 参试任务
   getTaskList({ limit: 9999, offset: 1 }).then((res) => {
@@ -299,6 +309,19 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 安装位置
+  getLocationList().then((res) => {
+    // console.log(res.data, '安装位置')
+    installLocationList.value = res.data
+  })
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 负责人
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -361,6 +384,8 @@
   listQuery.meterIdentify = ''
   listQuery.sort = ''
   listQuery.orderBy = ''
+  listQuery.manufacturer = ''
+  listQuery.groupName = ''
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -427,7 +452,7 @@
 }
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
-//   console.log(newVal, 'newVal')
+//   console.log(newVal, 'newVal')handler
 // }, {
 //   deep: true,
 // })
@@ -780,9 +805,9 @@
     <task ref="taskRef" @confirm="bindIds" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
@@ -797,9 +822,7 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
-          <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
@@ -807,6 +830,11 @@
       <search-item>
         <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
         <icon-button v-show="searchMore" icon="icon-zhankai" title="展开查询条件" style="margin-bottom: 10px;" @click="expandSearch" />
@@ -814,22 +842,16 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
         </search-item>
+
         <search-item>
-          <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
-        </search-item>
-        <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
-            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
-        </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-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
+          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+              <span style="float: left;">{{ item.name }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+            </el-option>
           </el-select>
         </search-item>
         <search-item>
@@ -839,19 +861,45 @@
           />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
-        </search-item>
-        <search-item>
           <el-date-picker
             v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
             format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
-            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+            <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
+          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+            <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+          </el-select>
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+            <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
+          </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-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+        </search-item>
+        <search-item>
+          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        </search-item>
+        <!-- <search-item>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+            <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item> -->
+
       </span>
     </search-area>
     <table-container>
@@ -869,7 +917,7 @@
         <!-- 普通表格 -->
         <normal-table
           v-show=" tableFlage "
-          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] : columns" :query="listQuery"
+          ref="normalTableRef" :data="list" :total="total" :columns="$props.statusName === '全部' ? [...columns, ...allColums] as any : columns as any" :query="listQuery"
           :list-loading="listLoading"
           :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 3af1845..20148da 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -14,6 +14,10 @@
     type: String,
     default: '100px',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
 })
 const $emits = defineEmits(['delete'])
 const $route = useRoute()
@@ -60,7 +64,7 @@
     <slot />
     <a v-for="item in urlList" :key="item.url + item.name" class="link" :href="item.url" type="primary" style="margin-right: 10px;" target="_blank">
       {{ item.minioFileName }}
-      <span v-if="!$route.path.includes('detail')" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
+      <span v-if="!$route.path.includes('detail') && $props.showClose" class="close" @click.stop.capture.prevent="close(item.minioFileName)">x</span>
     </a>
   </div>
 </template>
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 0db38a6..f9b05e5 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -40,6 +40,7 @@
   technicalTargetList: [], // 技术指标
   updateTime: '',
   equipmentType: '',
+  inspectable: [] as any,
 }) // 表单
 // 设备名称验证规则
 const checkCycle = (rule: any, value: any, callback: any) => {
@@ -53,13 +54,20 @@
     callback()
   }
 }
+// 表单验证规则
 const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentType: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
+  // category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '规格型号必填', trigger: ['blur', 'change'] }],
   checkCycle: [{ required: true, validator: checkCycle, trigger: ['blur', 'change'] }],
-}) // 表单验证规则
+})
+// 当计量站可检时，设备分类必填
+watch(() => ruleForm.value.inspectable, (newVal) => {
+  if (newVal?.length) {
+    rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
+  }
+}, { deep: true })
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string
@@ -76,8 +84,15 @@
   else {
     const data = JSON.parse($route.query.row as string)
     // detailGroup({ groupId: data.id }).then((res) => {
-    ruleForm.value = data
     // })
+    ruleForm.value = data
+    // 计量站是否可检
+    if (data.inspectable) {
+      ruleForm.value.inspectable = data.inspectable.split(',')
+    }
+    else {
+      ruleForm.value.inspectable = []
+    }
   }
 }
 onMounted(() => {
@@ -107,8 +122,12 @@
           ruleForm.value.helpInstruction = '/'
         }
         ruleForm.value.technicalTargetList = tableRef.value.list
+        const data = {
+          ...ruleForm.value,
+          inspectable: ruleForm.value.inspectable.join(','),
+        }
         if ($route.params.type === 'create') {
-          handlerFunApi('create', ruleForm.value).then((res) => {
+          handlerFunApi('create', data).then((res) => {
             ElMessage.success('添加成功')
             close()
           })
@@ -116,7 +135,7 @@
         else {
           // ruleForm.value.technicalTargetList = tableRef.value.list
           console.log(ruleForm.value)
-          handlerFunApi('update', ruleForm.value).then((res) => {
+          handlerFunApi('update', data).then((res) => {
             ElMessage.success('修改成功')
             close()
           })
@@ -216,7 +235,7 @@
         :model="ruleForm"
         :rules="rules" label-position="right" label-width="110px" class="form"
         :disabled="dialogStatus === 'detail'"
-        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
@@ -232,24 +251,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+              <el-input v-model="ruleForm.equipmentName" placeholder="设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规格型号" prop="model">
-              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+              <el-input v-model="ruleForm.model" placeholder="规格型号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="8">
             <el-form-item label="辅助字段" prop="helpInstruction">
-              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+              <el-input v-model="ruleForm.helpInstruction" placeholder="辅助字段" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备分类" prop="category">
-              <el-select v-model.trim="ruleForm.category" placeholder="设备分类" style="width: 100%;">
+              <el-select v-model.trim="ruleForm.category" clearable placeholder="设备分类" style="width: 100%;">
                 <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -281,8 +300,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
+        <el-row :gutter="24" class="marg" style="display: flex;justify-content: space-between;">
+          <el-col :span="12">
             <el-form-item label="使用说明书" prop="instructionsFile">
               <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
               <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
@@ -292,11 +311,19 @@
               </el-button>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="计量站是否可检" prop="inspectable">
+              <el-select v-model.trim="ruleForm.inspectable" clearable multiple placeholder="计量站是否可检" style="width: 100%;">
+                <el-option label="西昌可检" value="1" />
+                <el-option label="海口可检" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+              <el-input v-model="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,5 +336,13 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 4dd6dac..5985bc6 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   equipmentType: '',
@@ -187,7 +188,7 @@
     deviceNameList.value = res.data
   })
   // 规格型号及辅助字段
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
@@ -204,11 +205,22 @@
     getDeviceNameList({ equipmentType: newVal }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: newVal }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
   else {
+    // 设备名称
     getDeviceNameList({ equipmentType: '' }).then((res) => {
       deviceNameList.value = res.data
     })
+    getModelAllList({ equipmentType: '' }).then((res) => {
+      allList.value = res.data
+      modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+      helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    })
   }
 }, {
   deep: true,
@@ -303,9 +315,10 @@
         <template #columns>
           <el-table-column label="使用说明书" align="center">
             <template #default="scope">
-              <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
+              <!-- <el-link type="primary" @click="clickFile(scope.row.instructionsFile)">
                 {{ scope.row.instructionsFile }}
-              </el-link>
+              </el-link> -->
+              <show-photo :minio-file-name="scope.row.instructionsFile" :show-close="false" @delete="() => {}" />
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 6e93a28..e54fea3 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -240,11 +240,11 @@
     useStatusList.value = res.data
   })
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = res.data
   })
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6696082..1cc149b 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -299,11 +299,11 @@
 // 获取下拉框
 const fetchDict = () => {
   // 设备名称
-  getDeviceNameList().then((res) => {
+  getDeviceNameList({ equipmentType: '1' }).then((res) => {
     deviceNameList.value = res.data
   })
   // 规格型号
-  getModelAllList({}).then((res) => {
+  getModelAllList({ equipmentType: '1' }).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map(item => item.model)))
   })