diff --git a/project/pingchang/apps/AppHealthReport/components/Detail.vue b/project/pingchang/apps/AppHealthReport/components/Detail.vue
index 8bf945fd..1b5d7b68 100644
--- a/project/pingchang/apps/AppHealthReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHealthReport/components/Detail.vue
@@ -41,6 +41,13 @@
                   </ai-uploader>
                 </template>
               </el-table-column>
+              <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
+                <template slot-scope="{ row }">
+                  <div class="table-options">
+                    <el-button type="text" @click="toDetail(row)">详情</el-button>
+                  </div>
+                </template>
+              </el-table-column>
             </ai-table>
           </template>
         </ai-card>
@@ -74,6 +81,52 @@
           </template>
         </ai-card>
       </div>
+      <ai-dialog
+        :visible.sync="isShow"
+        width="890px"
+        customFooter
+        title="上报详情">
+        <ai-bar title="健康状况"></ai-bar>
+        <ai-wrapper
+          label-width="120px">
+          <ai-info-item label="当前体温">
+            <span :style="{color: reportInfo.temperature > 37.3 ? '#FF4466' : '#42D784'}">{{ reportInfo.temperature }}℃</span>
+          </ai-info-item>
+          <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
+            <span :style="{color: reportInfo.contactPatients === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicTouchInFourteen', reportInfo.contactPatients) }}</span>
+          </ai-info-item>
+          <ai-info-item label="当前健康状况" isLine>
+            <span :style="{color: !reportInfo.isHealth ? '#42D784' : '#FF4466'}">{{ reportInfo.healthName }}</span>
+          </ai-info-item>
+        </ai-wrapper>
+        <ai-bar title="核酸检测信息"></ai-bar>
+        <ai-wrapper
+          label-width="120px">
+          <ai-info-item label="检测日期">
+            <span>{{ reportInfo.nucleicAcidDate && reportInfo.nucleicAcidDate.split(' ')[0] }}</span>
+          </ai-info-item>
+          <ai-info-item label="检测结果">
+            <span :style="{color: reportInfo.nucleicAcidResult === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('EP_nucleicAcidResult', reportInfo.nucleicAcidResult) }}</span>
+          </ai-info-item>
+          <ai-info-item label="健康码状态">
+            <span :style="{color: (reportInfo.jkmType === '0' || reportInfo.jkmType === '1') ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('EP_jkmType', reportInfo.jkmType) }}</span>
+          </ai-info-item>
+          <ai-info-item label="已接种疫苗次数">
+            <span>{{ $dict.getLabel('EP_vaccinationCount', reportInfo.vaccinationCount) }}</span>
+          </ai-info-item>
+          <ai-info-item label="本人健康码截图" isLine>
+            <ai-uploader
+              :instance="instance"
+              :value="[{url: reportInfo.jkmUrl}]"
+              disabled
+              :limit="9">
+            </ai-uploader>
+          </ai-info-item>
+        </ai-wrapper>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="isShow = false">关闭</el-button>
+        </div>
+      </ai-dialog>
     </template>
   </ai-detail>
 </template>
@@ -95,6 +148,7 @@
         currIndex: 0,
         isLoading: false,
         riskDisposalInfo: {},
+        reportInfo: {},
         tableData: [],
         colConfigs1: [
           {prop: 'createTime', label: '上报日期', align: 'center' },
@@ -127,7 +181,9 @@
       this.isLoading = true
       if (this.params && this.params.id) {
         this.id = this.params.id
-        this.getInfo(this.params.id)
+        this.dict.load(['EP_vaccinationCount', 'EP_jkmType', 'epidemicTouchInFourteen', 'EP_healthType']).then(() => {
+          this.getInfo(this.params.id)
+        })
       }
     },
 
@@ -137,11 +193,8 @@
           if (res.code === 0) {
             this.info = res.data
 
-            console.log(res.data.handleLogs.filter(v => v.riskRelief))
-
             if (res.data.handleLogs && res.data.handleLogs.length) {
               this.riskDisposalInfo = res.data.handleLogs.filter(v => v.riskRelief).length ? res.data.handleLogs.filter(v => !v.riskRelief)[0] : {}
-              console.log(this.riskDisposalInfo)
 
               this.info.handleLogs = res.data.handleLogs.filter(v => !v.riskRelief)
             }
@@ -153,6 +206,37 @@
         })
       },
 
+      toDetail (row) {
+        this.reportInfo = row
+        this.isShow = true
+        let healthName = ''
+        this.reportInfo.isHealth = false
+        row.health.split(',').forEach(v => {
+          if (v > 0) {
+            this.reportInfo.isHealth = true
+          }
+          healthName = healthName + this.dict.getLabel('EP_healthType', v)
+        })
+        this.reportInfo.healthName = healthName
+        // this.instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => {
+        //   if (res.code === 0) {
+        //     this.reportInfo = res.data
+        //     this.reportInfo.checkPhoto = JSON.parse(res.data.checkPhoto)
+        //     let healthName = ''
+        //     this.reportInfo.isHealth = false
+        //     res.data.health.split(',').forEach(v => {
+        //       if (v > 0) {
+        //         this.reportInfo.isHealth = true
+        //       }
+        //       healthName = healthName + this.dict.getLabel('epidemicRecentHealth', v)
+        //     })
+        //     this.reportInfo.healthName = healthName
+
+        //     this.isShow = true
+        //   }
+        // })
+      },
+
       cancel () {
         this.$emit('change', {
           type: 'List',