From 5ec458255a4537d933dedb8c7a725e59b762b66e Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 18 Oct 2024 09:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=81=E8=AF=81=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=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

---
 api/phaseTwo/homePage.js                  |  8 +++++
 pages/realName/workPlan-details/index.vue | 37 ++++++++++++++++-------
 pages/realName/workPlan/index.vue         |  2 +-
 utils/request.js                          |  2 +-
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/api/phaseTwo/homePage.js b/api/phaseTwo/homePage.js
index 59143b3..b4f68ed 100644
--- a/api/phaseTwo/homePage.js
+++ b/api/phaseTwo/homePage.js
@@ -40,3 +40,11 @@ export function getStandGuardImgApi(data) {
     data
   })
 }
+// 首页二级页面--作业计划详情-持证信息详情
+export function getHoldCardInfoApi(data) {
+  return request({
+    url: '/ynPlan/home/getDayUserCZ',
+    method: 'post',
+    data
+  })
+}
diff --git a/pages/realName/workPlan-details/index.vue b/pages/realName/workPlan-details/index.vue
index 78c1748..25d4740 100644
--- a/pages/realName/workPlan-details/index.vue
+++ b/pages/realName/workPlan-details/index.vue
@@ -61,11 +61,18 @@
     <uni-section title="人员持证" type="line">
       <uni-card :is-shadow="true" margin="6" padding="0">
         <view class="person-card">
-          <view class="blue-border">低压电工作业（9）</view>
-          <view class="orange-border">低压电工作业（9）</view>
+          <view
+            class="blue-border"
+            v-for="(item, index) in holdCardList"
+            :key="index"
+            @tap="onQueryCardDetails(item.certificateName)"
+          >
+            {{ item.certificateName }}({{ item.certificateNum }})
+          </view>
+          <!-- <view class="orange-border">低压电工作业（9）</view>
           <view class="green-border">低压电工作业（9）</view>
           <view class="blue-border">低压电工作业（9）</view>
-          <view class="orange-border">低压电工作业（9）</view>
+          <view class="orange-border">低压电工作业（9）</view> -->
         </view>
       </uni-card>
     </uni-section>
@@ -79,13 +86,19 @@
 </template>
 
 <script>
-import { getWorkPlanDetailsApi, getWorkPersonnelApi, getStandGuardImgApi } from '../../../api/phaseTwo/homePage'
+import {
+  getWorkPlanDetailsApi,
+  getWorkPersonnelApi,
+  getStandGuardImgApi,
+  getHoldCardInfoApi
+} from '../../../api/phaseTwo/homePage'
 export default {
   data() {
     return {
       queryInfo: {}, // 作业计划页面传递的参数
       todayWorkList: [], // 今日计划
       workPersonList: [], // 作业人员
+      holdCardList: [], // 持证信息
       standGuardList: [], // 站班信息
       contentId: '',
       commonParams: {
@@ -101,29 +114,31 @@ export default {
     /* 获取今日作业计划 */
     async getTodayWorkPlan() {
       const res = await getWorkPlanDetailsApi(this.commonParams)
-
       this.todayWorkList = res.data
-      this.contentId = res.data[0].contentId
-      console.log('今日计划数据', res)
     },
     /* 获取人员信息 */
     async getWorkPersonnelData() {
       const contentIdParams = {
         contentId: this.contentId
       }
-
       const params = Object.assign(this.commonParams, contentIdParams)
-      const { data: res } = await getWorkPersonnelApi(params)
+      const res = await getWorkPersonnelApi(params)
       const response = await getStandGuardImgApi(params)
 
-      this.workPersonList = res
-      console.log('res---人员持证等', response)
+      this.workPersonList = res.data
+      this.holdCardList = res.datac
       this.standGuardList = response.data
     },
     /* 点击作业计划时查询作业人员 */
     onSearchWorkPerson(id) {
       this.contentId = id
       this.getWorkPersonnelData()
+    },
+    /* 查询持证信息 */
+    async onQueryCardDetails(name) {
+      const params = Object.assign(this.commonParams, { certificateName: name })
+      const res = await getHoldCardInfoApi(params)
+      console.log('resresres持证信息详情--', res)
     }
   },
   onLoad(options) {
diff --git a/pages/realName/workPlan/index.vue b/pages/realName/workPlan/index.vue
index 20117bc..1f213f5 100644
--- a/pages/realName/workPlan/index.vue
+++ b/pages/realName/workPlan/index.vue
@@ -205,7 +205,7 @@ export default {
 <style lang="scss" scoped>
 .work-plan {
   background-color: #eee;
-  padding-top: 10px;
+  padding-top: 74px;
 
   .header-fixed {
     width: 100%;
diff --git a/utils/request.js b/utils/request.js
index 96e3c9f..69bee70 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -4,7 +4,7 @@ import { getToken, setToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
-let timeout = 10000
+let timeout = 60000
 const baseUrl = config.loginBaseUrl
 console.log('baseUrl-请求', baseUrl)