diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 601968b..39b3b6d 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,21 +2,45 @@
 <script lang="ts" setup name="DeviceGroupList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
+import { getPostList } from '@/api/system/post'
+import { getDeptList, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
-  groupName: '',
+  companyId: '', // 所在单位
+  deptId: '', // 使用部门
+  positionId: '', // 使用岗位
   offset: 1,
   limit: 20,
+  subSystemId: '', // 分系统
+  groupName: '', // 分组名称
+  createUserId: userStore.id, // 分组名称
 })
 const columns = ref([
   {
-    text: '分组名称',
-    value: 'groupName',
+    text: '所在单位',
+    value: 'companyName',
     align: 'center',
   },
   {
-    text: '创建人',
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '分系统',
+    value: 'subSystemName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'positionName',
+    align: 'center',
+  },
+  {
+    text: '分组名称创建人',
     value: 'createUserName',
     align: 'center',
   },
@@ -34,7 +58,16 @@
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
-
+// 只看我的 复选框
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.createUserId = userStore.id
+  }
+  else {
+    listQuery.createUserId = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
@@ -55,7 +88,13 @@
 }
 // 重置
 const reset = () => {
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.positionId = ''
+  listQuery.subSystemId = ''
   listQuery.groupName = ''
+  listQuery.createUserId = userStore.id
+  checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -98,6 +137,64 @@
     })
   })
 }
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 分系统
+const systemList = ref<{ id: string; value: string; name: string }[]>([])
+const systemListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 获取使用单位
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 分系统
+    systemList.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    systemListAll.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
+}
+fetchDict()
+// 三级联动
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  listQuery.subSystemId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
+watch(() => listQuery.deptId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      systemList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
@@ -105,8 +202,40 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
+        <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
+        <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
+        <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+          <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.positionId" placeholder="使用岗位" clearable /> -->
+        <el-select v-model="listQuery.positionId" 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.groupName" placeholder="分组名称" clearable />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 601968b..39b3b6d 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,21 +2,45 @@
 <script lang="ts" setup name="DeviceGroupList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
+import { getPostList } from '@/api/system/post'
+import { getDeptList, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
-  groupName: '',
+  companyId: '', // 所在单位
+  deptId: '', // 使用部门
+  positionId: '', // 使用岗位
   offset: 1,
   limit: 20,
+  subSystemId: '', // 分系统
+  groupName: '', // 分组名称
+  createUserId: userStore.id, // 分组名称
 })
 const columns = ref([
   {
-    text: '分组名称',
-    value: 'groupName',
+    text: '所在单位',
+    value: 'companyName',
     align: 'center',
   },
   {
-    text: '创建人',
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '分系统',
+    value: 'subSystemName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'positionName',
+    align: 'center',
+  },
+  {
+    text: '分组名称创建人',
     value: 'createUserName',
     align: 'center',
   },
@@ -34,7 +58,16 @@
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
-
+// 只看我的 复选框
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.createUserId = userStore.id
+  }
+  else {
+    listQuery.createUserId = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
@@ -55,7 +88,13 @@
 }
 // 重置
 const reset = () => {
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.positionId = ''
+  listQuery.subSystemId = ''
   listQuery.groupName = ''
+  listQuery.createUserId = userStore.id
+  checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -98,6 +137,64 @@
     })
   })
 }
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 分系统
+const systemList = ref<{ id: string; value: string; name: string }[]>([])
+const systemListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 获取使用单位
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 分系统
+    systemList.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    systemListAll.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
+}
+fetchDict()
+// 三级联动
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  listQuery.subSystemId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
+watch(() => listQuery.deptId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      systemList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
@@ -105,8 +202,40 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
+        <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
+        <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
+        <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+          <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.positionId" placeholder="使用岗位" clearable /> -->
+        <el-select v-model="listQuery.positionId" 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.groupName" placeholder="分组名称" clearable />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c519728..5294a79 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -3,6 +3,7 @@
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -21,6 +22,7 @@
   },
 })
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -31,9 +33,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -156,9 +169,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -232,6 +247,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 601968b..39b3b6d 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,21 +2,45 @@
 <script lang="ts" setup name="DeviceGroupList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
+import { getPostList } from '@/api/system/post'
+import { getDeptList, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
-  groupName: '',
+  companyId: '', // 所在单位
+  deptId: '', // 使用部门
+  positionId: '', // 使用岗位
   offset: 1,
   limit: 20,
+  subSystemId: '', // 分系统
+  groupName: '', // 分组名称
+  createUserId: userStore.id, // 分组名称
 })
 const columns = ref([
   {
-    text: '分组名称',
-    value: 'groupName',
+    text: '所在单位',
+    value: 'companyName',
     align: 'center',
   },
   {
-    text: '创建人',
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '分系统',
+    value: 'subSystemName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'positionName',
+    align: 'center',
+  },
+  {
+    text: '分组名称创建人',
     value: 'createUserName',
     align: 'center',
   },
@@ -34,7 +58,16 @@
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
-
+// 只看我的 复选框
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.createUserId = userStore.id
+  }
+  else {
+    listQuery.createUserId = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
@@ -55,7 +88,13 @@
 }
 // 重置
 const reset = () => {
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.positionId = ''
+  listQuery.subSystemId = ''
   listQuery.groupName = ''
+  listQuery.createUserId = userStore.id
+  checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -98,6 +137,64 @@
     })
   })
 }
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 分系统
+const systemList = ref<{ id: string; value: string; name: string }[]>([])
+const systemListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 获取使用单位
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 分系统
+    systemList.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    systemListAll.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
+}
+fetchDict()
+// 三级联动
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  listQuery.subSystemId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
+watch(() => listQuery.deptId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      systemList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
@@ -105,8 +202,40 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
+        <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
+        <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
+        <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+          <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.positionId" placeholder="使用岗位" clearable /> -->
+        <el-select v-model="listQuery.positionId" 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.groupName" placeholder="分组名称" clearable />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c519728..5294a79 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -3,6 +3,7 @@
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -21,6 +22,7 @@
   },
 })
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -31,9 +33,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -156,9 +169,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -232,6 +247,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 5db85d5..69b924f 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -183,7 +183,12 @@
   else {
     device.forEach((item: any) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
-        list.value.push(item)
+        list.value.push({
+          ...item,
+          equipmentId: item.id,
+          id: null,
+          groupId: null,
+        })
       }
     })
   }

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 601968b..39b3b6d 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,21 +2,45 @@
 <script lang="ts" setup name="DeviceGroupList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
+import { getPostList } from '@/api/system/post'
+import { getDeptList, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
-  groupName: '',
+  companyId: '', // 所在单位
+  deptId: '', // 使用部门
+  positionId: '', // 使用岗位
   offset: 1,
   limit: 20,
+  subSystemId: '', // 分系统
+  groupName: '', // 分组名称
+  createUserId: userStore.id, // 分组名称
 })
 const columns = ref([
   {
-    text: '分组名称',
-    value: 'groupName',
+    text: '所在单位',
+    value: 'companyName',
     align: 'center',
   },
   {
-    text: '创建人',
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '分系统',
+    value: 'subSystemName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'positionName',
+    align: 'center',
+  },
+  {
+    text: '分组名称创建人',
     value: 'createUserName',
     align: 'center',
   },
@@ -34,7 +58,16 @@
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
-
+// 只看我的 复选框
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.createUserId = userStore.id
+  }
+  else {
+    listQuery.createUserId = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
@@ -55,7 +88,13 @@
 }
 // 重置
 const reset = () => {
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.positionId = ''
+  listQuery.subSystemId = ''
   listQuery.groupName = ''
+  listQuery.createUserId = userStore.id
+  checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -98,6 +137,64 @@
     })
   })
 }
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 分系统
+const systemList = ref<{ id: string; value: string; name: string }[]>([])
+const systemListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 获取使用单位
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 分系统
+    systemList.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    systemListAll.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
+}
+fetchDict()
+// 三级联动
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  listQuery.subSystemId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
+watch(() => listQuery.deptId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      systemList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
@@ -105,8 +202,40 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
+        <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
+        <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
+        <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+          <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.positionId" placeholder="使用岗位" clearable /> -->
+        <el-select v-model="listQuery.positionId" 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.groupName" placeholder="分组名称" clearable />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c519728..5294a79 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -3,6 +3,7 @@
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -21,6 +22,7 @@
   },
 })
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -31,9 +33,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -156,9 +169,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -232,6 +247,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 5db85d5..69b924f 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -183,7 +183,12 @@
   else {
     device.forEach((item: any) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
-        list.value.push(item)
+        list.value.push({
+          ...item,
+          equipmentId: item.id,
+          id: null,
+          groupId: null,
+        })
       }
     })
   }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 6d4c8d8..cd01404 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,7 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, editInfoNoApproval, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -157,6 +157,8 @@
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const deviceQualityList = ref<{ id: string; value: string; name: string }[]>() // 质量状况
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
 // 设备名称
 const deviceNameList = ref<string[]>([])
 // 规格型号
@@ -318,6 +320,9 @@
       ruleForm.value.companyId = res.data.id
       companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
+      getDeptTreeList({ pid: res.data.id }).then((res1) => {
+        deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      })
     })
   }
   else {
@@ -392,9 +397,17 @@
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
         }
+        // 计量室需要具备对受检设备中设备信息变更的权限，不走审批流，但是要留下变更记录
+        if ($route.path.includes('update') && userStore.deptName.includes('计量室')) {
+          editInfoNoApproval(ruleForm.value).then((res) => {
+            ElMessage.success('保存成功')
+            close()
+          })
+        }
         if (submitId.value !== '未提交' && submitId.value !== '') {
           ruleForm.value.id = submitId.value
         }
+        // 正常流程
         editInfo(ruleForm.value).then((res) => {
           submitId.value = res.data
           disabledSave.value = false
@@ -736,7 +749,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
-                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
+                <!-- <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" /> -->
+                <el-select v-model="ruleForm.deptId" filterable placeholder="使用部门" style="width: 100%;">
+                  <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">

diff --git a/public/config/config.json b/public/config/config.json
index ffd6d38..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index ca0ce73..3c33423 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -169,4 +169,11 @@
     params: data,
   })
 }
-
+// 编辑 -计量室 - 直接保存
+export function editInfoNoApproval(data: object) {
+  return request({
+    url: '/equipment/info/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 64fd8c5..8474420 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -13,7 +13,7 @@
   })
 }
 // 组织机构树列表
-export function getDeptTreeList(params?: { deptType: string }) {
+export function getDeptTreeList(params?: any) {
   return request1({
     url: `${prefix}/dept/tree`,
     method: 'get',
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index ac3c413..4cdf591 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -5,8 +5,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
+import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -17,9 +19,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -119,9 +132,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -219,6 +234,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/edit.vue b/src/views/tested/device/group/components/edit.vue
index a9e83f8..285a137 100644
--- a/src/views/tested/device/group/components/edit.vue
+++ b/src/views/tested/device/group/components/edit.vue
@@ -4,6 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './tableList.vue'
+import { getPostList } from '@/api/system/post'
 import { addGroup, detailGroup, updateGroup } from '@/api/eqpt/device/group'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
@@ -31,11 +32,13 @@
     id: '',
     updateTime: '',
     remark: '',
+    positionId: '',
   },
 }) // 表单
 const rules = ref<FormRules>({
   groupName: [{ required: true, message: '分组名称必填', trigger: 'blur' }],
   remark: [{ required: true, message: '备注必填', trigger: 'blur' }],
+  positionId: [{ required: true, message: '使用岗位必选', trigger: 'blur' }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -102,6 +105,16 @@
   formEl?.resetFields()
   close()
 }
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -141,6 +154,14 @@
               <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用岗位" prop="positionId">
+              <!-- <el-input v-model.trim="ruleForm.groupInfo.createTime" disabled /> -->
+              <el-select v-model="ruleForm.groupInfo.positionId" placeholder="使用岗位" clearable>
+                <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="18">
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index 601968b..39b3b6d 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -2,21 +2,45 @@
 <script lang="ts" setup name="DeviceGroupList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
+import { getPostList } from '@/api/system/post'
+import { getDeptList, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
-  groupName: '',
+  companyId: '', // 所在单位
+  deptId: '', // 使用部门
+  positionId: '', // 使用岗位
   offset: 1,
   limit: 20,
+  subSystemId: '', // 分系统
+  groupName: '', // 分组名称
+  createUserId: userStore.id, // 分组名称
 })
 const columns = ref([
   {
-    text: '分组名称',
-    value: 'groupName',
+    text: '所在单位',
+    value: 'companyName',
     align: 'center',
   },
   {
-    text: '创建人',
+    text: '使用部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '分系统',
+    value: 'subSystemName',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'positionName',
+    align: 'center',
+  },
+  {
+    text: '分组名称创建人',
     value: 'createUserName',
     align: 'center',
   },
@@ -34,7 +58,16 @@
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
-
+// 只看我的 复选框
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.createUserId = userStore.id
+  }
+  else {
+    listQuery.createUserId = ''
+  }
+})
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
@@ -55,7 +88,13 @@
 }
 // 重置
 const reset = () => {
+  listQuery.companyId = ''
+  listQuery.deptId = ''
+  listQuery.positionId = ''
+  listQuery.subSystemId = ''
   listQuery.groupName = ''
+  listQuery.createUserId = userStore.id
+  checked.value = true
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -98,6 +137,64 @@
     })
   })
 }
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 分系统
+const systemList = ref<{ id: string; value: string; name: string }[]>([])
+const systemListAll = ref<{ id: string; value: string; name: string }[]>([])
+// 使用岗位
+const usePositionList = ref<any[]>([])
+// 获取字典
+const fetchDict = () => {
+  // 使用岗位
+  getPostList({}).then((res) => {
+    usePositionList.value = res.data
+  })
+  // 获取使用单位
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 分系统
+    systemList.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    systemListAll.value = res.data.list.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
+}
+fetchDict()
+// 三级联动
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptId = ''
+  listQuery.subSystemId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
+watch(() => listQuery.deptId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      systemList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    systemList.value = systemListAll.value
+  }
+}, {
+  deep: true,
+})
 </script>
 
 <template>
@@ -105,8 +202,40 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
+        <!-- <el-input v-model.trim="listQuery.companyId" placeholder="所在单位" clearable /> -->
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.deptId" placeholder="使用部门" clearable /> -->
+        <!-- <dept-select v-model="listQuery.deptId" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.subSystemId" placeholder="分系统" clearable /> -->
+        <!-- <dept-select v-model="listQuery.subSystemId" :need-top="false" placeholder="分系统" /> -->
+        <el-select v-model="listQuery.subSystemId" filterable placeholder="分系统">
+          <el-option v-for="item in systemList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <!-- <el-input v-model.trim="listQuery.positionId" placeholder="使用岗位" clearable /> -->
+        <el-select v-model="listQuery.positionId" 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.groupName" placeholder="分组名称" clearable />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index c519728..5294a79 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -3,6 +3,7 @@
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
 import { getInfoListPage } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -21,6 +22,7 @@
   },
 })
 const emits = defineEmits(['add'])
+const userStore = useUserStore()
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
@@ -31,9 +33,20 @@
   deptIds: '', // 使用部门
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorId: userStore.id,
   limit: 5,
   offset: 1,
 })
+// 我负责的
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.value.directorId = userStore.id
+  }
+  else {
+    listQuery.value.directorId = ''
+  }
+})
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref(0)
@@ -156,9 +169,11 @@
     deptIds: '', // 使用部门
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorId: userStore.id,
     limit: 5,
     offset: 1,
   }
+  checked.value = true
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -232,6 +247,11 @@
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
+      </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 5db85d5..69b924f 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -183,7 +183,12 @@
   else {
     device.forEach((item: any) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
-        list.value.push(item)
+        list.value.push({
+          ...item,
+          equipmentId: item.id,
+          id: null,
+          groupId: null,
+        })
       }
     })
   }
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 6d4c8d8..cd01404 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,7 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, editInfoNoApproval, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -157,6 +157,8 @@
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
 const deviceQualityList = ref<{ id: string; value: string; name: string }[]>() // 质量状况
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
 // 设备名称
 const deviceNameList = ref<string[]>([])
 // 规格型号
@@ -318,6 +320,9 @@
       ruleForm.value.companyId = res.data.id
       companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
+      getDeptTreeList({ pid: res.data.id }).then((res1) => {
+        deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+      })
     })
   }
   else {
@@ -392,9 +397,17 @@
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
         }
+        // 计量室需要具备对受检设备中设备信息变更的权限，不走审批流，但是要留下变更记录
+        if ($route.path.includes('update') && userStore.deptName.includes('计量室')) {
+          editInfoNoApproval(ruleForm.value).then((res) => {
+            ElMessage.success('保存成功')
+            close()
+          })
+        }
         if (submitId.value !== '未提交' && submitId.value !== '') {
           ruleForm.value.id = submitId.value
         }
+        // 正常流程
         editInfo(ruleForm.value).then((res) => {
           submitId.value = res.data
           disabledSave.value = false
@@ -736,7 +749,10 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
-                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
+                <!-- <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" /> -->
+                <el-select v-model="ruleForm.deptId" filterable placeholder="使用部门" style="width: 100%;">
+                  <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 091c2f6..87ef113 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -20,6 +20,7 @@
 import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
 import { getGroupList } from '@/api/eqpt/device/group'
+import { getDeptList, getDeptTreeList } from '@/api/system/dept'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -300,6 +301,11 @@
 // 规格型号
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptListAll = ref<{ id: string; value: string; name: string }[]>([])
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -345,6 +351,14 @@
     console.log(res.data, '分组')
     groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
   })
+  // 单位部门
+  getDeptList({}).then((res) => {
+    // 单位
+    companyList.value = res.data.list.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // 部门
+    deptList.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    deptListAll.value = res.data.list.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -360,6 +374,20 @@
     modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   }
 })
+// 监听单位，修改部门
+watch(() => listQuery.companyId, (newVal) => {
+  listQuery.deptIds = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+    })
+  }
+  else {
+    deptList.value = deptListAll.value
+  }
+}, {
+  deep: true,
+})
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -862,10 +890,16 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" />
+        <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
+        <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" />
+        <!-- <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" /> -->
+        <el-select v-model="listQuery.deptIds" filterable placeholder="使用部门">
+          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>