From 0b9638814bdb53ad9d9c5caa409097ac7ff55a92 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 4 Sep 2025 11:51:12 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B5=B7?=
 =?UTF-8?q?=E5=BA=B7=E9=BB=98=E8=AE=A4=E7=A0=81=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/companyBigScreen.js                |  1 +
 .../videoModule/isc_plugin/video_isc_plugin.js       | 12 ++++++------
 .../companyBigScreen/components/companyInfo.vue      |  6 ++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/assets/js/api/companyBigScreen.js b/src/assets/js/api/companyBigScreen.js
index 89a508a6..bb6c0f71 100644
--- a/src/assets/js/api/companyBigScreen.js
+++ b/src/assets/js/api/companyBigScreen.js
@@ -163,6 +163,7 @@ export const getAreaDamgerList = data => post('/xmgl/panoramaPlanStatistics/sele
 
 // 查询项目信息
 export const getCompanyInfo = data => post('/xmgl/company/queryById', data)
+export const getQueryBySnCompanyInfo = data => post('/xmgl/company/queryBySn', data)
 
 // 查询项目列表
 export const getProjectList = data => post('/xmgl/project/selectProjectListByCompany', data)
diff --git a/src/components/videoModule/isc_plugin/video_isc_plugin.js b/src/components/videoModule/isc_plugin/video_isc_plugin.js
index 6d388b7d..788fbf84 100644
--- a/src/components/videoModule/isc_plugin/video_isc_plugin.js
+++ b/src/components/videoModule/isc_plugin/video_isc_plugin.js
@@ -79,15 +79,15 @@ export function unInitObjPlugin() {
 export function OpenVideo(cameraIndexCode, streamMode, winIndex) {
   var transMode = +'1'; //传输协议：1、TCP    0、UDP
   var gpuMode = +'0'; //是否启用GPU硬解：1、启用   0、不启用
-
+  console.log(8855544, streamMode)
   oWebControl.JS_RequestInterface({
     funcName: "startPreview",
     argument: JSON.stringify({
       cameraIndexCode: cameraIndexCode,
-      streamMode: streamMode,
+      streamMode: streamMode == 2 ? 0 : streamMode, // 码流类型 0 主码流 1 子码流 (2 主码流 1 子码流)
       transMode: transMode,
       gpuMode: gpuMode,
-      wndId: -1
+      wndId: -1,
     })
   }).then(function (oData) {
     console.log(oData.responseMsg.code === 336)
@@ -266,7 +266,7 @@ export function InitObjPlugin(appkey, secret, ip, port, type, videoData, layout)
 }
 //初始化
 function init(videoData) {
-  console.log(videoData)
+  console.log(222222222222, videoData)
   getPubKey(function () {
     ////////////////////////////////// 请自行修改以下变量值 ////////////////////////////////////
     // var appkey = "20880397"; //综合安防管理平台提供的appkey，必填
@@ -320,7 +320,7 @@ function init(videoData) {
       for (let i = 0; i < videoData.length; i++) {
         if (i < 24 && videoData.length >= i) {
           // setTimeout(()=>{
-          OpenVideo(videoData[i].serialNumber, 0, i + 1)
+          OpenVideo(videoData[i].serialNumber, videoData[i].defaultStreamType, i + 1)
           // },1000)
 
         }
@@ -335,7 +335,7 @@ export function isLoadPlugin(devList, layout) {
   if (oWebControl) {
     devList.forEach(element => {
       setTimeout(() => {
-        OpenVideo(element.serialNumber, 1)
+        OpenVideo(element.serialNumber,element.defaultStreamType)
       }, 500)
 
     });
diff --git a/src/views/companyAdmin/companyBigScreen/components/companyInfo.vue b/src/views/companyAdmin/companyBigScreen/components/companyInfo.vue
index 55933f7b..5bae737c 100644
--- a/src/views/companyAdmin/companyBigScreen/components/companyInfo.vue
+++ b/src/views/companyAdmin/companyBigScreen/components/companyInfo.vue
@@ -28,7 +28,7 @@
 import CompanyInfoDialog from './companyInfoDialog.vue'
 import Card from './card.vue'
 import { ref, onMounted } from 'vue'
-import { getCompanyInfo } from '@/assets/js/api/companyBigScreen'
+import { getQueryBySnCompanyInfo } from '@/assets/js/api/companyBigScreen'
 import { queryCustomConfig } from '@/assets/js/api/common'
 import store from '@/store'
 const infoData = ref({})
@@ -55,7 +55,9 @@ const getCustomConfig = async () => {
   }
 }
 const getCompanyInfoData = async () => {
-  const res = await getCompanyInfo({ sn: store.state.userInfo.sn })
+  const res = await getQueryBySnCompanyInfo({ 
+    sn: store.state.userInfo.sn, 
+  })
   console.log(res)
   infoData.value = {
     imageUrl: res.result.coverImage,