作业计划详情页面调试完成

.hbuilderx/launch.json

@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

pages/realName/index/components/pie-charts-model.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="charts-container">
-    <qiun-data-charts type="rose" :opts="opts" :chartData="chartData" />
+    <qiun-data-charts type="rose" :opts="opts" :chartData="chartData" @getIndex="handleChartClick" />
   </view>
 </template>
 
@@ -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('图表点击-------')
     }
   }
 }

pages/realName/workPlan-details/index.vue

@@ -63,12 +63,7 @@
     <uni-section title="人员持证" type="line">
       <uni-card :is-shadow="true" margin="6" padding="0">
         <view class="person-card">
-          <view
+          <view class="blue-border" v-for="(item, index) in holdCardList" :key="index" @tap="onQueryCardDetails(item)">
-            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>
@@ -92,35 +87,42 @@
           <uni-icons class="close-icon" style="color: #fff" type="close" size="26" @tap="onClosePopup"></uni-icons>
         </view>
 
-        <scroll-view class="scroll-container" scroll-y>
+        <uni-section title="持证人员列表" type="line">
-          <uni-table emptyText="暂无更多数据" :loading="loading">
+          <template v-slot:right>
-            <!-- 表头行 -->
+            <view
-            <uni-tr>
+              style="
-              <uni-th width="30" align="center">持证名称</uni-th>
+                padding: 10rpx;
-              <uni-th width="30" align="center">持证人姓名</uni-th>
+                border-radius: 12rpx;
-              <uni-th width="30" align="center">工种</uni-th>
+                border: 1px solid #3f9dfd;
-            </uni-tr>
+                color: #3f9dfd;
-            <!-- 表格数据行 -->
+                background-color: #d5e7f9;
-            <uni-tr v-for="item in holdCardDetailsList" :key="item.idNumber">
+              "
-              <uni-td align="center">
+            >
-                <view @tap="onClickTableTr(item.idNumber)">
+              {{ holdCardTitle }}
-                  {{ item.certificateName }}
+            </view>
-                </view>
+          </template>
-              </uni-td>
+        </uni-section>
 
-              <uni-td align="center">
+        <view class="table-th">
-                <view @tap="onClickTableTr(item.idNumber)">
+          <view>持证名称</view>
-                  {{ item.name }}
+          <view>持证人姓名</view>
-                </view>
+          <view>工种</view>
-              </uni-td>
+        </view>
-              <uni-td align="center">
+
-                <view @tap="onClickTableTr(item.idNumber)">
+        <view style="padding: 5rpx">
-                  {{ item.gz }}
+          <scroll-view style="height: 400rpx" scroll-y="true">
-                </view>
+            <view
-              </uni-td>
+              class="table-tr"
-            </uni-tr>
+              v-for="item in holdCardDetailsList"
-          </uni-table>
+              :key="item.idNumber"
-        </scroll-view>
+              @tap="onClickTableTr(item.idNumber)"
+            >
+              <view>{{ item.certificateName }}</view>
+              <view>{{ item.name }}</view>
+              <view>{{ item.gz }}</view>
+            </view>
+          </scroll-view>
+        </view>
       </view>
     </uni-popup>
   </view>
@@ -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 })
+      const params = Object.assign(this.commonParams, { certificateName: item.certificateName })
-
+      uni.showLoading({
-      this.loading = true
+        title: '数据加载中'
+      })
       const res = await getHoldCardInfoApi(params)
-      // uni.hideLoading()
+      uni.hideLoading()
-      this.loading = false
       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;
+  }
 }
 </style>