diff --git a/common/style/layout.css b/common/style/layout.css index d727d8d..07023e0 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -241,6 +241,9 @@ uni-button:after { height: 100%; overflow-y: auto; } +.slide_h { + overflow-y: hidden; +} .slide_new table { table-layout: fixed; min-width: 100%; @@ -251,13 +254,18 @@ uni-button:after { .slide_new table td, .slide_new table th { box-sizing: border-box; overflow: hidden; - white-space: nowrap; text-overflow: ellipsis; white-space: nowrap; padding: 0 20rpx; border-bottom: 10rpx solid #f5f5f5; text-align: center; } +.slide_h table td, .slide_h table th { + white-space: wrap; + padding: 0 20rpx; + border-bottom: 10rpx solid #f5f5f5; + text-align: center; +} .slide_new table td:first-child, .slide_new table th:first-child{ position: sticky; left: 0; @@ -268,7 +276,8 @@ uni-button:after { top: 0; background: #d7d7d7; font-size: 26rpx; - line-height: 98rpx; + line-height: 28rpx; + padding: 35rpx 10rpx; color: #7d7d7d; background-color: #dcdfea; font-weight: bold; @@ -281,6 +290,13 @@ uni-button:after { color: #7d7d7d; background: #fff; } +.slide_h table tbody tr td { + font-size: 28rpx; + line-height: 28rpx; + padding: 14rpx 20rpx; + color: #7d7d7d; + background: #fff; +} .slide_new table tbody tr.checked td { background-color: #f9efb6; } @@ -319,6 +335,76 @@ uni-button:after { background-color: #f3ccb5; color: #ff5e00; } +.item-wrapper { + width: 100%; + height: auto; +} +.item-wrap { + background-color: #fff; + border-radius: 24rpx; + padding: 22rpx 14rpx; + margin-bottom: 20rpx; + box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1); +} +.item-font-1 { + font-size: 28rpx; + color: #42444a; + line-height: 30rpx; + padding: 14rpx 4rpx; +} +.item-font-2 { + font-size: 26rpx; + color: #2b87ff; + line-height: 30rpx; + padding: 14rpx 4rpx; + background-color: #edf6ff; + border-radius: 10rpx; + text-align: center; +} +.item-font-3 { + font-size: 26rpx; + color: #ff8824; + line-height: 30rpx; + padding: 14rpx 4rpx; + background-color: #fff4ea; + border-radius: 10rpx; + text-align: center; +} +.item-font-4 { + font-size: 26rpx; + color: #c1c1c3; + line-height: 30rpx; + padding: 14rpx 4rpx; +} +.item-status { + font-size: 26rpx; + color: #fff; + line-height: 14px; + padding: 6rpx 1rpx; + background-color: #fff; + border-radius: 10rpx; + text-align: center; +} +.item-status-1 { + background-color: #cfd2d4; + color: #5e5d5d; +} +.item-status-2 { + color: #bf8836; + background-color: #f0e2cd; +} +.item-status-3 { + background-color: #f3ccb5; + color: #ff5e00; +} +.item-status-4 { + background-color: #96f3b8; + color: #36744c; +} +.item-line-1 { + height: 1rpx; + background-color: #b8b8ba; +} /** 提交栏 **/ .submit-bar { diff --git a/pages.json b/pages.json index 4fd2b71..f0ca1e1 100644 --- a/pages.json +++ b/pages.json @@ -32,6 +32,14 @@ } } + ,{ + "path" : "pages/modules/wire-board", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 612f315..b32c89e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -33,7 +33,7 @@ userName: '', menuList: [ {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'}, - {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/manage/man-group-disk'}, + {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'}, {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/manage/man-group-disk'} ] }; diff --git a/pages/modules/wire-board.vue b/pages/modules/wire-board.vue new file mode 100644 index 0000000..13745fb --- /dev/null +++ b/pages/modules/wire-board.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/utils/getData2.js b/utils/getData2.js index f85f93c..50f68ed 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -96,10 +96,14 @@ export const productionComplete = (code, user) => request({ * 涂板线 */ // 数据 -export const coatedWireIntoStorageTaskShow = () => request({ - url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', - data: {} -}) +// export const coatedWireIntoStorageTaskShow = () => request({ +// url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', +// data: {} +// }) +export const coatedWireIntoStorageTaskShow = () => { + let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}] + return res +} // 入库 export const coatedWireIntoStorageTask = (code, qty) => request({ url:'api/pda/manualSorting/coatedWireIntoStorageTask',