bugfix

src/App.jsx

@@ -7,17 +7,17 @@ function Home(props) {
 
   return (
     <>
-      {/* <Alarm.DetailModal
+      <Alarm.DetailModal
         open={open}
         onCancel={() => setOpen(false)}
         options={{ ruleId: 25 }}
         // options={{
         //   pointId: "ABC123_AAA_chr1_AEff_MIN_H",
         // }}
-      ></Alarm.DetailModal> */}
-      <Alarm.ComplexConfig editId={27} showList></Alarm.ComplexConfig>
+      ></Alarm.DetailModal>
+      {/* <Alarm.ComplexConfig ref={compRef} editId={50}></Alarm.ComplexConfig> */}
+      {/* <button onClick={() => compRef?.current?.ok()}>测试</button> */}
       {/* <Alarm.EasyConfig pointId="ABC123_AAA_chr1_AEff_MIN_H" ></Alarm.EasyConfig> */}
-
     </>
   );
 }

src/pages/Alarm/components/complex.jsx

@@ -86,7 +86,7 @@ const Complex = (props, ref) => {
   }, [alarmId]);
 
   const onModalOk = useMemoizedFn(async () => {
-    if (type === 0) {
+    if (type === 0 && showList) {
       props.onConfirm(null);
       return;
     }

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

@@ -308,46 +308,48 @@ const Index = (props) => {
   }, [range, props.data?.data?.rule_id]);
   return (
     <>
-      <Descriptions>
-        <Descriptions.Item
-          span={props.data?.data?.point_id ? 2 : 3}
-          label="告警名称"
-        >
-          {props.data?.data?.name}
-        </Descriptions.Item>
-        {props.data?.data?.point_id && (
-          <Descriptions.Item label="点位编号">
-            {props.data?.data?.point_id}
+      <div className={styles.desc}>
+        <Descriptions>
+          <Descriptions.Item
+            span={props.data?.data?.point_id ? 2 : 3}
+            label="告警名称"
+          >
+            {props.data?.data?.name}
           </Descriptions.Item>
-        )}
-        <Descriptions.Item label="告警时间">
-          {props.data?.data?.created_time}
-        </Descriptions.Item>
-        <Descriptions.Item label="恢复时间">
-          {props.data?.data?.recovery_time || "-"}
-        </Descriptions.Item>
-        <Descriptions.Item label="持续时间">
-          {getDur(props?.data?.data?.duration)}
-        </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>
-        <Descriptions.Item label="确认时间">
-          {props.data?.data?.confirmed_time}
-        </Descriptions.Item>
-        <Descriptions.Item label="确认人">
-          {props.data?.data?.confirmed_oper_name}
-        </Descriptions.Item>
-        <Descriptions.Item label="备注">
-          {props.data?.data?.remark}
-        </Descriptions.Item>
-      </Descriptions>
+          {props.data?.data?.point_id && (
+            <Descriptions.Item label="点位编号">
+              {props.data?.data?.point_id}
+            </Descriptions.Item>
+          )}
+          <Descriptions.Item label="告警时间">
+            {props.data?.data?.created_time}
+          </Descriptions.Item>
+          <Descriptions.Item label="恢复时间">
+            {props.data?.data?.recovery_time || "-"}
+          </Descriptions.Item>
+          <Descriptions.Item label="持续时间">
+            {getDur(props?.data?.data?.duration)}
+          </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>
+          <Descriptions.Item label="确认时间">
+            {props.data?.data?.confirmed_time}
+          </Descriptions.Item>
+          <Descriptions.Item label="确认人">
+            {props.data?.data?.confirmed_oper_name}
+          </Descriptions.Item>
+          <Descriptions.Item label="备注">
+            {props.data?.data?.remark}
+          </Descriptions.Item>
+        </Descriptions>
+      </div>
       {(props.data?.data?.sub_type === 13 ||
         props.data?.data?.sub_type === 14) && (
         <>
@@ -355,13 +357,13 @@ const Index = (props) => {
             <RangePicker
               value={range}
               onChange={setRange}
-              style={{ width: 440, marginTop: 50 }}
+              style={{ width: 440, marginTop: 20 }}
             />
           </div>
 
           {chartData && (
             <ReactECharts
-              style={{ height: 250 }}
+              style={{ height: 424 }}
               option={chartData}
               notMerge={true}
             />

src/pages/Alarm/components/components/AlarmDetail/index.module.less

@@ -51,3 +51,11 @@
   display: flex;
   justify-content: flex-end;
 }
+
+.desc {
+  :global {
+    .ant-descriptions .ant-descriptions-row > td {
+      padding-bottom: 10px;
+    }
+  }
+}

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

@@ -261,10 +261,10 @@ const Index = (props) => {
           </Button>
           <Button
             onClick={() => onConfirm(record)}
-            style={{ width: 0 }}
             type="link"
+            disabled={record.op_status === 1}
           >
-            确认
+            {record.op_status !== 1 ? "确认" : "已确认"}
           </Button>
         </div>
       ),

src/pages/Alarm/components/detail.jsx

@@ -79,7 +79,7 @@ const Detail = (props) => {
         <Radio.Group
           value={current}
           onChange={(e) => setCurrent(e.target.value)}
-          size="large"
+          size="middle"
         >
           <Radio.Button value="history">告警记录</Radio.Button>
           {tags.map((item, index) => (