Skip to content

K
kwell-mes
Commit a2a7b819 authored by yff's avatar yff
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents 20353c2f 00175e04
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 38 deletions
gavel/src/main/resources/templates/views/kmes/dashboard/first.html
View file @ a2a7b819
......@@ -60,7 +60,7 @@
<div class="center-left fl">
<div class="left-top rightTop border">
<div class="title">工艺流程图</div>
<div class="chat">
<div class="chat" style="margin-top: 20px;height: 2.5rem;">
<canvas id="gylct" style="width: 100%;height: 100%"></canvas>
</div>
</div>
......@@ -70,8 +70,8 @@
<div class="allnav banner">
<div class="list clearfix">
<div class="listTxt">
<p><label for="">应到人数：</label><span id="ydrs">0</span></p>
<p><label for="">实际人数：</label><span id="sjrs">0</span></p>
<p><label for="">应到人数：</label><span id="ydrs">20</span></p>
<p><label for="">实际人数：</label><span id="sjrs">20</span></p>
<p><label for="">休假人数：</label><span id="xjrs">0</span> </p>
<p><label for="">总生产量：</label><span id="zscl">0</span></p>
</div>
......@@ -367,12 +367,12 @@
});
// var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"));
var chartHgl=echarts.init(document.getElementById("chartHgl"));
var chartRjh=echarts.init(document.getElementById("chartRjh"));
var chartYjh=echarts.init(document.getElementById("chartYjh"));
var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"));
var chartTzzp=echarts.init(document.getElementById("chartzzp"));
var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"),null, {renderer: 'svg'});
var chartHgl=echarts.init(document.getElementById("chartHgl"),null, {renderer: 'svg'});
var chartRjh=echarts.init(document.getElementById("chartRjh"),null, {renderer: 'svg'});
var chartYjh=echarts.init(document.getElementById("chartYjh"),null, {renderer: 'svg'});
var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"),null, {renderer: 'svg'});
var chartTzzp=echarts.init(document.getElementById("chartzzp"),null, {renderer: 'svg'});
setproduceEchart(chartTzzp)/* 在制品状态 */
// oaechart(myChartSdcl); /*oa*/
setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/
......
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ a2a7b819
......@@ -42,6 +42,9 @@
})
/* 通用代码 */
const pdfUr="kmes/gpfk/queryPdfByWoidAndZpgx"
var urlo="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/O"
var urlt="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/T"
var urlm="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/M"
/* 初始化工序 */
function jyfk_getgx(e){
let that=e
......@@ -179,16 +182,16 @@
function jyfk_pdfshow(e,woid){
let that=e
let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
that.pdf=""
if (newpdfurl!=that.pdfurl){
that.pdfurl=newpdfurl
if(that.sivpdf){
clearInterval(that.sivpdf)
}
pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
that.sivpdf = e
})
}
// that.pdf=""
// if (newpdfurl!=that.pdfurl){
// that.pdfurl=newpdfurl
// if(that.sivpdf){
// clearInterval(that.sivpdf)
// }
// pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
// that.sivpdf = e
// })
// }
}
</script>
......@@ -204,7 +207,7 @@
</ul>
</div>
<!-- 左侧信息条 -->
<div class="left">
<div class="left" style="width: 30%;">
<!-- 左上信息表 -->
<div class="cbinfor">
<div class="cpif">
......@@ -261,9 +264,20 @@
</div>
</div>
<!-- 右侧信息pdf -->
<div class="right">
<div class="right" style="width: 45%;">
<canvas id="gpjypdf" class="rightPdf"></canvas>
</div>
<!-- new右侧 -->
<div class="right" style="width: 25%;">
<div style="height: 50%;overflow: hidden;">
<video width="100%" height="100%" :src="urlm" controls muted autoplay="autoplay" loop="loop">
</video>
</div>
<div ref="scrollmain" style="height: 50%;overflow: auto;border-bottom: 1px solid #EEEEEE;">
<canvas id="gpjyrpdf" ref="scroll" style="width: 100%;height: 160%;" ></canvas>
</div>
</div>
</div>
<!-- 界面5 -->
<div id="kwrkb05" style="display: none;">
......@@ -430,6 +444,7 @@
dbenlarge('kwrkb04',1,this.isFocus())
// this.sivpdf=
this.initpage()
this.scroll()
this.gettime()
this.appdestory()
},
......@@ -437,9 +452,12 @@
clearInterval(this.sivdestory)
clearInterval(this.sivpdf)
clearInterval(this.sivtimer)
clearInterval(this.sivrpdf)
clearInterval(this.sivscroll)
},
data:function(){
return{
urlm:urlm,
fksl:0,
isok:"",
username:localStorage.getItem("username"),
......@@ -458,11 +476,30 @@
tabdata:[],
sivtimer:null,//时间计数器
sivpdf:null,
sivdestory:null
sivdestory:null,
sivrpdf:null,
sivscroll:null
}
},
methods:{
scroll(){
/* test */
pdfshow(urlo,'gpjypdf', 10000).then(e => {
that.sivpdf = e
})
/* test */
pdfshow(urlt,'gpjyrpdf', 10000).then(e => {
that.sivrpdf = e
})
const mainData=this.$refs.scrollmain
const divData =this.$refs.scroll
this.sivscroll=setInterval(() => {
mainData.scrollTop += 1
if (mainData.clientHeight + mainData.scrollTop+10 > mainData.scrollHeight) {
mainData.scrollTop = 0
}
}, 100)
},
// 扫码接口
apiscanxlh(){
let that=this
......
gavel/src/main/resources/templates/views/kmes/gpwx/index.html
View file @ a2a7b819
......@@ -42,6 +42,9 @@
})
/* 通用代码 */
const pdfUr="kmes/gpfk/queryPdfByWoidAndZpgx"
var urlo="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/O"
var urlt="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/T"
var urlm="kmes/gpfkfj/queryFjBybzgx/"+window.bzlx+"/M"
/* 初始化工序 */
function wxfk_getgx(e){
let that=e
......@@ -89,16 +92,16 @@
function wxfk_pdfshow(e,woid){
let that=e
let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
that.pdf=""
if (newpdfurl!=that.pdfurl){
that.pdfurl=newpdfurl
if(that.sivpdf){
clearInterval(that.sivpdf)
}
pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
that.sivpdf = e
})
}
// that.pdf=""
// if (newpdfurl!=that.pdfurl){
// that.pdfurl=newpdfurl
// if(that.sivpdf){
// clearInterval(that.sivpdf)
// }
// pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
// that.sivpdf = e
// })
// }
}
/* 反馈技计数 */
function wxfk_apigetjs(s){
......@@ -204,7 +207,7 @@
</ul>
</div>
<!-- 左侧信息条 -->
<div class="left">
<div class="left" style="width: 30%;">
<!-- 左上信息表 -->
<div class="cbinfor">
<div class="cpif">
......@@ -261,8 +264,19 @@
</div>
</div>
<!-- 右侧信息pdf -->
<div class="right">
<canvas id="gpjypdf" class="rightPdf"></canvas>
<div class="right" style="width: 45%;">
<canvas id="gpwxpdf" class="rightPdf"></canvas>
</div>
<!-- new右侧 -->
<div class="right" style="width: 25%;">
<div style="height: 50%;overflow: hidden;">
<video width="100%" height="100%" :src="urlm" controls muted autoplay="autoplay" loop="loop">
</video>
</div>
<div ref="scrollmain" style="height: 50%;overflow: auto;border-bottom: 1px solid #EEEEEE;">
<canvas id="gpwxrpdf" ref="scroll" style="width: 100%;height: 160%;" ></canvas>
</div>
</div>
</div>
<!-- 界面5 -->
......@@ -430,15 +444,19 @@
// this.sivpdf=
this.initpage()
this.gettime()
this.scroll()
this.appdestory()
},
destroyed() {
clearInterval(this.sivdestory)
clearInterval(this.sivpdf)
clearInterval(this.sivtimer)
clearInterval(this.sivscroll)
clearInterval(this.sivrpdf)
},
data:function(){
return{
urlm:urlm,
fksl:0,
isok:"",
username:localStorage.getItem("username"),
......@@ -457,11 +475,30 @@
tabdata:[],
sivtimer:null,//时间计数器
sivpdf:null,
sivdestory:null
sivdestory:null,
sivscroll:null,
sivrpdf:null
}
},
methods:{
scroll(){
/* test */
pdfshow(urlo,'gpwxpdf', 10000).then(e => {
that.sivpdf = e
})
/* test */
pdfshow(urlt,'gpwxrpdf', 10000).then(e => {
that.sivrpdf = e
})
const mainData=this.$refs.scrollmain
const divData =this.$refs.scroll
this.sivscroll=setInterval(() => {
mainData.scrollTop += 1
if (mainData.clientHeight + mainData.scrollTop+10 > mainData.scrollHeight) {
mainData.scrollTop = 0
}
}, 100)
},
// 扫码接口
apiscanxlh(){
let that=this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment