Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/dialog/dialogCamera.vue

@@ -38,8 +38,21 @@
             />
           </div>
         </div>
-        <div style="width: 100%; height: calc(100% - 110px)">
-          
+        <div
+          style="
+            width: 100%;
+            height: calc(100% - 110px);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          "
+        >
+          <video width="1080" controls>
+            <source
+              src="https://www.runoob.com/try/demo_source/mov_bbb.mp4"
+              type="video/mp4"
+            />
+          </video>
         </div>
       </div>
     </el-dialog>

src/view/sy_map.vue

@@ -165,7 +165,7 @@
         @openMessage="openMessage"
       >
         <template #jzzt="{ currentCol, currentData }">
-          <div v-if="currentData.jzzt == 1">居住</div>
+          <div v-if="currentData.jzzt == 0">居住</div>
           <div v-else>未居住</div>
         </template>
         <template #sxt="{ currentCol, currentData }">