Quellcode durchsuchen

[Mod 0000] 项目采空区文本替换为老空区文本

houzekong vor 4 Monaten
Ursprung
Commit
ee71d854a2

+ 2 - 1
.env

@@ -2,7 +2,8 @@
 VITE_PORT = 3100
 
 #  网站标题
-VITE_GLOB_APP_TITLE = 省局密闭采空区监测系统
+VITE_GLOB_APP_TITLE = 省局老空区永久密闭监测系统
+# VITE_GLOB_APP_TITLE = 省局密闭采空区监测系统
 
 # 简称,此变量只能是字符/下划线
 VITE_GLOB_APP_SHORT_NAME = 省局密闭监测

+ 2 - 2
README.md

@@ -1,6 +1,6 @@
-## 密闭采空区监测系统
+## 老空区永久密闭监测系统
 
-密闭采空区监测系统前端代码仓库
+老空区永久密闭监测系统前端代码仓库
 
 ### 前言
 

+ 1 - 1
mock/sys/menu.ts

@@ -3455,7 +3455,7 @@ export default [
                   internalOrExternal: false,
                   icon: 'ant-design:windows-outlined',
                   componentName: 'sealedGoafIndex',
-                  title: '采空区首页',
+                  title: '老空区永久密闭首页',
                 },
                 name: 'dashboard-sealedGoafIndex',
                 id: '9502685863ab87f0ad1134142788a385',

+ 1 - 1
public/js/global.js

@@ -14,7 +14,7 @@ const __STATIC_ROUTES__ = [
           internalOrExternal: false,
           icon: '',
           componentName: 'SealedGoaf',
-          title: '采空区首页',
+          title: '老空区永久密闭首页',
         },
         name: 'dashboard-sealedgoaf',
       },

+ 74 - 76
src/layouts/default/plain.vue

@@ -3,100 +3,98 @@
   <Layout :class="prefixCls" v-bind="lockEvents">
     <LayoutFeatures />
     <LayoutHeader />
-    <SystemSelect />
+    <SystemSelect :style="{ position: 'fixed', top: '60px', left: '0', zIndex: '100' }" />
     <SimpleMap />
     <LayoutContent />
   </Layout>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, unref } from 'vue';
-import { Layout } from 'ant-design-vue';
-import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+  import { defineComponent, computed, unref } from 'vue';
+  import { Layout } from 'ant-design-vue';
+  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
-import LayoutHeader from './header/index.vue';
-import LayoutContent from './content/index.vue';
-import SystemSelect from './feature/SystemSelect.vue';
-import SimpleMap from './feature/SimpleMap.vue';
+  import LayoutHeader from './header/index.vue';
+  import LayoutContent from './content/index.vue';
+  import SystemSelect from './feature/SystemSelect.vue';
+  import SimpleMap from './feature/SimpleMap.vue';
 
-// import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useDesign } from '/@/hooks/web/useDesign';
-import { useLockPage } from '/@/hooks/web/useLockPage';
+  // import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
+  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+  import { useDesign } from '/@/hooks/web/useDesign';
+  import { useLockPage } from '/@/hooks/web/useLockPage';
 
-// import { useAppInject } from '/@/hooks/web/useAppInject';
+  // import { useAppInject } from '/@/hooks/web/useAppInject';
 
-export default defineComponent({
-  name: 'DefaultLayout',
-  components: {
-    LayoutFeatures: createAsyncComponent(() => import('/@/layouts/default/feature/index.vue')),
-    LayoutHeader,
-    LayoutContent,
-    Layout,
-    SystemSelect,
-    SimpleMap,
-  },
-  setup() {
-    const { prefixCls } = useDesign('default-layout');
-    // const { getIsMobile } = useAppInject();
-    // const { getShowFullHeaderRef } = useHeaderSetting();
-    const { getShowSidebar, getIsMixSidebar, getShowMenu } = useMenuSetting();
+  export default defineComponent({
+    name: 'DefaultLayout',
+    components: {
+      LayoutFeatures: createAsyncComponent(() => import('/@/layouts/default/feature/index.vue')),
+      LayoutHeader,
+      LayoutContent,
+      Layout,
+      SystemSelect,
+      SimpleMap,
+    },
+    setup() {
+      const { prefixCls } = useDesign('default-layout');
+      // const { getIsMobile } = useAppInject();
+      // const { getShowFullHeaderRef } = useHeaderSetting();
+      const { getShowSidebar, getIsMixSidebar, getShowMenu } = useMenuSetting();
 
-    // Create a lock screen monitor
-    const lockEvents = useLockPage();
+      // Create a lock screen monitor
+      const lockEvents = useLockPage();
 
-    const layoutClass = computed(() => {
-      let cls: string[] = ['ant-layout'];
-      if (unref(getIsMixSidebar) || unref(getShowMenu)) {
-        cls.push('ant-layout-has-sider');
-      }
-      return cls;
-    });
+      const layoutClass = computed(() => {
+        let cls: string[] = ['ant-layout'];
+        if (unref(getIsMixSidebar) || unref(getShowMenu)) {
+          cls.push('ant-layout-has-sider');
+        }
+        return cls;
+      });
 
-    return {
-      getShowSidebar,
-      prefixCls,
-      getIsMixSidebar,
-      layoutClass,
-      lockEvents,
-    };
-  },
-});
+      return {
+        getShowSidebar,
+        prefixCls,
+        getIsMixSidebar,
+        layoutClass,
+        lockEvents,
+      };
+    },
+  });
 </script>
 <style lang="less" scoped>
-@prefix-cls: ~'@{namespace}-default-layout';
+  @prefix-cls: ~'@{namespace}-default-layout';
 
-.@{prefix-cls} {
-  display: flex;
-  width: 100%;
-  min-height: 100%;
-  flex-direction: column;
-
-  >.ant-layout {
-    height: 0;
-    margin: 10px;
-    background-color: transparent;
-    position: relative;
-    z-index: @layout-basic-z-index;
-  }
-
-  &-main {
+  .@{prefix-cls} {
+    display: flex;
     width: 100%;
-    border-top-right-radius: 10px;
-    border-bottom-right-radius: 10px;
-    // background-color: #aaaaaa32;
-    background: rgba(255, 255, 255, 0.2);
-    backdrop-filter: blur(10px);
-    -webkit-backdrop-filter: blur(10px);
-    // 代码逻辑说明:【issues/8709】LayoutContent样式多出1px
-    // margin-left: 1px;
-  }
+    min-height: 100%;
+    flex-direction: column;
 
+    > .ant-layout {
+      height: 0;
+      margin: 10px;
+      background-color: transparent;
+      position: relative;
+      z-index: @layout-basic-z-index;
+    }
 
-}
+    &-main {
+      width: 100%;
+      border-top-right-radius: 10px;
+      border-bottom-right-radius: 10px;
+      // background-color: #aaaaaa32;
+      background: rgba(255, 255, 255, 0.2);
+      backdrop-filter: blur(10px);
+      -webkit-backdrop-filter: blur(10px);
+      // 代码逻辑说明:【issues/8709】LayoutContent样式多出1px
+      // margin-left: 1px;
+    }
+  }
 
-:deep(.jeecg-system-select) {
-  margin-left: 10px;
-  margin-top: 10px;
-}
+  :deep(.jeecg-system-select) {
+    margin-left: 10px;
+    margin-top: 10px;
+  }
 </style>

+ 133 - 127
src/layouts/default/sider/LayoutSider.vue

@@ -1,155 +1,161 @@
 <template>
-  <div style="display: flex; flex-direction: column; height: 100%;">
+  <div style="display: flex; flex-direction: column; height: 100%">
     <SystemSelect v-if="!getCollapsed" />
-    <Sider v-show="showClassSideBarRef" breakpoint="lg" collapsible :class="getSiderClass" :width="getMenuWidth"
-      :collapsed="getCollapsed" :collapsedWidth="getCollapsedWidth" :theme="getMenuTheme"
-      @breakpoint="onBreakpointChange">
+    <Sider
+      v-show="showClassSideBarRef"
+      breakpoint="lg"
+      collapsible
+      :class="getSiderClass"
+      :width="getMenuWidth"
+      :collapsed="getCollapsed"
+      :collapsedWidth="getCollapsedWidth"
+      :theme="getMenuTheme"
+      @breakpoint="onBreakpointChange"
+    >
       <LayoutMenu :theme="getMenuTheme" :menuMode="getMode" :splitType="getSplitType" showSearch />
       <template #trigger>
         <LayoutTrigger />
       </template>
     </Sider>
   </div>
-
 </template>
 <script lang="ts">
-import { computed, defineComponent, unref, CSSProperties } from 'vue';
-
-import { Layout } from 'ant-design-vue';
-import LayoutMenu from '../menu/index.vue';
-// import LayoutMenu from '../menu/SearchMenu.vue';
-import LayoutTrigger from '/@/layouts/default/trigger/index.vue';
-
-import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
-
-import { useAppStore } from '@/store/modules/app';
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useSiderEvent } from './useLayoutSider';
-import { useDesign } from '/@/hooks/web/useDesign';
-import SystemSelect from '../feature/SystemSelect.vue';
-
-// import DragBar from './DragBar.vue';
-
-export default defineComponent({
-  name: 'LayoutSideBar',
-  components: { Sider: Layout.Sider, LayoutMenu, LayoutTrigger, SystemSelect },
-  setup() {
-    // const dragBarRef = ref<ElRef>(null);
-    // const sideRef = ref<ElRef>(null);
-
-    const { getCollapsed, getMenuWidth, getSplit, getMenuTheme, getRealWidth, getMenuHidden, getMenuFixed, getIsMixMode, toggleCollapsed } =
-      useMenuSetting();
-
-    const { prefixCls } = useDesign('layout-sideBar');
-
-    const appStore = useAppStore();
-
-    // useDragLine(sideRef, dragBarRef);
-
-    const { getCollapsedWidth, onBreakpointChange } = useSiderEvent();
-
-    const getMode = computed(() => {
-      return unref(getSplit) ? MenuModeEnum.INLINE : null;
-    });
+  import { computed, defineComponent, unref, CSSProperties } from 'vue';
+
+  import { Layout } from 'ant-design-vue';
+  import LayoutMenu from '../menu/index.vue';
+  // import LayoutMenu from '../menu/SearchMenu.vue';
+  import LayoutTrigger from '/@/layouts/default/trigger/index.vue';
+
+  import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
+
+  import { useAppStore } from '@/store/modules/app';
+  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+  import { useSiderEvent } from './useLayoutSider';
+  import { useDesign } from '/@/hooks/web/useDesign';
+  import SystemSelect from '../feature/SystemSelect.vue';
+
+  // import DragBar from './DragBar.vue';
+
+  export default defineComponent({
+    name: 'LayoutSideBar',
+    components: { Sider: Layout.Sider, LayoutMenu, LayoutTrigger, SystemSelect },
+    setup() {
+      // const dragBarRef = ref<ElRef>(null);
+      // const sideRef = ref<ElRef>(null);
+
+      const { getCollapsed, getMenuWidth, getSplit, getMenuTheme, getRealWidth, getMenuHidden, getMenuFixed, getIsMixMode, toggleCollapsed } =
+        useMenuSetting();
+
+      const { prefixCls } = useDesign('layout-sideBar');
+
+      const appStore = useAppStore();
+
+      // useDragLine(sideRef, dragBarRef);
+
+      const { getCollapsedWidth, onBreakpointChange } = useSiderEvent();
+
+      const getMode = computed(() => {
+        return unref(getSplit) ? MenuModeEnum.INLINE : null;
+      });
+
+      const getSplitType = computed(() => {
+        return unref(getSplit) ? MenuSplitTyeEnum.LEFT : MenuSplitTyeEnum.NONE;
+      });
+
+      const showClassSideBarRef = computed(() => {
+        // 控制是否显示侧边栏
+        if (appStore.getLayoutHideSider) {
+          return false;
+        }
+        return unref(getSplit) ? !unref(getMenuHidden) : true;
+      });
+
+      const getSiderClass = computed(() => {
+        return [
+          prefixCls,
+          {
+            [`${prefixCls}--fixed`]: unref(getMenuFixed),
+            [`${prefixCls}--mix`]: unref(getIsMixMode),
+          },
+        ];
+      });
+
+      const getHiddenDomStyle = computed((): CSSProperties => {
+        const width = `${unref(getRealWidth)}px`;
+        return {
+          width: width,
+          overflow: 'hidden',
+          flex: `0 0 ${width}`,
+          maxWidth: width,
+          minWidth: width,
+          transition: 'all 0.2s',
+        };
+      });
+
+      // 在此处使用计算量可能会导致sider异常
+      // andv 更新后,如果trigger插槽可用,则此处代码可废弃
+      // const getTrigger = h(LayoutTrigger);
 
-    const getSplitType = computed(() => {
-      return unref(getSplit) ? MenuSplitTyeEnum.LEFT : MenuSplitTyeEnum.NONE;
-    });
-
-    const showClassSideBarRef = computed(() => {
-      // 控制是否显示侧边栏
-      if (appStore.getLayoutHideSider) {
-        return false;
-      }
-      return unref(getSplit) ? !unref(getMenuHidden) : true;
-    });
-
-    const getSiderClass = computed(() => {
-      return [
-        prefixCls,
-        {
-          [`${prefixCls}--fixed`]: unref(getMenuFixed),
-          [`${prefixCls}--mix`]: unref(getIsMixMode),
-        },
-      ];
-    });
-
-    const getHiddenDomStyle = computed((): CSSProperties => {
-      const width = `${unref(getRealWidth)}px`;
       return {
-        width: width,
-        overflow: 'hidden',
-        flex: `0 0 ${width}`,
-        maxWidth: width,
-        minWidth: width,
-        transition: 'all 0.2s',
+        prefixCls,
+        getHiddenDomStyle,
+        getSiderClass,
+        // getTrigger,
+        getCollapsedWidth,
+        getMenuFixed,
+        showClassSideBarRef,
+        getMenuWidth,
+        getCollapsed,
+        getMenuTheme,
+        onBreakpointChange,
+        getMode,
+        getSplitType,
+        toggleCollapsed,
       };
-    });
-
-    // 在此处使用计算量可能会导致sider异常
-    // andv 更新后,如果trigger插槽可用,则此处代码可废弃
-    // const getTrigger = h(LayoutTrigger);
-
-    return {
-      prefixCls,
-      getHiddenDomStyle,
-      getSiderClass,
-      // getTrigger,
-      getCollapsedWidth,
-      getMenuFixed,
-      showClassSideBarRef,
-      getMenuWidth,
-      getCollapsed,
-      getMenuTheme,
-      onBreakpointChange,
-      getMode,
-      getSplitType,
-      toggleCollapsed,
-
-    };
-  },
-});
+    },
+  });
 </script>
 <style lang="less">
-@prefix-cls: ~'@{namespace}-layout-sideBar';
+  @prefix-cls: ~'@{namespace}-layout-sideBar';
 
-.@{prefix-cls} {
-  border-top-left-radius: 10px;
-  border-bottom-left-radius: 10px;
-  z-index: @layout-sider-fixed-z-index;
-  flex: 1 !important;
+  .@{prefix-cls} {
+    border-top-left-radius: 10px;
+    border-bottom-left-radius: 10px;
+    z-index: @layout-sider-fixed-z-index;
+    flex: 1 !important;
 
-  &.ant-layout-sider-dark {
-    background-color: @sider-dark-bg-color;
+    &.ant-layout-sider-dark {
+      background-color: @sider-dark-bg-color;
 
-    .ant-layout-sider-trigger {
-      color: darken(@white, 25%);
-      background-color: @trigger-dark-bg-color;
+      .ant-layout-sider-trigger {
+        color: darken(@white, 25%);
+        background-color: @trigger-dark-bg-color;
 
-      &:hover {
-        color: @white;
-        background-color: @trigger-dark-hover-bg-color;
+        &:hover {
+          color: @white;
+          background-color: @trigger-dark-hover-bg-color;
+        }
       }
     }
-  }
 
-  &:not(.ant-layout-sider-dark) {
-    // box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
+    &:not(.ant-layout-sider-dark) {
+      // box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
 
-    .ant-layout-sider-trigger {
-      color: @text-color-base;
-      border-top: 1px solid @border-color-light;
+      .ant-layout-sider-trigger {
+        color: @text-color-base;
+        border-top: 1px solid @border-color-light;
+      }
     }
-  }
 
-  .ant-layout-sider-zero-width-trigger {
-    top: 40%;
-    z-index: 10;
-  }
+    .ant-layout-sider-zero-width-trigger {
+      top: 40%;
+      z-index: 10;
+    }
 
-  & .ant-layout-sider-trigger {
-    // height: 36px;
-    line-height: 36px;
+    & .ant-layout-sider-trigger {
+      // height: 36px;
+      line-height: 36px;
+    }
   }
-}
 </style>

+ 2 - 2
src/locales/lang/zh-CN/routes/basic.ts

@@ -2,6 +2,6 @@ export default {
   login: '登录',
   errorLogList: '错误日志列表',
   defaultHomePage: '默认首页',
-  baseHome: '采空区密闭一张图',
-  secondaryHome: '采空区密闭监测分析',
+  baseHome: '老空区永久密闭一张图',
+  secondaryHome: '密闭监测分析与预警',
 };

+ 0 - 138
src/views/analysis/warningAnalysis/autoFireAnalysis/autoFireAnalysis.data.ts

@@ -178,141 +178,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
-
-export const minesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];
-
-export const historicalMinesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];

+ 2 - 2
src/views/analysis/warningAnalysis/connectAnalysis/index.vue

@@ -20,8 +20,8 @@
         <Col :span="6">
           <!-- 时间选择 -->
           <div class="filter-section param-section">
-            <span class="filter-label">采空区选择:</span>
-            <Select ref="select" v-model:value="goafId" style="width: 300px" placeholder="请选择空区">
+            <span class="filter-label">密闭名称:</span>
+            <Select ref="select" v-model:value="goafId" style="width: 300px" placeholder="请选择空区">
               <SelectOption v-for="(item, index) in goafOption" :key="index" :value="item.value">{{ item.label }} </SelectOption>
             </Select>
           </div>

+ 6 - 6
src/views/analysis/warningAnalysis/connectAnalysis/index_copy .vue

@@ -6,14 +6,14 @@
           <div class="filter-section param-section">
             <span class="filter-label">煤矿名称:</span>
             <div class="param-selector">
-              <MineCascader  v-model:value="innerValue" style="width: 300px" :sync-to-store="false" :init-from-store="false"></MineCascader>
+              <MineCascader v-model:value="innerValue" style="width: 300px" :sync-to-store="false" :init-from-store="false"></MineCascader>
             </div>
           </div>
         </Col>
         <Col :span="6">
           <!-- 时间选择 -->
           <div class="filter-section param-section">
-            <span class="filter-label">空区选择:</span>
+            <span class="filter-label">空区选择:</span>
             <Select ref="select" v-model:value="goafId" style="width: 300px" placeholder="请选择采空区">
               <SelectOption v-for="(item, index) in goafOption" :key="index" :value="item.value">{{ item.label }} </SelectOption>
             </Select>
@@ -83,7 +83,7 @@
   import MineCascader from '@/components/Form/src/jeecg/components/MineCascader/MineCascader.vue';
   import { getGoafHistory, getGoafList } from './connectAnalysis.api';
   import { useRouter } from 'vue-router';
-   import { useMineDepartmentStore } from '/@/store/modules/mine';
+  import { useMineDepartmentStore } from '/@/store/modules/mine';
 
   // 组件注册
   const RangePicker: any = DatePicker.RangePicker;
@@ -102,8 +102,8 @@
   const filteredData = ref<any[]>([]); //曲线数据
 
   const innerValue = ref('100004');
-   const mineStore = useMineDepartmentStore();
-   const mineCode = ref<any>(currentRoute.value['query']['mineCode']); //传递过来的矿ID
+  const mineStore = useMineDepartmentStore();
+  const mineCode = ref<any>(currentRoute.value['query']['mineCode']); //传递过来的矿ID
 
   // // Tree Key 与参数名映射(关键:关联树形节点和实际参数)
   //   const treeKeyToParamMap = computed(() => ({
@@ -282,7 +282,7 @@
   }
 
   watchEffect(() => {
-    console.log(mineStore)
+    console.log(mineStore);
     innerValue.value && getGoafListData();
   });
 </script>

+ 0 - 138
src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/fireAreaJudgeAnalysis.data.ts

@@ -196,141 +196,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
-
-export const minesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];
-
-export const historicalMinesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];

+ 1 - 1
src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/index.vue

@@ -71,7 +71,7 @@
 
   const boardData = ref([
     {
-      label: '空区数量',
+      label: '空区数量',
       value: '-',
     },
     {

+ 0 - 138
src/views/analysis/warningAnalysis/overlimitAlarm/overlimitAlarm.data.ts

@@ -168,141 +168,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
-
-export const minesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];
-
-export const historicalMinesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];

+ 0 - 138
src/views/analysis/warningAnalysis/pressureDiffAnalysis/pressureDiffAnalysis.data.ts

@@ -169,141 +169,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
-
-export const minesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];
-
-export const historicalMinesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];

+ 7 - 7
src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/index.vue

@@ -69,7 +69,7 @@
 
   const { goafOptions, goafId, hiscode, initGoafOptions } = useInitForm();
 
-  const boardData = [
+  const boardData = ref([
     {
       label: '存在风险情况数量',
       value: '-',
@@ -90,7 +90,7 @@
       label: '高风险',
       value: '-',
     },
-  ];
+  ]);
 
   // 注册实时数据表格
   const [registerTable, { reload }] = useTable({
@@ -209,11 +209,11 @@
       alarmType: 'explosionAlarm',
     };
     const result = await getProvinceAlarmNum(params);
-    boardData[1].value = result.alarmLevel1;
-    boardData[2].value = result.alarmLevel2;
-    boardData[3].value = result.alarmLevel3;
-    boardData[4].value = result.alarmLevel4;
-    boardData[0].value = result.alarmLevel1 + result.alarmLevel2 + result.alarmLevel3 + result.alarmLevel4;
+    boardData.value[1].value = result.alarmLevel1;
+    boardData.value[2].value = result.alarmLevel2;
+    boardData.value[3].value = result.alarmLevel3;
+    boardData.value[4].value = result.alarmLevel4;
+    boardData.value[0].value = result.alarmLevel1 + result.alarmLevel2 + result.alarmLevel3 + result.alarmLevel4;
   }
 
   const { pause, resume } = useIntervalFn(() => reload({ silence: true }), 10000);

+ 0 - 138
src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/sealRiskJudgeAnalysis.data.ts

@@ -172,141 +172,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
-
-export const minesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-11-17 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];
-
-export const historicalMinesData = [
-  {
-    orderNo: 101, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 102, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-  {
-    orderNo: 103, // 序号
-    enforcement: '执法一处', // 区域
-    mineName: '神木市三江', // 煤矿名称
-    sealedName: '采空区密闭', // 密闭名称
-    coalSeam: 'XX煤层', // 所属煤层
-    riskLevel: 'Ⅰ类容易自燃', // 自燃倾向性(与搜索框选项label一致)
-    COVal: 24, // CO浓度(ppm)
-    CH4Val: 0, // CH4浓度(%)
-    C2H2Val: 0, // C2H2浓度(ppm)
-    O2Val: 20, // O2浓度(%)
-    temperature: 35, // 温度(℃)
-    pressureDiff: 50, // 压差(Pa)
-    leakage: '气体涌出', // 是否漏风
-    fireHazard: '低风险', // 自然发火隐患
-    unsealing: '不可启封', // 密闭启封判定
-    explosionHazard: '低风险', // 爆炸危险性
-    updateTime: '2025-12-22 15:00:40', // 更新时间
-    alertTime: '2025-11-17 15:00:40',
-    interPressure: '10',
-    outerPressure: '20',
-  },
-];

+ 296 - 296
src/views/dashboard/SealedGoaf/configurable.data.sealedGoaf.ts

@@ -62,7 +62,7 @@ export const testConfigSealedGoaf: Config[] = [
     showStyle: {
       size: 'width:440px;height:170px;',
       version: '原版',
-      position: 'top:20px;left:25px;',
+      position: 'top:70px;left:25px;',
     },
   },
   // 2. 当日生产状态
@@ -118,7 +118,7 @@ export const testConfigSealedGoaf: Config[] = [
     showStyle: {
       size: 'width:440px;height:140px;',
       version: '原版',
-      position: 'top:190px;left:25px;',
+      position: 'top:250px;left:25px;',
     },
   },
   // 3. 煤层自燃倾向性
@@ -171,23 +171,23 @@ export const testConfigSealedGoaf: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:180px;',
+      size: 'width:440px;height:210px;',
       version: '原版',
-      position: 'top:320px;left:25px;',
+      position: 'top:400px;left:25px;',
     },
   },
-  // 4. 联网状态
+  // 4. 当日报警情况统计
   {
-    deviceType: 'isOnline',
-    moduleName: '联网状态',
+    deviceType: 'realtime_monitor',
+    moduleName: '当日报警情况统计',
     pageType: 'sealed_goaf',
     moduleData: {
       header: {
-        show: true,
+        show: false,
         readFrom: '',
         selector: {
-          show: true,
-          value: '${pos}',
+          show: false,
+          value: '',
         },
         slot: {
           show: false,
@@ -200,160 +200,73 @@ export const testConfigSealedGoaf: Config[] = [
         link: '',
       },
       layout: {
-        direction: 'column',
+        direction: 'row',
         items: [
           {
             name: 'board',
-            basis: '40%',
-            overflow: true,
-          },
-          {
-            name: 'table',
-            basis: '60%',
-            overflow: true,
+            basis: '100%',
           },
         ],
       },
       board: [
         {
-          type: 'B',
+          type: 'D',
           readFrom: '',
           layout: 'val-top',
           items: [
             {
-              label: '应接入',
-              value: '210',
+              label: '${overLimitData[0].alarmDesc}',
+              value: '${overLimitData[0].num}',
             },
             {
-              label: '在线',
-              value: '27',
+              label: '${overLimitData[1].alarmDesc}',
+              value: '${overLimitData[1].num}',
             },
             {
-              label: '中断',
-              value: '17',
+              label: '${overLimitData[2].alarmDesc}',
+              value: '${overLimitData[2].num}',
             },
             {
-              label: '未接入',
-              value: '1',
-            },
-          ],
-        },
-      ],
-      chart: [],
-      gallery: [],
-      gallery_list: [],
-      table: [
-        {
-          type: 'B',
-          // parser: 'json',
-          readFrom: 'tableArray',
-          columns: [
-            {
-              name: ' ',
-              prop: 'index',
+              label: '${overLimitData[3].alarmDesc}',
+              value: '${overLimitData[3].num}',
             },
             {
-              name: '应接入',
-              prop: 'yjr',
+              label: '${overLimitData[4].alarmDesc}',
+              value: '${overLimitData[4].num}',
             },
             {
-              name: '在线',
-              prop: 'zx',
+              label: '${overLimitData[5].alarmDesc}',
+              value: '${overLimitData[5].num}',
             },
             {
-              name: '中断',
-              prop: 'zd',
+              label: '${overLimitData[6].alarmDesc}',
+              value: '${overLimitData[6].num}',
             },
             {
-              name: '未接入',
-              prop: 'wjr',
+              label: '${overLimitData[7].alarmDesc}',
+              value: '${overLimitData[7].num}',
             },
           ],
         },
       ],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
       list: [],
       complex_list: [],
       preset: [],
-      mock: {
-        isOnline: [
-          {
-            pos: '生成矿井',
-            boardArray: [
-              {
-                label: '低风险',
-                value: '210',
-              },
-              {
-                label: '一般风险',
-                value: '27',
-              },
-              {
-                label: '较高风险',
-                value: '17',
-              },
-              {
-                label: '高风险',
-                value: '1',
-              },
-            ],
-            tableArray: [
-              {
-                index: '执法一处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-              {
-                index: '执法二处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-              {
-                index: '执法三处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-              {
-                index: '执法四处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-              {
-                index: '执法五处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-              {
-                index: '执法六处',
-                yjr: '50',
-                zx: '20',
-                zd: '0',
-                wjr: '0',
-              },
-            ],
-          },
-        ],
-      },
     },
     showStyle: {
-      size: 'width:440px;height:315px;',
+      size: 'width:440px;height:250px;',
       version: '原版',
-      position: 'bottom:20px;left:25px;',
+      position: 'top:620px;left:25px;',
     },
   },
-  // 5. 密闭情况总览
+  // 5. 密闭情况总览 更名为 矿井情况总览
   {
     deviceType: 'sealed_info',
-    moduleName: '密闭情况总览',
+    moduleName: '矿井情况总览',
     pageType: 'sealed_goaf',
     moduleData: {
       header: {
@@ -514,27 +427,194 @@ export const testConfigSealedGoaf: Config[] = [
       },
     },
     showStyle: {
-      size: 'width:440px;height:330px;',
+      size: 'width:440px;height:420px;',
       version: '原版',
-      position: 'top:-20px;right:25px;',
+      position: 'top:30px;right:25px;',
     },
   },
   // 6. 采空区密闭预警分析
+  // {
+  //   deviceType: 'goafmonitoring',
+  //   moduleName: '采空区密闭预警分析',
+  //   pageType: 'sealed_goaf',
+  //   moduleData: {
+  //     header: {
+  //       show: true,
+  //       readFrom: '',
+  //       selector: {
+  //         show: false,
+  //         value: '${pos}',
+  //       },
+  //       slot: {
+  //         show: true,
+  //         value: '(总计:200)',
+  //       },
+  //     },
+  //     background: {
+  //       show: false,
+  //       type: 'video',
+  //       link: '',
+  //     },
+  //     layout: {
+  //       direction: 'column',
+  //       items: [
+  //         {
+  //           name: 'board',
+  //           basis: '42%',
+  //           overflow: true,
+  //         },
+  //         {
+  //           name: 'table',
+  //           basis: '58%',
+  //           overflow: true,
+  //         },
+  //       ],
+  //     },
+  //     board: [
+  //       {
+  //         type: 'C',
+  //         readFrom: '',
+  //         layout: 'val-top',
+  //         items: [
+  //           {
+  //             label: '低风险',
+  //             value: '210',
+  //           },
+  //           {
+  //             label: '一般风险',
+  //             value: '27',
+  //           },
+  //           {
+  //             label: '较高风险',
+  //             value: '17',
+  //           },
+  //           {
+  //             label: '高风险',
+  //             value: '1',
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //     chart: [],
+  //     gallery: [],
+  //     gallery_list: [],
+  //     table: [
+  //       {
+  //         type: 'A',
+  //         // parser: 'json',
+  //         readFrom: 'goafAlarmData',
+  //         columns: [
+  //           {
+  //             name: ' ',
+  //             prop: 'managementName',
+  //           },
+  //           {
+  //             name: '低风险',
+  //             prop: 'alarm1',
+  //           },
+  //           {
+  //             name: '一般风险',
+  //             prop: 'alarm2',
+  //           },
+  //           {
+  //             name: '较高风险',
+  //             prop: 'alarm3',
+  //           },
+  //           {
+  //             name: '高风险',
+  //             prop: 'alarm4',
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //     list: [],
+  //     complex_list: [],
+  //     preset: [],
+  //     // mock: {
+  //     //   goafMonitoring: [
+  //     //     {
+  //     //       pos: '自燃',
+  //     //       boardArray: [
+  //     //         {
+  //     //           label: '低风险',
+  //     //           value: '210',
+  //     //         },
+  //     //         {
+  //     //           label: '一般风险',
+  //     //           value: '27',
+  //     //         },
+  //     //         {
+  //     //           label: '较高风险',
+  //     //           value: '17',
+  //     //         },
+  //     //         {
+  //     //           label: '高风险',
+  //     //           value: '1',
+  //     //         },
+  //     //       ],
+  //     //       tableArray: [
+  //     //         {
+  //     //           managementName: '执法一处',
+  //     //           dfx: '50',
+  //     //           ybfx: '20',
+  //     //           jgfx: '0',
+  //     //           gfx: '0',
+  //     //         },
+  //     //         {
+  //     //           managementName: '执法二处',
+  //     //           dfx: '50',
+  //     //           ybfx: '20',
+  //     //           jgfx: '0',
+  //     //           gfx: '0',
+  //     //         },
+  //     //         {
+  //     //           managementName: '执法三处',
+  //     //           dfx: '50',
+  //     //           ybfx: '20',
+  //     //           jgfx: '0',
+  //     //           gfx: '0',
+  //     //         },
+  //     //         {
+  //     //           managementName: '执法四处',
+  //     //           dfx: '50',
+  //     //           ybfx: '20',
+  //     //           jgfx: '0',
+  //     //           gfx: '0',
+  //     //         },
+  //     //         {
+  //     //           managementName: '执法五处',
+  //     //           dfx: '50',
+  //     //           ybfx: '20',
+  //     //           jgfx: '0',
+  //     //           gfx: '0',
+  //     //         },
+  //     //       ],
+  //     //     },
+  //     //   ],
+  //     // },
+  //   },
+  //   showStyle: {
+  //     size: 'width:440px;height:300px;',
+  //     version: '原版',
+  //     position: 'top:320px;right:25px;',
+  //   },
+  // },
+  // 6. 联网状态
   {
-    deviceType: 'goafmonitoring',
-    moduleName: '采空区密闭预警分析',
+    deviceType: 'isOnline',
+    moduleName: '联网状态',
     pageType: 'sealed_goaf',
     moduleData: {
       header: {
         show: true,
         readFrom: '',
         selector: {
-          show: false,
+          show: true,
           value: '${pos}',
         },
         slot: {
-          show: true,
-          value: '(总计:200)',
+          show: false,
+          value: '',
         },
       },
       background: {
@@ -547,36 +627,36 @@ export const testConfigSealedGoaf: Config[] = [
         items: [
           {
             name: 'board',
-            basis: '42%',
+            basis: '40%',
             overflow: true,
           },
           {
             name: 'table',
-            basis: '58%',
+            basis: '60%',
             overflow: true,
           },
         ],
       },
       board: [
         {
-          type: 'C',
+          type: 'B',
           readFrom: '',
           layout: 'val-top',
           items: [
             {
-              label: '低风险',
+              label: '应接入',
               value: '210',
             },
             {
-              label: '一般风险',
+              label: '在线',
               value: '27',
             },
             {
-              label: '较高风险',
+              label: '中断',
               value: '17',
             },
             {
-              label: '高风险',
+              label: '未接入',
               value: '1',
             },
           ],
@@ -587,29 +667,29 @@ export const testConfigSealedGoaf: Config[] = [
       gallery_list: [],
       table: [
         {
-          type: 'A',
+          type: 'B',
           // parser: 'json',
-          readFrom: 'goafAlarmData',
+          readFrom: 'tableArray',
           columns: [
             {
               name: ' ',
-              prop: 'managementName',
+              prop: 'index',
             },
             {
-              name: '低风险',
-              prop: 'alarm1',
+              name: '应接入',
+              prop: 'yjr',
             },
             {
-              name: '一般风险',
-              prop: 'alarm2',
+              name: '在线',
+              prop: 'zx',
             },
             {
-              name: '较高风险',
-              prop: 'alarm3',
+              name: '中断',
+              prop: 'zd',
             },
             {
-              name: '高风险',
-              prop: 'alarm4',
+              name: '未接入',
+              prop: 'wjr',
             },
           ],
         },
@@ -617,160 +697,80 @@ export const testConfigSealedGoaf: Config[] = [
       list: [],
       complex_list: [],
       preset: [],
-      // mock: {
-      //   goafMonitoring: [
-      //     {
-      //       pos: '自燃',
-      //       boardArray: [
-      //         {
-      //           label: '低风险',
-      //           value: '210',
-      //         },
-      //         {
-      //           label: '一般风险',
-      //           value: '27',
-      //         },
-      //         {
-      //           label: '较高风险',
-      //           value: '17',
-      //         },
-      //         {
-      //           label: '高风险',
-      //           value: '1',
-      //         },
-      //       ],
-      //       tableArray: [
-      //         {
-      //           managementName: '执法一处',
-      //           dfx: '50',
-      //           ybfx: '20',
-      //           jgfx: '0',
-      //           gfx: '0',
-      //         },
-      //         {
-      //           managementName: '执法二处',
-      //           dfx: '50',
-      //           ybfx: '20',
-      //           jgfx: '0',
-      //           gfx: '0',
-      //         },
-      //         {
-      //           managementName: '执法三处',
-      //           dfx: '50',
-      //           ybfx: '20',
-      //           jgfx: '0',
-      //           gfx: '0',
-      //         },
-      //         {
-      //           managementName: '执法四处',
-      //           dfx: '50',
-      //           ybfx: '20',
-      //           jgfx: '0',
-      //           gfx: '0',
-      //         },
-      //         {
-      //           managementName: '执法五处',
-      //           dfx: '50',
-      //           ybfx: '20',
-      //           jgfx: '0',
-      //           gfx: '0',
-      //         },
-      //       ],
-      //     },
-      //   ],
-      // },
-    },
-    showStyle: {
-      size: 'width:440px;height:300px;',
-      version: '原版',
-      position: 'top:320px;right:25px;',
-    },
-  },
-  // 7. 当日报警情况统计
-  {
-    deviceType: 'realtime_monitor',
-    moduleName: '当日报警情况统计',
-    pageType: 'sealed_goaf',
-    moduleData: {
-      header: {
-        show: false,
-        readFrom: '',
-        selector: {
-          show: false,
-          value: '',
-        },
-        slot: {
-          show: false,
-          value: '',
-        },
-      },
-      background: {
-        show: false,
-        type: 'video',
-        link: '',
-      },
-      layout: {
-        direction: 'row',
-        items: [
+      mock: {
+        isOnline: [
           {
-            name: 'board',
-            basis: '100%',
+            pos: '生成矿井',
+            boardArray: [
+              {
+                label: '低风险',
+                value: '210',
+              },
+              {
+                label: '一般风险',
+                value: '27',
+              },
+              {
+                label: '较高风险',
+                value: '17',
+              },
+              {
+                label: '高风险',
+                value: '1',
+              },
+            ],
+            tableArray: [
+              {
+                index: '执法一处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+              {
+                index: '执法二处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+              {
+                index: '执法三处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+              {
+                index: '执法四处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+              {
+                index: '执法五处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+              {
+                index: '执法六处',
+                yjr: '50',
+                zx: '20',
+                zd: '0',
+                wjr: '0',
+              },
+            ],
           },
         ],
       },
-      board: [
-        {
-          type: 'D',
-          readFrom: '',
-          layout: 'val-top',
-          items: [
-            {
-              label: '${overLimitData[0].alarmDesc}',
-              value: '${overLimitData[0].num}',
-            },
-            {
-              label: '${overLimitData[1].alarmDesc}',
-              value: '${overLimitData[1].num}',
-            },
-            {
-              label: '${overLimitData[2].alarmDesc}',
-              value: '${overLimitData[2].num}',
-            },
-            {
-              label: '${overLimitData[3].alarmDesc}',
-              value: '${overLimitData[3].num}',
-            },
-            {
-              label: '${overLimitData[4].alarmDesc}',
-              value: '${overLimitData[4].num}',
-            },
-            {
-              label: '${overLimitData[5].alarmDesc}',
-              value: '${overLimitData[5].num}',
-            },
-            {
-              label: '${overLimitData[6].alarmDesc}',
-              value: '${overLimitData[6].num}',
-            },
-            {
-              label: '${overLimitData[7].alarmDesc}',
-              value: '${overLimitData[7].num}',
-            },
-          ],
-        },
-      ],
-      chart: [],
-      gallery: [],
-      gallery_list: [],
-      table: [],
-      list: [],
-      complex_list: [],
-      preset: [],
     },
     showStyle: {
-      size: 'width:440px;height:205px;',
+      size: 'width:440px;height:420px;',
       version: '原版',
-      position: 'bottom:10px;right:25px;',
+      position: 'top:460px;right:25px;',
     },
   },
 ];

+ 66 - 63
src/views/dashboard/SealedGoaf/index.vue

@@ -2,83 +2,86 @@
 <template>
   <div class="company-home">
     <!-- 渲染所有模块 -->
-    <ModulePrimary v-for="cfg in cfgs" :key="cfg.deviceType + cfg.moduleName" :show-style="cfg.showStyle"
-      :module-data="cfg.moduleData" :module-name="cfg.moduleName" :device-type="cfg.deviceType" :data="data"
-      :visible="true" />
+    <ModulePrimary
+      v-for="cfg in cfgs"
+      :key="cfg.deviceType + cfg.moduleName"
+      :show-style="cfg.showStyle"
+      :module-data="cfg.moduleData"
+      :module-name="cfg.moduleName"
+      :device-type="cfg.deviceType"
+      :data="data"
+      :visible="true"
+    />
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { useInitConfigs, useInitPage } from '@/components/Configurable/hooks/useInit';
-import { testConfigSealedGoaf } from './configurable.data.sealedGoaf';
-import { getCoalSeamFireNum, getMineProductionStatusNum, getOverLimitNum, getGoafAlarmNum, getGoafAlarmLevel } from './sealedGoaf.api'
-import ModulePrimary from '/@/components/Configurable/ModulePrimary.vue';
-import { useGlobSetting } from '/@/hooks/setting';
+  import { computed, onMounted, onUnmounted, ref } from 'vue';
+  import { useInitConfigs, useInitPage } from '@/components/Configurable/hooks/useInit';
+  import { testConfigSealedGoaf } from './configurable.data.sealedGoaf';
+  import { getCoalSeamFireNum, getMineProductionStatusNum, getOverLimitNum, getGoafAlarmNum, getGoafAlarmLevel } from './sealedGoaf.api';
+  import ModulePrimary from '/@/components/Configurable/ModulePrimary.vue';
+  import { useGlobSetting } from '/@/hooks/setting';
 
-const { title = '采空区密闭监测与分析系统' } = useGlobSetting();
-const { data, updateData } = useInitPage(title);
+  const { title = '老空区永久密闭监测与分析系统' } = useGlobSetting();
+  const { data, updateData } = useInitPage(title);
 
-const cfgs = computed(() => configs.value);
-const { configs, fetchConfigs } = useInitConfigs();
-const mineData = ref({}); // 所有数据汇总
+  const cfgs = computed(() => configs.value);
+  const { configs, fetchConfigs } = useInitConfigs();
+  const mineData = ref({}); // 所有数据汇总
 
-onMounted(async () => {
-  try {
-    // 1. 先获取基础配置(若有接口获取配置则保留,否则直接用本地testConfigSealedGoaf)
-    await fetchConfigs('sealed_goaf');
+  onMounted(async () => {
+    try {
+      // 1. 先获取基础配置(若有接口获取配置则保留,否则直接用本地testConfigSealedGoaf)
+      await fetchConfigs('sealed_goaf');
 
-    // 2. 异步获取所有接口数据(并行请求提升性能)
-    const [coalSeamFireData, productionStatusData, overLimitData, goafAlarmData, goafAlarmLevel] = await Promise.all([
-      getCoalSeamFireNum(), // 煤层自燃倾向数据
-      getMineProductionStatusNum(), // 当日生产状态数据
-      getOverLimitNum(), // 超限数据(可按需处理)
-      getGoafAlarmNum({}), // 执法处风险统计
-      getGoafAlarmLevel({ mineCode: '100008' }),
-    ]);
+      // 2. 异步获取所有接口数据(并行请求提升性能)
+      const [coalSeamFireData, productionStatusData, overLimitData, goafAlarmData, goafAlarmLevel] = await Promise.all([
+        getCoalSeamFireNum(), // 煤层自燃倾向数据
+        getMineProductionStatusNum(), // 当日生产状态数据
+        getOverLimitNum(), // 超限数据(可按需处理)
+        getGoafAlarmNum({}), // 执法处风险统计
+        getGoafAlarmLevel({ mineCode: '100008' }),
+      ]);
 
-    // 3. 把接口数据赋值给响应式变量(备用)
-    mineData.value = { coalSeamFireData, productionStatusData, overLimitData, goafAlarmData, goafAlarmLevel };
+      // 3. 把接口数据赋值给响应式变量(备用)
+      mineData.value = { coalSeamFireData, productionStatusData, overLimitData, goafAlarmData, goafAlarmLevel };
 
-    // 4. 赋值更新后的配置到configs(触发组件重新渲染)
-    configs.value = [...testConfigSealedGoaf]; // 解构触发响应式更新
+      // 4. 赋值更新后的配置到configs(触发组件重新渲染)
+      configs.value = [...testConfigSealedGoaf]; // 解构触发响应式更新
 
-    // 5. 更新页面数据
-    updateData(mineData.value);
+      // 5. 更新页面数据
+      updateData(mineData.value);
+    } catch (error) {
+      console.error('数据获取/配置更新失败:', error);
+    }
+  });
 
-  } catch (error) {
-    console.error('数据获取/配置更新失败:', error);
-  }
-});
-
-// 数据处理函数
-onUnmounted(() => { });
+  // 数据处理函数
+  onUnmounted(() => {});
 </script>
 <style lang="less" scoped>
-@import '/@/design/theme.less';
-
-@font-face {
-  font-family: 'douyuFont';
-  src: url('/@/assets/font/douyuFont.otf');
-}
-
-
+  @import '/@/design/theme.less';
 
+  @font-face {
+    font-family: 'douyuFont';
+    src: url('/@/assets/font/douyuFont.otf');
+  }
 
-.company-home {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  color: @white;
-  background-image: linear-gradient(90deg, @map-bg 0%, @map-bg 14%, transparent 50%, @map-bg 86%, @map-bg 100%);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  z-index: @layout-basic-z-index;
-  // 允许点击穿透以支持下面的地图进行交互
-  pointer-events: none;
-}
+  .company-home {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    color: @white;
+    background-image: linear-gradient(90deg, @map-bg 0%, @map-bg 14%, transparent 50%, @map-bg 86%, @map-bg 100%);
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    z-index: @layout-basic-z-index;
+    // 允许点击穿透以支持下面的地图进行交互
+    pointer-events: none;
+  }
 
-:deep(.ant-select-selection-item) {
-  display: flex;
-  align-items: center;
-}
+  :deep(.ant-select-selection-item) {
+    display: flex;
+    align-items: center;
+  }
 </style>

+ 9 - 7
src/views/dashboard/basicInfo/dataQuality/index.vue

@@ -12,8 +12,8 @@
           <a-button type="primary" preIcon="mdi:page-next-outline" @click="handleOpenModal({}, 'add')"> 新增问题 </a-button>
         </template> -->
         <template #queJson="{ record }">
-          <div style="display: flex; align-items: center; gap: 8px; width: 100%; justify-content: space-between;">
-            <span style=" white-space: pre-line; word-wrap: break-word; line-height: 1.6; display: block; text-align: left; padding: 2px 4px;">
+          <div style="display: flex; align-items: center; gap: 8px; width: 100%; justify-content: space-between">
+            <span style="white-space: pre-line; word-wrap: break-word; line-height: 1.6; display: block; text-align: left; padding: 2px 4px">
               {{ record?.queJson ? formatQueJson(record.queJson) : '' }}
             </span>
             <button @click="record && handleOpenModal(record, 'view')" class="action-btn" title="查看问题详情">
@@ -233,11 +233,13 @@
       if (!Array.isArray(queList)) return '问题格式异常';
       // 空数组处理
       if (queList.length === 0) return '无质量问题';
-      return queList.map((item) => {
-        const goafName = item.goafName;
-        const queCon = item.queCon || '无描述';
-        return `<${goafName}工作面采空区密闭监测>存在的问题:${queCon}`;
-      }).join('\n'); // 多个问题分行显示
+      return queList
+        .map((item) => {
+          const goafName = item.goafName;
+          const queCon = item.queCon || '无描述';
+          return `<${goafName}工作面老空区永久密闭监测>存在的问题:${queCon}`;
+        })
+        .join('\n'); // 多个问题分行显示
     } catch (error) {
       console.error('解析质量问题JSON失败:', error);
       return '问题数据解析失败';

+ 9 - 26
src/views/monitor/sealedMonitor/components/RealtimeDetailsModal.vue

@@ -87,11 +87,15 @@
   import { getGoafData } from '../monitor.api';
   import { useIntervalFn } from '@vueuse/core';
   import dayjs from 'dayjs';
+  import { propTypes } from '/@/utils/propTypes';
 
   export default defineComponent({
     components: { BasicModal, MiniBoard, BlastDelta, CustomChart },
+    props: {
+      identifyField: propTypes.string.def('goafId'),
+    },
     emits: ['close', 'register'],
-    setup(__, { emit }) {
+    setup(props, { emit }) {
       const dataRef = ref<any>({});
       const dataArray = ref<any[]>([]);
 
@@ -101,31 +105,12 @@
         dataArray.value = takeRight(concat(dataArray.value, item), 15);
       };
 
-      // const chartData = computed(() => {
-      //   return {
-      //     readTime: dataArray.value.map((item) => item.readTime),
-      //     sourcePressure: dataArray.value.map((item) => item.sourcePressure),
-      //     o2Val: dataArray.value.map((item) => item.o2Val),
-      //     coVal: dataArray.value.map((item) => item.coVal),
-      //   };
-      // });
-      function getTagType(level: string) {
-        switch (level) {
-          case '1':
-            return 'red';
-          case '2':
-            return 'volcano';
-          case '3':
-            return 'orange';
-          case '4':
-            return 'success';
-          default:
-            return 'default';
-        }
-      }
-
       const [register] = useModalInner((d) => {
         if (!d) return;
+        // 没数据或者新传入的数据id不同,说明是首次/点击别的数据列进入的该组件
+        if (!dataRef.value || d[props.identifyField] !== dataRef.value[props.identifyField]) {
+          dataArray.value = [];
+        }
         dataRef.value = d;
         push(d);
         resume();
@@ -141,7 +126,6 @@
         getGoafData({ mineCodeList: mineCode, goafId }).then((r) => {
           dataRef.value = last(r);
           push(dataRef.value);
-          // push(dataRef.value)
         });
       }
 
@@ -165,7 +149,6 @@
         modalDetailsData,
         dataArray,
         get,
-        getTagType,
         register,
         contextRender,
         okHandler,

+ 1 - 1
src/views/monitor/sealedMonitor/index.vue

@@ -96,7 +96,7 @@
     tableProps: {
       api: (params) => {
         if (!goafId.value) {
-          message.info('请先选择煤矿及空区');
+          message.info('请先选择煤矿及空区');
           return Promise.reject();
         }
         params.goafId = goafId.value;

+ 1 - 0
src/views/system/configurable/index.vue

@@ -84,6 +84,7 @@
           xxl: 5,
         },
         schemas: searchFormSchema,
+        schemaGroupNames: ['常规查询'],
       },
       useSearchForm: true,
       striped: true,