diff --git a/pages.json b/pages.json index 22b642a4..259d71de 100644 --- a/pages.json +++ b/pages.json @@ -1134,11 +1134,11 @@ { "path": "pages/alarmPage/indexTwo", "style": { - "navigationBarTitleText": "报警提示", - "enablePullDownRefresh": true, - "onReachBottomDistance": 100, - "navigationBarBackgroundColor": "#3A7BFF", - "navigationBarTextStyle": "white" + // "navigationBarTitleText": "报警提示", + "enablePullDownRefresh": true + // "onReachBottomDistance": 100, + // "navigationBarBackgroundColor": "#3A7BFF", + // "navigationBarTextStyle": "white" } }, { diff --git a/pages/personLocation/exam/beginexam/beginexam.vue b/pages/personLocation/exam/beginexam/beginexam.vue index 1fa76899..a9c82a1a 100644 --- a/pages/personLocation/exam/beginexam/beginexam.vue +++ b/pages/personLocation/exam/beginexam/beginexam.vue @@ -290,6 +290,7 @@ .beginexam { padding: 26.92rpx 32.69rpx; + padding-top: 40rpx; height: 58%; display: flex; flex-direction: column; @@ -307,7 +308,8 @@ .text:nth-child(2) { font-size: 34rpx; - width: 52%; + // width: 52%; + flex: 1; overflow-wrap: anywhere; } } @@ -322,8 +324,10 @@ .radio { display: flex; - align-items: flex; - + // align-items: center; + >text{ + margin-top: 5rpx; + } .question-desc { display: inline-block; width: 82%; @@ -342,8 +346,10 @@ .check { display: flex; - align-items: flex; - + // align-items: center; + >text{ + margin-top: 5rpx; + } .question-desc { display: inline-block; width: 82%; diff --git a/pages/personLocation/exam/examresult/examresult.vue b/pages/personLocation/exam/examresult/examresult.vue index 28054918..ee3a105a 100644 --- a/pages/personLocation/exam/examresult/examresult.vue +++ b/pages/personLocation/exam/examresult/examresult.vue @@ -17,13 +17,13 @@ 对于成绩不满意可再次考试 + @click="examAgain('/personLocation/exam/beginexam/beginexam')">再考一次 - 80 + {{pageData.score}} @@ -32,7 +32,7 @@ 恭喜您通过考试 + @click="goHiidden('/personLocation/exam/index/index')">返回 diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue index f986a21c..204ce521 100644 --- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue +++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue @@ -28,6 +28,10 @@ {{workerInfo.projectName}} + + 企业: + {{workerInfo.enterpriseName}} + 班组: {{workerInfo.teamName}} @@ -68,21 +72,21 @@ - 合同 + 劳动合同 已签 - 未签 + 未签 体检 已体检 - 未体检 + 未体检 - 保险 + 工伤保险