6.28 #25

マージ済み
juzi が 1 個のコミットを zjl から master へマージ 2023-06-28 17:06:16 +08:00
48個のファイルの変更316行の追加301行の削除
コミット 4e2af05e78 の変更だけを表示しています - すべてのコミットを表示

ファイルの表示

@@ -1 +1 @@
.box[data-v-334c85ea]{padding:16px}.box .title[data-v-334c85ea]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.box .bottom-tip .l-box[data-v-334c85ea],.box .bottom-tip .r-box[data-v-334c85ea]{width:50%;display:inline-block;text-align:center}.box .bottom-tip .l-box[data-v-334c85ea]{border-right:1px solid #e8e8e8}.box .bottom-tip .num1[data-v-334c85ea],.box .bottom-tip .num2[data-v-334c85ea]{font-size:28px}.box .bottom-tip .num1[data-v-334c85ea]{color:#3ca8ff}.box .bottom-tip .num2[data-v-334c85ea]{color:#69e6d8}.box .bottom-tip .month1[data-v-334c85ea],.box .bottom-tip .month2[data-v-334c85ea]{font-size:16px;color:#000}.box .bottom-tip .month1[data-v-334c85ea]:before,.box .bottom-tip .month2[data-v-334c85ea]:before{content:"";display:inline-block;width:8px;height:8px;background:#69e6d8;border-radius:4px;margin-right:8px;vertical-align:middle}.main-box[data-v-42d5076f]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-42d5076f]{overflow-y:auto;height:calc(100vh - 204px);padding:16px 10px 0}.main-box .left-box[data-v-42d5076f],.main-box .middle-bottom[data-v-42d5076f],.main-box .middle-top[data-v-42d5076f],.main-box .right-bottom[data-v-42d5076f],.main-box .right-top[data-v-42d5076f]{border-radius:8px;background-color:#fff}.main-box .middle-top[data-v-42d5076f]{height:60px;margin-bottom:8px;padding:16px}.main-box .middle-top .choose-box[data-v-42d5076f]{display:inline-block;margin-right:10px}.main-box .middle-top .search-box[data-v-42d5076f]{display:inline-block;vertical-align:bottom}.main-box .middle-bottom[data-v-42d5076f]{height:calc(100vh - 272px)}.main-box .right-top[data-v-42d5076f]{height:calc(50vh - 106px);margin-bottom:8px}.main-box .right-bottom[data-v-42d5076f]{height:calc(50vh - 106px)}.main-box .title[data-v-42d5076f]{display:inline-block;margin-right:8px;margin-bottom:22px}.main-box .title[data-v-42d5076f]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.middle-top .el-radio-button__inner{background-color:#f2f4f9}.middle-bottom{padding:16px} .box[data-v-334c85ea]{padding:16px}.box .title[data-v-334c85ea]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.box .bottom-tip .l-box[data-v-334c85ea],.box .bottom-tip .r-box[data-v-334c85ea]{width:50%;display:inline-block;text-align:center}.box .bottom-tip .l-box[data-v-334c85ea]{border-right:1px solid #e8e8e8}.box .bottom-tip .num1[data-v-334c85ea],.box .bottom-tip .num2[data-v-334c85ea]{font-size:28px}.box .bottom-tip .num1[data-v-334c85ea]{color:#3ca8ff}.box .bottom-tip .num2[data-v-334c85ea]{color:#69e6d8}.box .bottom-tip .month1[data-v-334c85ea],.box .bottom-tip .month2[data-v-334c85ea]{font-size:16px;color:#000}.box .bottom-tip .month1[data-v-334c85ea]:before,.box .bottom-tip .month2[data-v-334c85ea]:before{content:"";display:inline-block;width:8px;height:8px;background:#69e6d8;border-radius:4px;margin-right:8px;vertical-align:middle}.main-box[data-v-65ec23a8]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-65ec23a8]{overflow-y:auto;height:calc(100vh - 204px);padding:16px 10px 0}.main-box .left-box[data-v-65ec23a8],.main-box .middle-bottom[data-v-65ec23a8],.main-box .middle-top[data-v-65ec23a8],.main-box .right-bottom[data-v-65ec23a8],.main-box .right-top[data-v-65ec23a8]{border-radius:8px;background-color:#fff}.main-box .middle-top[data-v-65ec23a8]{height:60px;margin-bottom:8px;padding:16px}.main-box .middle-top .choose-box[data-v-65ec23a8]{display:inline-block;margin-right:10px}.main-box .middle-top .search-box[data-v-65ec23a8]{display:inline-block;vertical-align:bottom}.main-box .middle-bottom[data-v-65ec23a8]{height:calc(100vh - 272px)}.main-box .right-top[data-v-65ec23a8]{height:calc(50vh - 106px);margin-bottom:8px}.main-box .right-bottom[data-v-65ec23a8]{height:calc(50vh - 106px)}.main-box .title[data-v-65ec23a8]{display:inline-block;margin-right:8px;margin-bottom:22px}.main-box .title[data-v-65ec23a8]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.middle-top .el-radio-button__inner{background-color:#f2f4f9}.middle-bottom{padding:16px}

ファイルの表示

@@ -1 +1 @@
.glassWasteReport .el-table{display:flex;flex-direction:column}.glassWasteReport .el-table__body-wrapper{order:1}.glassWasteReport .el-table__fixed-body-wrapper{top:116px!important}.glassWasteReport .el-table__fixed-footer-wrapper{z-index:0;top:81px!important}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.wasteMachineReport .el-table th.el-table__cell{height:28px}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:60px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteMachineReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:80px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.wasteLocationReport .el-table th.el-table__cell{height:28px}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:48px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteLocationReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:68px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.glassDefectReport .baseMsg{font-size:14px;height:40px;line-height:40px;display:flex;border:1px solid #e8e8e8;border-radius:4px;margin-bottom:20px}.glassDefectReport .baseMsg li{width:25%;text-align:center;padding:0 10px;border-right:1px solid #e8e8e8;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.glassDefectReport .baseMsg li span{font-weight:600}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.glassDefectReport .el-table th.el-table__cell{height:28px}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:48px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.glassDefectReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:68px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.thicknessReport .baseMsg{font-size:14px;height:40px;line-height:40px;display:flex;border:1px solid #e8e8e8;border-radius:4px;margin-bottom:20px}.thicknessReport .baseMsg li{width:25%;text-align:center;padding:0 10px;border-right:1px solid #e8e8e8;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.thicknessReport .baseMsg li span{font-weight:600}.finalInspectionData[data-v-b9fcebd8]{width:100%}.finalInspectionData .box-top[data-v-b9fcebd8]{width:100%;padding:8px 16px 0}.finalInspectionData .box-top .search-box[data-v-b9fcebd8]{height:62px;padding:10px 16px;box-sizing:border-box;border-radius:8px;background-color:#fff}.finalInspectionData .box[data-v-b9fcebd8]{height:calc(100vh - 215px);margin:8px 16px 0 16px}.finalInspectionData .box .split-pane[data-v-b9fcebd8]{height:100%;border-radius:8px}.finalInspectionData .box .left-box[data-v-b9fcebd8]{padding:16px;background-color:#fff}.finalInspectionData .box .left-box .table-button[data-v-b9fcebd8]{display:inline-block;height:30px;width:100%;text-align:center;padding-top:4px;margin-bottom:16px;font-size:14px;color:#0b58ff;border-radius:4px;border:1px dotted #0b58ff;cursor:pointer}.finalInspectionData .box .right-box .inner-box[data-v-b9fcebd8]{height:100%;margin-left:16px;padding:16px 16px 0;border-radius:8px;overflow:auto;background-color:#fff}.finalInspectionData .box .right-box .inner-box .table-box[data-v-b9fcebd8]{margin-top:16px;height:calc(100vh - 290px);overflow:auto}.finalInspectionData .box .right-box .title[data-v-b9fcebd8]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle} .glassWasteReport .el-table{display:flex;flex-direction:column}.glassWasteReport .el-table__body-wrapper{order:1}.glassWasteReport .el-table__fixed-body-wrapper{top:116px!important}.glassWasteReport .el-table__fixed-footer-wrapper{z-index:0;top:81px!important}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.wasteMachineReport .el-table th.el-table__cell{height:28px}.wasteMachineReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:60px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteMachineReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:80px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.wasteLocationReport .el-table th.el-table__cell{height:28px}.wasteLocationReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:48px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.wasteLocationReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:68px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.glassDefectReport .baseMsg{font-size:14px;height:40px;line-height:40px;display:flex;border:1px solid #e8e8e8;border-radius:4px;margin-bottom:20px}.glassDefectReport .baseMsg li{width:25%;text-align:center;padding:0 10px;border-right:1px solid #e8e8e8;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.glassDefectReport .baseMsg li span{font-weight:600}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type{border-bottom:none}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type div.cell{text-align:right}.glassDefectReport .el-table th.el-table__cell{height:28px}.glassDefectReport .el-table thead.is-group tr:first-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:48px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.glassDefectReport .el-table thead.is-group tr:last-of-type th:first-of-type:before{content:"";position:absolute;height:35px;top:0;left:68px;background-color:#ebeef5;transform:rotate(-35deg);transform-origin:top;width:1px}.thicknessReport .baseMsg{font-size:14px;height:40px;line-height:40px;display:flex;border:1px solid #e8e8e8;border-radius:4px;margin-bottom:20px}.thicknessReport .baseMsg li{width:25%;text-align:center;padding:0 10px;border-right:1px solid #e8e8e8;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.thicknessReport .baseMsg li span{font-weight:600}.finalInspectionData[data-v-988f9d78]{width:100%}.finalInspectionData .box-top[data-v-988f9d78]{width:100%;padding:8px 16px 0}.finalInspectionData .box-top .search-box[data-v-988f9d78]{height:62px;padding:10px 16px;box-sizing:border-box;border-radius:8px;background-color:#fff}.finalInspectionData .box[data-v-988f9d78]{height:calc(100vh - 215px);margin:8px 16px 0 16px}.finalInspectionData .box .split-pane[data-v-988f9d78]{height:100%;border-radius:8px}.finalInspectionData .box .left-box[data-v-988f9d78]{padding:16px;background-color:#fff}.finalInspectionData .box .left-box .table-button[data-v-988f9d78]{display:inline-block;height:30px;width:100%;text-align:center;padding-top:4px;margin-bottom:16px;font-size:14px;color:#0b58ff;border-radius:4px;border:1px dotted #0b58ff;cursor:pointer}.finalInspectionData .box .right-box .inner-box[data-v-988f9d78]{height:100%;margin-left:16px;padding:16px 16px 0;border-radius:8px;overflow:auto;background-color:#fff}.finalInspectionData .box .right-box .inner-box .table-box[data-v-988f9d78]{margin-top:16px;height:calc(100vh - 290px);overflow:auto}.finalInspectionData .box .right-box .title[data-v-988f9d78]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

ファイルの表示

@@ -1 +0,0 @@
.box[data-v-831fd0b0]{padding:0 32px}

ファイルの表示

@@ -1 +0,0 @@
.main-box[data-v-0bb56d3c]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-0bb56d3c],.main-box .right-box[data-v-0bb56d3c]{overflow-y:auto;height:calc(100vh - 204px);padding:16px 10px 0;border-radius:8px;background-color:#fff}.main-box .title[data-v-0bb56d3c]{display:inline-block;margin-right:8px;margin-bottom:22px}.main-box .title[data-v-0bb56d3c]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

ファイルの表示

1
dist/css/8603.6c080e4e.css vendored ノーマルファイル
ファイルの表示

@@ -0,0 +1 @@
.main-box[data-v-1683220e]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-1683220e],.main-box .right-box[data-v-1683220e]{overflow-y:auto;height:calc(100vh - 204px);padding:16px 10px 0;border-radius:8px;background-color:#fff}.main-box .title[data-v-1683220e]{display:inline-block;margin-right:8px;margin-bottom:22px}.main-box .title[data-v-1683220e]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

ファイルの表示

@@ -1 +0,0 @@
.thicknessDistributionChart .top-table[data-v-39282f9b]{font-size:14px;font-weight:500;margin-bottom:16px}.thicknessDistributionChart .top-table ul[data-v-39282f9b]{display:flex;flex-flow:row nowrap}.thicknessDistributionChart .top-table ul li[data-v-39282f9b]{color:rgba(0,0,0,.85);width:20%;padding:10px;border:1px solid #e8e8e8}.thicknessDistributionChart .top-table ul .red-tip[data-v-39282f9b]{color:rgba(255,78,78,.85)}.thicknessDistributionChart .top-table ul .blue-tip[data-v-39282f9b]{color:#507dd7}.thicknessDistributionChart .top-table ul .purple-tip[data-v-39282f9b]{color:rgba(152,83,255,.85)}.thicknessDistributionChart .top-table ul .green-tip[data-v-39282f9b]{color:#50bb90}.thicknessDistributionChart .top-table ul .yellow-tip[data-v-39282f9b]{color:#ecb441}.thicknessDistributionChart .title[data-v-39282f9b]{font-size:14px;color:rgba(0,0,0,.85)}.thicknessDistributionChart .title[data-v-39282f9b]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.thicknessDistributionMap[data-v-f61202a6]{width:100%;padding:0 8px 0 16px}.thicknessDistributionMap .left-box[data-v-f61202a6],.thicknessDistributionMap .right-box[data-v-f61202a6]{height:calc(100vh - 205px);padding:16px;border-radius:8px;background-color:#fff}

1
dist/css/9853.2e75ca81.css vendored ノーマルファイル
ファイルの表示

@@ -0,0 +1 @@
.box[data-v-16d645bc]{padding:0 32px}

1
dist/css/9929.99269323.css vendored ノーマルファイル
ファイルの表示

@@ -0,0 +1 @@
.thicknessDistributionChart .top-table[data-v-5a382438]{font-size:14px;font-weight:500;margin-bottom:16px}.thicknessDistributionChart .top-table ul[data-v-5a382438]{display:flex;flex-flow:row nowrap}.thicknessDistributionChart .top-table ul li[data-v-5a382438]{color:rgba(0,0,0,.85);width:20%;padding:10px;border:1px solid #e8e8e8}.thicknessDistributionChart .top-table ul .red-tip[data-v-5a382438]{color:rgba(255,78,78,.85)}.thicknessDistributionChart .top-table ul .blue-tip[data-v-5a382438]{color:#507dd7}.thicknessDistributionChart .top-table ul .purple-tip[data-v-5a382438]{color:rgba(152,83,255,.85)}.thicknessDistributionChart .top-table ul .green-tip[data-v-5a382438]{color:#50bb90}.thicknessDistributionChart .top-table ul .yellow-tip[data-v-5a382438]{color:#ecb441}.thicknessDistributionChart .title[data-v-5a382438]{font-size:14px;color:rgba(0,0,0,.85)}.thicknessDistributionChart .title[data-v-5a382438]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.thicknessDistributionMap[data-v-247deb1f]{width:100%;padding:0 8px 0 16px}.thicknessDistributionMap .left-box[data-v-247deb1f],.thicknessDistributionMap .right-box[data-v-247deb1f]{height:calc(100vh - 205px);padding:16px;border-radius:8px;background-color:#fff}

2
dist/index.html vendored
ファイルの表示

@@ -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.a42f8636.js"></script><script defer="defer" src="/js/app.82d493da.js"></script><link href="/css/app.68cbc19b.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.a42f8636.js"></script><script defer="defer" src="/js/app.994d473e.js"></script><link href="/css/app.68cbc19b.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>

長すぎる行があるためファイル差分は表示されません

1
dist/js/1599.bcd5ebe9.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

2
dist/js/2629.8606a504.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

ファイルの表示

@@ -1 +0,0 @@
"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2740],{2740:function(t,r,e){e.r(r),e.d(r,{default:function(){return l}});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")])])}],s=e(6527),a={name:"ReportList",data(){return{totalReports:0,reportList:[]}},mounted(){this.getList()},methods:{getList(){(0,s.J_)({}).then((t=>{if(0===t.code&&t.data.length>0){this.totalReports=0;for(let r=0;r<t.data.length;r++)this.totalReports+=t.data[r].quantity;this.reportList=t.data}else this.totalReports=0,this.reportList=[]}))},toDetail(t){this.$router.push({name:"reportListDetail",params:{categoryId:t||""}})}}},u=a,i=e(1001),p=(0,i.Z)(u,o,n,!1,null,null,null),l=p.exports},6527:function(t,r,e){e.d(r,{AT:function(){return y},Hg:function(){return d},J_:function(){return n},QL:function(){return i},W0:function(){return f},a:function(){return c},an:function(){return _},bu:function(){return g},fL:function(){return C},kB:function(){return s},m3:function(){return l},oR:function(){return v},sy:function(){return a},uW:function(){return h},uj:function(){return m},wy:function(){return u},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 s(t){return(0,o.Z)({url:"/report/report-sheet/page",method:"post",data:t})}function a(t){return(0,o.Z)({url:"/report/report-sheet/update",method:"post",data:t})}function u(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 l(t){return(0,o.Z)({url:"/report/report-sheet-category/add",method:"post",data:t})}function c(t){return(0,o.Z)({url:"/report/report-sheet-category/update",method:"post",data:t})}function d(t){return(0,o.Z)({url:"/report/report-sheet-category/get",method:"post",data:t})}function f(t){return(0,o.Z)({url:"/report/report-sheet-category/delete",method:"post",data:t})}function h(t){return(0,o.Z)({url:"/report/GlassReport/listGlass",method:"post",data:t})}function m(t){return(0,o.Z)({url:"/report/GlassReport/qualityReport",method:"post",data:t})}function v(t){return(0,o.Z)({url:"/report/GlassReport/qualityReportexport",method:"post",responseType:"blob",data:t})}function g(t){return(0,o.Z)({url:"/report/GlassReport/thickReport",method:"post",data:t})}function _(t){return(0,o.Z)({url:"/report/GlassReport/thickReportexport",method:"post",responseType:"blob",data:t})}function y(t){return(0,o.Z)({url:"/quality/finalpackaging/queryGlassData",method:"post",data:t})}function C(t){return(0,o.Z)({url:"/quality/finalpackaging/claGlassData",method:"post",data:t})}},5002:function(t,r,e){t.exports=e.p+"img/report.b2b3c253.png"}}]);

1
dist/js/2740.5f835a4b.js vendored ノーマルファイル
ファイルの表示

@@ -0,0 +1 @@
"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2740],{2740:function(t,r,e){e.r(r),e.d(r,{default:function(){return l}});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")])])}],s=e(6527),a={name:"ReportList",data(){return{totalReports:0,reportList:[]}},mounted(){this.getList()},methods:{getList(){(0,s.J_)({}).then((t=>{if(0===t.code&&t.data.length>0){this.totalReports=0;for(let r=0;r<t.data.length;r++)this.totalReports+=t.data[r].quantity;this.reportList=t.data}else this.totalReports=0,this.reportList=[]}))},toDetail(t){this.$router.push({name:"reportListDetail",params:{categoryId:t||""}})}}},u=a,i=e(1001),p=(0,i.Z)(u,o,n,!1,null,null,null),l=p.exports},6527:function(t,r,e){e.d(r,{AT:function(){return y},Hg:function(){return d},J_:function(){return n},Kx:function(){return Z},QL:function(){return i},W0:function(){return f},a:function(){return c},an:function(){return _},bu:function(){return v},fL:function(){return R},gc:function(){return C},kB:function(){return s},m3:function(){return l},oR:function(){return g},sy:function(){return a},uW:function(){return h},uj:function(){return m},wy:function(){return u},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 s(t){return(0,o.Z)({url:"/report/report-sheet/page",method:"post",data:t})}function a(t){return(0,o.Z)({url:"/report/report-sheet/update",method:"post",data:t})}function u(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 l(t){return(0,o.Z)({url:"/report/report-sheet-category/add",method:"post",data:t})}function c(t){return(0,o.Z)({url:"/report/report-sheet-category/update",method:"post",data:t})}function d(t){return(0,o.Z)({url:"/report/report-sheet-category/get",method:"post",data:t})}function f(t){return(0,o.Z)({url:"/report/report-sheet-category/delete",method:"post",data:t})}function h(t){return(0,o.Z)({url:"/report/GlassReport/listGlass",method:"post",data:t})}function m(t){return(0,o.Z)({url:"/report/GlassReport/qualityReport",method:"post",data:t})}function g(t){return(0,o.Z)({url:"/report/GlassReport/qualityReportexport",method:"post",responseType:"blob",data:t})}function v(t){return(0,o.Z)({url:"/report/GlassReport/thickReport",method:"post",data:t})}function _(t){return(0,o.Z)({url:"/report/GlassReport/thickReportexport",method:"post",responseType:"blob",data:t})}function y(t){return(0,o.Z)({url:"/quality/finalpackaging/queryGlassData",method:"post",data:t})}function R(t){return(0,o.Z)({url:"/quality/finalpackaging/claGlassData",method:"post",data:t})}function Z(t){return(0,o.Z)({url:"/report/GlassReport/getGlassVoid",method:"post",data:t})}function C(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"}}]);

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

ファイルの表示

@@ -1 +0,0 @@
"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[4344],{4344:function(t,e,a){a.r(e),a.d(e,{default:function(){return b}});var r=function(){var t=this,e=t._self._c;return e("div",[e("el-row",{staticClass:"main-box",attrs:{gutter:10}},[e("el-col",{attrs:{span:4}},[e("div",{staticClass:"left-box"},[e("el-tree",{attrs:{data:t.treeData,"node-key":"id",props:t.defaultTime,"default-expand-all":""},on:{"node-click":t.clickDevice}})],1)]),e("el-col",{attrs:{span:20}},[e("div",{staticClass:"right-box"},[e("search-bar",{attrs:{formConfigs:t.formConfig},on:{headBtnClick:t.buttonClick}}),e("rate-analysis-chart")],1)])],1)],1)},n=[],o=a(5591),i=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticStyle:{width:"100%"},style:{height:t.chartHeight+"px"},attrs:{id:"rateChart"}})])},l=[],s=a(7171),c=a(475),u=a(5468),m={name:"RateAnalysisChart",mixins:[u.Z],data(){return{chartDom:"",chart:"",chartHeight:(0,c.NC)(214)-35}},mounted(){this.chartDom=document.getElementById("rateChart"),this.chart=s.S1(this.chartDom),this.getChart(),window.addEventListener("resize",(()=>{this.chartHeight=(0,c.NC)(214)-35}))},methods:{getChart(){const t=[],e=[],a=[];for(let o=1;o<=31;o++){let e="";e=o+"",t.push(e)}for(let o=1;o<=31;o++){let t="";t=parseInt(23*Math.random()+1),e.push(t)}for(let o=1;o<=31;o++){let t="";t=parseInt(10*Math.random()+90),a.push(t)}const r=["#73A0FA","#F6BE19","#5AD8A6"];var n={color:r,tooltip:{trigger:"axis",axisPointer:{type:"cross",crossStyle:{color:"#999"}}},legend:{data:["实际运行小时数","理论运行时长","设备利用率"]},xAxis:[{type:"category",data:t,axisPointer:{type:"shadow"}}],yAxis:[{type:"value",name:"理论运行时长",axisLabel:{formatter:"{value} h"}},{type:"value",name:"设备利用率",axisLabel:{formatter:"{value} %"}}],series:[{name:"实际运行小时数",type:"bar",tooltip:{valueFormatter:function(t){return t+" ml"}},data:e},{name:"理论运行时长",type:"line",tooltip:{valueFormatter:function(t){return t+" ml"}},data:e},{name:"设备利用率",type:"line",yAxisIndex:1,tooltip:{valueFormatter:function(t){return t+"%"}},data:a}]};n&&this.chart.setOption(n)}}},h=m,d=a(1001),p=(0,d.Z)(h,i,l,!1,null,null,null),f=p.exports,y={name:"utilizationRateAnalysis",data(){return{treeData:[],defaultTime:{children:"children",label:"name"},chooseMonth:"",formConfig:[{type:"datePicker",label:"月份选择",dateType:"month",format:"yyyy-MM",valueFormat:"yyyy-MM",placeholder:"月份选择",param:"testTime",width:200},{type:"button",btnName:"查询",name:"search",color:"primary"}]}},components:{rateAnalysisChart:f},mounted(){this.getTree()},methods:{getTree(){(0,o.SI)().then((t=>{this.treeData=t.data}))},buttonClick(t){console.log(t)},clickDevice(t){console.log(t),t.children||console.log(t.children)}}},g=y,v=(0,d.Z)(g,r,n,!1,null,"0bb56d3c",null),b=v.exports},5591:function(t,e,a){a.d(e,{FH:function(){return l},Hp:function(){return s},JQ:function(){return i},SI:function(){return o},WQ:function(){return m},b6:function(){return c},iv:function(){return n},m:function(){return u}});var r=a(8859);function n(){return(0,r.Z)({url:"/common/getList",method:"post"})}function o(){return(0,r.Z)({url:"/common/getTreeData",method:"post"})}function i(t){return(0,r.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function l(t){return(0,r.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function s(t){return(0,r.Z)({url:"/common/getAlarmData",method:"post",data:t})}function c(t){return(0,r.Z)({url:"/common/getProductData",method:"post",data:t})}function u(t){return(0,r.Z)({url:"/common/getMaterialData",method:"post",data:t})}const m="/api/common/attachment/uploadFileFormData"}}]);

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

1
dist/js/7671.5ca89394.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

1
dist/js/8603.551089ef.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

1
dist/js/9853.534bb5f1.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

1
dist/js/9929.9f8dbee7.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

長すぎる行があるためファイル差分は表示されません

1
dist/js/app.994d473e.js vendored ノーマルファイル

長すぎる行があるためファイル差分は表示されません

ファイルの表示

@@ -23,6 +23,14 @@ export function performanceUpdatePlan(data) {
data data
}) })
} }
// 利用率分析
export function getUtilization(data) {
return request({
url: '/equipment/PerformanceAnalysis/getUtilization',
method: 'post',
data
})
}
// 托盘指标分析 // 托盘指标分析
export function palletIndicatorAnalysisPage(data) { export function palletIndicatorAnalysisPage(data) {
return request({ return request({

ファイルの表示

@@ -138,3 +138,19 @@ export function claGlassData(data) {
data data
}) })
} }
// 终检数据-玻璃判废统计报表数据查询
export function getGlassVoid(data) {
return request({
url: '/report/GlassReport/getGlassVoid',
method: 'post',
data
})
}
// 终检数据-判废机组报表数据查询
export function getUnitVoid(data) {
return request({
url: '/report/GlassReport/getUnitVoid',
method: 'post',
data
})
}

ファイルの表示

@@ -67,7 +67,7 @@ export default {
let failurePercentList = [] let failurePercentList = []
let combinedEfficiencyList = [] let combinedEfficiencyList = []
for (let i = 0; i < this.chartMsg.length; i++) { for (let i = 0; i < this.chartMsg.length; i++) {
dateList.push(new Date(this.chartMsg[i].date).getDate()) dateList.push(new Date(this.chartMsg[i].recordDate).getDate())
activationList.push(this.chartMsg[i].activation) activationList.push(this.chartMsg[i].activation)
performanceList.push(this.chartMsg[i].performance) performanceList.push(this.chartMsg[i].performance)
failurePercentList.push(this.chartMsg[i].failurePercent) failurePercentList.push(this.chartMsg[i].failurePercent)

ファイルの表示

@@ -21,33 +21,49 @@ export default {
chartHeight: tableHeight(214) - 35 chartHeight: tableHeight(214) - 35
} }
}, },
props: {
chartData: {
type: Array,
required: true,
default: () => {
return []
}
}
},
mounted() { mounted() {
this.chartDom = document.getElementById('rateChart') this.$nextTick(() => {
this.chart = echarts.init(this.chartDom) this.getChart()
this.getChart() })
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = tableHeight(214) - 35 this.chartHeight = tableHeight(214) - 35
}) })
}, },
watch: {
chartData: function () {
this.getChart()
}
},
methods: { methods: {
getChart() { getChart() {
if (
this.chart !== null &&
this.chart !== '' &&
this.chart !== undefined
) {
this.chart.dispose() // 页面多次刷新会出现警告Dom已经初始化了一个实例这是销毁实例
}
this.chartDom = document.getElementById('rateChart')
this.chart = echarts.init(this.chartDom)
const xData = [] const xData = []
const yData1 = [] const yData1 = []
const yData2 = [] const yData2 = []
for (let i = 1; i <= 31; i++) { const yData3 = new Array(31).fill(24)
for (let i = 1; i <= this.chartData.length; i++) {
let num = '' let num = ''
num = i + '' num = i + ''
xData.push(num) xData.push(num)
} yData1.push(this.chartData[i - 1].operationHours)
for (let i = 1; i <= 31; i++) { yData2.push(this.chartData[i - 1].utilization.substring(0, 5))
let num = ''
num = parseInt(Math.random() * 23 + 1)
yData1.push(num)
}
for (let i = 1; i <= 31; i++) {
let num = ''
num = parseInt(Math.random() * 10 + 90)
yData2.push(num)
} }
const color = ['#73A0FA', '#F6BE19', '#5AD8A6'] const color = ['#73A0FA', '#F6BE19', '#5AD8A6']
var option = { var option = {
@@ -95,7 +111,7 @@ export default {
type: 'bar', type: 'bar',
tooltip: { tooltip: {
valueFormatter: function (value) { valueFormatter: function (value) {
return value + ' ml' return value + ' h'
} }
}, },
data: yData1 data: yData1
@@ -105,10 +121,10 @@ export default {
type: 'line', type: 'line',
tooltip: { tooltip: {
valueFormatter: function (value) { valueFormatter: function (value) {
return value + ' ml' return value + ' h'
} }
}, },
data: yData1 data: yData3
}, },
{ {
name: '设备利用率', name: '设备利用率',

ファイルの表示

@@ -5,10 +5,12 @@
<div class="left-box"> <div class="left-box">
<el-tree <el-tree
:data="treeData" :data="treeData"
node-key="id" node-key="name"
:props="defaultTime" :props="defaultTime"
default-expand-all default-expand-all
:highlight-current="true"
@node-click="clickDevice" @node-click="clickDevice"
ref="deviceTree"
> >
</el-tree> </el-tree>
</div> </div>
@@ -112,11 +114,15 @@ export default {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
eqName: '',
chooseDate: '',
listQuery: { listQuery: {
current: 1, current: 1,
size: 500 size: 500,
type: '',
time: '',
name: ''
}, },
chooseDate: '',
tableProps, tableProps,
tableData: [], tableData: [],
tableH: tableHeight(350), tableH: tableHeight(350),
@@ -134,6 +140,11 @@ export default {
getTree() { getTree() {
getTreeData().then((res) => { getTreeData().then((res) => {
this.treeData = res.data this.treeData = res.data
this.eqName = res.data[0].children[0].children[0].name
this.listQuery.name = this.eqName
setTimeout(() => {
this.$refs.deviceTree.setCurrentKey(this.eqName)
}, 100)
}) })
}, },
clickDevice(val) { clickDevice(val) {

ファイルの表示

@@ -5,10 +5,12 @@
<div class="left-box"> <div class="left-box">
<el-tree <el-tree
:data="treeData" :data="treeData"
node-key="id" node-key="name"
:props="defaultTime" :props="defaultTree"
:highlight-current="true"
default-expand-all default-expand-all
@node-click="clickDevice" @node-click="clickDevice"
ref="deviceTree"
> >
</el-tree> </el-tree>
</div> </div>
@@ -16,7 +18,7 @@
<el-col :span="20"> <el-col :span="20">
<div class="right-box"> <div class="right-box">
<search-bar :formConfigs="formConfig" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" @headBtnClick="buttonClick" />
<rate-analysis-chart></rate-analysis-chart> <rate-analysis-chart :chartData="chartData"></rate-analysis-chart>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@@ -25,15 +27,17 @@
<script> <script>
import { getTreeData } from '@/api/app' import { getTreeData } from '@/api/app'
import rateAnalysisChart from './../components/rateAnalysisChart.vue' import rateAnalysisChart from './../components/rateAnalysisChart.vue'
import { getUtilization } from '@/api/deviceManagement'
export default { export default {
name: 'utilizationRateAnalysis', name: 'utilizationRateAnalysis',
data() { data() {
return { return {
treeData: [], treeData: [],
defaultTime: { defaultTree: {
children: 'children', children: 'children',
label: 'name' label: 'name'
}, },
eqName: '',
chooseMonth: '', chooseMonth: '',
formConfig: [ formConfig: [
{ {
@@ -43,7 +47,8 @@ export default {
format: 'yyyy-MM', format: 'yyyy-MM',
valueFormat: 'yyyy-MM', valueFormat: 'yyyy-MM',
placeholder: '月份选择', placeholder: '月份选择',
param: 'testTime', param: 'timePosition',
defaultSelect: '',
width: 200 width: 200
}, },
{ {
@@ -52,28 +57,63 @@ export default {
name: 'search', name: 'search',
color: 'primary' color: 'primary'
} }
] ],
listQuery: {
timePosition: '',
name: ''
},
chartData: []
} }
}, },
components: { components: {
rateAnalysisChart rateAnalysisChart
}, },
mounted() { mounted() {
this.setDefaultVal()
this.getTree() this.getTree()
}, },
methods: { methods: {
setDefaultVal() {
let date = new Date()
let year = date.getFullYear()
let month =
date.getMonth() + 1 < 10
? '0' + (date.getMonth() + 1)
: date.getMonth() + 1
this.formConfig[0].defaultSelect = year + '-' + month
this.listQuery.timePosition = year + '-' + month
},
getTree() { getTree() {
getTreeData().then((res) => { getTreeData().then((res) => {
this.treeData = res.data this.treeData = res.data
this.eqName = res.data[0].children[0].children[0].name
this.listQuery.name = this.eqName
setTimeout(() => {
this.$refs.deviceTree.setCurrentKey(this.eqName)
}, 100)
})
this.getData()
},
getData() {
getUtilization({ ...this.listQuery }).then((res) => {
console.log(res)
if (res.code === 0 && res.data) {
this.chartData = res.data
} else {
this.chartData = []
}
}) })
}, },
buttonClick(val) { buttonClick(val) {
console.log(val) console.log(val)
this.listQuery.timePosition = val.timePosition
this.getData()
}, },
clickDevice(val) { clickDevice(val) {
console.log(val)
if (!val.children) { if (!val.children) {
console.log(val.children) // 设备
this.listQuery.name = val.name
this.eqName = val.name
} }
} }
} }

ファイルの表示

@@ -166,10 +166,12 @@ export default {
console.log(val) console.log(val)
this.processParametersVisible = true this.processParametersVisible = true
pageProcessParameter({ pageProcessParameter({
unitName: val.unitName, current: 1,
eqName: val.eqName, size: 500,
startTime: val.inEquipmentTime, unitId: val.data.unitId,
endTime: val.outEquipmentTime equipmentId: val.data.equipmentId,
startTime: val.data.inEquipmentTime,
endTime: val.data.outEquipmentTime
}).then((res) => { }).then((res) => {
console.log(res) console.log(res)
}) })

ファイルの表示

@@ -40,6 +40,14 @@ export default {
chartHeight: tableHeight(320) chartHeight: tableHeight(320)
} }
}, },
props: {
chartMsg: {
type: Array,
default: () => {
return []
}
}
},
mounted() { mounted() {
this.chartDom = document.getElementById('thicknessChart') this.chartDom = document.getElementById('thicknessChart')
this.chart = echarts.init(this.chartDom) this.chart = echarts.init(this.chartDom)
@@ -48,6 +56,11 @@ export default {
this.chartHeight = tableHeight(320) this.chartHeight = tableHeight(320)
}) })
}, },
watch: {
chartMsg: function () {
this.getChart()
}
},
methods: { methods: {
getChart() { getChart() {
let long = [] let long = []

ファイルの表示

@@ -16,7 +16,7 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<div class="right-box"> <div class="right-box">
<thickness-distribution-chart /> <thickness-distribution-chart :chartMsg="chartData" />
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@@ -82,14 +82,19 @@ export default {
} }
], ],
listQuery: { listQuery: {
glassId: '',
startTime: '', startTime: '',
endTime: '', endTime: ''
},
listQuery2: {
glassType: '',
testTime: '',
glassId: '' glassId: ''
}, },
tableProps, tableProps,
tableData: [], tableData: [],
tableH: tableHeight(350), tableH: tableHeight(350),
drawGlassId: '' chartData: []
} }
}, },
mounted() { mounted() {
@@ -117,10 +122,14 @@ export default {
0 0
) )
}) })
_this.drawGlassId = _this.tableData[0].id _this.listQuery2.glassId = _this.tableData[0].glassId
_this.listQuery2.glassType = _this.tableData[0].grindType
_this.listQuery2.testTime = _this.tableData[0].testTime
} else { } else {
this.tableData = [] this.tableData = []
this.drawGlassId = '' this.listQuery2.glassId = ''
this.listQuery2.glassType = ''
this.listQuery2.testTime = ''
} }
}) })
}, },
@@ -133,13 +142,16 @@ export default {
this.getList() this.getList()
break break
default: default:
drawThickness(this.drawGlassId).then((res) => { drawThickness({ ...this.listQuery2 }).then((res) => {
console.log(res) console.log(res)
this.chartData = res.data
}) })
} }
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.drawGlassId = val.newVal.id this.listQuery2.glassId = val.newVal.glassId
this.listQuery2.glassType = val.newVal.grindType
this.listQuery2.testTime = val.newVal.testTime
} }
} }
} }

ファイルの表示

@@ -75,7 +75,9 @@ import {
qualityReportexport, qualityReportexport,
thickReportexport, thickReportexport,
queryGlassData, queryGlassData,
claGlassData claGlassData,
getGlassVoid,
getUnitVoid
} from '@/api/reportManagement' } from '@/api/reportManagement'
import glassQualityReport from './finalInspectionDataReport/glassQualityReport.vue' import glassQualityReport from './finalInspectionDataReport/glassQualityReport.vue'
import glassThickReport from './finalInspectionDataReport/glassThickReport.vue' import glassThickReport from './finalInspectionDataReport/glassThickReport.vue'
@@ -91,12 +93,12 @@ const tablePropsL = [
{ {
prop: 'glassId', prop: 'glassId',
label: 'ID', label: 'ID',
minWidth: 100 minWidth: 120
}, },
{ {
prop: 'unloadTime', prop: 'unloadTime',
label: '检测时间', label: '检测时间',
minWidth: 120, minWidth: 160,
filter: timeFormatter filter: timeFormatter
}, },
{ {
@@ -222,15 +224,9 @@ export default {
packReportArr: [], //下片包装 packReportArr: [], //下片包装
packClaReportArr: [], packClaReportArr: [],
wasteReportArr: [{ name1: 11 }, { name1: 22 }], // 玻璃判废 wasteReportArr: [{ name1: 11 }, { name1: 22 }], // 玻璃判废
wasteMachineArr: [ wasteMachineArr: [],
{ name: '颗粒/面检数超标', name1: '11' },
{ name: '颗粒/缺陷聚集', name1: '22' },
{ name: '划伤', name1: '33' },
{ name: '面磨印记', name1: '44' },
{ name: '磨痕', name1: '55' }
],
wasteLocationArr: [ wasteLocationArr: [
{ name: '颗粒/面检数超标', name1: '11' }, { name: '颗粒/面检数超标', dd1: '11', dd2: '0' },
{ name: '颗粒/缺陷聚集', name1: '22' }, { name: '颗粒/缺陷聚集', name1: '22' },
{ name: '划伤', name1: '33' }, { name: '划伤', name1: '33' },
{ name: '面磨印记', name1: '44' }, { name: '面磨印记', name1: '44' },
@@ -317,6 +313,8 @@ export default {
this.thickReportArr = [] this.thickReportArr = []
this.packReportArr = [] this.packReportArr = []
this.packClaReportArr = [] this.packClaReportArr = []
this.wasteReportArr = []
this.wasteMachineArr = []
console.log(val) console.log(val)
if (val.value === '判废位置统计表') { if (val.value === '判废位置统计表') {
this.formConfig[3].type = 'select' this.formConfig[3].type = 'select'
@@ -360,10 +358,20 @@ export default {
case '厚度汇总报表': case '厚度汇总报表':
this.getThickReport(arr) this.getThickReport(arr)
break break
default: case '终检下片包装':
this.getGlassData(arr) this.getGlassData(arr)
break
case '玻璃判废统计表':
this.getWasteData(arr)
break
case '判废机组统计表':
this.getWasteMachineData(arr)
break
default:
console.log('111')
} }
}, },
// 玻璃基板品质报表
getGlassReport(arr) { getGlassReport(arr) {
qualityReport({ qualityReport({
// glassId: [122206240688, 122206240692], // glassId: [122206240688, 122206240692],
@@ -404,6 +412,7 @@ export default {
} }
}) })
}, },
// 厚度汇总报表
getThickReport(arr) { getThickReport(arr) {
thickReport({ thickReport({
glassId: arr, glassId: arr,
@@ -457,6 +466,28 @@ export default {
console.log(res) console.log(res)
this.packClaReportArr = res.data this.packClaReportArr = res.data
}) })
},
// 玻璃判废统计表
getWasteData(arr) {
getGlassVoid({
size: 1000,
current: 1,
glassId: arr
}).then((res) => {
console.log(res)
this.wasteReportArr = res.data
})
},
// 判废机组统计表
getWasteMachineData(arr) {
getUnitVoid({
size: 1000,
current: 1,
glassId: arr
}).then((res) => {
console.log(res)
this.wasteMachineArr = res.data
})
} }
} }
} }

ファイルの表示

@@ -7,6 +7,7 @@
:page="1" :page="1"
:limit="20" :limit="20"
show-summary show-summary
:summary-method="getSummaries"
/> />
</div> </div>
</template> </template>
@@ -18,7 +19,7 @@ const tableProps = [
label: 'ID' label: 'ID'
}, },
{ {
prop: 'name1', prop: 'qualified',
label: '合格' label: '合格'
}, },
{ {
@@ -26,51 +27,51 @@ const tableProps = [
label: '前工程不良', label: '前工程不良',
children: [ children: [
{ {
prop: 'name2', prop: 'bubblesNum',
label: '气泡数量' label: '气泡数量'
}, },
{ {
prop: 'name3', prop: 'bubblesSize',
label: '气泡尺寸' label: '气泡尺寸'
}, },
{ {
prop: 'name4', prop: 'topNum',
label: '上表锡数量' label: '上表锡数量'
}, },
{ {
prop: 'name5', prop: 'topSize',
label: '上表锡尺寸' label: '上表锡尺寸'
}, },
{ {
prop: 'name6', prop: 'bottomNum',
label: '下表锡数量' label: '下表锡数量'
}, },
{ {
prop: 'name7', prop: 'bottomSize',
label: '下表锡尺寸' label: '下表锡尺寸'
}, },
{ {
prop: 'name8', prop: 'defectNum',
label: '欠点数合计' label: '欠点数合计'
}, },
{ {
prop: 'name9', prop: 'defectGather',
label: '缺陷聚集' label: '缺陷聚集'
}, },
{ {
prop: 'name10', prop: 'tumor',
label: '结瘤' label: '结瘤'
}, },
{ {
prop: 'name11', prop: 'pt',
label: 'PT' label: 'PT'
}, },
{ {
prop: 'name12', prop: 'stone',
label: '结石' label: '结石'
}, },
{ {
prop: 'name13', prop: 'otherPre',
label: '其他' label: '其他'
} }
] ]
@@ -80,59 +81,59 @@ const tableProps = [
label: '后工程不良', label: '后工程不良',
children: [ children: [
{ {
prop: 'age', prop: 'kqOutnumber',
label: '颗粒/面检数超' label: '颗粒/面检数超'
}, },
{ {
prop: 'age1', prop: 'scratch',
label: '划伤' label: '划伤'
}, },
{ {
prop: 'age2', prop: 'kqGather',
label: '颗粒/缺陷聚集' label: '颗粒/缺陷聚集'
}, },
{ {
prop: 'age3', prop: 'wheelMark',
label: '轮印' label: '轮印'
}, },
{ {
prop: 'age4', prop: 'grindingMark',
label: '面磨印记' label: '面磨印记'
}, },
{ {
prop: 'age5', prop: 'residue',
label: '残留' label: '残留'
}, },
{ {
prop: 'age6', prop: 'stain',
label: '污渍' label: '污渍'
}, },
{ {
prop: 'age7', prop: 'fiber',
label: '纤维' label: '纤维'
}, },
{ {
prop: 'age8', prop: 'waterStain',
label: '水渍' label: '水渍'
}, },
{ {
prop: 'age9', prop: 'grindingCrack',
label: '磨痕' label: '磨痕'
}, },
{ {
prop: 'age10', prop: 'airAbrasion',
label: '气浮擦伤' label: '气浮擦伤'
}, },
{ {
prop: 'age11', prop: 'fogSurface',
label: '雾面' label: '雾面'
}, },
{ {
prop: 'age12', prop: 'foreignBody',
label: '异物' label: '异物'
}, },
{ {
prop: 'age13', prop: 'otherPost',
label: '其他' label: '其他'
} }
] ]
@@ -160,7 +161,37 @@ export default {
} }
} }
}, },
methods: {} methods: {
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '汇总'
return
}
if (index === 1) {
sums[index] = ' '
return
}
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
} else {
sums[index] = '0'
}
})
return sums
}
}
} }
</script> </script>
<style lang="scss"> <style lang="scss">

ファイルの表示

@@ -12,10 +12,13 @@
:max-height="tableH" :max-height="tableH"
:show-header="false" :show-header="false"
/> />
<button @click="exportData">导出,开发自测用后续会删除</button>
</div> </div>
</template> </template>
<script> <script>
import { tableHeight } from '@/utils' import { tableHeight } from '@/utils'
import * as XLSX from 'xlsx/xlsx.mjs'
import FileSaver from 'file-saver'
let tableProps = [] let tableProps = []
for (let j = 0; j < 21; j++) { for (let j = 0; j < 21; j++) {
let obj = {} let obj = {}
@@ -365,6 +368,33 @@ export default {
console.log(tableD) console.log(tableD)
this.exportDD = exportD this.exportDD = exportD
this.tableDD = tableD this.tableDD = tableD
},
exportData() {
const filename = '厚度表.xlsx'
const ws_name = 'Sheet1'
const wb = XLSX.utils.book_new()
const ws = XLSX.utils.aoa_to_sheet(this.exportDD)
XLSX.utils.book_append_sheet(wb, ws, ws_name)
ws['!merges'] = [
{ s: { r: 0, c: 0 }, e: { r: 0, c: 5 } },
{ s: { r: 0, c: 6 }, e: { r: 0, c: 7 } },
{ s: { r: 0, c: 8 }, e: { r: 0, c: 10 } },
{ s: { r: 0, c: 11 }, e: { r: 0, c: 12 } },
{ s: { r: 0, c: 13 }, e: { r: 0, c: 15 } },
{ s: { r: 0, c: 16 }, e: { r: 0, c: 17 } },
{ s: { r: 0, c: 18 }, e: { r: 0, c: 20 } }
]
let wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: false,
type: 'array'
})
FileSaver.saveAs(
new Blob([wbout], {
type: 'application/octet-stream'
}),
filename
)
} }
} }
} }

ファイルの表示

@@ -5,13 +5,10 @@
:table-data="tableData" :table-data="tableData"
:max-height="tableH" :max-height="tableH"
/> />
<button @click="exportD">导出,开发自测用后续会删除</button>
</div> </div>
</template> </template>
<script> <script>
import { tableHeight } from '@/utils' import { tableHeight } from '@/utils'
import * as XLSX from 'xlsx/xlsx.mjs'
import FileSaver from 'file-saver'
const tableProps = [ const tableProps = [
{ {
label: '研磨机组', label: '研磨机组',
@@ -57,170 +54,7 @@ export default {
data() { data() {
return { return {
tableProps, tableProps,
tableH: tableHeight(292), tableH: tableHeight(292)
tData: [
[
'厚度检查机报表',
null,
null,
null,
null,
null,
'玻璃ID:',
null,
'132334530057',
null,
null,
'检测时间',
null,
'2023/5/12 12:01:16',
null,
null,
'研磨类型',
null,
'4ABC',
null,
null
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
],
[
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443',
'494.105',
'498.234',
'345.654',
'345.654',
'234.567',
'234.567',
'556.443'
]
]
} }
}, },
mounted() { mounted() {
@@ -237,36 +71,7 @@ export default {
} }
} }
}, },
methods: { methods: {}
exportD() {
// debugger
const filename = '厚度表.xlsx'
const ws_name = 'Sheet1'
const wb = XLSX.utils.book_new()
const ws = XLSX.utils.aoa_to_sheet(this.tData)
XLSX.utils.book_append_sheet(wb, ws, ws_name)
ws['!merges'] = [
{ s: { r: 0, c: 0 }, e: { r: 0, c: 5 } },
{ s: { r: 0, c: 6 }, e: { r: 0, c: 7 } },
{ s: { r: 0, c: 8 }, e: { r: 0, c: 10 } },
{ s: { r: 0, c: 11 }, e: { r: 0, c: 12 } },
{ s: { r: 0, c: 13 }, e: { r: 0, c: 15 } },
{ s: { r: 0, c: 16 }, e: { r: 0, c: 17 } },
{ s: { r: 0, c: 18 }, e: { r: 0, c: 20 } }
]
let wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: false,
type: 'array'
})
FileSaver.saveAs(
new Blob([wbout], {
type: 'application/octet-stream'
}),
filename
)
}
}
} }
</script> </script>
<style lang="scss"> <style lang="scss">