Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

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;
 
       /* 标题栏样式 */

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',

src/views/vent/home/configurable/configurable.data.wz.ts

@@ -5,7 +5,7 @@ export const testConfigWZFire: Config[] = [
   {
     deviceType: '',
     moduleName: '重点区域风险监测',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
         show: false,
@@ -97,7 +97,7 @@ export const testConfigWZFire: Config[] = [
   {
     deviceType: 'pdArray',
     moduleName: '带式输送机防灭火监控系统',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
         show: false,
@@ -183,16 +183,16 @@ export const testConfigWZFire: Config[] = [
     },
   },
   {
-    deviceType: 'sgGxObj',
+    deviceType: 'pdArray',
     moduleName: '工作面光纤监测',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
-        show: true,
-        readFrom: 'devGxcw',
+        show: false,
+        readFrom: '',
         selector: {
           show: true,
-          value: '${strinstallpos}',
+          value: '${systemname}',
         },
         slot: {
           show: false,
@@ -205,11 +205,12 @@ export const testConfigWZFire: Config[] = [
         link: '',
       },
       layout: {
-        direction: 'row',
+        direction: 'column',
         items: [
           {
             name: 'chart',
             basis: '100%',
+            overflow: false,
           },
         ],
       },
@@ -217,7 +218,7 @@ export const testConfigWZFire: Config[] = [
       chart: [
         {
           type: 'line_smooth',
-          readFrom: '',
+          readFrom: 'arrayFiber',
           legend: { show: true },
           xAxis: [{ show: true }],
           yAxis: [{ show: true, name: '温度（℃）', position: 'left' }],
@@ -248,7 +249,7 @@ export const testConfigWZFire: Config[] = [
   {
     deviceType: 'sensorArray',
     moduleName: '传感器监测',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
         show: false,
@@ -318,7 +319,7 @@ export const testConfigWZFire: Config[] = [
   {
     deviceType: 'dsArray',
     moduleName: '变电硐室防灭火监控系统',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
         show: true,
@@ -423,7 +424,7 @@ export const testConfigWZFire: Config[] = [
   {
     deviceType: 'aqjkArray',
     moduleName: '安全监控系统',
-    pageType: '',
+    pageType: 'WZ_fire',
     moduleData: {
       header: {
         show: false,

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 {

src/views/vent/home/configurable/fireWZ.vue

@@ -33,16 +33,16 @@
         </div>
       </div>
     </div>
-    <!-- <div class="right-t">
-      <div class="tcontent-l" @click="redirectTo('https://bing.cn')">
+    <div class="right-t">
+      <div class="tcontent-l">
         <div>智能</div>
         <div>灌浆系统</div>
       </div>
-      <div class="tcontent-r" @click="redirectTo('https://bing.cn')">
+      <div class="tcontent-r">
         <div>智能</div>
         <div>注氟系统</div>
       </div>
-    </div> -->
+    </div>
     <ModuleBD
       v-for="cfg in configs"
       :key="cfg.deviceType"
@@ -66,24 +66,24 @@
   import ModuleBD from './components/ModuleBD.vue';
   import VentModal from '/@/components/vent/micro/ventModal.vue';
   import { getDisHome } from './configurable.api';
-  import { testConfigWZFire } from './configurable.data.wz';
+  // import { testConfigWZFire } from './configurable.data.wz';
   // import { getToken } from '/@/utils/auth';
 
-  const { configs, devicesTypes } = useInitConfigs();
+  const { configs, devicesTypes, fetchConfigs } = useInitConfigs();
   const { mainTitle, data, updateData, updateEnhancedConfigs } = useInitPage('王庄煤矿火灾智能监测系统');
   let interval: number | undefined;
   // function hideLoading() {
   //   loading.value = false;
   // }
   onMounted(() => {
-    // fetchConfigs('WZ_fire').then(() => {
-    configs.value = testConfigWZFire;
-    updateEnhancedConfigs(configs.value);
+    fetchConfigs('WZ_fire').then(() => {
+      // configs.value = testConfigWZFire;
+      updateEnhancedConfigs(configs.value);
 
-    getDisHome({
-      dataList: devicesTypes.value.concat('fireAllMineWarn').join(','),
-    }).then(updateData);
-    // });
+      getDisHome({
+        dataList: devicesTypes.value.concat('fireAllMineWarn').join(','),
+      }).then(updateData);
+    });
     setInterval(() => {
       getDisHome({
         dataList: devicesTypes.value.concat('fireAllMineWarn').join(','),

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

@@ -61,10 +61,12 @@
   import dayjs from 'dayjs';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getTableList, systemList } from './alarmFire.api';
+  import { useGlobSetting } from '/@/hooks/setting';
 
   type DeviceType = { deviceType: string; deviceName: string; datalist: any[] };
 
   const { createMessage } = useMessage();
+  const { sysOrgCode } = useGlobSetting();
   const monitorlistYw = ref(
     new Array(13).fill({
       strinstallpos: '',
@@ -123,6 +125,10 @@
             datalist: list,
             avginfo: { fmax: data[0]['fmax'], fmin: data[0]['fmin'], favg: data[0]['favg'] },
           };
+          // 王庄
+          if (sysOrgCode === 'lahgjtwzmk') {
+            object['fiber']['avginfo'].fmax = data[0]['maxValue'];
+          }
           const topData = cloneDeep(topList);
           topData[0].value = object['fiber']['avginfo'].fmax;
           topData[1].value = object['fiber']['avginfo'].fmin;