From 8420debd27d49219a4022a692d8fae980b89593c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sat, 18 May 2024 18:06:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/modules/video.ts                      |   4 +
 src/assets/images/icon-video-blue.png         | Bin 0 -> 235 bytes
 src/config/staticMenu.ts                      |   2 +-
 .../videoManagement/index.vue                 | 124 ++++++++++++++----
 5 files changed, 107 insertions(+), 27 deletions(-)
 create mode 100644 src/assets/images/icon-video-blue.png

diff --git a/.env.development b/.env.development
index 092d7e7..4ee55a5 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.221:19111'
-# VITE_API_URL = 'http://192.168.34.221:9111'
+VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -23,7 +23,7 @@ NODE_ENV = 'development'
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # agjt
 # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
-VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
+# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
 # 苏立信
 # VITE_API_URL = 'http://101.43.164.214:11111'
diff --git a/src/api/modules/video.ts b/src/api/modules/video.ts
index 3bdfcba..b1cc92a 100644
--- a/src/api/modules/video.ts
+++ b/src/api/modules/video.ts
@@ -5,6 +5,10 @@ const BASEURL = import.meta.env.VITE_API_URL;
 export const selectProjectVideoListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/videoItem/selectProjectVideoList`, params);
 };
+// 根据分组查询分组视频树形列表
+export const selectProjectVideoGroupApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/videoItem/selectProjectVideoTreeList`, params);
+};
 // 查询子账号视频列表
 export const selectUserVideoListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/videoItem/selectUserVideoList`, params);
diff --git a/src/assets/images/icon-video-blue.png b/src/assets/images/icon-video-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..486934337295cabe05881ed79ec92dd2ac3ec562
GIT binary patch
literal 235
zcmV<H02Kd;P)<h;3K|Lk000e1NJLTq000gE000OG1^@s6$q~-X00001b5ch_0Itp)
z=>Px#rAb6VR2Ug!3~Ktm_5c6>UJSSZBjbO@{|pP()pI6+l!UJO&-~}sj|djLnm{W5
zgY+@DgEck(Q2%@5`$C5Q4CX8#0YZS0k%1AU=I_7%7l4LvfY?kRf>`jM;XhatNIgj!
zku4xeBhbmyV48s%8Nb0eIO+e4UqN!~>bSC*n3!A{85tk4Ff%ZQ{9|Nvz@-Tor2m<i
l|8IfGudU_SlQ#3eDgYb5GVzik9A*Fj002ovPDHLkV1g>eWH0~#

literal 0
HcmV?d00001

diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts
index ac8b7bc..ed3e9d0 100644
--- a/src/config/staticMenu.ts
+++ b/src/config/staticMenu.ts
@@ -789,7 +789,7 @@ export const AGJTMenu: Array<any> = [
 		// ]
 	},
 	{
-		moduleName: "车辆定位",
+		moduleName: "机械设备定位",
 		modulePath: "/equipmentPosition"
 	},
 	{
diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue
index 0931848..c23c267 100644
--- a/src/views/sevenLargeScreen/videoManagement/index.vue
+++ b/src/views/sevenLargeScreen/videoManagement/index.vue
@@ -4,16 +4,15 @@
 			<div class="videoListBig">
 				<Card title="监控设备列表">
 					<el-scrollbar style="height: 100%">
-						<el-tree
-							ref="treeRef"
-							default-expand-all
-							icon="ArrowRight"
-							:data="shipinList"
-							node-key="name"
-							:props="defaultProps"
-							@node-click="checkVideo"
-							empty-text=""
-						>
+						<!-- default-expand-all -->
+						<el-tree ref="treeRef" icon="ArrowRight" :data="shipinList" node-key="id" @node-click="checkVideo" empty-text="">
+							<template #default="{ node, data }">
+								<span class="custom-tree-node">
+									<img v-if="data.deviceType == 2 && data.videoId" src="@/assets/images/icon-video-blue.png" />
+									<img v-else-if="data.deviceType != 2 && data.videoId" src="@/assets/images/icon-video-blue.png" />
+									<span :title="data.name">{{ data.name }}</span>
+								</span>
+							</template>
 						</el-tree>
 						<!-- <div class="decivList">
 							<div
@@ -68,10 +67,10 @@ import ysyPlayAndPlayback from "@/components/ysyPlayAndPlayback.vue";
 import { ref, onMounted, onBeforeUnmount, getCurrentInstance, nextTick, Ref, onBeforeMount } from "vue";
 import { ElMessage } from "element-plus";
 import { GlobalStore } from "@/stores";
-import { selectProjectVideoListApi, getSafeHatSessionApi } from "@/api/modules/video";
+import { selectProjectVideoListApi, selectProjectVideoGroupApi, getSafeHatSessionApi } from "@/api/modules/video";
 import { COMPANY } from "@/config/config";
 const defaultProps = {
-	children: "list",
+	children: "children",
 	label: (data: any, node: any) => node.data.name
 };
 let videoType = ref("") as any;
@@ -154,25 +153,25 @@ const checkVideo = async (item: any) => {
 // let firstVideoId = ref("" as any);
 //获取视频列表
 const getVideoList = async () => {
-	let res: any = await selectProjectVideoListApi({
+	let res: any = await selectProjectVideoGroupApi({
 		projectSn: store.sn
 		// all: 1
 		// all=1查全部
 	});
 	shipinList.value = res.result.videoList;
-	if(res.result.videoList[0].list){
-		if(!res.result.videoList[0].list[0]?.outip){
+	if (res.result.videoList[0].list) {
+		if (!res.result.videoList[0].list[0]?.outip) {
 			objData.value.appkey = res.result.videoList[0].list[0].appId;
 			objData.value.ip = res.result.videoList[0].list[0].account;
 			objData.value.secret = res.result.videoList[0].list[0].appSecret;
 			objData.value.port = +res.result.videoList[0].list[0].password;
-		}else{
+		} else {
 			objData.value.appkey = res.result.videoList[0].list[0].appId;
 			objData.value.ip = res.result.videoList[0].list[0].outip;
 			objData.value.secret = res.result.videoList[0].list[0].appSecret;
-			objData.value.port = +res.result.videoList[0].list[0].outport;	
+			objData.value.port = +res.result.videoList[0].list[0].outport;
 		}
-		
+
 		cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber;
 		// firstVideoId.value = res.result.videoList[0].serialNumber;
 		// previewVideo(res.result.videoList[0].list[0].serialNumber);
@@ -188,18 +187,18 @@ const getVideoList = async () => {
 			oWebControl.JS_Disconnect();
 		}
 	} else {
-		if(!res.result.videoList[0].list[0]?.outip){
+		if (!res.result.videoList[0].list[0]?.outip) {
 			objData.value.appkey = res.result.videoList[0].appId;
 			objData.value.ip = res.result.videoList[0].account;
 			objData.value.secret = res.result.videoList[0].appSecret;
 			objData.value.port = +res.result.videoList[0].password;
-		}else{
+		} else {
 			objData.value.appkey = res.result.videoList[0].appId;
 			objData.value.ip = res.result.videoList[0].outip;
 			objData.value.secret = res.result.videoList[0].appSecret;
 			objData.value.port = +res.result.videoList[0].outport;
 		}
-		
+
 		cameraIndexCode.value = res.result.videoList[0].serialNumber;
 		// firstVideoId.value = res.result.videoList[0].serialNumber;
 		// previewVideo(res.result.videoList[0].list[0].serialNumber);
@@ -215,11 +214,74 @@ const getVideoList = async () => {
 			oWebControl.JS_Disconnect();
 		}
 	}
-	
 };
+// const getVideoList = async () => {
+// 	let res: any = await selectProjectVideoListApi({
+// 		projectSn: store.sn
+// 		// all: 1
+// 		// all=1查全部
+// 	});
+// 	shipinList.value = res.result.videoList;
+// 	if(res.result.videoList[0].list){
+// 		if(!res.result.videoList[0].list[0]?.outip){
+// 			objData.value.appkey = res.result.videoList[0].list[0].appId;
+// 			objData.value.ip = res.result.videoList[0].list[0].account;
+// 			objData.value.secret = res.result.videoList[0].list[0].appSecret;
+// 			objData.value.port = +res.result.videoList[0].list[0].password;
+// 		}else{
+// 			objData.value.appkey = res.result.videoList[0].list[0].appId;
+// 			objData.value.ip = res.result.videoList[0].list[0].outip;
+// 			objData.value.secret = res.result.videoList[0].list[0].appSecret;
+// 			objData.value.port = +res.result.videoList[0].list[0].outport;
+// 		}
+
+// 		cameraIndexCode.value = res.result.videoList[0].list[0].serialNumber;
+// 		// firstVideoId.value = res.result.videoList[0].serialNumber;
+// 		// previewVideo(res.result.videoList[0].list[0].serialNumber);
+// 		console.log(objData.value);
+// 		console.log("视频列表", res);
+// 		ysyParams.value = res.result.videoList[0].list[0];
+// 		videoType.value = res.result.videoList[0].list[0].videoType;
+// 		if (res.result.videoList[0].list[0].videoType === 1) {
+// 			oWebControl.JS_HideWnd();
+// 			// 销毁当前播放的视频
+// 			oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
+// 			// 断开与插件服务连接
+// 			oWebControl.JS_Disconnect();
+// 		}
+// 	} else {
+// 		if(!res.result.videoList[0].list[0]?.outip){
+// 			objData.value.appkey = res.result.videoList[0].appId;
+// 			objData.value.ip = res.result.videoList[0].account;
+// 			objData.value.secret = res.result.videoList[0].appSecret;
+// 			objData.value.port = +res.result.videoList[0].password;
+// 		}else{
+// 			objData.value.appkey = res.result.videoList[0].appId;
+// 			objData.value.ip = res.result.videoList[0].outip;
+// 			objData.value.secret = res.result.videoList[0].appSecret;
+// 			objData.value.port = +res.result.videoList[0].outport;
+// 		}
+
+// 		cameraIndexCode.value = res.result.videoList[0].serialNumber;
+// 		// firstVideoId.value = res.result.videoList[0].serialNumber;
+// 		// previewVideo(res.result.videoList[0].list[0].serialNumber);
+// 		console.log(objData.value);
+// 		console.log("视频列表", res);
+// 		ysyParams.value = res.result.videoList[0];
+// 		videoType.value = res.result.videoList[0].videoType;
+// 		if (res.result.videoList[0].videoType === 1) {
+// 			oWebControl.JS_HideWnd();
+// 			// 销毁当前播放的视频
+// 			oWebControl.JS_RequestInterface({ funcName: "destroyWnd" });
+// 			// 断开与插件服务连接
+// 			oWebControl.JS_Disconnect();
+// 		}
+// 	}
+
+// };
 onBeforeMount(() => {
 	getVideoList();
-})
+});
 onMounted(async () => {
 	initPlugin();
 	// setTimeout(() => {
@@ -350,7 +412,7 @@ const initPlugin = () => {
 
 // 初始化
 const init = (callback: (() => void) | undefined) => {
-	console.log(objData.value,'我的视频服务器')
+	console.log(objData.value, "我的视频服务器");
 	getPubKey(() => {
 		let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填
 		let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填
@@ -596,4 +658,18 @@ const previewVideo = (data: string | null) => {
 		top: 0;
 	}
 }
+// 树形样式
+.custom-tree-node {
+	display: flex;
+	align-items: center;
+	span {
+		margin-left: 8%;
+		color: white;
+		font-size: 16px;
+		margin-bottom: 1px;
+	}
+	img {
+		margin-right: 8px;
+	}
+}
 </style>