From 235e535e5bfa7be4e0c2587e5731f6841b222d80 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Thu, 19 Dec 2024 10:13:17 +0800
Subject: [PATCH] gx

---
 src/view/dialog/dialogCamera.vue |  5 +-
 src/view/person/index.vue        | 87 ++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 32 deletions(-)

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