From 081aa07f63e6be9842b9d13a8778d38ab727339e Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 6 Jun 2024 16:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carManage/searchTeam/personDetail.vue | 5 +- .../bindPlatePlug/safeMesure.vue | 8 ++-- .../specialOperations/fireWork/safeMesure.vue | 10 ++-- .../groundSafe/safeMesure.vue | 10 ++-- .../specialOperations/highJob/safeMesure.vue | 10 ++-- .../hoistSafe/safeMesure.vue | 10 ++-- .../limitSpaceWork/safeMesure.vue | 10 ++-- .../openCircuit/safeMesure.vue | 10 ++-- .../tempElectricity/safeMesure.vue | 10 ++-- .../trainPlan/searchTeam/personList.vue | 47 +++++++++++++++---- 10 files changed, 88 insertions(+), 42 deletions(-) diff --git a/pages/projectEnd/carManage/searchTeam/personDetail.vue b/pages/projectEnd/carManage/searchTeam/personDetail.vue index 58c0ec71..23920272 100644 --- a/pages/projectEnd/carManage/searchTeam/personDetail.vue +++ b/pages/projectEnd/carManage/searchTeam/personDetail.vue @@ -325,7 +325,7 @@ width: 100%; margin: 20rpx 0; box-shadow: 0 8rpx 26rpx 0 rgba(212, 220, 236, 0.67); - padding: 20rpx 20rpx 20rpx 28rpx; + padding: 20rpx 20rpx 20rpx 20rpx; box-sizing: border-box; border-radius: 16rpx; } @@ -340,7 +340,7 @@ .item_wrap { width: 100%; flex-wrap: wrap; - justify-content: space-between; + /* justify-content: space-between; */ } .item_wrap .item { @@ -353,6 +353,7 @@ line-height: 84rpx; position: relative; margin-top: 14rpx; + margin-left: 8rpx; } .item_wrap .item .state1 { diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue index fb6211de..fead0b2a 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,7 +66,8 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { @@ -74,6 +75,7 @@ }, onLoad(options) { this.detailId = options.detailId + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue index 901c5874..36b67fba 100644 --- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue +++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue index 7cc85a4b..317ea1ae 100644 --- a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue +++ b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/highJob/safeMesure.vue b/pages/projectEnd/specialOperations/highJob/safeMesure.vue index 957475c8..83ce3472 100644 --- a/pages/projectEnd/specialOperations/highJob/safeMesure.vue +++ b/pages/projectEnd/specialOperations/highJob/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue index 7449bf3e..0e693959 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue index 747d2848..5d0e03f7 100644 --- a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue +++ b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue index 1a0d1f8c..4bac43dc 100644 --- a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue +++ b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0,c }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId; + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue index a4cb9ada..a73a17b3 100644 --- a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue +++ b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue @@ -5,7 +5,7 @@ 安全措施 - + 安全措施 是否涉及 @@ -66,14 +66,16 @@ detailId: '', detailData: '', safeMeasure:[], - otherSafeMeasure: [] + otherSafeMeasure: [], + statusBarHeight: 0, }; }, created() { this.getWork() }, onLoad(options) { - this.detailId = options.detailId + this.detailId = options.detailId, + this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; }, methods:{ getWork(){ @@ -112,7 +114,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 138rpx; + // padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/trainPlan/searchTeam/personList.vue b/pages/projectEnd/trainPlan/searchTeam/personList.vue index 6dd6fc19..26ce3089 100644 --- a/pages/projectEnd/trainPlan/searchTeam/personList.vue +++ b/pages/projectEnd/trainPlan/searchTeam/personList.vue @@ -4,13 +4,13 @@ 人员列表 - + @@ -60,7 +60,9 @@ pageNo: 1, pageSize: 100, objData: "", - selectCheckVal: [] + selectCheckVal: [], + isChecked: false, + isDisable: false, }; }, onLoad(options) { @@ -80,9 +82,16 @@ }, methods: { // 全选 - // selectAll(){ - - // }, + selectAll(e) { + this.isChecked = e.detail.value.length > 0 ? true : false; + this.personList = this.personList.map(item => { + return { + ...item, + isChecked: !item.isDisable ? this.isChecked : item.isChecked, + }; + }); + this.selectCheckVal = this.personList.filter(item => item.isChecked).map(item => item.checkVal); + }, addSaveBtn() { let dealData = []; this.personList.map(item => { @@ -110,8 +119,15 @@ }) }, checkboxChange(e) { - console.log(e) - this.selectCheckVal = e.detail.value + console.log(e, "11111") + this.selectCheckVal = e.detail.value; + this.personList = this.personList.map(item => { + return { + ...item, + isChecked: !this.selectCheckVal.includes(item.checkVal) ? false : true, + }; + }); + this.isChecked = e.detail.value.length == this.personList.length ? true : false; }, loadData() { var that = this @@ -144,6 +160,7 @@ item.isDisable = false; item.isChecked = false; }) + that.isChecked = false; if (uni.getStorageSync("personInfo")) { let storeArr = JSON.parse(uni.getStorageSync("personInfo")) that.personList.map((item, index) => { @@ -154,6 +171,10 @@ item.isChecked = true; } }) + that.isDisable = that.personList.filter(item => item.isChecked == true).length == that + .personList.length ? true : false; + that.isChecked = that.personList.filter(item => item.isChecked == true).length == that + .personList.length ? true : false; } } }) @@ -168,6 +189,14 @@