diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 8773439..13465d2 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -68,7 +68,7 @@
     ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取用户所在单位
     getUserDept().then((res) => {
-      if (res.data.fullName === '顶级' || res.data.version === '1') {
+      if (res.data.version === '1') {
         isAdmin.value = false
         getAdminDept({}).then((res) => {
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
@@ -77,6 +77,9 @@
       else {
         isAdmin.value = true
         ruleForm.noticeCompany = res.data.fullName
+        if (res.data.fullName === '顶级') {
+          ruleForm.noticeCompany = '顶级'
+        }
       }
     })
   }

diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 8773439..13465d2 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -68,7 +68,7 @@
     ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取用户所在单位
     getUserDept().then((res) => {
-      if (res.data.fullName === '顶级' || res.data.version === '1') {
+      if (res.data.version === '1') {
         isAdmin.value = false
         getAdminDept({}).then((res) => {
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
@@ -77,6 +77,9 @@
       else {
         isAdmin.value = true
         ruleForm.noticeCompany = res.data.fullName
+        if (res.data.fullName === '顶级') {
+          ruleForm.noticeCompany = '顶级'
+        }
       }
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9ab7f86..16e5c17 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -358,7 +358,7 @@
   inCheckInfo({ deptIds: id }).then((res) => {
     const data = res.data
     // 设备态势分析
-    inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
+    inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count })).filter((item: any) => item.value)
     // 部门排行榜
     if (isAdmin) {
       const max = Math.max(...data.dircetorAggrList.map((item: any) => item.count))
@@ -389,7 +389,7 @@
   toCheckInfo({ deptIds: id }).then((res) => {
     const data = res.data
     // 设备态势分析
-    toCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
+    toCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count })).filter((item: any) => item.value)
     // 部门排行榜
     if (isAdmin) {
       const max = Math.max(...data.dircetorAggrList.map((item: any) => item.count))

diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 8773439..13465d2 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -68,7 +68,7 @@
     ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取用户所在单位
     getUserDept().then((res) => {
-      if (res.data.fullName === '顶级' || res.data.version === '1') {
+      if (res.data.version === '1') {
         isAdmin.value = false
         getAdminDept({}).then((res) => {
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
@@ -77,6 +77,9 @@
       else {
         isAdmin.value = true
         ruleForm.noticeCompany = res.data.fullName
+        if (res.data.fullName === '顶级') {
+          ruleForm.noticeCompany = '顶级'
+        }
       }
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9ab7f86..16e5c17 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -358,7 +358,7 @@
   inCheckInfo({ deptIds: id }).then((res) => {
     const data = res.data
     // 设备态势分析
-    inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
+    inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count })).filter((item: any) => item.value)
     // 部门排行榜
     if (isAdmin) {
       const max = Math.max(...data.dircetorAggrList.map((item: any) => item.count))
@@ -389,7 +389,7 @@
   toCheckInfo({ deptIds: id }).then((res) => {
     const data = res.data
     // 设备态势分析
-    toCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
+    toCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count })).filter((item: any) => item.value)
     // 部门排行榜
     if (isAdmin) {
       const max = Math.max(...data.dircetorAggrList.map((item: any) => item.count))
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index b67b240..d31cf6e 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -971,10 +971,10 @@
           <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="计量标识">
-          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>
+      <search-item v-show="$props.statusName === '全部'">
+        <el-checkbox v-model="checked" size="large" checked>
+          只看我负责的
+        </el-checkbox>
       </search-item>
       <!-- 折叠查询条件 -->
       <template #searchMore>
@@ -983,6 +983,11 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
+          <el-select v-model="listQuery.meterIdentify" placeholder="计量标识">
+            <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <search-item>
           <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" />
         </search-item>
         <search-item>
@@ -1039,9 +1044,7 @@
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
         </search-item>
-        <search-item v-show="$props.statusName === '全部'">
-          <el-checkbox v-model="checked" 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" />