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

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

@@ -89,16 +89,6 @@ export const windrectParam = [
 ];
 
 export const monitorParam = [
-  // {
-  //   title: '安装位置',
-  //   code: 'strinstallpos',
-  //   unit: '',
-  // },
-  // {
-  //   title: '监测值',
-  //   code: 'readData.ss_analog_value',
-  //   unit: '',
-  // },
   {
     title: '监测值',
     code: 'readData.V', //神东大部分矿安全监控设备值都用的字段V，之后如果有矿监测值字段不是V时，沟通运维改点表为V

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

@@ -42,7 +42,7 @@
           </ventBox1>
         </div>
       </div>
-      <!-- <div class="lr right-box ml-auto">
+      <div class="lr right-box ml-auto">
         <div class="item-box sensor-container">
           <ventBox1 class="">
             <template #title>
@@ -67,7 +67,7 @@
             </template>
           </ventBox1>
         </div>
-      </div> -->
+      </div>
       <div class="lr right-box ml-5px">
         <div class="item-box sensor-container">
           <ventBox1>
@@ -132,12 +132,12 @@
     </div>
   </a-spin>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="balancePressHome">
   import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch } from 'vue';
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import { SvgIcon } from '/@/components/Icon';
   import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
-  import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, monitorParam, windrectParam } from '../balancePress.data';
+  import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, windrectParam } from '../balancePress.data';
   import { list, submit, subList } from '../balancePress.api';
   import { message } from 'ant-design-vue';
   import { get } from 'lodash-es';
@@ -160,7 +160,13 @@
     sourcePressure: '-',
     fault: '-',
   });
-
+  const monitorParam = [
+    {
+      title: '监测值',
+      code: 'readData.ss_analog_value',
+      unit: '',
+    },
+  ];
   const changeType = (isAutoControl) => {
     isAutoControl;
     //
@@ -201,7 +207,7 @@
     windowMonitorData.value = [];
     windrectMonitorData.value = [];
     result.forEach((item) => {
-      if (item.type.startsWith('safetymonitor') || item.type.startsWith('avgpressure_lowoxygen')) {
+      if (item.type.startsWith('safetymonitor')) {
         safetyMonitorData.value.push(...item.datalist);
       }
       if (item.type.startsWith('fanlocal')) {
@@ -235,7 +241,7 @@
   //获取低氧参数监测返显列表
   async function initParamList() {
     let res = await subList();
-    if (res && res.records.length != 0) {
+    if (res && res.records && res.records.length != 0) {
       formData.value = res.records[0];
     }
   }
@@ -271,7 +277,7 @@
   onMounted(() => {
     loading.value = true;
     mountedThree().then(async () => {
-      await setModelType('balancePressTun'); //balancePressBase
+      await setModelType('balancePressBase'); //balancePressBase
       loading.value = false;
       timer = null;
       await initParamList();

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

@@ -133,7 +133,7 @@
     </div>
   </a-spin>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="balancePressHome1">
   import { onBeforeMount, ref, onMounted, onUnmounted, reactive, defineProps, watch } from 'vue';
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import { SvgIcon } from '/@/components/Icon';
@@ -143,7 +143,6 @@
   import { message } from 'ant-design-vue';
   import { get } from 'lodash-es';
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-  import { object } from 'vue-types';
 
   const props = defineProps({
     deviceId: {

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

@@ -3,7 +3,7 @@
 
   <div class="scene-box">
     <div class="center-container">
-      <balancePressHome v-if="activeKey == 'monitor'" :deviceId = 'optionValue' />
+      <balancePressHome1 v-if="activeKey == 'monitor'" :deviceId = 'optionValue' />
       <div v-else class="history-group">
         <div class="device-button-group" v-if="deviceList.length > 0">
           <div class="device-button" :class="{ 'device-active': deviceActive == device.deviceType }" v-for="(device, index) in deviceList" :key="index" @click="deviceChange(index)">{{ device.deviceName }}</div>
@@ -25,7 +25,7 @@ import customHeader from '/@/components/vent/customHeader.vue';
 import { onBeforeMount, ref, onMounted, onUnmounted, reactive, onBeforeUnmount } from 'vue';
 import { list, getTableList } from './balancePress.api';
 import BottomMenu from '/@/views/vent/comment/components/bottomMenu.vue';
-import balancePressHome from './components/balancePressHome1.vue';
+import balancePressHome1 from './components/balancePressHome1.vue';
 import balancePressHistory from './components/balancePressHistory.vue';
 import balancePressHandleHistoryVue from './components/balancePressHandleHistory.vue';
 import balancePressAlarmHistory from './components/balancePressAlarmHistory.vue';

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

@@ -50,7 +50,7 @@
           <div v-if="hasPermission('window:showAngleArea')" class="button-box" @click="setAngle(1)">设定风窗面积</div>
         </div>
         <div v-if="hasPermission('window:sameSet')" class="button-box" @click="setControl('sameSetValue', '风窗面积设置')">设定风窗面积</div>
-        <div class="button-box" @click="setControl('COTest', 'CO调控预测')">CO调控预测</div>
+        <div v-if="hasPermission('window:COTest')" class="button-box" @click="setControl('COTest', 'CO调控预测')">CO调控预测</div>
       </div>
       <div class="top-right row">
         <div v-if="hasPermission('window:zhldkz')" class="button-box" @click="setControl('autoRun', '开启自主调控')">开启自主调控</div>