admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flx：冲突

Browse Source
This commit is contained in:
X_Rian 2024-06-13 18:40:46 +08:00
commit f899a097d6
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -6560,7 +6560,7 @@
}, },
"node_modules/echarts-liquidfill": { "node_modules/echarts-liquidfill": {
"version": "2.0.6", "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==", "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==",
"peerDependencies": { "peerDependencies": {
"echarts": "^4.8.0", "echarts": "^4.8.0",
@ -21389,7 +21389,7 @@
}, },
"echarts-liquidfill": { "echarts-liquidfill": {
"version": "2.0.6", "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==", "integrity": "sha512-p+AH0O9/BtwXMQQyhjJbMZo+GwRAgWG/DCyK5r27PQzpS0UWrgXu57MyEFc0A8Ub3sRuqEu08BuxwHICBkSWSQ==",
"requires": {} "requires": {}
}, },

2
src/components/setVideoDialog.vue
View File

@ -231,7 +231,7 @@ onMounted(async () => {});
font-family: "OPPOSans-Bold"; font-family: "OPPOSans-Bold";
display: flex; display: flex;
align-items: center; align-items: center;
margin: 0 40px; margin: 0 20px;
padding-top: 10px; padding-top: 10px;
.title-time { .title-time {

20
src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerTop.vue
View File

@ -1,16 +1,8 @@
<template> <template>
<div class="leftTop"> <div class="leftTop">
<Card title="安全教育"> <Card title="安全教育">
<div class="video-config"> <div class="video-config" @click="openPeopleCountDialog">
<el-icon class="config-icon" color="#57BCE8" size="24"><Setting /></el-icon> <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>
<div class="href-content" v-if="showVideo == 1"> <div class="href-content" v-if="showVideo == 1">
<el-carousel indicator-position="none" height="450px" style="width: 100%;"> <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> <video :src="BASEURL + '/image/' + projectData.videoUrl" class="videos" autoplay controls loop></video>
</div> </div>
</Card> </Card>
<setVideoDialog ref="partyBuildRef"></setVideoDialog>
</div> </div>
</template> </template>
@ -42,6 +35,7 @@ import { editProjectInfo, eidtProjectShowConfig, queryBySnData } from "@/api/mod
import { selectLiveVideoListApi } from "@/api/modules/video"; import { selectLiveVideoListApi } from "@/api/modules/video";
import ckplayerComp from "./ckplayerComp.vue"; import ckplayerComp from "./ckplayerComp.vue";
import { COMPANY } from "@/config/config"; import { COMPANY } from "@/config/config";
import setVideoDialog from "@/components/setVideoDialog.vue";
const store = GlobalStore(); const store = GlobalStore();
const videoList = ref([] as any); const videoList = ref([] as any);
@ -55,7 +49,13 @@ const props = withDefaults(defineProps<Props>(), {
}); });
// 项目信息 // 项目信息
const projectData = ref({} as any); const projectData = ref({} as any);
// 弹窗
const partyBuildRef = ref();
const openPeopleCountDialog = () => {
partyBuildRef.value.openDialog({
title: "配置视频"
});
};
watch( watch(
() => props.projectData, () => props.projectData,
newVal => { newVal => {