From 295a98d95007dff1330d7271fa15ef52f3612dd8 Mon Sep 17 00:00:00 2001
From: gengchunlei <1807398631@qq.com>
Date: Fri, 8 Nov 2024 16:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=20=201=E3=80=81=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screening/detail/SecondDetail.vue         |   8 +-
 .../components/AbnormalBloodLipidsDetail.vue  |   8 +-
 .../components/CerebralApoplexyDetail.vue     |   8 +-
 .../components/ChronicKidneyDiseaseDetail.vue |   8 +-
 .../visit/detail/components/CopdDetail.vue    |   8 +-
 .../components/CoronaryHeartDiseaseDetail.vue |   8 +-
 .../detail/components/DiabetesDetail.vue      | 328 +++++++++---------
 .../detail/components/HypertensionDetail.vue  |  10 +-
 8 files changed, 195 insertions(+), 191 deletions(-)

diff --git a/src/residentWX/screening/detail/SecondDetail.vue b/src/residentWX/screening/detail/SecondDetail.vue
index 0a532b1..38db136 100644
--- a/src/residentWX/screening/detail/SecondDetail.vue
+++ b/src/residentWX/screening/detail/SecondDetail.vue
@@ -460,10 +460,8 @@
                         <template #right-icon>
                             <doc-icon type='doc-down' />
                         </template>
-                        <div class='list gap-x-2.5 gap-y-1 flex items-center flex-wrap'>
-                            <div v-for="(url, index) in info.informedConsentUrl" :key="index" >
-                            <img style='width: 1.47rem;height: 2.04rem'  :src="url.trueDownloadUrl" />
-                            </div>
+                        <div>
+                            <image-preview :img-list='info.informedConsentUrl'></image-preview>
                         </div>
                     </van-collapse-item>
 
@@ -493,8 +491,10 @@ import { showNotify } from 'vant'
 import { secondScreenDetail } from '@/api/residentWX/screening.js'
 import { useStore } from '@/residentWX/store'
 import { fetchDataHandle } from '@/utils/common'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 
 export default {
+    components: { ImagePreview },
     inject:['showNav'],
     data() {
         return {
diff --git a/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue b/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
index 138aa1a..6ad1a60 100644
--- a/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
+++ b/src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue
@@ -322,10 +322,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -359,7 +357,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
diff --git a/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue b/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
index 138aa1a..6ad1a60 100644
--- a/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
+++ b/src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue
@@ -322,10 +322,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -359,7 +357,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
diff --git a/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue b/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
index 0f7615c..c440f06 100644
--- a/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
+++ b/src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue
@@ -322,10 +322,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -359,7 +357,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
diff --git a/src/residentWX/visit/detail/components/CopdDetail.vue b/src/residentWX/visit/detail/components/CopdDetail.vue
index dc11808..8fd10b3 100644
--- a/src/residentWX/visit/detail/components/CopdDetail.vue
+++ b/src/residentWX/visit/detail/components/CopdDetail.vue
@@ -320,10 +320,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -357,7 +355,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
diff --git a/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue b/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
index ad8d40b..aaa6c7a 100644
--- a/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
+++ b/src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue
@@ -322,10 +322,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -359,7 +357,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
diff --git a/src/residentWX/visit/detail/components/DiabetesDetail.vue b/src/residentWX/visit/detail/components/DiabetesDetail.vue
index 8e2496e..9c4f5d8 100644
--- a/src/residentWX/visit/detail/components/DiabetesDetail.vue
+++ b/src/residentWX/visit/detail/components/DiabetesDetail.vue
@@ -1,228 +1,228 @@
 <template>
-    <div class="p-3 grow cont-box">
-        <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head mt-2">
-                <span class="text-16 font-semibold">全部内容</span>
-                <span @click="toggleAll">
-                    <span v-if="!collapseAll">展开全部</span>
+    <div class='p-3 grow cont-box'>
+        <div class='p-3 h-full cont-inner'>
+            <div class='flex justify-between collapse-head mt-2'>
+                <span class='text-16 font-semibold'>全部内容</span>
+                <span @click='toggleAll'>
+                    <span v-if='!collapseAll'>展开全部</span>
                     <span v-else>收起全部</span>
                     <span :class="['ml-2 icon-down', { 'icon-down-expanded': collapseAll }]">
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </span>
                 </span>
             </div>
 
-            <van-collapse :model-value="activeCollapse" ref="collapse" class="doc-collapse" @change="collapseChange">
-                <van-collapse-item key="1" title="居民信息" name="1">
+            <van-collapse :model-value='activeCollapse' ref='collapse' class='doc-collapse' @change='collapseChange'>
+                <van-collapse-item key='1' title='居民信息' name='1'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div v-for="item in columnsBase" :key="item.key">
-                            <div class="flex justify-between py-1 border-bottom item">
-                                <span class="shrink-0 mr-2 label">{{ item.title }}</span>
+                    <div class='list'>
+                        <div v-for='item in columnsBase' :key='item.key'>
+                            <div class='flex justify-between py-1 border-bottom item'>
+                                <span class='shrink-0 mr-2 label'>{{ item.title }}</span>
                                 <span v-if="item.key === 'idCard'">{{ $idCardHide(residentInfo.idCard) || '-' }}</span>
-                                <span class="text-end" v-else>
+                                <span class='text-end' v-else>
                                     <span>{{ residentInfo[item.key] || '-' }}</span>
-                                    <span v-if="item.unit" class="ml-1">{{ item.unit }}</span>
+                                    <span v-if='item.unit' class='ml-1'>{{ item.unit }}</span>
                                 </span>
                             </div>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="2" title="症状" name="2">
+                <van-collapse-item key='2' title='症状' name='2'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">症状</span>
-                            <span class="text-end">
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>症状</span>
+                            <span class='text-end'>
                                 {{ info.symptomName || '-' }}
                             </span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="3" title="体征" name="3">
+                <van-collapse-item key='3' title='体征' name='3'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div v-for="item in columnsPhysical" :key="item.key">
-                            <div class="flex justify-between py-1 border-bottom item">
-                                <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                                <span class="text-end">
+                    <div class='list'>
+                        <div v-for='item in columnsPhysical' :key='item.key'>
+                            <div class='flex justify-between py-1 border-bottom item'>
+                                <span class='shrink-0 mr-2 label'>{{ item.title }}</span>
+                                <span class='text-end'>
                                     <span>{{ info[item.key] || '-' }}</span>
-                                    <span v-if="item.unit" class="ml-1">{{ item.unit }}</span>
+                                    <span v-if='item.unit' class='ml-1'>{{ item.unit }}</span>
                                 </span>
                             </div>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="4" title="生活方式指导" name="4">
+                <van-collapse-item key='4' title='生活方式指导' name='4'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div style="color: #262626">吸烟</div>
-                    <div class="box">
+                    <div style='color: #262626'>吸烟</div>
+                    <div class='box'>
                         <div>
                             <span>是否正在吸烟:</span>
                             <span>{{ info.isSmokingName }}</span>
                         </div>
-                        <div v-if="info.isSmoking === 1">
+                        <div v-if='info.isSmoking === 1'>
                             <span>您大约从几岁起开始养成每天或基本每天都吸烟的习惯:</span>
                             <span>{{ info.startSmokeAge || '-' }}岁</span>
                         </div>
-                        <div v-if="info.isSmoking === 1 || info.isSmoking === 2">
+                        <div v-if='info.isSmoking === 1 || info.isSmoking === 2'>
                             <span>您最近7天是否吸烟:</span>
                             <span>{{ info.lastSevenSmokeName }}</span>
                         </div>
-                        <div v-if="info.isSmoking === 1 || info.isSmoking === 2">
+                        <div v-if='info.isSmoking === 1 || info.isSmoking === 2'>
                             <span>日吸烟量:</span>
                             <span>{{ info.daySmoking || '-' }}支</span>
-                            <span class="ml-4">目标日吸烟量:</span>
+                            <span class='ml-4'>目标日吸烟量:</span>
                             <span>{{ info.goalDaySmoking || '-' }}支</span>
                         </div>
                     </div>
-                    <div style="color: #262626" class="mt-2">饮酒</div>
-                    <div class="box">
+                    <div style='color: #262626' class='mt-2'>饮酒</div>
+                    <div class='box'>
                         <div>
                             <span>是否正在饮酒:</span>
                             <span>{{ info.isDrinkName }}</span>
                         </div>
-                        <div v-if="info.isDrink === 1 || info.isDrink === 2">
+                        <div v-if='info.isDrink === 1 || info.isDrink === 2'>
                             <span>日饮酒量:</span>
                             <span>{{ info.dayDrink || '-' }}ml</span>
-                            <span class="ml-4">目标日饮酒量:</span>
+                            <span class='ml-4'>目标日饮酒量:</span>
                             <span>{{ info.goalDayDrink || '-' }}ml</span>
                         </div>
-                        <div v-if="info.isDrink === 1 || info.isDrink === 2">
+                        <div v-if='info.isDrink === 1 || info.isDrink === 2'>
                             <span>白酒:</span>
                             <span>{{ info.drinkLiquor || '-' }}ml/日</span>
-                            <span class="ml-2">啤酒:</span>
+                            <span class='ml-2'>啤酒:</span>
                             <span>{{ info.drinkBeer || '-' }}ml/日</span>
-                            <span class="ml-2">红酒:</span>
+                            <span class='ml-2'>红酒:</span>
                             <span>{{ info.drinkRed || '-' }}ml/日</span>
-                            <span class="ml-2">黄酒:</span>
+                            <span class='ml-2'>黄酒:</span>
                             <span>{{ info.drinkYellow || '-' }}ml/日</span>
-                            <span class="ml-2">其他:</span>
+                            <span class='ml-2'>其他:</span>
                             <span>{{ info.drinkOther || '-' }}ml/日</span>
                         </div>
                     </div>
-                    <div style="color: #262626" class="mt-2">运动</div>
-                    <div class="box">
+                    <div style='color: #262626' class='mt-2'>运动</div>
+                    <div class='box'>
                         <div>
                             <span>有无规律活动:</span>
                             <span>{{ info.regularExerciseName }}</span>
                         </div>
-                        <div v-if="info.regularExercise === 1">
+                        <div v-if='info.regularExercise === 1'>
                             <span>运动强度:</span>
                             <span>{{ info.exerciseStrengthName }}</span>
                         </div>
-                        <div v-if="info.regularExercise === 1">
+                        <div v-if='info.regularExercise === 1'>
                             <span>目前运动情况:</span>
                             <span>{{ info.nowExerciseWeek || '-' }}次/周、</span>
                             <span>{{ info.nowExerciseMinute || '-' }}分钟/次</span>
                         </div>
                     </div>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">主食</span>
-                            <span class="text-end">{{ info.staplFood || '-' }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>主食</span>
+                            <span class='text-end'>{{ info.staplFood || '-' }}</span>
                         </div>
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">目标主食</span>
-                            <span class="text-end">{{ info.targetStaplFood || '-' }}</span>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>目标主食</span>
+                            <span class='text-end'>{{ info.targetStaplFood || '-' }}</span>
                         </div>
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">心理调整</span>
-                            <span class="text-end">{{ info.psychologicalRecoveryName || '-' }}</span>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>心理调整</span>
+                            <span class='text-end'>{{ info.psychologicalRecoveryName || '-' }}</span>
                         </div>
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">遵医行为</span>
-                            <span class="text-end">{{ info.doctorAdviceName || '-' }}</span>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>遵医行为</span>
+                            <span class='text-end'>{{ info.doctorAdviceName || '-' }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="5" title="辅助检查" name="5">
+                <van-collapse-item key='5' title='辅助检查' name='5'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div v-for="item in columnsAuxiliary" :key="item.key">
-                            <div class="flex justify-between py-1 border-bottom item">
-                                <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                                <span class="text-end">
+                    <div class='list'>
+                        <div v-for='item in columnsAuxiliary' :key='item.key'>
+                            <div class='flex justify-between py-1 border-bottom item'>
+                                <span class='shrink-0 mr-2 label'>{{ item.title }}</span>
+                                <span class='text-end'>
                                     <span>{{ info[item.key] || '-' }}</span>
-                                    <span class="ml-1">{{ item.unit }}</span>
+                                    <span class='ml-1'>{{ item.unit }}</span>
                                 </span>
-                                
+
                             </div>
                         </div>
                     </div>
-                    <div v-for="(x, xIndex) in inspectList" :key="x.insType">
-                        <div style="color: #262626" :class="[xIndex === 0 ? '' : 'mt-2']">{{ x.insName }}</div>
-                        <div class="box">
-                            <div v-for="y in x.items">
+                    <div v-for='(x, xIndex) in inspectList' :key='x.insType'>
+                        <div style='color: #262626' :class="[xIndex === 0 ? '' : 'mt-2']">{{ x.insName }}</div>
+                        <div class='box'>
+                            <div v-for='y in x.items'>
                                 <span>{{ y.itemName }}:</span>
                                 <span>{{ y.itemValue }}</span>
-                                <span class="ml-1">{{ y.unit }}</span>
+                                <span class='ml-1'>{{ y.unit }}</span>
                             </div>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="6" title="服药依从性" name="6">
+                <van-collapse-item key='6' title='服药依从性' name='6'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">服药依从性</span>
-                            <span class="text-end">{{ info.medicationComplianceName || '-' }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>服药依从性</span>
+                            <span class='text-end'>{{ info.medicationComplianceName || '-' }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="7" title="药物不良反应" name="7">
+                <van-collapse-item key='7' title='药物不良反应' name='7'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">药物不良反应</span>
-                            <span class="text-end">{{ info.drugsAdverseName || '-' }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>药物不良反应</span>
+                            <span class='text-end'>{{ info.drugsAdverseName || '-' }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="8" title="低血糖反应" name="8">
+                <van-collapse-item key='8' title='低血糖反应' name='8'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">低血糖反应</span>
-                            <span class="text-end">{{ info.glycopeniaReactionName || '-' }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>低血糖反应</span>
+                            <span class='text-end'>{{ info.glycopeniaReactionName || '-' }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="9" title="此次随访分类" name="9">
+                <van-collapse-item key='9' title='此次随访分类' name='9'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">此次随访分类</span>
-                            <span class="text-end">{{ info.visitTypeName || '-' }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>此次随访分类</span>
+                            <span class='text-end'>{{ info.visitTypeName || '-' }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="10" title="目前诊断" name="10">
+                <van-collapse-item key='10' title='目前诊断' name='10'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">目前诊断</span>
-                            <span class="text-end">
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>目前诊断</span>
+                            <span class='text-end'>
                                 {{ info.currentDiagnosisName || '-' }}
                             </span>
                         </div>
@@ -293,36 +293,36 @@
                         </div>
                     </div> -->
                 </van-collapse-item>
-                <van-collapse-item key="11" title="用药情况" name="11">
+                <van-collapse-item key='11' title='用药情况' name='11'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">是否调整治疗方案</span>
-                            <span class="text-end">{{ info.adjustTreatName }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>是否调整治疗方案</span>
+                            <span class='text-end'>{{ info.adjustTreatName }}</span>
                         </div>
                     </div>
-                    <div v-if="info.adjustTreat === 1">
-                        <div style="color: #262626" class="mt-2">用药</div>
-                        <div v-for="(item, index) in medicateCase" :key="index" class="box mt-2">
+                    <div v-if='info.adjustTreat === 1'>
+                        <div style='color: #262626' class='mt-2'>用药</div>
+                        <div v-for='(item, index) in medicateCase' :key='index' class='box mt-2'>
                             <div>
                                 <span>药物名称:</span>
                                 <span>{{ item.drugName }}</span>
-                                <span class="ml-4">剂量:</span>
-                                <span class="mr-1">{{ item.dose }}</span>
+                                <span class='ml-4'>剂量:</span>
+                                <span class='mr-1'>{{ item.dose }}</span>
                                 <span>{{ store.getDictValue('CP00081', item.unit) }}</span>
                             </div>
                             <div>
                                 <span>频次:</span>
                                 <span>{{ store.getDictValue('CP00084', item.frequency) }}</span>
-                                <span class="ml-4">用法:</span>
+                                <span class='ml-4'>用法:</span>
                                 <span>{{ store.getDictValue('CP00083', item.usage) }}</span>
                             </div>
                         </div>
                     </div>
-                    <div style="color: #262626" class="mt-2">胰岛素</div>
-                    <div class="box">
+                    <div style='color: #262626' class='mt-2'>胰岛素</div>
+                    <div class='box'>
                         <div>
                             <span>胰岛素种类:</span>
                             <span>{{ info.insulinTypeName }}</span>
@@ -333,69 +333,67 @@
                         </div>
                         <div>
                             <span>用量:</span>
-                            <span v-for="(item, index) in insulinDosage" :key="index">
-                                <template v-if="item.checked">
+                            <span v-for='(item, index) in insulinDosage' :key='index'>
+                                <template v-if='item.checked'>
                                     <span>{{ item.name }}</span>
-                                    <span class="mr-1 ml-1">{{ item.dosage }}</span>
+                                    <span class='mr-1 ml-1'>{{ item.dosage }}</span>
                                     <span>IU、</span>
                                 </template>
                             </span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="12" title="转诊" name="12">
+                <van-collapse-item key='12' title='转诊' name='12'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">转诊</span>
-                            <span class="text-end">{{ info.isReferralName }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>转诊</span>
+                            <span class='text-end'>{{ info.isReferralName }}</span>
                         </div>
-                        <div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">转诊原因</span>
-                            <span class="text-end">{{ info.referralReason }}</span>
+                        <div v-if='info.isReferral === 1' class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>转诊原因</span>
+                            <span class='text-end'>{{ info.referralReason }}</span>
                         </div>
-                        <div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">转诊机构</span>
-                            <span class="text-end">{{ info.referralUnitName }}</span>
+                        <div v-if='info.isReferral === 1' class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>转诊机构</span>
+                            <span class='text-end'>{{ info.referralUnitName }}</span>
                         </div>
-                        <div v-if="info.isReferral === 1" class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">转诊科室</span>
-                            <span class="text-end">{{ info.referralOfficeName }}</span>
+                        <div v-if='info.isReferral === 1' class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>转诊科室</span>
+                            <span class='text-end'>{{ info.referralOfficeName }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="13" title="现场随访照片" name="13">
+                <van-collapse-item key='13' title='现场随访照片' name='13'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="14" title="下次随访日期" name="14">
+                <van-collapse-item key='14' title='下次随访日期' name='14'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div class="flex justify-between py-1 border-bottom item">
-                            <span class="shrink-0 mr-2 label">下次随访日期</span>
-                            <span class="text-end">{{ info.nextVisitDate }}</span>
+                    <div class='list'>
+                        <div class='flex justify-between py-1 border-bottom item'>
+                            <span class='shrink-0 mr-2 label'>下次随访日期</span>
+                            <span class='text-end'>{{ info.nextVisitDate }}</span>
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item key="15" title="随访机构" name="15">
+                <van-collapse-item key='15' title='随访机构' name='15'>
                     <template #right-icon>
-                        <doc-icon type="doc-down" />
+                        <doc-icon type='doc-down' />
                     </template>
-                    <div class="list">
-                        <div v-for="item in columnsOrg" :key="item.key">
-                            <div class="flex justify-between py-1 border-bottom item">
-                                <span class="shrink-0 mr-2 label">{{ item.title }}</span>
-                                <span class="text-end">{{ info[item.key] }}</span>
+                    <div class='list'>
+                        <div v-for='item in columnsOrg' :key='item.key'>
+                            <div class='flex justify-between py-1 border-bottom item'>
+                                <span class='shrink-0 mr-2 label'>{{ item.title }}</span>
+                                <span class='text-end'>{{ info[item.key] }}</span>
                             </div>
                         </div>
                     </div>
@@ -407,11 +405,15 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
+
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
-            default: () => {}
+            default: () => {
+            }
         }
     },
     data() {
@@ -461,7 +463,7 @@ export default {
                 { title: '录入日期', key: 'createDate' },
                 { title: '录入单位', key: 'createUnitName' },
                 { title: '录入科室', key: 'createOfficeName' },
-                { title: '录入医生', key: 'createDoctorName' },
+                { title: '录入医生', key: 'createDoctorName' }
             ],
             columnsAuxiliary: [
                 { title: '空腹静脉血糖值', key: 'emptyBloodGlucose', unit: 'mmol/L' },
@@ -544,7 +546,7 @@ export default {
     }
 }
 </script>
-<style lang="less" scoped>
+<style lang='less' scoped>
 .cont-box {
     background-color: #f9f9f9;
 
@@ -574,10 +576,12 @@ export default {
 
 .list {
     color: #262626;
+
     .label {
         min-width: 5em;
     }
 }
+
 .box {
     background: #F8FAFC;
     padding: 8px;
diff --git a/src/residentWX/visit/detail/components/HypertensionDetail.vue b/src/residentWX/visit/detail/components/HypertensionDetail.vue
index 2ea5e52..21fa304 100644
--- a/src/residentWX/visit/detail/components/HypertensionDetail.vue
+++ b/src/residentWX/visit/detail/components/HypertensionDetail.vue
@@ -12,7 +12,7 @@
                 </span>
             </div>
 
-            <van-collapse v-model="activeCollapse" ref="collapse" class="doc-collapse" @change="collapseChange">
+            <van-collapse :model-value="activeCollapse" ref="collapse" class="doc-collapse" @change="collapseChange">
                 <van-collapse-item key="1" title="居民信息" name="1">
                     <template #right-icon>
                         <doc-icon type="doc-down" />
@@ -360,10 +360,8 @@
                     <template #right-icon>
                         <doc-icon type="doc-down" />
                     </template>
-                    <div class="list gap-x-2.5 gap-y-1 flex items-center flex-wrap">
-                        <div v-for="(url, index) in info.visitImageList" :key="index" >
-                            <img style="width: 1.47rem; height: 2.04rem" :src="url.trueDownloadUrl" />
-                        </div>
+                    <div>
+                        <image-preview :img-list='info.visitImageList'></image-preview>
                     </div>
                 </van-collapse-item>
                 <van-collapse-item key="13" title="下次随访日期" name="13">
@@ -397,7 +395,9 @@
 <script>
 import { fetchDataHandle } from '@/utils/common.js'
 import { useStore } from '@/resident/store/index.js'
+import ImagePreview from '@/residentWX/components/imagePreview/imagePreview'
 export default {
+    components: { ImagePreview },
     props: {
         visitInfo: {
             type: Object,
-- 
2.18.0