修复bug

src/views/department/MyFile.vue

@@ -441,8 +441,9 @@
     <!-- 可用扫描仪信息 -->
      <div>
         <el-dialog v-model="checkScanner" title="扫描仪" width="30%">
-            <div v-for="item in scannerList" :key="item.scannerId" @click="checkScanFn(item)" :class="{'checkScan':item.scannerId ==checkScanId }">
-                {{item.scannerName}}
+            <div v-for="item in scannerList" :key="item.scannerId" @click="checkScanFn(item)" id="Onescan" :class="{'checkScan':item.scannerId ==checkScanId }">
+               <img src="@/assets/images/scanImg.png" alt="">
+                {{item.deptName?item.deptName:''}}&nbsp;&nbsp;{{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -2565,6 +2566,13 @@ p {
         justify-content: space-between;
     }
 }
+#Onescan{
+    height: 48px;
+    line-height: 48px;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+}
 
 .isCheck {
     opacity: 1 !important;

src/views/highSearch/HighSearch.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="container">
     <div class="logo">
-      <img src="@/assets/images/Frame_427319127.png" alt="" />
+      <img src="@/assets/images/logos.png" alt="" />
       <div class="font">聚合智慧文档管理系统</div>
     </div>
     <div class="search_box">
@@ -238,8 +238,9 @@ const closeImgPreview = () => {
   align-items: center;
 
   img {
-    width: 80px;
-    height: 80px;
+    width: 100px;
+    height: 40px;
+    margin-right: 10px;
   }
 
   .font {

src/views/login.vue

@@ -289,6 +289,7 @@ const submitForm = async (formEl) => {
       ).then((response) => {
         console.log("response", response);
         ElMessage({ message: "修改成功,请重新登录", type: "success" });
+        formData.value = { oldpss: "", newpass: "", rePass: "" };
         showEdit.value = false;
       });
     } else {

src/views/myfile/MyFile.vue

@@ -462,7 +462,8 @@
      <div>
         <el-dialog v-model="checkScanner" title="扫描仪" width="30%">
             <div v-for="item in scannerList" :key="item.scannerId" @click="checkScanFn(item)" id="Onescan" :class="{'checkScan':item.scannerId ==checkScanId }">
-                {{item.scannerName}}
+               <img src="@/assets/images/scanImg.png" alt="">
+                {{item.deptName?item.deptName:''}}&nbsp;&nbsp;{{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -2536,9 +2537,11 @@ p {
     background-color: #F5F7F9;
 }
 #Onescan{
-    height: 30px;
-    line-height: 30px;
+    height: 48px;
+    line-height: 48px;
     font-size: 14px;
+    display: flex;
+    align-items: center;
 }
 
 :deep(.el-collapse-item__header) {

src/views/publicment/MyFile.vue

@@ -437,8 +437,9 @@
     <!-- 可用扫描仪信息 -->
      <div>
         <el-dialog v-model="checkScanner" title="扫描仪" width="30%">
-            <div v-for="item in scannerList" :key="item.scannerId" @click="checkScanFn(item)" :class="{'checkScan':item.scannerId ==checkScanId }">
-                {{item.scannerName}}
+            <div v-for="item in scannerList" :key="item.scannerId" id="Onescan" @click="checkScanFn(item)" :class="{'checkScan':item.scannerId ==checkScanId }">
+               <img src="@/assets/images/scanImg.png" alt="">
+                {{item.deptName?item.deptName:''}}&nbsp;&nbsp;{{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -2353,7 +2354,13 @@ p {
     border-radius: 4px;
     background-color: white;
 }
-
+#Onescan{
+    height: 48px;
+    line-height: 48px;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+}
 .useBox {
     width: 100%;
     height: 24px;

src/views/scanner/info/index.vue

@@ -169,6 +169,7 @@
 
 <script setup name="Info">
 import { addInfo, updateInfo, delInfo, getInfo, listInfo } from '@/api/scanner/info'
+import { getInfo as getUserInfoApi} from "@/api/login";
 import { encode, decode } from '@/utils/sm2util'
 import {
   deptTreeSelect,
@@ -187,6 +188,7 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
 const deptOptions = ref(undefined);
+const userDeptId = ref()
 //ip验证
 const scannerIpRule = (rule, value, callback) => {
   var pPattern = new RegExp(
@@ -248,7 +250,7 @@ function reset() {
     scannerIp: null,
     isPublic: "N",
     userId: null,
-    deptId: null,
+    deptId: userDeptId.value,
     createBy: null,
     createTime: null,
     updateBy: null,
@@ -373,6 +375,12 @@ console.log('arr',arr);
     )     
   console.log('row',row);
 }
+const getUserInfo =async ()=>{
+const infoRes = await getUserInfoApi();
+userDeptId.value = infoRes.user.deptId
+console.log('infoRes',infoRes);
+}
+getUserInfo()
 getDeptTree();
 getList()
 </script>

src/views/system/user/profile/resetPwd.vue

@@ -4,10 +4,10 @@
          <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
       </el-form-item>
       <el-form-item label="新密码" prop="newPassword">
-         <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
+         <el-input v-model="user.newPassword" placeholder="密码长度最少为8位，包含大小写字母、数字、特殊字符" type="password" show-password />
       </el-form-item>
       <el-form-item label="确认密码" prop="confirmPassword">
-         <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+         <el-input v-model="user.confirmPassword" placeholder="密码长度最少为8位，包含大小写字母、数字、特殊字符" type="password" show-password/>
       </el-form-item>
       <el-form-item>
       <el-button type="primary" @click="submit" class="sure">保存</el-button>