Просмотр исходного кода

[Feat 0000]矿井火灾预警系统页面添加导航栏并对样式进行调整

wangkeyi 4 недель назад
Родитель
Сommit
b77be7a657

+ 0 - 2
src/views/vent/home/configurable/components/ModuleMine.vue

@@ -128,8 +128,6 @@ watch(
       //   height: 100%;
       background: var(--image-common-border2) no-repeat center;
       background-size: 100% 100%;
-      box-shadow: 0 0 16px #0a223a99;
-      z-index: 2;
       overflow: hidden;
 
       /* 标题栏样式 */

+ 9 - 9
src/views/vent/home/configurable/configurable.data.mine.ts

@@ -29,11 +29,11 @@ export const testConfigMineFire: Config[] = [
         items: [
           {
             name: 'board',
-            basis: '50%',
+            basis: '45%',
           },
           {
             name: 'complex_list',
-            basis: '50%',
+            basis: '55%',
           },
         ],
       },
@@ -88,9 +88,9 @@ export const testConfigMineFire: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:290px;',
+      size: 'width:440px;height:270px;',
       version: '原版',
-      position: 'top:50px;left:10px;',
+      position: 'top:65px;left:10px;',
     },
   },
   // 2. 带式输送机防灭火监控系统(左中)
@@ -121,11 +121,11 @@ export const testConfigMineFire: Config[] = [
         items: [
           {
             name: 'board',
-            basis: '35%',
+            basis: '30%',
           },
           {
             name: 'chart',
-            basis: '65%',
+            basis: '70%',
           },
         ],
       },
@@ -154,7 +154,7 @@ export const testConfigMineFire: Config[] = [
         {
           type: 'line_smooth',
           readFrom: 'arrayFiber',
-          legend: { show: true },
+          legend: { show: false },
           xAxis: [{ show: true }],
           yAxis: [{ show: true, name: '温度(℃)', position: 'left' }],
           series: [
@@ -175,7 +175,7 @@ export const testConfigMineFire: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:290px;',
+      size: 'width:440px;height:320px;',
       version: '原版',
       position: 'top:340px;left:10px;',
     },
@@ -225,7 +225,7 @@ export const testConfigMineFire: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:290px;',
+      size: 'width:440px;height:260px;',
       version: '原版',
       position: 'bottom:8px;left:10px;',
       headerPosition: 'centerBottom',

+ 16 - 11
src/views/vent/home/configurable/fireMine.vue

@@ -3,7 +3,8 @@
   <div class="company-home">
     <!-- 顶部标题样式块 -->
     <div class="top-bg">
-      <div class="main-title">{{ mainTitle }}</div>
+      <!-- <div class="main-title">{{ mainTitle }}</div> -->
+      <NewNav :Title="mainTitle" />
     </div>
     <!-- 中间样式块 -->
     <div class="center-info-bar">
@@ -68,6 +69,7 @@ import { computed, onMounted, onUnmounted } from 'vue';
 import { useInitConfigs, useInitPage } from './hooks/useInit';
 import ModuleMine from './components/ModuleMine.vue';
 import ModuleBDDual from './components/ModuleBDDual.vue';
+import NewNav from './components/originalNew/NewNavFire.vue';
 import { getDisHome } from './configurable.api';
 import { testConfigMineFire } from './configurable.data.mine';
 
@@ -126,20 +128,23 @@ function redirectTo(url) {
 
   .top-bg {
     width: 100%;
-    height: 80px;
+    height: 73px;
     background: var(--image-fire-title) no-repeat top;
     position: absolute;
     z-index: 1;
-    .main-title {
-      height: 80px;
-      font-family: 'douyuFont';
-      font-size: 26px;
-      letter-spacing: 2px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: 0 0 10px 0;
+    ::v-deep .New-nav .nav-menu .nav-menu-left .nav-menu-unactive{
+      margin-top: 0;
     }
+    ::v-deep .New-nav .nav-menu .nav-menu-left .nav-menu-active{
+      margin-top: 0;
+    }
+    ::v-deep .New-nav .nav-menu .nav-menu-right .nav-menu-unactive{
+      margin-top: 0;
+    }
+    ::v-deep .New-nav .nav-menu .nav-menu-right .nav-menu-active{
+      margin-top: 0;
+    }
+
   }
   // 顶部中间样式块
   .center-info-bar {