1.作业计划执行人员姓名颜色调整为白色

master
董哲奇 7 months ago
parent 2ce59647ac
commit 0fdb4ccb2c

@ -7,6 +7,7 @@
"dev": "vue-cli-service serve",
"local": "vue-cli-service serve --mode local",
"server": "vue-cli-service serve --mode server",
"test": "vue-cli-service serve --mode test",
"lint": "eslint --ext .js,.vue src",
"build:test": "vue-cli-service build --mode test",
"build:prod": "vue-cli-service build",

@ -11,7 +11,7 @@ const search=function (){
fill:'#ffffff',
width: 110,
height:20,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(selectRect)
@ -21,7 +21,7 @@ const search=function (){
fill:'#ffffff',
width: 110,
height:20,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(plRect)
@ -32,7 +32,7 @@ const search=function (){
fill:'#ffffff',
width: 110,
height:20,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(fdRect)
@ -43,7 +43,7 @@ const search=function (){
// fill:'#ffffff',
// width: 115,
// height:20,
// stroke:'black',
// stroke:'white',
// strokeWidth:1,
// })
// group.add(sljhrqRect)

@ -207,7 +207,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
//group.add(indexRect)
@ -217,7 +217,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:index,
align:'center',
verticalAlign:'middle',
@ -242,7 +242,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:`${item.wph||''},${item.wpgg}`,
align:'center',
verticalAlign:'middle',
@ -255,7 +255,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize-20,
height:40,
fill:'black',
fill:'white',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`,
align:'center',
verticalAlign:'middle',

@ -29,7 +29,7 @@ export default function (width,height){
y: 0,
width: _width,
height:_height,
fill:'black',
fill:'white',
text:'划线设备',
align:'center',
verticalAlign:'middle',

@ -126,7 +126,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
//group.add(indexRect)
@ -136,7 +136,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:index,
align:'center',
verticalAlign:'middle',
@ -161,7 +161,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:`${item.wph||''},${item.wpgg}`,
align:'center',
verticalAlign:'middle',
@ -174,7 +174,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize-20,
height:40,
fill:'black',
fill:'white',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`,
align:'center',
verticalAlign:'middle',

@ -1,5 +1,4 @@
import Konva from "konva";
import {shangLiao} from "@/api/zyjh";
export const sljh=function (width,height){

@ -213,7 +213,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:index,
align:'center',
verticalAlign:'middle',
@ -238,7 +238,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:`${item.wph||''},${item.wpgg}`,
align:'center',
verticalAlign:'middle',
@ -251,7 +251,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize-20,
height:40,
fill:'black',
fill:'white',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`,
align:'center',
verticalAlign:'middle',

@ -1,7 +1,13 @@
export default function () {
let height=window.innerHeight
if (height > 1024) {
height = window.innerHeight*0.13
}else{
height = window.innerHeight*0.275
}
const options={
height:250,
height:height,
align:'center',
border: true,
resizable: true,

@ -10,6 +10,10 @@ import {bgControl, getDw, getPgd, getPgd2, zx} from "@/api/zyjh";
export default {
name:'PwanPgd',
props:{
height:{
type:Number,
default:0
},
worker:{
type:Function,
default:function (){}
@ -30,7 +34,7 @@ export default {
},
created(){
this.deviceId=this.$route.query.deviceId||''
const {options,columns,setExt}=paoWanPgdConfig()
const {options,columns,setExt}=paoWanPgdConfig(this.$props.height)
this.setExt=setExt
this.gridOptions=options
this.gridOptions.columns=columns
@ -40,11 +44,9 @@ export default {
},
sockets:{
zyjhzx(data){
console.log(data)
if (this.deviceId!==data.msg.deviceId&&data.msg.actionType!=='开始派工'){
return
}
console.log(123)
//
const djhWhLengh=3
const tmpList=this.list.filter(item=>item.djh===data.msg.orderNumber||item.djh.slice(-djhWhLengh)===data.msg.orderNumber)
@ -54,7 +56,6 @@ export default {
return
}
console.log(111,tmpList)
for (const item of this.list) {
if (item.djh===data.msg.orderNumber||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
const worker=this.$props.worker()
@ -99,25 +100,33 @@ export default {
this.initData()
},
checkboxAll({checked}){
const worker=this.$props.worker()
if (!worker){
this.$message.warning('请选择操作人')
return;
if (!this.privateCheck(checked)){
this.$refs.vxeGrid.setAllCheckboxRow(!checked);
return
}
if (checked){
const worker=this.$props.worker()
this.paigong(worker)
}
},
checkboxChange({checked}){
const worker=this.$props.worker()
if (!worker){
this.$message.warning('请选择操作人')
return;
if (!this.privateCheck(checked)){
this.$refs.vxeGrid.setAllCheckboxRow(!checked);
return
}
if (checked){
const worker=this.$props.worker()
this.paigong(worker)
}
},
privateCheck(){
const worker=this.$props.worker()
if (!worker){
this.$message.warning('请选择操作人')
return false;
}
return true
},
paigong(worker){
const list=this.$refs.vxeGrid.getCheckboxRecords()
const tmpArr=[]

@ -470,7 +470,7 @@ export default function (width,height){
const generateQRCode=function (text='',group) {
const imgSize=118
const rect=new Konva.Rect({
x:385,
x:_width-189,
y:0,
width:128.7,
height:120,
@ -485,7 +485,7 @@ export default function (width,height){
imageObj.onload = function () {
const shape = new Konva.Image({
x: 390,
x: _width-183,
y: 1,
width: imgSize,
height: imgSize,

@ -1,7 +1,12 @@
export default function () {
let height=window.innerHeight
if (height > 1024) {
height = window.innerHeight*0.88
}else{
height = window.innerHeight*0.78
}
const options={
height:715,
height:height,
align:'center',
border: true,
resizable: true,

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers"/>
<PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :height="height" :worker="getWorker" :workers="workers"/>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
<Drawer ref="drawer"/>
@ -160,7 +160,6 @@ export default {
overflow: hidden;
width: 100%;
height: 100vh;
aspect-ratio: 16/9;
}
.container{

@ -207,7 +207,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:index,
align:'center',
verticalAlign:'middle',
@ -232,7 +232,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:`${item.wph||''},${item.wpgg}`,
align:'center',
verticalAlign:'middle',
@ -245,7 +245,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize-20,
height:40,
fill:'black',
fill:'white',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`,
align:'center',
verticalAlign:'middle',

@ -29,7 +29,7 @@ export default function (width,height){
y: 0,
width: _width,
height:_height,
fill:'black',
fill:'white',
text:'设备',
align:'center',
verticalAlign:'middle',

@ -127,7 +127,7 @@ export default {
y:0,
width:40,
height:40,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
//group.add(indexRect)
@ -136,7 +136,7 @@ export default {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:i,
align:'center',
verticalAlign:'middle',
@ -161,7 +161,7 @@ export default {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:gb+',12*2830*13090',
align:'center',
verticalAlign:'middle',
@ -174,7 +174,7 @@ export default {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:'G175K-4,上料:2024/07/01,切割:2024/07/04',
align:'center',
verticalAlign:'middle',
@ -199,7 +199,7 @@ export default {
y:0,
width:itemWith,
height:itemHeight,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
qyGroup.add(rect)
@ -292,7 +292,7 @@ export default {
y:0,
width: size,
height: size,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(rect)
@ -301,7 +301,7 @@ export default {
y:0,
width: size,
height: size,
fill:'black',
fill:'white',
text:qy.name+'\n'+dw.name,
align:'center',
verticalAlign:'middle',
@ -339,7 +339,7 @@ export default {
y:0,
width: size,
height: size,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(rect)
@ -348,7 +348,7 @@ export default {
y:0,
width: size,
height: size,
fill:'black',
fill:'white',
text:qy.name,
align:'center',
verticalAlign:'middle',
@ -382,7 +382,7 @@ export default {
width:this.width-30,
height:20,
lineHeight:1,
stroke:'black',
stroke:'white',
strokeWidth:0.1,
text:this.msg,
align:'center',

@ -2,7 +2,7 @@ import Konva from "konva";
const baifang=function (option={}) {
const width=option.width,height=option.height,image=require('@/assets/gb.png')
const _width=width*0.4-50,_height=height*0.737
const _width=width*0.4-50,_height=height*0.715
const x=width*0.6+40,y=262
const bg=function (){
@ -152,7 +152,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
//group.add(indexRect)
@ -162,7 +162,7 @@ const baifang=function (option={}) {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:index,
align:'center',
verticalAlign:'middle',
@ -187,7 +187,7 @@ const baifang=function (option={}) {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:`${item.wph||''},${item.wpgg}`,
align:'center',
verticalAlign:'middle',
@ -200,8 +200,8 @@ const baifang=function (option={}) {
y: 0,
width: imgSize+40,
height:40,
fill:'black',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`,
fill:'white',
text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割计划日期:${item.qgjhrq||''}`,
align:'center',
verticalAlign:'middle',
})

@ -2,7 +2,7 @@ import Konva from "konva";
const liliao=function (width,height,dw,callback) {
const _width=width*0.4,_height=height*0.737
const _width=width*0.4,_height=height*0.715
const container=function (){
const x=width*0.2+30,y=262

@ -2,7 +2,7 @@ import Konva from "konva";
const workers=function (width,height,persons) {
const _width=width*0.2,_height=height*0.737
const _width=width*0.2,_height=height*0.715
const container=function (){
const x=20,y=262
@ -62,7 +62,7 @@ const workers=function (width,height,persons) {
}
const person=function (index,item){
const alignSize=2
const width=((_width-30)/alignSize),height=135
const width=((_width*0.9)/alignSize),height=_height/5.2
const x=index%alignSize*width+(index%alignSize+1)*10,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
const group=new Konva.Group({
x:x,
@ -79,8 +79,10 @@ const workers=function (width,height,persons) {
}
selectObj.onload = function () {
const shape = new Konva.Image({
x: 83,
x: 0,
y: 0,
offsetX:-width*0.69,
offsetY:-3,
width: 39,
height:39,
image: this,
@ -111,8 +113,8 @@ const workers=function (width,height,persons) {
x: 0,
y: 0,
offsetX:4,
width: 137*0.95,
height:155*0.80,
width: width,
height:height,
image: this,
});
group.add(shape)
@ -127,8 +129,8 @@ const workers=function (width,height,persons) {
y: 0,
offsetX:-4,
offsetY:-10,
width: 126*0.9,
height:134*0.80,
width: width*0.9,
height:height*0.89,
image: this,
});
group.add(shape)
@ -140,7 +142,7 @@ const workers=function (width,height,persons) {
y:70,
width: width,
height: height,
fill:'black',
fill:'white',
text:item.userName,
align:'center',
verticalAlign:'middle',

@ -333,16 +333,22 @@ export default {
const _sljhGroup=this.sljhGroup;
let touchingFlag=false;
const that=this
qyGroup.on('click touchstart',function ({evt}){
let timeout=null
qyGroup.on('mousedown touchstart',function ({evt}){
const worker=that.getCurrentWorker();
if (!that.canSl||!worker){
return
}
const {clientX:x,clientY:y}=evt.touches[0]
const {clientX:_x,clientY:_y}=evt
let x=_x,y=_y
if (evt.type==='touchstart'){
x=evt.targetTouches[0].clientX
y=evt.targetTouches[0].clientY
}
touchingFlag=true;
const _that=this
setTimeout(()=>{
timeout=setTimeout(()=>{
const movingFlag=_sljhGroup.isDragging()
if (!movingFlag){
if (touchingFlag){
@ -405,7 +411,8 @@ export default {
},500)
})
qyGroup.on('touchend',function (){
qyGroup.on('mouseup touchend',function (){
clearTimeout(timeout)
touchingFlag=false;
this.draggable(false)
_sljhGroup.draggable(true)

@ -174,7 +174,7 @@ export default {
y:0,
width:40,
height:40,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
//group.add(indexRect)
@ -184,7 +184,7 @@ export default {
y:0,
width:40,
height:40,
fill:'black',
fill:'white',
text:i,
align:'center',
verticalAlign:'middle',
@ -209,7 +209,7 @@ export default {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:gb+',12*2830*13090',
align:'center',
verticalAlign:'middle',
@ -222,7 +222,7 @@ export default {
y: 0,
width: imgSize,
height:40,
fill:'black',
fill:'white',
text:'G175K-4,上料:2024/07/01,切割:2024/07/04',
align:'center',
verticalAlign:'middle',
@ -320,7 +320,7 @@ export default {
y:0,
width:itemWith,
height:itemHeight,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
qyGroup.add(rect)
@ -391,7 +391,7 @@ export default {
y:0,
width: size,
height: size,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(rect)
@ -400,7 +400,7 @@ export default {
y:0,
width: size,
height: size,
fill:'black',
fill:'white',
text:qy.name+'\n'+dw.name,
align:'center',
verticalAlign:'middle',
@ -440,7 +440,7 @@ export default {
y:0,
width: size,
height: size,
stroke:'black',
stroke:'white',
strokeWidth:1,
})
group.add(rect)
@ -449,7 +449,7 @@ export default {
y:0,
width: size,
height: size,
fill:'black',
fill:'white',
text:qy.name,
align:'center',
verticalAlign:'middle',
@ -577,7 +577,7 @@ export default {
width:this.width-30,
height:20,
lineHeight:1,
stroke:'black',
stroke:'white',
strokeWidth:0.1,
text:this.msg,
align:'center',

@ -31,7 +31,7 @@ module.exports = {
lintOnSave: false,
productionSourceMap: false,
devServer: {
// host: '192.127.2.129',
host: '192.127.2.129',
port: port,
open: true,
overlay: {

Loading…
Cancel
Save