1.更新一些内容

2.增加语音操作提醒信息
3.增加页面跳转时携带deviceId
master
董哲奇 7 months ago
parent 48a6419155
commit 3b994f75d6

@ -8,6 +8,7 @@ export function saveTzjhPgdXd(data) {return request({url: '/pgdTzjh/saveTzjhPgdX
export function saveTzjhPgdXdBack(data) {return request({url: '/pgdTzjh/saveTzjhPgdXdBack', method: 'post', data})} export function saveTzjhPgdXdBack(data) {return request({url: '/pgdTzjh/saveTzjhPgdXdBack', method: 'post', data})}
export function saveTzjhPgdFk(data) {return request({url: '/pgdTzjh/saveTzjhPgdFk', method: 'post', data})} export function saveTzjhPgdFk(data) {return request({url: '/pgdTzjh/saveTzjhPgdFk', method: 'post', data})}
export function getPgdBase(data) {return request({url: '/pgdTzjh/getPgdBase', method: 'post', data})} export function getPgdBase(data) {return request({url: '/pgdTzjh/getPgdBase', method: 'post', data})}
export function getPgdBase1(data) {return request({url: '/pgdTzjh/getPgdBase1', method: 'post', data})}
export function checkTzReq(data) {return request({url: '/pgdTzjh/checkTz', method: 'post', data})} export function checkTzReq(data) {return request({url: '/pgdTzjh/checkTz', method: 'post', data})}

@ -23,7 +23,6 @@ import './plugins/vxe-table'
import 'xe-utils' import 'xe-utils'
import VXETable from 'vxe-table' import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css' import 'vxe-table/lib/style.css'
import cal from './utils/calculation' import cal from './utils/calculation'
import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx' import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
@ -95,7 +94,7 @@ Object.keys(filters).forEach(key => {
}) })
Vue.use(new VueSocketIO({ Vue.use(new VueSocketIO({
debug: true, debug: false,
connection: process.env.VUE_APP_WEBSOCKET, // connection: process.env.VUE_APP_WEBSOCKET, //
options: { autoConnect:false,path: "",transports: ['websocket', 'xhr-polling', 'jsonp-polling'], } //Optional options options: { autoConnect:false,path: "",transports: ['websocket', 'xhr-polling', 'jsonp-polling'], } //Optional options
})) }))

@ -35,7 +35,7 @@ export default {
} }
</script> </script>
<style> <style scoped>
.el-tabs__item { .el-tabs__item {
color: white; color: white;
font-family: 'Arial', sans-serif; /* 设置字体为Arial */ font-family: 'Arial', sans-serif; /* 设置字体为Arial */

@ -66,7 +66,7 @@
<el-row> <el-row>
<el-col > <el-col >
<el-form-item style="float: right" > <el-form-item style="float: right" >
<span style="font-size: 12px;color: red; float: right;"> * 表中数据红色为需求期提前蓝色为拖期</span> <!-- <span style="font-size: 12px;color: red; float: right;"> * 表中数据红色为需求期提前蓝色为拖期</span>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

@ -26,7 +26,7 @@
</el-date-picker> </el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="状态:" style="width: 350px"> <!-- <el-form-item label="状态:" style="width: 350px">
<el-select v-model="request.Zt" placeholder="状态" clearable> <el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option <el-option
v-for="item in statusOptions" v-for="item in statusOptions"
@ -36,7 +36,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</div> </div>
<div style="width: 100%; text-align: right"> <div style="width: 100%; text-align: right">
<el-button type="primary" @click="initList()"></el-button> <el-button type="primary" @click="initList()"></el-button>
@ -176,27 +176,27 @@ export default {
], ],
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ // {
field: "zt", // field: "zt",
title: "状态", // title: "",
align: "center", // align: "center",
slots: { default: "Zt_default" }, // slots: { default: "Zt_default" },
filters: [ // filters: [
{ // {
data: { // data: {
checks: [], // checks: [],
sVal: "", // sVal: "",
sMenu: "", // sMenu: "",
fType1: "", // fType1: "",
fVal1: "", // fVal1: "",
fMode: "and", // fMode: "and",
fType2: "", // fType2: "",
fVal2: "", // fVal2: "",
}, // },
}, // },
], // ],
filterRender: { name: "FilterCombination" }, // filterRender: { name: "FilterCombination" },
}, // },
{ {
field: "bz", field: "bz",
title: "备注", title: "备注",

@ -26,7 +26,7 @@
</el-date-picker> </el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="状态:" style="width: 350px"> <!-- <el-form-item label="状态:" style="width: 350px">
<el-select v-model="request.Zt" placeholder="状态" clearable> <el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option <el-option
v-for="item in statusOptions" v-for="item in statusOptions"
@ -36,12 +36,12 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
</div> </div>
<div style="width: 100%; text-align: right"> <div style="width: 100%; text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('submit')" <!-- <el-button type="success" @click="toolbarButtonClickEvent('submit')"
>审核</el-button >审核</el-button
> >-->
<el-button type="primary" @click="initList()"></el-button> <el-button type="primary" @click="initList()"></el-button>
</div> </div>
</div> </div>
@ -127,11 +127,31 @@ export default {
align: "center", align: "center",
fixed: "left", fixed: "left",
}, },
// {
// field: "zt",
// title: "",
// align: "center",
// slots: { default: "Zt_default" },
// filters: [
// {
// data: {
// checks: [],
// sVal: "",
// sMenu: "",
// fType1: "",
// fVal1: "",
// fMode: "and",
// fType2: "",
// fVal2: "",
// },
// },
// ],
// filterRender: { name: "FilterCombination" },
// },
{ {
field: "zt", field: "dcCh",
title: "状态", title: "船号",
align: "center", align: "center",
slots: { default: "Zt_default" },
filters: [ filters: [
{ {
data: { data: {
@ -149,8 +169,8 @@ export default {
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ {
field: "dcCh", field: "dcPl",
title: "船号", title: "批量",
align: "center", align: "center",
filters: [ filters: [
{ {
@ -169,8 +189,8 @@ export default {
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ {
field: "dcPl", field: "dcFd",
title: "批量", title: "分段",
align: "center", align: "center",
filters: [ filters: [
{ {
@ -189,8 +209,8 @@ export default {
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ {
field: "dcFd", field: "jhrq",
title: "分段", title: "计划期",
align: "center", align: "center",
filters: [ filters: [
{ {
@ -209,8 +229,8 @@ export default {
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ {
field: "jhrq", field: "bz",
title: "计划期", title: "备注",
align: "center", align: "center",
filters: [ filters: [
{ {
@ -229,8 +249,28 @@ export default {
filterRender: { name: "FilterCombination" }, filterRender: { name: "FilterCombination" },
}, },
{ {
field: "bz", field: "bzy",
title: "备注", title: "编制人",
align: "center",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "bzrq",
title: "编制日期",
align: "center", align: "center",
filters: [ filters: [
{ {

@ -315,15 +315,15 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wpfl', title: '物品分类', width: 60, // { field: 'wpfl', title: '', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, // filterRender: { name: 'FilterCombination', },
}, // },
//
{ field: 'jldw', title: '计量单位', width: 60, // { field: 'jldw', title: '', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, // filterRender: { name: 'FilterCombination', },
}, // },
{ field: 'sl', title: '数量', width: 70, { field: 'sl', title: '数量', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],

@ -150,6 +150,10 @@ export default {
tableColumn:[ tableColumn:[
{ type: 'checkbox', width: 50 }, { type: 'checkbox', width: 50 },
{ type: 'seq', width: 60, title: '序号' }, { type: 'seq', width: 60, title: '序号' },
{ field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcCh', title: '船只', minWidth: "70", { field: 'dcCh', title: '船只', minWidth: "70",
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -222,10 +226,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'drcs', title: '导入次数', minWidth: "100", { field: 'drcs', title: '导入次数', minWidth: "100",
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },

@ -284,11 +284,11 @@ export default {
window.addEventListener('resize', this.getHeight) window.addEventListener('resize', this.getHeight)
this.getHeight() this.getHeight()
this.initBase() this.initBase()
this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 1, 'first'),'yyyy/MM/dd') this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 0, 'first'),'yyyy/MM/dd')
}, },
watch: { watch: {
'queryParam.beginTime'(newValue, Value){ 'queryParam.beginTime'(newValue, Value){
this.queryParam.endTime= XEUtils.toDateString(XEUtils.getWhatMonth(newValue, 3),'yyyy/MM/dd') this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(newValue, 0, 'last'),'yyyy/MM/dd')
}, },
'$route'(){ '$route'(){
this.getParams(); this.getParams();

@ -284,11 +284,10 @@ export default {
window.addEventListener('resize', this.getHeight) window.addEventListener('resize', this.getHeight)
this.getHeight() this.getHeight()
this.initBase() this.initBase()
this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 1, 'first'),'yyyy/MM/dd')
}, },
watch: { watch: {
'queryParam.beginTime'(newValue, Value){ 'queryParam.beginTime'(newValue, Value){
this.queryParam.endTime= XEUtils.toDateString(XEUtils.getWhatMonth(newValue, 3),'yyyy/MM/dd') this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(newValue, 0, 'last'),'yyyy/MM/dd')
}, },
'$route'(){ '$route'(){
this.getParams(); this.getParams();
@ -423,6 +422,7 @@ export default {
getCzxx({}).then(res=>{ getCzxx({}).then(res=>{
this.dictData = res.data this.dictData = res.data
}) })
this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 0, 'first'),'yyyy/MM/dd')
}, },
initList() { initList() {
if (this.queryParam.beginTime === ''|| if (this.queryParam.beginTime === ''||

@ -17,7 +17,7 @@
<el-button type="success" @click="initList"></el-button> <el-button type="success" @click="initList"></el-button>
<!-- <el-button type="success" @click="initList1">1</el-button>--> <!-- <el-button type="success" @click="initList1">1</el-button>-->
<el-button type="success" @click="save"></el-button> <el-button type="success" @click="save"></el-button>
<el-button type="success" @click="tqSygd"></el-button> <!-- <el-button type="success" @click="tqSygd"></el-button>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

@ -209,7 +209,7 @@ export default {
label: "已打印", label: "已打印",
}, },
{ {
value: "42", value: "32",
label: "未派工", label: "未派工",
}, },
{ {
@ -508,9 +508,9 @@ export default {
}, },
slpgclick(){ slpgclick(){
if(this.queryParam.zt!=="42"){ // if(this.queryParam.zt!=="42"){
return // return
} // }
let obj=this.$refs.xGrid.getCheckboxRecords() let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){ if(obj.length===0){

@ -185,7 +185,7 @@ import {
savePwPgdXd, savePwPgdXd,
savePwPgdXdBack, savePwPgdXdBack,
savePwjhPg, savePwjhPg,
savePwjhPgBack savePwjhPgBack, getPgdBase1
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
@ -232,7 +232,7 @@ export default {
sljs:'', sljs:'',
dw:'', dw:'',
scry:'', scry:'',
scdw:'' scdw:'一区'
}, },
list: [], list: [],
heads: { token: getToken() }, heads: { token: getToken() },
@ -483,11 +483,12 @@ export default {
}, },
initBase(){ initBase(){
getPgdBase({}).then(res=>{ getPgdBase1({}).then(res=>{
console.log(res.data) console.log(res.data)
this.zyqs=res.data.zyqs this.zyqs=res.data.zyqs
this.zyrys=res.data.zyrys this.zyrys=res.data.zyrys
this.dictData = res.data this.dictData = res.data
this.dictData.resourcesCodes=[{zyq:'一区'}]
this.projectData=res.data.cbbm this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm this.projectData1=res.data.cbbm
}) })
@ -526,7 +527,7 @@ export default {
}, },
slpgclick(){ slpgclick(){
if(this.queryParam.zt!=="21"){ if(this.queryParam.zt!=="11"){
return return
} }

@ -1,4 +1,4 @@
<template> w<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">--> <!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container> <el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px"> <el-header style="width: 100%; height: 80px;font-size: 12px">
@ -340,17 +340,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wpfl', title: '物品分类', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jldw', title: '计量单位', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '数量', width: 70, { field: 'sl', title: '数量', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -359,9 +348,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qq', title: '区域', width: 90,editRender: { name: 'input' }, { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },

@ -314,17 +314,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wpfl', title: '物品分类', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jldw', title: '计量单位', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '数量', width: 70, { field: 'sl', title: '数量', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -334,8 +323,6 @@ export default {
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'qq', title: '区域', width: 90,editRender: { name: 'input' }, { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },

@ -332,17 +332,6 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wpfl', title: '物品分类', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jldw', title: '计量单位', width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '数量', width: 70, { field: 'sl', title: '数量', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },

@ -20,6 +20,7 @@ export default {
data(){ data(){
return { return {
ljbs:false, ljbs:false,
deviceId:null,
zyTypeWidth:'20%', zyTypeWidth:'20%',
data:{ data:{
zyType:'0', zyType:'0',
@ -41,6 +42,7 @@ export default {
} }
}, },
created(){ created(){
this.deviceId=this.$route.query.deviceId||''
this.data.zyType=this.$route.query.zyType||'0' this.data.zyType=this.$route.query.zyType||'0'
const path=this.$route.path.replace('/','') const path=this.$route.path.replace('/','')
this.nextPath=this.nextPathName[path].path this.nextPath=this.nextPathName[path].path
@ -56,7 +58,7 @@ export default {
methods:{ methods:{
changePage(){ changePage(){
this.$emit('clear') this.$emit('clear')
this.$router.push(`${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) this.$router.push(`${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}&deviceId=${this.deviceId}`)
}, },
init(){ init(){
this.$emit('initWorkers',this.data.bzType) this.$emit('initWorkers',this.data.bzType)

@ -2,7 +2,7 @@
<div id="searchPl" ref="searchPl"> <div id="searchPl" ref="searchPl">
<ProjectSelect ref="projectSelectRef" clearable :_style="{width:'115px'}"/> <ProjectSelect ref="projectSelectRef" clearable :_style="{width:'115px'}"/>
<VxeInput v-model="queryParam.dcPl" clearable placeholder="请输入批量"/> <VxeInput v-model="queryParam.dcPl" clearable placeholder="请输入批量"/>
<VxeInput v-if="ljbs" v-model="queryParam.kw" clearable placeholder="请输入跨位"/> <VxeInput v-model="queryParam.kw" clearable placeholder="请输入跨位"/>
<VxeInput v-if="ljbs" v-model="queryParam.fd" clearable placeholder="请输入分段"/> <VxeInput v-if="ljbs" v-model="queryParam.fd" clearable placeholder="请输入分段"/>
<VxeButton status="primary" content="查询" @click="search" /> <VxeButton status="primary" content="查询" @click="search" />
<VxeSelect v-if="ljbs" v-model="gylxSelectData" ref="gylxSelectRef" clearable :options="gylx" placeholder="选择工艺路线"/> <VxeSelect v-if="ljbs" v-model="gylxSelectData" ref="gylxSelectRef" clearable :options="gylx" placeholder="选择工艺路线"/>
@ -15,7 +15,6 @@
</template> </template>
<script> <script>
import ProjectSelect from "@/components/ProjectSelect/index.vue"; import ProjectSelect from "@/components/ProjectSelect/index.vue";
import {startLoading} from "@/utils";
export default { export default {
name:'SliaoSearch', name:'SliaoSearch',

@ -1,31 +1,103 @@
<template> <template>
<div v-if="showStatus" id="tips" class="tips" ref="tips"></div> <div v-show="showStatus" id="tips" class="tips" ref="tips"></div>
</template> </template>
<script> <script>
import * as Tips from './tips'
export default { export default {
name: "TipsComp", name: "TipsComp",
props:{
msg:{
type:Object,
default:{}
}
},
data(){ data(){
return { return {
showStatus:false, showStatus:false,
width:0,
height:0,
stage:null,
layer:null,
deviceId:null,
commandEnum:{
大船大船:'大船大船',
开始派工:'开始派工',
开始报工:'开始报工',
确认完毕:'确认完毕',
执行成功:'执行成功',
}
}
},
mounted(){
this.initKonvaStage()
},
created(){
this.deviceId=this.$route.query.deviceId||''
console.log(this.deviceId)
},
sockets:{
tip(data){
if (data.code===3001&&data.msg.deviceId===this.$props.deviceId){
this.onMsg(`语音设备已暂停,请再次说出"${this.commandEnum.大船大船}"激活语音设备`,true)
setTimeout(()=>{
this.hide()
},10000)
}
if (data.code===3002&&data.msg.deviceId===this.$props.deviceId){
this.show()
let msg
switch (data.msg.actionType){
case this.commandEnum.大船大船:
msg='设备已激活,请说出"开始派工"/"开始报工"'
break;
case this.commandEnum.开始派工:
msg=`${data.msg.actionType},请说出派工单号后"确认完毕"`
break;
case this.commandEnum.开始报工:
msg=`${data.msg.actionType},请说出派工单号后"确认完毕"`
break;
case this.commandEnum.确认完毕:
msg='正中处理中,请稍后...'
break;
default:
msg=data.msg.actionType
}
this.onMsg(msg)
}
},
complete(){
if (data.code===3000&&data.msg.deviceId===this.$props.deviceId){
this.onMsg("设备激活中,您需要派工/报工?")
}
} }
}, },
methods:{ methods:{
getShowStatus(){ onMsg(msg){
return this.showStatus const {onMsg}=Tips.default
onMsg(msg)
},
initKonvaStage(){
this.width=this.$refs.tips.clientWidth
this.height=this.$refs.tips.clientHeight
const {container}=Tips.default
const {stage,layer}=container(this.width,this.height,'tips')
this.stage=stage
this.layer=layer
}, },
hide(){ hide(){
this.showStatus = false; this.showStatus = false;
}, },
show(){ show(){
this.hide()
this.showStatus = true this.showStatus = true
}, },
} }
} }
</script> </script>
<style scoped>
#tips{
overflow: hidden;
aspect-ratio: 16/9;
width: 100%;
height: 4.5vh;
position: fixed;
top:5px;
}
</style>

@ -0,0 +1,79 @@
import Konva from "konva";
let $layer=null
let $width=null
let $height=null
let $group=null
const container=function (width=0,height=0,container){
$width=width
$height=height
const stage = new Konva.Stage({
container: container,
width: width,
height: height,
});
const layer = new Konva.Layer();
stage.add(layer)
layer.draw();
$layer=layer
const imageObj = new Image();
imageObj.src = require('@/assets/pwan/gbSelectBg.png');
imageObj.onload = function () {
const shape = new Konva.Image({
x: 0,
y: 0,
width: width,
height:height,
image: imageObj,
});
layer.add(shape)
}
return {
stage,layer
}
}
const onMsg=function (msg,replay=false){
if ($group){
$group.remove()
}
const group=new Konva.Group({
x:$width-50,
y:0,
width:$width*0.35,
height:$height,
})
$layer.add(group)
$group=group
const text=new Konva.Text({
x:0,
y:0,
width:$width*0.35,
height:$height,
fill:'yellow',
verticalAlign:'middle',
fontSize:24,
text:msg
})
group.add(text)
const play=function (){
group.to({
x: -$width*0.3,
y: 0,
duration: 10, //持续时间
onFinish() {
group.remove()
replay&&play()
}
})
}
play()
}
export default {container,onMsg}

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<HxianPgd id="hxpgd" ref="hxpgd" @initPgd="initPgd" :pgd="pgd" :workers="workers" @pgdClick="pgdClick"/> <HxianPgd id="hxpgd" ref="hxpgd" @initPgd="initPgd" :pgd="pgd" :workers="workers" @pgdClick="pgdClick"/>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -18,10 +19,11 @@ import {getPgd, getYcldw} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue"; import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanFKui', name:'PWanFKui',
components: {ZyjhSelectComp, HxianPgd}, components: {TipsComp, ZyjhSelectComp, HxianPgd},
data(){ data(){
return { return {
title:'划 线 作 业 报 工', title:'划 线 作 业 报 工',

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" /> <HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" />
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -16,10 +17,11 @@ import {getBzryList} from "@/api/sjzx/bzzGL";
import {getYcldw} from "@/api/zyjh"; import {getYcldw} from "@/api/zyjh";
import HxianPgd from "@/views/zyjhzx/hxianpgong/comps/HxianPgd.vue"; import HxianPgd from "@/views/zyjhzx/hxianpgong/comps/HxianPgd.vue";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'HxianPGong', name:'HxianPGong',
components: {ZyjhSelectComp, HxianPgd}, components: {TipsComp, ZyjhSelectComp, HxianPgd},
data(){ data(){
return { return {
title:'划 线 作 业 派 工', title:'划 线 作 业 派 工',

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<LjianPgd v-if="show" id="ljianbgd" ref="hxpgd" @initPgd="initPgd" @search="search" :worker="currentWorker" :workers="workers" /> <LjianPgd v-if="show" id="ljianbgd" ref="hxpgd" @initPgd="initPgd" @search="search" :worker="currentWorker" :workers="workers" />
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -17,10 +18,11 @@ import LjianPgd from "@/views/zyjhzx/ljian/bgcomps/LjianPgd.vue";
import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue"; import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
import {getQmPgd} from "@/api/jhzxgl/pgd"; import {getQmPgd} from "@/api/jhzxgl/pgd";
import {startLoading} from "@/utils"; import {startLoading} from "@/utils";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanFKui', name:'PWanFKui',
components: {SliaoSearch, LjianPgd, ZyjhSelectComp}, components: {TipsComp, SliaoSearch, LjianPgd, ZyjhSelectComp},
data(){ data(){
return { return {
title:'零 件 作 业 报 工', title:'零 件 作 业 报 工',

@ -4,6 +4,7 @@
<SliaoSearch v-if="show" ref="sliaoSearch" @search="search" @paigong="paigong" @plGylx="plGylx" :workers="workers" /> <SliaoSearch v-if="show" ref="sliaoSearch" @search="search" @paigong="paigong" @plGylx="plGylx" :workers="workers" />
<LjianPgd v-if="show" id="ljianpgd" ref="hxpgd" @initPgd="initPgd" @search="search" :worker="currentWorker" :workers="workers" /> <LjianPgd v-if="show" id="ljianpgd" ref="hxpgd" @initPgd="initPgd" @search="search" :worker="currentWorker" :workers="workers" />
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -19,10 +20,11 @@ import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
import {getQmPgd} from "@/api/jhzxgl/pgd"; import {getQmPgd} from "@/api/jhzxgl/pgd";
import initSearch from "@/views/zyjhzx/components/search"; import initSearch from "@/views/zyjhzx/components/search";
import {endLoading, startLoading} from "@/utils"; import {endLoading, startLoading} from "@/utils";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanFKui', name:'PWanFKui',
components: {SliaoSearch, LjianPgd, ZyjhSelectComp}, components: {TipsComp, SliaoSearch, LjianPgd, ZyjhSelectComp},
data(){ data(){
return { return {
title:'零 件 作 业 派 工', title:'零 件 作 业 派 工',

@ -2,6 +2,7 @@
<div class="container"> <div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -16,10 +17,11 @@ import {sljh} from "@/views/zyjhzx/lliaofkui/comps/sljh";
import {getPgd, getYcldw, shangLiao} from "@/api/zyjh"; import {getPgd, getYcldw, shangLiao} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanFKui', name:'PWanFKui',
components: {ZyjhSelectComp}, components: {TipsComp, ZyjhSelectComp},
data(){ data(){
return { return {
title:'理 料 作 业 报 工', title:'理 料 作 业 报 工',

@ -2,6 +2,7 @@
<div class="container"> <div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<LliaoPgd id="pwpgd" ref="llpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" /> <LliaoPgd id="pwpgd" ref="llpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" />
<TipsComp />
</div> </div>
</template> </template>
@ -14,10 +15,11 @@ import drawPgd from './comps/pgd'
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import {getPgd, getYcldw} from "@/api/zyjh"; import {getPgd, getYcldw} from "@/api/zyjh";
import LliaoPgd from "@/views/zyjhzx/lliaopgong/comps/LliaoPgd.vue"; import LliaoPgd from "@/views/zyjhzx/lliaopgong/comps/LliaoPgd.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanPGong', name:'PWanPGong',
components: {LliaoPgd}, components: {TipsComp, LliaoPgd},
data(){ data(){
return { return {
title:'理 料 作 业 派 工', title:'理 料 作 业 派 工',

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<PWanPgd id="pwbgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" :workers="workers" @pgdClick="pgdClick"/> <PWanPgd id="pwbgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" :workers="workers" @pgdClick="pgdClick"/>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -18,10 +19,11 @@ import drawCsd from './comps/csd'
import { getYcldw} from "@/api/zyjh"; import { getYcldw} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanFKui', name:'PWanFKui',
components: {ZyjhSelectComp, PWanPgd}, components: {TipsComp, ZyjhSelectComp, PWanPgd},
data(){ data(){
return { return {
title:'抛 丸 作 业 报 工', title:'抛 丸 作 业 报 工',
@ -104,7 +106,7 @@ export default {
const that=this const that=this
this.slGroup.children.forEach(item=>{ this.slGroup.children.forEach(item=>{
const data=item.getAttr('item') const data=item.getAttr('item')
if (data.czbh===option.dcCh){ if (data.czbh===option.dcCh&&data.pl===option.dcPl&&data.fd===option.dcFd&&data.tlth===option.tzbh){
const imageObj = new Image(); const imageObj = new Image();
imageObj.src = require('@/assets/pwan/gbSelectBg.png'); imageObj.src = require('@/assets/pwan/gbSelectBg.png');
imageObj.onload = function () { imageObj.onload = function () {

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <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" :worker="getWorker" :workers="workers"/>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers"/>
<TipsComp />
</div> </div>
</template> </template>
@ -16,10 +17,11 @@ import drawPgd from './comps/pgd'
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import {dict, getYcldw, shangLiao} from "@/api/zyjh"; import {dict, getYcldw, shangLiao} from "@/api/zyjh";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanPGong', name:'PWanPGong',
components: {ZyjhSelectComp, PWanPgd}, components: {TipsComp, ZyjhSelectComp, PWanPgd},
data(){ data(){
return { return {
title:'抛 丸 作 业 派 工', title:'抛 丸 作 业 派 工',

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<QgePgd id="qgfkpgd" v-if="pgdShow" ref="hxpgd" @initPgd="initPgd" :pgd="pgd" :worker="getWorker" :workers="workers" @pgdClick="pgdClick"/> <QgePgd id="qgfkpgd" v-if="pgdShow" ref="hxpgd" @initPgd="initPgd" :pgd="pgd" :worker="getWorker" :workers="workers" @pgdClick="pgdClick"/>
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers" @clear="clear"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers" @clear="clear"/>
<TipsComp />
</div> </div>
</template> </template>
@ -18,10 +19,11 @@ import {getPgd, getYcldw, shangLiao} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL"; import {getBzryList} from "@/api/sjzx/bzzGL";
import QgePgd from "@/views/zyjhzx/qgefkui/comps/QgePgd.vue"; import QgePgd from "@/views/zyjhzx/qgefkui/comps/QgePgd.vue";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name: 'QGeFKui', name: 'QGeFKui',
components: {ZyjhSelectComp, QgePgd}, components: {TipsComp, ZyjhSelectComp, QgePgd},
data() { data() {
return { return {
title: '切 割 作 业 报 工', title: '切 割 作 业 报 工',

@ -3,6 +3,7 @@
<div id="pwpg" class="pwpg" ref="pwpg"></div> <div id="pwpg" class="pwpg" ref="pwpg"></div>
<QgePgd id="qgpgd" v-if="pgdShow" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" /> <QgePgd id="qgpgd" v-if="pgdShow" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" :workers="workers" />
<ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers" @clear="clear"/> <ZyjhSelectComp id="selectComp" ref="selRef" @initWorkers="initWorkers" @clear="clear"/>
<TipsComp />
</div> </div>
</template> </template>
@ -16,10 +17,11 @@ import {getBzryList} from "@/api/sjzx/bzzGL";
import {getYcldw} from "@/api/zyjh"; import {getYcldw} from "@/api/zyjh";
import QgePgd from "@/views/zyjhzx/qgepgong/comps/QgePgd.vue"; import QgePgd from "@/views/zyjhzx/qgepgong/comps/QgePgd.vue";
import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
export default { export default {
name:'PWanPGong', name:'PWanPGong',
components: {ZyjhSelectComp, QgePgd}, components: {TipsComp, ZyjhSelectComp, QgePgd},
data(){ data(){
return { return {
title:'切 割 作 业 派 工', title:'切 割 作 业 派 工',

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

Loading…
Cancel
Save