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

Reviewed-on: #26

dist/css/1653.72b2e894.css

@@ -1 +0,0 @@
-.main-box[data-v-afb2cca2]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-afb2cca2],.main-box .right-box[data-v-afb2cca2]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-afb2cca2]{padding:16px 10px 0;overflow-y:auto}.main-box .right-box[data-v-afb2cca2]{padding:16px}

dist/css/2659.1d96686d.css

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

dist/css/3167.3ac910ee.css

@@ -1 +1 @@
-.home_module_title[data-v-632946fd]{padding:16px 16px 0}.home_module_title .iconStyle[data-v-632946fd]{margin-right:8px}.home_module_title .titleStyle[data-v-632946fd]{font-weight:600;color:rgba(0,0,0,.9);vertical-align:top}.capacity_box[data-v-7b29d162],.material_box[data-v-01601021]{padding:12px 23px 0}.device_alarm[data-v-8c9c62bc]{display:flex;flex-flow:row wrap}.device_alarm .alarm_item[data-v-8c9c62bc]{width:20%;border-right:1px solid #ccc;border-bottom:1px solid #ccc}.device_alarm .alarm_item .alarm_tip[data-v-8c9c62bc]{color:#000}.device_alarm .alarm_item .alarm_tip .alarm_num[data-v-8c9c62bc]{display:inline-block;color:#fff;margin-left:4px;padding:1px 4px;border-radius:4px}.device_alarm .alarm_item .alarm_tip .class_red[data-v-8c9c62bc]{background:#f55;box-shadow:0 2px 5px 0 hsla(0,97%,71%,.6)}.device_alarm .alarm_item .alarm_tip .class_green[data-v-8c9c62bc]{background:#50d277;box-shadow:0 2px 5px 0 rgba(80,210,119,.6)}.device_alarm .alarm_item .icon-style[data-v-8c9c62bc]{margin:8px 5px 0 0;vertical-align:middle}.device_alarm .alarm_item .alarm_yellow[data-v-8c9c62bc]{color:#ffb750}.device_alarm .alarm_item .alarm_grey[data-v-8c9c62bc]{color:#aaa}.device_alarm .alarm_item .alarm_green[data-v-8c9c62bc]{color:#50d277}.device_alarm .alarm_item .sub_name[data-v-8c9c62bc]{vertical-align:middle;color:#000;opacity:.55}.device_alarm .alarm_item .special_item[data-v-8c9c62bc]{position:relative}.device_alarm .alarm_item .model_style[data-v-8c9c62bc]{display:none;color:#454545;padding:2px;background:#f2f4f9;border-radius:2px;vertical-align:middle}.device_alarm .alarm_item .model_style .separate_color[data-v-8c9c62bc]{color:#dcdfe6}.device_alarm .alarm_item .model_style2[data-v-8c9c62bc]{position:absolute;top:5px;line-height:10px}.device_alarm .alarm_item .model_style2 p[data-v-8c9c62bc]:after{content:"";display:inline-block;height:1px;width:100%;position:relative;top:-3px;background-color:#dcdfe6;margin-left:2px}.device_alarm .alarm_item:hover .model_style[data-v-8c9c62bc]{display:inline-block}.device_alarm[data-v-8c9c62bc] :nth-child(10),.device_alarm[data-v-8c9c62bc] :nth-child(15),.device_alarm[data-v-8c9c62bc] :nth-child(5){border-right:0}.device_alarm[data-v-8c9c62bc] :nth-child(16),.device_alarm[data-v-8c9c62bc] :nth-child(17),.device_alarm[data-v-8c9c62bc] :nth-child(18),.device_alarm[data-v-8c9c62bc] :nth-child(19){border-bottom:0}.device_alarm[data-v-8c9c62bc] :last-child{border-right:0;border-bottom:0}.home_progress .el-progress-bar__inner{background:linear-gradient(270deg,#4bc4ff,#0b58ff)}.product_area[data-v-093ac14a]{display:flex}.product_area .box_left[data-v-093ac14a],.product_area .box_right[data-v-093ac14a]{width:50%;height:calc(50vh - 154px)}.product_area .box_left .title[data-v-093ac14a],.product_area .box_right .title[data-v-093ac14a]{color:#000}.product_area .box_left .title[data-v-093ac14a] :first-child,.product_area .box_right .title[data-v-093ac14a] :first-child{margin-right:24px}.product_area .box_left .title[data-v-093ac14a]:before,.product_area .box_right .title[data-v-093ac14a]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.product_area .box_left[data-v-093ac14a]{border-right:1px solid #dcdfe6;padding-right:18px}.product_area .box_left .plan_num[data-v-093ac14a],.product_area .box_left .product_num[data-v-093ac14a]{width:100%;border-radius:8px}.product_area .box_left .plan_num .num[data-v-093ac14a],.product_area .box_left .product_num .num[data-v-093ac14a]{color:rgba(0,0,0,.85)}.product_area .box_left .plan_num .words[data-v-093ac14a],.product_area .box_left .product_num .words[data-v-093ac14a]{font-size:14px;color:rgba(0,0,0,.45)}.product_area .box_left .plan_num[data-v-093ac14a]{background:#fff8e8}.product_area .box_left .product_num[data-v-093ac14a]{background:#e3ffeb}.product_area .progress_box[data-v-093ac14a]{color:#000}.product_area .progress_box .blue_color[data-v-093ac14a]{color:#0d5bff;float:right;margin-bottom:8px}.home-container .title-bar[data-v-30952e46]{height:52px;background-color:#fff}.home-container .title-bar .tip[data-v-30952e46]{font-size:18px;font-weight:600;color:#000;display:inline-block;margin:10px 20px 0 32px}.home-container .kanban-container[data-v-30952e46]{padding:8px 16px}.home-container .kanban-container .area1[data-v-30952e46],.home-container .kanban-container .area2[data-v-30952e46],.home-container .kanban-container .area3[data-v-30952e46],.home-container .kanban-container .area4[data-v-30952e46]{height:calc(50vh - 84px);border-radius:4px;background-color:#fff}.home-container .kanban-container .area1[data-v-30952e46],.home-container .kanban-container .area2[data-v-30952e46]{margin-bottom:8px;overflow:scroll}
+.home_module_title[data-v-632946fd]{padding:16px 16px 0}.home_module_title .iconStyle[data-v-632946fd]{margin-right:8px}.home_module_title .titleStyle[data-v-632946fd]{font-weight:600;color:rgba(0,0,0,.9);vertical-align:top}.capacity_box[data-v-4d0dc5dc],.material_box[data-v-7e600a8c]{padding:12px 23px 0}.device_alarm[data-v-8c9c62bc]{display:flex;flex-flow:row wrap}.device_alarm .alarm_item[data-v-8c9c62bc]{width:20%;border-right:1px solid #ccc;border-bottom:1px solid #ccc}.device_alarm .alarm_item .alarm_tip[data-v-8c9c62bc]{color:#000}.device_alarm .alarm_item .alarm_tip .alarm_num[data-v-8c9c62bc]{display:inline-block;color:#fff;margin-left:4px;padding:1px 4px;border-radius:4px}.device_alarm .alarm_item .alarm_tip .class_red[data-v-8c9c62bc]{background:#f55;box-shadow:0 2px 5px 0 hsla(0,97%,71%,.6)}.device_alarm .alarm_item .alarm_tip .class_green[data-v-8c9c62bc]{background:#50d277;box-shadow:0 2px 5px 0 rgba(80,210,119,.6)}.device_alarm .alarm_item .icon-style[data-v-8c9c62bc]{margin:8px 5px 0 0;vertical-align:middle}.device_alarm .alarm_item .alarm_yellow[data-v-8c9c62bc]{color:#ffb750}.device_alarm .alarm_item .alarm_grey[data-v-8c9c62bc]{color:#aaa}.device_alarm .alarm_item .alarm_green[data-v-8c9c62bc]{color:#50d277}.device_alarm .alarm_item .sub_name[data-v-8c9c62bc]{vertical-align:middle;color:#000;opacity:.55}.device_alarm .alarm_item .special_item[data-v-8c9c62bc]{position:relative}.device_alarm .alarm_item .model_style[data-v-8c9c62bc]{display:none;color:#454545;padding:2px;background:#f2f4f9;border-radius:2px;vertical-align:middle}.device_alarm .alarm_item .model_style .separate_color[data-v-8c9c62bc]{color:#dcdfe6}.device_alarm .alarm_item .model_style2[data-v-8c9c62bc]{position:absolute;top:5px;line-height:10px}.device_alarm .alarm_item .model_style2 p[data-v-8c9c62bc]:after{content:"";display:inline-block;height:1px;width:100%;position:relative;top:-3px;background-color:#dcdfe6;margin-left:2px}.device_alarm .alarm_item:hover .model_style[data-v-8c9c62bc]{display:inline-block}.device_alarm[data-v-8c9c62bc] :nth-child(10),.device_alarm[data-v-8c9c62bc] :nth-child(15),.device_alarm[data-v-8c9c62bc] :nth-child(5){border-right:0}.device_alarm[data-v-8c9c62bc] :nth-child(16),.device_alarm[data-v-8c9c62bc] :nth-child(17),.device_alarm[data-v-8c9c62bc] :nth-child(18),.device_alarm[data-v-8c9c62bc] :nth-child(19){border-bottom:0}.device_alarm[data-v-8c9c62bc] :last-child{border-right:0;border-bottom:0}.home_progress .el-progress-bar__inner{background:linear-gradient(270deg,#4bc4ff,#0b58ff)}.product_area[data-v-916c3c62]{display:flex}.product_area .box_left[data-v-916c3c62],.product_area .box_right[data-v-916c3c62]{width:50%;height:calc(50vh - 154px)}.product_area .box_left .title[data-v-916c3c62],.product_area .box_right .title[data-v-916c3c62]{color:#000}.product_area .box_left .title[data-v-916c3c62] :first-child,.product_area .box_right .title[data-v-916c3c62] :first-child{margin-right:24px}.product_area .box_left .title[data-v-916c3c62]:before,.product_area .box_right .title[data-v-916c3c62]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.product_area .box_left[data-v-916c3c62]{border-right:1px solid #dcdfe6;padding-right:18px}.product_area .box_left .plan_num[data-v-916c3c62],.product_area .box_left .product_num[data-v-916c3c62]{width:100%;border-radius:8px}.product_area .box_left .plan_num .num[data-v-916c3c62],.product_area .box_left .product_num .num[data-v-916c3c62]{color:rgba(0,0,0,.85)}.product_area .box_left .plan_num .words[data-v-916c3c62],.product_area .box_left .product_num .words[data-v-916c3c62]{font-size:14px;color:rgba(0,0,0,.45)}.product_area .box_left .plan_num[data-v-916c3c62]{background:#fff8e8}.product_area .box_left .product_num[data-v-916c3c62]{background:#e3ffeb}.product_area .progress_box[data-v-916c3c62]{color:#000}.product_area .progress_box .blue_color[data-v-916c3c62]{color:#0d5bff;float:right;margin-bottom:8px}.home-container .title-bar[data-v-2d39b76b]{height:52px;background-color:#fff}.home-container .title-bar .tip[data-v-2d39b76b]{font-size:18px;font-weight:600;color:#000;display:inline-block;margin:10px 20px 0 32px}.home-container .kanban-container[data-v-2d39b76b]{padding:8px 16px}.home-container .kanban-container .area1[data-v-2d39b76b],.home-container .kanban-container .area2[data-v-2d39b76b],.home-container .kanban-container .area3[data-v-2d39b76b],.home-container .kanban-container .area4[data-v-2d39b76b]{height:calc(50vh - 84px);border-radius:4px;background-color:#fff}.home-container .kanban-container .area1[data-v-2d39b76b],.home-container .kanban-container .area2[data-v-2d39b76b]{margin-bottom:8px;overflow:scroll}

dist/css/3712.047b69e1.css

@@ -1 +0,0 @@
-.detail-box .column-box .box .tip-value[data-v-63ceee10]{display:block}.detail-box .column-box .box .tip[data-v-63ceee10]{display:inline-block;background-color:#cae2ff;border-radius:2px;color:#288aff;padding:4px}.detail-box .border-right[data-v-63ceee10]{border-right:1px solid #e8e8e8}.statistics[data-v-3a8e1127]{padding:0 24px}.statistics .title[data-v-3a8e1127]{display:inline-block;margin:24px 0 16px 0}.statistics .title[data-v-3a8e1127]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box[data-v-946347de]{margin-top:8px}.main-box .top-box[data-v-946347de]{width:100%}.main-box .top-box .top-left[data-v-946347de],.main-box .top-box .top-right[data-v-946347de]{height:calc(49vh - 76.44px);background-color:#fff;border-radius:8px}.main-box .top-box .top-left .titleStyle[data-v-946347de]{font-weight:600;color:rgba(0,0,0,.9);vertical-align:top}.main-box .top-box .top-left .line-order-msg[data-v-946347de]{display:flex}.main-box .top-box .top-left .line-order-msg li .title[data-v-946347de]{display:inline-block}.main-box .top-box .top-left .line-order-msg li .title[data-v-946347de]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .top-box .top-left .line-order-msg li .num-box[data-v-946347de]{border-right:1px solid #ccc}.main-box .top-box .top-left .line-order-msg li .plan_num[data-v-946347de],.main-box .top-box .top-left .line-order-msg li .product_num[data-v-946347de]{width:100%;border-radius:8px}.main-box .top-box .top-left .line-order-msg li .plan_num .num[data-v-946347de],.main-box .top-box .top-left .line-order-msg li .product_num .num[data-v-946347de]{color:rgba(0,0,0,.85);margin-bottom:6px}.main-box .top-box .top-left .line-order-msg li .plan_num .words[data-v-946347de],.main-box .top-box .top-left .line-order-msg li .product_num .words[data-v-946347de]{font-size:14px;color:rgba(0,0,0,.45)}.main-box .top-box .top-left .line-order-msg li .plan_num[data-v-946347de]{background:#fff8e8}.main-box .top-box .top-left .line-order-msg li .product_num[data-v-946347de]{background:#e3ffeb}.main-box .bottom-box[data-v-946347de]{height:calc(51vh - 79.56px);background-color:#fff;border-radius:8px;margin:8px 8px 0 0}

dist/css/4785.8c5f04fd.css

@@ -0,0 +1 @@
+.detail-box .column-box .box .tip-value[data-v-63ceee10]{display:block}.detail-box .column-box .box .tip[data-v-63ceee10]{display:inline-block;background-color:#cae2ff;border-radius:2px;color:#288aff;padding:4px}.detail-box .border-right[data-v-63ceee10]{border-right:1px solid #e8e8e8}.statistics[data-v-481a3ece]{padding:0 24px}.statistics .title[data-v-481a3ece]{display:inline-block;margin:24px 0 16px 0}.statistics .title[data-v-481a3ece]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box[data-v-2c312d06]{margin-top:8px}.main-box .top-box[data-v-2c312d06]{width:100%}.main-box .top-box .top-left[data-v-2c312d06],.main-box .top-box .top-right[data-v-2c312d06]{height:calc(49vh - 76.44px);background-color:#fff;border-radius:8px}.main-box .top-box .top-left .titleStyle[data-v-2c312d06]{font-weight:600;color:rgba(0,0,0,.9);vertical-align:top}.main-box .top-box .top-left .line-order-msg[data-v-2c312d06]{display:flex}.main-box .top-box .top-left .line-order-msg li .title[data-v-2c312d06]{display:inline-block}.main-box .top-box .top-left .line-order-msg li .title[data-v-2c312d06]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .top-box .top-left .line-order-msg li .num-box[data-v-2c312d06]{border-right:1px solid #ccc}.main-box .top-box .top-left .line-order-msg li .plan_num[data-v-2c312d06],.main-box .top-box .top-left .line-order-msg li .product_num[data-v-2c312d06]{width:100%;border-radius:8px}.main-box .top-box .top-left .line-order-msg li .plan_num .num[data-v-2c312d06],.main-box .top-box .top-left .line-order-msg li .product_num .num[data-v-2c312d06]{color:rgba(0,0,0,.85);margin-bottom:6px}.main-box .top-box .top-left .line-order-msg li .plan_num .words[data-v-2c312d06],.main-box .top-box .top-left .line-order-msg li .product_num .words[data-v-2c312d06]{font-size:14px;color:rgba(0,0,0,.45)}.main-box .top-box .top-left .line-order-msg li .plan_num[data-v-2c312d06]{background:#fff8e8}.main-box .top-box .top-left .line-order-msg li .product_num[data-v-2c312d06]{background:#e3ffeb}.main-box .bottom-box[data-v-2c312d06]{height:calc(51vh - 79.56px);background-color:#fff;border-radius:8px;margin:8px 8px 0 0}

dist/css/7213.c23c4dd5.css

@@ -1 +1 @@
-.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-2ee4d940]{position:relative}.box .text1[data-v-2ee4d940],.box .text2[data-v-2ee4d940],.box .text3[data-v-2ee4d940],.box .text4[data-v-2ee4d940]{position:absolute}.box .text1[data-v-2ee4d940]{top:30px;left:0}.box .text2[data-v-2ee4d940]{top:30px;right:0}.box .text3[data-v-2ee4d940]{bottom:10px;left:0}.box .text4[data-v-2ee4d940]{bottom:10px;right:0}.defectScatterPlot[data-v-79550084]{height:calc(100vh - 206px);overflow:auto}.defectScatterPlot .split-pane[data-v-79550084]{height:100%;border-radius:8px}.defectScatterPlot .left-box[data-v-79550084]{margin-left:16px;padding:16px 16px 0;background-color:#fff}.defectScatterPlot .right-box[data-v-79550084]{margin-right:16px}.defectScatterPlot .right-box .inner-box[data-v-79550084]{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-79550084]{margin-bottom:18px}.defectScatterPlot .right-box .inner-box .line2[data-v-79550084]{margin-bottom:12px}.defectScatterPlot .right-box .inner-box .line2 .el-checkbox[data-v-79550084]{margin-right:8px}.defectScatterPlot .title[data-v-79550084]{font-size:14px;color:rgba(0,0,0,.85)}.defectScatterPlot .title[data-v-79550084]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;vertical-align:middle;margin-right:8px}
+.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-b262c1ca]{height:calc(100vh - 206px);overflow:auto}.defectScatterPlot .split-pane[data-v-b262c1ca]{height:100%;border-radius:8px}.defectScatterPlot .left-box[data-v-b262c1ca]{margin-left:16px;padding:16px 16px 0;background-color:#fff}.defectScatterPlot .right-box[data-v-b262c1ca]{margin-right:16px}.defectScatterPlot .right-box .inner-box[data-v-b262c1ca]{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-b262c1ca]{margin-bottom:18px}.defectScatterPlot .right-box .inner-box .line2[data-v-b262c1ca]{margin-bottom:12px}.defectScatterPlot .right-box .inner-box .line2 .el-checkbox[data-v-b262c1ca]{margin-right:8px}.defectScatterPlot .title[data-v-b262c1ca]{font-size:14px;color:rgba(0,0,0,.85)}.defectScatterPlot .title[data-v-b262c1ca]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;vertical-align:middle;margin-right:8px}

dist/css/8695.62e18984.css

@@ -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-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}
+.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-010f8f58]{width:100%;padding:0 6px 0 16px}.main-box .left-box[data-v-010f8f58]{overflow-y:auto;height:calc(100vh - 204px);padding:16px 10px 0}.main-box .left-box[data-v-010f8f58],.main-box .middle-bottom[data-v-010f8f58],.main-box .middle-top[data-v-010f8f58],.main-box .right-bottom[data-v-010f8f58],.main-box .right-top[data-v-010f8f58]{border-radius:8px;background-color:#fff}.main-box .middle-top[data-v-010f8f58]{height:60px;margin-bottom:8px;padding:16px}.main-box .middle-top .choose-box[data-v-010f8f58]{display:inline-block;margin-right:10px}.main-box .middle-top .search-box[data-v-010f8f58]{display:inline-block;vertical-align:bottom}.main-box .middle-bottom[data-v-010f8f58]{height:calc(100vh - 272px)}.main-box .right-top[data-v-010f8f58]{height:calc(50vh - 106px);margin-bottom:8px}.main-box .right-bottom[data-v-010f8f58]{height:calc(50vh - 106px)}.main-box .title[data-v-010f8f58]{display:inline-block;margin-right:8px;margin-bottom:22px}.main-box .title[data-v-010f8f58]: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}

dist/css/8815.af3c78a7.css

@@ -0,0 +1 @@
+.main-box[data-v-07aecce8]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-07aecce8],.main-box .right-box[data-v-07aecce8]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-07aecce8]{padding:16px 10px 0;overflow-y:auto}.main-box .right-box[data-v-07aecce8]{padding:16px}

dist/css/9929.99269323.css

@@ -1 +0,0 @@
-.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}

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.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>
+<!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.2747d357.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>

dist/js/2162.da2e53e7.js

@@ -1 +1 @@
-"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2162],{2162:function(t,o,e){e.r(o),e.d(o,{default:function(){return m}});var r=function(){var t=this,o=t._self._c;return o("div",{staticClass:"login-container"},[o("div",{staticClass:"login-background"},[o("div",{staticClass:"login-background-container"},[t._m(0),o("img",{staticStyle:{width:"90%","margin-left":"5%"},attrs:{src:e(6254),alt:""}})])]),o("div",{staticClass:"login-right"},[t._m(1),o("el-form",{ref:"loginForm",staticClass:"login-form",attrs:{model:t.loginForm,"status-icon":""}},[o("el-form-item",{attrs:{prop:"mobile"}},[o("el-input",{model:{value:t.loginForm.mobile,callback:function(o){t.$set(t.loginForm,"mobile",o)},expression:"loginForm.mobile"}})],1),o("el-form-item",{attrs:{prop:"password"}},[o("el-input",{attrs:{type:"password",autocomplete:"off","show-password":""},model:{value:t.loginForm.password,callback:function(o){t.$set(t.loginForm,"password",o)},expression:"loginForm.password"}})],1),o("el-button",{staticStyle:{width:"100%"},attrs:{type:"primary",loading:t.loading},on:{click:function(o){return t.submitForm("loginForm")}}},[t._v("登录")])],1),t._m(2)],1)])},i=[function(){var t=this,o=t._self._c;return o("div",{staticClass:"back-title"},[t._v(" Wel"),o("span",[t._v("come")]),o("p",[o("span",{staticClass:"back-title-point"}),t._v("G8.5TFT-LCD玻璃基板后工程段制造执行系统 ")])])},function(){var t=this,o=t._self._c;return o("div",{staticClass:"title-container"},[o("h3",{staticClass:"title"},[o("img",{staticClass:"logo",attrs:{src:e(6949)}}),o("span",[t._v("TFT")])])])},function(){var t=this,o=t._self._c;return o("div",{staticClass:"login-footer"},[o("span",[t._v("版权所有：中建材智能自动化研究院有限公司")]),o("span",[t._v("版本：1.0")])])}],n=e(5591),a={name:"LoginPage",data(){return{loginForm:{mobile:"13588441519",password:"123abc."},rules:{mobile:[{required:!0,message:"请输入用户名",trigger:"blur"},{min:3,max:18,message:"长度在 3 到 18 个字符",trigger:"blur"}],passWord:[{required:!0,message:"请输入密码",trigger:"blur"},{min:6,max:18,message:"长度在 6 到 18 个字符",trigger:"blur"}]},loading:!1}},methods:{submitForm(t){this.$refs[t].validate((t=>{if(!t)return console.log("error submit!!"),!1;this.loading=!0,this.$store.dispatch("user/login",this.loginForm).then((()=>{this.$store.dispatch("user/getInfo"),(0,n.iv)().then((t=>{if(0===t.code){let o=t.data;for(let t in o)for(let e of o[t])e.dataCode?e.dataCode=Number(e.dataCode):(e.dataCode=Number(e.id),e.dataName=e.name);if(localStorage.setItem("publicList",JSON.stringify(o)),location.href.split("?")[1]){let t=location.href.split("?")[1].split("=");if("redirect"===t[0]){let o=decodeURIComponent(t[1]);this.$router.push({path:o})}else this.$router.push({path:"/home/index"})}else this.$router.push({path:"/home/index"})}}))}))}))}}},s=a,l=e(1001),u=(0,l.Z)(s,r,i,!1,null,"1891ea5e",null),m=u.exports},5591:function(t,o,e){e.d(o,{FH:function(){return s},Hp:function(){return l},JQ:function(){return a},SI:function(){return n},WQ:function(){return c},b6:function(){return u},iv:function(){return i},m:function(){return m}});var r=e(8859);function i(){return(0,r.Z)({url:"/common/getList",method:"post"})}function n(){return(0,r.Z)({url:"/common/getTreeData",method:"post"})}function a(t){return(0,r.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function s(t){return(0,r.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function l(t){return(0,r.Z)({url:"/common/getAlarmData",method:"post",data:t})}function u(t){return(0,r.Z)({url:"/common/getProductData",method:"post",data:t})}function m(t){return(0,r.Z)({url:"/common/getMaterialData",method:"post",data:t})}const c="/api/common/attachment/uploadFileFormData"},6254:function(t,o,e){t.exports=e.p+"img/login.335fca7c.gif"}}]);
+"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2162],{2162:function(t,o,e){e.r(o),e.d(o,{default:function(){return m}});var r=function(){var t=this,o=t._self._c;return o("div",{staticClass:"login-container"},[o("div",{staticClass:"login-background"},[o("div",{staticClass:"login-background-container"},[t._m(0),o("img",{staticStyle:{width:"90%","margin-left":"5%"},attrs:{src:e(6254),alt:""}})])]),o("div",{staticClass:"login-right"},[t._m(1),o("el-form",{ref:"loginForm",staticClass:"login-form",attrs:{model:t.loginForm,"status-icon":""}},[o("el-form-item",{attrs:{prop:"mobile"}},[o("el-input",{model:{value:t.loginForm.mobile,callback:function(o){t.$set(t.loginForm,"mobile",o)},expression:"loginForm.mobile"}})],1),o("el-form-item",{attrs:{prop:"password"}},[o("el-input",{attrs:{type:"password",autocomplete:"off","show-password":""},model:{value:t.loginForm.password,callback:function(o){t.$set(t.loginForm,"password",o)},expression:"loginForm.password"}})],1),o("el-button",{staticStyle:{width:"100%"},attrs:{type:"primary",loading:t.loading},on:{click:function(o){return t.submitForm("loginForm")}}},[t._v("登录")])],1),t._m(2)],1)])},n=[function(){var t=this,o=t._self._c;return o("div",{staticClass:"back-title"},[t._v(" Wel"),o("span",[t._v("come")]),o("p",[o("span",{staticClass:"back-title-point"}),t._v("G8.5TFT-LCD玻璃基板后工程段制造执行系统 ")])])},function(){var t=this,o=t._self._c;return o("div",{staticClass:"title-container"},[o("h3",{staticClass:"title"},[o("img",{staticClass:"logo",attrs:{src:e(6949)}}),o("span",[t._v("TFT")])])])},function(){var t=this,o=t._self._c;return o("div",{staticClass:"login-footer"},[o("span",[t._v("版权所有：中建材智能自动化研究院有限公司")]),o("span",[t._v("版本：1.0")])])}],i=e(5591),a={name:"LoginPage",data(){return{loginForm:{mobile:"13588441519",password:"123abc."},rules:{mobile:[{required:!0,message:"请输入用户名",trigger:"blur"},{min:3,max:18,message:"长度在 3 到 18 个字符",trigger:"blur"}],passWord:[{required:!0,message:"请输入密码",trigger:"blur"},{min:6,max:18,message:"长度在 6 到 18 个字符",trigger:"blur"}]},loading:!1}},methods:{submitForm(t){this.$refs[t].validate((t=>{if(!t)return console.log("error submit!!"),!1;this.loading=!0,this.$store.dispatch("user/login",this.loginForm).then((()=>{this.$store.dispatch("user/getInfo"),(0,i.iv)().then((t=>{if(0===t.code){let o=t.data;for(let t in o)for(let e of o[t])e.dataCode?e.dataCode=Number(e.dataCode):(e.dataCode=Number(e.id),e.dataName=e.name);if(localStorage.setItem("publicList",JSON.stringify(o)),location.href.split("?")[1]){let t=location.href.split("?")[1].split("=");if("redirect"===t[0]){let o=decodeURIComponent(t[1]);this.$router.push({path:o})}else this.$router.push({path:"/home/index"})}else this.$router.push({path:"/home/index"})}}))}))}))}}},s=a,l=e(1001),u=(0,l.Z)(s,r,n,!1,null,"1891ea5e",null),m=u.exports},5591:function(t,o,e){e.d(o,{FH:function(){return s},Hp:function(){return u},JQ:function(){return a},SI:function(){return i},Vx:function(){return m},WQ:function(){return p},b6:function(){return c},iv:function(){return n},jL:function(){return l},m:function(){return d}});var r=e(8859);function n(){return(0,r.Z)({url:"/common/getList",method:"post"})}function i(){return(0,r.Z)({url:"/common/getTreeData",method:"post"})}function a(t){return(0,r.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function s(t){return(0,r.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function l(t){return(0,r.Z)({url:"/common/getFpyData",method:"post",data:t})}function u(t){return(0,r.Z)({url:"/common/getAlarmData",method:"post",data:t})}function m(t){return(0,r.Z)({url:"/common/getCapacityData",method:"post",data:t})}function c(t){return(0,r.Z)({url:"/common/getProductData",method:"post",data:t})}function d(t){return(0,r.Z)({url:"/common/getMaterialData",method:"post",data:t})}const p="/api/common/attachment/uploadFileFormData"},6254:function(t,o,e){t.exports=e.p+"img/login.335fca7c.gif"}}]);

dist/js/2505.38389faf.js

@@ -1 +1 @@
-"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2505],{2505:function(t,e,n){n.r(e),n.d(e,{default:function(){return l}});var a=function(){var t=this,e=t._self._c;return e("el-row",{staticClass:"main-box",attrs:{gutter:10}},[e("el-col",{attrs:{span:4}},[e("div",{staticClass:"left-box"},[e("el-tree",{ref:"deviceStatusTree",attrs:{data:t.treeData,"node-key":"id",props:t.defaultProps,"default-expand-all":"","highlight-current":""},on:{"node-click":t.clickDevice}})],1)]),e("el-col",{attrs:{span:20}},[e("div",{staticClass:"right-box"},[e("span",{staticClass:"title"},[t._v(t._s(t.equipmentName))]),e("ul",{staticClass:"eq-msg"},[e("li",[t._v("设备模式："+t._s(t.eqMessage.mode))]),e("li",[t._v("设备状态："+t._s(t.eqMessage.state))]),e("li",[t._v("设备报警："+t._s(t.eqMessage.alarmNum))]),e("li",[t._v("剩余维护时间："+t._s(t.eqMessage.remainMainTime)+"秒")])]),e("div",{staticClass:"img-box"},[t.eqMessage.imgId?e("img",{attrs:{src:t.deviceImg,alt:"设备图片"}}):e("img",{attrs:{src:n(6056),alt:"设备图片"}})])])])],1)},i=[],s=n(5591),r=n(8859);function o(t){return(0,r.Z)({url:"/monitor/eqMonitor/get",method:"post",data:t})}var u={name:"DeviceStatus",data(){return{treeData:[],defaultProps:{children:"children",label:"name"},eqMessage:{},equipmentId:"",deviceImg:"",equipmentName:""}},mounted(){this.getTree()},methods:{getTree(){(0,s.SI)().then((t=>{this.treeData=t.data,this.equipmentId=this.getId(t.data),this.setCurrent(),this.getMsg()}))},getId(t){return t[0].children?this.getId(t[0].children):t[0].id},setCurrent(){let t=this;setTimeout((function(){t.$refs.deviceStatusTree.setCurrentKey(t.equipmentId)}),500)},getMsg(){o({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,this.equipmentName=t.data.equipmentName,this.deviceImg="http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId="+t.data.imgId}))},clickDevice(t){console.log(t),t.children||(this.equipmentId=t.id,this.equipmentName=t.name,this.getMsg())}}},m=u,c=n(1001),d=(0,c.Z)(m,a,i,!1,null,"483dec8e",null),l=d.exports},5591:function(t,e,n){n.d(e,{FH:function(){return o},Hp:function(){return u},JQ:function(){return r},SI:function(){return s},WQ:function(){return d},b6:function(){return m},iv:function(){return i},m:function(){return c}});var a=n(8859);function i(){return(0,a.Z)({url:"/common/getList",method:"post"})}function s(){return(0,a.Z)({url:"/common/getTreeData",method:"post"})}function r(t){return(0,a.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function o(t){return(0,a.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function u(t){return(0,a.Z)({url:"/common/getAlarmData",method:"post",data:t})}function m(t){return(0,a.Z)({url:"/common/getProductData",method:"post",data:t})}function c(t){return(0,a.Z)({url:"/common/getMaterialData",method:"post",data:t})}const d="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);
+"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2505],{2505:function(t,e,n){n.r(e),n.d(e,{default:function(){return l}});var a=function(){var t=this,e=t._self._c;return e("el-row",{staticClass:"main-box",attrs:{gutter:10}},[e("el-col",{attrs:{span:4}},[e("div",{staticClass:"left-box"},[e("el-tree",{ref:"deviceStatusTree",attrs:{data:t.treeData,"node-key":"id",props:t.defaultProps,"default-expand-all":"","highlight-current":""},on:{"node-click":t.clickDevice}})],1)]),e("el-col",{attrs:{span:20}},[e("div",{staticClass:"right-box"},[e("span",{staticClass:"title"},[t._v(t._s(t.equipmentName))]),e("ul",{staticClass:"eq-msg"},[e("li",[t._v("设备模式："+t._s(t.eqMessage.mode))]),e("li",[t._v("设备状态："+t._s(t.eqMessage.state))]),e("li",[t._v("设备报警："+t._s(t.eqMessage.alarmNum))]),e("li",[t._v("剩余维护时间："+t._s(t.eqMessage.remainMainTime)+"秒")])]),e("div",{staticClass:"img-box"},[t.eqMessage.imgId?e("img",{attrs:{src:t.deviceImg,alt:"设备图片"}}):e("img",{attrs:{src:n(6056),alt:"设备图片"}})])])])],1)},i=[],r=n(5591),o=n(8859);function s(t){return(0,o.Z)({url:"/monitor/eqMonitor/get",method:"post",data:t})}var u={name:"DeviceStatus",data(){return{treeData:[],defaultProps:{children:"children",label:"name"},eqMessage:{},equipmentId:"",deviceImg:"",equipmentName:""}},mounted(){this.getTree()},methods:{getTree(){(0,r.SI)().then((t=>{this.treeData=t.data,this.equipmentId=this.getId(t.data),this.setCurrent(),this.getMsg()}))},getId(t){return t[0].children?this.getId(t[0].children):t[0].id},setCurrent(){let t=this;setTimeout((function(){t.$refs.deviceStatusTree.setCurrentKey(t.equipmentId)}),500)},getMsg(){s({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,this.equipmentName=t.data.equipmentName,this.deviceImg="http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId="+t.data.imgId}))},clickDevice(t){console.log(t),t.children||(this.equipmentId=t.id,this.equipmentName=t.name,this.getMsg())}}},m=u,c=n(1001),d=(0,c.Z)(m,a,i,!1,null,"483dec8e",null),l=d.exports},5591:function(t,e,n){n.d(e,{FH:function(){return s},Hp:function(){return m},JQ:function(){return o},SI:function(){return r},Vx:function(){return c},WQ:function(){return p},b6:function(){return d},iv:function(){return i},jL:function(){return u},m:function(){return l}});var a=n(8859);function i(){return(0,a.Z)({url:"/common/getList",method:"post"})}function r(){return(0,a.Z)({url:"/common/getTreeData",method:"post"})}function o(t){return(0,a.Z)({url:"/common/updateEqSeq",method:"post",data:t})}function s(t){return(0,a.Z)({url:"/common/attachment/downloadFile",method:"get",responseType:"blob",params:t,timeout:6e4})}function u(t){return(0,a.Z)({url:"/common/getFpyData",method:"post",data:t})}function m(t){return(0,a.Z)({url:"/common/getAlarmData",method:"post",data:t})}function c(t){return(0,a.Z)({url:"/common/getCapacityData",method:"post",data:t})}function d(t){return(0,a.Z)({url:"/common/getProductData",method:"post",data:t})}function l(t){return(0,a.Z)({url:"/common/getMaterialData",method:"post",data:t})}const p="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);

src/api/app.js

@@ -32,6 +32,15 @@ export function downLoadFile(params) {
   })
 }
 
+// 获取直通率对比数据
+export function getFpyData(data) {
+  return request({
+    url: '/common/getFpyData',
+    method: 'post',
+    data
+  })
+}
+
 export function getAlarmData(data) {
   return request({
     url: '/common/getAlarmData',
@@ -39,6 +48,14 @@ export function getAlarmData(data) {
     data
   })
 }
+// 获取产能信息数据
+export function getCapacityData(data) {
+  return request({
+    url: '/common/getCapacityData',
+    method: 'post',
+    data
+  })
+}
 
 export function getProductData(data) {
   return request({

src/api/deviceManagement.js

@@ -46,6 +46,22 @@ export function palletIndicatorGetType(data) {
     data
   })
 }
+// 获取MTBR-F(年、月)
+export function getMTBRF(data) {
+  return request({
+    url: '/equipment/PerformanceAnalysis/getMTBRF',
+    method: 'post',
+    data
+  })
+}
+// 获取MTBR-F(周)
+export function getMTBRFWeek(data) {
+  return request({
+    url: '/equipment/PerformanceAnalysis/getMTBRFWeek',
+    method: 'post',
+    data
+  })
+}
 
 // 备品备件
 export function getSparePartStockPage(data) {

src/views/deviceManagement/performanceAnalysis/mtbrf.vue

@@ -21,7 +21,11 @@
             <el-col class="middle-top">
               <div>
                 <div class="choose-box">
-                  <el-radio-group v-model="selectDimension" size="small">
+                  <el-radio-group
+                    v-model="selectDimension"
+                    size="small"
+                    @change="selectData"
+                  >
                     <el-radio-button label="year">年</el-radio-button>
                     <el-radio-button label="month">月</el-radio-button>
                     <el-radio-button label="week">周</el-radio-button>
@@ -30,8 +34,26 @@
                 <div class="search-box">
                   <span>发生时间 </span>
                   <el-date-picker
-                    v-model="chooseDate"
+                    v-if="selectDimension === 'year'"
-                    type="date"
+                    v-model="yearDate"
+                    type="year"
+                    placeholder="请选择"
+                    size="small"
+                  >
+                  </el-date-picker>
+                  <el-date-picker
+                    v-if="selectDimension === 'month'"
+                    v-model="monthDate"
+                    type="month"
+                    placeholder="请选择"
+                    size="small"
+                  >
+                  </el-date-picker>
+                  <el-date-picker
+                    v-if="selectDimension === 'week'"
+                    v-model="weekDate"
+                    type="week"
+                    format="yyyy 第 WW 周"
                     placeholder="请选择"
                     size="small"
                   >
@@ -80,6 +102,7 @@
 </template>
 <script>
 import { getTreeData } from '@/api/app'
+import { getMTBRF, getMTBRFWeek } from '@/api/deviceManagement'
 import { tableHeight } from '@/utils/index'
 import contrastChart1 from './../components/contrastChart.vue'
 import contrastChart2 from './../components/contrastChart.vue'
@@ -115,7 +138,9 @@ export default {
         label: 'name'
       },
       eqName: '',
-      chooseDate: '',
+      yearDate: '',
+      monthDate: '',
+      weekDate: '',
       listQuery: {
         current: 1,
         size: 500,
@@ -153,14 +178,29 @@ export default {
         console.log(val.children)
       }
     },
+    selectData(val) {
+      console.log(val)
+      this.yearDate = ''
+      this.monthDate = ''
+      this.weekDate = ''
+    },
     getList() {
-      let arr = []
+      if (this.selectDimension === 'week') {
-      for (let i = 0; i < 30; i++) {
+        getMTBRFWeek().then((res) => {
-        let obj = {}
+          console.log(res)
-        obj.startState = i + '2112'
+        })
-        arr.push(obj)
+      } else {
+        getMTBRF().then((res) => {
+          console.log(res)
+        })
       }
-      this.tableData = arr
+      // let arr = []
+      // for (let i = 0; i < 30; i++) {
+      //   let obj = {}
+      //   obj.startState = i + '2112'
+      //   arr.push(obj)
+      // }
+      // this.tableData = arr
     }
   }
 }

src/views/home/components/Capacity.vue

@@ -28,22 +28,22 @@
 import { tableHeight } from './utils'
 const tableProps = [
   {
-    prop: 'line',
+    prop: 'equipmentName',
     label: '设备名称',
     minWidth: 98
   },
   {
-    prop: 'unit1',
+    prop: 'glassNumberIn',
     label: '投入数量',
     minWidth: 98
   },
   {
-    prop: 'unit2',
+    prop: 'glassNumberOut',
     label: '输出数量',
     minWidth: 98
   },
   {
-    prop: 'unit3',
+    prop: 'glassNumberMiss',
     label: '损失数量',
     minWidth: 98
   }
@@ -53,8 +53,6 @@ export default {
   data() {
     return {
       tableProps,
-      tableDataL: [],
-      tableDataR: [],
       tableH: tableHeight(),
       listQuery1: {
         current: 1,
@@ -70,21 +68,27 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight()
     })
-    this.getList()
   },
-  methods: {
+  props: {
-    getList() {
+    list: {
-      let arr = []
+      type: Array,
-      for (let i = 0; i < 16; i++) {
+      default: () => {
-        let obj = {}
+        return []
-        obj.id = i
-        obj.line = '设备' + i
-        arr.push(obj)
       }
-      if (arr.length > 8) {
+    },
-        this.tableDataL = arr.slice(0, 8)
+    beilv: {
-        this.tableDataR = arr.slice(8, 16)
+      type: Number,
+      default: 1
     }
+  },
+  computed: {
+    tableDataL: function () {
+      return this.list.length > 8
+        ? this.list.slice(0, 8)
+        : this.list.slice(0, this.list.length)
+    },
+    tableDataR: function () {
+      return this.list.length > 8 ? this.list.slice(8, 16) : []
     }
   }
 }

src/views/home/components/Material.vue

@@ -48,8 +48,6 @@ export default {
   data() {
     return {
       tableProps,
-      // tableDataL: [],
-      // tableDataR: [],
       tableH: tableHeight(),
       listQuery1: {
         current: 1,
@@ -83,22 +81,6 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight()
     })
-    // this.getList()
-  },
-  methods: {
-    getListA() {
-      let arr = []
-      for (let i = 0; i < 16; i++) {
-        let obj = {}
-        obj.id = i
-        obj.line = '耗材' + i
-        arr.push(obj)
-      }
-      if (arr.length > 8) {
-        this.tableDataL = arr.slice(0, 8)
-        this.tableDataR = arr.slice(8, 16)
-      }
-    }
   }
 }
 </script>

src/views/home/components/Product.vue

@@ -109,46 +109,46 @@
           }"
         >
           <span>13时直通率</span>
-          <span class="blue_color">63.45%</span>
+          <span class="blue_color">{{ lastHourFpy }}</span>
           <div class="home_progress">
             <el-progress
               :text-inside="true"
               :stroke-width="strokeWidth"
-              :percentage="70"
+              :percentage="lastHourFpyP"
             ></el-progress>
           </div>
         </div>
         <div class="progress_box" :style="{ marginBottom: 92 * beilv + 'px' }">
           <span>14时直通率</span>
-          <span class="blue_color">63.45%</span>
+          <span class="blue_color">{{ nowFpy }}</span>
           <div class="home_progress">
             <el-progress
               :text-inside="true"
               :stroke-width="strokeWidth"
-              :percentage="70"
+              :percentage="nowFpyP"
             ></el-progress>
           </div>
         </div>
       </div>
       <div class="progress_box" :style="{ marginBottom: 16 * beilv + 'px' }">
         <span>昨日直通率</span>
-        <span class="blue_color">63.45%</span>
+        <span class="blue_color">{{ yesterdayFpy }}</span>
         <div class="home_progress">
           <el-progress
             :text-inside="true"
             :stroke-width="strokeWidth"
-            :percentage="70"
+            :percentage="yesterdayFpyP"
           ></el-progress>
         </div>
       </div>
       <div class="progress_box">
         <span>今日直通率</span>
-        <span class="blue_color">63.45%</span>
+        <span class="blue_color">{{ todayFpy }}</span>
         <div class="home_progress">
           <el-progress
             :text-inside="true"
             :stroke-width="strokeWidth"
-            :percentage="70"
+            :percentage="todayFpyP"
           ></el-progress>
         </div>
       </div>
@@ -170,6 +170,12 @@ export default {
         return {}
       }
     },
+    dbMsg: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
     beilv: {
       type: Number,
       default: 1
@@ -184,6 +190,30 @@ export default {
     },
     progressPercentage: function () {
       return this.productMsg.process * 100 + '%'
+    },
+    lastHourFpy: function () {
+      return this.dbMsg.lastHourFpy * 100 + '%'
+    },
+    lastHourFpyP: function () {
+      return this.dbMsg.lastHourFpy * 100
+    },
+    todayFpy: function () {
+      return this.dbMsg.todayFpy * 100 + '%'
+    },
+    todayFpyP: function () {
+      return this.dbMsg.todayFpy * 100
+    },
+    nowFpy: function () {
+      return this.dbMsg.nowFpy * 100 + '%'
+    },
+    nowFpyP: function () {
+      return this.dbMsg.nowFpy * 100
+    },
+    yesterdayFpy: function () {
+      return this.dbMsg.yesterdayFpy * 100 + '%'
+    },
+    yesterdayFpyP: function () {
+      return this.dbMsg.yesterdayFpy * 100
     }
   }
 }

src/views/home/index.vue

@@ -2,7 +2,12 @@
   <div id="home-container" class="home-container">
     <div class="title-bar">
       <h2 class="tip">生产监控看板</h2>
-      <el-select v-model="lineName" placeholder="请选择名称" size="small">
+      <el-select
+        v-model="lineName"
+        placeholder="请选择名称"
+        size="small"
+        @change="changeLine"
+      >
         <el-option
           v-for="item in nameList"
           :key="item.dataCode"
@@ -21,7 +26,11 @@
               :title="'生产进度'"
               :beilv="beilv"
             />
-            <product-area :productMsg="productMsg" :beilv="beilv" />
+            <product-area
+              :productMsg="productMsg"
+              :dbMsg="dbMsg"
+              :beilv="beilv"
+            />
           </div>
         </el-col>
         <el-col :span="12">
@@ -43,7 +52,7 @@
               :title="'产能信息'"
               :beilv="beilv"
             />
-            <capacity-area />
+            <capacity-area :list="capacityList" />
           </div>
         </el-col>
         <el-col :span="12">
@@ -66,7 +75,13 @@ import CapacityArea from './components/Capacity.vue'
 import MaterialArea from './components/Material.vue'
 import DeviceArea from './components/Device.vue'
 import ProductArea from './components/Product.vue'
-import { getAlarmData, getProductData, getMaterialData } from '@/api/app'
+import {
+  getAlarmData,
+  getProductData,
+  getMaterialData,
+  getCapacityData,
+  getFpyData
+} from '@/api/app'
 export default {
   name: 'HomePage',
   components: {
@@ -82,15 +97,16 @@ export default {
       lineName: 1,
       nameList: JSON.parse(localStorage.getItem('publicList')).proLineVoList,
       productMsg: {},
+      dbMsg: {},
       deviceList: [],
-      materialList: []
+      materialList: [],
+      capacityList: []
     }
   },
   mounted() {
     this.beilv = document.getElementById('home-container').offsetWidth / 1920
     window.addEventListener('resize', () => {
       this.beilv = document.getElementById('home-container').offsetWidth / 1920
-      console.log(this.beilv)
     })
     this.getMsg()
   },
@@ -99,23 +115,56 @@ export default {
       this.getProductMsg()
       this.getDeviceMsg()
       this.getMaterialData()
+      this.getData()
+      this.getDBData()
+    },
+    changeLine(val) {
+      this.lineName = val
+      this.getMsg()
     },
     getProductMsg() {
       getProductData({ productionLineId: this.lineName }).then((res) => {
-        console.log(res)
+        if (res.code === 0) {
           this.productMsg = res.data
+        } else {
+          this.productMsg = {}
+        }
+      })
+    },
+    getDBData() {
+      getFpyData({ productionLineId: this.lineName }).then((res) => {
+        if (res.code === 0) {
+          this.dbMsg = res.data
+        } else {
+          this.dbMsg = {}
+        }
       })
     },
     getDeviceMsg() {
       getAlarmData({ id: this.lineName }).then((res) => {
-        // console.log(res)
+        if (res.code === 0) {
           this.deviceList = res.data
+        } else {
+          this.deviceList = []
+        }
       })
     },
     getMaterialData() {
       getMaterialData({ id: this.lineName }).then((res) => {
-        console.log(res)
+        if (res.code === 0) {
           this.materialList = res.data
+        } else {
+          this.materialList = []
+        }
+      })
+    },
+    getData() {
+      getCapacityData({ id: this.lineName }).then((res) => {
+        if (res.code === 0) {
+          this.capacityList = res.data
+        } else {
+          this.capacityList = []
+        }
       })
     }
   }

src/views/productionScheduling/components/WorkOrderProgressStatistics.vue

@@ -3,9 +3,9 @@
     <span class="title">{{ line }}在制品统计</span>
     <base-table :table-props="tableProps1" :table-data="tableData1" />
     <span class="title">面磨单元在制品统计</span>
-    <base-table :table-props="tableProps2" :table-data="tableData2" />
+    <base-table :table-props="tableProps2" :table-data="tableData1" />
     <span class="title">终检单元在制品统计</span>
-    <base-table :table-props="tableProps3" :table-data="tableData3" />
+    <base-table :table-props="tableProps3" :table-data="tableData1" />
   </div>
 </template>
 <script>
@@ -174,9 +174,27 @@ export default {
     }
   },
   props: {
-    lineName: {
+    // lineName: {
-      type: Number,
+    //   type: Number,
-      default: 1
+    //   default: 1
+    // },
+    tableLine: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    tableGrind: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    tableFinal: {
+      type: Array,
+      default: () => {
+        return []
+      }
     },
     beilv: {
       type: Number,

src/views/productionScheduling/productionData.vue

@@ -113,7 +113,7 @@ export default {
         current: 1,
         size: 20,
         unitName: '',
-        eqName: ''
+        equipmentName: ''
       },
       centervisible: false,
       addOrEditTitle: ''
@@ -157,11 +157,14 @@ export default {
     clickDevice(val) {
       if (!val.children) {
         // 设备
-        this.listQuery.eqName = val.name
+        this.listQuery.equipmentName = val.name
         this.listQuery.unitName = ''
       } else if (val.children && val.parent) {
-        this.listQuery.eqName = ''
+        this.listQuery.equipmentName = ''
         this.listQuery.unitName = val.name
+      } else {
+        this.listQuery.equipmentName = ''
+        this.listQuery.unitName = ''
       }
       this.getList()
     },

src/views/productionScheduling/workOrderProgress.vue

@@ -146,7 +146,12 @@
     <el-row>
       <el-col :span="24">
         <div class="bottom-box">
-          <progress-statistics :lineName="lineName" :beilv="beilv" />
+          <progress-statistics
+            :tableLine="tableLine"
+            :tableGrind="tableGrind"
+            :tableFinal="tableFinal"
+            :beilv="beilv"
+          />
         </div>
       </el-col>
     </el-row>
@@ -193,6 +198,9 @@ export default {
     changeLine() {
       this.getProductMsg()
       this.getProcess()
+      this.getLineGlassCount()
+      this.getGrindGlassCount()
+      this.getFinalClassCount()
     },
     getProductMsg() {
       getProductData({ productionLineId: this.lineName }).then((res) => {
@@ -213,16 +221,25 @@ export default {
     getLineGlassCount() {
       lineGlassCount({ productionLineId: this.lineName }).then((res) => {
         console.log(res)
+        // if (res.code === 0) {
+        //   this.tableLine = res.data
+        // }
       })
     },
     getGrindGlassCount() {
       grindGlassCount({ productionLineId: this.lineName }).then((res) => {
         console.log(res)
+        // if (res.code === 0) {
+        //   this.tableGrind = res.data
+        // }
       })
     },
     getFinalClassCount() {
       finalClassCount({ productionLineId: this.lineName }).then((res) => {
         console.log(res)
+        // if (res.code === 0) {
+        //   this.tableFinal = res.data
+        // }
       })
     }
   }

src/views/qualityManagement/components/defectScatterPlotChart.vue

@@ -129,8 +129,8 @@ export default {
         let obj = {}
         for (let j of this.defectMsg[i]) {
           let arr2 = []
-          arr2.push(parseInt(j.ypos))
+          arr2.push(2600 - parseInt(j.ypos))
-          arr2.push(parseInt(j.xpos))
+          arr2.push(2250 - parseInt(j.xpos))
           arr1.push(arr2)
         }
         obj.name = this.transLabel(i)

src/views/qualityManagement/components/thicknessDistributionChart.vue

@@ -2,28 +2,36 @@
   <div class="thicknessDistributionChart">
     <div class="top-table">
       <ul>
-        <li>转换速度：32654654</li>
+        <li>转换速度：{{ chartMsg[0] ? chartMsg[0].conveyorSpeed : '' }}</li>
-        <li>配方类型：G8.5-0943</li>
+        <li>配方类型：{{ chartMsg[0] ? chartMsg[0].glassType : '' }}</li>
-        <li>玻璃索引：56565</li>
+        <li>玻璃索引：{{ chartMsg[0] ? chartMsg[0].glassIndex : '' }}</li>
-        <li>等级：G1</li>
+        <li>等级：{{ chartMsg[0] ? chartMsg[0].result : '' }}</li>
         <li></li>
       </ul>
       <ul>
-        <li class="red-tip">最大值：235454</li>
+        <li class="red-tip">
-        <li class="blue-tip">最小值：5652356</li>
+          最大值：{{ chartMsg[0] ? chartMsg[0].maxValue : '' }}
-        <li class="purple-tip">平均值：6856532656</li>
+        </li>
-        <li class="green-tip">厚度差：656413212</li>
+        <li class="blue-tip">
-        <li class="yellow-tip">研磨类型：4ABC</li>
+          最小值：{{ chartMsg[0] ? chartMsg[0].minValue : '' }}
+        </li>
+        <li class="purple-tip">
+          平均值：{{ chartMsg[0] ? chartMsg[0].avgValue : '' }}
+        </li>
+        <li class="green-tip">
+          厚度差：{{ chartMsg[0] ? chartMsg[0].ttvValue : '' }}
+        </li>
+        <li class="yellow-tip">
+          研磨类型：{{ chartMsg[0] ? chartMsg[0].grindType : '' }}
+        </li>
       </ul>
     </div>
     <div>
-      <span class="title">玻璃ID：46745386415274874</span>
+      <span class="title"
+        >玻璃ID：{{ chartMsg[0] ? chartMsg[0].glassId : '' }}</span
+      >
     </div>
-    <div
+    <div id="thicknessChart" :style="{ height: chartHeight + 'px' }" />
-      id="thicknessChart"
-      style="width: 100%"
-      :style="{ height: chartHeight + 'px' }"
-    />
   </div>
 </template>
 <script>
@@ -37,7 +45,7 @@ export default {
     return {
       chartDom: '',
       chart: '',
-      chartHeight: tableHeight(320)
+      chartHeight: tableHeight(350)
     }
   },
   props: {
@@ -49,11 +57,9 @@ export default {
     }
   },
   mounted() {
-    this.chartDom = document.getElementById('thicknessChart')
-    this.chart = echarts.init(this.chartDom)
     this.getChart()
     window.addEventListener('resize', () => {
-      this.chartHeight = tableHeight(320)
+      this.chartHeight = tableHeight(350)
     })
   },
   watch: {
@@ -63,32 +69,44 @@ export default {
   },
   methods: {
     getChart() {
-      let long = []
+      // console.log(this.chartMsg)
-      for (let i = 1; i <= 21; i++) {
+      let long = Array.from({ length: 21 }, (v, i) => i + 1)
-        long.push(i)
+      let wide = Array.from({ length: 7 }, (v, i) => i + 1)
-      }
-      let wide = []
-      for (let i = 1; i <= 7; i++) {
-        wide.push(i)
-      }
       const data = []
-      for (let k = 0; k < long.length; k++) {
+      // 将数据坐标转到斜对角
-        for (let j = 0; j < wide.length; j++) {
+      let tempData = []
+      for (let i = 0; i < this.chartMsg.length; i++) {
         let arr = []
-          arr[0] = k
+        arr[0] = this.chartMsg[i].column13
-          arr[1] = j
+        arr[1] = this.chartMsg[i].column11
-          arr[2] = parseInt(Math.random() * 80 + 470)
+        arr[2] = this.chartMsg[i].column9
+        arr[3] = this.chartMsg[i].column7
+        arr[4] = this.chartMsg[i].column5
+        arr[5] = this.chartMsg[i].column3
+        arr[6] = this.chartMsg[i].column1
+        tempData[20 - i] = arr
+      }
+      for (let j = 0; j < tempData.length; j++) {
+        for (let k = 0; k < tempData[j].length; k++) {
+          let arr = []
+          arr[0] = j
+          arr[1] = k
+          arr[2] = tempData[j][k]
           data.push(arr)
         }
       }
-      console.log(data)
+      // console.log(data)
+      this.chartDom = document.getElementById('thicknessChart')
+      this.chart = echarts.init(this.chartDom)
       var option = {
         tooltip: {
           position: 'top'
         },
         grid: {
-          height: '50%',
+          height: '80%',
-          top: '10%'
+          width: '96%',
+          left: '3%',
+          top: '12%'
         },
         xAxis: {
           type: 'category',
@@ -105,8 +123,8 @@ export default {
           }
         },
         visualMap: {
-          min: 470,
+          min: this.chartMsg[0] ? this.chartMsg[0].minValue || 490 : 490,
-          max: 550,
+          max: this.chartMsg[0] ? this.chartMsg[0].maxValue || 510 : 510,
           calculable: true,
           color: ['#FF8481', '#F9E35E', '#A6FF99', '#46EBE8', '#4572FF'],
           orient: 'horizontal',
@@ -119,7 +137,8 @@ export default {
             type: 'heatmap',
             data: data,
             label: {
-              show: true
+              show: true,
+              fontSize: 10
             },
             emphasis: {
               itemStyle: {

src/views/qualityManagement/processFullInspection/defectScatterPlot.vue

@@ -40,6 +40,9 @@
               <el-button type="primary" size="small" plain @click="exportExl"
                 >导出</el-button
               >
+              <el-button type="primary" size="small" plain @click="clearChoose"
+                >重置</el-button
+              >
             </div>
             <div class="line2">
               <el-checkbox-group v-model="checkList">
@@ -52,7 +55,7 @@
               </el-checkbox-group>
             </div>
             <div>
-              <span class="title">缺陷散点图(1245241242)</span>
+              <span class="title">缺陷散点图{{ showGlassId }}</span>
             </div>
             <defect-scatter-plot-chart
               ref="poltChart"
@@ -93,7 +96,7 @@ const tableProps = [
     minWidth: 120
   },
   {
-    prop: 'package',
+    prop: 'packingStation',
     label: '包装工位'
   },
   {
@@ -186,7 +189,8 @@ export default {
       selectedGlassId: [],
       detailMsg: {},
       defectList: {},
-      cornerList: []
+      cornerList: [],
+      showGlassId: '' //显示玻璃id，多块玻璃不显示
     }
   },
   mounted() {
@@ -287,7 +291,7 @@ export default {
     selectType(val) {
       if (val === 'pellet') {
         this.checkList = ['s', 'm', 'l', 'xl']
-      } else {
+      } else if (val === 'surface') {
         this.checkList = [
           'bl',
           'distortion',
@@ -308,6 +312,11 @@ export default {
     moveEnd() {
       this.$refs.poltChart.getChart()
     },
+    // 清除缺陷选择
+    clearChoose() {
+      this.type = ''
+      this.checkList = []
+    },
     // 导出
     exportExl() {
       pointExport({

src/views/qualityManagement/processFullInspection/thicknessDistributionMap.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row :gutter="8" class="thicknessDistributionMap">
-    <el-col :span="10">
+    <el-col :span="8">
       <div class="left-box">
         <search-bar :formConfigs="formConfig" @headBtnClick="buttonClick" />
         <base-table
@@ -14,7 +14,7 @@
         />
       </div>
     </el-col>
-    <el-col :span="14">
+    <el-col :span="16">
       <div class="right-box">
         <thickness-distribution-chart :chartMsg="chartData" />
       </div>
@@ -112,7 +112,7 @@ export default {
   methods: {
     getList() {
       queryThickness({ ...this.listQuery }).then((res) => {
-        console.log(res)
+        // console.log(res)
         if (res.code === 0 && res.data.length > 0) {
           let _this = this
           _this.tableData = res.data
@@ -143,7 +143,7 @@ export default {
           break
         default:
           drawThickness({ ...this.listQuery2 }).then((res) => {
-            console.log(res)
+            // console.log(res)
             this.chartData = res.data
           })
       }