xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
姚宇浩 2024-08-14 09:24:04 +08:00
parent fa5def7c0f d8770a92cb
commit 45b8e12b13
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/view/dialog/dialogCamera.vue
View File

@ -38,8 +38,21 @@
/> />
</div> </div>
</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>
</div> </div>
</el-dialog> </el-dialog>
@ -110,7 +123,7 @@ watch(
// 使用生命钩子 // 使用生命钩子
onMounted(() => { onMounted(() => {
cameraShow.value = props.cameraShow; cameraShow.value = props.cameraShow;
// data.columns = props.columns; // data.columns = props.columns;
// data.title = props.title; // data.title = props.title;
// data.tableData = props.tableData; // data.tableData = props.tableData;

2
src/view/sy_map.vue
View File

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