From 7bb1b1c123aba0258e30e020c3677f2bc56becc0 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 18 Oct 2024 14:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- .../index/components/pie-charts-model.vue | 8 +- pages/realName/workPlan-details/index.vue | 116 +++++++++++------- 3 files changed, 81 insertions(+), 45 deletions(-) diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9b0d791..4ccd172 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/pages/realName/index/components/pie-charts-model.vue b/pages/realName/index/components/pie-charts-model.vue index 32b37f3..b8c2d61 100644 --- a/pages/realName/index/components/pie-charts-model.vue +++ b/pages/realName/index/components/pie-charts-model.vue @@ -1,6 +1,6 @@ @@ -80,6 +80,9 @@ export default { labelBgOpacity: 0.7, labelFontColor: '#666666' } + }, + onClick: e => { + console.log('eeeee图表点击了---', e) } } } @@ -133,6 +136,9 @@ export default { this.chartData = JSON.parse(JSON.stringify(data)) }, 500) }) + }, + handleChartClick() { + console.log('图表点击-------') } } } diff --git a/pages/realName/workPlan-details/index.vue b/pages/realName/workPlan-details/index.vue index 34819dc..e50af56 100644 --- a/pages/realName/workPlan-details/index.vue +++ b/pages/realName/workPlan-details/index.vue @@ -63,12 +63,7 @@ - + {{ item.certificateName }}({{ item.certificateNum }}) - - 持证名称 - 持证人姓名 - 工种 - - - - - - {{ item.certificateName }} - - + + + - - - {{ item.name }} - - - - - {{ item.gz }} - - - - - + + 持证名称 + 持证人姓名 + 工种 + + + + + + {{ item.certificateName }} + {{ item.name }} + {{ item.gz }} + + + @@ -140,6 +142,7 @@ export default { todayWorkList: [], // 今日计划 workPersonList: [], // 作业人员 holdCardList: [], // 持证信息 + holdCardTitle: '', holdCardDetailsList: [], // 持证信息详情 standGuardList: [], // 站班信息 contentId: '', @@ -178,14 +181,15 @@ export default { this.getWorkPersonnelData() }, /* 查询持证信息 */ - async onQueryCardDetails(name) { + async onQueryCardDetails(item) { + this.holdCardTitle = `${item.certificateName}(${item.certificateNum})` this.$refs.popup.open() - const params = Object.assign(this.commonParams, { certificateName: name }) - - this.loading = true + const params = Object.assign(this.commonParams, { certificateName: item.certificateName }) + uni.showLoading({ + title: '数据加载中' + }) const res = await getHoldCardInfoApi(params) - // uni.hideLoading() - this.loading = false + uni.hideLoading() console.log('resresres持证信息详情--', res) this.holdCardDetailsList = res.data }, @@ -196,8 +200,6 @@ export default { }, /* 持证详情列表点击事件 */ onClickTableTr(id) { - console.log('id-----人员id', id) - // 跳转人员信息页面 uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` }) } @@ -287,6 +289,7 @@ export default { width: 90vw; height: 50vh; background-color: #fff; + overflow: hidden; .popup-title { position: relative; background-color: #3f9dfd; @@ -294,7 +297,7 @@ export default { line-height: 100rpx; text-align: center; color: #fff; - font-size: 30rpx; + font-size: 38rpx; .close-icon { position: absolute; @@ -307,5 +310,32 @@ export default { width: 100%; height: calc(100% - 100rpx); } + + .table-th { + display: flex; + view { + padding: 5rpx 0; + flex: 1; + text-align: center; + font-size: 32rpx; + font-weight: bold; + } + } + + .table-tr { + padding: 8rpx 0; + display: flex; + border-bottom: 1px solid #ccc; + view { + padding: 5rpx 0; + flex: 1; + font-size: 30rpx; + text-align: center; + } + } + + .table-tr view:first-child { + text-align: left; + } }