From 053b8c477d32713430fbfda85d4983d3bd37daa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 27 Mar 2025 17:52:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=85=E5=A4=84=E7=90=86=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=202.=E5=88=92=E7=BA=BF=E6=8A=A5=E5=B7=A5,?=
 =?UTF-8?q?=E5=88=87=E5=89=B2=E6=8A=A5=E5=B7=A5,=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=A4=9A=E5=88=97?=
 =?UTF-8?q?,=E5=8F=96=E6=B6=88=E7=90=86=E6=96=99=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zyjhzx/bfang/comps/BFangTable.vue | 9 +++++----
 src/views/zyjhzx/bfang/comps/table.js       | 4 ++++
 src/views/zyjhzx/bfang/index.vue            | 2 +-
 src/views/zyjhzx/hxianfkui/comps/person.js  | 8 ++++----
 src/views/zyjhzx/hxianfkui/comps/sb.js      | 2 +-
 src/views/zyjhzx/hxianfkui/index.vue        | 4 ++--
 src/views/zyjhzx/qgefkui/comps/person.js    | 8 ++++----
 src/views/zyjhzx/qgefkui/index.vue          | 4 ++--
 8 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/zyjhzx/bfang/comps/BFangTable.vue b/src/views/zyjhzx/bfang/comps/BFangTable.vue
index 525ed63..855179d 100644
--- a/src/views/zyjhzx/bfang/comps/BFangTable.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangTable.vue
@@ -60,14 +60,15 @@ export default {
     },
     initData() {
       const params=this.dataInitParam;
-      if(!params.dcCh){
-        this.$message.warning('请选择船号')
-        return;
-      }
+      // if(!params.dcCh){
+      //   this.$message.warning('请选择船号')
+      //   return;
+      // }
       params.zyq=this.zyq
       wbfList(params).then((res) => {
         res.data.forEach(item => {
           item.selected = false
+          item.ljsl=item.ljList.length
           for (const dw of this.dwxx) {
             if (item.dwxxId === dw.id) {
               item.qy = dw.qy
diff --git a/src/views/zyjhzx/bfang/comps/table.js b/src/views/zyjhzx/bfang/comps/table.js
index 0cee3f7..3cec181 100644
--- a/src/views/zyjhzx/bfang/comps/table.js
+++ b/src/views/zyjhzx/bfang/comps/table.js
@@ -36,6 +36,10 @@ export default function () {
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
+    { field: 'ljsl', title: '零件数量', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
   ]
 
   return {options,columns}
diff --git a/src/views/zyjhzx/bfang/index.vue b/src/views/zyjhzx/bfang/index.vue
index 0a3f41c..a373e72 100644
--- a/src/views/zyjhzx/bfang/index.vue
+++ b/src/views/zyjhzx/bfang/index.vue
@@ -53,7 +53,7 @@ export default {
 
       }
       getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{
-        res.data=res.data.filter(item=>item.position==='数控'||item.position==='龙门'||item.position==='班长')
+        res.data=res.data.filter(item=>item.position==='配套工'||item.position==='班长')
         this.workers=res.data
         const that=this
         for (let i=0;i<res.data.length;i++){
diff --git a/src/views/zyjhzx/hxianfkui/comps/person.js b/src/views/zyjhzx/hxianfkui/comps/person.js
index 308c3aa..7078964 100644
--- a/src/views/zyjhzx/hxianfkui/comps/person.js
+++ b/src/views/zyjhzx/hxianfkui/comps/person.js
@@ -1,7 +1,7 @@
 import Konva from "konva";
 
 export default function (width,height){
-  const _width=width*0.075,_height=height*0.73
+  const _width=width*0.445,_height=height*0.73
 
   const container=function (){
     const x=20,y=260
@@ -56,11 +56,11 @@ export default function (width,height){
   }
 
   const person=function (index,persons={}){
-    const alignSize=1
-    const width=(_width-5)/alignSize,height=110
+    const alignSize=6
+    const width=(_width-14)/alignSize,height=110
     const x=index%alignSize*width+index%alignSize+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
     const group=new Konva.Group({
-      x:x,
+      x:x+4,
       y:y,
       width:width,
       height:height
diff --git a/src/views/zyjhzx/hxianfkui/comps/sb.js b/src/views/zyjhzx/hxianfkui/comps/sb.js
index 3db74f6..aa5fc1a 100644
--- a/src/views/zyjhzx/hxianfkui/comps/sb.js
+++ b/src/views/zyjhzx/hxianfkui/comps/sb.js
@@ -1,7 +1,7 @@
 import Konva from "konva";
 
 export default function (width,height,zyq){
-  const x=width*0.495,y=260,_width=width*0.186,_height=height*0.713
+  const x=width*0.455,y=260,_width=width*0.227,_height=height*0.713
   const bg=new Konva.Group({
     x:x,
     y:y,
diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue
index 5731c70..db6c486 100644
--- a/src/views/zyjhzx/hxianfkui/index.vue
+++ b/src/views/zyjhzx/hxianfkui/index.vue
@@ -201,7 +201,7 @@ export default {
 
       this.initWorkers(this.$refs.selRef.getData().bzType)
 
-      this.initDw()
+      // this.initDw()
 
       const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height)
       this.setWorkers=setWorkers
@@ -213,7 +213,7 @@ export default {
       this.getSelectSbbm=getSelectSbbm
       this.layer.add(bgGroup)
 
-      this.initBaiFang()
+      // this.initBaiFang()
     },
   }
 }
diff --git a/src/views/zyjhzx/qgefkui/comps/person.js b/src/views/zyjhzx/qgefkui/comps/person.js
index 308c3aa..7078964 100644
--- a/src/views/zyjhzx/qgefkui/comps/person.js
+++ b/src/views/zyjhzx/qgefkui/comps/person.js
@@ -1,7 +1,7 @@
 import Konva from "konva";
 
 export default function (width,height){
-  const _width=width*0.075,_height=height*0.73
+  const _width=width*0.445,_height=height*0.73
 
   const container=function (){
     const x=20,y=260
@@ -56,11 +56,11 @@ export default function (width,height){
   }
 
   const person=function (index,persons={}){
-    const alignSize=1
-    const width=(_width-5)/alignSize,height=110
+    const alignSize=6
+    const width=(_width-14)/alignSize,height=110
     const x=index%alignSize*width+index%alignSize+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
     const group=new Konva.Group({
-      x:x,
+      x:x+4,
       y:y,
       width:width,
       height:height
diff --git a/src/views/zyjhzx/qgefkui/index.vue b/src/views/zyjhzx/qgefkui/index.vue
index 108054b..aafa110 100644
--- a/src/views/zyjhzx/qgefkui/index.vue
+++ b/src/views/zyjhzx/qgefkui/index.vue
@@ -203,7 +203,7 @@ export default {
 
       this.initWorkers(this.$refs.selRef.getData().bzType)
 
-      this.initDw()
+      // this.initDw()
 
       const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height)
       this.setWorkers=setWorkers
@@ -215,7 +215,7 @@ export default {
       this.getSelectSbbm=getSelectSbbm
       this.layer.add(bgGroup)
 
-      this.initBaiFang()
+      // this.initBaiFang()
 
       this.pgdShow=true
     },