From 0b633a703aa16df466c53a7fe8a7161bc38e8864 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 2 Aug 2023 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/reportManagement/reportAll.png     | Bin 0 -> 668 bytes
 src/assets/reportManagement/reportIcon.png    | Bin 0 -> 965 bytes
 src/layout/components/Navbar.vue              |   1 +
 src/layout/index.vue                          |   7 +-
 src/styles/variables.module.scss              |   2 +-
 .../basicConfig/components/accountAdd.vue     |   9 +-
 .../basicConfig/components/consumablesAdd.vue |   6 +-
 .../basicConfig/components/deviceAdd.vue      |   6 +-
 .../components/lineSideLibraryAdd.vue         |   6 +-
 .../basicConfig/components/sparePartsAdd.vue  |   6 +-
 src/views/basicConfig/deviceConfig.vue        |   4 +-
 .../components/alarmAdd.vue                   |   3 +-
 .../components/inAndOutManagementAdd.vue      |   9 +-
 .../components/productPowerEdit.vue           |   3 +-
 .../plannedMaintenance.vue                    |   8 +-
 .../plannedMaintenanceAdd.vue                 |   6 +-
 .../plannedMaintenanceEdit.vue                |   6 +-
 .../maintenanceManagement/selfMaintenance.vue |   4 +-
 .../selfMaintenanceAdd.vue                    |   6 +-
 .../spareParts/sparePartsAdd.vue              |   3 +-
 .../spareParts/sparePartsEdit.vue             |   3 +-
 .../spareParts/sparePartsOut.vue              |   3 +-
 .../components/OffShelfPackagingAdd.vue       |   9 +-
 .../components/OffShelfPackagingContinue.vue  |   3 +-
 .../components/WorkOrderAdd.vue               |   6 +-
 .../offShelfPackaging.vue                     |   4 +-
 .../productionScheduling/reLaunching.vue      |   8 +-
 .../workOrderManagement.vue                   |  20 +--
 .../components/samplingAdd.vue                |   7 +-
 .../components/standardSetting.vue            |  13 +-
 .../defectScatterPlot.vue                     |   8 +-
 .../components/reportClassAdd.vue             |   6 +-
 .../components/reportNameEdit.vue             |   3 +-
 .../reportTools/reportClassification.vue      |   4 +-
 .../reportTools/reportList.vue                | 115 ++++++++++++++----
 .../reportTools/reportListDetail.vue          |   7 +-
 36 files changed, 155 insertions(+), 159 deletions(-)
 create mode 100644 src/assets/reportManagement/reportAll.png
 create mode 100644 src/assets/reportManagement/reportIcon.png

diff --git a/src/assets/reportManagement/reportAll.png b/src/assets/reportManagement/reportAll.png
new file mode 100644
index 0000000000000000000000000000000000000000..05ab84e8456abec453defa1066ea96f9b58e1313
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0#QjsK~z|U?Uc<+6=4*{e`jW{7p_T|1w}yyNiJISWxD8lRf}3h(kj{n
zt^5O$TD6R@Rs~7^0d0zic9LQdRv>|rN?Du8Bv28?x$ikGG!vb7?j5jI_kpvSbKd89
z&YbtWP(uy>JH(f;sbUw#ZJ<6SodA!eIlg9wFjagATmcFxwetu!WOsZopMfvMIgCx2
z_KjA=1Y|U`PMDYGxFIbSc@Mb?;s9s^wxm!2UM{}@waWTIj@sM?s^Lu57}-z*nu8@z
z?S>jy8Nt6WV3afS0FH8%I^H_}^i-drhBwSUQJ0KTO2$wd&#YB_>XY$z__KV8rsxy|
zjq7sGEfBi_*-s2$Z;~Sv!{dZuDW#KN%#{1{8z`|EC;JdxzrzwNQXh>$JPRNl%z}Gv
z<^o0v2Qb@;g`eeMJnrTHL*+}@`@(CWBjfB0rDTt^G6!JqqBDp*0QRn8A4G$zayXvw
zk!0KfYtNpmH8Edk0kGld7{&|CeqeSM3tDh`8K=82_sWLZ;giYQf{O1ey4--#1B@_N
zJ}IXuFJJlzdrLnOeT48Pxa&FpKotSl5Ia#0;q1<m_+Q9TzN7SEa=|CF0S{5#7E}TG
zmRe)-6}6^Jiu8k3L;?hhQy2**ZK*s;JBD`~vMyoeV0i_dJwdhGhE{C=V1wZ~R69}a
z^~q$7U>exw&4Upp(@Sl*E?hK-h97KzKFlUT+E6+%UZQ&6N8*16`or@Gw}AC8A+~_f
zD<|~s%9jBev8Wrfi@<h}Nzg~A_N={}HPleUYWxOhq%mnu%4mWB0000<MNUMnLSTX;
CTq-O8

literal 0
HcmV?d00001

diff --git a/src/assets/reportManagement/reportIcon.png b/src/assets/reportManagement/reportIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc935f0dd93d43d287b315a0b13484d713f8008c
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1A0kBK~z|U?N)DSm1P_~=Xvk$W?MtdC?lD$KMb}HxvR53E|DTh*oX?r
z4@oUQgb-3=TYurU`C(d#Rzx3+gy=(92oYu>B$ZC)bznK#<|-1T8cpS@YwO<UclzKB
zZt>pjy|ePm4!rR4yyy2j=Q+;<?+=*AJgzY~*TVZws@%uX0Yh0lj=oQ8nf~7ltU0At
z0&f7Q$}LSm=)Lhfyt!`!{eNbl<)oV6u$#i_0+c~#*n0Rje*Lc+Xh~@aV@L{k0zfbe
zT_irtdUPIb;!js)AdynZf&g12^Z=-gVm1$x6kds?(RX+)r;0Xk*KxIp*a@JzNa4Rh
zz>gq0`V-tA*+3$t#U-X+Fniolku~w=fmNLN=LZ+YKCyzo!L!*6Uzq_{^T;qDV@sGg
z5aAN8>{lzK*8wama@S`GK0j~=-UF#Zq|gNZLgGs`d0@=qY%o)g8Getj>q##rEzY`3
z7OCY&keEp$G=Z7}D!snK_5yqafI-^p=w5_FiJ9#HxFMugfIf)Hb-|Fy2G$F(9e^XS
zFMWxRj;-f(qy&OW#AR&Ml{0h_+r4Qto53b`oon~TH82e3zC*$Z^Srw(=GrsBrVMpj
z#?3M~T}h>`bOB1jv_cJxtmegq;&Si#lo`(DqOFkBn@MY!LRHN;o4xqBiI3I(%2ftb
zU7pg2d2KU8MXqMTJh#-2GcmN5mm(iQJ{k^ckqhi)kWT`L<>fs<@C5+`w2eS>URjpV
zTPk(QZ(DeNrv3#D)P14FC0Xl&+{HlHnH82fYL|$6XYu?w9G^yjGs>cavdTbi`#0-2
z9!3s5f`)@y6ijQxJUh+QlaWSESb3_S>tuYu3}Yd;|Fjp|hK}-ndE9Q(8kJYljL&4G
z;rc_mA+mv?W4Hj*E}14}f=stS_HKQ%9hb-XjIj}>Zkf_DrA_K`X*R+mUEgde^Y)HR
zOLDcBWqNh^9-Ir)n(+?Q9MG+SY`cJs`CNh@d9ph;g$n?XEyF@5?Ev&(Ubz6g4|C6s
zw(@KtjYz-a>Q8hh&F==eB5!#bz@FUuW&ovm+5=Fqb*zoYX6qe&Ady(}v42?LYXFuO
zVEqgt`Td~VgCs3V+oDIZn?6%{`J{D<=!Q_1TmA#Y+d<sDG`7CD*>KK7>C*kGcBVd3
nW^&J+d5AyEwbwl6aZT|jh->Zy=AbLX00000NkvXXu0mjf;u+3H

literal 0
HcmV?d00001

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 384ee4e..1490635 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -97,6 +97,7 @@ export default {
 @import '@/styles/variables.module.scss';
 .navbar-container {
   height: 64px;
+  min-width: 1300px;
   background: #fff;
   box-shadow: 0px 1px 4px 0px rgba(0, 21, 41, 0.12);
   padding-right: 24px;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b7bd029..d30c862 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -8,7 +8,7 @@
       <menu-list />
     </el-aside>
     <el-container class="sectionBox">
-      <el-header>
+      <el-header class="el-header" style="height: 64px">
         <navbar />
       </el-header>
       <el-container>
@@ -43,16 +43,17 @@ export default {
 <style lang="scss" scoped>
 @import '@/styles/variables.module.scss';
 .itemContainer {
-  min-width: 1500px;
   .el-header {
     padding: 0;
+    overflow-x: auto;
+    overflow-y: hidden;
   }
   .sectionBox {
     height: 100%;
     background-color: $background-color-secondary;
     .app-container {
       height: calc(100vh - #{$navbarHeight} - #{$footerHeight} - 10px);
-      margin-top: 7px;
+      margin-top: 3px;
       .app-main {
         height: calc(100vh - #{$navbarHeight} - #{$footerHeight} - 50px);
       }
diff --git a/src/styles/variables.module.scss b/src/styles/variables.module.scss
index 51b21a8..6dbb88f 100644
--- a/src/styles/variables.module.scss
+++ b/src/styles/variables.module.scss
@@ -44,7 +44,7 @@ $color-success-light-8: mix($color-white, $color-success, 80%) !default;
 $color-success-light-9: mix($color-white, $color-success, 90%) !default;
 
 // size
-$navbarHeight: 60px; // 导航栏高度
+$navbarHeight: 64px; // 导航栏高度
 $menuWidth: 160px;
 $footerHeight: 30px;
 
diff --git a/src/views/basicConfig/components/accountAdd.vue b/src/views/basicConfig/components/accountAdd.vue
index ff312d6..0fea064 100644
--- a/src/views/basicConfig/components/accountAdd.vue
+++ b/src/views/basicConfig/components/accountAdd.vue
@@ -114,8 +114,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -125,8 +124,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -135,8 +133,7 @@ export default {
           } else {
             this.$message({
               message: '用户名格式不正确应为数字或者字母，请检查',
-              type: 'error',
-              duration: 1500
+              type: 'error'
             })
           }
         } else {
diff --git a/src/views/basicConfig/components/consumablesAdd.vue b/src/views/basicConfig/components/consumablesAdd.vue
index dc442b8..3978df3 100644
--- a/src/views/basicConfig/components/consumablesAdd.vue
+++ b/src/views/basicConfig/components/consumablesAdd.vue
@@ -94,8 +94,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -105,8 +104,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/basicConfig/components/deviceAdd.vue b/src/views/basicConfig/components/deviceAdd.vue
index 66b9d7a..593462d 100644
--- a/src/views/basicConfig/components/deviceAdd.vue
+++ b/src/views/basicConfig/components/deviceAdd.vue
@@ -302,8 +302,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -313,8 +312,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/basicConfig/components/lineSideLibraryAdd.vue b/src/views/basicConfig/components/lineSideLibraryAdd.vue
index 786e2d4..b1d142b 100644
--- a/src/views/basicConfig/components/lineSideLibraryAdd.vue
+++ b/src/views/basicConfig/components/lineSideLibraryAdd.vue
@@ -82,8 +82,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -93,8 +92,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/basicConfig/components/sparePartsAdd.vue b/src/views/basicConfig/components/sparePartsAdd.vue
index 2327d25..4bc1990 100644
--- a/src/views/basicConfig/components/sparePartsAdd.vue
+++ b/src/views/basicConfig/components/sparePartsAdd.vue
@@ -95,8 +95,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -106,8 +105,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/basicConfig/deviceConfig.vue b/src/views/basicConfig/deviceConfig.vue
index 1e53239..2a00b2f 100644
--- a/src/views/basicConfig/deviceConfig.vue
+++ b/src/views/basicConfig/deviceConfig.vue
@@ -239,9 +239,7 @@ export default {
       updateTreeData(list).then(() => {
         this.$message({
           message: '操作成功',
-          type: 'success',
-          duration: 1500,
-          onClose: () => {}
+          type: 'success'
         })
         this.getTree()
       })
diff --git a/src/views/consumablesManagement/components/alarmAdd.vue b/src/views/consumablesManagement/components/alarmAdd.vue
index a49802c..6dad549 100644
--- a/src/views/consumablesManagement/components/alarmAdd.vue
+++ b/src/views/consumablesManagement/components/alarmAdd.vue
@@ -87,8 +87,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             }
diff --git a/src/views/consumablesManagement/components/inAndOutManagementAdd.vue b/src/views/consumablesManagement/components/inAndOutManagementAdd.vue
index b70e29f..0e12d4a 100644
--- a/src/views/consumablesManagement/components/inAndOutManagementAdd.vue
+++ b/src/views/consumablesManagement/components/inAndOutManagementAdd.vue
@@ -321,8 +321,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -332,8 +331,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -344,8 +342,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/deviceManagement/components/productPowerEdit.vue b/src/views/deviceManagement/components/productPowerEdit.vue
index 15c48b1..1afe716 100644
--- a/src/views/deviceManagement/components/productPowerEdit.vue
+++ b/src/views/deviceManagement/components/productPowerEdit.vue
@@ -162,8 +162,7 @@ export default {
         if (res.code === 0) {
           this.$message({
             message: '操作成功',
-            type: 'success',
-            duration: 1500
+            type: 'success'
           })
           this.$emit('successSubmit')
         }
diff --git a/src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue b/src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue
index a63730b..f034bf2 100644
--- a/src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue
+++ b/src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue
@@ -351,9 +351,7 @@ export default {
                 console.log(res)
                 this.$message({
                   message: '派工成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {}
+                  type: 'success'
                 })
                 this.getList()
               })
@@ -377,9 +375,7 @@ export default {
                 console.log(res)
                 this.$message({
                   message: '工单删除成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {}
+                  type: 'success'
                 })
                 this.listQuery.current = 1
                 this.getList()
diff --git a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue b/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue
index 6f35dbf..4e168dd 100644
--- a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue
+++ b/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue
@@ -214,8 +214,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -225,8 +224,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue b/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue
index 08d9792..ffa8abf 100644
--- a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue
+++ b/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue
@@ -297,8 +297,7 @@ export default {
             maintainManageConfirm({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             })
@@ -306,8 +305,7 @@ export default {
             maintainManageUCompleted({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             })
diff --git a/src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue b/src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue
index ba14e87..f5a11c1 100644
--- a/src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue
+++ b/src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue
@@ -244,9 +244,7 @@ export default {
               console.log(res)
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.listQuery.current = 1
               this.getList()
diff --git a/src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue b/src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue
index 845c1e2..cf2ce1b 100644
--- a/src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue
+++ b/src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue
@@ -232,8 +232,7 @@ export default {
             autoMaintainUpdate({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             })
@@ -241,8 +240,7 @@ export default {
             autoMaintainAdd({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             })
diff --git a/src/views/deviceManagement/spareParts/sparePartsAdd.vue b/src/views/deviceManagement/spareParts/sparePartsAdd.vue
index f76d34a..53ffd58 100644
--- a/src/views/deviceManagement/spareParts/sparePartsAdd.vue
+++ b/src/views/deviceManagement/spareParts/sparePartsAdd.vue
@@ -188,8 +188,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             }
diff --git a/src/views/deviceManagement/spareParts/sparePartsEdit.vue b/src/views/deviceManagement/spareParts/sparePartsEdit.vue
index bc3ced4..c35ae03 100644
--- a/src/views/deviceManagement/spareParts/sparePartsEdit.vue
+++ b/src/views/deviceManagement/spareParts/sparePartsEdit.vue
@@ -191,8 +191,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             }
diff --git a/src/views/deviceManagement/spareParts/sparePartsOut.vue b/src/views/deviceManagement/spareParts/sparePartsOut.vue
index aee4014..64bb968 100644
--- a/src/views/deviceManagement/spareParts/sparePartsOut.vue
+++ b/src/views/deviceManagement/spareParts/sparePartsOut.vue
@@ -228,8 +228,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             }
diff --git a/src/views/productionScheduling/components/OffShelfPackagingAdd.vue b/src/views/productionScheduling/components/OffShelfPackagingAdd.vue
index f81836e..0fbf7b3 100644
--- a/src/views/productionScheduling/components/OffShelfPackagingAdd.vue
+++ b/src/views/productionScheduling/components/OffShelfPackagingAdd.vue
@@ -135,8 +135,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -146,8 +145,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
-                    duration: 1500
+                    type: 'success'
                   })
                   this.$emit('successSubmit')
                 }
@@ -157,8 +155,7 @@ export default {
             this.$message({
               message:
                 '玻璃架ID与目前是包装或者复投状态的玻璃架ID重复！请重新编辑输入！',
-              type: 'error',
-              duration: 1500
+              type: 'error'
             })
           }
         } else {
diff --git a/src/views/productionScheduling/components/OffShelfPackagingContinue.vue b/src/views/productionScheduling/components/OffShelfPackagingContinue.vue
index 68afc0a..49631b0 100644
--- a/src/views/productionScheduling/components/OffShelfPackagingContinue.vue
+++ b/src/views/productionScheduling/components/OffShelfPackagingContinue.vue
@@ -72,8 +72,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit2')
             }
diff --git a/src/views/productionScheduling/components/WorkOrderAdd.vue b/src/views/productionScheduling/components/WorkOrderAdd.vue
index be06874..df05e4a 100644
--- a/src/views/productionScheduling/components/WorkOrderAdd.vue
+++ b/src/views/productionScheduling/components/WorkOrderAdd.vue
@@ -271,8 +271,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -282,8 +281,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/productionScheduling/offShelfPackaging.vue b/src/views/productionScheduling/offShelfPackaging.vue
index a195575..4c8b811 100644
--- a/src/views/productionScheduling/offShelfPackaging.vue
+++ b/src/views/productionScheduling/offShelfPackaging.vue
@@ -326,9 +326,7 @@ export default {
             unloadPalletFinish({ id: val.data.id }).then(() => {
               this.$message({
                 message: '结束包装成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.getList()
             })
diff --git a/src/views/productionScheduling/reLaunching.vue b/src/views/productionScheduling/reLaunching.vue
index 3e83095..908d6bf 100644
--- a/src/views/productionScheduling/reLaunching.vue
+++ b/src/views/productionScheduling/reLaunching.vue
@@ -311,9 +311,7 @@ export default {
             reloadRackEnd({ id: val.data.id }).then(() => {
               this.$message({
                 message: '结束复投成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.getList()
             })
@@ -330,9 +328,7 @@ export default {
             reloadRack({ id: val.data.id }).then(() => {
               this.$message({
                 message: '复投上架成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.getList()
             })
diff --git a/src/views/productionScheduling/workOrderManagement.vue b/src/views/productionScheduling/workOrderManagement.vue
index 87cca7f..6a59dcc 100644
--- a/src/views/productionScheduling/workOrderManagement.vue
+++ b/src/views/productionScheduling/workOrderManagement.vue
@@ -452,9 +452,7 @@ export default {
             workOrderRelease({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单下发成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.getList()
             })
@@ -468,9 +466,7 @@ export default {
             workOrderFinish({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单结束成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.getList()
             })
@@ -484,9 +480,7 @@ export default {
             workOrderDelete({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.listQuery.current = 1
               this.getList()
@@ -511,9 +505,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           message: '工单导入成功',
-          type: 'success',
-          duration: 1500,
-          onClose: () => {}
+          type: 'success'
         })
         this.listQuery.current = 1
         this.getList()
@@ -523,9 +515,7 @@ export default {
       if (err) {
         this.$message({
           message: '工单导入失败，请检查格式是否正确',
-          type: 'error',
-          duration: 1500,
-          onClose: () => {}
+          type: 'error'
         })
       }
     }
diff --git a/src/views/qualityManagement/components/samplingAdd.vue b/src/views/qualityManagement/components/samplingAdd.vue
index a9d29f5..8da6bd0 100644
--- a/src/views/qualityManagement/components/samplingAdd.vue
+++ b/src/views/qualityManagement/components/samplingAdd.vue
@@ -196,8 +196,7 @@ export default {
           if (this.tableData.length === 0) {
             this.$message({
               message: '请先到标准设置中添加该检测项目的检测点',
-              type: 'error',
-              duration: 2000
+              type: 'error'
             })
             return false
           }
@@ -229,9 +228,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '保存成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.$emit('successSubmit')
               this.formClear()
diff --git a/src/views/qualityManagement/components/standardSetting.vue b/src/views/qualityManagement/components/standardSetting.vue
index 3f9b0ab..1e41064 100644
--- a/src/views/qualityManagement/components/standardSetting.vue
+++ b/src/views/qualityManagement/components/standardSetting.vue
@@ -171,8 +171,7 @@ export default {
           if (this.tableData.length === 0) {
             this.$message({
               message: '请点击新增按钮添加标准值后再保存',
-              type: 'error',
-              duration: 1500
+              type: 'error'
             })
             return false
           }
@@ -180,8 +179,7 @@ export default {
             if (!item.detectItem || !item.detectPoint || !item.detectStandard) {
               this.$message({
                 message: '表格中有数据空缺，请检查',
-                type: 'error',
-                duration: 1500
+                type: 'error'
               })
               return false
             }
@@ -193,9 +191,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '保存成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.$emit('successSubmit')
               this.formClear()
@@ -223,8 +219,7 @@ export default {
       if (!this.form.detectItem) {
         this.$message({
           message: '请先选择检验项目',
-          type: 'error',
-          duration: 1500
+          type: 'error'
         })
         return false
       }
diff --git a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
index 25a9b9a..9a13dec 100644
--- a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
+++ b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
@@ -231,18 +231,14 @@ export default {
       if (this.selectedGlassId.length === 0) {
         this.$message({
           message: '请先勾选左侧的玻璃',
-          type: 'error',
-          duration: 1500,
-          onClose: () => {}
+          type: 'error'
         })
         return false
       }
       if (this.checkList.length === 0) {
         this.$message({
           message: '请先勾选缺陷',
-          type: 'error',
-          duration: 1500,
-          onClose: () => {}
+          type: 'error'
         })
         return false
       }
diff --git a/src/views/reportManagement/components/reportClassAdd.vue b/src/views/reportManagement/components/reportClassAdd.vue
index dd0750f..87f453b 100644
--- a/src/views/reportManagement/components/reportClassAdd.vue
+++ b/src/views/reportManagement/components/reportClassAdd.vue
@@ -49,8 +49,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
@@ -62,8 +61,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
-                  duration: 1500
+                  type: 'success'
                 })
                 this.$emit('successSubmit')
               }
diff --git a/src/views/reportManagement/components/reportNameEdit.vue b/src/views/reportManagement/components/reportNameEdit.vue
index 6192c30..7481a7f 100644
--- a/src/views/reportManagement/components/reportNameEdit.vue
+++ b/src/views/reportManagement/components/reportNameEdit.vue
@@ -41,8 +41,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
-                duration: 1500
+                type: 'success'
               })
               this.$emit('successSubmit')
             }
diff --git a/src/views/reportManagement/reportTools/reportClassification.vue b/src/views/reportManagement/reportTools/reportClassification.vue
index 8b24563..5ce1ac8 100644
--- a/src/views/reportManagement/reportTools/reportClassification.vue
+++ b/src/views/reportManagement/reportTools/reportClassification.vue
@@ -136,9 +136,7 @@ export default {
             reportCategoryDelete({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
+                type: 'success'
               })
               this.listQuery.current = 1
               this.getList()
diff --git a/src/views/reportManagement/reportTools/reportList.vue b/src/views/reportManagement/reportTools/reportList.vue
index ba53b2b..68d454f 100644
--- a/src/views/reportManagement/reportTools/reportList.vue
+++ b/src/views/reportManagement/reportTools/reportList.vue
@@ -1,24 +1,28 @@
 <template>
   <div class="reoprtManager">
     <div class="report">
-      <div class="imgBox">
-        <img
-          src="./../../../assets/reportManagement/report.png"
-          alt=""
-          width="355px"
-          height="314px"
-        />
-      </div>
-      <div class="numBox">
-        <div>
+      <div class="reportBox">
+        <div class="imgBox">
+          <img src="./../../../assets/reportManagement/report.png" alt="" />
+        </div>
+        <div class="numBox">
           <div class="reportNum">
             <div class="num">{{ totalReports }}</div>
             <div class="text">
-              <p class="font">全部报表</p>
-              <p class="letter">Reports</p>
+              <p class="font">
+                <img
+                  src="./../../../assets/reportManagement/reportAll.png"
+                  alt=""
+                  style="width: 32px; height: 32px"
+                />
+                <span>全部报表</span>
+              </p>
+              <p class="letter">
+                {{ totalReports > 1 ? 'Reports' : 'Report' }}
+              </p>
             </div>
           </div>
-          <div class="detail" @click="toDetail()">了解详情</div>
+          <div class="detail detail1" @click="toDetail()">了解详情</div>
         </div>
       </div>
     </div>
@@ -27,11 +31,21 @@
         <div class="reportNum">
           <div class="num">{{ item.quantity }}</div>
           <div class="text">
-            <p class="font">{{ item.name }}</p>
-            <p class="letter">Reports</p>
+            <p class="font">
+              <img
+                src="./../../../assets/reportManagement/reportIcon.png"
+                alt=""
+                style="width: 32px; height: 32px"
+              />
+              <span class="title" :title="item.name">{{ item.name }}</span>
+              <!-- <span class="title" :title="item.name">
+                测试测试测试测试报表测试报表
+              </span> -->
+            </p>
+            <p class="letter">{{ item.quantity > 1 ? 'Reports' : 'Report' }}</p>
           </div>
         </div>
-        <div class="detail" @click="toDetail(item.id)">了解详情</div>
+        <div class="detail detail2" @click="toDetail(item.id)">了解详情</div>
       </div>
     </div>
   </div>
@@ -76,7 +90,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .reoprtManager {
   padding-left: 16px;
   padding-top: 8px;
@@ -86,27 +100,39 @@ export default {
   align-content: flex-start;
   overflow: auto;
   .report {
-    width: 768px;
+    width: calc(((100vw - 272px) / 2) - 16px);
+    // width: 808px;
     height: 456px;
     background: #fff;
     border-radius: 4px;
     margin: 0 16px 16px 0;
     position: relative;
+    .reportBox {
+      margin: auto;
+      width: 685px;
+    }
     .imgBox {
       display: inline-block;
-      width: 480px;
+      width: 445px;
       height: 100%;
-      padding: 80px 0 0 80px;
+      padding-top: 80px;
+      img {
+        width: 355px;
+        height: 314px;
+      }
     }
     .numBox {
       position: absolute;
       display: inline-block;
       height: 100%;
+      // padding-top: 120px;
       top: 120px;
     }
   }
   .reportDesc {
-    width: 376px;
+    position: relative;
+    width: calc(((100vw - 272px) / 4) - 16px);
+    // width: 396px;
     height: 456px;
     background: #fff;
     border-radius: 4px;
@@ -120,22 +146,36 @@ export default {
       font-size: 80px;
       font-weight: 600;
       color: #161616;
-      margin-right: 36px;
+      margin-right: 18px;
     }
     .text {
       display: inline-block;
+      text-align: left;
       .font {
         font-size: 18px;
         letter-spacing: 2px;
         margin-bottom: 5px;
+        img {
+          vertical-align: middle;
+        }
+        .title {
+          display: inline-block;
+          vertical-align: middle;
+          max-width: 150px;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
+        }
       }
       .letter {
+        padding-left: 4px;
         font-size: 32px;
         font-weight: 300;
       }
     }
   }
   .detail {
+    position: absolute;
     width: 200px;
     height: 30px;
     font-size: 14px;
@@ -144,8 +184,37 @@ export default {
     color: #fff;
     background: #0b58ff;
     border-radius: 4px;
-    margin: 139px auto 0;
     cursor: pointer;
   }
+  .detail1 {
+    position: absolute;
+    bottom: 200px;
+  }
+  .detail2 {
+    position: absolute;
+    bottom: 80px;
+    right: calc((((100vw - 272px) / 4) - 16px - 200px) / 2);
+  }
+}
+@media only screen and (max-width: 1600px) {
+  .reoprtManager {
+    .report {
+      .reportBox {
+        width: 550px;
+      }
+      .imgBox {
+        width: 320px;
+        height: 100%;
+        img {
+          width: 300px;
+          height: 314px;
+        }
+      }
+      .numBox {
+        height: 100%;
+        top: 120px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/reportManagement/reportTools/reportListDetail.vue b/src/views/reportManagement/reportTools/reportListDetail.vue
index 0cf9620..c33ec03 100644
--- a/src/views/reportManagement/reportTools/reportListDetail.vue
+++ b/src/views/reportManagement/reportTools/reportListDetail.vue
@@ -204,9 +204,7 @@ export default {
               delReportlist({ id: val.data.id }).then(() => {
                 this.$message({
                   message: '报表删除成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {}
+                  type: 'success'
                 })
                 this.listQuery.current = 1
                 this.getList()
@@ -250,8 +248,7 @@ export default {
         if (res.code === 0) {
           this.$message({
             message: '操作成功',
-            type: 'success',
-            duration: 1500
+            type: 'success'
           })
           this.getList()
         }