From f7b62e5a7cb51875b76b27527c24392b971eb26f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 17 Jun 2024 14:27:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E6=A3=80=E5=B7=A1=E9=98=B2?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/securityCheck/pages/securityCheck.js | 46 +++---- .../securityCheck/pages/securityCheck.json | 5 +- .../securityCheck/pages/securityCheck.wxml | 113 +++++++++--------- .../securityCheck/pages/securityCheck.wxss | 17 +-- 4 files changed, 90 insertions(+), 91 deletions(-) diff --git a/subpages/securityCheck/pages/securityCheck.js b/subpages/securityCheck/pages/securityCheck.js index 7fb2e33..dcedb25 100644 --- a/subpages/securityCheck/pages/securityCheck.js +++ b/subpages/securityCheck/pages/securityCheck.js @@ -2,11 +2,10 @@ import {securityCheckk} from "../../../utils/api"; Page({ data: { + active:0, pageNo: 1, - pageSize:3, + pageSize:20, id: 0, - waitingCheckStyle: "color: #1974ec;border-bottom: 2px solid blue;", - qualifiedStyle: "", marsi:[ // ], @@ -51,7 +50,9 @@ getList() { pageSize: this.data.pageSize, checkResultFlag: this.data.checkResultFlag }).then(({ data }) => { + data.list.forEach(item => { + console.log(item); if (item.hiddenDangeList) { if (item.hiddenDangeList.findIndex(itemC => itemC.hazardStatus === 2) === -1) { item.status = true; @@ -71,6 +72,7 @@ getList() { nodata: true }); } + console.log(this.data.flag1Array); if (this.data.flag1Array.length === 0) { this.setData({ loadMoreVisible: false, @@ -104,26 +106,26 @@ getList() { }) }, toggleColor(e) { - let value = e.currentTarget.dataset.value; // 获取点击选项的值 - if (value === "1") { - this.setData({ - waitingCheckStyle: "color: blue;border-bottom: 2px solid blue;", - qualifiedStyle: "", - flag0Array: [] - }); - this.data.checkResultFlag = 0 - this.data.pageNo = 1 - this.getList() - } else if (value === "2") { - this.setData({ - waitingCheckStyle: "", - qualifiedStyle: "color: blue; border-bottom: 2px solid blue;", - flag1Array: [] - }); - this.data.checkResultFlag = 1 - this.data.pageNo = 1 - this.getList() + console.log(e.detail.index); + const let1 =e.detail.index + if (e.detail.index==0) { + this.setData({ + checkResultFlag:let1 + }) + this.getList() + console.log(this.data.checkResultFlag); } + else{ + this.setData({ + checkResultFlag:let1 + }) + this.getList() + console.log(this.data.checkResultFlag); + } + this.setData({ + active:let1 + }) + }, qualifed(){ wx.navigateTo({ diff --git a/subpages/securityCheck/pages/securityCheck.json b/subpages/securityCheck/pages/securityCheck.json index 6a88a8d..af119c3 100644 --- a/subpages/securityCheck/pages/securityCheck.json +++ b/subpages/securityCheck/pages/securityCheck.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index" + }, "navigationBarTitleText": "安检巡查" } \ No newline at end of file diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml index ee3388a..3c211a7 100644 --- a/subpages/securityCheck/pages/securityCheck.wxml +++ b/subpages/securityCheck/pages/securityCheck.wxml @@ -1,67 +1,66 @@ - - - - 待复核 - - - 已合格 - - - - - - - - - {{item.name}} - 检查时间: {{item.orderDate}} - 检查人员: {{item.checkPersons}} - {{item.status?'未整改隐患':'隐患明细'}}: - {{index+1}}.{{item.hazardDesc}} - - - - 整改要求:{{item.hazardDesc}} - - - - - 已整改隐患:{{indexC+1}}.{{item.hazardDesc}} - - - 拟复查时间: {{item.reviewTime}} + + + + + + + + + {{item.name}} + 检查时间: {{item.orderDate}} + 检查人员: {{item.checkPersons}} + {{item.status?'未整改隐患':'隐患明细'}}: + {{index+1}}.{{item.hazardDesc}} + + + + 整改要求:{{item.hazardDesc}} + + + + + 已整改隐患:{{indexC+1}}.{{item.hazardDesc}} + + + 拟复查时间: {{item.reviewTime}} + + + + + + + - - - - - - - + + + + + + + {{item.name}} + 检查时间: {{item.createdTime}} + 检查人员: {{item.checkPersons}} + 检查结论: 合格 - - - - {{item.name}} - 检查时间: {{item.createdTime}} - 检查人员: {{item.checkPersons}} - 检查结论: 合格 - 合格时间: {{item.orderDate}} + - - - - - - + + + + + - - + + + + + + - + + \ No newline at end of file diff --git a/subpages/securityCheck/pages/securityCheck.wxss b/subpages/securityCheck/pages/securityCheck.wxss index 259b177..f751738 100644 --- a/subpages/securityCheck/pages/securityCheck.wxss +++ b/subpages/securityCheck/pages/securityCheck.wxss @@ -10,15 +10,10 @@ page{ flex-direction: column; } .search{ - height: 110rpx; width: 100%; - padding:0 22rpx; box-sizing: border-box; - background-color: #fff; - display: flex; align-items: center; /* justify-content: space-between; */ - padding-top: 20rpx; box-sizing: border-box; justify-content: center; } @@ -28,8 +23,6 @@ page{ margin-right: 60rpx; } .row1{ - display: flex; - flex-direction: row; font-size: 30rpx } .box_2 { @@ -53,11 +46,11 @@ page{ overflow-y: auto; } */ .section_5 { - width: 100%; height: 1395rpx; display: flex; flex-direction: column; overflow: hidden; + padding: 20rpx; } .content_1{ display: flex; @@ -108,19 +101,20 @@ page{ margin-left: 332rpx; } .list_1 { - /* width: 710rpx; */ + width: 700rpx; /* height: 603rpx; */ /* display: flex; */ /* flex-direction: column; */ /* justify-content: space-between; */ - margin: 20rpx 0 0 20rpx; + display: flex; /* width: 100%; */ + margin-bottom: 20rpx; } .section_1-0 { background-color: rgba(255,255,255,1.000000); border-radius: 20rpx; /* height: 410rpx; */ - /* width: 710rpx; */ + width: 710rpx; display: flex; flex-direction: column; padding-bottom: 10px; @@ -186,6 +180,7 @@ margin-left: 30rpx; .image-wrapper{ width: 190rpx; height: 190rpx; + } From 0c91d24c3156792df551876451193ac2bfa7aca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 19 Jun 2024 18:01:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/mine.wxml | 6 +++--- pages/resiAndHouse/resiAndHouse.wxml | 2 +- pages/resiAndHouse/resiAndHouse.wxss | 6 ++++-- subpages/addResi/pages/addResi/addResi.wxml | 2 +- .../pages/dissatisfied/demandCheck/demandCheck.wxml | 8 ++++---- .../pages/residentCategory/residentCategory.wxml | 2 +- .../pages/residentCategory/residentCategory.wxss | 6 +++++- .../pages/resnoinformation/resnoinformation.wxss | 3 +++ subpages/searchResult/pages/resiInfo/resiInfo.wxss | 1 + subpages/securityCheck/pages/securityCheck.wxml | 4 ++-- subpages/securityCheck/pages/securityCheck.wxss | 3 +++ 11 files changed, 28 insertions(+), 15 deletions(-) diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 4e4f6c6..b1b3d72 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -51,21 +51,21 @@ --> - + 设置 - + 修改密码 - + 使用指南 diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index 29d6e3e..2da4b81 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -51,7 +51,7 @@ - + diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 5a43b5b..164dbe2 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -458,7 +458,7 @@ page { } .box_18 { - width: 100%; + width: 400rpx; /* height: 36rpx; */ flex-direction: row; align-items: center; @@ -509,6 +509,8 @@ page { } .text-wrapper_9 { + position: absolute; + right: 0; display: flex; width: 300rpx; overflow-wrap: break-word; @@ -1340,7 +1342,7 @@ page { /* max-width: 302rpx; */ flex: 1; overflow-x: scroll; - padding: 10rpx 0 0; + box-sizing: border-box; margin-left: 16rpx; font-size: 24rpx; diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index 1e686fa..273d263 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -156,7 +156,7 @@ - + diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index c34eba0..8b1ebf6 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -10,7 +10,7 @@ 所属组织 - {{agencyName?agencyName:'请选择-'}} + {{agencyName?agencyName:'请选择'}} @@ -106,7 +106,7 @@ {{tabVal === '1'?'需求时间':'发生时间'}} - {{showTime?showTime:'请选择'}} + {{showTime?showTime:'请选择'}} @@ -136,7 +136,7 @@ {{tabVal === '1'?'需求人':'联系人'}} - + {{resiName?resiName:'请选择'}} @@ -145,7 +145,7 @@ * - 联系电话 + 联系电话