7 Commits 39317edf20 ... 27149c1599

Author SHA1 Message Date
  hongrunxia 27149c1599 Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 1 week ago
  hongrunxia 145bbc6d1c [Mod 0000] 给风门添加监测模块按钮权限 1 week ago
  hongrunxia aa4e03cb93 Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 1 week ago
  hongrunxia d0b7c62196 Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 1 week ago
  hongrunxia 13344f4af2 [Mod 0000] 修改局部风机风筒评价名称 1 week ago
  hongrunxia d236bb89fc Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base 1 week ago
  hongrunxia 6b18e06752 [Mod 0000] 修改风筒漏风率评价 1 week ago

+ 1 - 1
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);
       }
     }

+ 2 - 1
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) {

+ 4 - 4
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"