From 1781f0ccce5407d6b72e4c6eeced0a24fe4b51fb Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Tue, 18 Jun 2024 09:49:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=A3=81?=
 =?UTF-8?q?=E5=89=AA=E5=90=8E=E7=9A=84=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comboForm/dialogPage/adminDialog.vue      | 19 +++++++++++++-
 .../comboForm/dialogPage/laborDialog.vue      | 25 ++++++++++++++++++-
 .../comboForm/dialogPage/temporaryDialog.vue  | 19 +++++++++++++-
 .../laborManage/personDetails.vue             | 19 +++++++++++++-
 .../personModule/laborComponent.vue           | 19 +++++++++++++-
 5 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue
index 616bb14e..c2f1b380 100644
--- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue
+++ b/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue
@@ -1027,7 +1027,7 @@
     >
       <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
-        <vueCropper
+        <!-- <vueCropper
           ref="cropper"
           :img="cropperOption.img"
           :outputType="cropperOption.outputType"
@@ -1037,6 +1037,17 @@
           :fixedBox="true"
           :outputSize="0.7"
           :maxImgSize="300"
+        ></vueCropper> -->
+        <vueCropper
+          ref="cropper"
+          :img="cropperOption.img"
+          :outputType="cropperOption.outputType"
+          :autoCropWidth="cropperOption.autoCropWidth"
+          :autoCropHeight="cropperOption.autoCropHeight"
+          :outputSize="1"
+          :maxImgSize="300"
+          mode="contain"
+          :autoCrop="true"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -2990,6 +3001,12 @@ export default {
           })
           .then((res) => {
             console.log("aaaaa", res);
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
             if (res.data.status == "SUCCESS") {
               if (this.isSzProject == 1) {
                 this.checkImgLibrary(res.data.data[0].imageUrl);
diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue
index a271c9a7..b2ffd1d5 100644
--- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue
+++ b/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue
@@ -945,7 +945,7 @@
     >
       <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
-        <vueCropper
+        <!-- <vueCropper
           ref="cropper"
           :img="cropperOption.img"
           :outputType="cropperOption.outputType"
@@ -955,6 +955,17 @@
           :fixedBox="true"
           :outputSize="0.7"
           :maxImgSize="300"
+        ></vueCropper> -->
+        <vueCropper
+          ref="cropper"
+          :img="cropperOption.img"
+          :outputType="cropperOption.outputType"
+          :autoCropWidth="cropperOption.autoCropWidth"
+          :autoCropHeight="cropperOption.autoCropHeight"
+          :outputSize="1"
+          :maxImgSize="300"
+          mode="contain"
+          :autoCrop="true"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -2793,6 +2804,18 @@ export default {
           })
           .then((res) => {
             console.log("aaaaa", res);
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
             if (res.data.status == "SUCCESS") {
               if (this.isSzProject == 1) {
                 this.checkImgLibrary(res.data.data[0].imageUrl);
diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
index 18fe42d6..75cda90c 100644
--- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
+++ b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
@@ -488,7 +488,7 @@
     >
       <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
-        <vueCropper
+        <!-- <vueCropper
           ref="cropper"
           :img="cropperOption.img"
           :outputType="cropperOption.outputType"
@@ -498,6 +498,17 @@
           :fixedBox="true"
           :outputSize="0.7"
           :maxImgSize="300"
+        ></vueCropper> -->
+        <vueCropper
+          ref="cropper"
+          :img="cropperOption.img"
+          :outputType="cropperOption.outputType"
+          :autoCropWidth="cropperOption.autoCropWidth"
+          :autoCropHeight="cropperOption.autoCropHeight"
+          :outputSize="1"
+          :maxImgSize="300"
+          mode="contain"
+          :autoCrop="true"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -2476,6 +2487,12 @@ export default {
           })
           .then((res) => {
             console.log("aaaaa", res);
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
             if (res.data.status == "SUCCESS") {
               if (this.isSzProject == 1) {
                 this.checkImgLibrary(res.data.data[0].imageUrl);
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index de09dc90..9de566f5 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -2299,7 +2299,7 @@
     >
       <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
-        <vueCropper
+        <!-- <vueCropper
           ref="cropper"
           :img="cropperOption.img"
           :outputType="cropperOption.outputType"
@@ -2309,6 +2309,17 @@
           :fixedBox="true"
           :outputSize="0.7"
           :maxImgSize="300"
+        ></vueCropper> -->
+        <vueCropper
+          ref="cropper"
+          :img="cropperOption.img"
+          :outputType="cropperOption.outputType"
+          :autoCropWidth="cropperOption.autoCropWidth"
+          :autoCropHeight="cropperOption.autoCropHeight"
+          :outputSize="1"
+          :maxImgSize="300"
+          mode="contain"
+          :autoCrop="true"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -3446,6 +3457,12 @@ export default {
             //     this.checkFace(res.data.data[0].imageUrl);
             //   }
             // }
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
             if (res.data.status == "SUCCESS") {
               // this.checkImgLibrary(res.data.data[0].imageUrl);
               if (this.isSzProject == 1) {
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 0c9f06b2..9a81e69f 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -2242,7 +2242,7 @@
     >
       <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
-        <vueCropper
+        <!-- <vueCropper
           ref="cropper"
           :img="cropperOption.img"
           :outputType="cropperOption.outputType"
@@ -2252,6 +2252,17 @@
           :fixedBox="true"
           :outputSize="0.7"
           :maxImgSize="300"
+        ></vueCropper> -->
+        <vueCropper
+          ref="cropper"
+          :img="cropperOption.img"
+          :outputType="cropperOption.outputType"
+          :autoCropWidth="cropperOption.autoCropWidth"
+          :autoCropHeight="cropperOption.autoCropHeight"
+          :outputSize="1"
+          :maxImgSize="300"
+          mode="contain"
+          :autoCrop="true"
         ></vueCropper>
         <!-- </vue-scroll> -->
       </div>
@@ -4430,6 +4441,12 @@ export default {
           })
           .then((res) => {
             console.log("aaaaa", res);
+            let imgSize = Number(res.data.data[0].fileInfo.size / 1024);
+            console.log('经过vueCropper裁剪后', imgSize);
+            if (imgSize <= 10 || imgSize >= 200) {
+              this.$message.error("图片裁剪后大小不能超过200kb小于10kb,请重新裁剪或重新上传图片!");
+              return false;
+            }
             if (res.data.status == "SUCCESS") {
               if (this.isSzProject == 1) {
                 this.checkImgLibrary(res.data.data[0].imageUrl);