Skip to content

M
MES_PAD
Commit df017a24 authored by 上官's avatar 上官
Browse files
Options

文琼合并

parent 12b8c64c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2487 additions and 598 deletions
css/Cutting.css 0 → 100644
View file @ df017a24
*{
list-style: none;
padding: 0;
margin: 0;
border: 0;
}
html,body{
width: 100%;
height: 100%;
overflow: hidden;
}
[v-cloak] {
display: none !important;
}
.redColor{
color: red;
display: inline-block;
}
.blueColor{
color: royalblue;
display: inline-block;
}
.altrowstable {
border-width: 1px;
/*padding: 2px;*/
border-style: solid;
border-color: #a9c6c9;
background: white;
height: 200%;
/*background-color: #F6F6F6;*/
}
.mui-backdrop {
position: fixed;
top: 251px;
right: 10px;
bottom: 5px;
left: 698px;
z-index: 998;
background-color: rgba(0, 0, 0, .3);
}
#app{
width: 100%;
height: 100%;
}
.mui-content{
height: 100%;
width: 100%;
}
.left{
float: left;
width: 30%;
height: 100%;
display: block;
}
.left-1{
position: fixed;
top: 2px;
width: 30%;
}
.left-1 a{
width: 30px;
}
.left-1 label{
text-align: center;
display: block;
line-height: 30px;
}
.left-2{
padding-top: 35px;
}
.mui-search input[type=search]{
border-radius:0 ;
}
.Text{
border: 1px solid rgb(218, 230, 239);
height: 460px;
background: #fff;
position: relative;
/* display: none; */
margin-top: -18px;
overflow: hidden;
}
.Text1{
border: 1px solid rgb(218, 230, 239);
height: 460px;
background: #fff;
position: relative;
margin-top: -18px;
overflow: hidden;
}
.scroll1{
/* top:35px */
}
.mui-scroll{
overflow: scroll;
}
.complet-detail{
padding: 5px 0;
height: 93px;
border-bottom: 1px solid #dadada;
box-sizing: border-box;
}
.complet-detail li{
float: left;
width: 50%;
font-size: 12px;
line-height:20px;
height: 20px;
text-align: left;
}
.complet-detail li span{
padding-left: 3px;
box-sizing: border-box;
display: block;
font-size: 12px;
float: left;
}
.complet-detail li span:nth-of-type(2){
padding-left: 1px !important;
}
.complet-detail li:nth-of-type(1) span:nth-of-type(2){
width:90px;
white-space:nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.complet-detail li:nth-of-type(3) span:nth-of-type(2){
width:100px;
white-space:nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.active{
background: #efeff4;
}
/**左侧底部按钮**/
.btn_bottom{
position: absolute;
bottom: 1px;
width: 30%;
background: #fff;
z-index: 10;
}
/**右侧***/
.right{
float: right;
width: 69.5%;
height: 100%;
box-sizing: border-box;
display: block;
}
.detail-header{
float: left;
width: 60%;
position: relative;
}
.mui-table {
}
.mui-table tr th{
height: 50px;
}
.item_table{
border: #DAE6EF solid 1px;
display: inline-block;
height: 376px;
background: white;
top:60px;
box-sizing: border-box;
margin-top:-9px ;
}
.sDetail td{
height: 62px;
}
.Rbtn button{
width: 120px; height: 70px; display: inline-block;
}
.Rcomputed button{
width: 85px;height: 70px;margin-bottom: -1px;font-size: 25px
}
dest/css/Cutting.css 0 → 100644
View file @ df017a24
*{
list-style: none;
padding: 0;
margin: 0;
border: 0;
}
html,body{
width: 100%;
height: 100%;
overflow: hidden;
}
[v-cloak] {
display: none !important;
}
.redColor{
color: red;
display: inline-block;
}
.blueColor{
color: royalblue;
display: inline-block;
}
.altrowstable {
border-width: 1px;
/*padding: 2px;*/
border-style: solid;
border-color: #a9c6c9;
background: white;
height: 200%;
/*background-color: #F6F6F6;*/
}
.mui-backdrop {
position: fixed;
top: 251px;
right: 10px;
bottom: 5px;
left: 698px;
z-index: 998;
background-color: rgba(0, 0, 0, .3);
}
#app{
width: 100%;
height: 100%;
}
.mui-content{
height: 100%;
width: 100%;
}
.left{
float: left;
width: 30%;
height: 100%;
display: block;
}
.left-1{
position: fixed;
top: 2px;
width: 30%;
}
.left-1 a{
width: 30px;
}
.left-1 label{
text-align: center;
display: block;
line-height: 30px;
}
.left-2{
padding-top: 35px;
}
.mui-search input[type=search]{
border-radius:0 ;
}
.Text{
border: 1px solid rgb(218, 230, 239);
height: 460px;
background: #fff;
position: relative;
/* display: none; */
margin-top: -18px;
overflow-y: scroll;
}
.Text1{
border: 1px solid rgb(218, 230, 239);
height: 460px;
background: #fff;
position: relative;
margin-top: -18px;
}
.maeginTop{
margin-top: 10px;
height: 481px;
}
.mui-scroll{
overflow-y: scroll;
}
.complet-detail{
padding: 5px 0;
height: 93px;
border-bottom: 1px solid #dadada;
box-sizing: border-box;
}
.complet-detail li{
float: left;
width: 50%;
font-size: 12px;
line-height:20px;
height: 20px;
text-align: left;
}
.complet-detail li span{
padding-left: 3px;
box-sizing: border-box;
display: block;
font-size: 12px;
float: left;
}
.complet-detail li span:nth-of-type(2){
padding-left: 1px !important;
}
.complet-detail li:nth-of-type(1) span:nth-of-type(2){
width:90px;
white-space:nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.complet-detail li:nth-of-type(3) span:nth-of-type(2){
width:100px;
white-space:nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.active{
background: #efeff4;
}
/**左侧底部按钮**/
.btn_bottom{
position: fixed;
bottom: 1px;
width: 30%;
z-index: 10;
left: 1px;
height: 40px;
line-height: 40px;
}
.btn_bottom #n1,.btn_bottom #n2{
display: block;
float: left;
text-align: center;
width: 50%;
}
/**右侧***/
.right{
float: right;
width: 70%;
height: 100%;
box-sizing: border-box;
display: block;
}
.detail-header{
float: left;
width: 60%;
position: relative;
}
.mui-table tr th{
height: 50px;
}
.item_table{
border: #DAE6EF solid 1px;
display: inline-block;
height: 376px;
background: white;
top:60px;
box-sizing: border-box;
margin-top:-9px ;
}
.sDetail td{
height: 62px;
}
.Rbtn button{
width: 120px; height: 70px; display: inline-block;
}
.Rcomputed button{
width: 85px;height: 70px;margin-bottom: -1px;font-size: 25px
}
/*********/
#pullrefresh{
width: 100%;
}
dest/css/needlecarHand/needlecarHandover.css 0 → 100644
View file @ df017a24
*{
list-style: none;
padding: 0;
margin: 0;
border: 0;
}
html,body,#app{
width: 100%;
height: 100%;
overflow: hidden;
}
[v-cloak] {
display: none !important;
}
.need-left{
width: 40%;
float: left;
height: 100%;
}
#left-1{
background-color: #007AFF; height: 30px;width: 100%; margin-bottom: 1px;line-height: 30px;
}
#left-2{
position: relative;
width: 100%;
height:482px;
margin-top: -15px;
}
.active{
background: #efeff4;
}
.marginTop{
margin-top: 0 !important;
height:515px !important;
}
.mui-scroll{
height: 100%;
padding-bottom: 15px;
box-sizing: border-box;
}
.leftList{
border: solid #DAE6EF 1px ;height: 100%; background: white;
width: 100%;
overflow-y: scroll;
}
.mui-search #search{
border-radius: 0;
}
#item1 div{
/* padding-bottom: 10px; */
}
#item2{
/* top: 32px; */
}
#item2 ul li p{
text-align: left;
}
.leftState{
position: fixed;bottom: 1px;left: 1px;z-index: 10;width: 40%;background: #fff;
}
#pullrefresh{
width: 100%;
height: 100%;
}
/************/
.need-right{
width: 60%;
float: right;
}
#right {
width: 100%;
}
#right-2{
position: fixed; bottom: 1px; right: 1px;
}
#right-2 button{
width: 200px; height: 70px;"
}
\ No newline at end of file
dest/js/mes/cutting.js 0 → 100644
View file @ df017a24
This diff is collapsed.
html/Cutting.html
View file @ df017a24
This diff is collapsed.
html/NeedlecarHandover.html
View file @ df017a24
This diff is collapsed.
html/application.html
View file @ df017a24
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
console.log("GetModuleList::" + JSON.stringify(e)) console.log("GetModuleList::" + JSON.stringify(e))
var isSuccess = e.success; var isSuccess = e.success;
if(isSuccess) { if(isSuccess) {
var items = e.items; var items = e.items;
console.log(JSON.stringify(items) ) console.log(JSON.stringify(items) )
//手动在结尾添加了一个设置项目 //手动在结尾添加了一个设置项目
...@@ -203,8 +204,8 @@ ...@@ -203,8 +204,8 @@
} }
console.log("GetModuleList::begin" )
Api.post('/api/User/GetModuleList',null,onGetDataSuccess,onGetDataFailure); Api.post('/api/User/GetModuleList',{},onGetDataSuccess,onGetDataFailure);
mui(".application-box").on('tap', 'a', function() { mui(".application-box").on('tap', 'a', function() {
......
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