=to== ，扫描仪列表优化

src/views/department/MyFile.vue

@@ -443,7 +443,7 @@
         <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 }">
                <img src="@/assets/images/scanImg.png" alt="">
-                {{item.deptName?item.deptName:''}}&nbsp;&nbsp;{{item.scannerName}}
+                {{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -1973,7 +1973,7 @@ export default {
             // console.log('onActivated.query',route.query);
             loadingPreview.value = true
             //给pagesize复制
-            if(fileGrid.value = 0){
+            if(fileGrid.value == 0){
                  pageSize.value = 20               
             }else{
                 if(!folder.value.length){

src/views/myfile/MyFile.vue

@@ -463,7 +463,7 @@
         <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 }">
                <img src="@/assets/images/scanImg.png" alt="">
-                {{item.deptName?item.deptName:''}}&nbsp;&nbsp;{{item.scannerName}}
+                {{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -1994,6 +1994,17 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const changePageSizeFn = ()=>{
+            if(fileGrid.value == 0){
+                if(!folder.value.length){
+                    pageSize.value = 80
+                }else{
+                    pageSize.value = 20+pageSize.value
+                }
+            }else{
+                pageSize.value = 20
+            }
+        }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);
             console.log('files',newValue);
@@ -2059,6 +2070,7 @@ export default {
             // console.log('!thisFolder.value',thisFolder.value);
             // refreshFile()
             // 添加监听，点击其他地方关闭文件夹右键菜单
+            changePageSizeFn()
             window.addEventListener("click", closeRMenu, true);
             window.addEventListener("click", mouseClick, true);
             // console.log('onMounted');
@@ -2068,15 +2080,7 @@ export default {
             // console.log('onActivated.query',route.query);
             loadingPreview.value = true
             //给pagesize复制
-            if(fileGrid.value = 0){
-                 pageSize.value = 20               
-            }else{
-                if(!folder.value.length){
-                    pageSize.value = 80
-                }else{
-                    pageSize.value = 20+pageSize.value
-                }
-            }
+
             // setTimeout(()=>{
             //     if(route.query.row){
             //         const newRow = JSON.parse(route.query.row)
@@ -2340,7 +2344,8 @@ export default {
             setImg,
             closeAddFile,
             fileHeight,
-            pageSize
+            pageSize,
+            changePageSizeFn
         }
     },
     watch: {

src/views/publicment/MyFile.vue

@@ -439,7 +439,7 @@
         <el-dialog v-model="checkScanner" title="扫描仪" width="30%">
             <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}}
+                {{item.scannerName}}
             </div>
             <template #footer>
                 <span class="dialog-footer">
@@ -1987,7 +1987,7 @@ export default {
             console.log('onActivated.query',route.query);
             loadingPreview.value = true
             //给pagesize复制
-            if(fileGrid.value = 0){
+            if(fileGrid.value == 0){
                  pageSize.value = 20               
             }else{
                 if(!folder.value.length){

src/views/scanner/info/index.vue

@@ -312,7 +312,8 @@ function submitForm() {
           getList()
         })
       } else {
-         console.log('form.value',form.value);
+        // const query = JSON.parse(JSON.stringify(form.value))
+        //  console.log('form.value',query);
             addInfo(form.value).then((response) => {
               const data = response.data
               const pass=decode(data.pass);