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

src/utils/threejs/main.worker.ts

@@ -12,9 +12,9 @@ export function initModalWorker() {
   };
   const modalUrlArr = [
     'fm/fm_2023-06-02.glb',
-    'fm/Fm-door_2023-11-28.glb',
-    'fm/Fm-wire_2023-11-28.glb',
-    'fm/Fm-wall_2023-11-28.glb',
+    'fm/Fm-door_2023-11-29.glb',
+    'fm/Fm-wire_2023-11-29.glb',
+    'fm/Fm-wall_2023-11-29.glb',
     'fm/fmThree_2023-07-25.glb',
     'fm/fmThreeBase_2023-07-25.glb',
 
@@ -34,7 +34,7 @@ export function initModalWorker() {
     'cf/dsgd_2023-06-02.glb',
     'cf/ddcf_2023-07-13.glb',
     'cf/dsmove_2023-06-02.glb',
-    'cf/fixedCf_2023-11-28.glb',
+    'cf/fixedCf_2023-11-29.glb',
     'jbfj/jbfj-hd_2023-10-19.glb',
     'jbfj/jbfj-fm_2023-06-02.glb',
     'jbfj/jbfj-fc_2023-06-02.glb',

src/views/vent/monitorManager/alarmMonitor/fire/closeWall.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="closeWall">
         <div class="title">
-            <div class="box">
+            <div class="box-container">
                 <div class="contents">
                     <img src="../../../../../assets/images/fire/pie.png" alt="" />
                     <span class="text">{{ topContent.temperature }}</span>
@@ -18,14 +18,14 @@
                     </div>
                 </div>
             </div>
-            <div class="box">
+            <div class="box-container">
                 <div class="text1">{{ topContent.warn }}</div>
             </div>
         </div>
         <div class="content">
             <div class="title-b">采空区密闭参数</div>
             <div class="card-btn">
-                <div :class="activeIndex == index ? 'box1' : 'box'" v-for="(item, index) in mbList" :key="index"
+                <div :class="activeIndex == index ? 'box-container1' : 'box-container'" v-for="(item, index) in mbList" :key="index"
                     @click="btnClick(item, index)">
                     <div class="label">{{ item.label }}</div>
                     <div class="box-item box-item1">
@@ -262,9 +262,8 @@ watch(() => props.listData, (val) => {
         background: url('../../../../../assets/images/fire/bj1.png') no-repeat center;
         background-size: 100% 100%;
         align-items: center;
-        .box {
+        .box-container {
             display: flex;
-            margin-top: 10px !important;
             &:nth-child(1) {
                 justify-content: space-around;
                 align-items: center;
@@ -366,7 +365,7 @@ watch(() => props.listData, (val) => {
             display: flex;
             justify-content: space-between;
 
-            .box {
+            .box-container {
                 position: relative;
                 width: 16%;
                 height: 100%;
@@ -426,7 +425,7 @@ watch(() => props.listData, (val) => {
                 }
             }
 
-            .box1 {
+            .box-container1 {
                 position: relative;
                 width: 16%;
                 height: 100%;

src/views/vent/monitorManager/alarmMonitor/fire/fireWork.vue

@@ -14,7 +14,7 @@
                 <div class="percent" v-if="item.list.length != 0">
                     <div class="title">{{ item.label }}</div>
                     <div class="value">
-                        <div class="box" v-for="(items, ind) in item.list" :key="ind">
+                        <div class="content-box" v-for="(items, ind) in item.list" :key="ind">
                             <span style="color: #b3b8cc">{{ `${items.label} :` }}</span>
                             <span style="color: #3df6ff; margin-left: 10px">{{ `${items.value}%` }}</span>
                         </div>
@@ -37,7 +37,7 @@
                 <div class="text">束管系统监测</div>
             </div>
             <div class="content">
-                <div class="box" v-for="(item, index) in contentList" :key="index">
+                <div class="content-box" v-for="(item, index) in contentList" :key="index">
                     <div class="box-item" v-for="(items, ind) in item.list" :key="ind" @click="getSgClick(items)">
                         <div class="content-title">{{ items.title }}</div>
                         <div class="content-item">
@@ -382,12 +382,12 @@ watch(() => props.listData, (val, val1) => {
             flex-direction: column;
             justify-content: space-between;
 
-            .box {
+            .content-box {
                 width: 100%;
                 height: 29%;
                 display: flex;
                 justify-content: space-between;
-
+                margin-top: 0px !important;
                 .box-item {
                     position: relative;
                     width: 16%;

src/views/vent/monitorManager/alarmMonitor/fire/mainWell.vue

@@ -15,7 +15,7 @@
         </div>
         <!-- 束管监测 -->
         <div class="work-nav" v-if="listData.bundletube.length!=0 && strType!='sys_coalseam'">
-            <div class="box">
+            <div class="content-box">
                 <div class="contents">
                     <img src="../../../../../assets/images/fire/pie.png" alt="" />
                     <span class="text">{{ topContent.temperature }}</span>
@@ -32,14 +32,14 @@
                     </div>
                 </div>
             </div>
-            <div class="box">
+            <div class="content-box">
                 <div class="text1">{{ topContent.warn }}</div>
             </div>
         </div>
 
 
         <div class="center-box" v-if="strType!='sys_coalseam'">
-            <div class="box" v-for="(items, index) in tabList" :key="index">
+            <div class="content-box" v-for="(items, index) in tabList" :key="index">
                 <div class="title">
                     <span class="label">{{ items.label }}</span>
                     <span class="details">{{ `${items.details}>>` }}</span>
@@ -62,7 +62,7 @@
         </div>
 
         <div  :class="listData.fiber.length!=0 ? 'center-box1' : 'center-box2'" v-if="strType=='sys_coalseam'">
-            <div class="box" v-for="(items, index) in tabLists" :key="index">
+            <div class="content-box" v-for="(items, index) in tabLists" :key="index">
                 <div class="title">
                     <span class="label">{{ items.label }}</span>
                     <span class="details">{{ `${items.details}>>` }}</span>
@@ -101,7 +101,7 @@
         <div class="content-s" v-if="listData.bundletube.length!=0 && strType!='sys_coalseam'">
             <div class="title-b">采空区密闭参数</div>
             <div class="card-btn">
-                <div :class="activeIndex == index ? 'box1' : 'box'" v-for="(item, index) in mbList" :key="index"
+                <div :class="activeIndex == index ? 'content-box1' : 'content-box'" v-for="(item, index) in mbList" :key="index"
                     @click="btnClick(item, index)">
                     <div class="label">{{ item.label }}</div>
                     <div class="box-item box-item1">
@@ -489,7 +489,7 @@ watch(() => props.listData, (val) => {
 
 
        
-        .box {
+        .content-box {
             display: flex;
 
             &:nth-child(1) {
@@ -576,7 +576,7 @@ watch(() => props.listData, (val) => {
         justify-content: space-between;
         align-items: center;
 
-        .box {
+        .content-box {
             display: flex;
             flex-direction: column;
             width: 32%;
@@ -626,7 +626,7 @@ watch(() => props.listData, (val) => {
         align-items: flex-start;
         flex-wrap: wrap;
 
-        .box {
+        .content-box {
             display: flex;
             flex-direction: column;
             width: calc(50% - 10px);
@@ -677,7 +677,7 @@ watch(() => props.listData, (val) => {
         align-items: flex-start;
         flex-wrap: wrap;
 
-        .box {
+        .content-box {
             display: flex;
             flex-direction: column;
             width: calc(50% - 10px);
@@ -788,7 +788,7 @@ watch(() => props.listData, (val) => {
             display: flex;
             justify-content: space-between;
 
-            .box {
+            .content-box {
                 position: relative;
                 width: 16%;
                 height: 100%;
@@ -848,7 +848,7 @@ watch(() => props.listData, (val) => {
                 }
             }
 
-            .box1 {
+            .content-box1 {
                 position: relative;
                 width: 16%;
                 height: 100%;

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -167,7 +167,6 @@
                     ]" />
                   
                   </template>
-                  
                   <template #filterCell="{ column, record }">
                     <template v-if="deviceType.startsWith('gate')">
                       <template v-if="record.frontGateOpenCtrl == 1 || record.frontGateOpenCtrl === true">
@@ -408,7 +407,7 @@ const onSelect: TreeProps['onSelect'] = (keys, e) => {
     dataSource.value = []
     activeKey.value = '1'
     timer = null
-    getMonitor()
+    getMonitor(true)
   }, 200)
 };
 
@@ -457,7 +456,7 @@ async function getDeviceType() {
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = undefined;
-function getMonitor() {
+function getMonitor(flag?) {
   if (deviceType.value) {
     if (timer) timer = null
     if (Object.prototype.toString.call(timer) === '[object Null]') {
@@ -466,7 +465,7 @@ function getMonitor() {
         if (timer) {
           getMonitor();
         }
-      }, 1000);
+      }, flag ? 0 : 1000);
     }
   }
 };
@@ -509,7 +508,6 @@ async function getDataSource() {
   } else {
     let res = null
     if(systemID.value){
-
       res = await list({ devicetype: 'sys', types: deviceType.value, systemID: systemID.value })
       if (res && res.msgTxt) {
         const result = res.msgTxt;
@@ -536,11 +534,18 @@ async function getDataSource() {
         })
       }
     }else{
-      const formData = monitorTable.value.getForm()
-      const searchForm = formData.getFieldsValue()
-      res = await list({ devicetype: deviceType.value, pagetype: 'normal', filterParams: { ...searchForm } })
-      if (res && res.msgTxt) {
-        const result = res.msgTxt[0];
+      let resultData, searchForm;
+      if(monitorTable.value){
+        // 安全监控
+        const formData = monitorTable.value.getForm()
+        searchForm = formData.getFieldsValue()
+        resultData = await list({ devicetype: deviceType.value, pagetype: 'normal', filterParams: { ...searchForm } })
+      }else{
+        // 非安全监控
+        resultData = await list({ devicetype: deviceType.value, pagetype: 'normal'})
+      }
+      if (resultData && resultData.msgTxt) {
+        const result = resultData.msgTxt[0];
         if(result){
           const data = result['datalist'].filter((data: any) => {
             const readData = data.readData;
@@ -550,7 +555,6 @@ async function getDataSource() {
             const resultData = <any[]>[]
             // 如果是安全监控的数据时需要过滤常见设备数据，根据设定的常用安全监控字典去匹配
             const dictCodes = getDictItemsByCode('safetynormal')
-           
             if (!searchForm['dataTypeName'] && dictCodes && dictCodes.length) {
               for (let i = 0; i < dictCodes.length; i++) {
                 const dict = dictCodes[i]
@@ -574,7 +578,6 @@ async function getDataSource() {
         dataSource.value = []
       }
     }
-    
   }
 }
 
@@ -604,10 +607,10 @@ function goDetail(record?) {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("fanmain") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fan-main', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("fanlocal") != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fan-local', query: { id: activeID.value } })
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal', query: { id: activeID.value } })
       window.open(newPage.href, '_blank')
     } else if (deviceType.value.indexOf("pulping") != -1) {
       const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } })
@@ -670,7 +673,6 @@ function toHome() {
 }
 
 async function findTreeDataValue(obj) {
-  debugger
   const findDeviceType = (data: [], obj) => {
     let type = ''
     if (obj.deviceid) {
@@ -709,7 +711,7 @@ async function findTreeDataValue(obj) {
   if (timer === undefined) {
     timer = null
     await getDataSource()
-    getMonitor()
+    getMonitor(true)
   }
 }
 

src/views/vent/monitorManager/windrectMonitor/dantou.threejs.ts

@@ -52,11 +52,11 @@ class ddWindRect {
     }
     const textArr = [
       {
-        text: `单点式测风装置`,
+        text: `测风实时数据`,
         font: 'normal 32px Arial',
         color: '#009900',
         strokeStyle: '#002200',
-        x: 140,
+        x: 160,
         y: 95,
       },
       {
@@ -108,11 +108,11 @@ class ddWindRect {
         y: 252,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
-        x: 50,
+        x: History_Type['type'] == 'remote' ? 110 : 50,
         y: 302,
       },
     ];