Merge branch 'master' of http://39.97.59.228:8013/hrx/goaf-monitoring-system

src/components/Form/src/BasicForm.vue

@@ -452,5 +452,12 @@
         }
       }
     }
+
+    // 使用默认定位的select dropdown内容需要强制定位以消除动态计算位置后再被Adaptive Container变形后造成的位置偏移问题
+    .ant-select-dropdown,
+    .ant-picker-dropdown {
+      left: 0px !important;
+      top: 35px !important;
+    }
   }
 </style>

src/components/Form/src/TableForm.vue

@@ -461,5 +461,12 @@
         }
       }
     }
+
+    // 使用默认定位的select dropdown内容需要强制定位以消除动态计算位置后再被Adaptive Container变形后造成的位置偏移问题
+    .ant-select-dropdown,
+    .ant-picker-dropdown {
+      left: 0px !important;
+      top: 35px !important;
+    }
   }
 </style>

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

@@ -88,10 +88,10 @@ export const columns: BasicColumn[] = [
     // 自定义渲染函数，计算并显示天数差
     customRender: ({ record }) => {
       // 校验预警时间是否存在
-      if (!record?.createTime) {
+      if (!record?.updateTime) {
         return '0';
       }
-      const alarmDate = new Date(record.createTime);
+      const alarmDate = new Date(record.updateTime);
       alarmDate.setHours(0, 0, 0, 0);
       const alarmTime = alarmDate.getTime();
       if (isNaN(alarmTime)) {

src/views/monitor/log/index.vue

@@ -61,6 +61,7 @@
       },
       formConfig: {
         schemas: searchSchema,
+        schemaGroupNames: ['常规查询'],
         fieldMapToTime: [['fieldTime', ['createTime_begin', 'createTime_end'], 'YYYY-MM-DD']],
       },
     },

src/views/system/dict/index.vue

@@ -72,6 +72,7 @@
       columns: columns,
       formConfig: {
         schemas: searchFormSchema,
+        schemaGroupNames: ['常规查询'],
       },
       actionColumn: {
         width: 240,

src/views/system/notice/index.vue

@@ -57,6 +57,7 @@
       columns: columns,
       formConfig: {
         schemas: searchFormSchema,
+        schemaGroupNames: ['常规查询'],
         fieldMapToTime: [['sendTime', ['sendTime_begin', 'sendTime_end'], 'YYYY-MM-DD']],
       },
     },

src/views/system/role/index.vue

@@ -63,9 +63,10 @@
       columns: columns,
       formConfig: {
         // 代码逻辑说明: 【QQYUN-5873】查询区域lablel默认居左
-        labelWidth: 65,
+        // labelWidth: 65,
         rowProps: { gutter: 24 },
         schemas: searchFormSchema,
+        schemaGroupNames: ['常规查询'],
       },
       actionColumn: {
         width: 120,