diff --git a/components/time/time-date.vue b/components/time/time-date.vue new file mode 100644 index 0000000..3aac3e5 --- /dev/null +++ b/components/time/time-date.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index 06c5ddf..68e55bb 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/pages/tabbar/pagehome/pagehome.vue @@ -169,10 +169,18 @@ 其他 - + - + + + {{item.title}} + + + + + + {{item.title}} @@ -263,6 +271,7 @@ otherList:[ {imgsrc:'/static/public/icon-home-largeScreen.png',title:'维保统计'}, {imgsrc:'/static/public/icon-home-reportForm.png',title:'数据看板'}, + {imgsrc:'/static/public/icon-home-status.png',title:'人员状态'}, {imgsrc:'/static/public/icon-home-product.png',title:'新产品'}, ], // 解决方案 @@ -460,8 +469,12 @@ let otherUrls = [ '/pagesA/faultStatistics/faultStatistics', '/pagesA/faultStatistics/projectOverview', + '/pagesA/peopleManagement/peopleManagement', '/pagesB/new-product/new-product', ]; + if(this.role!=3 && index==2) { + otherUrls[index] = '/pagesB/new-product/new-product'; + } uni.navigateTo({ url:otherUrls[index] }) diff --git a/pagesA/dataQuery/projectDetails.vue b/pagesA/dataQuery/projectDetails.vue index b290432..653a937 100644 --- a/pagesA/dataQuery/projectDetails.vue +++ b/pagesA/dataQuery/projectDetails.vue @@ -160,7 +160,7 @@ if (res.code) { this.projectObj = res.data; this.imgNum = this.projectObj.completed_img.length; - this.projectGK = this.projectObj.project_overview_min;//项目概况 + this.projectGK = this.projectObj.project_overview;//项目概况 this.project_material = this.projectObj.project_material;//项目材料 } else { diff --git a/pagesA/faultStatistics/faultStatistics.vue b/pagesA/faultStatistics/faultStatistics.vue index 29a8571..9ceae81 100644 --- a/pagesA/faultStatistics/faultStatistics.vue +++ b/pagesA/faultStatistics/faultStatistics.vue @@ -34,7 +34,7 @@ 维保类型 - + @@ -58,18 +58,21 @@ - + + + @@ -316,7 +329,6 @@ } .charts-box { - margin: auto; margin-top: 50rpx; width: 100%; height: 330rpx; diff --git a/pagesA/faultStatistics/projectOverview.vue b/pagesA/faultStatistics/projectOverview.vue index 52fada3..8ed05dd 100644 --- a/pagesA/faultStatistics/projectOverview.vue +++ b/pagesA/faultStatistics/projectOverview.vue @@ -1,6 +1,6 @@