meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2019-10-06 08:27:27 +08:00
parent 66876d957d
commit 3c48d2583e
9 changed files with 479 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/api/ManufacturingCenter/EquipmentMonitoring.js Normal file
View File

@@ -0,0 +1,35 @@
import request from '@/utils/request'
// 查询加工工时统计表
export function getwork_state() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_设备数据采集_工作状态_查询'
}
})
}
// 查询工位状态
export function getOP_state() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_设备数据采集_工位状态_查询'
}
})
}
// 查询零件图号
export function searchtooltip(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_工位零件图号查询',
param: '工位号=' + num
}
})
}

2
src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
View File

@@ -33,7 +33,7 @@ export function saveWeight(num1, num2, num3, num4) {
data: {
type: '2',
name: '备料管理_采购计划明细_保存重量和备注',
param: `采购计划明细流水号=${num1}&重量=${num2}&备注=${num3}&单价=${num4}`
param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}`
}
})
}

23
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -26,38 +26,39 @@ export function searchMateriel(num) {
})
}
// 查询到货单
export function searchArriveOrder(pageCurrent, pageSize) {
export function searchArriveOrder(num, num1, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '备料管理_到货单查询',
param: `供应商名称_check=${num}&供应商名称=${num1}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 新增到货单
export function addPurchaseOrder(num1, num2, num3, num4, num5) {
export function addPurchaseOrder(num1, num2, num3, num4, num5, num6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_新增到货单',
param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}`
param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&供应商流水号=${num6}`
}
})
}
// 编辑采购单
export function editPurchaseOrder(num1, num2, num3, num4, num5, num6) {
export function editPurchaseOrder(num1, num2, num3, num4, num5, num6, num7) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '备料管理_编辑到货单',
param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}`
param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}`
}
})
}
@@ -97,3 +98,15 @@ export function addMateriel(num1, num2, num3) {
}
})
}
// 查询供应商
export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_供应商_查询数据_根据条件',
param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
}
})
}

2
src/utils/request.js
View File

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.102:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

432
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -1,234 +1,328 @@
<template>
<el-card>
<div class="process">
<div style="position: relative;left:39px;top:375px; width: 100px;height: 28px;">
<div :id="OPNAME137" :title="tooltip" style="position: relative;left:39px;top:375px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)" >
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME137 }}</div>
<div :id="OPNAME137+fang" class="fang"/>
<div :id="OPNAME137+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME137 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:382px; width: 100px;height: 28px;">
<div :id="OPNAME138" :title="tooltip" style="position: relative;left:39px;top:382px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME138 }}</div>
<div :id="OPNAME138+fang" class="fang"/>
<div :id="OPNAME138+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME138 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:389px; width: 100px;height: 28px;">
<div :id="OPNAME139" :title="tooltip" style="position: relative;left:39px;top:389px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME139 }}</div>
<div :id="OPNAME139+fang" class="fang"/>
<div :id="OPNAME139+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME139 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:396px; width: 100px;height: 28px;">
<div :id="OPNAME140" :title="tooltip" style="position: relative;left:39px;top:396px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME140 }}</div>
<div :id="OPNAME140+fang" class="fang"/>
<div :id="OPNAME140+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME140 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:403px; width: 100px;height: 28px;">
<div :id="OPNAME141" :title="tooltip" style="position: relative;left:39px;top:403px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME141 }}</div>
<div :id="OPNAME141+fang" class="fang"/>
<div :id="OPNAME141+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME141 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:410px; width: 100px;height: 28px;">
<div :id="OPNAME142" :title="tooltip" style="position: relative;left:39px;top:410px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME142 }}</div>
<div :id="OPNAME142+fang" class="fang"/>
<div :id="OPNAME142+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME142 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:417px; width: 100px;height: 28px;">
<div :id="OPNAME143" :title="tooltip" style="position: relative;left:39px;top:417px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME143 }}</div>
<div :id="OPNAME143+fang" class="fang"/>
<div :id="OPNAME143+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME143 }}</div>
</el-row>
</div>
<div style="position: relative;left:39px;top:424px; width: 100px;height: 28px;">
<div :id="OPNAME144" :title="tooltip" style="position: relative;left:39px;top:424px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME144 }}</div>
<div :id="OPNAME144+fang" class="fang"/>
<div :id="OPNAME144+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME144 }}</div>
</el-row>
</div>
<div style="position: relative;left:140px;top:395px; width: 100px;height: 28px;">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:140px;top:395px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME136 }}</div>
<div :id="OPNAME136+fang" class="fang"/>
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME136 }}</div>
</el-row>
</div>
<div style="position: relative;left:788px;top:25px; width: 100px;height: 28px;">
<div :id="OPNAME101" :title="tooltip" style="position: relative;left:788px;top:25px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div>
<div :id="OPNAME101+circle" class="circle"/>
<div :id="OPNAME101+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
<div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div>
<div :id="OPNAME102+circle" class="circle"/>
<div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:64px; width: 100px;height: 28px;">
<div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:64px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div>
<div :id="OPNAME103+circle" class="circle"/>
<div :id="OPNAME103+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:60px; width: 100px;height: 28px;">
<div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:60px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div>
<div :id="OPNAME104+circle" class="circle"/>
<div :id="OPNAME104+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:892px;top:76px; width: 100px;height: 28px;">
<div :id="OPNAME105" :title="tooltip" style="position: relative;left:892px;top:76px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 9px"/><div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
<div :id="OPNAME105+fang" class="fang"/>
<div :id="OPNAME105+circle" class="circle" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
</el-row>
</div>
<div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
<div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div>
<div :id="OPNAME106+circle" class="circle"/>
<div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:43px; width: 100px;height: 28px;">
<div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div>
<div :id="OPNAME107+circle" class="circle"/>
<div :id="OPNAME107+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:38px; width: 100px;height: 28px;">
<div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div>
<div :id="OPNAME108+circle" class="circle"/>
<div :id="OPNAME108+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:32px; width: 100px;height: 28px;">
<div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div>
<div :id="OPNAME109+circle" class="circle"/>
<div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:27px; width: 100px;height: 28px;">
<div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div>
<div :id="OPNAME110+circle" class="circle"/>
<div :id="OPNAME110+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:21px; width: 100px;height: 28px;">
<div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div>
<div :id="OPNAME111+circle" class="circle"/>
<div :id="OPNAME111+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:788px;top:15px; width: 100px;height: 28px;">
<div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div>
<div :id="OPNAME112+circle" class="circle"/>
<div :id="OPNAME112+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;">
<div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div>
<div :id="OPNAME113+circle" class="circle"/>
<div :id="OPNAME113+fang" class="fang" style="margin-left: 12px"/>
</el-row>
</div>
<div style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;">
<div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div>
<div :id="OPNAME114+circle" class="circle"/>
<div :id="OPNAME114+fang" class="fang" style="margin-left: 12px"/>
</el-row>
</div>
<div style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;">
<div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div>
<div :id="OPNAME115+circle" class="circle"/>
<div :id="OPNAME115+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;">
<div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div>
<div :id="OPNAME116+circle" class="circle"/>
<div :id="OPNAME116+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;">
<div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div>
<div :id="OPNAME117+circle"class="circle"/>
<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>
</el-row>
</div>
<div style="position: relative;left:1022px;top:-326px; width: 100px;height: 28px;">
<div :id="OPNAME118" :title="tooltip" style="position: relative;left:1022px;top:-326px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
<div :id="OPNAME118+fang" class="fang"/>
<div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
</el-row>
</div>
<div style="position: relative;left:1022px;top:-311px; width: 100px;height: 28px;">
<div :id="OPNAME119" :title="tooltip" style="position: relative;left:1022px;top:-311px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
<div :id="OPNAME119+fang" class="fang"/>
<div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
</el-row>
</div>
<div style="position: relative;left:1022px;top:-295px; width: 100px;height: 28px;">
<div :id="OPNAME120" :title="tooltip" style="position: relative;left:1022px;top:-295px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
<div :id="OPNAME120+fang" class="fang"/>
<div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
</el-row>
</div>
<div style="position: relative;left:1020px;top:-190px; width: 100px;height: 28px;">
<div :id="OPNAME121" :title="tooltip" style="position: relative;left:1020px;top:-190px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
<div :id="OPNAME121+fang" class="fang"/>
<div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
</el-row>
</div>
<div style="position: relative;left:1020px;top:-120px; width: 100px;height: 28px;">
<div :id="OPNAME122" :title="tooltip" style="position: relative;left:1020px;top:-120px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
<div :id="OPNAME122+fang" class="fang"/>
<div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
</el-row>
</div>
<div style="position: relative;left:1118px;top:-585px; width: 100px;height: 28px;">
<div :id="OPNAME123" :title="tooltip" style="position: relative;left:1118px;top:-585px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
<div :id="OPNAME123+fang" class="fang"/>
<div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
</el-row>
</div>
<div style="position: relative;left:1118px;top:-568px; width: 100px;height: 28px;">
<div :id="OPNAME124" :title="tooltip" style="position: relative;left:1118px;top:-568px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
<div :id="OPNAME124+fang" class="fang"/>
<div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
</el-row>
</div>
<div style="position: relative;left:1118px;top:-553px; width: 100px;height: 28px;">
<div :id="OPNAME125" :title="tooltip" style="position: relative;left:1118px;top:-553px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
<div :id="OPNAME125+fang" class="fang"/>
<div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
</el-row>
</div>
<div style="position: relative;left:1118px;top:-537px; width: 100px;height: 28px;">
<div :id="OPNAME126" :title="tooltip" style="position: relative;left:1118px;top:-537px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
<div :id="OPNAME126+fang" class="fang"/>
<div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
</el-row>
</div>
<div style="position: relative;left:1124px;top:-341px; width: 100px;height: 28px;">
<div :id="OPNAME127" :title="tooltip" style="position: relative;left:1124px;top:-341px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
<div :id="OPNAME127+fang" class="fang"/>
<div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
</el-row>
</div>
<div style="position: relative;left:1120px;top:-319px; width: 100px;height: 28px;">
<div :id="OPNAME128" :title="tooltip" style="position: relative;left:1120px;top:-319px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
<div :id="OPNAME128+fang" class="fang"/>
<div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-769px; width: 100px;height: 28px;">
<div :id="OPNAME129" :title="tooltip" style="position: relative;left:1270px;top:-769px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
<div :id="OPNAME129+fang" class="fang"/>
<div :id="OPNAME129+circle"class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-759px; width: 100px;height: 28px;">
<div :id="OPNAME130" :title="tooltip" style="position: relative;left:1270px;top:-759px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
<div :id="OPNAME130+fang" class="fang"/>
<div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-719px; width: 100px;height: 28px;">
<div :id="OPNAME131" :title="tooltip" style="position: relative;left:1270px;top:-719px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
<div :id="OPNAME131+fang" class="fang"/>
<div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-649px; width: 100px;height: 28px;">
<div :id="OPNAME132" :title="tooltip" style="position: relative;left:1270px;top:-649px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
<div :id="OPNAME132+fang" class="fang"/>
<div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
</el-row>
</div>
<div style="position: relative;left:1273px;top:-640px; width: 100px;height: 28px;">
<div :id="OPNAME133" :title="tooltip" style="position: relative;left:1273px;top:-640px; width: 100px;height: 28px;">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 10px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
<div :id="OPNAME133+fang" class="fang"/>
<div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-545px; width: 100px;height: 28px;">
<div :id="OPNAME134" :title="tooltip" style="position: relative;left:1270px;top:-545px; width: 100px;height: 28px;">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
<div :id="OPNAME134+fang" class="fang"/>
<div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
</el-row>
</div>
<div style="position: relative;left:1270px;top:-535px; width: 100px;height: 28px;">
<div :id="OPNAME135" :title="tooltip" style="position: relative;left:1270px;top:-535px; width: 100px;height: 28px;">
<el-row>
<div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
<div :id="OPNAME135+fang" class="fang"/>
<div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
</el-row>
</div>
</div>
</el-card>
</template>
<script>import { wsuri, name } from '@/utils/request'
<script>
import $ from 'jquery'
import { getwork_state, getOP_state, searchtooltip } from '@/api/ManufacturingCenter/EquipmentMonitoring'
import { wsuri, name3 } from '@/utils/request'
export default {
data() {
return {
fang: '_fang',
circle: '_circle',
tooltip: '787878',
socketConnect: true,
OPNAME101: 'OP1010',
OPNAME102: 'OP1020',
@@ -274,18 +368,105 @@ export default {
OPNAME142: 'OP1420',
OPNAME143: 'OP1430',
OPNAME144: 'OP1440',
timer: null
timer: null,
opname: ''
}
},
mounted() {
this.connect()
this.timer = setInterval(this.searchState, 15 * 1000) // 工位状态 15秒 一刷新
this.getwork_state()
this.getOP_state()
this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
},
beforeDestroy() {
// 页面结束之前关闭所有timer，防止资源占用
clearInterval(this.timer)
},
methods: {
// 工作状态 0 黄色 1 绿色
getwork_state() {
this.getOP_state()
// function opclickshowPanel() {
// console.log(this.opname)
// if (this.opname != undefined) {
// var aaa = 'http://localhost:8065/webpage/MesWebFun02.htm?opname=' + this.opname + '&ip=192.168.1.103&port=8015'
// window.open(aaa)
// }
// }
getwork_state().then(response => {
// 通过jQuery添加类选择器和移除类选择器
for (let i = 0; i < response.data.length; i++) {
// 点击工位事件
// 通过“事件监听”的方式来绑定事件（也叫Dom2级事件处理程序）
// document.getElementById(response.data[i].设备号).onclick = _this.opclickshowPanel(); //鼠标单击的时候调用showMes这个函数
// $('#' + response.data[i].设备号).bind('click', opclickshowPanel)
if (response.data[i].设备状态 === '1') {
$('#' + response.data[i].设备号 + '_fang').removeClass('fang')
$('#' + response.data[i].设备号 + '_fang').addClass('fang1')
} else if (response.data[i].设备状态 === '0') {
$('#' + response.data[i].设备号 + '_fang').removeClass('fang1')
$('#' + response.data[i].设备号 + '_fang').addClass('fang')
}
}
})
},
opclickshowPanel($event) {
if($event.path[2].id!=undefined && $event.path[2].id!==null &&$event.path[2].id!=='')
{
var aaa = 'http://localhost:8065/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.103&port=8015'
window.open(aaa)
}
},
// 工位电流值
// 1停机灰色 2开机黄色 3运行绿色 4报警红色
getOP_state() {
getOP_state().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].状态代码 === '1') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').addClass('circle2')
} else if (response.data[i].状态代码 === '2') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').addClass('circle1')
} else if (response.data[i].状态代码 === '3') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').addClass('circle')
} else if (response.data[i].状态代码 === '4') {
$('#' + response.data[i].工位号 + '_circle').removeClass('circle')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
$('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
$('#' + response.data[i].工位号 + '_circle').addClass('circle3')
}
}
})
},
// 鼠标移入加入class
changeActive($event) {
searchtooltip($event.path[2].id).then(response => {
if (response.data.length > 0) {
if (response.data[0].工艺计划流水号 == 0) {
response.data[0].工艺计划流水号 = null
}
this.tooltip = '当前零件图号:' + response.data[0].工艺计划流水号
}
})
// $event.currentTarget.className="active";
},
removeActive($event) {
// $event.currentTarget.className="";
},
tooltipselect() {
console.log(76576576)
this.tooltip = '7867564657676754'
},
/* socket连接*/
connect() {
if (this.socketConnect === true) {
@@ -304,19 +485,60 @@ export default {
// 打开
websocketopen() {
console.log('WebSocket连接成功')
this.websock.send('{<' + name + '>}')
this.websock.send('{<' + name3 + '>}')
},
// 数据接收
websocketonmessage(msg) {
this.msg = msg
console.log(msg)
const aa = this.msg.data.split('|')
console.log(aa[1])
// if (aa[1] === '') {
//
// } else if (aa[1] === '') {
//
// }
this.msg = msg.data
// console.log(msg)
var msgArray = this.msg.split('|')
if (msgArray != '' && msgArray.length >= 4) {
var command = msgArray[1]
var opname = msgArray[2]
var value = msgArray[3]
switch (command) {
case 'MachineStatusAlarm':// hight 报错不管心跳
case 'Alarm':
if (value == 1) {
} else {
}
break
case 'PartPalletStatus':// 托盘到位
if (value == 1) {
} else {
}
break
case 'OEE':// 托盘到位
if (value === '1') {
$('#' + opname + '_circle').removeClass('circle3')
$('#' + opname + '_circle').removeClass('circle1')
$('#' + opname + '_circle').removeClass('circle')
$('#' + opname + '_circle').addClass('circle2')
} else if (value === '2') {
$('#' + opname + '_circle').removeClass('circle')
$('#' + opname + '_circle').removeClass('circle3')
$('#' + opname + '_circle').removeClass('circle2')
$('#' + opname + '_circle').addClass('circle1')
} else if (value === '3') {
$('#' + opname + '_circle').removeClass('circle3')
$('#' + opname + '_circle').removeClass('circle1')
$('#' + opname + '_circle').removeClass('circle2')
$('#' + opname + '_circle').addClass('circle')
} else if (value === '4') {
$('#' + opname + '_circle').removeClass('circle')
$('#' + opname + '_circle').removeClass('circle1')
$('#' + opname + '_circle').removeClass('circle2')
$('#' + opname + '_circle').addClass('circle3')
}
// getOP_state() // 初始化设备状态
break
default:
break
}
}
},
// 关闭
websocketclose() {
@@ -344,6 +566,7 @@ export default {
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}
/*绿色*/
.circle{
float: left;
width: 10px;
@@ -353,15 +576,17 @@ export default {
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
}
/*黄色*/
.circle1{
float: left;
width: 10px;
height: 10px;
background-color:yellow;
background-color:#FFBB00 ;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
}
/*灰色*/
.circle2{
float: left;
width: 10px;
@@ -371,6 +596,7 @@ export default {
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
}
/*红色*/
.circle3{
float: left;
width: 10px;
@@ -390,6 +616,6 @@ export default {
float: left;
width: 10px;
height: 10px;
background-color:yellow;
background-color:#FFBB00 ;
}
</style>

147
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -18,7 +18,7 @@
</div>
<div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:190px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">装配质检合格率：{{ `${data2[0].装配质检}%` }}</div>
<div slot="content">装配质检合格率：{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
</el-tooltip>
</div>
@@ -54,13 +54,13 @@
</div>
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 280px;top:95px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">自制质检合格率：{{ `${data2[0].自制质检}%` }}</div>
<div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
</el-tooltip>
</div>
<div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 197px;top:286px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">采购质检合格率：{{ `${data2[0].采购质检}%` }}</div>
<div slot="content">采购质检合格率：{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button>
</el-tooltip>
</div>
@@ -96,8 +96,8 @@
</div>
<div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1295px;top:236px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">回款进度：{{ `${data2[0].签订合同}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
<div slot="content">回款进度：{{ parseInt(`${data2[0].签订合同}`) + '%' }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ parseInt(`${data2[0].签订合同}`) + '%' }}</el-button>
</el-tooltip>
</div>
<div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1280px;top:238px; width: 80px;height: 48px;">
@@ -319,7 +319,7 @@
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<el-row>
<div style="margin-top: 17px">
<span>机床设计者：</span><el-tag size="mini">{{ '李玉萍' }}</el-tag>
<span>机床设计者：</span><el-tag size="mini">{{ dataDiv2.负责人 }}</el-tag>
<span style="margin-left: 10px">组件总数：</span><el-tag size="mini">{{ dataDiv2.组件总数 }}</el-tag>
<span style="margin-left: 10px">整改组数：</span><el-tag size="mini">{{ dataDiv2.整改组数 }}</el-tag>
</div>
@@ -964,12 +964,7 @@
<el-card class="showDiv">
<h3 style="align-content: center">{{ Machine }} : 车间加工</h3>
<el-row style="margin-top: 10px">
<el-col :span="8">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<div id="barDiv10" style="width:600px;height:400px; display: block; float: left"/>
</div>
</el-col>
<el-col :span="16">
<el-col :span="24">
<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
<el-table
:data="tableDataDiv10"
@@ -985,13 +980,7 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="是否完成">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际完成时间" type="success" size="mini" style="width: 80px">完成</el-tag>
<el-tag v-else type="danger" size="mini" style="width: 80px">未完成</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="80px">
<el-table-column align="center" label="组号">
<template slot-scope="scope">
{{ scope.row.组号 ? scope.row.组号 : '--' }}
</template>
@@ -1001,7 +990,12 @@
{{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="负责人" width="80px">
<el-table-column align="center" label="组别进度">
<template slot-scope="scope">
{{ scope.row.进度 ? scope.row.进度 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="负责人">
<template slot-scope="scope">
{{ scope.row.负责人 ? scope.row.负责人 : '--' }}
</template>
@@ -1333,6 +1327,11 @@
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="发货状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="发货单编号">
<template slot-scope="scope">
{{ scope.row.发货单编号 ? scope.row.发货单编号 : '--' }}
@@ -1343,34 +1342,19 @@
{{ scope.row.发货单名称 ? scope.row.发货单名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="制单人">
<el-table-column align="center" label="货品编号">
<template slot-scope="scope">
{{ scope.row.制单人 ? scope.row.制单人 : '--' }}
{{ scope.row.货品编号 ? scope.row.货品编号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="发货人">
<el-table-column align="center" label="货品名称">
<template slot-scope="scope">
{{ scope.row.执行人 ? scope.row.执行人 : '--' }}
{{ scope.row.货品名称 ? scope.row.货品名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="发出时间">
<el-table-column align="center" label="货品类别">
<template slot-scope="scope">
{{ scope.row.发出时间 ? scope.row.发出时间 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="车辆牌号">
<template slot-scope="scope">
{{ scope.row.车辆牌号 ? scope.row.车辆牌号 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="司机姓名">
<template slot-scope="scope">
{{ scope.row.司机姓名 ? scope.row.司机姓名 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="联系电话">
<template slot-scope="scope">
{{ scope.row.联系电话 ? scope.row.联系电话 : '--' }}
{{ scope.row.货品类别 ? scope.row.货品类别 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="收货单位">
@@ -1378,9 +1362,9 @@
{{ scope.row.收货单位 ? scope.row.收货单位 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="收货地址">
<el-table-column align="center" label="发出时间">
<template slot-scope="scope">
{{ scope.row.收货地址 ? scope.row.收货地址 : '--' }}
{{ scope.row.发出时间 ? scope.row.发出时间 : '--' }}
</template>
</el-table-column>
</el-table>
@@ -2082,6 +2066,7 @@ export default {
dataDiv2: {
组件总数: '',
整改组数: '',
负责人: '',
data: []
},
dataDiv3: {
@@ -2529,6 +2514,9 @@ export default {
}
}).then(res => {
this.tableDataDiv2 = res.data
if (this.tableDataDiv2.length !== 0) {
this.dataDiv2.负责人 = res.data[0].负责人
}
request({
url: '',
method: 'post',
@@ -3409,71 +3397,13 @@ export default {
method: 'post',
data: {
type: '3',
name: `select COUNT(*) as 未完成
from 项目计划管理_组件计划_视图
where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is null`
name: `select CONVERT(nvarchar(50),round(CONVERT(float,sum(case when [机加工实际完成时间] is not null then [投产总数量] else 0 end ))/CONVERT(float,sum([投产总数量]))*100,2) ) as 进度
from 综合查询_车间加工
where 机床流水号 = ${this.machineValue1} and 计划类型 = 4`
}
}).then(res => {
if (res.data[0].未完成 !== 0) {
this.dataDiv10.data.push({
name: '未完成',
value: res.data[0].未完成
})
}
}).then(() => {
request({
url: '',
method: 'post',
data: {
type: '3',
name: `select COUNT(*) as 已完成
from 项目计划管理_组件计划_视图
where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is not null`
}
}).then(res => {
if (res.data[0].已完成 !== 0) {
this.dataDiv10.data.push({
name: '已完成',
value: res.data[0].已完成
})
}
this.drawLineDiv10()
})
})
})
},
// 绘制油漆div饼图
drawLineDiv10() {
const bar = echarts.init(document.getElementById('barDiv10'))
// 指定图表的配置项和数据
bar.setOption({
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
},
legend: {
orient: 'vertical',
left: 'left',
data: ['已完成', '未完成']
},
series: [
{
name: '状态比例',
type: 'pie',
radius: '55%',
center: ['50%', '45%'],
data: this.dataDiv10.data,
itemStyle: {
emphasis: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
})
},
// 查询自家备料div数据
async searchDiv11() {
this.showDiv0 = false
@@ -4501,10 +4431,11 @@ export default {
method: 'post',
data: {
type: '3',
name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue1} and 是否发出 = 1`
name: `select * from 综合查询_发货_查询视图 where 机床流水号 = 10`
}
}).then(res => {
this.tableDataDiv23 = res.data
console.log(this.tableDataDiv23)
})
}
}
@@ -4516,16 +4447,22 @@ export default {
background: red;
}
.jixingzhong{
width: 80px;
height: 40px;
background: #7eaced;
color: black;
font-weight: bold;
}
.yiwancheng{
width: 80px;
height: 40px;
background: #ff9759;
color: black;
font-weight: bold;
}
.weikaishi{
width: 80px;
height: 40px;
background: #EAEAEA;
color: black;
font-weight: bold;

8
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -187,9 +187,9 @@
<el-input v-model="scope.row.成品尺寸" size="mini" style="width:120px" @change="saveWeight(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="单价" align="center" >
<el-table-column label="单位" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
<el-input v-model="scope.row.单位" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="备注">
@@ -564,11 +564,11 @@ export default {
this.$message.error('请输入正确的单价')
row.单价 = ''
} else {
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
}
},
saveRemarks(index, row) {
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
},
// ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
useqrcode(contractNum) {

53
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -81,9 +81,9 @@
{{ scope.row.成品尺寸 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" >
<el-table-column label="单位" align="center" >
<template slot-scope="scope">
{{ scope.row.单价 }}
{{ scope.row.单位 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="备注">
@@ -95,11 +95,9 @@
</el-card>
<el-card>
<div>
<span>采购单号:</span>
<el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip :open-delay="1200" effect="dark" content="查询采购单" placement="top">
<el-input v-model="Name" placeholder="供应商" size="small" clearable/>
<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
</el-tooltip>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增到货单</el-button>
@@ -125,6 +123,11 @@
{{ scope.row.金额 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -228,6 +231,17 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
<el-option
v-for="item in supplierNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
<el-input v-model="form.备注" size="small"/>
@@ -254,7 +268,7 @@
</template>
<script>
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5 } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5, searchSupplier } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { mapGetters } from 'vuex'
export default {
@@ -263,6 +277,8 @@ export default {
purchasingOrder: '',
supplierName0: '',
arrest: [],
check: 0,
Name: '',
tableData2: [],
total2: 0,
pageCurrent2: 1,
@@ -280,8 +296,10 @@ export default {
单位: '',
数量: '',
金额: '',
备注: ''
备注: '',
supplierNameValue: ''
},
supplierNames: [],
dialogVisible: false,
title: '',
rules: { // 采购表单验证规则
@@ -289,7 +307,7 @@ export default {
单位: [{ required: true, message: '请填写单位' }],
数量: [{ required: true, message: '请填写数量' }],
金额: [{ required: true, message: '请填写金额' }],
备注: [{ required: true, message: '请填写备注' }]
supplierNameValue: [{ required: true, message: '请选择供应商' }]
},
工艺计划流水号组: [],
采购计划明细流水号组: []
@@ -332,7 +350,8 @@ export default {
},
// 查询到货单
searchTable4() {
searchArriveOrder(this.pageCurrent4, this.pageSize4).then(response => {
this.Name ? this.check = 1 : this.check = 0
searchArriveOrder(this.check, this.Name, this.pageCurrent4, this.pageSize4).then(response => {
this.tableData4 = response.data.rows
this.total4 = response.data.total
})
@@ -356,13 +375,22 @@ export default {
this.form.数量 = ''
this.form.金额 = ''
this.form.备注 = ''
this.form.supplierNameValue = ''
this.dialogVisible = true
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) {
this.supplierNames.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
// 新增
submitAddPurchaseOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注).then(response => {
addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.form.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新建到货单成功')
this.pageCurrent4 = 1
@@ -387,12 +415,13 @@ export default {
this.form.数量 = row.数量
this.form.金额 = row.金额
this.form.备注 = row.备注
this.form.supplierNameValue = row.供应商流水号
this.dialogVisible = true
},
submitEditPurchaseOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
editPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.到货单流水号).then(response => {
editPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.到货单流水号, this.form.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改到货单成功')
this.searchTable4()

32
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -5,23 +5,7 @@
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 130px" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable/>
<span style="margin-left: 10px">传送人:</span>
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:130px">
<el-option
v-for="item in selectPerson1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">接收人:</span>
<el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:130px">
<el-option
v-for="item in selectPerson"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
<el-button
type="success"
size="small"
@@ -34,7 +18,7 @@
size="small"
icon="el-icon-circle-plus-outline"
style="margin-left: 10px"
@click="addTable1()">新增</el-button>
@click="addTable1()">新增发票</el-button>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="550px" stripe border highlight-current-row @expand-change="searchTable02">
@@ -42,19 +26,19 @@
<template slot-scope="scope">
<el-table :data="gridData" class="subTableHeader" stripe border size="mini" show-summary style="width: 40%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购单号">
<el-table-column min-width="150" align="center" label="到货单号">
<template slot-scope="scope">
{{ scope.row.采购单号 }}
{{ scope.row.到货单号 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="采购单名称">
<el-table-column min-width="100" align="center" label="到货单名称">
<template slot-scope="scope">
{{ scope.row.采购单名称 }}
{{ scope.row.到货单名称 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="总价" prop="总价">
<el-table-column min-width="100" align="center" label="金额" prop="金额">
<template slot-scope="scope">
{{ scope.row.总价 }}
{{ scope.row.金额 }}
</template>
</el-table-column>
</el-table>