This commit is contained in:
duanxiaohai 2024-12-19 10:13:17 +08:00
parent 3e154e7a0c
commit 235e535e5b
2 changed files with 60 additions and 32 deletions

View File

@ -114,7 +114,10 @@ watch(
(newVal) => { (newVal) => {
if (newVal) { if (newVal) {
// //
initializeVideo(); nextTick(()=>{
initializeVideo();
})
} else { } else {
// //
disposeVideo(); disposeVideo();

View File

@ -74,7 +74,8 @@
v-for="item in dataMyTag.myTag" v-for="item in dataMyTag.myTag"
:key="item" :key="item"
@click="item.show ? onClickTag(item) : ''" @click="item.show ? onClickTag(item) : ''"
:class="item.show ? 'my-tag-item_active' : ''"> :class="item.show ? 'my-tag-item_active' : ''"
>
<p> <p>
{{ item.name }} {{ item.name }}
</p> </p>
@ -86,6 +87,12 @@
<img src="@/assets/person/back.png" alt="" /> <img src="@/assets/person/back.png" alt="" />
<p>返回</p> <p>返回</p>
</div> </div>
<div class="videoCamera" v-if="dataMyTag.camera" @click="openCamera()">
<img src="@/assets/images/sxt_detail.png" alt="" />
</div>
<div class="person-main"> <div class="person-main">
<div <div
v-for="(item, index) in dataMyTag.myTag1" v-for="(item, index) in dataMyTag.myTag1"
@ -97,19 +104,14 @@
: 'main-tag-item', : 'main-tag-item',
item.name == tableType.title ? 'main-tag-item_active' : '', item.name == tableType.title ? 'main-tag-item_active' : '',
]" ]"
@click="onClickTag2(item.name, item.label)"> @click="onClickTag2(item.name, item.label)"
>
<span v-if="item.name == '退休养老'"> 退休<br />养老</span> <span v-if="item.name == '退休养老'"> 退休<br />养老</span>
<span v-else>{{ item.name }}</span> <span v-else>{{ item.name }}</span>
</div> </div>
<div class="person-main-person"></div> <div class="person-main-person"></div>
<!-- v-if="dataMyTag.camera" --> <!-- v-if="dataMyTag.camera" -->
<div
class="videoCamera"
v-if="dataMyTag.camera"
@click="openCamera()">
<img src="@/assets/images/sxt_detail.png" alt="" />
</div>
</div> </div>
<div class="main_table"> <div class="main_table">
<el-table <el-table
@ -130,14 +132,16 @@
height: '50px', height: '50px',
backgroundColor: 'rgba(31, 63, 113, 1)', backgroundColor: 'rgba(31, 63, 113, 1)',
color: '#fff', color: '#fff',
}"> }"
>
<template v-for="item in tableMain.columns"> <template v-for="item in tableMain.columns">
<el-table-column <el-table-column
v-if="item.type == 'slot'" v-if="item.type == 'slot'"
:label="item.label" :label="item.label"
:prop="item.property" :prop="item.property"
:width="item.width" :width="item.width"
:align="item.align || 'left'"> :align="item.align || 'left'"
>
<template #default="scope"> <template #default="scope">
<!-- 医疗保险类型 --> <!-- 医疗保险类型 -->
<div v-if="item.property == 'xs'"> <div v-if="item.property == 'xs'">
@ -151,7 +155,8 @@
:width="item.width" :width="item.width"
:prop="item.property" :prop="item.property"
:label="item.label" :label="item.label"
:align="item.align || 'left'" /> :align="item.align || 'left'"
/>
</template> </template>
</el-table> </el-table>
</div> </div>
@ -181,12 +186,14 @@
height: '50px', height: '50px',
backgroundColor: 'rgba(31, 63, 113, 1)', backgroundColor: 'rgba(31, 63, 113, 1)',
color: '#fff', color: '#fff',
}"> }"
>
<template v-for="item in tableType.columns"> <template v-for="item in tableType.columns">
<el-table-column <el-table-column
v-if="item.type == 'slot'" v-if="item.type == 'slot'"
:label="item.label" :label="item.label"
:prop="item.property"> :prop="item.property"
>
<template #default="scope"> <template #default="scope">
<!-- 医疗保险类型 --> <!-- 医疗保险类型 -->
<div v-if="item.property == 'ylbxlx'"> <div v-if="item.property == 'ylbxlx'">
@ -201,7 +208,8 @@
v-else v-else
:width="item.width" :width="item.width"
:prop="item.property" :prop="item.property"
:label="item.label" /> :label="item.label"
/>
</template> </template>
</el-table> </el-table>
<el-pagination <el-pagination
@ -212,7 +220,8 @@
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
v-model:current-page="pagination.current" v-model:current-page="pagination.current"
@current-change="handlePagination" /> @current-change="handlePagination"
/>
</div> </div>
</div> </div>
<div> <div>
@ -237,12 +246,14 @@
height: '50px', height: '50px',
backgroundColor: 'rgba(31, 63, 113, 1)', backgroundColor: 'rgba(31, 63, 113, 1)',
color: '#fff', color: '#fff',
}"> }"
>
<template v-for="item in dataMyTag.form.column"> <template v-for="item in dataMyTag.form.column">
<el-table-column <el-table-column
:width="item.width" :width="item.width"
:prop="item.property" :prop="item.property"
:label="item.label" /> :label="item.label"
/>
</template> </template>
</el-table> </el-table>
<el-pagination <el-pagination
@ -253,7 +264,8 @@
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
v-model:current-page="zhpagination.current" v-model:current-page="zhpagination.current"
@current-change="handlePagination1" /> @current-change="handlePagination1"
/>
</div> </div>
</div> </div>
<div> <div>
@ -278,12 +290,14 @@
height: '50px', height: '50px',
backgroundColor: 'rgba(31, 63, 113, 1)', backgroundColor: 'rgba(31, 63, 113, 1)',
color: '#fff', color: '#fff',
}"> }"
>
<template v-for="item in dataMyTag.zfForm.column"> <template v-for="item in dataMyTag.zfForm.column">
<el-table-column <el-table-column
:width="item.width" :width="item.width"
:prop="item.property" :prop="item.property"
:label="item.label" /> :label="item.label"
/>
</template> </template>
</el-table> </el-table>
<el-pagination <el-pagination
@ -294,7 +308,8 @@
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
v-model:current-page="zfpagination.current" v-model:current-page="zfpagination.current"
@current-change="handlePagination2" /> @current-change="handlePagination2"
/>
</div> </div>
</div> </div>
</div> </div>
@ -320,12 +335,14 @@
height: '50px', height: '50px',
backgroundColor: 'rgba(31, 63, 113, 1)', backgroundColor: 'rgba(31, 63, 113, 1)',
color: '#fff', color: '#fff',
}"> }"
>
<template v-for="item in tableType.columns"> <template v-for="item in tableType.columns">
<el-table-column <el-table-column
v-if="item.type == 'slot'" v-if="item.type == 'slot'"
:label="item.label" :label="item.label"
:prop="item.property"> :prop="item.property"
>
<template #default="scope"> <template #default="scope">
<!-- 医疗保险类型 --> <!-- 医疗保险类型 -->
<div v-if="item.property == 'ylbxlx'"> <div v-if="item.property == 'ylbxlx'">
@ -348,7 +365,8 @@
v-else v-else
:width="item.width" :width="item.width"
:prop="item.property" :prop="item.property"
:label="item.label" /> :label="item.label"
/>
</template> </template>
</el-table> </el-table>
<el-pagination <el-pagination
@ -359,7 +377,8 @@
prev-text="上一页" prev-text="上一页"
next-text="下一页" next-text="下一页"
v-model:current-page="pagination.current" v-model:current-page="pagination.current"
@current-change="handlePagination" /> @current-change="handlePagination"
/>
</div> </div>
</div> </div>
<div v-else> <div v-else>
@ -369,7 +388,8 @@
<div class="my-info"> <div class="my-info">
<div <div
class="my-info-item" class="my-info-item"
v-if="dataMyTag.title == '学习' && baseInfo.eduPhase"> v-if="dataMyTag.title == '学习' && baseInfo.eduPhase"
>
<div class="my-info-label" style="min-width: 40px">学历</div> <div class="my-info-label" style="min-width: 40px">学历</div>
<div class="my-info-content"> <div class="my-info-content">
<p>{{ baseInfo.eduPhase || "" }}</p> <p>{{ baseInfo.eduPhase || "" }}</p>
@ -377,7 +397,8 @@
</div> </div>
<div <div
class="my-info-item" class="my-info-item"
v-if="dataMyTag.title == '婚育' && baseInfo.maritalStatus"> v-if="dataMyTag.title == '婚育' && baseInfo.maritalStatus"
>
<div class="my-info-label">婚姻状况</div> <div class="my-info-label">婚姻状况</div>
<div class="my-info-content"> <div class="my-info-content">
<p>{{ baseInfo.maritalStatus || "" }}</p> <p>{{ baseInfo.maritalStatus || "" }}</p>
@ -386,12 +407,14 @@
<div v-for="(item, index) in tableType.columns"> <div v-for="(item, index) in tableType.columns">
<div <div
class="my-info-item" class="my-info-item"
v-if="rightList?.length != 0 && item.show == true"> v-if="rightList?.length != 0 && item.show == true"
>
<div <div
class="my-info-label" class="my-info-label"
:class=" :class="
item.label == '学校' || item.label == '班级' ? 'widu' : '' item.label == '学校' || item.label == '班级' ? 'widu' : ''
"> "
>
{{ item.label }} {{ item.label }}
</div> </div>
<div class="my-info-content"> <div class="my-info-content">
@ -417,7 +440,8 @@
:cameraShow="camerali.show" :cameraShow="camerali.show"
:hlsUriSsl="camerali.hlsUriSsl" :hlsUriSsl="camerali.hlsUriSsl"
:sxtnames="camerali.name" :sxtnames="camerali.name"
@close="close1"> @close="close1"
>
</DialogCamera> </DialogCamera>
</div> </div>
</template> </template>
@ -1300,6 +1324,7 @@ onMounted(() => {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; position: relative;
top: -30px;
.main-tag-item { .main-tag-item {
background: url("../../assets/person/tag.png") no-repeat; background: url("../../assets/person/tag.png") no-repeat;
@ -1705,7 +1730,7 @@ onMounted(() => {
} }
.videoCamera { .videoCamera {
position: absolute; position: absolute;
top: -10px; top: 0px;
right: 30px; right: 30px;
cursor: pointer; cursor: pointer;
img { img {