Merge pull request '5.24' (#20) from zjl into master

Reviewed-on: #20

dist/css/2859.5f1c96d8.css

@@ -0,0 +1 @@
+.main-box[data-v-559864b3]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-559864b3],.main-box .right-box[data-v-559864b3]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-559864b3]{padding:16px 0 0;overflow:auto}.main-box .right-box[data-v-559864b3]{padding:24px}.main-box .right-box .title[data-v-559864b3]{display:inline-block;font-size:14px;color:#000;margin-bottom:16px}.main-box .right-box .title[data-v-559864b3]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .right-box .eq-msg[data-v-559864b3]{display:flex;justify-content:space-between;margin-bottom:25px}.main-box .right-box .eq-msg li[data-v-559864b3]{width:22%;height:48px;box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:8px;line-height:48px;padding-left:16px}.main-box .right-box .img-box[data-v-559864b3]{text-align:center}.main-box .right-box .img-box img[data-v-559864b3]{max-width:100%;max-height:calc(100vh - 300px)}

dist/css/293.b914c318.css

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

dist/css/3058.de5828a6.css

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

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

dist/css/551.aacf299b.css

@@ -1 +0,0 @@
-.root-box[data-v-690601c2]{height:calc(29.2vh - 45.552px);width:calc(100vw - 280px);position:relative}.root-box .canvas[data-v-690601c2]{position:absolute}.bottom-box[data-v-13a579c4],.top-box[data-v-13a579c4]{background-color:#fff;margin:8px 16px 0!important;border-radius:4px}.top-box[data-v-13a579c4]{height:calc(29.2vh - 45.552px)}.bottom-box[data-v-13a579c4]{height:calc(70.8vh - 110.448px);padding:0 16px 16px}.bottom-box .area .title[data-v-13a579c4]{display:inline-block;font-size:14px;color:#000;margin:14px 0}.bottom-box .area .title[data-v-13a579c4]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

dist/css/6389.7d5e9ba4.css

@@ -1 +0,0 @@
-.main-box[data-v-28eb19db]{width:100%;padding:8px 6px 0 16px}.main-box .left-box[data-v-28eb19db],.main-box .right-box[data-v-28eb19db]{border-radius:8px;background-color:#fff;height:calc(100vh - 148px)}.main-box .left-box[data-v-28eb19db]{padding:16px 0 0;overflow:auto}.main-box .right-box[data-v-28eb19db]{padding:24px}.main-box .right-box .title[data-v-28eb19db]{display:inline-block;font-size:14px;color:#000;margin-bottom:16px}.main-box .right-box .title[data-v-28eb19db]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}.main-box .right-box .eq-msg[data-v-28eb19db]{display:flex;justify-content:space-between;margin-bottom:25px}.main-box .right-box .eq-msg li[data-v-28eb19db]{width:22%;height:48px;box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:8px;line-height:48px;padding-left:16px}.main-box .right-box .img-box[data-v-28eb19db]{text-align:center}.main-box .right-box .img-box img[data-v-28eb19db]{max-width:100%;max-height:calc(100vh - 300px)}

dist/css/9835.2109528e.css

@@ -0,0 +1 @@
+.root-box[data-v-690601c2]{height:calc(29.2vh - 45.552px);width:calc(100vw - 280px);position:relative}.root-box .canvas[data-v-690601c2]{position:absolute}.bottom-box[data-v-46ad938a],.top-box[data-v-46ad938a]{background-color:#fff;margin:8px 16px 0!important;border-radius:4px}.top-box[data-v-46ad938a]{height:calc(29.2vh - 45.552px)}.bottom-box[data-v-46ad938a]{height:calc(70.8vh - 110.448px);padding:0 16px 16px}.bottom-box .area .title[data-v-46ad938a]{display:inline-block;font-size:14px;color:#000;margin:14px 0}.bottom-box .area .title[data-v-46ad938a]:before{content:"";display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;margin-right:8px;vertical-align:middle}

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.ae91d20e.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.005f8b1a.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/2859.26a89213.js

@@ -0,0 +1 @@
+"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[2859],{2859:function(t,e,n){n.r(e),n.d(e,{default:function(){return d}});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(1)}),500)},getMsg(){o({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,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())}}},c=u,m=n(1001),l=(0,m.Z)(c,a,i,!1,null,"559864b3",null),d=l.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 l},b6:function(){return c},iv:function(){return i},m:function(){return m}});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 c(t){return(0,a.Z)({url:"/common/getProductData",method:"post",data:t})}function m(t){return(0,a.Z)({url:"/common/getMaterialData",method:"post",data:t})}const l="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);

dist/js/6389.09106c34.js

@@ -1 +0,0 @@
-"use strict";(self["webpackChunktft_mes"]=self["webpackChunktft_mes"]||[]).push([[6389],{6389:function(t,e,n){n.r(e),n.d(e,{default:function(){return d}});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("设备A")]),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)},r=[],s=n(5591),i=n(8859);function o(t){return(0,i.Z)({url:"/monitor/eqMonitor/get",method:"post",data:t})}var u={name:"DeviceStatus",data(){return{treeData:[],defaultProps:{children:"children",label:"name"},eqMessage:{},equipmentId:"",deviceImg:""}},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(1)}),500)},getMsg(){o({equipmentId:this.equipmentId}).then((t=>{console.log(t),this.eqMessage=t.data,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.getMsg())}}},c=u,l=n(1001),m=(0,l.Z)(c,a,r,!1,null,"28eb19db",null),d=m.exports},5591:function(t,e,n){n.d(e,{FH:function(){return o},Hp:function(){return u},JQ:function(){return i},SI:function(){return s},WQ:function(){return m},b6:function(){return c},iv:function(){return r},m:function(){return l}});var a=n(8859);function r(){return(0,a.Z)({url:"/common/getList",method:"post"})}function s(){return(0,a.Z)({url:"/common/getTreeData",method:"post"})}function i(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 c(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 m="/api/common/attachment/uploadFileFormData"},6056:function(t,e,n){t.exports=n.p+"img/empty.c5f8511f.png"}}]);

src/api/qualityManagement.js

@@ -110,6 +110,14 @@ export function queryPointClear(data) {
     data
   })
 }
+// 缺陷散点图--角边信息，传玻璃ID
+export function cornerData(data) {
+  return request({
+    url: '/quality/ProcessFull/cornerData',
+    method: 'post',
+    data
+  })
+}
 export function pointExport2(data) {
   return request({
     url: '/quality/ProcessFull/pointExport2',
@@ -231,3 +239,11 @@ export function pageProcess(data) {
     data
   })
 }
+// 获取分页工艺参数（传单元ID、设备ID和上下片时间）
+export function pageProcessParameter(data) {
+  return request({
+    url: '/quality/productTrace/pageProcessParameter',
+    method: 'post',
+    data
+  })
+}

src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue

@@ -186,7 +186,9 @@ export default {
       this.form.proLineId = val[0]
     },
     getNameList() {
-      getNameList().then((res) => {
+      getNameList({
+        type: ''
+      }).then((res) => {
         console.log(res)
         this.sparePartsList = res.data
         this.sparePartsSpecList = []

src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue

@@ -274,7 +274,9 @@ export default {
       this.form.proLineId = val[0]
     },
     getNameList() {
-      getNameList().then((res) => {
+      getNameList({
+        type: ''
+      }).then((res) => {
         this.sparePartsList = res.data
       })
     },

src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue

@@ -211,7 +211,9 @@ export default {
       this.form.proLineId = val[0]
     },
     getNameList() {
-      getNameList().then((res) => {
+      getNameList({
+        type: ''
+      }).then((res) => {
         this.sparePartsList = res.data
       })
     },

src/views/qualityManagement/components/defectScatterPlotChart.vue

@@ -5,10 +5,10 @@
       style="width: 100%"
       :style="{ height: chartHeight + 'px' }"
     />
-    <span class="text1">文本框11111</span>
+    <span class="text1">{{ c2 }}</span>
-    <span class="text2">文本框222222232323232322</span>
+    <span class="text2">{{ c3 }}</span>
-    <span class="text3">文本框33333</span>
+    <span class="text3">{{ c1 }}</span>
-    <span class="text4">文本框44444</span>
+    <span class="text4">{{ c4 }}</span>
   </div>
 </template>
 <script>
@@ -24,6 +24,12 @@ export default {
       default: () => {
         return {}
       }
+    },
+    cornerData: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   data() {
@@ -32,24 +38,28 @@ export default {
       chart: '',
       chartHeight: tableHeight(446),
       list: [
-        { label: 'S', value: 's' },
+        { label: 'S', value: 'S' },
-        { label: 'M', value: 'm' },
+        { label: 'M', value: 'M' },
-        { label: 'L', value: 'l' },
+        { label: 'L', value: 'L' },
-        { label: 'XL', value: 'xl' },
+        { label: 'XL', value: 'XL' },
-        { label: '气泡', value: 'bl' },
+        { label: '气泡', value: 'BL' },
-        { label: '变形', value: 'distortion' },
+        { label: '变形', value: 'Distortion' },
-        { label: '纤维', value: 'fiber' },
+        { label: '纤维', value: 'Fiber' },
-        { label: '划伤', value: 'scratch' },
+        { label: '划伤', value: 'Scratch' },
-        { label: '结节', value: 'knot' },
+        { label: '结节', value: 'Knot' },
-        { label: '结石', value: 'stone' },
+        { label: '结石', value: 'Stone' },
-        { label: '铂金', value: 'pt' },
+        { label: '铂金', value: 'Pt' },
-        { label: '拖尾', value: 'tail' },
+        { label: '拖尾', value: 'Tail' },
-        { label: 'ADG', value: 'adg' },
+        { label: 'ADG', value: 'Adg' },
-        { label: '点状缺陷', value: 'tin' },
+        { label: '点状缺陷', value: 'Tin' },
-        { label: '锡缺陷(顶部)', value: 'top' },
+        { label: '锡缺陷(顶部)', value: 'Top' },
-        { label: '锡缺陷(底部)', value: 'bottom' },
+        { label: '锡缺陷(底部)', value: 'Bottom' },
-        { label: '无法识别', value: 'iisrest' }
+        { label: '无法识别', value: 'Iisrest' }
-      ]
+      ],
+      c1: '',
+      c2: '',
+      c3: '',
+      c4: ''
     }
   },
   mounted() {
@@ -60,9 +70,39 @@ export default {
   watch: {
     defectMsg: function () {
       this.getChart()
+    },
+    cornerData: function () {
+      this.getCorner()
     }
   },
   methods: {
+    getCorner() {
+      if (this.cornerData.length > 0) {
+        for (let i = 0; i < this.cornerData.length; i++) {
+          if (this.cornerData[i].cornerID === 'C1') {
+            this.c1 =
+              this.cornerData[i].deltaX + '*' + this.cornerData[i].deltaY + '□'
+          }
+          if (this.cornerData[i].cornerID === 'C2') {
+            this.c2 =
+              this.cornerData[i].deltaX + '*' + this.cornerData[i].deltaY + '□'
+          }
+          if (this.cornerData[i].cornerID === 'C3') {
+            this.c3 =
+              '□' + this.cornerData[i].deltaX + '*' + this.cornerData[i].deltaY
+          }
+          if (this.cornerData[i].cornerID === 'C4') {
+            this.c4 =
+              '□' + this.cornerData[i].deltaX + '*' + this.cornerData[i].deltaY
+          }
+        }
+      } else {
+        this.c1 = ''
+        this.c2 = ''
+        this.c3 = ''
+        this.c4 = ''
+      }
+    },
     transLabel(v) {
       let label = ''
       for (let l = 0; l < this.list.length; l++) {
@@ -82,12 +122,9 @@ export default {
       }
       this.chartDom = document.getElementById('defectScatterPlotChart')
       this.chart = echarts.init(this.chartDom)
-      console.log(this.defectMsg)
       let legendList = []
       let seriesList = []
       for (let i in this.defectMsg) {
-        console.log(i)
-        console.log(this.transLabel(i))
         legendList.push(this.transLabel(i))
         let arr1 = []
         let obj = {}
@@ -103,7 +140,6 @@ export default {
         obj.symbolSize = 5
         seriesList.push(obj)
       }
-      console.log(seriesList)
       var option = {
         color: [
           '#5d7ab7',
@@ -136,7 +172,7 @@ export default {
         grid: {
           x: 60,
           y: 60,
-          x2: 10,
+          x2: 20,
           y2: 60,
           borderWidth: 1
         },

src/views/qualityManagement/components/processFlowDetail.vue

@@ -11,7 +11,7 @@
         <method-btn
           v-if="tableBtn.length"
           slot="handleBtn"
-          :width="180"
+          :width="100"
           label="操作"
           :method-list="tableBtn"
           @clickBtn="handleClick"
@@ -31,30 +31,13 @@
           :max-height="tableH"
         />
       </el-drawer>
-      <el-drawer
-        title="设备参数"
-        :append-to-body="true"
-        :visible.sync="deviceParametersVisible"
-        size="50%"
-      >
-        <div class="box">
-          <base-table
-            :page="1"
-            :limit="1000"
-            :table-props="tablePropsD"
-            :table-data="tableDataD"
-            :max-height="tableH"
-          />
-        </div>
-      </el-drawer>
     </div>
   </el-drawer>
 </template>
 <script>
 import { tableHeight } from '@/utils/index'
-import { pageProcess } from '@/api/qualityManagement'
+import { pageProcess, pageProcessParameter } from '@/api/qualityManagement'
 import { timeFormatter } from '@/utils'
-import { getParamList } from '@/api/processManagement'
 const tableProps = [
   {
     prop: 'unitName',
@@ -93,23 +76,19 @@ const tableBtn = [
   {
     type: 'processParameters',
     btnName: '工艺参数'
-  },
-  {
-    type: 'deviceParameters',
-    btnName: '设备参数'
   }
 ]
 const tablePropsP = [
   {
-    prop: 'process',
+    prop: 'paramName',
     label: '工艺'
   },
   {
-    prop: 'currentValue',
+    prop: 'value',
-    label: '当前值'
+    label: '参数值'
   },
   {
-    prop: 'time',
+    prop: 'createTime',
     label: '参数记录时间'
   }
 ]
@@ -140,10 +119,7 @@ export default {
       deviceParametersVisible: false,
       tablePropsP,
       tablePropsD,
-      tableDataP: [
+      tableDataP: [],
-        { process: 'X切刀工作时的高度', currentValue: '20' },
-        { process: 'X方向划线速度', currentValue: '6' }
-      ],
       tableDataD: [
         {
           device: '面研磨上片工位_取纸机器人',
@@ -188,15 +164,13 @@ export default {
     },
     handleClick(val) {
       console.log(val)
-      if (val.type === 'processParameters') {
+      this.processParametersVisible = true
-        this.processParametersVisible = true
+      pageProcessParameter({
-        this.getProcess()
+        unitName: val.unitName,
-      } else if (val.type === 'deviceParameters') {
+        eqName: val.eqName,
-        this.deviceParametersVisible = true
+        startTime: val.inEquipmentTime,
-      }
+        endTime: val.outEquipmentTime
-    },
+      }).then((res) => {
-    getProcess() {
-      getParamList().then((res) => {
         console.log(res)
       })
     },

src/views/qualityManagement/processFullInspection/defectScatterPlot.vue

@@ -57,6 +57,7 @@
             <defect-scatter-plot-chart
               ref="poltChart"
               :defectMsg="defectList"
+              :cornerData="cornerList"
             />
             <div class="bottom">
               <div style="margin-bottom: 10px">
@@ -79,7 +80,8 @@ import {
   drawPoint,
   queryPointClear,
   pointExport,
-  pointExport2
+  pointExport2,
+  cornerData
 } from '@/api/qualityManagement'
 import moment from 'moment'
 import { timeFormatter } from '@/utils'
@@ -180,7 +182,8 @@ export default {
       ],
       selectedGlassId: [],
       detailMsg: {},
-      defectList: {}
+      defectList: {},
+      cornerList: []
     }
   },
   mounted() {
@@ -223,13 +226,13 @@ export default {
         return false
       }
       this.getDetail()
+      this.getCornerData()
       drawPoint({
         startTime: this.listQuery.startTime,
         endTime: this.listQuery.endTime,
         glassId: this.selectedGlassId,
         defectType: this.checkList
       }).then((res) => {
-        console.log(res)
         if (res.code === 0) {
           this.defectList = res.data
         } else {
@@ -251,6 +254,13 @@ export default {
         }
       })
     },
+    getCornerData() {
+      cornerData({
+        glassId: this.selectedGlassId
+      }).then((res) => {
+        this.cornerList = res.data
+      })
+    },
     buttonClick(val) {
       //查询
       this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''

src/views/siteMonitoring/deviceStatus.vue

@@ -16,7 +16,7 @@
     </el-col>
     <el-col :span="20">
       <div class="right-box">
-        <span class="title">设备A</span>
+        <span class="title">{{ equipmentName }}</span>
         <ul class="eq-msg">
           <li>设备模式：{{ eqMessage.mode }}</li>
           <li>设备状态：{{ eqMessage.state }}</li>
@@ -45,7 +45,8 @@ export default {
       },
       eqMessage: {},
       equipmentId: '',
-      deviceImg: ''
+      deviceImg: '',
+      equipmentName: ''
     }
   },
   mounted() {
@@ -84,6 +85,7 @@ export default {
       console.log(val)
       if (!val.children) {
         this.equipmentId = val.id
+        this.equipmentName = val.name
         this.getMsg()
       }
     }

src/views/siteMonitoring/productionLineStatus.vue

@@ -32,7 +32,7 @@
           :page="listQuery2.current"
           :limit="listQuery2.size"
           :pageWidth="40"
-          :table-props="tableProps2"
+          :table-props="tableProps1"
           :table-data="tableData4"
           :max-height="tableH"
         />
@@ -84,6 +84,11 @@ const tableProps1 = [
     prop: 'glassID',
     label: '玻璃ID',
     minWidth: 98
+  },
+  {
+    prop: 'glassID1',
+    label: '研磨类型',
+    minWidth: 98
   }
 ]
 const tableProps2 = [