flx:冲突
This commit is contained in:
commit
f899a097d6
4
package-lock.json
generated
4
package-lock.json
generated
@ -6560,7 +6560,7 @@
|
||||
},
|
||||
"node_modules/echarts-liquidfill": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz",
|
||||
"resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz",
|
||||
"integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==",
|
||||
"peerDependencies": {
|
||||
"echarts": "^4.8.0",
|
||||
@ -21389,7 +21389,7 @@
|
||||
},
|
||||
"echarts-liquidfill": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz",
|
||||
"resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-2.0.6.tgz",
|
||||
"integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==",
|
||||
"requires": {}
|
||||
},
|
||||
|
||||
@ -231,7 +231,7 @@ onMounted(async () => {});
|
||||
font-family: "OPPOSans-Bold";
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 0 40px;
|
||||
margin: 0 20px;
|
||||
padding-top: 10px;
|
||||
|
||||
.title-time {
|
||||
|
||||
@ -1,16 +1,8 @@
|
||||
<template>
|
||||
<div class="leftTop">
|
||||
<Card title="安全教育">
|
||||
<div class="video-config">
|
||||
<div class="video-config" @click="openPeopleCountDialog">
|
||||
<el-icon class="config-icon" color="#57BCE8" size="24"><Setting /></el-icon>
|
||||
<div class="dialog-content" v-show="false">
|
||||
<div class="dialog-title">
|
||||
<div class="title-img"><img src="@/assets/images/titleIcon.png" alt="" /></div>
|
||||
<div class="title-text">
|
||||
<i>配置视频</i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="href-content" v-if="showVideo == 1">
|
||||
<el-carousel indicator-position="none" height="450px" style="width: 100%;">
|
||||
@ -29,6 +21,7 @@
|
||||
<video :src="BASEURL + '/image/' + projectData.videoUrl" class="videos" autoplay controls loop></video>
|
||||
</div>
|
||||
</Card>
|
||||
<setVideoDialog ref="partyBuildRef"></setVideoDialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -42,6 +35,7 @@ import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/mod
|
||||
import { selectLiveVideoListApi } from "@/api/modules/video";
|
||||
import ckplayerComp from "./ckplayerComp.vue";
|
||||
import { COMPANY } from "@/config/config";
|
||||
import setVideoDialog from "@/components/setVideoDialog.vue";
|
||||
|
||||
const store = GlobalStore();
|
||||
const videoList = ref([] as any);
|
||||
@ -55,7 +49,13 @@ const props = withDefaults(defineProps<Props>(), {
|
||||
});
|
||||
// 项目信息
|
||||
const projectData = ref({} as any);
|
||||
|
||||
// 弹窗
|
||||
const partyBuildRef = ref();
|
||||
const openPeopleCountDialog = () => {
|
||||
partyBuildRef.value.openDialog({
|
||||
title: "配置视频"
|
||||
});
|
||||
};
|
||||
watch(
|
||||
() => props.projectData,
|
||||
newVal => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user