bugfix

src/api/alarm.js

@@ -23,7 +23,7 @@ export async function searchPoint(data) {
   return res.statusText ? res.data : res;
 }
 
-export async function getAlarmHistory(page, rule_ids, size = 10) {
+export async function getAlarmHistory(page, rule_ids, size = 15) {
   const res = await axios.post(
     "/api/unialarm/get_alarm_history",
     {

src/entry.module.scss

@@ -1,5 +1,5 @@
 :global{
   :local(.App){
-    height: 0px !important;
+    height: 100%;
   }
 }

src/pages/Alarm/components/components/AlarmDetail/index.jsx

@@ -229,6 +229,7 @@ const Index = (props) => {
     newData.xAxis.data = res?.data?.point?.map((item) =>
       dayjs.unix(item[0]).format("HH:mm")
     );
+    newData.yAxis.name = props.data?.data?.unit;
     if (res?.data?.hh) {
       newData.series.push({
         name: "上上限",
@@ -239,11 +240,6 @@ const Index = (props) => {
           width: 1,
           type: "dashed",
         },
-        endLabel: {
-          show: true,
-          formatter: "{a}",
-          color: "inherit",
-        },
       });
     }
     if (res?.data?.h) {
@@ -311,8 +307,8 @@ const Index = (props) => {
               {props.data?.data?.point_id}
             </Descriptions.Item>
           )}
-          <Descriptions.Item label="告警时间">
-            {props.data?.data?.created_time}
+          <Descriptions.Item label="告警级别">
+            {levelMap[props.data?.data?.alarm_level]}
           </Descriptions.Item>
           <Descriptions.Item label="恢复时间">
             {props.data?.data?.recovery_time || "-"}
@@ -320,12 +316,13 @@ const Index = (props) => {
           <Descriptions.Item label="持续时间">
             {getDur(props?.data?.data?.duration)}
           </Descriptions.Item>
+          <Descriptions.Item label="告警时间">
+            {props.data?.data?.created_time}
+          </Descriptions.Item>
           <Descriptions.Item label="告警类型">
             {alarmTypeMap[props.data?.data?.type]}
           </Descriptions.Item>
-          <Descriptions.Item label="告警级别">
-            {levelMap[props.data?.data?.alarm_level]}
-          </Descriptions.Item>
+
           <Descriptions.Item label="告警状态">
             {alarmStatusMap[props.data?.data?.status]}
           </Descriptions.Item>
@@ -349,7 +346,7 @@ const Index = (props) => {
               format="YYYY-MM-DD HH:mm"
               value={range}
               onChange={setRange}
-              style={{ width: 360, marginTop: 20 }}
+              style={{ width: 360 }}
               presets={rangePresets}
             />
           </div>