Browse Source

安检巡查图片打不开,首页样式进行更改

v4.3.1_xiaowang_bug
是小王呀\24601 1 year ago
parent
commit
c979271680
  1. 4
      pages/index/index.wxml
  2. 53
      pages/index/index.wxss
  3. 4
      subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
  4. 71
      subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
  5. 24
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
  6. 4
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
  7. 1
      subpages/securityCheck/pages/securityCheck.wxml

4
pages/index/index.wxml

@ -107,7 +107,7 @@
未创建{{curMonth}}月份满意度自查 未创建{{curMonth}}月份满意度自查
</view> </view>
<view class="bg_new_right"> <view class="bg_new_right">
<image src="../../images/work/map.png" mode="" style="max-height: 200rpx;width: 200rpx;"/> <image src="../../images/work/map.png" mode="" style="max-height: 158rpx;width: 147rpx;"/>
</view> </view>
<text class="tag" wx:if="{{communitySelfInspTop.monthName}}">进行中</text> <text class="tag" wx:if="{{communitySelfInspTop.monthName}}">进行中</text>
</view> </view>
@ -134,7 +134,7 @@
<text class="more" bind:tap="moreNews">更多</text> <text class="more" bind:tap="moreNews">更多</text>
</view> </view>
<view class="card"> <view class="card">
<view class="Information" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail"> <view class=" {{index==4?'Information1':'Information' }}" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail">
<view class="Information_one"> <view class="Information_one">
<view class="one_one"> <view class="one_one">
<image src="../../images/index/Topping.png" class="Information_image" wx:if="{{item.msgType==resident_categiry}}"></image> <image src="../../images/index/Topping.png" class="Information_image" wx:if="{{item.msgType==resident_categiry}}"></image>

53
pages/index/index.wxss

@ -105,7 +105,7 @@ page {
flex-direction: row; flex-direction: row;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: -75rpx 0 0 30rpx; margin: -95rpx 0 0 30rpx;
} }
@ -740,7 +740,6 @@ page {
width: 700rpx; width: 700rpx;
height:auto ; height:auto ;
background-color: #FFFFFF; background-color: #FFFFFF;
margin: 20rpx 0 0 30rpx;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin: 20rpx 24rpx 0 24rpx; margin: 20rpx 24rpx 0 24rpx;
@ -749,13 +748,19 @@ page {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-direction: row; flex-direction: row;
margin: 30rpx 30rpx 30rpx 30rpx; margin: 30rpx 30rpx 0rpx 30rpx;
height:70rpx;
} }
.news_remind{ .news_remind{
font-family: PingFang SC; width: 202rpx;
font-weight: bold; height: 33rpx;
overflow-wrap: break-word;
color: rgba(51,51,51,1);
font-size: 34rpx; font-size: 34rpx;
color: #333333; font-family: PingFang-SC-Bold;
font-weight: 700;
text-align: left;
white-space: nowrap;
line-height: 52rpx; line-height: 52rpx;
} }
.more{ .more{
@ -764,15 +769,22 @@ page {
line-height: 36rpx; line-height: 36rpx;
} }
.Information{ .Information{
height: 110rpx; height: 115rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 10rpx 30rpx 30rpx 30rpx; margin: 10rpx 30rpx 0 30rpx;
border-bottom: 2rpx solid #EAEAEA; border-bottom: 2rpx solid #EAEAEA;
} }
.Information1{
height: 110rpx;
display: flex;
flex-direction: column;
margin: 10rpx 30rpx 0 30rpx;
}
.Information_one{ .Information_one{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 20rpx;
} }
.Information_test{ .Information_test{
@ -795,7 +807,7 @@ page {
.Information_two{ .Information_two{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 20rpx 0 0 0rpx; margin: 10rpx 0 20rpx 0rpx;
} }
.Information_test3{ .Information_test3{
width: 169rpx; width: 169rpx;
@ -838,7 +850,7 @@ line-height: 40rpx;
/* align-items: center; */ /* align-items: center; */
} }
.right text{ .right text{
font-size: 40rpx; font-size: 34rpx;
font-family: DIN Alternate; font-family: DIN Alternate;
color: #FF783C; color: #FF783C;
/* align-items: center; */ /* align-items: center; */
@ -849,7 +861,7 @@ line-height: 40rpx;
} }
.bg_new_box{ .bg_new_box{
background: #F9FBFE; background: #F9FBFE;
height: 300rpx; height: 230rpx;
width: 95%; width: 95%;
margin-top: -30rpx; margin-top: -30rpx;
margin-left: -10rpx; margin-left: -10rpx;
@ -862,7 +874,7 @@ line-height: 40rpx;
.bg_new_right{ .bg_new_right{
position: absolute; position: absolute;
float: right; float: right;
top: 50%; top: 70%;
transform: translateY(-50%); transform: translateY(-50%);
right: 0; right: 0;
} }
@ -879,6 +891,7 @@ line-height: 40rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #FF783C; color: #FF783C;
margin-top: 20rpx;
} }
.new_h2{ .new_h2{
margin-top: 30rpx; margin-top: 30rpx;
@ -894,14 +907,21 @@ line-height: 40rpx;
bottom: 0; bottom: 0;
margin-left: 30rpx; margin-left: 30rpx;
} }
.list{
width: 650rpx;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.list_card { .list_card {
width: 650rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
/* align-items: center; */ /* align-items: center; */
color: #333333; color: #333333;
border-bottom: 1px solid #f7f7f7; padding: 10rpx 0;
padding: 30rpx 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -911,7 +931,7 @@ line-height: 40rpx;
} }
.list_card:last-child { .list_card:last-child {
margin-top: 29rpx;
} }
.list_card .special { .list_card .special {
@ -926,6 +946,9 @@ line-height: 40rpx;
} }
.new_hh{ .new_hh{
margin-bottom: 12rpx; margin-bottom: 12rpx;
font-size: 34rpx;
color: #333333;
line-height: 52rpx;
} }
.new_submit{ .new_submit{
margin-top: 30rpx; margin-top: 30rpx;

4
subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml

@ -8,8 +8,8 @@
<text class="test_3">已提交人数:{{item.personQty}}</text> <text class="test_3">已提交人数:{{item.personQty}}</text>
</view> </view>
<view class="list_3"> <view class="list_3">
<button style="font-weight: 30;" class="button1" open-type="share" bind:tap="share" data-item="{{item}}">一键分享</button> <button style="font-weight: 30;" class="button1" open-type="share" bind:tap="share" data-item="{{item}}"><text class="text_one">一键分享</text></button>
<button style="font-weight: 30;" class="button" wx:key="index" data-item="{{item}}" bind:tap="handelClickedit">查看统计</button> <button style="font-weight: 30;" class="button" wx:key="index" data-item="{{item}}" bind:tap="handelClickedit"><text text class="text_two">查看统计</text></button>
</view> </view>
</view> </view>
<view class="content"> <view class="content">

71
subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss

@ -30,7 +30,7 @@ page {
.content .card .list_card{ .content .card .list_card{
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
padding: 30rpx; padding: 20rpx;
align-items: center; align-items: center;
color: #333333; color: #333333;
border-top: 1px solid #EAEAEA; border-top: 1px solid #EAEAEA;
@ -102,7 +102,7 @@ page {
font-size: 24rpx; font-size: 24rpx;
} }
.list_card .right .score b{ .list_card .right .score b{
font-size: 40rpx; font-size: 36rpx;
font-family: DIN Alternate; font-family: DIN Alternate;
font-weight: bold; font-weight: bold;
color: #FF783C; color: #FF783C;
@ -189,51 +189,60 @@ page {
} }
.list_3{ .list_3{
width: 100%; width: 351rpx;
height: 56rpx; height: 56rpx;
flex-direction: row; flex-direction: row;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: start; justify-content: start;
margin: 40rpx 0 0 0; margin: 45rpx 0 0 0;
} }
.button{ .button{
width: 200rpx;
display: flex;
flex-direction: row;
justify-content: flex-start;
border-radius: 43rpx;
color: rgba(51,51,51,1);
font-size: 30rpx;
font-family:PingFang-SC-Medium;
margin: 20rpx 0 0 15rpx;
box-sizing: border-box;
font-weight: 500rpx;
height: 56rpx;
line-height: 86rpx;
background-color: rgba(57,116,246,1.000000); background-color: rgba(57,116,246,1.000000);
border-radius: 28rpx;
height: 56rpx;
display: flex;
flex-direction: column;
width: 160rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.button1{ .button1{
width: 200rpx; width: 160rpx;
display: flex;
flex-direction: row;
justify-content: flex-start;
border-radius: 43rpx;
color: rgba(51,51,51,1);
font-size: 30rpx;
font-family:PingFang-SC-Medium;
margin: 20rpx 0 0 15rpx;
box-sizing: border-box;
font-weight: 500rpx;
height: 56rpx; height: 56rpx;
line-height: 86rpx; border-radius: 28rpx;
background-color: rgba(255,255,255,1.000000);
border: 1px solid rgba(153,153,153,1);
display: flex;
flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-right: 40rpx;
}
.text_one{
width: 118rpx;
height: 28rpx;
font-family: PingFang SC;
font-size: 30rpx;
color: #333333;
line-height: 42rpx;
margin-bottom: 10rpx;
}
.text_two{
width: 118rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(255,255,255,1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
white-space: nowrap;
line-height: 42rpx;
margin-bottom: 10rpx;
margin-left: 5rpx;
} }

24
subpages/safetyinspection/pages/safetyinspection/safetyinspection.js

@ -11,6 +11,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
attachmentUrl:"", attachmentUrl:"",
imageshow:false, imageshow:false,
orgid:'', orgid:'',
@ -56,7 +57,6 @@ Page({
checkResultFlagRouter:options.flag, checkResultFlagRouter:options.flag,
}) })
console.log(options.resiId,App.globalData.user.agencyId,options.flag)
} }
this.showRecordData() this.showRecordData()
this.toOinspectionStaff() this.toOinspectionStaff()
@ -109,7 +109,6 @@ Page({
}, },
onImage(e){ onImage(e){
const attachmentUrls = e.currentTarget.dataset.item; const attachmentUrls = e.currentTarget.dataset.item;
console.log(attachmentUrls.attachmentUrl);
this.setData({ this.setData({
imageshow: true, imageshow: true,
attachmentUrl:attachmentUrls.attachmentUrl attachmentUrl:attachmentUrls.attachmentUrl
@ -206,6 +205,7 @@ Page({
item.hiddenDangeList1 = []; item.hiddenDangeList1 = [];
item.hiddenDangeList2 = []; item.hiddenDangeList2 = [];
item.hiddenDangeList3 = []; item.hiddenDangeList3 = [];
item.hiddenDangeList4 = [];
item.hiddenDangeList.forEach(itemC => { item.hiddenDangeList.forEach(itemC => {
if (itemC.hazardStatus === 0) { if (itemC.hazardStatus === 0) {
item.hiddenDangeList0.push(itemC); item.hiddenDangeList0.push(itemC);
@ -217,7 +217,6 @@ Page({
}); });
} }
}); });
if(res.data[0].hiddenDangeList){ if(res.data[0].hiddenDangeList){
let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:1})); let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:1}));
this.setData({ this.setData({
@ -227,6 +226,25 @@ Page({
this.setData({ this.setData({
showList:res.data showList:res.data
}) })
const updatedShowList = this.data.showList.map((item, index, array) => {
if (index < array.length - 1) {
if (array[index + 1].checkResultFlag === 1 && item.checkResultFlag === 0) {
return {
...item,
hiddenDangeList3: true
};
}else{
return {
...item,
hiddenDangeList3:false
};
}
}
return item;
});
this.setData({
showList:updatedShowList
})
}) })
}, },
toOinspectionStaff(){ toOinspectionStaff(){

4
subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml

@ -128,7 +128,7 @@
<text class="logs-content-txt">{{item.checkResultFlag == 1?'合格':'不合格'}}</text> <text class="logs-content-txt">{{item.checkResultFlag == 1?'合格':'不合格'}}</text>
</view> </view>
<view wx:if="{{item.hiddenDangeList0.length}}"> <view wx:if="{{item.hiddenDangeList0.length}}">
<text class="logs-content-title">{{item.hiddenDangeList2.length ==0?'未整改隐患: ':'隐患明细:'}}</text> <text class="logs-content-title">{{!item.hiddenDangeList3?'未整改隐患:':'隐患明细:'}}</text>
<text class="logs-content-txt" name="{{index}}" wx:for="{{item.hiddenDangeList0}}">{{index + 1}}.{{item.hazardDesc}}</text> <text class="logs-content-txt" name="{{index}}" wx:for="{{item.hiddenDangeList0}}">{{index + 1}}.{{item.hazardDesc}}</text>
</view> </view>
<view wx:if="{{item.hiddenDangeList1.length}}"> <view wx:if="{{item.hiddenDangeList1.length}}">
@ -163,7 +163,7 @@
</view> </view>
</view> </view>
<view style="height: 100rpx; width: 100%;"></view> <view style="height: 100rpx; width: 100%;"></view>
<view class="footer"> <view class="footer" wx:if="{{checkResultFlagRouter==0}}">
<view class="btn" bind:tap="handelClickSave"> <view class="btn" bind:tap="handelClickSave">
<text class="btn_text">提交</text> <text class="btn_text">提交</text>
</view> </view>

1
subpages/securityCheck/pages/securityCheck.wxml

@ -30,7 +30,6 @@
已整改隐患:<text wx:for="{{item.hiddenDangeList1}}" wx:key="indexC" wx:for-index='indexC'>{{indexC+1}}.{{item.hazardDesc}} </text> 已整改隐患:<text wx:for="{{item.hiddenDangeList1}}" wx:key="indexC" wx:for-index='indexC'>{{indexC+1}}.{{item.hazardDesc}} </text>
</view> </view>
</view> </view>
<text wx:else class="title_mall">已整改隐患:--</text>
<view class="title_mall">拟复查时间: {{item.reviewTime}}</view> <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
</view> </view>
</view> </view>

Loading…
Cancel
Save