Skip to content

K
kwell-mes
Commit 83dc68f3 authored by 李苏's avatar 李苏 💬
Browse files
Options

登录页面

parent f7620f80
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1179 additions and 55 deletions
gavel/src/main/resources/static/css/jyfk.css
View file @ 83dc68f3
#kwrkb04{
#kwrkb04 div{
font-size: 14px;
}
#kwrkb04 li{
font-size: 14px;
}
#kwrkb05 div{
font-size: 14px;
}
#kwrkb05 li{
font-size: 14px;
}
#kwrkb06 div{
font-size: 14px;
}
#kwrkb06 li{
font-size: 14px;
}
#kwrkb04{
height: 100%;
width: 100%;
display: flex;
......
gavel/src/main/resources/static/css/wxfk.css
View file @ 83dc68f3
#kwrkb07 div{
font-size: 14px;
}
#kwrkb07 li{
font-size: 14px;
}
#kwrkb08 div{
font-size: 14px;
}
#kwrkb08 li{
font-size: 14px;
}
#kwrkb09 div{
font-size: 14px;
}
#kwrkb09 li{
font-size: 14px;
}
#kwrkb07{
height: 100%;
width: 100%;
......
gavel/src/main/resources/static/css/zpfk.css
View file @ 83dc68f3
......@@ -3,22 +3,22 @@
padding: 0;
}
#kwrkb01 div{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb01 li{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb02 div{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb02 li{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb03 div{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb03 li{
font-size: 15px!important;
font-size: 14px;
}
#kwrkb01 {
height: 100%;
......@@ -226,7 +226,7 @@
#kwrkb02 .tipul button{
margin-left: 10px;
height: 30px;
width: 60px;
/* width: 60px; */
background-color: #FFFFFF;
border: 0.5px solid #EEEEEE;
text-decoration:none;
......
gavel/src/main/resources/static/js/kmeshome.js 0 → 100644
View file @ 83dc68f3
This diff is collapsed.
gavel/src/main/resources/templates/views/index.html 0 → 100644
View file @ 83dc68f3
This diff is collapsed.
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ 83dc68f3
......@@ -3,12 +3,13 @@
<link rel="stylesheet" type="text/css" href="css/zpfk.css"/>
<style type="text/css">
.errdialog{
width: 35%;
min-width:35%;
/* width: 35%; */
height: 40px;
text-align: center;
line-height: 40px;
position: absolute;
top: 100px;
top: 50px;
right: 50%;
color: #FFFFFF;
background-color: rgba(255,0,0,0.5);
......@@ -41,7 +42,6 @@
/* 通用代码 */
/* 大屏内部弹框 */
function screenAlert(dom,msg,timeNum){
debugger
let getdom=$(dom)
getdom.css('position','relative')
let dialog="<div class='errdialog'>"+msg+"</div>"
......@@ -84,7 +84,7 @@
function zpfk_hqlx(e){
let that=e
return new Promise(function(y,n){
gas.post('kmes/gpfk/querySmlx ',{"wosnid":that.xlh}, function(res){
gas.post('kmes/gpfk/querySmlx ',{"wosnid":that.xlh,"bzlx":window.bzlx||"无"}, function(res){
if(res.data&&res.data.records){
let getinfor=res.data.records
y(getinfor.id||"")}
......@@ -97,12 +97,21 @@
/* 扫描物料 */
function zpfk_wlxh(z){
let that =z
gas.post('kmes/gphy/zpwl ',{"wlxh":that.xlh,"djid":that.gd}, function(res){
if(!that.gd){
let msg="请先扫描工单序列号，获取工单号"
screenAlert(that.el,msg,2000)
zpfk_wrz(that,msg,'error')
return false
}
gas.post('kmes/gphy/zpwl',{"wlxh":that.xlh}, function(res){
if(res.data&&res.data.records){
/* 表格加1 ok标志改变 日志 */
}else{
let msg="查询装配物料:"+that.xlh+"失败"
zpfk_wrz(that,msg,"error")
}
});
})
}
/* 获取工序工单等信息 */
function zpfk_queryKwellWoinfo(e){
......@@ -110,6 +119,8 @@
return new Promise(function(y,n){
gas.post('kmes/gpfk/queryKwellWoinfo',{"wosnid":that.xlh}, function(res){
if(res.data&&res.data.records){
let msg="查询工单信息:"+that.xlh+"成功"
zpfk_wrz(that,msg)
/* 赋值操作 */
that.gd = res.data.records.djid;
that.cpsn = res.data.records.wosnCode;
......@@ -120,6 +131,11 @@
/* 日志操作 */
/* pdf地址 */
}else{
let msg="查询工单信息:"+that.xlh+"失败"
that.xlh=""
zpfk_wrz(that,msg,'error')
screenAlert(that.el,msg,2000)
}
});
})
......@@ -130,13 +146,20 @@
that.xlh=""
gas.post('kmes/gpfk/queryWoBomByWoid',{"woid":woid}, function(res){
if(res.data&&res.data.records){
let msg="查询装配表格:"+woid+"成功"
zpfk_wrz(that,msg)
that.tabdata = res.data.records;
that.initpage()
}else{
let msg="查询装配表格:"+woid+"失败"
zpfk_wrz(that,msg,'error')
screenAlert(that.el,msg,2000)
}
});
}
/* pdfshow gxid登录页传进来 */
function zpfk_pdfshow(e,woid){
console.log("pdf")
let that=e
let newPdfurl=that.pdfurl+"?woid="+woid+"&&"+"gxid="+window.gxid||"nogxid"
if (newpdfurl!=that.pdfurl){
......@@ -154,8 +177,9 @@
let that=t
zpfk_hqlx(that).then(function(e){
if(e=="WOSNID"){
let msg="正在查询WOSNID:"+that.xlh
zpfk_wrz(that,msg)
zpfk_queryKwellWoinfo(that).then(function(s){
console.log(s)
zpfk_queryWoBomByWoid(that,s)
zpfk_pdfshow(that,s)
})
......@@ -164,10 +188,19 @@
}else if(e=="NGBZ"){
that.okOrng="N"
}else if(e=="WLID"){
let msg="正在查询WLID:"+that.xlh
zpfk_wrz(that,msg)
zpfk_wlxh(that)
}else if(e=="LOGOUT"){
zpfk_wrz(that,"即将退出系统")
}
/* 获取类型 */
}).catch(function(){
})
.catch(function(e){
console.log(e)
let msg="无法识别该序列号:"+that.xlh
zpfk_wrz(that,msg,'error')
screenAlert(that.el,msg,2000)
that.xlh=""
})
}
......@@ -202,11 +235,18 @@
},20000)
}
/* 日志事件汇总,写在请求内部或者单独拿出 */
function zpfk_rzts1(o){
function zpfk_wrz(o,msg,type){
let that=o
$(that.el).find(".rz").append("<br>>" + "<span>" +"正在查询:"+that.xlh+"</sapn>")
if(type!='error'){
$(that.el).find(".rz").append("<br>>" + "<span>" +msg+"</sapn>")
that.addtop = that.addtop + 600
$(that.el).find(".rz").scrollTop(that.addtop)
}else{
$(that.el).find(".rz").append("<br>>" + "<span style='color: red;'>" +msg+"</sapn>")
that.addtop = that.addtop + 600
$(that.el).find(".rz").scrollTop(that.addtop)
}
/* this.xlh="" */
}
/* 弹框封装 */
......@@ -255,7 +295,6 @@
</div>
<div style="height: calc(100% - 20px);display: flex;">
<div class="rz" style="width: 80%;height: 100%;background-color: #393456;color: #FFFFFF;overflow: auto;">
<span>>>Tips</span>
</div>
<div :class="okOrng=='OK'?'ok-item':'nok-item'"
style="width: 20%;height: 100%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
......@@ -330,8 +369,7 @@
日志
</div>
<div style="height: calc(100% - 20px);display: flex;">
<div style="width: 100%;height: 100%;background-color: #393456;color: #FFFFFF;">
<span>>>Tips</span>
<div class="rz" style="width: 100%;height: 100%;background-color: #393456;color: #FFFFFF;overflow: auto;">
</div>
</div>
</div>
......@@ -394,8 +432,8 @@
日志
</div>
<div style="height: calc(100% - 20px);display: flex;">
<div style="width: 100%;height: 100%;background-color: #393456;color: #FFFFFF;">
<span>>>Tips</span>
<div class="rz" style="width: 100%;height: 100%;background-color: #393456;color: #FFFFFF;overflow: auto;">
</div>
</div>
</div>
......@@ -418,13 +456,14 @@
let Vkwrkb01 = new Vue({
el: "#kwrkb01",
mounted() {
console.log("mounted")
pdfshow("pdf/dcAcess.pdf","kwrkb01pdf",20000)
this.initpage()
dbenlarge('kwrkb01', 1, this.initpage)
$(this.el).dblclick()
this.gettime()
this.isFocus()
this.appdestory()
screenAlert(this.el,'error',2000)
},
destroyed() {
clearInterval(this.sivdestory)
......@@ -458,7 +497,7 @@
zpfk_zpfk(that)
},
isFocus(){
let $xlh=$("#kwrkb01").find('input[name="xlh"]')
let $xlh=$(this.el).find('input[name="xlh"]')
$xlh.focus()
},
// 扫码事件
......@@ -466,11 +505,6 @@
var evt = window.event || e;
if (evt.keyCode == 13) {
this.apiscanxlh()
console.log(this.xlh)
$("#kwrkb01").find(".rz").append("<br>>" + "<span>" +"正在查询:"+this.xlh+"</sapn>")
this.addtop = this.addtop + 600
$("#kwrkb01").find(".rz").scrollTop(this.addtop)
/* this.xlh="" */
}
},
// 初始化页面
......@@ -497,11 +531,8 @@
let Vkwrkb02= new Vue({
el:"#kwrkb02",
mounted() {
dbenlarge('kwrkb02',0,this.initpage)
pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
this.sivpdf=e
$("#kwrkb02").hide()
})
// $(this.el).hide()
dbenlarge('kwrkb02',1,this.initpage)
// this.sivpdf=
this.initpage()
this.gettime()
......@@ -533,6 +564,10 @@
}
},
methods:{
isFocus(){
let $xlh=$(this.el).find('input[name="xlh"]')
$xlh.focus()
},
// 扫码接口
apiscanxlh(){
let that=this
......@@ -543,7 +578,6 @@
var evt = window.event || e;
if (evt.keyCode == 13) {
this.apiscanxlh()
console.log(this.xlh)
$("#kwrkb02").find(".rz").append("<br>>" + "<span>" +"正在查询:"+this.xlh+"</sapn>")
this.addtop = this.addtop + 600
$("#kwrkb02").find(".rz").scrollTop(this.addtop)
......@@ -573,11 +607,7 @@
let Vkwrkb03= new Vue({
el:"#kwrkb03",
mounted() {
dbenlarge('kwrkb03',0,this.initpage)
pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
this.sivpdf=e
$("#kwrkb03").hide()
})
dbenlarge('kwrkb03',1,this.initpage)
// this.sivpdf=
this.initpage()
this.gettime()
......@@ -609,6 +639,10 @@
}
},
methods:{
isFocus(){
let $xlh=$(this.el).find('input[name="xlh"]')
$xlh.focus()
},
// 扫码接口
apiscanxlh(){
let that=this
......@@ -619,7 +653,6 @@
var evt = window.event || e;
if (evt.keyCode == 13) {
this.apiscanxlh()
console.log(this.xlh)
$("#kwrkb03").find(".rz").append("<br>>" + "<span>" +"正在查询:"+this.xlh+"</sapn>")
this.addtop = this.addtop + 600
$("#kwrkb03").find(".rz").scrollTop(this.addtop)
......
gavel/src/main/resources/templates/views/login_view.html
View file @ 83dc68f3
......@@ -128,15 +128,13 @@
let bzgxsn=$gylx.val()
HTTP.post("kmes/gpfk/login ", {usersn:usersn,bzgxsn:bzgxsn}, function(result) {
if (result['success']) {
if(result.data.records.gylx=='ZP'){
}
else if(result.data.records.gylx=='JY'){
}
else if(result.data.records.gylx=='WX'){
}
// window.location.href = "index";
let mkurl=result.data.records.fkurl
let mkid=result.data.records.modulecode
let bzlx=result.data.records.id
window.bzlx=bzlx
let url="index#"+mkurl+";"+mkid+"+"+bzlx
window.location.href =url
} else {
$rygh.val("")
$gylx.val("")
......
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