外因火灾更新

src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -90,7 +90,8 @@ function getBack() {
 async function getMenuList() {
   let res = await sysTypeWarnList({ type: 'fire' });
   if (res.length != 0) {
-    menuList1.external = res.external.filter((v) => v.strtype != 'sys_surface_caimei');
+     menuList1.external = res.external
+    // menuList1.external = res.external.filter((v) => v.strtype != 'sys_surface_caimei');
     menuList1.internal = res.internal;
     menuList1.info = res.info;
     if (!activeIndex.value && menuList1.internal && menuList1.internal.length > 0) {
@@ -152,6 +153,7 @@ function getDetailList(param) {
 //内外因火灾、预警指标选项切换
 function fireMenuToggle(ind) {
   activeIndex.value = ind;
+   menuList.value=[]
   switch (ind) {
     case 0:
       loading.value = true;

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

@@ -1054,7 +1054,6 @@ let chartsColumnsFan1 = [],
 
 // 这里需要处理主备echartColumns
 if (chartsColumns.length > 0) {
-  console.log(chartsColumns);
   for (let i = 0; i < chartsColumns.length; i++) {
     let itemColumn = chartsColumns[i];
     let dataIndexFan1, dataIndexFan2;
@@ -1062,8 +1061,8 @@ if (chartsColumns.length > 0) {
       const dataIndex = itemColumn['dataIndex'] as string;
       dataIndexFan1 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan1') : dataIndex.replace('fan', 'fan1');
       dataIndexFan2 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan2') : dataIndex.replace('fan', 'fan2');
-      chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: fanTitles[0] + itemColumn['legend'] });
-      chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: fanTitles[1] + itemColumn['legend'] });
+      chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: fanTitles[0] + itemColumn['des'] });
+      chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: fanTitles[1] + itemColumn['des'] });
     }
   }
 }