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

src/views/vent/home/configurable/components/MonitorBar.vue

@@ -54,12 +54,12 @@
         },
         {
           label: '计划风量(m³/min)',
-          value: '${midinfo[0].sysdata.totalPlanM3}',
+          value: '${midinfo[0].sysdata.xufengliang}',
         },
         {
-          label: '通风巷道长度(万m)',
+          label: '通风巷道长度(m)',
           // value: '223196',
-          value: '${totallength}',
+          value: '${midinfo[0].sysinfo.totallength}',
         },
         {
           label: '有效风量率',

src/views/vent/home/configurable/ventV5.vue

@@ -13,7 +13,7 @@
         全矿井通风检测
         <CaretDownOutlined />
       </a>
-      <MonitorBar v-if="showBar" class="module-monitor-bar" :is-data-real-time="isDataRealTime" :data="barData" />
+      <MonitorBar v-if="showBar" class="module-monitor-bar" :is-data-real-time="isDataRealTime" :data="data" />
       <!-- <a-dropdown class="module-dropdown" :class="{ 'module-dropdown-original': isOriginal }" :trigger="['click']" placement="bottomRight">
         <template #overlay>
         </template>
@@ -76,7 +76,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
+  import { onMounted, onUnmounted, ref, watch } from 'vue';
   // import { CaretDownOutlined } from '@ant-design/icons-vue';
   import MonitorBar from './components/MonitorBar.vue';
   import { useInitConfigs, useInitPage } from './hooks/useInit';
@@ -97,10 +97,6 @@
   const router = useRouter();
   const isDataRealTime = ref(sysDataType === 'monitor');
   const showBar = ref(true);
-  const barData = computed(() => ({
-    ...data.value,
-    totallength: 223196,
-  }));
   let interval: number | undefined;
 
   function switchDataMode() {

src/views/vent/home/configurable/ventWLML.vue

@@ -13,7 +13,7 @@
         全矿井通风检测
         <CaretDownOutlined />
       </a>
-      <MonitorBar v-if="showBar" class="module-monitor-bar" :is-data-real-time="isDataRealTime" :data="barData" />
+      <MonitorBar v-if="showBar" class="module-monitor-bar" :is-data-real-time="isDataRealTime" :data="data" />
       <!-- <a-dropdown class="module-dropdown" :class="{ 'module-dropdown-original': isOriginal }" :trigger="['click']" placement="bottomRight">
         <template #overlay>
         </template>
@@ -76,7 +76,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
+  import { onMounted, onUnmounted, ref, watch } from 'vue';
   // import { CaretDownOutlined } from '@ant-design/icons-vue';
   import MonitorBar from './components/MonitorBar.vue';
   import { useInitConfigs, useInitPage } from './hooks/useInit';
@@ -97,10 +97,6 @@
   const router = useRouter();
   const isDataRealTime = ref(sysDataType === 'monitor');
   const showBar = ref(true);
-  const barData = computed(() => ({
-    ...data.value,
-    totallength: 90810,
-  }));
   let interval: number | undefined;
 
   function switchDataMode() {

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.base.ts

@@ -513,7 +513,7 @@ class ModelContext {
         fanLocalCSS3D.name = 'text6';
         fanLocalCSS3D.scale.set(0.04, 0.04, 0.04);
         fanLocalCSS3D.rotation.y = -Math.PI / 2;
-        fanLocalCSS3D.position.set(-84.23, 6.95, -19.47);
+        fanLocalCSS3D.position.set(-84.47, 6.56, -19.47);
         this.group.add(fanLocalCSS3D);
       }
     }

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

@@ -1032,7 +1032,7 @@
   const leftColumns1 = ref<any[]>([
     { title: '供风充足评价', value: '' },
     { title: '回风流超限评价', value: '' },
-    { title: '漏风率评价', value: '' },
+    { title: '风筒漏风率评价', value: '' },
   ]);
   const devicekide = ref(deviceTypeDicts && deviceTypeDicts.length > 0 ? deviceTypeDicts[0]['value'] : 'fanlocal');
   const deviceType = ref(selectData.deviceType);
@@ -1101,6 +1101,7 @@
   const changePlay = () => {
     showPlay.value = !showPlay.value;
   };
+
   const tabChange = (activeKeyVal) => {
     activeKey.value = activeKeyVal;
     if (activeKeyVal == 1) {

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

@@ -89,7 +89,7 @@
     <div class="bottom-tabs-box" @mousedown="setDivHeight($event, 350, scroll)">
       <dv-border-box8 :dur="5" :style="`padding: 5px; height: ${scroll.y + 120}px`">
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
-          <a-tab-pane key="1" tab="实时监测">
+          <a-tab-pane v-if="!hasPermission('show:noMonitor')" key="1" tab="实时监测">
             <MonitorTable
               v-if="activeKey === '1'"
               ref="MonitorDataTable"
@@ -175,7 +175,7 @@
                 :chartsColumns="chartsColumns" :device-list-api="list" device-type="gate" />
             </div>
           </a-tab-pane> -->
-          <a-tab-pane key="3" tab="历史数据">
+          <a-tab-pane v-if="!hasPermission('show:noHistory')" key="3" tab="历史数据">
             <div class="tab-item" v-if="activeKey === '3'">
               <HistoryTable :columnsType="deviceType" :device-type="deviceType" designScope="gate-history" :scroll="scroll">
                 <template #filterCell="{ column, record }">
@@ -243,7 +243,7 @@
               </HistoryTable>
             </div>
           </a-tab-pane>
-          <a-tab-pane key="4" tab="报警历史">
+          <a-tab-pane v-if="!hasPermission('show:noAlarm')" key="4" tab="报警历史">
             <div class="tab-item" v-if="activeKey === '4'">
               <template v-if="sysOrgCode != 'zmhjhzmy'">
                 <AlarmHistoryTable
@@ -271,7 +271,7 @@
               </template>
             </div>
           </a-tab-pane>
-          <a-tab-pane key="5" tab="操作历史">
+          <a-tab-pane v-if="!hasPermission('show:noHandleHistory')" key="5" tab="操作历史">
             <div class="tab-item" v-if="activeKey === '5'">
               <HandlerHistoryTable
                 columns-type="operator_history"

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

@@ -141,9 +141,7 @@
       ledList = selection;
     }
 
-    stopVoice({
-      deviceIdList: ledList.map((e) => e.deviceId), //设备id,可以传多个
-    });
+    stopVoice(ledList.map((e) => e.deviceId));
   }
 
   onMounted(async () => {