Bladeren bron

1. 柳塔注氮页面调整

hongrunxia 8 maanden geleden
bovenliggende
commit
bbd6630539

+ 1 - 1
src/views/vent/monitorManager/compressor/components/nitrogenHome_bd.vue

@@ -937,7 +937,7 @@ watch([monitorDataGroupNum, loading], ([newMonitorDataGroupNum, newLoading]) =>
 
 watch(() => props.deviceId, async(deviceId) => {
   if(deviceId){
-    await getCamera(deviceId, playerRef.value);
+    await getCamera(deviceId, playerRef.value, );
   }
 })
 

+ 2 - 2
src/views/vent/monitorManager/compressor/components/nitrogenHome_bet.vue

@@ -440,7 +440,7 @@ watch([monitorDataGroupNum, loading], ([newMonitorDataGroupNum, newLoading]) =>
 
 watch(() => props.deviceId, async(deviceId) => {
   if(deviceId){
-    await getCamera(deviceId, playerRef.value);
+    await getCamera(deviceId, playerRef.value, 'nitrogen');
   }
 })
 onBeforeUnmount(() => {
@@ -452,7 +452,7 @@ onMounted(async () => {
   await mountedThree().then(() => {
     loading.value = false;
   });
-  await getCamera(props.deviceId, playerRef.value);
+  await getCamera(props.deviceId, playerRef.value, 'nitrogen');
 });
 
 onUnmounted(() => {

+ 6 - 4
src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -211,12 +211,14 @@ export const zhudanOption = reactive({
 });
 
 export function getMonitorComponent() {
-  const { sysOrgCode } = useGlobSetting();
+  // const { sysOrgCode } = useGlobSetting();
+  const sysOrgCode = 'sdmtjtltmk';
   let nitrogenHome;
   switch (sysOrgCode) {
     case 'sdmtjtdltmk': //dltj
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_dltj.vue'));
       return nitrogenHome;
+    case 'sdmtjtltmk':
     case 'sdmtjtsgtmk': // 石圪台
     case 'sdmtjtbetmk': // bet
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bet.vue'));
@@ -232,9 +234,9 @@ export function getMonitorComponent() {
     case 'sdmtjtcctmk': // 寸草塔
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
       return nitrogenHome;
-    case 'sdmtjtltmk': // 柳塔
-      nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_lt.vue'));
-      return nitrogenHome;
+    // case 'sdmtjtltmk': // 柳塔
+    //   nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_lt.vue'));
+    //   return nitrogenHome;
     case 'lahgjtlnmy': // 潞宁
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_ln.vue'));
       return nitrogenHome;

+ 12 - 2
src/views/vent/monitorManager/nitrogen/components/nitrogenHome1.vue

@@ -172,7 +172,7 @@
         </div>
       </div>
     </div>
-    <div ref="playerRef" class="player-box"></div>
+    <div ref="playerRef" class="player-box" :class="{ 'sw-player': sysOrgCode == 'sdmtjtswmk' }"></div>
   </div>
 </template>
 
@@ -185,6 +185,7 @@
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import { formatNum } from '/@/utils/ventutil';
   import { useCamera } from '/@/hooks/system/useCamera';
+  import { useGlobSetting } from '/@/hooks/setting';
 
   const props = defineProps({
     deviceId: {
@@ -196,6 +197,8 @@
       require: true,
     },
   });
+  // const { sysOrgCode } = useGlobSetting();
+  const sysOrgCode = 'sdmtjtswmk';
   const loading = ref(false);
   const monitorDataGroup = ref<Number[]>([]);
   const monitorDataGroupFlag = ref(1);
@@ -384,7 +387,7 @@
       mountedThree(deviceProperty.value.monitorDataGroupArr).then(async () => {
         setMonitorGroupNum(1);
         getMonitor(true).then(async () => {
-          if (selectData.value && selectData.value['deviceID']) await getCamera(selectData.value['deviceID'], playerRef.value);
+          if (selectData.value && selectData.value['deviceID']) await getCamera(selectData.value['deviceID'], playerRef.value, 'forcFan');
         });
       });
     }, 0);
@@ -627,6 +630,13 @@
       justify-content: end;
     }
   }
+  //**上湾视频样式 */
+  .sw-player {
+    right: 350px;
+    bottom: 130px;
+    display: flex;
+    flex-direction: row;
+  }
   .input-box {
     width: calc(100%);
     display: flex;

+ 4 - 4
src/views/vent/monitorManager/nitrogen/nitrogen.data.1.ts

@@ -1,8 +1,8 @@
 import { ref, defineAsyncComponent } from 'vue';
 import { useGlobSetting } from '/@/hooks/setting';
 export function getNitrogenHome() {
-  const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtswmk';
+  // const { sysOrgCode } = useGlobSetting();
+  const sysOrgCode = 'sdmtjtswmk';
   let nitrogenHome;
   switch (sysOrgCode) {
     case 'sdmtjtbltmk': //补连塔
@@ -59,8 +59,8 @@ export const bottomBtnList = ref([
 ]);
 
 export async function getMonitorData() {
-  const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtswmk';
+  // const { sysOrgCode } = useGlobSetting();
+  const sysOrgCode = 'sdmtjtswmk';
   switch (sysOrgCode) {
     case 'yjmdsankuang': // 窑街三矿
       return await import('./nitrogen.dataYJ');