Bladeren bron

[Feat 0000]蓝色版本导航栏路由跳转

bobo04052021@163.com 1 dag geleden
bovenliggende
commit
99d8863444
44 gewijzigde bestanden met toevoegingen van 11 en 18 verwijderingen
  1. 0 0
      src/views/vent/home/configurable/blue/components/ModuleDustNew.vue
  2. 0 0
      src/views/vent/home/configurable/blue/components/ModuleFireNew.vue
  3. 0 0
      src/views/vent/home/configurable/blue/components/ModuleFireNewDual.vue
  4. 0 0
      src/views/vent/home/configurable/blue/components/ModuleNew.vue
  5. 0 0
      src/views/vent/home/configurable/blue/components/ModuleWarnMonitor.vue
  6. 2 6
      src/views/vent/home/configurable/blue/components/NewNav.vue
  7. 3 6
      src/views/vent/home/configurable/blue/components/NewNavFire.vue
  8. 0 0
      src/views/vent/home/configurable/blue/components/center-area-warn.vue
  9. 0 0
      src/views/vent/home/configurable/blue/components/content-FireNew.vue
  10. 0 0
      src/views/vent/home/configurable/blue/components/content-New.vue
  11. 0 0
      src/views/vent/home/configurable/blue/components/content-warn.vue
  12. 0 0
      src/views/vent/home/configurable/blue/components/content.vue
  13. 0 0
      src/views/vent/home/configurable/blue/components/detail/MiniBoard-Warn.vue
  14. 0 0
      src/views/vent/home/configurable/blue/components/header.vue
  15. 0 0
      src/views/vent/home/configurable/blue/components/moduleBottom-warn.vue
  16. 0 0
      src/views/vent/home/configurable/blue/components/moduleLeft-warn.vue
  17. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/NewNav.vue
  18. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/NewNavFire.vue
  19. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/NewNavWarn.vue
  20. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/leftHeader1.vue
  21. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/leftHeader2.vue
  22. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleBottom.vue
  23. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleLeft.vue
  24. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleLeftBottom.vue
  25. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleLeftCenter.vue
  26. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleLeftTop.vue
  27. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleRightBottom.vue
  28. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleRightCenter.vue
  29. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleRightTop.vue
  30. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleTop.vue
  31. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/moduleTopFire.vue
  32. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/rightHeader1.vue
  33. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/rightHeader2.vue
  34. 0 0
      src/views/vent/home/configurable/blue/components/originalNew/rightHeader3.vue
  35. 0 0
      src/views/vent/home/configurable/blue/components/yj_chart.vue
  36. 0 0
      src/views/vent/home/configurable/blue/components/yj_gasWarn.vue
  37. 0 0
      src/views/vent/home/configurable/blue/components/yj_risk.vue
  38. 0 0
      src/views/vent/home/configurable/blue/components/yj_ventWarn.vue
  39. 1 1
      src/views/vent/home/configurable/blue/dustNew.vue
  40. 1 1
      src/views/vent/home/configurable/blue/fireNew.vue
  41. 1 1
      src/views/vent/home/configurable/blue/homeBlue.vue
  42. 2 2
      src/views/vent/home/configurable/blue/ventNew.vue
  43. 0 0
      src/views/vent/home/configurable/blue/warnMonitor.vue
  44. 1 1
      src/views/vent/home/configurable/fireMine.vue

+ 0 - 0
src/views/vent/home/configurable/bule/components/ModuleDustNew.vue → src/views/vent/home/configurable/blue/components/ModuleDustNew.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/ModuleFireNew.vue → src/views/vent/home/configurable/blue/components/ModuleFireNew.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/ModuleFireNewDual.vue → src/views/vent/home/configurable/blue/components/ModuleFireNewDual.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/ModuleNew.vue → src/views/vent/home/configurable/blue/components/ModuleNew.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/ModuleWarnMonitor.vue → src/views/vent/home/configurable/blue/components/ModuleWarnMonitor.vue


+ 2 - 6
src/views/vent/home/configurable/bule/components/NewNav.vue → src/views/vent/home/configurable/blue/components/NewNav.vue

@@ -69,20 +69,16 @@ let menuList = ref<any[]>([
   },
   {
     name: '火灾监控',
-    targatUrl: '/configurable/fireNew/fireS/home',
+    targatUrl: '/micro-vent-3dModal/configurable/fireNew/fireS/home',
   },
   {
     name: '粉尘监控',
-    targatUrl: '/configurable/dustNew/dustS/home',
+    targatUrl: '/micro-vent-3dModal/configurable/dustNew/dustS/home',
   },
   {
     name: '预警监测',
     targatUrl: '/warnMonitor/configurable/home',
   },
-  {
-    name: '灾害预警',
-    MenuItemList: [{ name: '多灾融合预警' }, { name: '通风监测预警' }, { name: '火灾监测预警' }, { name: '粉尘监测预警' }, { name: '瓦斯监测预警' }],
-  },
 ]); //一级菜单列表
 let activeIndex = ref(0); //当前激活menu索引
 const router = useRouter();

+ 3 - 6
src/views/vent/home/configurable/bule/components/NewNavFire.vue → src/views/vent/home/configurable/blue/components/NewNavFire.vue

@@ -77,16 +77,12 @@ let menuList = ref<any[]>([
   },
   {
     name: '粉尘监控',
-    targatUrl: '/configurable/dustNew/dustS/home',
+    targatUrl: '/micro-vent-3dModal/configurable/dustNew/dustS/home',
   },
   {
     name: '预警监测',
     targatUrl: '/warnMonitor/configurable/home',
   },
-  {
-    name: '灾害预警',
-    MenuItemList: [{ name: '多灾融合预警' }, { name: '通风监测预警' }, { name: '火灾监测预警' }, { name: '粉尘监测预警' }, { name: '瓦斯监测预警' }],
-  },
 ]); //一级菜单列表
 let activeIndex = ref(0); //当前激活menu索引
 const router = useRouter();
@@ -105,9 +101,10 @@ function menuItemClick(index) {
   isShowMenuItem.value = false;
 }
 function updateActiveState(path: string) {
+  const currentPath = route.path;
   menuList.value.forEach((menu, index) => {
     // 处理有直接链接的菜单项
-    if (menu.targatUrl === path) {
+    if (menu.targatUrl === currentPath) {
       activeIndex.value = index;
       isShowMenuItem.value = false;
       return;

+ 0 - 0
src/views/vent/home/configurable/bule/components/center-area-warn.vue → src/views/vent/home/configurable/blue/components/center-area-warn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/content-FireNew.vue → src/views/vent/home/configurable/blue/components/content-FireNew.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/content-New.vue → src/views/vent/home/configurable/blue/components/content-New.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/content-warn.vue → src/views/vent/home/configurable/blue/components/content-warn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/content.vue → src/views/vent/home/configurable/blue/components/content.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/detail/MiniBoard-Warn.vue → src/views/vent/home/configurable/blue/components/detail/MiniBoard-Warn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/header.vue → src/views/vent/home/configurable/blue/components/header.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/moduleBottom-warn.vue → src/views/vent/home/configurable/blue/components/moduleBottom-warn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/moduleLeft-warn.vue → src/views/vent/home/configurable/blue/components/moduleLeft-warn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/NewNav.vue → src/views/vent/home/configurable/blue/components/originalNew/NewNav.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/NewNavFire.vue → src/views/vent/home/configurable/blue/components/originalNew/NewNavFire.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/NewNavWarn.vue → src/views/vent/home/configurable/blue/components/originalNew/NewNavWarn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/leftHeader1.vue → src/views/vent/home/configurable/blue/components/originalNew/leftHeader1.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/leftHeader2.vue → src/views/vent/home/configurable/blue/components/originalNew/leftHeader2.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleBottom.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleBottom.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleLeft.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleLeft.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleLeftBottom.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleLeftBottom.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleLeftCenter.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleLeftCenter.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleLeftTop.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleLeftTop.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleRightBottom.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleRightBottom.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleRightCenter.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleRightCenter.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleRightTop.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleRightTop.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleTop.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleTop.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/moduleTopFire.vue → src/views/vent/home/configurable/blue/components/originalNew/moduleTopFire.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/rightHeader1.vue → src/views/vent/home/configurable/blue/components/originalNew/rightHeader1.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/rightHeader2.vue → src/views/vent/home/configurable/blue/components/originalNew/rightHeader2.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/originalNew/rightHeader3.vue → src/views/vent/home/configurable/blue/components/originalNew/rightHeader3.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/yj_chart.vue → src/views/vent/home/configurable/blue/components/yj_chart.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/yj_gasWarn.vue → src/views/vent/home/configurable/blue/components/yj_gasWarn.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/yj_risk.vue → src/views/vent/home/configurable/blue/components/yj_risk.vue


+ 0 - 0
src/views/vent/home/configurable/bule/components/yj_ventWarn.vue → src/views/vent/home/configurable/blue/components/yj_ventWarn.vue


+ 1 - 1
src/views/vent/home/configurable/bule/dustNew.vue → src/views/vent/home/configurable/blue/dustNew.vue

@@ -33,7 +33,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted } from 'vue';
 // import { CaretDownOutlined } from '@ant-design/icons-vue';
-import NewNav from './components/NewNav.vue';
+import NewNav from './components/NewNavFire.vue';
 import { useInitConfigs, useInitPage } from '../hooks/useInit';
 import ModuleDustNew from './components/ModuleDustNew.vue';
 import VentModal from '/@/components/vent/micro/ventModal.vue';

+ 1 - 1
src/views/vent/home/configurable/bule/fireNew.vue → src/views/vent/home/configurable/blue/fireNew.vue

@@ -53,7 +53,7 @@
 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted } from 'vue';
 // import { CaretDownOutlined } from '@ant-design/icons-vue';
-import NewNav from './components/originalNew/NewNavFire.vue';
+import NewNav from './components/NewNavFire.vue';
 import { useInitConfigs, useInitPage } from '../hooks/useInit';
 import ModuleNew from './components/ModuleNew.vue';
 import ModuleFireNew from './components/ModuleFireNew.vue';

+ 1 - 1
src/views/vent/home/configurable/bule/homeBlue.vue → src/views/vent/home/configurable/blue/homeBlue.vue

@@ -29,7 +29,7 @@
 import { onMounted, onUnmounted } from 'vue';
 // import { CaretDownOutlined } from '@ant-design/icons-vue';
 // import MonitorCenter from './components/MonitorCenter.vue';
-import NewNav from './components/originalNew/NewNav.vue';
+import NewNav from './components/originalNew/NewNavFire.vue';
 import { useInitConfigs, useInitPage } from '../hooks/useInit';
 import ModuleNew from './components/ModuleNew.vue';
 // import { useRoute } from 'vue-router';

+ 2 - 2
src/views/vent/home/configurable/bule/ventNew.vue → src/views/vent/home/configurable/blue/ventNew.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="company-home">
     <div style="width: 100%; height: 100%; position: absolute; left: 0; top: 0; z-index: 0">
-      <!-- <VentModal /> -->
+      <VentModal />
     </div>
     <div class="top-bg">
       <!-- <img style="width: 300px; height: 40px; position: fixed; left: 5px; top: 5px" src="./meeee.png" /> -->
@@ -29,7 +29,7 @@
 import { onMounted, onUnmounted } from 'vue';
 // import { CaretDownOutlined } from '@ant-design/icons-vue';
 // import MonitorCenter from './components/MonitorCenter.vue';
-import NewNav from './components/originalNew/NewNav.vue';
+import NewNav from './components/NewNavFire.vue';
 import { useInitConfigs, useInitPage } from '../hooks/useInit';
 import ModuleNew from './components/ModuleNew.vue';
 // import { useRoute } from 'vue-router';

+ 0 - 0
src/views/vent/home/configurable/bule/warnMonitor.vue → src/views/vent/home/configurable/blue/warnMonitor.vue


+ 1 - 1
src/views/vent/home/configurable/fireMine.vue

@@ -4,7 +4,7 @@
     <!-- 顶部标题样式块 -->
     <div class="top-bg">
       <!-- <div class="main-title">{{ mainTitle }}</div> -->
-      <NewNav disabled :Title="mainTitle" />
+      <NewNav :Title="mainTitle" />
     </div>
     <!-- 中间样式块 -->
     <div class="center-info-bar">