-
+
-
+
+
{{ videoNameUp(i - 1) }}
@@ -67,7 +61,7 @@ import { getVideoItemInfoPoliceCameraItemApi } from "@/api/modules/workTicket";
import { Close } from "@element-plus/icons-vue";
import moment from "moment";
import dayjs from "dayjs";
-import { reactive, watch, onMounted, computed } from "vue";
+import { reactive, watch, onMounted, computed, nextTick } from "vue";
import { ElMessage } from "element-plus";
import loadingGif from "@/assets/images/iscImage/loading.gif";
import errorPng from "@/assets/images/iscImage/text-to-image.png";
@@ -103,9 +97,9 @@ const videoInfo = reactive({
isFullScreen: false,
isFullScreenAll: false,
randomNumber: "",
- player: null,
- // 每个实例独立的状态
- instanceStates: {}
+ player: null,
+ // 每个实例独立的状态
+ instanceStates: {}
});
// 关闭所有视频
const stopAllPlay = () => {
@@ -274,7 +268,7 @@ const capture = (imageType, currentWindowIndex) => {
const initPlayer = () => {
videoInfo.player = new JSPlugin({
// 需要英文字母开头 必填
- szId: 'player-' + props.playerId, // 使用唯一ID
+ szId: "player-" + props.playerId, // 使用唯一ID
// 必填,引用H5player.min.js的js相对路径
szBasePath: "/public/bin",
@@ -383,9 +377,11 @@ const initPlayer = () => {
console.log("recv ElementChanged: " + iWndIndex + ", szElementType:" + szElementType);
}
});
- if (videoInfo.devH5List.length > 0) {
- play(videoInfo.devH5List[0], videoInfo.iWndIndex);
- }
+ nextTick(() => {
+ if (videoInfo.devH5List.length > 0) {
+ play(videoInfo.devH5List[0], videoInfo.iWndIndex);
+ }
+ });
};
/**
* 获取取流连接
diff --git a/src/views/sevenLargeScreen/homeworkControlProcess/index.vue b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue
index ad8fc39..ebaa5c9 100644
--- a/src/views/sevenLargeScreen/homeworkControlProcess/index.vue
+++ b/src/views/sevenLargeScreen/homeworkControlProcess/index.vue
@@ -435,10 +435,13 @@ const workTicketCountList = ref([
stateType: 4
}
]);
-const getWorkTicketCountWorkTicket = (showLoading) => {
- getWorkTicketCountWorkTicketApi({
- projectSn: store.sn
- }, showLoading).then(res => {
+const getWorkTicketCountWorkTicket = showLoading => {
+ getWorkTicketCountWorkTicketApi(
+ {
+ projectSn: store.sn
+ },
+ showLoading
+ ).then(res => {
if (res.code == 200) {
// workTicketCountList.value = res.result;
workTicketCountList.value = [
@@ -500,8 +503,8 @@ const onWorkTicketRefresh = () => {
const getWorkTicketPage = () => {
const params = {
...workTicketInfo,
- constructionTimeBegin_end: workTicketInfo.constructionTime.length > 0 ? workTicketInfo.constructionTime[0] : "",
- constructionTimeEnd_start: workTicketInfo.constructionTime.length > 0 ? workTicketInfo.constructionTime[1] : ""
+ applicationTime_begin: workTicketInfo.constructionTime.length > 0 ? workTicketInfo.constructionTime[0] : "",
+ applicationTime_end: workTicketInfo.constructionTime.length > 0 ? workTicketInfo.constructionTime[1] : ""
};
delete params.constructionTime;
getWorkTicketPageApi({
@@ -942,6 +945,10 @@ const downloadFileBtn = (url, name) => {
:deep(.el-date-editor) {
width: 36%;
margin-top: 10px;
+ .el-range-input {
+ color: white;
+ // background-color: transparent;
+ }
}
:deep(.el-cascader),
@@ -1223,7 +1230,10 @@ const downloadFileBtn = (url, name) => {
.content-img {
display: flex;
flex-wrap: wrap;
- > .el-image:nth-child(even) {
+ > .el-image:nth-child(n + 4) {
+ margin-top: 20px;
+ }
+ > .el-image:not(:nth-child(3n + 1)) {
margin-left: 20px;
}
> .el-image {
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index daa0607..9ea3145 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -39,10 +39,10 @@
-->
- 
+
+
- 
+
-
+
// 请求工具
// import http from "@/http/http2.js";
-import { getVideoItemInfo } from "@/api/modules/mapConfig";
+import { getVideoItemInfo, getTalkURLsApi } from "@/api/modules/mapConfig";
import { Close } from "@element-plus/icons-vue";
import moment from "moment";
import dayjs from "dayjs";
@@ -212,23 +212,36 @@ const isTalkback = currentWindowIndex => {
const talkbackStart = currentWindowIndex => {
let player = videoInfo.player,
index = currentWindowIndex - 1;
+ getTalkURLsApi({
+ protocol: "wss",
+ projectSn: videoInfo.devH5List[index].projectSn,
+ serialNumber: videoInfo.devH5List[index].serialNumber
+ }).then(res => {
+ const res2 = JSON.parse(res.result);
+ if (!res2.data) {
+ ElMessage.warning("获取url失败");
+ return;
+ }
+ console.log(res2.data.url);
- player
- .JS_StartTalk(videoInfo.devH5List[index].url, {
- // irecordType: 1,
- // cbStreamCB: this.streamcb,
- })
- .then(
- () => {
- ElMessage.success("开始对讲");
- videoInfo.talkbackBegin = true;
- console.log("record start ...");
- },
- e => {
- console.error(e);
- ElMessage.error("对讲连接失败");
- }
- );
+ const url = res2.data.url.replace("hrdl.zhgdyun.com", "sp.szjxj.com");
+ player.JS_StartTalk(url, {
+ // irecordType: 1,
+ // cbStreamCB: this.streamcb,
+ })
+ .then(
+ () => {
+ ElMessage.success("开始对讲");
+ videoInfo.talkbackBegin = true;
+ openSound(currentWindowIndex);
+ console.log("record start ...");
+ },
+ e => {
+ console.error(e);
+ ElMessage.error("对讲连接失败");
+ }
+ );
+ });
};
// 结束对讲
const talkbackStop = currentWindowIndex => {
@@ -238,6 +251,7 @@ const talkbackStop = currentWindowIndex => {
res => {
console.log("record stoped, saving ...", res);
videoInfo.talkbackBegin = false;
+ closeSound(currentWindowIndex);
},
e => {
console.error(e);
@@ -367,7 +381,10 @@ const initPlayer = () => {
});
console.log(11222233, someFlag);
const player_playVideo = wnd.querySelector(`#player_playVideo${iWndIndex}`);
- if (player_playVideo.src || someFlag) {
+ const findFlag = Array.from(wnd.childNodes).find(item => {
+ return item.id && item.id.includes("player_playVideo");
+ });
+ if (player_playVideo.src || someFlag || findFlag.duration == "Infinity") {
controls.classList.add("video-controls_flex");
}
}
@@ -587,10 +604,13 @@ watch(
console.log("视频播放", videoInfo.devH5List);
}
} else {
- play({
- ...item,
- eIndex: index
- }, index);
+ play(
+ {
+ ...item,
+ eIndex: index
+ },
+ index
+ );
}
});
if (a.length > 1) {
@@ -656,7 +676,7 @@ onMounted(() => {
background-image: url("@/assets/images/iscImage/talkback.png");
}
.talkback_active {
- background-image: url("~@/assets/images/iscImage/talkback_active.png");
+ background-image: url("~@/assets/images/iscImage/talkback_active.png");
}
.screenshot {
background-image: url("@/assets/images/iscImage/screenshot.png");