Skip to content

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

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

parents 32d39f22 d686b21c
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 24 deletions
gavel/src/main/resources/static/css/jyfk.css
View file @ 0be08980
.n-item {background:rgb(57, 52, 86);}
.null-item {background:#FFFFFF;}
.ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
.nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
#kwrkb04 div{
font-size: 14px;
}
......
gavel/src/main/resources/static/css/wxfk.css
View file @ 0be08980
.n-item {background:rgb(57, 52, 86);}
.null-item {background:#FFFFFF;}
.ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
.nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
#kwrkb07 div{
font-size: 14px;
}
......
gavel/src/main/resources/static/css/zpfk.css
View file @ 0be08980
......@@ -2,6 +2,10 @@
margin: 0;
padding: 0;
}
.n-item {background:rgb(57, 52, 86);}
.null-item {background:#FFFFFF;}
.ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
.nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
#kwrkb01 div{
font-size: 14px;
}
......@@ -138,6 +142,7 @@
#kwrkb01 .wid70{
width: 70%;
}
#kwrkb01 .n-item {background:rgb(57, 52, 86);}
#kwrkb01 .ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
#kwrkb01 .nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
/* 界面2 */
......
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ 0be08980
......@@ -195,13 +195,13 @@
that.xlh=""
gas.post('kmes/gpfk/queryWoBomByWoid',{"woid":woid,"wosn":that.cpsn,"bzlx":window.bzlx}, function(res){
if(res.data&&res.data.records){
let msg="查询装配表格:"+woid+"成功"
zpfk_wrz(that,msg)
// let msg="查询装配表格:"+woid+"成功"
// zpfk_wrz(that,msg)
that.tabdata = res.data.records;
that.initpage()
}else{
let msg=res.message||"查询装配表格:"+woid+"失败"
zpfk_wrz(that,msg,'error')
// zpfk_wrz(that,msg,'error')
screenAlert(that.el,msg,2000)
}
});
......@@ -236,7 +236,7 @@
that.okOrng="OK"
that.xlh=""
}else if(e=="NGBZ"){
that.okOrng="N"
that.okOrng="NG"
that.xlh=""
}else if(e=="LOGOUT"){
zpfk_wrz(that,"即将退出系统")
......@@ -246,8 +246,8 @@
/* 获取类型 */
})
.catch(function(e){
let msg="正在查询WLID:"+that.xlh
zpfk_wrz(that,msg)
// let msg="正在查询WLID:"+that.xlh
// zpfk_wrz(that,msg)
zpfk_wlxh(that)
// console.log(e)
// let msg="无法识别该序列号:"+that.xlh
......@@ -297,6 +297,7 @@
$(that.el).find(".rz").append("<br>>" + "<span style='color: red;'>" +msg+"</sapn>")
that.addtop = that.addtop + 600
$(that.el).find(".rz").scrollTop(that.addtop)
that.okOrng='NG'
}
/* this.xlh="" */
......@@ -348,7 +349,7 @@
<div style="height: calc(100% - 20px);display: flex;">
<div class="rz" style="width: 80%;height: 100%;background-color: #393456;color: #FFFFFF;overflow: auto;">
</div>
<div :class="okOrng=='OK'?'ok-item':'nok-item'"
<div :class="{'ok-item' : okOrng=='OK','nok-item' : okOrng=='NG','n-item': okOrng!='OK'&&okOrng!='NG'}"
style="width: 20%;height: 100%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{okOrng}}</b>
</div>
......@@ -408,7 +409,9 @@
</div>
</div>
<div class="cpiright" style="width: 30%;height: 100%;padding: 10px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : okOrng=='OK','nok-item' : okOrng=='NG','n-item': okOrng!='OK'&&okOrng!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{okOrng}}</b>
</div>
</div>
......@@ -476,7 +479,9 @@
<!-- 日志 -->
<div class="cprz" style="position: relative;">
<div class="cpiright" style="width:30%;height: 50%;padding: 10px;position: absolute;right: 0px;top: 20px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : okOrng=='OK','nok-item' : okOrng=='NG','n-item': okOrng!='OK'&&okOrng!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{okOrng}}</b>
</div>
</div>
......@@ -524,7 +529,7 @@
data: function() {
return {
username:localStorage.getItem("username"),
okOrng:"N",
okOrng:"",
pdfdom:"kwrkb01pdf",
el:"#kwrkb01",
pdfurl:"kmes/gpfk/queryPdfByWoidAndZpgx",
......
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ 0be08980
......@@ -134,11 +134,11 @@
if(res.data&&res.data.records){
debugger
if(type=="ok"){
taht.isok="OK"
that.isok="OK"
that.hg=res.data.records.hgsl||0;
that.ng=res.data.records.bhgsl||0;
}else if(type=="ng"){
taht.isok="NG"
that.isok="NG"
that.hg=res.data.records.hgsl||0;
that.ng=res.data.records.bhgsl||0;
}
......@@ -259,7 +259,9 @@
<span style="font-size: 20px;font-weight: 800;">NG数量:{{ng}}</span>
</div>
</div>
<div class="cardList-wrappers" style="width: 40%;height: 95%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
class="" style="width: 40%;height: 95%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b style="font-size: 60px;">{{isok}}</b>
</div>
</div>
......@@ -338,7 +340,9 @@
<div class="tab">
<div class="maintab" style="position: relative;">
<div class="cpiright" style="width:160px;height: 160px;padding: 10px;position: absolute;right: 10px;top: 20px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{isok}}</b>
</div>
</div>
......@@ -412,7 +416,9 @@
<div class="tab">
<div class="maintab" style="position: relative;">
<div class="cpiright" style="width:130px;height: 130px;padding: 10px;position: absolute;right: 10px;top: 20px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{isok}}</b>
</div>
</div>
......@@ -454,7 +460,7 @@
},
data:function(){
return{
isok="OK",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......@@ -529,7 +535,7 @@
},
data:function(){
return{
isok="OK",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......@@ -599,7 +605,7 @@
},
data:function(){
return{
isok="OK",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......
gavel/src/main/resources/templates/views/kmes/gpwx/index.html
View file @ 0be08980
......@@ -258,7 +258,9 @@
<span style="font-size: 20px;font-weight: 800;">NG数量:{{ng}}</span>
</div>
</div>
<div class="cardList-wrappers" style="width: 40%;height: 95%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
style="width: 40%;height: 95%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b style="font-size: 60px;">{{isok}}</b>
</div>
</div>
......@@ -337,7 +339,9 @@
<div class="tab">
<div class="maintab" style="position: relative;">
<div class="cpiright" style="width:160px;height: 160px;padding: 10px;position: absolute;right: 10px;top: 20px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{isok}}</b>
</div>
</div>
......@@ -411,7 +415,9 @@
<div class="tab">
<div class="maintab" style="position: relative;">
<div class="cpiright" style="width:130px;height: 130px;padding: 10px;position: absolute;right: 10px;top: 20px;">
<div style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<div
:class="{'ok-item' : isok=='OK','nok-item' : isok=='NG','null-item': isok!='OK'&&isok!='NG'}"
style="width: 100%;height: 100%;background-color: #1890FF;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
<b>{{isok}}</b>
</div>
</div>
......@@ -453,7 +459,7 @@
},
data:function(){
return{
isok:"ok",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......@@ -528,7 +534,7 @@
},
data:function(){
return{
isok:"ok",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......@@ -598,7 +604,7 @@
},
data:function(){
return{
isok:"ok",
isok:"",
username:localStorage.getItem("username"),
pm:"",
ng:0,
......
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