Commit f2bcf79a authored by 上官's avatar 上官

调整 同步

parent a708af0a
......@@ -23,17 +23,7 @@
height: 200%;
/*background-color: #F6F6F6;*/
}
.mark{
position:fixed;
left:0;
top:0;
opacity:.5;
width:100%;
height:100%;
background:#000;
z-index:998;
pointer-events: none; //不能操作
}
.mui-backdrop {position: fixed;top:251px;right: 10px;bottom: 5px;left: 698px;z-index: 998;background-color: rgba(0,0,0,.3);}
......@@ -49,8 +39,8 @@
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -151,9 +141,6 @@
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" style="border: 0px ; color:royalblue; width: 23%;height: 100%; text-align: left; padding-left:0px ;"
@click="nextday(-1)">
<!-- <a class=" mui-icon mui-icon-arrowleft mui-pull-left" style="border: blue solid 1px; margin-top: 5px" @click="nextday(-1)"></a> -->
<!-- <a class=" mui-icon mui-icon-arrowleft mui-pull-left" style="border: blue solid 1px; margin-left: -15px;margin-top: 5px" @click="nextday(-1)"></a> -->
</button>
<button class="mui-btn-outlined" style="padding-left: 6px; width: 54%;height: 100%; margin-left: -4px" id="selectdate"
......@@ -370,9 +357,7 @@
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
console.log("app::" + ap.style)
ap.style=" display: inline-block";
},200)
......@@ -1079,6 +1064,8 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
console.log("back")
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
......@@ -29,15 +29,15 @@
</head>
<body>
<div id="app">
<div id="app" style="display: none;">
<div class="mui-content">
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -269,7 +269,7 @@
<script src="../dest/js/moment.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
plus.nativeUI.showWaiting()
initPage();
});
......@@ -351,7 +351,11 @@
app.getDataDetail1();
});
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
ap.style=" display: inline-block";
},200)
mui('.mui-scroll-wrapper').scroll({
bounce: false,
......@@ -1064,6 +1068,7 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
This diff is collapsed.
......@@ -23,8 +23,8 @@
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white;" @click="back"></a>
<label style=" text-align: center; margin-left: 100px; color: white; position: relative;top: 7px;">我的任务 </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white; position: relative;top: 7px;">我的任务 </label>
</div>
<div id="left-2" style="width: 40%">
<div id="left-date" style=" border: solid #B6B6B6 1px; ">
......@@ -48,30 +48,30 @@
<li class="mui-table-view-cell">无明细数据.请选择其他日期</li>
</ul>
<ul class="mui-table-view" style="margin-top: 5px;" v-for=" itemsDetail ,n in itemsLeft" @click="nextPage(itemsDetail)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{itemsDetail.WorkTeam}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606; padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606;">数量: </p>
<p style="float: left;width: 28%; color: red;">{{itemsDetail.Qty}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF; padding: 0; margin: 0;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 28%; color: red; padding: 0; margin: 0;">{{itemsDetail.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 18%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606;"> 完成时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 完成时间: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 18%; color: darkgray;"> 发布时间: </p>
<p style="float: left;width: 40%; color: darkgray;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: darkgray;">发布人: </p>
<p style="float: left;width: 28%; color: darkgray;">{{itemsDetail.PlanMan}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 11px 2px 11px;">
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 发布时间: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">发布人: </p>
<p style="float: left;width: 28%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.PlanMan}} </p>
</li>
</ul>
</div>
......@@ -83,7 +83,7 @@
<div id="right " class="mui-pull-right " style=" width: 60%; display: inline-block; position: relative; top: -70px ; ">
<div id="right-1">
<table class="mui-table" style="background: #BBBBBB;">
<table class="mui-table" style="background: #289BE5;">
<tbody class="mui-table-view-cell">
<tr style="height: 31px;">
<td style="text-align: center; width: 40%;">工序</td>
......@@ -93,7 +93,7 @@
</tbody>
</table>
<div id=22 class="mui-scroll-wrapper" style=" margin-top: 35px ;height: 452px;">
<div id=22 class="mui-scroll-wrapper" style=" margin-top: 32px ;height: 452px;">
<div class="mui-scroll">
<!--这里放置真实显示的DOM内容-->
<!-- <div id="right-2">dfsfsfs</div> -->
......@@ -443,7 +443,7 @@
},
back: function() {
mui.back()
},
},
})
......
......@@ -11,8 +11,8 @@
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white;" @click="back"></a>
<label style=" text-align: center; margin-left: 100px; color: white;">车间交接 </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white;">针车交接 </label>
</div>
<div id="left-2" style="width: 40%">
<div class="mui-segmented-control" style="">
......@@ -25,30 +25,30 @@
<div id="item1" class="mui-scroll-wrapper scroll1" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft" @click="selectLeft(items)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{items.WorkTeam}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;">数量: </p>
<p style="float: left;width: 32%; color: red;">{{items.Qty}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0;">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 20%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;">&nbsp;{{items.PlanDate}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 11px 15px;">
<p style="float: left;width: 20%; color: 060606;"> 时报时间: </p>
<p style="float: left;width: 35%; color: 060606;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: 060606;">实报人: </p>
<p style="float: left;width: 28%; color: 060606;">{{items.ReportUser}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
......@@ -58,30 +58,30 @@
<div id="item2" class="mui-scroll-wrapper scroll2" :style="display_" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft2" @click="selectLeft(items)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{items.WorkTeam}} </p>
<li style=" padding: 2px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;">数量: </p>
<p style="float: left;width: 32%; color: red;">{{items.Qty}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 20%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;">&nbsp;{{items.PlanDate}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 11px 15px;">
<p style="float: left;width: 20%; color: 060606;"> 时报时间: </p>
<p style="float: left;width: 35%; color: 060606;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: 060606;">实报人: </p>
<p style="float: left;width: 28%; color: 060606;">{{items.ReportUser}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
......@@ -337,7 +337,7 @@
},
back: function() {
mui.back();
},
},
})
......
This diff is collapsed.
......@@ -29,15 +29,15 @@
</head>
<body>
<div id="app">
<div id="app" style="display: none;">
<div class="mui-content">
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -269,7 +269,7 @@
<script src="../dest/js/moment.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
plus.nativeUI.showWaiting()
initPage();
});
......@@ -353,7 +353,11 @@
});
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
ap.style=" display: inline-block";
},200)
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
......@@ -1057,6 +1061,7 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
......@@ -76,23 +76,29 @@
</a>
</div>
<div class="application-box" types="工序交接-针车">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/zc.png" alt="工序交接-针车" /></div>
<h3 class="application-tit" title="工序交接-针车">针车交接</h3>
</a>
</div>
<div class="application-box" types="工序交接-成型">
<a ids="3" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="工序交接-针车" /></div>
<h3 class="application-tit" title="工序交接-针车">工序交接-针车</h3>
<div class="application-img"><img src="../dest/img/cx.png" alt="工序交接-成型" /></div>
<h3 class="application-tit" title="工序交接-针车">成型交接</h3>
</a>
</div>
<div class="application-box" types="我的任务">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="我的任务" /></div>
<a ids="5" href="javascript:;">
<div class="application-img"><img src="../dest/img/mywork.png" alt="我的任务" /></div>
<h3 class="application-tit" title="我的任务">我的任务</h3>
</a>
</div>
<div class="application-box" types="针车排班表">
<a ids="5" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="针车排班表" /></div>
<a ids="6" href="javascript:;">
<div class="application-img"><img src="../dest/img/bp.png" alt="针车排班表" /></div>
<h3 class="application-tit" title="针车排班表">针车排班表</h3>
</a>
</div>
......@@ -139,7 +145,7 @@
var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon');
var pages = ['Needlecarreport_new','Cutting',"Forming","NeedlecarHandover","MyWork","NeedlecarPBB"];
var pages = ['Needlecarreport_new','Cutting',"Forming","FormingHandover","NeedlecarHandover","MyWork","NeedlecarPBB"];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a");
var back__first = null;
......@@ -158,6 +164,9 @@
items.push({
Name: "工序交接-针车"
});
items.push({
Name: "工序交接-成型"
});
items.push({
Name: "我的任务"
});
......
......@@ -3,7 +3,7 @@
"id" : "H544710A8", /*应用的标识,创建应用时自动生成,勿手动修改*/
"name" : "飞天兔MES", /*应用名称,程序桌面图标名称*/
"version" : {
"name" : "1.0.0.0", /*应用版本名称*/
"name" : "1.0.0.2", /*应用版本名称*/
"code" : "338"
},
"description" : "飞天兔MES平板版", /*应用描述信息*/
......
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