1.完善抛丸作业计划执行相关

src/api/zyjh.js

@@ -8,6 +8,22 @@ export const daoduo=function(data){
   })
 }
 
+export const zx=function(data){
+  return request({
+    url: '/zyjh/pgfk',
+    method: 'post',
+    data: data
+  })
+}
+
+export const getPgd=function(data){
+  return request({
+    url: '/zyjh/pgd',
+    method: 'post',
+    data: data
+  })
+}
+
 export const shangLiao=function(data){
   return request({
     url: '/zyjh/sl',

src/views/zyjhzx/pwanfkui/comps/person.js

@@ -53,7 +53,7 @@ export default function (width,height){
       y:0,
       width:width,
       height:height,
-      text: persons.name,
+      text: persons.userName,
       align: 'center',
       verticalAlign:'middle',
       fontSize:12

src/views/zyjhzx/pwanfkui/comps/pgdTable.js

@@ -9,9 +9,7 @@ export default function () {
     size:'mini',
     showOverflow: true,
     scrollY:{enable:true},
-    data:[
+    data:[]
-      {dcCh:'G175K-6',gdh:'20240812101',dcPl:'002',dcFd:'2302','tzbh':'1231232'}
-    ]
   }
   const gdhFormat=function ({cellValue}){
     if (cellValue){

src/views/zyjhzx/pwanfkui/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div id="pwpg" class="pwpg" ref="pwpg"></div>
-    <PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
+    <PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" />
   </div>
 </template>
 
@@ -14,6 +14,9 @@ import drawDw from './comps/dw'
 import drawPgd from './comps/pgd'
 import baifang from "./comps/baifang";
 import drawCsd from './comps/csd'
+import {getPgd, getYcldw} from "@/api/zyjh";
+import liliao from "@/views/zyjhzx/sliao/comps/liliao";
+import {getBzryList} from "@/api/sjzx/bzzGL";
 
 export default {
   name:'PWanFKui',
@@ -27,17 +30,9 @@ export default {
       layer:null,
       pgdGroup:null,
       drawGd:null,
-      dw:[
+      dw:[],
-        {name:'预处理垛位\n垛位1\n摆放预览',
+      pgd:[],
-          list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
+      currentWorker:null,
-        },
-        {name:'预处理垛位\n垛位2\n摆放预览',
-          list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
-        },
-        {name:'预处理垛位\n垛位2\n摆放预览',
-          list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
-        },
-      ]
     }
   },
   mounted() {
@@ -61,35 +56,34 @@ export default {
     },
     initDw(){
       const that=this
-      new Promise(resolve => {
+      getYcldw().then(res=>{
-        return resolve(this.dw)
-      }).then(res=>{
-        console.log(this)
         const {container,dw}=drawDw(this.width,this.height,that.initBaiFang)
         const group=container()
 
         this.layer.add(group)
 
-        for (let i=0;i<res.length;i++){
+        for (let i=0;i<res.data.length;i++){
-          const item=res[i]
+          const item=res.data[i]
           const dwGroup=dw(i,item)
           group.add(dwGroup)
         }
       })
     },
     initWorkers(){
-      new Promise(resolve => {
+      const that=this
-        return resolve([
+      getBzryList({resourcesCode:'4KB002'}).then(res=>{
-          {name:'张三1'},{name:'张三2'},
+        const {container,person}=workers(this.width,this.height)
-          {name:'张三1'},{name:'张三2'},
-        ])
-      }).then(res=>{
-        const {container,person}=workers(this.width,this.height,res)
         const group=container()
+        group.on('click touchstart',function (){
+          that.currentWorker=person
+          getPgd({field:'',jhrqField:'',user:that.currentWorker.userName}).then(res=>[
+            that.pgd=res.data
+          ])
+        })
         this.layer.add(group)
 
-        for (let i=0;i<res.length;i++){
+        for (let i=0;i<res.data.length;i++){
-          const item=res[i]
+          const item=res.data[i]
           const worker=person(i,item)
           group.add(worker)
         }

src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue

@@ -1,13 +1,23 @@
 <template>
-  <VxeGrid v-bind="gridOptions" @cell-click="cellClick" />
+  <VxeGrid ref="vxeGrid" v-bind="gridOptions" @cell-click="cellClick" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
 </template>
 
 <script>
+import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
+import {zx} from "@/api/zyjh";
+
 export default {
   name:'PwanPgd',
+  props:{
+    worker:{
+      type:Function,
+      default:function (){}
+    }
+  },
   data(){
     return{
+      type:'pwpg',
       gridOptions:{},
       list:{},
     }
@@ -18,6 +28,44 @@ export default {
     this.gridOptions.columns=columns
   },
   methods:{
+    checkboxAll({checked}){
+      const worker=this.$props.worker()
+      if (!worker){
+        this.$message.warning('请选择操作人')
+        return;
+      }
+      if (checked){
+        this.paigong(worker)
+      }
+    },
+    checkboxChange({checked,row}){
+      const worker=this.$props.worker()
+      if (!worker){
+        this.$message.warning('请选择操作人')
+        return;
+      }
+      if (checked){
+        this.paigong(worker)
+      }
+    },
+    paigong(worker){
+      const list=this.$refs.vxeGrid.getCheckboxRecords()
+      const tmpArr=[]
+      for (const item of list) {
+        const data={
+          id:item.id,
+          pwsgr:worker.userName,//抛丸施工人员姓名
+        }
+        tmpArr.push(data)
+      }
+      const data={
+        type:this.type,
+        list:tmpArr
+      }
+      VXETable.modal.confirm('您确定派工吗？').then(res=>{
+        res==='confirm'&&zx(data)
+      })
+    },
     cellClick({row}){
       this.$emit('initPgd',row)
     }

src/views/zyjhzx/pwanpgong/comps/person.js

@@ -1,17 +1,20 @@
 import Konva from "konva";
 
 export default function (width,height){
-  const x=0,y=0,_width=width*0.5,_height=120
+  const _width=width*0.5,_height=120
 
   const container=function (){
     const x=20,y=45
 
-    const group=new Konva.Group({
+    const layer=new Konva.Layer({
       x:x,
       y:y,
       width:_width,
       height:_height
     })
+    layer.clipFunc(function(ctx) {
+      ctx.rect(0, 0, _width, _height);
+    });
 
     const rect=new Konva.Rect({
       x:0,
@@ -22,9 +25,31 @@ export default function (width,height){
       strokeWidth:1,
     })
 
-    group.add(rect)
+    layer.add(rect)
 
-    return group
+    const group=new Konva.Group({
+      x:0,
+      y:0,
+      width:_width,
+      height:_height,
+      draggable: true,
+      dragBoundFunc:function (pos){
+        return {
+          x:pos.x,
+          y:y
+        }
+      },
+    })
+    layer.add(group)
+
+
+    return {layer,group}
+  }
+
+  let currentWork=null;
+
+  const getCurrentWorker=function (){
+    return currentWork
   }
 
   const person=function (index,persons={}){
@@ -38,6 +63,10 @@ export default function (width,height){
       height:height
     })
 
+    group.on('click touchstart',function (){
+      currentWork=persons
+    })
+
     const rect=new Konva.Rect({
       x:0,
       y:0,
@@ -53,7 +82,7 @@ export default function (width,height){
       y:0,
       width:width,
       height:height,
-      text: persons.name,
+      text: persons.userName,
       align: 'center',
       verticalAlign:'middle',
       fontSize:12
@@ -64,6 +93,6 @@ export default function (width,height){
   }
 
   return{
-    container,person
+    container,person,getCurrentWorker
   }
 }

src/views/zyjhzx/pwanpgong/comps/pgdTable.js

@@ -9,9 +9,7 @@ export default function () {
     size:'mini',
     showOverflow: true,
     scrollY:{enable:true},
-    data:[
+    data:[]
-      {dcCh:'G175K-6',gdh:'20240812101',dcPl:'001',dcFd:'2302','tzbh':'1231232'}
-    ]
   }
   const gdhFormat=function ({cellValue}){
     if (cellValue){

src/views/zyjhzx/pwanpgong/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div id="pwpg" class="pwpg" ref="pwpg"></div>
-    <PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
+    <PWanPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" />
   </div>
 </template>
 
@@ -12,6 +12,8 @@ import drawTitle from './comps/title'
 import workers from "./comps/person";
 import drawDw from './comps/dw'
 import drawPgd from './comps/pgd'
+import {getBzryList} from "@/api/sjzx/bzzGL";
+import {getYcldw} from "@/api/zyjh";
 
 export default {
   name:'PWanPGong',
@@ -25,6 +27,7 @@ export default {
       layer:null,
       pgdGroup:null,
       drawGd:null,
+      getCurrentWorker:null,
     }
   },
   mounted() {
@@ -32,41 +35,34 @@ export default {
   },
   methods:{
     initPgd(pgd={}){
-      console.log(pgd)
       const group=this.drawGd(pgd)
       this.pgdGroup.add(group)
     },
     initDw(){
-      new Promise(resolve => {
+      getYcldw().then(res=>{
-        return resolve([
+        const {container,dw}=drawDw(this.width,this.height)
-          {name:'垛位1\n预览信息'},{name:'垛位2\n预览信息'},
-          {name:'垛位3\n预览信息'},{name:'垛位4\n预览信息'},
-        ])
-      }).then(res=>{
-        const {container,dw}=drawDw(this.width,this.height,res)
         const group=container()
         this.layer.add(group)
 
-        for (let i=0;i<res.length;i++){
+        for (let i=0;i<res.data.length;i++){
-          const item=res[i]
+          const item=res.data[i]
           const dwGroup=dw(i,item)
           group.add(dwGroup)
         }
       })
     },
+    getWorker(){
+      return this.getCurrentWorker()
+    },
     initWorkers(){
-      new Promise(resolve => {
+      getBzryList({resourcesCode:'4KB002'}).then(res=>{
-        return resolve([
+        const {container,person,getCurrentWorker}=workers(this.width,this.height)
-          {name:'张三1'},{name:'张三2'},
+        this.getCurrentWorker=getCurrentWorker
-          {name:'张三1'},{name:'张三2'},
+        const {layer,group}=container()
-        ])
+        this.stage.add(layer)
-      }).then(res=>{
-        const {container,person}=workers(this.width,this.height,res)
-        const group=container()
-        this.layer.add(group)
 
-        for (let i=0;i<res.length;i++){
+        for (let i=0;i<res.data.length;i++){
-          const item=res[i]
+          const item=res.data[i]
           const worker=person(i,item)
           group.add(worker)
         }