diff --git a/pages.json b/pages.json index 2c35a2d..5c378ca 100644 --- a/pages.json +++ b/pages.json @@ -254,13 +254,21 @@ "style": { "navigationStyle": "custom" } - },{ + }, + { //首页二级跳转页面 -- 人员列表 "path": "pages/realName/index/pages/personList", "style": { "navigationStyle": "custom" } }, + { + //首页三级级跳转页面 -- 人员信息 + "path": "pages/realName/index/pages/personDetail", + "style": { + "navigationStyle": "custom" + } + }, { //工作台 "path": "pages/realName/workbench/index", diff --git a/pages/realName/workPlan-details/index.vue b/pages/realName/workPlan-details/index.vue index 25d4740..34819dc 100644 --- a/pages/realName/workPlan-details/index.vue +++ b/pages/realName/workPlan-details/index.vue @@ -53,7 +53,9 @@ - {{ item.name }} + + {{ item.name }} + @@ -79,9 +81,48 @@ - 站班会照片 + + + + + + 持证信息 + + + + + + + + 持证名称 + 持证人姓名 + 工种 + + + + + + {{ item.certificateName }} + + + + + + {{ item.name }} + + + + + {{ item.gz }} + + + + + + + @@ -99,8 +140,10 @@ export default { todayWorkList: [], // 今日计划 workPersonList: [], // 作业人员 holdCardList: [], // 持证信息 + holdCardDetailsList: [], // 持证信息详情 standGuardList: [], // 站班信息 contentId: '', + loading: false, commonParams: { proName: '', day: this.$moment().format('YYYY-MM-DD') @@ -136,9 +179,27 @@ export default { }, /* 查询持证信息 */ async onQueryCardDetails(name) { + this.$refs.popup.open() const params = Object.assign(this.commonParams, { certificateName: name }) + + this.loading = true const res = await getHoldCardInfoApi(params) + // uni.hideLoading() + this.loading = false console.log('resresres持证信息详情--', res) + this.holdCardDetailsList = res.data + }, + /* 关闭持证信息弹框 */ + onClosePopup() { + uni.hideLoading() + this.$refs.popup.close() + }, + /* 持证详情列表点击事件 */ + onClickTableTr(id) { + console.log('id-----人员id', id) + + // 跳转人员信息页面 + uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` }) } }, onLoad(options) { @@ -221,4 +282,30 @@ export default { .person-card view:nth-child(3n + 1) { margin-left: 0; } + +.popup-center { + width: 90vw; + height: 50vh; + background-color: #fff; + .popup-title { + position: relative; + background-color: #3f9dfd; + height: 100rpx; + line-height: 100rpx; + text-align: center; + color: #fff; + font-size: 30rpx; + + .close-icon { + position: absolute; + right: 30rpx; + top: 0; + } + } + + .scroll-container { + width: 100%; + height: calc(100% - 100rpx); + } +} diff --git a/pages/realName/workPlan/index.vue b/pages/realName/workPlan/index.vue index 1f213f5..dbf7f77 100644 --- a/pages/realName/workPlan/index.vue +++ b/pages/realName/workPlan/index.vue @@ -26,12 +26,7 @@ - + {{ index + 1 }} {{ item.proName }} @@ -42,7 +37,7 @@ :style="{ color: item.isCollect == 1 ? '#f9971e' : '' }" > - + {{ item.subComName }} 可接受风险:{{ item.kjsfx }} @@ -51,7 +46,7 @@ 高风险:{{ item.gfx }} - + 作业人数 {{ item.personNum }} @@ -118,7 +113,6 @@ export default { methods: { /* 获取作业计划列表 */ async getWorkPlantData() { - console.log('this.queryParams参数', this.queryParams) uni.request({ url: config.loginBaseUrl + '/bmw/homeSubPage/getAppDayPlanMsg', method: 'POST', @@ -128,7 +122,6 @@ export default { // token: this.token }, success: res => { - console.log('res****', res) this.recordsTotal = res.data.recordsTotal this.companyInfoList = res.data.data }, @@ -193,6 +186,7 @@ export default { success: res => { if (res.data.code === 200) { uni.showToast({ icon: 'none', title: ` ${row.isCollect == 0 ? '收藏成功' : '已取消收藏'}` }) + this.getWorkPlantData() } }, fail: err => {}