5.24

2023-05-24 10:37:01 +08:00
parent 997c8c86eb
commit f3e296f6e6
40 changed files with 143 additions and 94 deletions
--- a/src/api/qualityManagement.js
+++ b/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
+  })
+}
--- a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceAdd.vue
+++ b/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 = []
--- a/src/views/deviceManagement/maintenanceManagement/plannedMaintenanceEdit.vue
+++ b/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
      })
    },
--- a/src/views/deviceManagement/maintenanceManagement/selfMaintenanceAdd.vue
+++ b/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
      })
    },
--- a/src/views/qualityManagement/components/defectScatterPlotChart.vue
+++ b/src/views/qualityManagement/components/defectScatterPlotChart.vue
@@ -5,10 +5,10 @@
      style="width: 100%"
      :style="{ height: chartHeight + 'px' }"
    />
-    <span class="text1">文本框11111</span>
-    <span class="text2">文本框222222232323232322</span>
-    <span class="text3">文本框33333</span>
-    <span class="text4">文本框44444</span>
+    <span class="text1">{{ c2 }}</span>
+    <span class="text2">{{ c3 }}</span>
+    <span class="text3">{{ c1 }}</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: 'M', value: 'm' },
-        { label: 'L', value: 'l' },
-        { label: 'XL', value: 'xl' },
-        { label: '气泡', value: 'bl' },
-        { label: '变形', value: 'distortion' },
-        { label: '纤维', value: 'fiber' },
-        { label: '划伤', value: 'scratch' },
-        { label: '结节', value: 'knot' },
-        { label: '结石', value: 'stone' },
-        { label: '铂金', value: 'pt' },
-        { label: '拖尾', value: 'tail' },
-        { label: 'ADG', value: 'adg' },
-        { label: '点状缺陷', value: 'tin' },
-        { label: '锡缺陷(顶部)', value: 'top' },
-        { label: '锡缺陷(底部)', value: 'bottom' },
-        { label: '无法识别', value: 'iisrest' }
-      ]
+        { label: 'S', value: 'S' },
+        { label: 'M', value: 'M' },
+        { label: 'L', value: 'L' },
+        { label: 'XL', value: 'XL' },
+        { label: '气泡', value: 'BL' },
+        { label: '变形', value: 'Distortion' },
+        { label: '纤维', value: 'Fiber' },
+        { label: '划伤', value: 'Scratch' },
+        { label: '结节', value: 'Knot' },
+        { label: '结石', value: 'Stone' },
+        { label: '铂金', value: 'Pt' },
+        { label: '拖尾', value: 'Tail' },
+        { label: 'ADG', value: 'Adg' },
+        { label: '点状缺陷', value: 'Tin' },
+        { label: '锡缺陷(顶部)', value: 'Top' },
+        { label: '锡缺陷(底部)', value: 'Bottom' },
+        { 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
        },
--- a/src/views/qualityManagement/components/processFlowDetail.vue
+++ b/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',
-    label: '当前值'
+    prop: 'value',
+    label: '参数值'
  },
  {
-    prop: 'time',
+    prop: 'createTime',
    label: '参数记录时间'
  }
 ]
@@ -140,10 +119,7 @@ export default {
      deviceParametersVisible: false,
      tablePropsP,
      tablePropsD,
-      tableDataP: [
-        { process: 'X切刀工作时的高度', currentValue: '20' },
-        { process: 'X方向划线速度', currentValue: '6' }
-      ],
+      tableDataP: [],
      tableDataD: [
        {
          device: '面研磨上片工位_取纸机器人',
@@ -188,15 +164,13 @@ export default {
    },
    handleClick(val) {
      console.log(val)
-      if (val.type === 'processParameters') {
-        this.processParametersVisible = true
-        this.getProcess()
-      } else if (val.type === 'deviceParameters') {
-        this.deviceParametersVisible = true
-      }
-    },
-    getProcess() {
-      getParamList().then((res) => {
+      this.processParametersVisible = true
+      pageProcessParameter({
+        unitName: val.unitName,
+        eqName: val.eqName,
+        startTime: val.inEquipmentTime,
+        endTime: val.outEquipmentTime
+      }).then((res) => {
        console.log(res)
      })
    },
--- a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
+++ b/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] : ''
--- a/src/views/siteMonitoring/deviceStatus.vue
+++ b/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()
      }
    }
--- a/src/views/siteMonitoring/productionLineStatus.vue
+++ b/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 = [