Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

.env.development

@@ -6,8 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-# VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
-VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
+# VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
 # VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
@@ -29,7 +29,7 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

src/design/theme.less

@@ -133,6 +133,7 @@ html[data-theme='light'] {
 @vent-device-manager-control-btn: var(--vent-device-manager-control-btn);
 @vent-device-manager-control-btn-hover: var(--vent-device-manager-control-btn-hover);
 
+
 // 下面的代码负责将主题相关的选择器、图片前缀等 less 变量声明
 @theme-dark: ~"html[data-theme='dark2']";
 @theme-light: ~"html[data-theme='light']";

src/design/themify/dark.less

@@ -49,4 +49,5 @@ html[data-theme='dark2'] {
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;
+
 }

src/design/themify/deepblue.less

@@ -63,4 +63,5 @@ html[data-theme='deepblue'] {
   --vent-warn-tab-bg: #0f376c;
   --vent-warn-tab-border: #107eec;
   --vent-warn-tab-bg-actived: #0963c1;
+
 }

src/design/themify/default.less

@@ -62,4 +62,8 @@ html {
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;
+
+  --vent-balancePress-fan-bg-default: linear-gradient( to right, #071D3C22, #035EA266);
+  --vent-balancePress-fan-bg-select: linear-gradient(to right, #21A6CE99, #052d3d99);
+
 }

src/design/themify/light.less

@@ -1,40 +1,32 @@
 html[data-theme='light'] {
   --vent-primary-color: #1580cc;
-
   --vent-header-bg-color: linear-gradient(#005177, #0a344c);
-
   --vent-btn-primary-hover-color: #389bd9;
   --vent-btn-primary-focus-color: #1c638a99;
   --vent-btn-primary-color: #1c638a;
   --vent-btn-primary-border-color: #56b3c96b;
-
   --vent-table-thead: #3d9dd45d;
   --vent-table-thead-border: #91e9fe;
   --vent-table-hover: #0dc3ff22;
   --vent-table-no-hover: #00bfff10;
   --vent-table-action-link: #00e7ff;
-
   --vent-modal-title: #39e9fe;
   --vent-modal-border: #04bdaa;
   --vent-modal-bg: #0042ab22;
   --vent-modal-box-shadow: #2b87ff;
   --vent-modal-bg2: linear-gradient(#2cd1ff55, #1eb0ff55);
-
   --vent-tabs-bg: linear-gradient(#0091aa33, #2081ff11);
   --vent-tabs-table-thead: #3d9dd433;
   --vent-tabs-action-link: #28f3f3;
-
   --vent-form-item-border: #3ad8ff77;
-
   --vent-text-base: #ddd;
   --vent-base-color: #09172c;
   --vent-base-border: #5cfaff;
   --vent-base-light-bg: #60f4ff;
   --vent-base-light-bg-opcity: #60f4ff55;
-  --vent-transparent: #ffffff00;
-  --vent-font-color: #ffffff;
+  --vent-transparent: #fff0;
+  --vent-font-color: #fff;
   --vent-font-action-link: #7af5ff;
-
   --vent-configurable-bg: #09316a;
   --vent-configurable-module-bg: #3df6ff11;
   --vent-configurable-original-module-bg: #3df6ff15;
@@ -43,7 +35,6 @@ html[data-theme='light'] {
   --vent-configurable-home-bg-img: linear-gradient(to top, #39a3ff00, #0091ff99);
   --vent-configurable-home-timeline: linear-gradient(to top, #39a3ff00, #0091ff99, #39a3ff00);
   --vent-configurable-home-light-border: #3df6ff;
-
   --vent-gas-list-item-bg-img: linear-gradient(to right, #39a3ff55, #3977e500);
   --vent-gas-tab-bg: #10427a;
   --vent-gas-tab-bg-avtived: #166ab5;
@@ -51,12 +42,10 @@ html[data-theme='light'] {
   --vent-gas-primary-text: #00c8d9;
   --vent-gas-primary-bg: #1673bf;
   --vent-gas-primary-trasparent-bg: #0091ff12;
-
   --vent-device-manager-box-border: #44d3ff70;
-  --vent-device-manager-box-bg: #ffffff11;
+  --vent-device-manager-box-bg: #fff1;
   --vent-device-manager-control-btn: linear-gradient(#1fa6cb, #127cb5);
   --vent-device-manager-control-btn-hover: linear-gradient(#2cd1ff55, #1eb0ff55);
-
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;

src/views/vent/gas/gasInspect/components/inspectEdit.vue

@@ -6,8 +6,10 @@
                 <a-input v-model:value="formStateEdit.id" disabled />
             </a-form-item>
             <a-form-item label="瓦斯巡检地点：">
-                <a-select ref="select" v-model:value="formStateEdit.strInstallPos" placeholder="请选择..." @change="changeAddress">
-                    <a-select-option v-for="(item, index) in addressList" :key="item.value">{{ item.label
+                <a-select ref="select" v-model:value="formStateEdit.strInstallPos" placeholder="请选择..."
+                    @change="changeAddress">
+                    <a-select-option v-for="(item, index) in addressList" :key="item.value" :value="item.label">{{
+                        item.label
                         }}</a-select-option>
                 </a-select>
             </a-form-item>
@@ -31,7 +33,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from 'vue'
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { queryAllDisTeam,getAllGasIns } from '../gasInspect.api'
+import { queryAllDisTeam, getAllGasIns } from '../gasInspect.api'
 
 let props = defineProps({
     inspectEditData: {
@@ -47,7 +49,7 @@ let formStateEdit = reactive<any>({
     strInstallPos: '',
     disTeamId: '',
     insType: '',
-    deviceId:''
+    deviceId: ''
 })
 let addressList = ref<any[]>([])//监测地点下拉选项列表
 let qdList = ref<any[]>([])//区队下拉选项列表
@@ -67,23 +69,25 @@ async function queryAllDisTeamList() {
     }
 }
 //获取所有巡检地址
-async function getAllGasInsList(){
-    let res=await getAllGasIns()
-    console.log(res,'所有巡检地点---------')
-    if(res.length!=0){
-        addressList.value=res.map(el=>{
+async function getAllGasInsList() {
+    let res = await getAllGasIns()
+    console.log(res, '所有巡检地点---------')
+    if (res.length != 0) {
+        addressList.value = res.map(el => {
             return {
-                label:el.strinstallpos,
-                value:el.strinstallpos,
+                label: el.strinstallpos,
+                value: el.strinstallpos,
                 deviceId: el.id,
             }
         })
     }
 }
 //巡检地址选项切换
-let changeAddress=(val)=>{
-    formStateEdit.deviceId=addressList.value.filter(v=>v.value==val)[0].deviceId
-    formStateEdit.strInstallPos=val
+let changeAddress = (val) => {
+    console.log(val, '888===')
+    formStateEdit.deviceId = addressList.value.filter(v => v.value == val)[0].deviceId
+    formStateEdit.strInstallPos = val
+    console.log(formStateEdit.strInstallPos, '090===')
 }
 //编辑提交
 let confirmEdit = () => {
@@ -96,16 +100,20 @@ let cancelEdit = () => {
         strInstallPos: '',
         disTeamId: '',
         insType: '',
-        deviceId:''
+        deviceId: ''
     }
     $emit('cancelEdit',)
 }
 watch(() => props.inspectEditData, (newV, oldV) => {
-    formStateEdit = Object.assign({}, newV)
+    formStateEdit.strInstallPos = newV.strInstallPos
+    formStateEdit.id = newV.id
+    formStateEdit.disTeamId = newV.disTeamId
+    formStateEdit.insType = newV.insType
+    formStateEdit.deviceId = newV.deviceId
     getAllGasInsList()
     queryAllDisTeamList()
 }, { immediate: true })
-onMounted(() => {})
+onMounted(() => { })
 </script>
 
 <style lang="less" scoped>

src/views/vent/home/colliery/index.vue

@@ -34,10 +34,12 @@
                 <div class="nav-item" v-if="(item.valList && item.valList.length > 0) || item.val">
                   <div class="item-label">{{ item.name }}</div>
                   <div class="item-value">
-                    <div v-if="item.isShow" class="bg-box" v-for="(ite, ind) in item.valList" :key="ind">
-                      <div class="box-line"></div>
-                      <div class="value-text">{{ ite.val }}</div>
-                    </div>
+                    <template v-if="item.isShow">
+                      <div class="bg-box" v-for="(ite, ind) in item.valList" :key="ind">
+                        <div class="box-line"></div>
+                        <div class="value-text">{{ ite.val }}</div>
+                      </div>
+                    </template>
                     <div v-else class="value-text1">{{ item.val }}</div>
                   </div>
                 </div>
@@ -136,7 +138,6 @@
   const centerModalRef = ref();
   const fullModalRef = ref();
 
-  const globSetting = useGlobSetting();
   const pageType = ref('');
   let router = useRouter();
   const pageResult = ref({});
@@ -164,7 +165,6 @@
 
   function getList() {
     list({}).then((res) => {
-      console.log(res, 'res-----------');
       fanLocalList.length = 0;
       fanLocalList.push(res.fanlocal);
       mainList.value = res.fanmain || [];
@@ -225,6 +225,11 @@
       }
       warnData.value = res.warn || [];
       deviceData.value = res.device || {};
+
+      // 大海则不需要漏风率
+      if (sysOrgCode === 'sdtljtdhzmk') {
+        navList[4].val = 0;
+      }
     });
   }
 

src/views/vent/monitorManager/alarmMonitor/common/external-gqcw.vue

@@ -0,0 +1,152 @@
+<template>
+    <div class="external-gqcw">
+        <div class="nav" v-for="(item, index) in topOutList" :key="index">
+            <div class="pic" v-if="item.imgSrc">
+                <img :src="imgUrl" alt="" />
+            </div>
+            <div class="content" v-if="item.label && item.value">
+                <span>{{ item.label }}</span>
+                <span>{{ item.value }}</span>
+            </div>
+            <div class="text" v-if="item.text">{{ item.text }}</div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { topOutList } from '../common.data';
+import imgUrl from '/@/assets/images/fire/pie.png';
+</script>
+
+<style lang="less" scoped>
+@import '/@/design/theme.less';
+
+@{theme-deepblue} {
+    .external-gqcw {
+        --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
+        --image-max: url('/@/assets/images/themify/deepblue/fire/max.svg');
+        --image-min: url('/@/assets/images/themify/deepblue/fire/min.svg');
+        --image-pj: url('/@/assets/images/themify/deepblue/fire/pj.svg');
+        --image-1: url('/@/assets/images/themify/deepblue/fire/1.png');
+        --image-contetn: url('/@/assets/images/themify/deepblue/fire/contetn.png');
+        --image-2: url('/@/assets/images/themify/deepblue/fire/2.png');
+    }
+}
+
+.external-gqcw {
+    --image-zwnr: url('/@/assets/images/fire/wy-zwnr.png');
+    --image-z: url('/@/assets/images/fire/wy-z.png');
+    --image-zt: url('/@/assets/images/fire/wy-zt.png');
+    --image-zt1: url('/@/assets/images/fire/wy-zt2.png');
+    --image-time: url('/@/assets/images/fire/wy-time.png');
+    --image-time1: url('/@/assets/images/fire/wy-time2.png');
+    --image-title: url('/@/assets/images/fire/wy-title.png');
+    --image-bj2: url('/@/assets/images/fire/wy-bj.png');
+    --image-max: url('/@/assets/images/fire/max.svg');
+    --image-min: url('/@/assets/images/fire/min.svg');
+    --image-pj: url('/@/assets/images/fire/pj.svg');
+    --image-1: url('/@/assets/images/fire/1.png');
+    --image-contetn: url('/@/assets/images/fire/contetn.png');
+    --image-2: url('/@/assets/images/fire/2.png');
+    --border-image-2: linear-gradient(to bottom, transparent, #024688, transparent);
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .nav {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        &:nth-child(1) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(2) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(3) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(4) {
+            flex: 1.2;
+            color: #b3b8cc;
+            font-size: 16px;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(5) {
+            flex: 0.8;
+            color: #2b87ff;
+            font-size: 14px;
+            height: 100%;
+        }
+
+        .pic {
+            width: 26%;
+            height: 84%;
+
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .content {
+            height: 84%;
+            margin-left: 15px;
+            color: #fff;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-around;
+
+            span {
+                font-size: 14px;
+
+                &:nth-child(1) {
+                    padding: 5px 0px;
+                    color: #b3b8cc;
+                }
+
+                &:nth-child(2) {
+                    font-family: 'douyuFont';
+                    font-size: 16px;
+                    color: var(--vent-table-action-link);
+                }
+            }
+        }
+    }
+
+    .nav:nth-child(1) .pic {
+        background: var(--image-max) no-repeat center;
+        background-size: 50% 50%;
+    }
+
+    .nav:nth-child(2) .pic {
+        background: var(--image-min) no-repeat center;
+        background-size: 50% 50%;
+    }
+
+    .nav:nth-child(3) .pic {
+        background: var(--image-pj) no-repeat center;
+        background-size: 50% 50%;
+    }
+}
+</style>

src/views/vent/monitorManager/balancePressMonitor/balancePress.threejs.ts

@@ -49,8 +49,6 @@ export const play = (controlType, deviceType, frequency, state, duration?) => {
 export const updateText = (selectData) => {
   if (balancePressType === 'balancePressBase') {
     return balancePressBaseObj?.addText.call(balancePressBaseObj, selectData);
-  } else if (balancePressType === 'balancePressTun') {
-    return balancePressTunObj?.addText.call(balancePressTunObj, selectData);
   }
 };
 
@@ -86,8 +84,8 @@ export const setModelType = (type) => {
           await animateCamera(
             oldCameraPosition,
             { x: 3.9025, y: 0.7782, z: 6.6307 },
-            { x: 1.4763946591400468, y: 28.41203761378685, z: 14.142784066252352 },
-            { x: 1.334507975656787, y: 1.6848765189635717, z: -1.5733583795572064 },
+            { x: 0.30694425126412234, y: 6.664533888402769, z: 3.7879281016804667 },
+            { x: 0.27488693515931245, y: 0.6259183086723961, z: 0.23709305659449886 },
             model,
             0.8
           );

src/views/vent/monitorManager/balancePressMonitor/components/balancePressHome1.vue

@@ -77,6 +77,20 @@
                     ><SvgIcon class="icon" size="14" name="fiber-title" />
                     <span>局扇：{{ monitor.strinstallpos }}</span>
                   </div>
+                  <div class="vent-flex-row">
+                    <div
+                      class="fan-btn"
+                      :class="{ 'fan-btn-active': get(fanBtnData, monitor.deviceId) == 'Fan1' }"
+                      @click="changeFanBtn(monitor.deviceId, 'Fan1')"
+                      >主机</div
+                    >
+                    <div
+                      class="fan-btn"
+                      :class="{ 'fan-btn-active': get(fanBtnData, monitor.deviceId) == 'Fan2' }"
+                      @click="changeFanBtn(monitor.deviceId, 'Fan2')"
+                      >备机</div
+                    >
+                  </div>
                   <div class="input-box">
                     <div class="input-item">
                       <div class="title">运行风机</div>
@@ -85,17 +99,10 @@
                     <div v-for="(item, index) in fanlocalColumn" class="input-item" :key="index">
                       <div class="title">{{ item.title }}</div>
                       <div class="value">{{
-                        get(
-                          monitor,
-                          item.dataIndex.startsWith('Fan')
-                            ? get(monitor, 'Fan1StartStatus') == 1
-                              ? item.dataIndex.replace('Fan', 'Fan1')
-                              : item.dataIndex.replace('Fan', 'Fan2')
-                            : get(monitor, item.dataIndex),
-                          '-'
-                        )
+                        item.dataIndex.startsWith('Fan')
+                          ? get(monitor, item.dataIndex.replace('Fan', fanBtnData[monitor.deviceId]))
+                          : get(monitor, item.dataIndex)
                       }}</div>
-                      <!-- <div class="unit">{{ item.unit }}</div> -->
                     </div>
                   </div>
                 </template>
@@ -192,6 +199,7 @@
 
   const safetyMonitorData = ref<any[]>([]);
   const fanlocalMonitorData = ref<any[]>([]);
+  const fanBtnData = reactive({});
   const windowMonitorData = ref<any[]>([]);
   const windrectMonitorData = ref<any[]>([]);
   const fanlocalColumn = ref<any[]>([]);
@@ -215,6 +223,7 @@
           const f1Run = e.readData.Fan1StartStatus == '1';
           e.FanfHz = f1Run ? e.readData.Fan1_Frequency : e.readData.Fan2_Frequency;
           e.FanRun = f1Run ? '1#风机' : '2#风机';
+          if (!fanBtnData[e.deviceId]) fanBtnData[e.deviceId] = 'Fan1';
         });
         fanlocalMonitorData.value.push(...item.datalist);
       }
@@ -227,6 +236,9 @@
     });
   }
 
+  function changeFanBtn(deviceId, fan) {
+    fanBtnData[deviceId] = fan;
+  }
   // 喷粉操作
   function onSubmit() {
     sessionStorage.setItem('lalance-press-formdata', JSON.stringify(formData.value));
@@ -286,6 +298,7 @@
 <style lang="less" scoped>
   @import '/@/design/vent/modal.less';
   @import '../../comment/less/workFace.less';
+
   @ventSpace: zxm;
   .monitor-container {
     margin-top: 60px;
@@ -338,6 +351,30 @@
       padding: 4px 0;
     }
   }
+  .fan-btn {
+    flex: 1;
+    text-align: center;
+    background: var(--vent-balancePress-fan-bg-default);
+    cursor: pointer;
+    &:hover {
+      color: var(--vent-font-action-link);
+      background: var(--vent-balancePress-fan-bg-select);
+    }
+    &:first-child {
+      border-left: 1px solid;
+      border-radius: 4px;
+      border-color: var(--vent-configurable-home-light-border);
+    }
+    &:last-child {
+      border-right: 1px solid;
+      border-radius: 4px;
+      border-color: var(--vent-configurable-home-light-border);
+    }
+  }
+  .fan-btn-active {
+    color: var(--vent-font-action-link);
+    background: var(--vent-balancePress-fan-bg-select);
+  }
 
   :deep(.@{ventSpace}-tabs-tabpane-active) {
     overflow: auto;

src/views/vent/monitorManager/balancePressMonitor/index1.vue

@@ -17,7 +17,7 @@
     </div>
     <BottomMenu @change="changeActive"/>
   </div>
-  <Vent2dModal style="width: 100vw; height: 100vh; position: absolute; top: 0; left: 0;" />
+  <Vent2dModal v-if="activeKey == 'monitor'" style="width: 100vw; height: 100vh; position: absolute; top: 0; left: 0;" />
 </template>
 
 <script setup lang="ts">
@@ -136,6 +136,12 @@ onBeforeUnmount(() => {
   margin-top: 20px;
   pointer-events: none;
   position: relative;
+  :deep(.left-box){
+    margin-top: 0px;
+  }
+  :deep(.right-box){
+    margin-top: 0px;
+  }
   .history-group{
     padding: 0 20px;
     .history-container{

src/views/vent/monitorManager/balancePressMonitor/index2.vue

@@ -34,7 +34,6 @@ import balancePressHistory from './components/balancePressHistory.vue';
 import balancePressHandleHistoryVue from './components/balancePressHandleHistory.vue';
 import balancePressAlarmHistory from './components/balancePressAlarmHistory.vue';
 import { useRouter } from 'vue-router';
-import { setModelType } from './balancePress.threejs';
 
 type DeviceType = { deviceType: string, deviceName: string, datalist: any[] };
 
@@ -103,7 +102,7 @@ function getSelectRow(deviceID){
   // })
   optionValue.value = deviceID
   getDeviceList()
-  setModelType('balancePressTun')
+  // setModelType('balancePressTun')
 }
 
 onBeforeMount(() => {

src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -286,7 +286,7 @@
     formData['pageNo'] = pagination['current'];
     formData['pageSize'] = pagination['pageSize'];
     formData['column'] = 'createTime';
-    if (stationType.value !== 'redis') {
+    if (stationType.value !== 'redis' && deviceOptions.value[0]) {
       formData['strtype'] = deviceTypeStr.value
         ? deviceTypeStr.value
         : deviceOptions.value[0]['strtype']

src/views/vent/monitorManager/comment/MonitorTable.vue

@@ -120,7 +120,7 @@
       pagination: props.isShowPagination
         ? {
             current: 1,
-            pageSize: 50,
+            pageSize: 30,
             pageSizeOptions: ['10', '30', '50', '100', '500'],
             showQuickJumper: false,
           }

src/views/vent/monitorManager/sensorMonitor/index.vue

@@ -4,7 +4,7 @@
       <a-tabs class="tabs-box" type="card" v-model:activeKey="activeKey" @change="tabChange">
         <a-tab-pane key="1" tab="实时监测">
           <div class="box-bg table-box" style="margin-bottom: 10px">
-            <div>
+            <div class="table-box-content">
               <label style="color: var(--vent-font-color)">设备类型：</label>
               <Select
                 @change="handleSensorChange"
@@ -21,7 +21,7 @@
               </template>
               <MonitorTable
                 ref="SensorMonitorRef"
-                :is-show-select="false"
+                :is-show-select="true"
                 :columnsType="deviceKind + '_monitor'"
                 :dataSource="dataSource"
                 design-scope="modelsensor_monitor"
@@ -87,7 +87,7 @@
         </a-tab-pane>
         <a-tab-pane key="4" tab="报警分析">
           <div class="tab-item box-bg" v-if="activeKey == '4'">
-           <warnAnalysis  device-type="modelsensor"></warnAnalysis>
+            <warnAnalysis device-type="modelsensor" />
           </div>
         </a-tab-pane>
         <!-- <a-tab-pane key="4" tab="操作历史">
@@ -110,7 +110,7 @@
   import MonitorTable from '../comment/MonitorTable.vue';
   import HistoryTable from '../comment/HistoryTable.vue';
   import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
-  import warnAnalysis from '../comment/warnAnalysis.vue'
+  import warnAnalysis from '../comment/warnAnalysis.vue';
   import { list, getTableList } from './sensor.api';
   import { deviceList } from '../../deviceManager/comment/pointTabel/point.api';
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
@@ -371,8 +371,13 @@
       background-color: #ffffff11;
       overflow-y: auto;
     }
+    .table-box-content {
+      height: 430px;
+      background-color: #ffffff03;
+      border-bottom: 1px solid #44d3ff70;
+    }
     .charts-box {
-      height: calc(40% - 80px);
+      height: 300px;
       padding: 5px 10px;
       margin-top: 10px;
     }
@@ -397,7 +402,7 @@
     }
     .@{ventSpace}-picker,
     .@{ventSpace}-select-selector {
-      width: 100% ;
+      width: 100%;
       background: #00000017 !important;
       border: 1px solid @vent-form-item-border !important;
       input,