diff --git a/pages/application/eight-assignments.vue b/pages/application/eight-assignments.vue index 12a16a0..1729ddc 100644 --- a/pages/application/eight-assignments.vue +++ b/pages/application/eight-assignments.vue @@ -12,6 +12,26 @@ 八项作业 --> + + + + {{eight_work_count.HOTWORK_COUNT}} + + + 动火作业 + + + + + + + {{eight_work_count.HIGHWORK_COUNT}} + + + 高处作业 + + + @@ -22,70 +42,37 @@ 安全作业 - - - - - - - - - - - - {{eight_work_count.BLIND_BOARD_COUNT}} - - - 盲板抽堵作业 - - - - - - {{eight_work_count.BREAK_GROUND_COUNT}} - - - 动土作业 - - - - - - {{eight_work_count.HIGHWORK_COUNT}} - - - 高处作业 - - - - - - - - {{eight_work_count.HOISTING_COUNT}} - - - 吊装作业 - - - - - - {{eight_work_count.ELECTRICITY_COUNT}} - - - 临时用电作业 - - - - - - {{eight_work_count.HOTWORK_COUNT}} - - - 动火作业 - - + + + + + {{eight_work_count.HOISTING_COUNT}} + + + 吊装作业 + + + + + + + {{eight_work_count.BREAK_GROUND_COUNT}} + + + 动土作业 + + + + + + + {{eight_work_count.ELECTRICITY_COUNT}} + + + 临时用电作业 + + + @@ -95,23 +82,19 @@ 断路作业 + + + + + {{eight_work_count.BLIND_BOARD_COUNT}} + + + 盲板抽堵作业 + + - diff --git a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue index 5f1a827..f37f015 100644 --- a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue +++ b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue @@ -765,12 +765,12 @@ diff --git a/pages/basics/home.vue b/pages/basics/home.vue index f140c99..7078dcc 100644 --- a/pages/basics/home.vue +++ b/pages/basics/home.vue @@ -1400,9 +1400,9 @@ /*说明*/ .notice-warp { - font-size: 26 upx; - padding: 40 upx 0; - border-bottom: 1 upx solid #eee; + font-size: 26upx; + padding: 40upx 0; + border-bottom: 1upx solid #eee; text-align: center; } @@ -1412,10 +1412,10 @@ .notice-warp .btn-change { display: inline-block; - margin-top: 28 upx; - padding: 6 upx 16 upx; - border: 1 upx solid #FF6990; - border-radius: 40 upx; + margin-top: 28upx; + padding: 6upx 16upx; + border: 1upx solid #FF6990; + border-radius: 40upx; color: #FF6990; } @@ -1424,7 +1424,7 @@ } .main { - padding: 0 30 upx; + padding: 0 30upx; } .flex-line { @@ -1438,7 +1438,7 @@ } .flex-line .otext { - width: 200 upx; + width: 200upx; text-align: center; white-space: nowrap; overflow: hidden; @@ -1447,7 +1447,7 @@ .container { width: 100%; - padding: 20 upx; + padding: 20upx; background-color: #f7f8f8; padding-top: 0; } @@ -1455,31 +1455,31 @@ .noticeer { width: 100%; background: #ffffff; - border-radius: 10 upx; - padding: 20 upx; - margin-bottom: 20 upx; + border-radius: 10upx; + padding: 20upx; + margin-bottom: 20upx; } .noticeer image { - width: 40 upx; - height: 40 upx; + width: 40upx; + height: 40upx; vertical-align: middle; - margin-top: -5 upx; - margin-right: 5 upx; + margin-top: -5upx; + margin-right: 5upx; } .answerico { position: fixed; - right: 20 upx; + right: 20upx; top: 50%; transform: translateY(-50%); z-index: 9; } .answerico uni-image img { - width: 70 px; - height: 70 px; + width: 70px; + height: 70px; } .cu-modal { diff --git a/pages/questionnaire/questionnaire.vue b/pages/questionnaire/questionnaire.vue index e9974a1..93ef731 100644 --- a/pages/questionnaire/questionnaire.vue +++ b/pages/questionnaire/questionnaire.vue @@ -224,14 +224,14 @@ } .course-header { - padding: 20 upx; - border-bottom: 1 upx solid #F1F1F1; + padding: 20upx; + border-bottom: 1upx solid #F1F1F1; line-height: 1.6; } .course-name { font-weight: bold; - font-size: 30 upx; + font-size: 30upx; } .course-int { @@ -243,28 +243,28 @@ } .course-aa { - padding: 0 20 upx; + padding: 0 20upx; } .course-items { border-bottom: 1px dashed #F1F1F1; - padding: 20 upx 0; + padding: 20upx 0; } .course-items .course-ask { line-height: 1.6; - font-size: 28 upx; + font-size: 28upx; /* margin-bottom: 10upx; */ } .course-answer { - padding-left: 40 upx; - margin-top: 20 upx; + padding-left: 40upx; + margin-top: 20upx; } .answer-lable { display: block; - margin-bottom: 20 upx; + margin-bottom: 20upx; } .answer-lable:last-child { @@ -272,6 +272,6 @@ } .answer-lable radio { - margin-right: 20 upx; + margin-right: 20upx; }