[Fix 0000] 已知问题修复

public/js/global.js

@@ -313,6 +313,7 @@ const __STATIC_ROUTES__ = [
           icon: '',
           componentName: 'index',
           title: '地图管理',
+          hideMenu: true,
         },
         name: 'association',
       },

src/api/sys/menu.ts

@@ -63,7 +63,7 @@ export const getMenuList: () => Promise<getMenuListResultModel> = () => {
           const template = ele.children[0];
           const routes = tree.map((d) => {
             const route = generateStaticSealedMonitorRoute(template, d);
-            route.meta.hideMenu = route.children?.length === 0;
+            // route.meta.hideMenu = route.children?.length === 0;
             return route;
           });
           ele.children.push(...routes);

src/components/Form/src/jeecg/components/MineCascader/MineCascader.vue

@@ -72,11 +72,11 @@
 
       // 如果从STORE里初始化数据需要触发一次watcher以初始化组件状态
       if (props.initFromStore) {
-        // handleWatch(mineStore.getDepartId);
+        handleWatch(mineStore.getDepartId);
         // 为了让使用该组件的各个页面能够第一时间使用到该组件传递的值，手动触发一次emit
         handleChange([mineStore.getDepartId]);
       } else {
-        // handleWatch(props.value);
+        handleWatch(props.value);
         // 为了让使用该组件的各个页面能够第一时间使用到该组件传递的值，手动触发一次emit
         handleChange([props.value]);
       }
@@ -98,6 +98,10 @@
       }
 
       function handleWatch(id: string = '') {
+        if (id === '') {
+          // 当监听到的数据为空时，99%的情况是外部操作导致，因此触发一次 change -> watch
+          return handleChange([]);
+        }
         // rootId提供了选项过滤功能，任何传入的值都应该检查
         if (!mineStore.findDepartById(id, options.value)) {
           console.warn('[Watch] The id provided is not included in MineOptions');
@@ -115,19 +119,7 @@
         innerValue.value = path;
       }
 
-      watch(
-        () => props.value,
-        (nv) => {
-          // 触发事件的顺序应该是 change -> watch
-          if (nv === '') {
-            // 因此当监听到的数据为空时，99%的情况是外部操作导致，因此触发一次 change -> watch
-            handleChange([nv]);
-          } else {
-            // 反之则为内部正常数据触发 change 后来到这里走 watch 的逻辑
-            handleWatch(nv);
-          }
-        }
-      );
+      watch(() => props.value, handleWatch);
 
       return {
         innerValue,

src/views/analysis/warningAnalysis/autoFireAnalysis/autoFireAnalysis.data.ts

@@ -52,28 +52,28 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: 'CO浓度(ppm)',
-    dataIndex: 'coVal',
+    title: 'C2H4(ppm)',
+    dataIndex: 'c2h4Val',
     width: 100,
   },
   {
-    title: 'CO日增率',
-    dataIndex: 'coRzl',
+    title: 'C2H2(ppm)',
+    dataIndex: 'c2h2Val',
     width: 100,
   },
   {
-    title: 'O2浓度(%)',
-    dataIndex: 'o2Val',
+    title: 'CO浓度(ppm)',
+    dataIndex: 'coVal',
     width: 100,
   },
   {
-    title: 'C2H4(ppm)',
-    dataIndex: 'c2h4Val',
+    title: 'CO日增率',
+    dataIndex: 'coRzl',
     width: 100,
   },
   {
-    title: 'C2H2(ppm)',
-    dataIndex: 'c2h2Val',
+    title: 'O2浓度(%)',
+    dataIndex: 'o2Val',
     width: 100,
   },
   {
@@ -170,7 +170,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'riskLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [

src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/fireAreaJudgeAnalysis.data.ts

@@ -178,7 +178,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'riskLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [

src/views/analysis/warningAnalysis/overlimitAlarm/overlimitAlarm.data.ts

@@ -150,7 +150,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'riskLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [

src/views/analysis/warningAnalysis/pressureDiffAnalysis/pressureDiffAnalysis.data.ts

@@ -151,7 +151,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'riskLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [

src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/sealRiskJudgeAnalysis.data.ts

@@ -154,7 +154,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'riskLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [

src/views/dashboard/basicInfo/dataQuality/dataQuality.data.ts

@@ -10,15 +10,18 @@ export const colorHexMap: Record<string, string> = {
   gold: '#faad14',
   red: '#f5222d',
   gray: '#8c8c8c',
-  black: '#000000', 
+  black: '#000000',
 };
 
 // 2. 定义动态映射的类型（供外部传入）
-export type ProductionStatusMap = Record<string | number, { 
-  label: string; 
-  value: number | string; 
-  color: string; 
-}>;
+export type ProductionStatusMap = Record<
+  string | number,
+  {
+    label: string;
+    value: number | string;
+    color: string;
+  }
+>;
 
 // 3. 生成表格列（支持传入动态映射）
 export function getColumns(dynamicStatusMap: Ref<ProductionStatusMap>) {
@@ -42,12 +45,16 @@ export function getColumns(dynamicStatusMap: Ref<ProductionStatusMap>) {
         // 空值/异常值处理
         const status = record.mineProStatus;
         // 从动态映射中取值，兜底未知状态
-        const { label, color } = dynamicStatusMap.value[status] || { 
-          label: '-', 
+        const { label, color } = dynamicStatusMap.value[status] || {
+          label: '-',
         };
-        return h('span', { 
-          style: { color: colorHexMap[color] } 
-        }, label);
+        return h(
+          'span',
+          {
+            style: { color: colorHexMap[color] },
+          },
+          label
+        );
       },
     },
     {
@@ -157,7 +164,7 @@ export function getSearchFormSchema(dynamicStatusOptions: Ref<{ label: string; v
   ];
   return searchFormSchema;
 }
-export const topFormSchema :FormSchema[] = [
+export const topFormSchema: FormSchema[] = [
   {
     field: 'mineCode',
     label: '煤矿名称',
@@ -165,17 +172,15 @@ export const topFormSchema :FormSchema[] = [
     componentProps: {
       changeOnSelect: false,
       initFromStore: false,
-      syncToStore: false
+      syncToStore: false,
     },
     required: true,
-    rules: [
-      { required: true, message: '请选择煤矿名称', trigger: 'change' },
-    ],
+    rules: [{ required: true, message: '请选择煤矿名称', trigger: 'change' }],
   },
 ];
 
 /** 弹框表单配置 */
-export const formSchema :FormSchema[] = [
+export const formSchema: FormSchema[] = [
   {
     field: 'goafName',
     label: '工作面名称',
@@ -195,9 +200,7 @@ export const formSchema :FormSchema[] = [
       format: 'YYYY-MM-DD HH:mm:ss',
     },
     required: true,
-    rules: [
-      { required: true, message: '请选择开始时间', trigger: 'change' },
-    ],
+    rules: [{ required: true, message: '请选择开始时间', trigger: 'blur' }],
   },
   {
     field: 'endTime',
@@ -208,9 +211,7 @@ export const formSchema :FormSchema[] = [
       format: 'YYYY-MM-DD HH:mm:ss',
     },
     required: true,
-    rules: [
-      { required: true, message: '请选择结束时间', trigger: 'change' },
-    ],
+    rules: [{ required: true, message: '请选择结束时间', trigger: 'blur' }],
   },
   {
     field: 'queCon',

src/views/dashboard/basicInfo/minesInfo/minesInfo.data.ts

@@ -70,7 +70,7 @@ export function getColumns(dynamicStatusMap: Ref<ProductionStatusMap>): BasicCol
       },
     },
     {
-      title: '自燃情况',
+      title: '自燃倾向性',
       dataIndex: 'alarmLevel',
       width: 100,
     },

src/views/monitor/sealedMonitor/index.vue

@@ -72,6 +72,7 @@
             label: '煤矿名称',
             component: 'MineCascader',
             colProps: { span: 6 },
+            required: true,
             componentProps: {
               initFromStore: false,
               syncToStore: false,

src/views/monitor/sealedMonitor/monitor.data.ts

@@ -41,7 +41,7 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '自燃情况',
+    title: '自燃倾向性',
     dataIndex: 'coalSeamLevel',
     width: 100,
   },
@@ -154,14 +154,13 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'coalSeamLevel',
-    label: '自燃情况',
+    label: '自燃倾向性',
     component: 'Select',
     componentProps: {
       options: [
-        { label: '1类易自燃', value: '1类易自燃' },
-        { label: '2类易自燃', value: '2类易自燃' },
-        { label: '3类易自燃', value: '3类易自燃' },
-        { label: '4类易自燃', value: '4类易自燃' },
+        { label: 'Ⅰ类容易自燃', value: 'Ⅰ类容易自燃' },
+        { label: 'Ⅱ类自燃', value: 'Ⅱ类自燃' },
+        { label: 'Ⅲ类不易自燃', value: 'Ⅲ类不易自燃' },
       ],
     },
     colProps: { span: 6 },
@@ -188,7 +187,7 @@ export const modalDetailsData: {
     //   value: 'coalSeamName',
     // },
     // {
-    //   label: '自燃情况',
+    //   label: '自燃倾向性',
     //   value: 'Ⅰ类容易自燃',
     // },
     {
@@ -438,7 +437,7 @@ export const historicalFormSchema: FormSchema[] = [
   // },
   // {
   //   field: 'riskLevel',
-  //   label: '自燃情况',
+  //   label: '自燃倾向性',
   //   component: 'Select',
   //   componentProps: {
   //     options: [