From 6985e31067a723fa48eb6de7f54e58de0698e40b Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 2 Aug 2024 09:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 13 +++++++++---- pages.json | 2 +- .../{slitting => production}/ZjContainer.vue | 0 utils/mork2.js | 10 +++++----- 4 files changed, 15 insertions(+), 10 deletions(-) rename pages/SecondPhase/{slitting => production}/ZjContainer.vue (100%) diff --git a/common/style/layout.styl b/common/style/layout.styl index dfdb6dd..f83ad72 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -325,16 +325,20 @@ uni-button:after { font-weight: bold; } .slide_new table tr.checked { - background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + // background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + background-color: #6190e8; } .slide_new table tr.checked td { - background: transparent; + background-color: transparent; + color: #fff; } .slide_new table tr.checked td:first-child { - background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + // background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + background-color: #6190e8; } .slide_new table tr.checked td:nth-child(2) { - background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + // background-image: linear-gradient(to top,#c2cde3,#f6f7fb); + background-color: #6190e8; } .slide_new table tr.checked td:first-child { border-left: 1rpx solid #6798ef; @@ -522,6 +526,7 @@ uni-button[disabled]:not([type]) { } .msg_p2 { font-size: 28rpx; + font-weight: 700; line-height: 30rpx; color: #ff6a00; text-align: left; diff --git a/pages.json b/pages.json index b94cf3c..34e48e1 100644 --- a/pages.json +++ b/pages.json @@ -488,7 +488,7 @@ } ,{ - "path" : "pages/SecondPhase/slitting/ZjContainer", + "path" : "pages/SecondPhase/production/ZjContainer", "style" : { "navigationStyle": "custom" diff --git a/pages/SecondPhase/slitting/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue similarity index 100% rename from pages/SecondPhase/slitting/ZjContainer.vue rename to pages/SecondPhase/production/ZjContainer.vue diff --git a/utils/mork2.js b/utils/mork2.js index 82037db..f4a391a 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -71,7 +71,8 @@ export const allAuthority = () => { {menu_id: '3', title: '烘烤工序', path: '/pages/SecondPhase/production/BakeProcess'}, {menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'}, {menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'}, - {menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'} + {menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'}, + {menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'} ]}, {menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [ {menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'}, @@ -87,8 +88,7 @@ export const allAuthority = () => { {menu_id: '8', title: '气胀轴库维护', path: '/pages/SecondPhase/slitting/ShaftSave'}, {menu_id: '8', title: '分切子卷维护', path: '/pages/SecondPhase/slitting/ZjSave'}, {menu_id: '8', title: '备货区管理', path: '/pages/SecondPhase/slitting/StockingArea'}, - {menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'}, - {menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/slitting/ZjContainer'} + {menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'} ]}, {menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [ {menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'}, @@ -127,8 +127,8 @@ export const authority = () => { {title: '载具入库',sonTree: [{title: '空载具入库'}]}, {title: '空木箱入库',sonTree: [{title: '空木箱入库'}]}, {title: '发货区',sonTree: [{title: '发货区解绑'}]}, - {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}]}, - {title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷装箱'}]}, + {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}, {title: '子卷装箱'}]}, + {title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}]}, {title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'}]}, {title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]} ]