diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cfa3489..f6dbdbc 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -28,6 +28,8 @@
   num: 0,
   version: '',
 })
+// 角色名称
+const roleName = ref('')
 // 获取角色列表
 const roleList = ref<any[]>([])
 // 查询数据
@@ -48,6 +50,10 @@
     callback(new Error('角色名称不可为空'))
   }
   else {
+    if (value === roleName.value && value) {
+      callback()
+      return
+    }
     if (roleList.value.filter((item: any) => item.name === value).length) {
       callback(new Error('角色名称重复'))
     }
@@ -166,8 +172,10 @@
     nextTick(() => {
       dataFormRef.value?.clearValidate()
     })
+    roleName.value = ''
   }
   else if (dialogstatus === 'update') {
+    roleName.value = row.name
     formData.value = {
       id: row.id,
       name: row.name,

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cfa3489..f6dbdbc 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -28,6 +28,8 @@
   num: 0,
   version: '',
 })
+// 角色名称
+const roleName = ref('')
 // 获取角色列表
 const roleList = ref<any[]>([])
 // 查询数据
@@ -48,6 +50,10 @@
     callback(new Error('角色名称不可为空'))
   }
   else {
+    if (value === roleName.value && value) {
+      callback()
+      return
+    }
     if (roleList.value.filter((item: any) => item.name === value).length) {
       callback(new Error('角色名称重复'))
     }
@@ -166,8 +172,10 @@
     nextTick(() => {
       dataFormRef.value?.clearValidate()
     })
+    roleName.value = ''
   }
   else if (dialogstatus === 'update') {
+    roleName.value = row.name
     formData.value = {
       id: row.id,
       name: row.name,
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index c3b57f2..39a0840 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -36,6 +36,7 @@
   sex?: string // 性别
   roleName?: string
   attr1?: string
+  avatar?: string
 }
 // 用户列表返回值类型
 export interface userType {
@@ -59,6 +60,7 @@
   syncId: string
   syncName: string
   version: string
+  avatar?: string
 
 }
 export interface changePageType {

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cfa3489..f6dbdbc 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -28,6 +28,8 @@
   num: 0,
   version: '',
 })
+// 角色名称
+const roleName = ref('')
 // 获取角色列表
 const roleList = ref<any[]>([])
 // 查询数据
@@ -48,6 +50,10 @@
     callback(new Error('角色名称不可为空'))
   }
   else {
+    if (value === roleName.value && value) {
+      callback()
+      return
+    }
     if (roleList.value.filter((item: any) => item.name === value).length) {
       callback(new Error('角色名称重复'))
     }
@@ -166,8 +172,10 @@
     nextTick(() => {
       dataFormRef.value?.clearValidate()
     })
+    roleName.value = ''
   }
   else if (dialogstatus === 'update') {
+    roleName.value = row.name
     formData.value = {
       id: row.id,
       name: row.name,
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index c3b57f2..39a0840 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -36,6 +36,7 @@
   sex?: string // 性别
   roleName?: string
   attr1?: string
+  avatar?: string
 }
 // 用户列表返回值类型
 export interface userType {
@@ -59,6 +60,7 @@
   syncId: string
   syncName: string
   version: string
+  avatar?: string
 
 }
 export interface changePageType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 35c09f4..8c38a61 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,7 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '', // 人员类别
+  avatar: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -73,7 +73,7 @@
   roleId: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
-  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
+  avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -109,7 +109,7 @@
   userForm.roleId = ''
   userForm.password = ''
   userForm.rePassword = ''
-  userForm.attr1 = ''
+  userForm.avatar = ''
 }
 // 新增数据
 const createData = () => {
@@ -190,7 +190,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '',
+  avatar: '',
 }) => {
   console.log(row, 'row')
   getDictByCode('sex').then((response) => {
@@ -214,7 +214,7 @@
     userForm.sex = row.sex
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     roleName.value = row.roleName
     // roleName.value = row.roleName
     resetForm1()
@@ -233,7 +233,7 @@
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
     roleName.value = row.roleName
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     delete userForm.password
     delete userForm.rePassword
   }
@@ -326,8 +326,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="人员类别" prop="attr1">
-            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+          <el-form-item label="人员类别" prop="avatar">
+            <el-select v-model="userForm.avatar" placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cfa3489..f6dbdbc 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -28,6 +28,8 @@
   num: 0,
   version: '',
 })
+// 角色名称
+const roleName = ref('')
 // 获取角色列表
 const roleList = ref<any[]>([])
 // 查询数据
@@ -48,6 +50,10 @@
     callback(new Error('角色名称不可为空'))
   }
   else {
+    if (value === roleName.value && value) {
+      callback()
+      return
+    }
     if (roleList.value.filter((item: any) => item.name === value).length) {
       callback(new Error('角色名称重复'))
     }
@@ -166,8 +172,10 @@
     nextTick(() => {
       dataFormRef.value?.clearValidate()
     })
+    roleName.value = ''
   }
   else if (dialogstatus === 'update') {
+    roleName.value = row.name
     formData.value = {
       id: row.id,
       name: row.name,
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index c3b57f2..39a0840 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -36,6 +36,7 @@
   sex?: string // 性别
   roleName?: string
   attr1?: string
+  avatar?: string
 }
 // 用户列表返回值类型
 export interface userType {
@@ -59,6 +60,7 @@
   syncId: string
   syncName: string
   version: string
+  avatar?: string
 
 }
 export interface changePageType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 35c09f4..8c38a61 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,7 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '', // 人员类别
+  avatar: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -73,7 +73,7 @@
   roleId: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
-  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
+  avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -109,7 +109,7 @@
   userForm.roleId = ''
   userForm.password = ''
   userForm.rePassword = ''
-  userForm.attr1 = ''
+  userForm.avatar = ''
 }
 // 新增数据
 const createData = () => {
@@ -190,7 +190,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '',
+  avatar: '',
 }) => {
   console.log(row, 'row')
   getDictByCode('sex').then((response) => {
@@ -214,7 +214,7 @@
     userForm.sex = row.sex
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     roleName.value = row.roleName
     // roleName.value = row.roleName
     resetForm1()
@@ -233,7 +233,7 @@
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
     roleName.value = row.roleName
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     delete userForm.password
     delete userForm.rePassword
   }
@@ -326,8 +326,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="人员类别" prop="attr1">
-            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+          <el-form-item label="人员类别" prop="avatar">
+            <el-select v-model="userForm.avatar" placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index bc6103a..4f3e9a9 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,8 +23,8 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
-  sort: 'desc',
-  orderBy: 'create_time',
+  // sort: 'desc',
+  // orderBy: 'create_time',
 
 })
 const columns = ref([
@@ -146,8 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
-  listQuery.sort = 'desc'
-  listQuery.orderBy = 'create_time'
+  // listQuery.sort = 'desc'
+  // listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称

diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index b10af7e..99c815c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -32,7 +32,7 @@
       common.value = user[0]
     }
     // 如果只有一个 子系统不用选择直接跳转
-    if (sysList.value.length === 1) {
+    if (sysList.value.length === 1 && !user.length) {
       changeSys(sysList.value[0])
     }
   })
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index cfa3489..f6dbdbc 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -28,6 +28,8 @@
   num: 0,
   version: '',
 })
+// 角色名称
+const roleName = ref('')
 // 获取角色列表
 const roleList = ref<any[]>([])
 // 查询数据
@@ -48,6 +50,10 @@
     callback(new Error('角色名称不可为空'))
   }
   else {
+    if (value === roleName.value && value) {
+      callback()
+      return
+    }
     if (roleList.value.filter((item: any) => item.name === value).length) {
       callback(new Error('角色名称重复'))
     }
@@ -166,8 +172,10 @@
     nextTick(() => {
       dataFormRef.value?.clearValidate()
     })
+    roleName.value = ''
   }
   else if (dialogstatus === 'update') {
+    roleName.value = row.name
     formData.value = {
       id: row.id,
       name: row.name,
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index c3b57f2..39a0840 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -36,6 +36,7 @@
   sex?: string // 性别
   roleName?: string
   attr1?: string
+  avatar?: string
 }
 // 用户列表返回值类型
 export interface userType {
@@ -59,6 +60,7 @@
   syncId: string
   syncName: string
   version: string
+  avatar?: string
 
 }
 export interface changePageType {
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 35c09f4..8c38a61 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -26,7 +26,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '', // 人员类别
+  avatar: '', // 人员类别
 })// 表单
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
@@ -73,7 +73,7 @@
   roleId: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
   email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
-  attr1: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
+  avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }],
 })// 前端校验规则
 const roleName = ref<string>()// 角色名，展示用
 const btnLoading = ref<boolean>(false)// 保存按钮的加载中状态
@@ -109,7 +109,7 @@
   userForm.roleId = ''
   userForm.password = ''
   userForm.rePassword = ''
-  userForm.attr1 = ''
+  userForm.avatar = ''
 }
 // 新增数据
 const createData = () => {
@@ -190,7 +190,7 @@
   rePassword: '', // 重复密码
   birthday: '',
   sex: '', // 性别
-  attr1: '',
+  avatar: '',
 }) => {
   console.log(row, 'row')
   getDictByCode('sex').then((response) => {
@@ -214,7 +214,7 @@
     userForm.sex = row.sex
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     roleName.value = row.roleName
     // roleName.value = row.roleName
     resetForm1()
@@ -233,7 +233,7 @@
     userForm.birthday = row.birthday
     userForm.roleId = row.roleId
     roleName.value = row.roleName
-    userForm.attr1 = row.attr1
+    userForm.avatar = row.avatar
     delete userForm.password
     delete userForm.rePassword
   }
@@ -326,8 +326,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="人员类别" prop="attr1">
-            <el-select v-model="userForm.attr1" placeholder="请选择" :style="{ width: '100%' }">
+          <el-form-item label="人员类别" prop="avatar">
+            <el-select v-model="userForm.avatar" placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in perTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index bc6103a..4f3e9a9 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -23,8 +23,8 @@
   certificateNo: '',
   offset: 20,
   limit: 1,
-  sort: 'desc',
-  orderBy: 'create_time',
+  // sort: 'desc',
+  // orderBy: 'create_time',
 
 })
 const columns = ref([
@@ -146,8 +146,8 @@
   listQuery.certificateNo = ''
   listQuery.offset = 20
   listQuery.limit = 1
-  listQuery.sort = 'desc'
-  listQuery.orderBy = 'create_time'
+  // listQuery.sort = 'desc'
+  // listQuery.orderBy = 'create_time'
   search()
 }
 // 设备名称
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 14b960e..a485c9d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="DeviceInfoList">
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import axios from 'axios'
 import type { IlistObjType, IlistQueryType } from './interface'
 import useUserStore from '@/store/modules/user'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
@@ -697,24 +698,51 @@
       lock: true,
       background: 'rgba(255, 255, 255, 0.8)',
     })
-    importDevice(fd, $props.equipmentType).then((res) => {
-      if (res.code === 200) {
-        ElMessage.success('上传成功')
-        fileRef.value.value = ''
-        loading.close()
-
-        fetchData(true)
+    axios({
+      url: `${window.localStorage.getItem('baseURL-eqpt')!}/equipment/info/import?equipmentType=${$props.equipmentType}`,
+      method: 'post',
+      data: fd,
+      headers: { token: userStore.token },
+    }).then((res) => {
+      fileRef.value.value = ''
+      const response = res.data
+      loading.close()
+      if (response.code === 200) {
+        ElMessage.success(response.message)
       }
       else {
-        fileRef.value.value = ''
-        // ElMessage.error(res.message)
-        loading.close()
+        ElMessage.warning(response.message)
       }
     }).catch(() => {
       fileRef.value.value = ''
-      // ElMessage.error(err.message)
       loading.close()
+      ElMessage.error('上传失败')
     })
+    //     export function importDevice(data: object, deviceType: string) {
+    //   return request({
+    //     url: `/equipment/info/import?equipmentType=${deviceType}`,
+    //     method: 'post',
+    //     data,
+    //   })
+    // }
+    // importDevice(fd, $props.equipmentType).then((res) => {
+    //   if (res.code === 200) {
+    //     ElMessage.success('上传成功')
+    //     fileRef.value.value = ''
+    //     loading.close()
+
+    //     fetchData(true)
+    //   }
+    //   else {
+    //     fileRef.value.value = ''
+    //     // ElMessage.error(res.message)
+    //     loading.close()
+    //   }
+    // }).catch(() => {
+    //   fileRef.value.value = ''
+    //   // ElMessage.error(err.message)
+    //   loading.close()
+    // })
   }
 }
 // 导入