[Mod 000000] 优化设备监测组件

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

@@ -137,28 +137,35 @@
             :chartsColumns="chartsColumnsreal" chartsType="" :option="echartsOption" />
         </div> -->
       </a-tab-pane>
+      <template v-if="!hasPermission('safety:hideWarning')">
+        <a-tab-pane key="3" tab="报警历史">
+          <div class="tab-item">
+            <AlarmHistoryTable
+              ref="alarmHistoryTable"
+              v-if="activeKey == '3' && deviceType == 'safetymonitor'"
+              columns-type="alarm"
+              :list="safetyList"
+              :device-type="deviceType"
+              :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
+              designScope="alarm-history"
+            />
+          </div>
+        </a-tab-pane>
+      </template>
+      <template v-else>
+        <a-tab-pane key="3" tab="报警历史">
+          <div class="tab-item">
+            <AlarmHistoryCommentTable
+              v-if="activeKey == '3' && deviceType != 'safetymonitor'"
+              columns-type="alarm"
+              :device-type="deviceType"
+              :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
+              designScope="alarm-history"
+            />
+          </div>
+        </a-tab-pane>
+      </template>
 
-      <a-tab-pane key="3" tab="报警历史" v-if="!hasPermission('safety:hideWarning')">
-        <div class="tab-item">
-          <AlarmHistoryTable
-            ref="alarmHistoryTable"
-            v-if="activeKey == '3'"
-            columns-type="alarm"
-            :list="safetyList"
-            :device-type="deviceType"
-            :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
-            designScope="alarm-history"
-          />
-          <!-- <AlarmHistoryCommentTable
-            ref="alarmHistoryTable"
-            v-else-if="activeKey == '3'"
-            columns-type="alarm"
-            :device-type="deviceType"
-            :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
-            designScope="alarm-history"
-          /> -->
-        </div>
-      </a-tab-pane>
       <a-tab-pane key="4" tab="操作历史" v-if="deviceType !== 'safetymonitor' && deviceType !== 'wasichoufang'">
         <div class="tab-item">
           <HandlerHistoryTable
@@ -171,7 +178,7 @@
           />
         </div>
       </a-tab-pane>
-      <a-tab-pane key="5" tab="报警分析" v-if="!hasPermission('safety:hideWarning')">
+      <a-tab-pane key="5" tab="报警分析" v-if="!hasPermission('safety:hideWarning') && deviceType == 'safetymonitor'">
         <div class="tab-item">
           <safetyWarnAnalysis :device-type="deviceType" />
         </div>
@@ -201,7 +208,7 @@
 <script setup lang="ts">
   import { ref, onMounted, onUnmounted, shallowRef, defineProps, watch, inject, unref } from 'vue';
   import { list, getDeviceList, safetyList, getExportUrl, subStationList, initSubStation } from './safety.api';
-  // import AlarmHistoryCommentTable from '../comment/AlarmHistoryTable.vue';
+  import AlarmHistoryCommentTable from '../comment/AlarmHistoryTable.vue';
   import safetyWarnAnalysis from '../comment/safetyWarnAnalysis.vue';
   import AlarmHistoryTable from './AlarmHistoryTable.vue';
   import HistoryTable from './HistoryTable.vue';
@@ -216,6 +223,7 @@
   import { useMethods } from '/@/hooks/system/useMethods';
   import { message } from 'ant-design-vue';
   import { SendOutlined } from '@ant-design/icons-vue';
+  import { template } from 'lodash-es';
 
   const { sysOrgCode } = useGlobSetting();
   const { hasPermission } = usePermission();