Merge pull request 'zjl' (#30) from zjl into master

Reviewed-on: #30

dist/css/1007.7f8980d9.css

@@ -1 +1 @@
-.self-maintenance[data-v-7f3d9a89]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}
+.plan-maintenance[data-v-63dc5e22]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}

dist/css/1327.2c1d687d.css

@@ -1 +0,0 @@
-.tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-b1bb2734]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-b1bb2734]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-b1bb2734]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-4c764f8e]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-4c764f8e]{position:absolute;bottom:0;right:32px}

dist/css/2927.2c809e9b.css

@@ -0,0 +1 @@
+.bottom-box[data-v-4b7be4b1]{overflow-x:auto;display:flex}.bottom-box .bottom-left[data-v-4b7be4b1],.bottom-box .bottom-right[data-v-4b7be4b1]{display:inline-block}.bottom-box .bottom-left[data-v-4b7be4b1]{width:290px;margin-right:8px}.bottom-box .bottom-left .dataTab li[data-v-4b7be4b1]{width:65px}.bottom-box .bottom-right[data-v-4b7be4b1]{width:calc(100% - 300px)}.bottom-box .bottom-right .dataTab li[data-v-4b7be4b1]{width:7.7%;min-width:60px}.title[data-v-4b7be4b1]{display:inline-block;height:66px;width:30px;font-size:14px;line-height:14px;font-weight:500;padding:5px 8px 0;color:rgba(0,0,0,.85);background-color:#fafafa;border-top-left-radius:5px;border-bottom-left-radius:5px}.dataTab[data-v-4b7be4b1]{display:flex;flex-flow:row nowrap}.dataTab li[data-v-4b7be4b1]{font-size:14px;border-right:1px solid #e8e8e8;border-bottom:1px solid #e8e8e8}.dataTab li p[data-v-4b7be4b1]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dataTab li .tabHead[data-v-4b7be4b1]{height:31px;background:#e9ebf0}.dataTab li .tabHead[data-v-4b7be4b1],.dataTab li .tabValue[data-v-4b7be4b1]{padding:8px}.dataTab li .tabValue[data-v-4b7be4b1]{height:35px}.box[data-v-557638a7]{position:relative}.box .text1[data-v-557638a7],.box .text2[data-v-557638a7],.box .text3[data-v-557638a7],.box .text4[data-v-557638a7]{position:absolute}.box .text1[data-v-557638a7]{top:30px;left:0}.box .text2[data-v-557638a7]{top:30px;right:0}.box .text3[data-v-557638a7]{bottom:10px;left:0}.box .text4[data-v-557638a7]{bottom:10px;right:0}.defectScatterPlot[data-v-37cc2088]{height:calc(100vh - 206px);overflow:auto}.defectScatterPlot .split-pane[data-v-37cc2088]{height:100%;border-radius:8px}.defectScatterPlot .left-box[data-v-37cc2088]{margin-left:16px;padding:16px 16px 0;background-color:#fff}.defectScatterPlot .right-box[data-v-37cc2088]{margin-right:16px}.defectScatterPlot .right-box .inner-box[data-v-37cc2088]{height:100%;margin-left:16px;padding:16px 16px 0;border-radius:8px;overflow:auto;background-color:#fff;font-size:14px}.defectScatterPlot .right-box .inner-box .line1[data-v-37cc2088]{margin-bottom:18px}.defectScatterPlot .right-box .inner-box .line2[data-v-37cc2088]{margin-bottom:12px}.defectScatterPlot .right-box .inner-box .line2 .el-checkbox[data-v-37cc2088]{margin-right:8px}.defectScatterPlot .title[data-v-37cc2088]{font-size:14px;color:rgba(0,0,0,.85)}.defectScatterPlot .title[data-v-37cc2088]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;vertical-align:middle;margin-right:8px}

dist/css/3180.971e8d95.css

@@ -0,0 +1 @@
+.tableInner .el-input__inner{border:none;padding:0;height:33px}.samplingAdd .form-box[data-v-617720a2]{height:100%;padding:0 32px;position:relative}.samplingAdd .form-box .first-line[data-v-617720a2]{border-bottom:1px solid #e9e9e9;margin-bottom:23px}.samplingAdd .bottom[data-v-617720a2]{position:absolute;bottom:0;right:32px}.standardSetting .form-box[data-v-fd8cce48]{height:100%;padding:0 32px;position:relative}.standardSetting .bottom[data-v-fd8cce48]{position:absolute;bottom:0;right:32px}

dist/css/5255.68aa564b.css

@@ -1 +1 @@
-.plan-maintenance[data-v-2348839c]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}
+.self-maintenance[data-v-c0a045c8]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}

dist/css/5343.fe8a2064.css

@@ -1 +0,0 @@
-.bottom-box[data-v-5624e103]{overflow-x:auto;display:flex}.bottom-box .bottom-left[data-v-5624e103],.bottom-box .bottom-right[data-v-5624e103]{display:inline-block}.bottom-box .bottom-left[data-v-5624e103]{width:290px;margin-right:8px}.bottom-box .bottom-left .dataTab li[data-v-5624e103]{width:65px}.bottom-box .bottom-right[data-v-5624e103]{width:calc(100% - 300px)}.bottom-box .bottom-right .dataTab li[data-v-5624e103]{width:7.7%;min-width:60px}.title[data-v-5624e103]{display:inline-block;height:66px;width:30px;font-size:14px;line-height:14px;font-weight:500;padding:5px 8px 0;color:rgba(0,0,0,.85);background-color:#fafafa;border-top-left-radius:5px;border-bottom-left-radius:5px}.dataTab[data-v-5624e103]{display:flex;flex-flow:row nowrap}.dataTab li[data-v-5624e103]{font-size:14px;border-right:1px solid #e8e8e8;border-bottom:1px solid #e8e8e8}.dataTab li p[data-v-5624e103]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dataTab li .tabHead[data-v-5624e103]{height:31px;background:#e9ebf0}.dataTab li .tabHead[data-v-5624e103],.dataTab li .tabValue[data-v-5624e103]{padding:8px}.dataTab li .tabValue[data-v-5624e103]{height:35px}.box[data-v-499108ae]{position:relative}.box .text1[data-v-499108ae],.box .text2[data-v-499108ae],.box .text3[data-v-499108ae],.box .text4[data-v-499108ae]{position:absolute}.box .text1[data-v-499108ae]{top:30px;left:0}.box .text2[data-v-499108ae]{top:30px;right:0}.box .text3[data-v-499108ae]{bottom:10px;left:0}.box .text4[data-v-499108ae]{bottom:10px;right:0}.defectScatterPlot[data-v-046d3a89]{height:calc(100vh - 206px);overflow:auto}.defectScatterPlot .split-pane[data-v-046d3a89]{height:100%;border-radius:8px}.defectScatterPlot .left-box[data-v-046d3a89]{margin-left:16px;padding:16px 16px 0;background-color:#fff}.defectScatterPlot .right-box[data-v-046d3a89]{margin-right:16px}.defectScatterPlot .right-box .inner-box[data-v-046d3a89]{height:100%;margin-left:16px;padding:16px 16px 0;border-radius:8px;overflow:auto;background-color:#fff;font-size:14px}.defectScatterPlot .right-box .inner-box .line1[data-v-046d3a89]{margin-bottom:18px}.defectScatterPlot .right-box .inner-box .line2[data-v-046d3a89]{margin-bottom:12px}.defectScatterPlot .right-box .inner-box .line2 .el-checkbox[data-v-046d3a89]{margin-right:8px}.defectScatterPlot .title[data-v-046d3a89]{font-size:14px;color:rgba(0,0,0,.85)}.defectScatterPlot .title[data-v-046d3a89]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;vertical-align:middle;margin-right:8px}

dist/css/5370.b6155b0b.css

@@ -1 +1 @@
-.device-add .device-uploader{width:178px;height:178px;display:block}.device-add .device-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.device-add .device-uploader .el-upload:hover{border-color:#409eff}.device-add .device-uploader .avatar-uploader-icon{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.img-box[data-v-0a02c89e]{border:1px dashed #d9d9d9}.img-box .avatar[data-v-0a02c89e]{width:100%;cursor:pointer}.img-box .avatar-close-icon[data-v-0a02c89e]{font-size:24px;position:absolute;right:-10px;top:-10px;cursor:pointer}.main-box[data-v-50aec75c]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-50aec75c],.main-box .right-box[data-v-50aec75c]{border-radius:8px;background-color:#fff;overflow-y:auto;height:calc(100vh - 147px);margin-top:8px}.main-box .left-box[data-v-50aec75c]{padding:16px 0 0}.main-box .right-box[data-v-50aec75c]{padding:16px 10px 0}
+.device-add .device-uploader{width:178px;height:178px;display:block}.device-add .device-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.device-add .device-uploader .el-upload:hover{border-color:#409eff}.device-add .device-uploader .avatar-uploader-icon{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.img-box[data-v-903287c4]{border:1px dashed #d9d9d9}.img-box .avatar[data-v-903287c4]{width:100%;cursor:pointer}.img-box .avatar-close-icon[data-v-903287c4]{font-size:24px;position:absolute;right:-10px;top:-10px;cursor:pointer}.main-box[data-v-46e8c84b]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-46e8c84b],.main-box .right-box[data-v-46e8c84b]{border-radius:8px;background-color:#fff;overflow-y:auto;height:calc(100vh - 147px);margin-top:8px}.main-box .left-box[data-v-46e8c84b]{padding:16px 0 0}.main-box .right-box[data-v-46e8c84b]{padding:16px 10px 0}

dist/css/6015.049013c2.css

@@ -1 +0,0 @@
-.reoprtManager{padding-left:16px;padding-top:8px;display:flex;flex-flow:row wrap;height:calc(100vh - 210px);align-content:flex-start;overflow:auto}.reoprtManager .report{width:768px;height:456px;background:#fff;border-radius:4px;margin:0 16px 16px 0;position:relative}.reoprtManager .report .imgBox{display:inline-block;width:480px;height:100%;padding:80px 0 0 80px}.reoprtManager .report .numBox{position:absolute;display:inline-block;height:100%;top:120px}.reoprtManager .reportDesc{width:376px;height:456px;background:#fff;border-radius:4px;text-align:center;padding-top:120px;margin:0 16px 16px 0}.reoprtManager .reportNum .num{display:inline-block;font-size:80px;font-weight:600;color:#161616;margin-right:36px}.reoprtManager .reportNum .text{display:inline-block}.reoprtManager .reportNum .text .font{font-size:18px;letter-spacing:2px;margin-bottom:5px}.reoprtManager .reportNum .text .letter{font-size:32px;font-weight:300}.reoprtManager .detail{width:200px;height:30px;font-size:14px;line-height:30px;text-align:center;color:#fff;background:#0b58ff;border-radius:4px;margin:139px auto 0;cursor:pointer}

dist/css/6714.cd2c7c18.css

@@ -0,0 +1 @@
+.reoprtManager[data-v-a6efde02]{padding-left:16px;padding-top:8px;display:flex;flex-flow:row wrap;height:calc(100vh - 210px);align-content:flex-start;overflow:auto}.reoprtManager .report[data-v-a6efde02]{width:calc(50vw - 152px);height:456px;background:#fff;border-radius:4px;margin:0 16px 16px 0;position:relative}.reoprtManager .report .reportBox[data-v-a6efde02]{margin:auto;width:685px}.reoprtManager .report .imgBox[data-v-a6efde02]{display:inline-block;width:445px;height:100%;padding-top:80px}.reoprtManager .report .imgBox img[data-v-a6efde02]{width:355px;height:314px}.reoprtManager .report .numBox[data-v-a6efde02]{position:absolute;display:inline-block;height:100%;top:120px}.reoprtManager .reportDesc[data-v-a6efde02]{position:relative;width:calc(25vw - 84px);height:456px;background:#fff;border-radius:4px;text-align:center;padding-top:120px;margin:0 16px 16px 0}.reoprtManager .reportNum .num[data-v-a6efde02]{display:inline-block;font-size:80px;font-weight:600;color:#161616;margin-right:18px}.reoprtManager .reportNum .text[data-v-a6efde02]{display:inline-block;text-align:left}.reoprtManager .reportNum .text .font[data-v-a6efde02]{font-size:18px;letter-spacing:2px;margin-bottom:5px}.reoprtManager .reportNum .text .font img[data-v-a6efde02]{vertical-align:middle}.reoprtManager .reportNum .text .font .title[data-v-a6efde02]{display:inline-block;vertical-align:middle;max-width:150px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.reoprtManager .reportNum .text .letter[data-v-a6efde02]{padding-left:4px;font-size:32px;font-weight:300}.reoprtManager .detail[data-v-a6efde02]{position:absolute;width:200px;height:30px;font-size:14px;line-height:30px;text-align:center;color:#fff;background:#0b58ff;border-radius:4px;cursor:pointer}.reoprtManager .detail1[data-v-a6efde02]{position:absolute;bottom:200px}.reoprtManager .detail2[data-v-a6efde02]{position:absolute;bottom:80px;right:calc(12.5vw - 142px)}@media only screen and (max-width:1600px){.reoprtManager .report .reportBox[data-v-a6efde02]{width:550px}.reoprtManager .report .imgBox[data-v-a6efde02]{width:320px;height:100%}.reoprtManager .report .imgBox img[data-v-a6efde02]{width:300px;height:314px}.reoprtManager .report .numBox[data-v-a6efde02]{height:100%;top:120px}}

dist/css/9498.4183d899.css

@@ -0,0 +1 @@
+.bottom-box[data-v-4b7be4b1]{overflow-x:auto;display:flex}.bottom-box .bottom-left[data-v-4b7be4b1],.bottom-box .bottom-right[data-v-4b7be4b1]{display:inline-block}.bottom-box .bottom-left[data-v-4b7be4b1]{width:290px;margin-right:8px}.bottom-box .bottom-left .dataTab li[data-v-4b7be4b1]{width:65px}.bottom-box .bottom-right[data-v-4b7be4b1]{width:calc(100% - 300px)}.bottom-box .bottom-right .dataTab li[data-v-4b7be4b1]{width:7.7%;min-width:60px}.title[data-v-4b7be4b1]{display:inline-block;height:66px;width:30px;font-size:14px;line-height:14px;font-weight:500;padding:5px 8px 0;color:rgba(0,0,0,.85);background-color:#fafafa;border-top-left-radius:5px;border-bottom-left-radius:5px}.dataTab[data-v-4b7be4b1]{display:flex;flex-flow:row nowrap}.dataTab li[data-v-4b7be4b1]{font-size:14px;border-right:1px solid #e8e8e8;border-bottom:1px solid #e8e8e8}.dataTab li p[data-v-4b7be4b1]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dataTab li .tabHead[data-v-4b7be4b1]{height:31px;background:#e9ebf0}.dataTab li .tabHead[data-v-4b7be4b1],.dataTab li .tabValue[data-v-4b7be4b1]{padding:8px}.dataTab li .tabValue[data-v-4b7be4b1]{height:35px}.full-inspection-detail[data-v-ea5a76cc]{margin:0 16px;padding:16px;border-radius:8px;height:calc(100vh - 205px);background-color:#fff}.full-inspection-detail .plot-total[data-v-ea5a76cc]{position:relative;height:115px}.full-inspection-detail .plot-total .plot-total-box[data-v-ea5a76cc]{position:absolute;width:100%;top:25px;left:0}

dist/css/9498.c0680631.css

@@ -1 +0,0 @@
-.bottom-box[data-v-5624e103]{overflow-x:auto;display:flex}.bottom-box .bottom-left[data-v-5624e103],.bottom-box .bottom-right[data-v-5624e103]{display:inline-block}.bottom-box .bottom-left[data-v-5624e103]{width:290px;margin-right:8px}.bottom-box .bottom-left .dataTab li[data-v-5624e103]{width:65px}.bottom-box .bottom-right[data-v-5624e103]{width:calc(100% - 300px)}.bottom-box .bottom-right .dataTab li[data-v-5624e103]{width:7.7%;min-width:60px}.title[data-v-5624e103]{display:inline-block;height:66px;width:30px;font-size:14px;line-height:14px;font-weight:500;padding:5px 8px 0;color:rgba(0,0,0,.85);background-color:#fafafa;border-top-left-radius:5px;border-bottom-left-radius:5px}.dataTab[data-v-5624e103]{display:flex;flex-flow:row nowrap}.dataTab li[data-v-5624e103]{font-size:14px;border-right:1px solid #e8e8e8;border-bottom:1px solid #e8e8e8}.dataTab li p[data-v-5624e103]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dataTab li .tabHead[data-v-5624e103]{height:31px;background:#e9ebf0}.dataTab li .tabHead[data-v-5624e103],.dataTab li .tabValue[data-v-5624e103]{padding:8px}.dataTab li .tabValue[data-v-5624e103]{height:35px}.full-inspection-detail[data-v-ea5a76cc]{margin:0 16px;padding:16px;border-radius:8px;height:calc(100vh - 205px);background-color:#fff}.full-inspection-detail .plot-total[data-v-ea5a76cc]{position:relative;height:115px}.full-inspection-detail .plot-total .plot-total-box[data-v-ea5a76cc]{position:absolute;width:100%;top:25px;left:0}

dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.11e7f529.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.eea12e50.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.41e2ca26.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

dist/js/6015.c6917d38.js

@@ -1 +0,0 @@
-"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[6015],{6015:function(t,r,e){e.r(r),e.d(r,{default:function(){return c}});var o=function(){var t=this,r=t._self._c;return r("div",{staticClass:"reoprtManager"},[r("div",{staticClass:"report"},[t._m(0),r("div",{staticClass:"numBox"},[r("div",[r("div",{staticClass:"reportNum"},[r("div",{staticClass:"num"},[t._v(t._s(t.totalReports))]),t._m(1)]),r("div",{staticClass:"detail",on:{click:function(r){return t.toDetail()}}},[t._v("了解详情")])])])]),t._l(t.reportList,(function(e,o){return r("div",{key:o,staticClass:"reportDesc"},[r("div",[r("div",{staticClass:"reportNum"},[r("div",{staticClass:"num"},[t._v(t._s(e.quantity))]),r("div",{staticClass:"text"},[r("p",{staticClass:"font"},[t._v(t._s(e.name))]),r("p",{staticClass:"letter"},[t._v("Reports")])])]),r("div",{staticClass:"detail",on:{click:function(r){return t.toDetail(e.id)}}},[t._v("了解详情")])])])}))],2)},n=[function(){var t=this,r=t._self._c;return r("div",{staticClass:"imgBox"},[r("img",{attrs:{src:e(5002),alt:"",width:"355px",height:"314px"}})])},function(){var t=this,r=t._self._c;return r("div",{staticClass:"text"},[r("p",{staticClass:"font"},[t._v("全部报表")]),r("p",{staticClass:"letter"},[t._v("Reports")])])}],u=e(6527),s={name:"ReportList",data(){return{totalReports:0,reportList:[]}},mounted(){this.getList()},methods:{getList(){(0,u.J_)({}).then((t=>{0===t.code&&t.data.length>0?this.reportList=t.data:this.reportList=[]})),(0,u.up)({}).then((t=>{0===t.code&&t.data.length>0?this.totalReports=t.data[0].reportNum:this.totalReports=0}))},toDetail(t){this.$router.push({name:"reportListDetail",params:{categoryId:t||""}})}}},a=s,i=e(1001),p=(0,i.Z)(a,o,n,!1,null,null,null),c=p.exports},6527:function(t,r,e){e.d(r,{AT:function(){return C},Hg:function(){return f},J_:function(){return n},Kx:function(){return x},QL:function(){return i},V0:function(){return g},W0:function(){return h},a:function(){return d},an:function(){return y},bu:function(){return Z},fL:function(){return k},gc:function(){return G},kB:function(){return u},m3:function(){return l},oR:function(){return _},sy:function(){return s},uW:function(){return v},uj:function(){return R},up:function(){return c},wF:function(){return m},wy:function(){return a},yk:function(){return p}});var o=e(8859);function n(t){return(0,o.Z)({url:"/report/report-sheet-category/list",method:"post",data:t})}function u(t){return(0,o.Z)({url:"/report/report-sheet/page",method:"post",data:t})}function s(t){return(0,o.Z)({url:"/report/report-sheet/update",method:"post",data:t})}function a(t){return(0,o.Z)({url:"/report/report-sheet/delete",method:"post",data:t})}function i(t){return(0,o.Z)({url:"/report/report-sheet/get",method:"post",data:t})}function p(t){return(0,o.Z)({url:"/report/report-sheet-category/page",method:"post",data:t})}function c(t){return(0,o.Z)({url:"/report/GlassReport/getReportNum",method:"post",data:t})}function l(t){return(0,o.Z)({url:"/report/report-sheet-category/add",method:"post",data:t})}function d(t){return(0,o.Z)({url:"/report/report-sheet-category/update",method:"post",data:t})}function f(t){return(0,o.Z)({url:"/report/report-sheet-category/get",method:"post",data:t})}function h(t){return(0,o.Z)({url:"/report/report-sheet-category/delete",method:"post",data:t})}function m(t){return(0,o.Z)({url:"/order/proReport/getProductReportData",method:"post",data:t})}function g(t){return(0,o.Z)({url:"/order/proReport/exportProductReport",method:"post",responseType:"blob",data:t,timeout:6e4})}function v(t){return(0,o.Z)({url:"/report/GlassReport/listGlass",method:"post",data:t})}function R(t){return(0,o.Z)({url:"/report/GlassReport/qualityReport",method:"post",data:t})}function _(t){return(0,o.Z)({url:"/report/GlassReport/qualityReportexport",method:"post",responseType:"blob",data:t})}function Z(t){return(0,o.Z)({url:"/report/GlassReport/thickReport",method:"post",data:t})}function y(t){return(0,o.Z)({url:"/report/GlassReport/thickReportexport",method:"post",responseType:"blob",data:t})}function C(t){return(0,o.Z)({url:"/quality/finalpackaging/queryGlassData",method:"post",data:t})}function k(t){return(0,o.Z)({url:"/quality/finalpackaging/claGlassData",method:"post",data:t})}function x(t){return(0,o.Z)({url:"/report/GlassReport/getGlassVoid",method:"post",data:t})}function G(t){return(0,o.Z)({url:"/report/GlassReport/getUnitVoid",method:"post",data:t})}},5002:function(t,r,e){t.exports=e.p+"img/report.b2b3c253.png"}}]);

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;

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);
       }

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;
 

src/views/basicConfig/components/accountAdd.vue

@@ -114,8 +114,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -125,8 +124,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -135,8 +133,7 @@ export default {
           } else {
             this.$message({
               message: '用户名格式不正确应为数字或者字母，请检查',
-              type: 'error',
+              type: 'error'
-              duration: 1500
             })
           }
         } else {

src/views/basicConfig/components/consumablesAdd.vue

@@ -94,8 +94,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -105,8 +104,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/basicConfig/components/deviceAdd.vue

@@ -302,8 +302,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -313,8 +312,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/basicConfig/components/lineSideLibraryAdd.vue

@@ -82,8 +82,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -93,8 +92,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/basicConfig/components/sparePartsAdd.vue

@@ -95,8 +95,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -106,8 +105,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/basicConfig/deviceConfig.vue

@@ -239,9 +239,7 @@ export default {
       updateTreeData(list).then(() => {
         this.$message({
           message: '操作成功',
-          type: 'success',
+          type: 'success'
-          duration: 1500,
-          onClose: () => {}
         })
         this.getTree()
       })

src/views/consumablesManagement/components/alarmAdd.vue

@@ -87,8 +87,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             }

src/views/consumablesManagement/components/inAndOutManagementAdd.vue

@@ -321,8 +321,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -332,8 +331,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -344,8 +342,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/deviceManagement/components/productPowerEdit.vue

@@ -162,8 +162,7 @@ export default {
         if (res.code === 0) {
           this.$message({
             message: '操作成功',
-            type: 'success',
+            type: 'success'
-            duration: 1500
           })
           this.$emit('successSubmit')
         }

src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue

@@ -351,9 +351,7 @@ export default {
                 console.log(res)
                 this.$message({
                   message: '派工成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500,
-                  onClose: () => {}
                 })
                 this.getList()
               })
@@ -377,9 +375,7 @@ export default {
                 console.log(res)
                 this.$message({
                   message: '工单删除成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500,
-                  onClose: () => {}
                 })
                 this.listQuery.current = 1
                 this.getList()

src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue

@@ -214,8 +214,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -225,8 +224,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue

@@ -297,8 +297,7 @@ export default {
             maintainManageConfirm({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             })
@@ -306,8 +305,7 @@ export default {
             maintainManageUCompleted({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             })

src/views/deviceManagement/maintenanceManagement/selfMaintenance.vue

@@ -244,9 +244,7 @@ export default {
               console.log(res)
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.listQuery.current = 1
               this.getList()

src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue

@@ -232,8 +232,7 @@ export default {
             autoMaintainUpdate({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             })
@@ -241,8 +240,7 @@ export default {
             autoMaintainAdd({ ...this.form }).then(() => {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             })

src/views/deviceManagement/spareParts/sparePartsAdd.vue

@@ -188,8 +188,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             }

src/views/deviceManagement/spareParts/sparePartsEdit.vue

@@ -191,8 +191,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             }

src/views/deviceManagement/spareParts/sparePartsOut.vue

@@ -228,8 +228,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             }

src/views/productionScheduling/components/OffShelfPackagingAdd.vue

@@ -135,8 +135,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -146,8 +145,7 @@ export default {
                 if (res.code === 0) {
                   this.$message({
                     message: '操作成功',
-                    type: 'success',
+                    type: 'success'
-                    duration: 1500
                   })
                   this.$emit('successSubmit')
                 }
@@ -157,8 +155,7 @@ export default {
             this.$message({
               message:
                 '玻璃架ID与目前是包装或者复投状态的玻璃架ID重复！请重新编辑输入！',
-              type: 'error',
+              type: 'error'
-              duration: 1500
             })
           }
         } else {

src/views/productionScheduling/components/OffShelfPackagingContinue.vue

@@ -72,8 +72,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit2')
             }

src/views/productionScheduling/components/WorkOrderAdd.vue

@@ -271,8 +271,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -282,8 +281,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/productionScheduling/offShelfPackaging.vue

@@ -326,9 +326,7 @@ export default {
             unloadPalletFinish({ id: val.data.id }).then(() => {
               this.$message({
                 message: '结束包装成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.getList()
             })

src/views/productionScheduling/reLaunching.vue

@@ -311,9 +311,7 @@ export default {
             reloadRackEnd({ id: val.data.id }).then(() => {
               this.$message({
                 message: '结束复投成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.getList()
             })
@@ -330,9 +328,7 @@ export default {
             reloadRack({ id: val.data.id }).then(() => {
               this.$message({
                 message: '复投上架成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.getList()
             })

src/views/productionScheduling/workOrderManagement.vue

@@ -452,9 +452,7 @@ export default {
             workOrderRelease({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单下发成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.getList()
             })
@@ -468,9 +466,7 @@ export default {
             workOrderFinish({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单结束成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.getList()
             })
@@ -484,9 +480,7 @@ export default {
             workOrderDelete({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.listQuery.current = 1
               this.getList()
@@ -511,9 +505,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           message: '工单导入成功',
-          type: 'success',
+          type: 'success'
-          duration: 1500,
-          onClose: () => {}
         })
         this.listQuery.current = 1
         this.getList()
@@ -523,9 +515,7 @@ export default {
       if (err) {
         this.$message({
           message: '工单导入失败，请检查格式是否正确',
-          type: 'error',
+          type: 'error'
-          duration: 1500,
-          onClose: () => {}
         })
       }
     }

src/views/qualityManagement/components/defectScatterPlotChart.vue

@@ -123,6 +123,8 @@ export default {
       this.chart = echarts.init(chartDom)
       let legendList = []
       let seriesList = []
+      let num = 0 // 计算点的数量，判断后续bursh是否需要延迟
+      let delayTime = 0
       for (let i in this.defectMsg) {
         legendList.push(this.transLabel(i))
         let arr1 = []
@@ -132,6 +134,7 @@ export default {
           arr2.push(2600 - parseInt(j.ypos))
           arr2.push(2250 - parseInt(j.xpos))
           arr1.push(arr2)
+          num++
         }
         obj.name = this.transLabel(i)
         obj.type = 'scatter'
@@ -139,6 +142,15 @@ export default {
         obj.symbolSize = 5
         seriesList.push(obj)
       }
+      if (num <= 3000) {
+        delayTime = 0
+      } else if (3000 < num <= 7000) {
+        delayTime = 1000
+      } else if (7000 < num <= 10000) {
+        delayTime = 2000
+      } else {
+        delayTime = 3000
+      }
       var option = {
         color: [
           '#5d7ab7',
@@ -170,7 +182,12 @@ export default {
         },
         brush: {
           toolbox: ['rect', 'clear'],
-          xAxisIndex: 0
+          xAxisIndex: 0,
+          throttleType: 'debounce',
+          throttleDelay: delayTime
+        },
+        tooltip: {
+          formatter: '{c},{a}'
         },
         grid: {
           x: 60,
@@ -188,9 +205,13 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
+              type: 'dashed',
               color: 'rgba(0, 0, 0, 0.15)'
             }
           },
+          axisLabel: {
+            rotate: 45
+          },
           max: 2600,
           min: 0,
           interval: 100
@@ -205,6 +226,7 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
+              type: 'dashed',
               color: 'rgba(0, 0, 0, 0.15)'
             }
           },

src/views/qualityManagement/components/defectScatterPlotTotal.vue

@@ -5,7 +5,7 @@
         <div class="title">颗粒数据</div>
         <li v-for="(item, index) in leftList" :key="index">
           <p class="tabHead">{{ item.name }}</p>
-          <p class="tabValue">{{ item.value }}</p>
+          <p class="tabValue" :title="item.value">{{ item.value }}</p>
         </li>
       </ul>
     </div>
@@ -14,7 +14,7 @@
         <div class="title">面检数据</div>
         <li v-for="(item, index) in rightList" :key="index">
           <p class="tabHead">{{ item.name }}</p>
-          <p class="tabValue">{{ item.value }}</p>
+          <p class="tabValue" :title="item.value">{{ item.value }}</p>
         </li>
       </ul>
     </div>

src/views/qualityManagement/components/samplingAdd.vue

@@ -196,8 +196,7 @@ export default {
           if (this.tableData.length === 0) {
             this.$message({
               message: '请先到标准设置中添加该检测项目的检测点',
-              type: 'error',
+              type: 'error'
-              duration: 2000
             })
             return false
           }
@@ -229,9 +228,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '保存成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.$emit('successSubmit')
               this.formClear()

src/views/qualityManagement/components/standardSetting.vue

@@ -48,6 +48,7 @@
       <el-row>
         <el-col :span="24" style="margin-bottom: 20px">
           <base-table
+            :key="standardSettingNum"
             :table-props="tableProps"
             :table-data="tableData"
             :max-height="tableH"
@@ -126,6 +127,7 @@ export default {
           { required: true, message: '请选择检验项目', trigger: 'change' }
         ]
       },
+      standardSettingNum: 0,
       tableProps,
       tableData: [],
       tableBtn,
@@ -163,7 +165,9 @@ export default {
       })
     },
     handleClick(val) {
-      this.tableData.splice(val._pageIndex, 1)
+      console.log(val)
+      this.tableData.splice(val.data._pageIndex - 1, 1)
+      this.standardSettingNum++
     },
     submitForm() {
       this.$refs['form'].validate((valid) => {
@@ -171,8 +175,7 @@ export default {
           if (this.tableData.length === 0) {
             this.$message({
               message: '请点击新增按钮添加标准值后再保存',
-              type: 'error',
+              type: 'error'
-              duration: 1500
             })
             return false
           }
@@ -180,8 +183,7 @@ export default {
             if (!item.detectItem || !item.detectPoint || !item.detectStandard) {
               this.$message({
                 message: '表格中有数据空缺，请检查',
-                type: 'error',
+                type: 'error'
-                duration: 1500
               })
               return false
             }
@@ -193,9 +195,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '保存成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.$emit('successSubmit')
               this.formClear()
@@ -223,8 +223,7 @@ export default {
       if (!this.form.detectItem) {
         this.$message({
           message: '请先选择检验项目',
-          type: 'error',
+          type: 'error'
-          duration: 1500
         })
         return false
       }

src/views/qualityManagement/processFullInspection/defectScatterPlot.vue

@@ -231,18 +231,14 @@ export default {
       if (this.selectedGlassId.length === 0) {
         this.$message({
           message: '请先勾选左侧的玻璃',
-          type: 'error',
+          type: 'error'
-          duration: 1500,
-          onClose: () => {}
         })
         return false
       }
       if (this.checkList.length === 0) {
         this.$message({
           message: '请先勾选缺陷',
-          type: 'error',
+          type: 'error'
-          duration: 1500,
-          onClose: () => {}
         })
         return false
       }
@@ -255,6 +251,17 @@ export default {
         defectType: this.checkList
       }).then((res) => {
         if (res.code === 0) {
+          // console.log(res.data)
+          // let arr = []
+          // let aobj = {}
+          // for (let i = 0; i < 10000; i++) {
+          //   let obj = {}
+          //   obj.xpos = Math.floor(Math.random() * 2250)
+          //   obj.ypos = Math.floor(Math.random() * 2600)
+          //   arr.push(obj)
+          // }
+          // aobj.BL = arr
+          // this.defectList = aobj
           this.defectList = res.data
         } else {
           this.defectList = {}

src/views/reportManagement/components/reportClassAdd.vue

@@ -49,8 +49,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }
@@ -62,8 +61,7 @@ export default {
               if (res.code === 0) {
                 this.$message({
                   message: '操作成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500
                 })
                 this.$emit('successSubmit')
               }

src/views/reportManagement/components/reportNameEdit.vue

@@ -41,8 +41,7 @@ export default {
             if (res.code === 0) {
               this.$message({
                 message: '操作成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500
               })
               this.$emit('successSubmit')
             }

src/views/reportManagement/reportTools/reportClassification.vue

@@ -136,9 +136,7 @@ export default {
             reportCategoryDelete({ id: val.data.id }).then(() => {
               this.$message({
                 message: '工单删除成功',
-                type: 'success',
+                type: 'success'
-                duration: 1500,
-                onClose: () => {}
               })
               this.listQuery.current = 1
               this.getList()

src/views/reportManagement/reportTools/reportList.vue

@@ -1,24 +1,28 @@
 <template>
   <div class="reoprtManager">
     <div class="report">
-      <div class="imgBox">
+      <div class="reportBox">
-        <img
+        <div class="imgBox">
-          src="./../../../assets/reportManagement/report.png"
+          <img src="./../../../assets/reportManagement/report.png" alt="" />
-          alt=""
+        </div>
-          width="355px"
+        <div class="numBox">
-          height="314px"
-        />
-      </div>
-      <div class="numBox">
-        <div>
           <div class="reportNum">
             <div class="num">{{ totalReports }}</div>
             <div class="text">
-              <p class="font">全部报表</p>
+              <p class="font">
-              <p class="letter">Reports</p>
+                <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="font">
-            <p class="letter">Reports</p>
+              <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>

src/views/reportManagement/reportTools/reportListDetail.vue

@@ -204,9 +204,7 @@ export default {
               delReportlist({ id: val.data.id }).then(() => {
                 this.$message({
                   message: '报表删除成功',
-                  type: 'success',
+                  type: 'success'
-                  duration: 1500,
-                  onClose: () => {}
                 })
                 this.listQuery.current = 1
                 this.getList()
@@ -250,8 +248,7 @@ export default {
         if (res.code === 0) {
           this.$message({
             message: '操作成功',
-            type: 'success',
+            type: 'success'
-            duration: 1500
           })
           this.getList()
         }