elink-star
/
epmet-work-mp
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

样式问题123

data-page-V4.3.1
是小王呀\24601 1 year ago
parent
085884f05d
commit
5359027698
4 changed files with 135 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
  2. 54
      subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
  3. 44
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
  4. 67
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss

44
subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
View File

@ -13,8 +13,9 @@
</view> </view>
<view class="from"> <view class="from">
<view class="prosecutors"> <view class="prosecutors">
<text class="prosecutors_req">*</text>
<view class="nes">
<view class="conclusion"> <view class="conclusion">
<text class="prosecutors_req">*</text>
<text class="prosecutors_pre">企业名称</text> <text class="prosecutors_pre">企业名称</text>
<picker class="prosecutors_name" bindchange="pickerChange2" range-key="name" value="{{index}}" range="{{companyList}}"> <picker class="prosecutors_name" bindchange="pickerChange2" range-key="name" value="{{index}}" range="{{companyList}}">
<view class="{{gridNName?'':'gray'}}"> <view class="{{gridNName?'':'gray'}}">
@ -24,23 +25,25 @@
</view> </view>
<view class="conclusion_right"> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view></view>
</view> </view>
<view class="prosecutors" bind:tap="showPopup">
<view class="prosecutors" bind:tap="showPopup"> <text class="prosecutors_req">*</text>
<view class="nes">
<view class="conclusion"> <view class="conclusion">
<text class="prosecutors_req">*</text>
<text class="prosecutors_pre">检查人员</text> <text class="prosecutors_pre">检查人员</text>
<text class="prosecutors_name">{{ selectedNames }}</text> <text class="prosecutors_name">{{ selectedNames }}</text>
</view> </view>
<view> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view></view>
</view> </view>
<view class="pitfall"> <view class="pitfall">
<view class="prosecutors"> <view class="prosecutors">
<view class="conclusion"> <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
<text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text> <view class="conclusion1">
<text class="prosecutors_pre">隐患明细</text> <text class="prosecutors_pre">隐患明细</text>
</view> </view>
</view> </view>
@ -75,12 +78,12 @@
</view> </view>
</view> </view>
<view class="prosecutors"> <view class="prosecutors">
<text class="prosecutors_req">*</text>
<view class="nes">
<view class="conclusion"> <view class="conclusion">
<text class="prosecutors_req">*</text>
<text class="prosecutors_pre">检查结论</text> <text class="prosecutors_pre">检查结论</text>
<picker class="prosecutors_name" bindchange="pickerChange" value="{{index}}" range="{{array}}"> <picker class="prosecutors_name" bindchange="pickerChange" value="{{index}}" range="{{array}}">
<view class="{{checkResultName?'':'gray'}}"> <view class="{{checkResultName?'':'gray'}}">
{{checkResultName?checkResultName:'请选择'}} {{checkResultName?checkResultName:'请选择'}}
</view> </view>
@ -89,22 +92,25 @@
<view class="conclusion_right"> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view>
</view>
</view> </view>
<view class="prosecutors"> <view class="prosecutors">
<view class="prosecutors_data"> <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
<text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text> <view class="nes">
<view class="conclusion">
<text class="prosecutors_pre">拟复查时间</text> <text class="prosecutors_pre">拟复查时间</text>
<view> <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{data}}">
<picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{data}}">
<view class="{{getData?'':'gray'}}"> <view class="{{getData?'':'gray'}}">
{{getData?getData:'请选择'}} {{getData?getData:'请选择'}}
</view> </view>
</picker> </picker>
</view>
</view> </view>
<view> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view>
</view>
</view> </view>
<view class="attachment"> <view class="attachment">
<view class="image-box"> <view class="image-box">
@ -125,7 +131,7 @@
<image wx:if="{{uploadImageList.length < 3}}" src="../../../../images/ig_tianjiatupian@2x.png" bindtap="chooseImage" /> <image wx:if="{{uploadImageList.length < 3}}" src="../../../../images/ig_tianjiatupian@2x.png" bindtap="chooseImage" />
</view> </view>
</view> </view>
<text class="text1">备注</text> <text class="text_27">备注</text>
<view class="textarea1"> <view class="textarea1">
<textarea placeholder-style="color: #C1C1C1;" bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="请输入" /> <textarea placeholder-style="color: #C1C1C1;" bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="请输入" />
</view> </view>

54
subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
View File

@ -15,6 +15,15 @@ page {
margin: 30rpx; margin: 30rpx;
} }
.prosecutors{ .prosecutors{
display: flex;
flex-direction:row;
align-items: center;
margin: 20rpx;
height: 80rpx;
}
.nes{
width: 630rpx;
display: flex; display: flex;
flex-direction:row; flex-direction:row;
align-items: center; align-items: center;
@ -27,9 +36,14 @@ page {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.conclusion1{
display: flex;
flex-direction: row;
margin-left: 20rpx;
}
.prosecutors_req{ .prosecutors_req{
color: red; color: red;
margin: 5rpx margin: 5rpx;
} }
.prosecutors_pre{ .prosecutors_pre{
width: 124rpx; width: 124rpx;
@ -58,7 +72,6 @@ page {
.prosecutors_img{ .prosecutors_img{
width: 40rpx; width: 40rpx;
height: 30rpx; height: 30rpx;
margin-right: 30rpx;
} }
.prosecutors_top{ .prosecutors_top{
display: flex; display: flex;
@ -97,6 +110,7 @@ page {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 20rpx; margin: 20rpx;
padding-left: 40rpx;
} }
.image1{ .image1{
margin-top: 20rpx; margin-top: 20rpx;
@ -108,6 +122,18 @@ page {
position: absolute; position: absolute;
top: 35rpx; top: 35rpx;
} }
.field-text{
width: 61rpx;
height: 31rpx;
overflow-wrap: break-word;
color: rgba(102,102,102,1);
font-size: 32rpx;
font-family: PingFang-SC-Regular;
font-weight: normal;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
}
.text1{ .text1{
width: 62rpx; width: 62rpx;
height: 30rpx; height: 30rpx;
@ -124,8 +150,9 @@ page {
.textarea1{ .textarea1{
margin-top: 20rpx; margin-top: 20rpx;
background-color:#f7f7f7 ; background-color:#f7f7f7 ;
width: 100%; width: 650rpx;
height: 200rpx; height: 200rpx;
margin-left: 40rpx;
} }
/* .text2{ /* .text2{
width: 133rpx; width: 133rpx;
@ -330,9 +357,8 @@ margin-bottom: 20rpx;
height: auto; height: auto;
border-radius: 16rpx; border-radius: 16rpx;
background: #fff; background: #fff;
margin-top: 20rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 34rpx 24rpx; padding: 34rpx 40rpx;
position: relative; position: relative;
display: flex; display: flex;
/* display: flex; /* display: flex;
@ -345,7 +371,7 @@ margin-bottom: 20rpx;
grid-template-rows: 214rpx; grid-template-rows: 214rpx;
grid-gap: 17rpx; grid-gap: 17rpx;
height: 188rpx; height: 188rpx;
margin-top:80rpx ; margin-top:50rpx ;
} }
.image-list-2 { .image-list-2 {
height: 428rpx !important; height: 428rpx !important;
@ -452,7 +478,7 @@ margin-bottom: 20rpx;
line-height: 42rpx; line-height: 42rpx;
} }
.requirement{ .requirement{
padding-left:20rpx ; padding-left:40rpx ;
} }
.popup-content{ .popup-content{
margin: 20rpx; margin: 20rpx;
@ -461,4 +487,18 @@ margin-bottom: 20rpx;
} }
.checkbox{ .checkbox{
margin: 40rpx; margin: 40rpx;
}
.text_27 {
margin-left: 40rpx;
margin-bottom: 30rpx;
width: 62rpx;
height: 30rpx;
overflow-wrap: break-word;
color: rgba(102,102,102,1);
font-size: 32rpx;
font-family: PingFang-SC-Regular;
font-weight: normal;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
} }

44
subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
View File

@ -1,20 +1,24 @@
<!--subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml--> <!--subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml-->
<view class="form_add"> <view class="form_add">
<view class="prosecutors" bind:tap="showPopup"> <view class="prosecutors" bind:tap="showPopup">
<text class="prosecutors_req">*</text> <text class="prosecutors_req">*</text>
<view> <view class="nes">
<text class="prosecutors_pre">检查人员</text> <view class="conclusion">
</view> <text class="prosecutors_pre">检查人员</text>
<text class="prosecutors_name">{{ selectedNames }}</text> <text class="prosecutors_name">{{ selectedNames }}</text>
</view>
<view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view></view>
</view> </view>
<view class="pitfall"> <view class="pitfall">
<view class="prosecutors" style="border-bottom: none;"> <view class="prosecutors" style="border-bottom: none;">
<view> <view>
<text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text> <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
<text class="prosecutors_pre">未整改隐患</text> <text class="prosecutors_pre1">未整改隐患</text>
</view> </view>
</view> </view>
<view class="checkbox1"> <view class="checkbox1">
@ -35,9 +39,10 @@
<text>再添加一条</text> <text>再添加一条</text>
</view> </view>
</view> </view>
<view class="prosecutors"> <view class="prosecutors" >
<text class="prosecutors_req">*</text>
<view class="nes">
<view class="conclusion"> <view class="conclusion">
<text class="prosecutors_req">*</text>
<text class="prosecutors_pre">检查结论</text> <text class="prosecutors_pre">检查结论</text>
<picker class="prosecutors_name" bindchange="pickerChange" value="{{checkResultFlag}}" range="{{array}}"> <picker class="prosecutors_name" bindchange="pickerChange" value="{{checkResultFlag}}" range="{{array}}">
<view class="{{checkResultFlagName?'':'gray'}}"> <view class="{{checkResultFlagName?'':'gray'}}">
@ -47,23 +52,24 @@
</view> </view>
<view class="conclusion_right"> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view></view>
</view> </view>
<view class="prosecutors"> <view class="prosecutors" >
<view class="prosecutors_data"> <text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text>
<text class="prosecutors_req" wx:if="{{checkResultFlag == 0}}">*</text> <view class="nes">
<view class="conclusion">
<text class="prosecutors_pre">拟复查时间</text> <text class="prosecutors_pre">拟复查时间</text>
<view> <picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
<picker mode="date" class="prosecutors_name" bindchange="pickerChange1" value="{{reviewTime}}">
<view class="{{reviewTime?'':'gray'}}"> <view class="{{reviewTime?'':'gray'}}">
{{reviewTime?reviewTime:'请选择'}} {{reviewTime?reviewTime:'请选择'}}
</view> </view>
</picker> </picker>
</view>
</view> </view>
<view> <view class="conclusion_right">
<image src="../../../../images/right.png" class="prosecutors_img"></image> <image src="../../../../images/right.png" class="prosecutors_img"></image>
</view> </view></view>
</view> </view>
<view class="image-box"> <view class="image-box">
<view class="{{ uploadImageList.length < 4 ? 'image-list' : uploadImageList.length > 3 && uploadImageList.length < 7 ? 'image-list image-list-2' : uploadImageList.length > 6 && uploadImageList.length < 10 ? 'image-list image-list-3' : 'image-list image-list-4' }}"> <view class="{{ uploadImageList.length < 4 ? 'image-list' : uploadImageList.length > 3 && uploadImageList.length < 7 ? 'image-list image-list-2' : uploadImageList.length > 6 && uploadImageList.length < 10 ? 'image-list image-list-3' : 'image-list image-list-4' }}">
@ -84,12 +90,10 @@
</view> </view>
</view> </view>
<view class="attachment"> <view class="attachment">
<text class="text1">备注</text> <text class="text1">备注</text>
<view class="textarea1"> <view class="textarea1">
<textarea placeholder-style="color: #C1C1C1;" bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="请输入" /> <textarea placeholder-style="color: #C1C1C1;" bindinput="bindRemarkInput" maxlength="100" placeholder-class="gray" placeholder="请输入" />
</view> </view>
</view> </view>
</view> </view>
<view class="form_record"> <view class="form_record">
@ -139,7 +143,7 @@
</view> </view>
<view wx:if="{{index}}" > <view wx:if="{{index}}" >
<text class="logs-content-title">巡查定位：</text> <text class="logs-content-title">巡查定位：</text>
<text class="logs-content-txt">{{item.address}}</text> <text class="logs-content-txt">{{item.reviewAddress}}</text>
</view> </view>
</view> </view>
</view> </view>

67
subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
View File

@ -30,46 +30,68 @@ page {
margin-top:20rpx ; margin-top:20rpx ;
} }
.prosecutors{ .prosecutors{
width: 650rpx;
display: flex; display: flex;
flex-direction:row; flex-direction:row;
align-items: center; align-items: center;
height: 100rpx; margin: 20rpx;
justify-content: space-between; height: 80rpx;
border-bottom: 1px solid #EAEAEA;
} }
.conclusion{ .conclusion{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.nes{
width: 630rpx;
display: flex;
flex-direction:row;
align-items: center;
margin: 20rpx;
justify-content: space-between;
height: 80rpx;
border-bottom: 1px solid #EAEAEA;
}
.prosecutors_req{ .prosecutors_req{
color: red; color: red;
margin: 5rpx margin: 5rpx
} }
.prosecutors_pre{ .prosecutors_pre{
/* width: 125rpx; */ width: 124rpx;
height: 50rpx; height: 31rpx;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(102,102,102,1); color: rgba(51,51,51,1);
font-size:32rpx; font-size: 32rpx;
font-family: PingFang-SC-Regular;
font-weight: normal;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
}
.prosecutors_pre1{
width: 124rpx;
height: 31rpx;
overflow-wrap: break-word;
color: rgba(51,51,51,1);
font-size: 32rpx;
font-family: PingFang-SC-Regular;
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 50rpx; line-height: 42rpx;
margin-left: 6rpx; margin-left: 20rpx;
} }
.prosecutors_name{ .prosecutors_name{
width: 400rpx; width: 150px;
height: 50rpx; height: 30rpx;
text-emphasis: none;
overflow: hidden;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 32rpx; font-size: 32rpx;
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 50rpx; line-height: 42rpx;
margin-left: 30rpx; margin-left: 60rpx;
} }
.prosecutors_img{ .prosecutors_img{
width: 40rpx; width: 40rpx;
@ -339,24 +361,13 @@ margin-bottom: 20rpx;
background: #fff; background: #fff;
margin-top: 20rpx; margin-top: 20rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 34rpx 24rpx; padding: 34rpx 60rpx;
position: relative; position: relative;
} }
.group{ .group{
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.image-box {
width: 100%;
height: auto;
border-radius: 16rpx;
background: #fff;
margin-top: 20rpx;
box-sizing: border-box;
padding: 34rpx 24rpx;
position: relative;
/* display: flex;
align-items: center; */
}
.image-box .image-list-label { .image-box .image-list-label {
position: absolute; position: absolute;
top: 35rpx; top: 35rpx;

Write Preview
Loading…
Cancel
Save