From d022e33da93cc268c48135e6cdbddf835038122d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98tuzi0421?= <‘tuz0421@163.com> Date: Mon, 19 Feb 2024 16:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 42 ++- __MACOSX/components/._.DS_Store | Bin 0 -> 120 bytes .../chocolate-progress-bar/._.DS_Store | Bin 0 -> 120 bytes components/.DS_Store | Bin 0 -> 6148 bytes components/chocolate-progress-bar/.DS_Store | Bin 0 -> 6148 bytes .../chocolate-progress-bar.vue | 123 ++++++++ components/customTabBar/index.vue | 16 +- components/progressBar.vue | 94 ++++++ pages.json | 74 ++++- pages/deviceRepair/RepairReport.vue | 115 +++++++ pages/deviceRepair/deviceRepair.vue | 105 +++++++ pages/deviceStatus/deviceStatus.vue | 23 ++ pages/equipmentManage/bindingDevice.vue | 103 ++++++ pages/equipmentManage/editDevice.vue | 98 ++++++ pages/equipmentManage/equipmentManage.vue | 80 +++++ pages/index/index.vue | 297 ++++++++++++++---- pages/index/materialYield.vue | 107 +++++++ pages/index/productionOrder.vue | 123 -------- pages/index/schedule.vue | 61 ++++ pages/login/login.vue | 75 +++-- pages/person/accountCenter.vue | 34 +- pages/person/person.vue | 106 ++++--- pages/production/productionDetail.vue | 22 ++ pages/production/productionOrder.vue | 135 ++++++++ static/disable.png | Bin 0 -> 1079 bytes static/enable.png | Bin 0 -> 1220 bytes static/iconfont/iconfont-weapp/icon/icon.wxss | 62 +++- .../iconfont-weapp/iconfont-weapp-icon.css | 62 +++- .../iconfont-weapp/iconfont-weapp-icon.wxss | 62 +++- static/iconfont/iconfont.css | 99 +++++- static/indexA.png | Bin 0 -> 978 bytes static/indexB.png | Bin 0 -> 940 bytes static/personA.png | Bin 0 -> 884 bytes static/personB.png | Bin 0 -> 949 bytes 34 files changed, 1833 insertions(+), 285 deletions(-) create mode 100644 __MACOSX/components/._.DS_Store create mode 100644 __MACOSX/components/chocolate-progress-bar/._.DS_Store create mode 100644 components/.DS_Store create mode 100644 components/chocolate-progress-bar/.DS_Store create mode 100644 components/chocolate-progress-bar/chocolate-progress-bar.vue create mode 100644 components/progressBar.vue create mode 100644 pages/deviceRepair/RepairReport.vue create mode 100644 pages/deviceRepair/deviceRepair.vue create mode 100644 pages/deviceStatus/deviceStatus.vue create mode 100644 pages/equipmentManage/bindingDevice.vue create mode 100644 pages/equipmentManage/editDevice.vue create mode 100644 pages/equipmentManage/equipmentManage.vue create mode 100644 pages/index/materialYield.vue delete mode 100644 pages/index/productionOrder.vue create mode 100644 pages/index/schedule.vue create mode 100644 pages/production/productionDetail.vue create mode 100644 pages/production/productionOrder.vue create mode 100644 static/disable.png create mode 100644 static/enable.png create mode 100644 static/indexA.png create mode 100644 static/indexB.png create mode 100644 static/personA.png create mode 100644 static/personB.png 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 0000000000000000000000000000000000000000..a5b28df1cbc6e15bd0d35cdadd0c2e65d5131c7d GIT binary patch literal 120 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}u^SMB_!U6R08`;00ODZ-jv*mIP;rnB Iur73U08|YJ=l}o! literal 0 HcmV?d00001 diff --git a/__MACOSX/components/chocolate-progress-bar/._.DS_Store b/__MACOSX/components/chocolate-progress-bar/._.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a5b28df1cbc6e15bd0d35cdadd0c2e65d5131c7d GIT binary patch literal 120 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}u^SMB_!U6R08`;00ODZ-jv*mIP;rnB Iur73U08|YJ=l}o! literal 0 HcmV?d00001 diff --git a/components/.DS_Store b/components/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0b4ff9631e412af7ce5dcab5b2d3c82eb4fe0826 GIT binary patch literal 6148 zcmeHK&2G~`5T0!V-2@?WK>XbHg2W+}5?ZxzK(azO^oC>v2SBYITZtvdYuOGFgdo2H zS9k(mg$oxXIP(}>;M<>|R)IrQ6#?3@X1>|komu;ncGpWptUrxa%r8Xs zD_xNd8`%OfT|-hz0aX;!_R44%a11yG{x$~G+Py+U8k2-QzJ7Bm&>q3YRN~pD5No?Q zNaZk0Wr#erX}pKt{H_Jwnzh1NncG?)!aPmNs@wg{HZ~jQ&Tnzv;;oCVXZ~2u{3@uX zWj`pMsMdp^8i&?@C}sN755h-DJUeV(z9+LPNV2%l$w?Gr$kWG37Rgy(PP3@gb$rvo zd6PE}+t=swTX%MQ9kI7_d(jc|{rzr7?C$I>7EONjM(^&y(d5O;`K!h2xB5GYVaL;Q z$>I{;!C8yZbky^Qa*{6#teZcPgF!T{hD2XJeSGun>-zc8sq*vj>E8djUu3DwMtJWf zr^l#p?wK)Q+2$9{Yz9}@G2j^ZR~bDh11A~SG|jd; z|L_0){(mybwHyPEf&YpD))@GMK0e8wtt%g=&RPLIf+|ttYJ)lj#vaGoQAhDLs221I X?E1C()!tRQm&m#2>6qM?uXGKtcpXq@aVNPRD1%_yHoy(NZ8gvM1|! zc9kjO7=UaK4_80~U`%4{l-3Zw$5Kq`<5m;%~+Y3nn`jHy5> zkP3V&px=i=SFC}PqkTFUYy=>#m^S0R%@V|-31SVL9GRhsQ;ANM7%{}@%$KOEfs>=t zA$BtNiIXKJ6tUBpFIEnzju}&dRA8>asV^Jt|JU?i=Knb + + + + + {{ progress_txt }}% + {{title}} + + + + + + + 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 @@ +