diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index c8827ac..a671968 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -55,7 +55,7 @@
   }
   // equipmentId
   if (newVal.equipmentId || newVal.id) {
-    fetchData(newVal.equipmentId)
+    fetchData(newVal.equipmentId || newVal.id)
     approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
     fetchStatusList()
     fetchDevicelogs()

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index c8827ac..a671968 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -55,7 +55,7 @@
   }
   // equipmentId
   if (newVal.equipmentId || newVal.id) {
-    fetchData(newVal.equipmentId)
+    fetchData(newVal.equipmentId || newVal.id)
     approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
     fetchStatusList()
     fetchDevicelogs()
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d359207..4962d89 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -38,7 +38,7 @@
 }
 // 对话框类型：create,update
 const dialogStatus = ref('create')
-
+const companyId = ref('')
 const ruleForm = ref({
   approvalStatus: '', // 审批状态
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
@@ -91,6 +91,7 @@
   certificateList: [],
   checkDestination: '', // 检定去向
   // submission: '0', // 送检状态
+  limitInstruction: '', // 限用说明
 }) // 表单
 // 是否展示检定机构等一行信息
 const submission = ref('0')
@@ -153,6 +154,7 @@
   usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
+  limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -203,8 +205,10 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getPostList({}).then((res) => {
-    usePositionList.value = res.data
+  getUserDept().then((res1) => {
+    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
+      usePositionList.value = res.data
+    })
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -259,7 +263,6 @@
   }
 })
 // 设备相关，填充数据
-const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -862,6 +865,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-if="ruleForm.meterIdentify === '1'" :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="限用说明" prop="limitInstruction">
+                <el-input v-model="ruleForm.limitInstruction" type="textarea" :rows="1" placeholder="限用说明" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </detail-block-com>
         <detail-block-com>
           <el-row :gutter="24" class="marg">

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index c8827ac..a671968 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -55,7 +55,7 @@
   }
   // equipmentId
   if (newVal.equipmentId || newVal.id) {
-    fetchData(newVal.equipmentId)
+    fetchData(newVal.equipmentId || newVal.id)
     approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
     fetchStatusList()
     fetchDevicelogs()
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d359207..4962d89 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -38,7 +38,7 @@
 }
 // 对话框类型：create,update
 const dialogStatus = ref('create')
-
+const companyId = ref('')
 const ruleForm = ref({
   approvalStatus: '', // 审批状态
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
@@ -91,6 +91,7 @@
   certificateList: [],
   checkDestination: '', // 检定去向
   // submission: '0', // 送检状态
+  limitInstruction: '', // 限用说明
 }) // 表单
 // 是否展示检定机构等一行信息
 const submission = ref('0')
@@ -153,6 +154,7 @@
   usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
+  limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -203,8 +205,10 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getPostList({}).then((res) => {
-    usePositionList.value = res.data
+  getUserDept().then((res1) => {
+    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
+      usePositionList.value = res.data
+    })
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -259,7 +263,6 @@
   }
 })
 // 设备相关，填充数据
-const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -862,6 +865,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-if="ruleForm.meterIdentify === '1'" :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="限用说明" prop="limitInstruction">
+                <el-input v-model="ruleForm.limitInstruction" type="textarea" :rows="1" placeholder="限用说明" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </detail-block-com>
         <detail-block-com>
           <el-row :gutter="24" class="marg">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2257385..26c0cca 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -177,7 +177,7 @@
     text: '分组',
     value: 'groupNames',
     align: 'center',
-    filters: true,
+    // filters: true,
   },
 ])
 const otherColums = ref([
@@ -465,11 +465,12 @@
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
+  togetherList.value = [[]] as any
   togetherLoading.value = true
   getInfoListTogether({ ...listQuery, directorId: $props.statusName === '全部' && checked.value ? userStore.id : '' }).then((res) => {
-    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
+    // 收起展开
   })
 }
 // 获取展开行内表格数据
@@ -495,18 +496,7 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 查询数据
-async function search() {
-  if (tableFlage.value) {
-    // 普通表格
-    fetchData(false)
-  }
-  else {
-    // 聚合表格
-    await fetchTogetherData()
-    fetchExpandData(listQuery)
-  }
-}
+
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
 //   console.log(newVal, 'newVal')handler
@@ -521,7 +511,7 @@
   selectList.value = row
 }
 // 控制展开行
-const expands = ref()
+const expands = ref<any[]>([])
 const expandChange = (row: any, expandedRows: any) => {
   if (expandedRows.length) {
     expands.value = []
@@ -581,11 +571,26 @@
     }
   }
 }
+// 查询数据
+async function search() {
+  if (tableFlage.value) {
+    // 普通表格
+    fetchData(false)
+  }
+  else {
+    // 聚合表格
+    await fetchTogetherData()
+    // 先判断是否有展开行
+    if (expands.value.length) {
+      fetchExpandData({ equipmentName: expands.value[0] })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
   // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-  if ($props.statusName === '全部' && userStore.roleNames.includes('操作手') && type === 'update') {
+  if ($props.statusName === '全部' && userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手' && type === 'update') {
     if (row.directorName !== userStore.name) {
       ElMessage.warning('负责人不是自己,不可编辑')
       return
@@ -603,28 +608,57 @@
 }
 // 导出列表
 const exportList = () => {
-  if (list.value.length) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: 'Loading',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    const data = {
-      ...listQuery,
-      offset: undefined,
-      limit: undefined,
-      ids: selectList.value.map(item => item.id),
-    }
-    exportDevice(data).then((res) => {
-      exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
-      loading.close()
-    })
-      .catch((_) => {
+  if (tableFlage.value) {
+    // 普通表格
+    if (list.value.length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: selectList.value.map(item => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
         loading.close()
       })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
   else {
-    ElMessage.warning('无可导出内容')
+    // 聚合表格
+    if (expandTableRef.value.getSelectionRows().map((item: any) => item.id).length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
+        loading.close()
+      })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
 }
 const fileRef = ref() // 文件上传input，获取input的引用
@@ -725,7 +759,7 @@
 const delHandler = (row: IlistObjType) => {
   if ($props.statusName === '全部') {
     // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-    if (userStore.roleNames.includes('操作手')) {
+    if (userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手') {
       if (row.directorName !== userStore.name) {
         ElMessage.warning('负责人不是自己,不可删除')
         return
@@ -880,20 +914,20 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" />
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
@@ -908,7 +942,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+        <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>
@@ -919,12 +953,12 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" />
         </search-item>
 
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -944,34 +978,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位" clearable>
+          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-select v-model="listQuery.taskId" placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组" clearable>
+          <el-select v-model="listQuery.groupId" placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
@@ -1081,7 +1115,7 @@
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
             }
-          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+          " :pagination=" false " :is-showmulti-select=" false " :query="{}"
         >
           <!-- <template #columns>
             <el-table-column label="操作" width="160" align="center" />
@@ -1094,8 +1128,8 @@
           :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
           @select="togetherSelect"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column type="expand">
+          <!-- <el-table-column type="selection" width="38" /> -->
+          <el-table-column type="expand" width="38">
             <template #default>
               <!-- 展开表格身体 -->
               <!-- <normal-table
@@ -1181,5 +1215,9 @@
     display: none;
   }
 }
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
 </style>
 

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index c8827ac..a671968 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -55,7 +55,7 @@
   }
   // equipmentId
   if (newVal.equipmentId || newVal.id) {
-    fetchData(newVal.equipmentId)
+    fetchData(newVal.equipmentId || newVal.id)
     approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
     fetchStatusList()
     fetchDevicelogs()
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d359207..4962d89 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -38,7 +38,7 @@
 }
 // 对话框类型：create,update
 const dialogStatus = ref('create')
-
+const companyId = ref('')
 const ruleForm = ref({
   approvalStatus: '', // 审批状态
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
@@ -91,6 +91,7 @@
   certificateList: [],
   checkDestination: '', // 检定去向
   // submission: '0', // 送检状态
+  limitInstruction: '', // 限用说明
 }) // 表单
 // 是否展示检定机构等一行信息
 const submission = ref('0')
@@ -153,6 +154,7 @@
   usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
+  limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -203,8 +205,10 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getPostList({}).then((res) => {
-    usePositionList.value = res.data
+  getUserDept().then((res1) => {
+    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
+      usePositionList.value = res.data
+    })
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -259,7 +263,6 @@
   }
 })
 // 设备相关，填充数据
-const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -862,6 +865,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-if="ruleForm.meterIdentify === '1'" :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="限用说明" prop="limitInstruction">
+                <el-input v-model="ruleForm.limitInstruction" type="textarea" :rows="1" placeholder="限用说明" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </detail-block-com>
         <detail-block-com>
           <el-row :gutter="24" class="marg">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2257385..26c0cca 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -177,7 +177,7 @@
     text: '分组',
     value: 'groupNames',
     align: 'center',
-    filters: true,
+    // filters: true,
   },
 ])
 const otherColums = ref([
@@ -465,11 +465,12 @@
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
+  togetherList.value = [[]] as any
   togetherLoading.value = true
   getInfoListTogether({ ...listQuery, directorId: $props.statusName === '全部' && checked.value ? userStore.id : '' }).then((res) => {
-    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
+    // 收起展开
   })
 }
 // 获取展开行内表格数据
@@ -495,18 +496,7 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 查询数据
-async function search() {
-  if (tableFlage.value) {
-    // 普通表格
-    fetchData(false)
-  }
-  else {
-    // 聚合表格
-    await fetchTogetherData()
-    fetchExpandData(listQuery)
-  }
-}
+
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
 //   console.log(newVal, 'newVal')handler
@@ -521,7 +511,7 @@
   selectList.value = row
 }
 // 控制展开行
-const expands = ref()
+const expands = ref<any[]>([])
 const expandChange = (row: any, expandedRows: any) => {
   if (expandedRows.length) {
     expands.value = []
@@ -581,11 +571,26 @@
     }
   }
 }
+// 查询数据
+async function search() {
+  if (tableFlage.value) {
+    // 普通表格
+    fetchData(false)
+  }
+  else {
+    // 聚合表格
+    await fetchTogetherData()
+    // 先判断是否有展开行
+    if (expands.value.length) {
+      fetchExpandData({ equipmentName: expands.value[0] })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
   // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-  if ($props.statusName === '全部' && userStore.roleNames.includes('操作手') && type === 'update') {
+  if ($props.statusName === '全部' && userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手' && type === 'update') {
     if (row.directorName !== userStore.name) {
       ElMessage.warning('负责人不是自己,不可编辑')
       return
@@ -603,28 +608,57 @@
 }
 // 导出列表
 const exportList = () => {
-  if (list.value.length) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: 'Loading',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    const data = {
-      ...listQuery,
-      offset: undefined,
-      limit: undefined,
-      ids: selectList.value.map(item => item.id),
-    }
-    exportDevice(data).then((res) => {
-      exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
-      loading.close()
-    })
-      .catch((_) => {
+  if (tableFlage.value) {
+    // 普通表格
+    if (list.value.length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: selectList.value.map(item => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
         loading.close()
       })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
   else {
-    ElMessage.warning('无可导出内容')
+    // 聚合表格
+    if (expandTableRef.value.getSelectionRows().map((item: any) => item.id).length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
+        loading.close()
+      })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
 }
 const fileRef = ref() // 文件上传input，获取input的引用
@@ -725,7 +759,7 @@
 const delHandler = (row: IlistObjType) => {
   if ($props.statusName === '全部') {
     // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-    if (userStore.roleNames.includes('操作手')) {
+    if (userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手') {
       if (row.directorName !== userStore.name) {
         ElMessage.warning('负责人不是自己,不可删除')
         return
@@ -880,20 +914,20 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" />
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
@@ -908,7 +942,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+        <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>
@@ -919,12 +953,12 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" />
         </search-item>
 
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -944,34 +978,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位" clearable>
+          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-select v-model="listQuery.taskId" placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组" clearable>
+          <el-select v-model="listQuery.groupId" placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
@@ -1081,7 +1115,7 @@
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
             }
-          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+          " :pagination=" false " :is-showmulti-select=" false " :query="{}"
         >
           <!-- <template #columns>
             <el-table-column label="操作" width="160" align="center" />
@@ -1094,8 +1128,8 @@
           :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
           @select="togetherSelect"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column type="expand">
+          <!-- <el-table-column type="selection" width="38" /> -->
+          <el-table-column type="expand" width="38">
             <template #default>
               <!-- 展开表格身体 -->
               <!-- <normal-table
@@ -1181,5 +1215,9 @@
     display: none;
   }
 }
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
 </style>
 
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index f9b05e5..488b06c 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -67,6 +67,9 @@
   if (newVal?.length) {
     rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
   }
+  else {
+    rules.value.category = []
+  }
 }, { deep: true })
 // 弹窗初始化
 const initDialog = () => {

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 949bab7..902a16b 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -11,6 +11,7 @@
 import useUserStore from '@/store/modules/user'
 import useMenuStore from '@/store/modules/menu'
 import useRouteStore from '@/store/modules/route'
+import ResetPwd from '@/layouts/components/Tools/resetPwd.vue'
 const routeStore = useRouteStore()
 
 const route = useRoute()
@@ -39,7 +40,7 @@
   if (system.url.includes('http')) {
     const token = userStore.token
     const params = `?token=${token}`
-    console.log(system.url + params)
+    // console.log(system.url + params)
     window.open(system.url + params)
   }
   else {
@@ -54,6 +55,23 @@
     })
   }
 }
+const resetPwd = ref()
+function userCommand(command: 'dashboard' | 'resetPassword' | 'setting' | 'hotkeys' | 'logout' | 'index') {
+  switch (command) {
+    case 'resetPassword':
+      resetPwd.value.initDialog()
+      break
+    case 'logout':
+      localStorage.removeItem('currentSys')
+      routeStore.removeRoutes()
+      userStore.logout().then(() => {
+        router.push({
+          name: 'login',
+        })
+      })
+      break
+  }
+}
 </script>
 
 <template>
@@ -80,11 +98,56 @@
         账户管理
       </div>
     </div>
+    <!-- 退出登录 -->
+    <el-dropdown class="user-container" size="default" @command="userCommand">
+      <div class="user-wrapper">
+        {{ userStore.name }}
+        <el-icon>
+          <svg-icon name="ep:caret-bottom" />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu class="user-dropdown" style="font-size: 20px;">
+          <!-- <el-dropdown-item divided command="resetPassword">
+            修改密码
+          </el-dropdown-item> -->
+          <el-dropdown-item divided command="logout">
+            退出登录
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <reset-pwd ref="resetPwd" />
     <copyright />
   </div>
 </template>
 
 <style lang="scss" scoped>
+:deep(.user-container) {
+  display: inline-block;
+  height: 24px;
+  line-height: 24px;
+  cursor: pointer;
+  position: absolute;
+  top: 2%;
+  right: 3%;
+  width: 8%;
+  text-align: center;
+  z-index: 999999;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+  // border: 2px solid #fff;
+
+  .user-wrapper {
+    .el-avatar {
+      vertical-align: middle;
+      margin-top: -2px;
+      margin-right: 4px;
+    }
+  }
+}
+
 .container-all-sys {
   width: 100%;
   position: absolute;
@@ -146,7 +209,7 @@
 
 .common-container {
   position: absolute;
-  z-index: 99999;
+  // z-index: 99999;
   width: 8%;
   height: 80px;
   font-size: 20px;
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index 84ed512..3a6e621 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -7,8 +7,8 @@
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   deptName: '',
-  offset: 1,
-  limit: 20,
+  // offset: 1,
+  // limit: 20,
 })
 const columns = ref([
   {
@@ -59,14 +59,14 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data
-  listLoading.value = false
-  // })
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
+  getListPage(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
@@ -76,10 +76,16 @@
 // 重置
 const reset = () => {
   listQuery.deptName = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
+  // listQuery.offset = 1
+  // listQuery.limit = 20
   search()
 }
+// // 表格被选中的行
+// const selectList = ref<any[]>([])
+// // 表格多选
+// const multiSelect = (row: any[]) => {
+//   selectList.value = row
+// }
 // 导出列表
 const exportList = () => {
   if (list.value.length) {
@@ -116,7 +122,7 @@
       </template>
       <!-- 普通表格 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
         :is-showmulti-select="false" :pagination=" false " :options="
           {
             needIndex: true, // 是否需要序号列
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 86fc995..decb5d3 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -22,7 +22,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -105,7 +105,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -262,7 +262,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index a93fb54..bbe6c86 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -36,7 +36,7 @@
   manufacturer: '',
   deptId: '',
   usePositionId: '',
-  usageStatus: '',
+  usageStatusList: ['0', '1', '4'],
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
@@ -118,7 +118,7 @@
     manufacturer: '',
     deptId: '',
     usePositionId: '',
-    usageStatus: '',
+    usageStatusList: [],
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
@@ -251,7 +251,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable style="width: 100%;">
+        <el-select v-model="listQuery.usageStatusList" collapse-tags multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index 6c6ca71..6a9b44b 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -17,6 +17,7 @@
     value: 'equipmentName',
     required: true,
     isSelect: false, // 是否下拉框
+    isClick: true,
   },
   {
     text: '型号规格',
@@ -29,7 +30,7 @@
     value: 'manufactureNo',
     required: false,
     isSelect: false, // 是否下拉框
-    isClick: true,
+    isClick: false,
   },
   {
     text: '生产厂家',
@@ -259,7 +260,7 @@
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable && (item.text !== '出厂编号' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <span v-if="!scope.row.editable && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
           <el-input
             v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index c8827ac..a671968 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -55,7 +55,7 @@
   }
   // equipmentId
   if (newVal.equipmentId || newVal.id) {
-    fetchData(newVal.equipmentId)
+    fetchData(newVal.equipmentId || newVal.id)
     approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
     fetchStatusList()
     fetchDevicelogs()
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d359207..4962d89 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -38,7 +38,7 @@
 }
 // 对话框类型：create,update
 const dialogStatus = ref('create')
-
+const companyId = ref('')
 const ruleForm = ref({
   approvalStatus: '', // 审批状态
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
@@ -91,6 +91,7 @@
   certificateList: [],
   checkDestination: '', // 检定去向
   // submission: '0', // 送检状态
+  limitInstruction: '', // 限用说明
 }) // 表单
 // 是否展示检定机构等一行信息
 const submission = ref('0')
@@ -153,6 +154,7 @@
   usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
+  limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -203,8 +205,10 @@
     // console.log(res.data, '设备名称')
   })
   // 使用岗位
-  getPostList({}).then((res) => {
-    usePositionList.value = res.data
+  getUserDept().then((res1) => {
+    getPostList({ searchId: $route.path.includes('detail') ? '' : res1.data.id }).then((res) => {
+      usePositionList.value = res.data
+    })
   })
   // 安装位置
   getLocationList().then((res) => {
@@ -259,7 +263,6 @@
   }
 })
 // 设备相关，填充数据
-const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -862,6 +865,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-if="ruleForm.meterIdentify === '1'" :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="限用说明" prop="limitInstruction">
+                <el-input v-model="ruleForm.limitInstruction" type="textarea" :rows="1" placeholder="限用说明" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </detail-block-com>
         <detail-block-com>
           <el-row :gutter="24" class="marg">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2257385..26c0cca 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -177,7 +177,7 @@
     text: '分组',
     value: 'groupNames',
     align: 'center',
-    filters: true,
+    // filters: true,
   },
 ])
 const otherColums = ref([
@@ -465,11 +465,12 @@
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
+  togetherList.value = [[]] as any
   togetherLoading.value = true
   getInfoListTogether({ ...listQuery, directorId: $props.statusName === '全部' && checked.value ? userStore.id : '' }).then((res) => {
-    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
+    // 收起展开
   })
 }
 // 获取展开行内表格数据
@@ -495,18 +496,7 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 查询数据
-async function search() {
-  if (tableFlage.value) {
-    // 普通表格
-    fetchData(false)
-  }
-  else {
-    // 聚合表格
-    await fetchTogetherData()
-    fetchExpandData(listQuery)
-  }
-}
+
 // 监听聚合表格多选
 // watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
 //   console.log(newVal, 'newVal')handler
@@ -521,7 +511,7 @@
   selectList.value = row
 }
 // 控制展开行
-const expands = ref()
+const expands = ref<any[]>([])
 const expandChange = (row: any, expandedRows: any) => {
   if (expandedRows.length) {
     expands.value = []
@@ -581,11 +571,26 @@
     }
   }
 }
+// 查询数据
+async function search() {
+  if (tableFlage.value) {
+    // 普通表格
+    fetchData(false)
+  }
+  else {
+    // 聚合表格
+    await fetchTogetherData()
+    // 先判断是否有展开行
+    if (expands.value.length) {
+      fetchExpandData({ equipmentName: expands.value[0] })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
   // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-  if ($props.statusName === '全部' && userStore.roleNames.includes('操作手') && type === 'update') {
+  if ($props.statusName === '全部' && userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手' && type === 'update') {
     if (row.directorName !== userStore.name) {
       ElMessage.warning('负责人不是自己,不可编辑')
       return
@@ -603,28 +608,57 @@
 }
 // 导出列表
 const exportList = () => {
-  if (list.value.length) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: 'Loading',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    const data = {
-      ...listQuery,
-      offset: undefined,
-      limit: undefined,
-      ids: selectList.value.map(item => item.id),
-    }
-    exportDevice(data).then((res) => {
-      exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
-      loading.close()
-    })
-      .catch((_) => {
+  if (tableFlage.value) {
+    // 普通表格
+    if (list.value.length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: selectList.value.map(item => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
         loading.close()
       })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
   else {
-    ElMessage.warning('无可导出内容')
+    // 聚合表格
+    if (expandTableRef.value.getSelectionRows().map((item: any) => item.id).length) {
+      const loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const data = {
+        ...listQuery,
+        offset: undefined,
+        limit: undefined,
+        ids: expandTableRef.value.getSelectionRows().map((item: any) => item.id),
+      }
+      exportDevice(data).then((res) => {
+        exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
+        loading.close()
+      })
+        .catch((_) => {
+          loading.close()
+        })
+    }
+    else {
+      ElMessage.warning('无可导出内容')
+    }
   }
 }
 const fileRef = ref() // 文件上传input，获取input的引用
@@ -725,7 +759,7 @@
 const delHandler = (row: IlistObjType) => {
   if ($props.statusName === '全部') {
     // 当角色是操作手时，只有负责人是自己时可以编辑/删除
-    if (userStore.roleNames.includes('操作手')) {
+    if (userStore.roleNames.length === 1 && userStore.roleNames[0] === '操作手') {
       if (row.directorName !== userStore.name) {
         ElMessage.warning('负责人不是自己,不可删除')
         return
@@ -880,20 +914,20 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
+        <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称">
           <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号" clearable>
+        <el-select v-model.trim="listQuery.model" filterable placeholder="规格型号">
           <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" />
       </search-item>
       <search-item>
         <!-- <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" /> -->
@@ -908,7 +942,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+        <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>
@@ -919,12 +953,12 @@
       </template>
       <span v-show="!searchMore">
         <search-item>
-          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+          <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" />
         </search-item>
 
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
-          <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
+          <el-select v-model="listQuery.directorName" filterable placeholder="负责人" style="width: 100%;">
             <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
@@ -944,34 +978,34 @@
           />
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
+          <el-select v-model="listQuery.usageStatus" placeholder="使用状态">
             <el-option v-for="item in useStatusList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-select v-model="listQuery.useSign" placeholder="在用信息">
             <el-option v-for="item in inUseList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位" clearable>
+          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位">
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable /> -->
-          <el-select v-model="listQuery.installLocation" placeholder="安装位置" clearable>
+          <el-select v-model="listQuery.installLocation" placeholder="安装位置">
             <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-select v-model="listQuery.taskId" placeholder="参试任务">
             <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="listQuery.groupId" placeholder="分组" clearable>
+          <el-select v-model="listQuery.groupId" placeholder="分组">
             <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
           <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
@@ -1081,7 +1115,7 @@
               needIndex: false, // 是否需要序号列
               border: true, // 是否需要上方边框
             }
-          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+          " :pagination=" false " :is-showmulti-select=" false " :query="{}"
         >
           <!-- <template #columns>
             <el-table-column label="操作" width="160" align="center" />
@@ -1094,8 +1128,8 @@
           :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
           @select="togetherSelect"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column type="expand">
+          <!-- <el-table-column type="selection" width="38" /> -->
+          <el-table-column type="expand" width="38">
             <template #default>
               <!-- 展开表格身体 -->
               <!-- <normal-table
@@ -1181,5 +1215,9 @@
     display: none;
   }
 }
+
+::v-deep(.el-table__expanded-cell) {
+  padding: 0;
+}
 </style>
 
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index f9b05e5..488b06c 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -67,6 +67,9 @@
   if (newVal?.length) {
     rules.value.category = [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }]
   }
+  else {
+    rules.value.category = []
+  }
 }, { deep: true })
 // 弹窗初始化
 const initDialog = () => {
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 87b342e..885c7cd 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -156,6 +156,7 @@
   listQuery.taskId = ''
   listQuery.deptId = ''
   listQuery.checkStatus = ''
+  listQuery.checkDestination = ''
   listQuery.useSign = ''
   listQuery.limit = 20
   listQuery.offset = 1