diff --git a/App.vue b/App.vue index a8be177..6fee664 100644 --- a/App.vue +++ b/App.vue @@ -3,8 +3,10 @@ onLaunch: function() { console.warn('当前组件仅支持 uni_modules 目录结构 ,请升级 HBuilderX 到 3.1.0 版本以上!') console.log('App Launch') - // plus.navigator.setFullscreen(true);//隐藏状态栏 - // uni.hideTabBar(); + // #ifndef MP-WEIXIN + uni.hideTabBar(); + // #endif + }, onShow: function() { console.log('App Show') @@ -43,8 +45,44 @@ .font12{font-size: $uni-font-size-sm;} .font13{font-size:13px;} .font14{font-size: $uni-font-size-base;} + .font15{font-size: 15px;} + .font20{font-size: 20px;} + .font22{font-size: 22px;} + .font24{font-size: 24px;} + .font35{font-size: 35px;} .font_bold{font-weight: bold;} //文字颜色 .text_color_black{color: #000;} + // .text_{color: #00B68D;} + + //布局 + .flex_layout{display: flex;} + //paddind + .padd_top12{padding-top:12px;} + //margin + .mar_top12{margin-top: 12px;} + .page_list{margin-bottom: 12px;padding:0 12px;} + //有详情的列表 + .detail_list{margin-bottom: 12px; + .list_top{ + display: flex; + padding:12px; + font-size: 14px; + border-radius: 8px 8px 0px 0px; + background: linear-gradient(90deg, rgba(61, 84, 176, 0.70) 5.83%, rgba(58, 77, 158, 0.00) 73.76%); + .top_left{flex: 1;} + } + .list_content{padding:12px;} + } + + //页面固定按钮 + .bottom_but{bottom: 40px;bottom: 40px;position: fixed;width: calc(100% - 28px); + view{width: 50%;text-align: center;margin: 0 20px;border-radius: 19px;background: #DDD;line-height: 38px;} + } + //底部固定添加按钮 + .page_bottom_button{width: 100%;position: fixed;bottom: 0px;background-color: #060B26;border-top: 1px solid #2E3249;height: 80px; + .page_add{display: flex;justify-content: center;margin: 7px 20px;border-radius: 17.5px;background: #1C2755;line-height: 35px;} + } + .bot_padding{padding-bottom: 100px;} diff --git a/__MACOSX/components/._.DS_Store b/__MACOSX/components/._.DS_Store new file mode 100644 index 0000000..a5b28df Binary files /dev/null and b/__MACOSX/components/._.DS_Store differ diff --git a/__MACOSX/components/chocolate-progress-bar/._.DS_Store b/__MACOSX/components/chocolate-progress-bar/._.DS_Store new file mode 100644 index 0000000..a5b28df Binary files /dev/null and b/__MACOSX/components/chocolate-progress-bar/._.DS_Store differ diff --git a/components/.DS_Store b/components/.DS_Store new file mode 100644 index 0000000..0b4ff96 Binary files /dev/null and b/components/.DS_Store differ diff --git a/components/chocolate-progress-bar/.DS_Store b/components/chocolate-progress-bar/.DS_Store new file mode 100644 index 0000000..bb9f336 Binary files /dev/null and b/components/chocolate-progress-bar/.DS_Store differ diff --git a/components/chocolate-progress-bar/chocolate-progress-bar.vue b/components/chocolate-progress-bar/chocolate-progress-bar.vue new file mode 100644 index 0000000..94417fa --- /dev/null +++ b/components/chocolate-progress-bar/chocolate-progress-bar.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/components/customTabBar/index.vue b/components/customTabBar/index.vue index c80c019..1b95621 100644 --- a/components/customTabBar/index.vue +++ b/components/customTabBar/index.vue @@ -4,7 +4,7 @@ - + @@ -31,8 +31,8 @@ export default { { id: 0, path: '/pages/index/index', - icon: '/static/logo.png', - selectIcon: '/static/logo.png', + icon: '/static/indexB.png', + selectIcon: '/static/indexA.png', text: '首页', centerItem: false }, @@ -48,8 +48,8 @@ export default { { id: 2, path: '/pages/person/person', - icon: '/static/logo.png', - selectIcon: '/static/logo.png', + icon: '/static/personA.png', + selectIcon: '/static/personB.png', text: '我的', centerItem: false } @@ -58,13 +58,9 @@ export default { }, mounted () { this.currentItem = this.currentPage - // 隐藏原来的tabBar导航栏 - uni.hideTabBar() }, methods: { changeItem (item) { - let _this = this - //_this.currentItem = item.id; uni.switchTab({ url: item.path }) @@ -89,7 +85,7 @@ view { align-items: center; padding: 5rpx 0; color: #999999; - + background: #131E3B; /* 针对tabbar的统一处理 */ .tabbar-item { width: 33.33%; diff --git a/components/progressBar.vue b/components/progressBar.vue new file mode 100644 index 0000000..0b71300 --- /dev/null +++ b/components/progressBar.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/pages.json b/pages.json index 7d821d4..a2eb8c8 100644 --- a/pages.json +++ b/pages.json @@ -41,12 +41,84 @@ } }, { - "path" : "pages/index/productionOrder", + "path" : "pages/production/productionOrder", "style" : { "navigationBarTitleText" : "生产工单管理", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/index/schedule", + "style" : + { + "navigationBarTitleText" : "工单进度", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/index/materialYield", + "style" : + { + "navigationBarTitleText" : "工单出材率", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/equipmentManage/equipmentManage", + "style" : + { + "navigationBarTitleText" : "设备管理", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/equipmentManage/editDevice", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/equipmentManage/bindingDevice", + "style" : + { + "navigationBarTitleText" : "设备管理", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/production/productionDetail", + "style" : + { + "navigationBarTitleText" : "工单详情", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/deviceRepair/deviceRepair", + "style" : + { + "navigationBarTitleText" : "硬件设备报修", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/deviceRepair/RepairReport", + "style" : + { + "navigationBarTitleText" : "设备报修", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/deviceStatus/deviceStatus", + "style" : + { + "navigationBarTitleText" : "设备状态", + "enablePullDownRefresh" : false + } }], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/deviceRepair/RepairReport.vue b/pages/deviceRepair/RepairReport.vue new file mode 100644 index 0000000..77700d4 --- /dev/null +++ b/pages/deviceRepair/RepairReport.vue @@ -0,0 +1,115 @@ +