diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js index 7c10493..4cc16ba 100644 --- a/src/api/jhzxgl/pgd.js +++ b/src/api/jhzxgl/pgd.js @@ -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 saveTzjhPgdFk(data) {return request({url: '/pgdTzjh/saveTzjhPgdFk', 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})} diff --git a/src/main.js b/src/main.js index d27632a..bc26c42 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,6 @@ import './plugins/vxe-table' import 'xe-utils' import VXETable from 'vxe-table' - import 'vxe-table/lib/style.css' import cal from './utils/calculation' import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx' @@ -95,7 +94,7 @@ Object.keys(filters).forEach(key => { }) Vue.use(new VueSocketIO({ - debug: true, + debug: false, connection: process.env.VUE_APP_WEBSOCKET, // options: { autoConnect:false,path: "",transports: ['websocket', 'xhr-polling', 'jsonp-polling'], } //Optional options })) diff --git a/src/views/hbao/comps/HTabs.vue b/src/views/hbao/comps/HTabs.vue index cd98e16..a9c1ed3 100644 --- a/src/views/hbao/comps/HTabs.vue +++ b/src/views/hbao/comps/HTabs.vue @@ -35,7 +35,7 @@ export default { } - diff --git a/src/views/zyjhzx/components/tips.js b/src/views/zyjhzx/components/tips.js new file mode 100644 index 0000000..45dedc1 --- /dev/null +++ b/src/views/zyjhzx/components/tips.js @@ -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} diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index cc93413..c94cdbf 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -3,6 +3,7 @@
+ @@ -18,10 +19,11 @@ import {getPgd, getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanFKui', - components: {ZyjhSelectComp, HxianPgd}, + components: {TipsComp, ZyjhSelectComp, HxianPgd}, data(){ return { title:'划 线 作 业 报 工', diff --git a/src/views/zyjhzx/hxianpgong/index.vue b/src/views/zyjhzx/hxianpgong/index.vue index b59a703..7bab73c 100644 --- a/src/views/zyjhzx/hxianpgong/index.vue +++ b/src/views/zyjhzx/hxianpgong/index.vue @@ -3,6 +3,7 @@
+ @@ -16,10 +17,11 @@ import {getBzryList} from "@/api/sjzx/bzzGL"; import {getYcldw} from "@/api/zyjh"; import HxianPgd from "@/views/zyjhzx/hxianpgong/comps/HxianPgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'HxianPGong', - components: {ZyjhSelectComp, HxianPgd}, + components: {TipsComp, ZyjhSelectComp, HxianPgd}, data(){ return { title:'划 线 作 业 派 工', diff --git a/src/views/zyjhzx/ljian/baogong.vue b/src/views/zyjhzx/ljian/baogong.vue index df99541..1cda2f6 100644 --- a/src/views/zyjhzx/ljian/baogong.vue +++ b/src/views/zyjhzx/ljian/baogong.vue @@ -3,6 +3,7 @@
+ @@ -17,10 +18,11 @@ import LjianPgd from "@/views/zyjhzx/ljian/bgcomps/LjianPgd.vue"; import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue"; import {getQmPgd} from "@/api/jhzxgl/pgd"; import {startLoading} from "@/utils"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanFKui', - components: {SliaoSearch, LjianPgd, ZyjhSelectComp}, + components: {TipsComp, SliaoSearch, LjianPgd, ZyjhSelectComp}, data(){ return { title:'零 件 作 业 报 工', diff --git a/src/views/zyjhzx/ljian/index.vue b/src/views/zyjhzx/ljian/index.vue index 37bc55a..1d07132 100644 --- a/src/views/zyjhzx/ljian/index.vue +++ b/src/views/zyjhzx/ljian/index.vue @@ -4,6 +4,7 @@ + @@ -19,10 +20,11 @@ import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue"; import {getQmPgd} from "@/api/jhzxgl/pgd"; import initSearch from "@/views/zyjhzx/components/search"; import {endLoading, startLoading} from "@/utils"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanFKui', - components: {SliaoSearch, LjianPgd, ZyjhSelectComp}, + components: {TipsComp, SliaoSearch, LjianPgd, ZyjhSelectComp}, data(){ return { title:'零 件 作 业 派 工', diff --git a/src/views/zyjhzx/lliaofkui/index.vue b/src/views/zyjhzx/lliaofkui/index.vue index 0b13027..7aecce9 100644 --- a/src/views/zyjhzx/lliaofkui/index.vue +++ b/src/views/zyjhzx/lliaofkui/index.vue @@ -2,6 +2,7 @@
+
@@ -16,10 +17,11 @@ import {sljh} from "@/views/zyjhzx/lliaofkui/comps/sljh"; import {getPgd, getYcldw, shangLiao} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanFKui', - components: {ZyjhSelectComp}, + components: {TipsComp, ZyjhSelectComp}, data(){ return { title:'理 料 作 业 报 工', diff --git a/src/views/zyjhzx/lliaopgong/index.vue b/src/views/zyjhzx/lliaopgong/index.vue index bddc1fe..ab2c2f6 100644 --- a/src/views/zyjhzx/lliaopgong/index.vue +++ b/src/views/zyjhzx/lliaopgong/index.vue @@ -2,6 +2,7 @@
+
@@ -14,10 +15,11 @@ import drawPgd from './comps/pgd' import {getBzryList} from "@/api/sjzx/bzzGL"; import {getPgd, getYcldw} from "@/api/zyjh"; import LliaoPgd from "@/views/zyjhzx/lliaopgong/comps/LliaoPgd.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanPGong', - components: {LliaoPgd}, + components: {TipsComp, LliaoPgd}, data(){ return { title:'理 料 作 业 派 工', diff --git a/src/views/zyjhzx/pwanfkui/index.vue b/src/views/zyjhzx/pwanfkui/index.vue index 35f5a18..dc724da 100644 --- a/src/views/zyjhzx/pwanfkui/index.vue +++ b/src/views/zyjhzx/pwanfkui/index.vue @@ -3,6 +3,7 @@
+ @@ -18,10 +19,11 @@ import drawCsd from './comps/csd' import { getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanFKui', - components: {ZyjhSelectComp, PWanPgd}, + components: {TipsComp, ZyjhSelectComp, PWanPgd}, data(){ return { title:'抛 丸 作 业 报 工', @@ -104,7 +106,7 @@ export default { const that=this this.slGroup.children.forEach(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(); imageObj.src = require('@/assets/pwan/gbSelectBg.png'); imageObj.onload = function () { diff --git a/src/views/zyjhzx/pwanpgong/index.vue b/src/views/zyjhzx/pwanpgong/index.vue index 928d212..e0c3c17 100644 --- a/src/views/zyjhzx/pwanpgong/index.vue +++ b/src/views/zyjhzx/pwanpgong/index.vue @@ -3,6 +3,7 @@
+ @@ -16,10 +17,11 @@ import drawPgd from './comps/pgd' import {getBzryList} from "@/api/sjzx/bzzGL"; import {dict, getYcldw, shangLiao} from "@/api/zyjh"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanPGong', - components: {ZyjhSelectComp, PWanPgd}, + components: {TipsComp, ZyjhSelectComp, PWanPgd}, data(){ return { title:'抛 丸 作 业 派 工', diff --git a/src/views/zyjhzx/qgefkui/index.vue b/src/views/zyjhzx/qgefkui/index.vue index 5c85407..e06d59d 100644 --- a/src/views/zyjhzx/qgefkui/index.vue +++ b/src/views/zyjhzx/qgefkui/index.vue @@ -3,6 +3,7 @@
+ @@ -18,10 +19,11 @@ import {getPgd, getYcldw, shangLiao} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import QgePgd from "@/views/zyjhzx/qgefkui/comps/QgePgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name: 'QGeFKui', - components: {ZyjhSelectComp, QgePgd}, + components: {TipsComp, ZyjhSelectComp, QgePgd}, data() { return { title: '切 割 作 业 报 工', diff --git a/src/views/zyjhzx/qgepgong/index.vue b/src/views/zyjhzx/qgepgong/index.vue index 6b48e99..d80ad66 100644 --- a/src/views/zyjhzx/qgepgong/index.vue +++ b/src/views/zyjhzx/qgepgong/index.vue @@ -3,6 +3,7 @@
+ @@ -16,10 +17,11 @@ import {getBzryList} from "@/api/sjzx/bzzGL"; import {getYcldw} from "@/api/zyjh"; import QgePgd from "@/views/zyjhzx/qgepgong/comps/QgePgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; export default { name:'PWanPGong', - components: {ZyjhSelectComp, QgePgd}, + components: {TipsComp, ZyjhSelectComp, QgePgd}, data(){ return { title:'切 割 作 业 派 工', diff --git a/vue.config.js b/vue.config.js index 8d5f6e9..09103fe 100644 --- a/vue.config.js +++ b/vue.config.js @@ -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: {