ZaiZai 1 年之前
父節點
當前提交
636b353292
共有 4 個文件被更改,包括 10 次插入8 次删除
  1. 0 2
      src/plugins/HcPdfSign.js
  2. 2 2
      src/views/file/collection.vue
  3. 2 2
      src/views/file/records.vue
  4. 6 2
      src/views/home/components/border.vue

+ 0 - 2
src/plugins/HcPdfSign.js

@@ -151,8 +151,6 @@ export default class HcPdfSign {
         const res = await this.getImageSize(url)
         const scaleFactor = 100 / res.height
         const newWidth = res.width * scaleFactor
-        console.log(res)
-        console.log(newWidth)
         this.signImgCss = { url: url, width: newWidth, height: 100 }
     }
 

+ 2 - 2
src/views/file/collection.vue

@@ -314,11 +314,11 @@
                         </el-button>
                     </div>
                     <div class="right">
-                        <el-button :disabled="uploadsLoading" size="large" @click="batchUploadCancel">
+                        <el-button size="large" :loading="uploadSaveLoading" @click="batchUploadCancel">
                             <HcIcon name="close" />
                             <span>取消</span>
                         </el-button>
-                        <el-button :disabled="uploadsLoading" :loading="uploadSaveLoading" hc-btn type="primary" @click="batchUploadSave">
+                        <el-button :loading="uploadSaveLoading" hc-btn type="primary" @click="batchUploadSave">
                             <HcIcon name="save" />
                             <span>提交保存</span>
                         </el-button>

+ 2 - 2
src/views/file/records.vue

@@ -234,11 +234,11 @@
                         <el-alert title="提示:每次不超过10份,文件量越多,响应容易超时" type="error" :closable="false" />
                     </div>
                     <div class="right">
-                        <el-button size="large" :disabled="uploadsLoading" @click="batchUploadCancel">
+                        <el-button size="large" :loading="uploadSaveLoading" @click="batchUploadCancel">
                             <HcIcon name="close" />
                             <span>取消</span>
                         </el-button>
-                        <el-button type="primary" hc-btn :disabled="uploadsLoading" :loading="uploadSaveLoading" @click="batchUploadSave">
+                        <el-button type="primary" hc-btn :loading="uploadSaveLoading" @click="batchUploadSave">
                             <HcIcon name="save" />
                             <span>提交保存</span>
                         </el-button>

+ 6 - 2
src/views/home/components/border.vue

@@ -17,6 +17,7 @@
 
 <script setup>
 import { onMounted, ref } from 'vue'
+import { isNullES } from 'js-fast-way'
 
 //渲染完成
 onMounted(() => {
@@ -42,8 +43,11 @@ const mainWidth = ref(0)
 const mainHeight = ref(0)
 const onWindowResize = () => {
     const el = mainRef.value
-    mainWidth.value = el.clientWidth
-    mainHeight.value = el.clientHeight
+    if (isNullES(el)) {
+        return
+    }
+    mainWidth.value = el?.clientWidth
+    mainHeight.value = el?.clientHeight
 }
 </script>