bugfix

src/App.jsx

@@ -10,34 +10,34 @@ function Home(props) {
       <Alarm.DetailModal
         open={open}
         onCancel={() => setOpen(false)}
-        // options={{ ruleId: 25 }}
-        options={{
-          detail: {
-            id: 260909,
-            name: "DT_chr7_AE已有告警名称超下下限(值0.00; 限值5000)",
-            rule_id: 88,
-            type: 1,
-            sub_type: 14,
-            status: 1,
-            point_id: "ZWB_ALARM_chr_1_AE",
-            point_name: "",
-            alarm_level: 1,
-            op_status: 2,
-            created_time: "2024-09-25 10:43:08",
-            duration: 3,
-            confirmed_time: "",
-            confirmed_oper_id: 0,
-            confirmed_oper_name: "",
-            recovery_time: "",
-            remark: "",
-            value: 2.446e-41,
-            unit: "",
-            group_name: "",
-          },
-        }}
+        options={{ ruleId: 69 }}
         // options={{
-        //   pointId: "ABC123_AAA_chr1_AEff_MIN_H",
+        //   detail: {
+        //     id: 260909,
+        //     name: "DT_chr7_AE已有告警名称超下下限(值0.00; 限值5000)",
+        //     rule_id: 88,
+        //     type: 1,
+        //     sub_type: 14,
+        //     status: 1,
+        //     point_id: "ZWB_ALARM_chr_1_AE",
+        //     point_name: "",
+        //     alarm_level: 1,
+        //     op_status: 2,
+        //     created_time: "2024-09-25 10:43:08",
+        //     duration: 3,
+        //     confirmed_time: "",
+        //     confirmed_oper_id: 0,
+        //     confirmed_oper_name: "",
+        //     recovery_time: "",
+        //     remark: "",
+        //     value: 2.446e-41,
+        //     unit: "",
+        //     group_name: "",
+        //   },
         // }}
+        // // options={{
+        // //   pointId: "ABC123_AAA_chr1_AEff_MIN_H",
+        // // }}
       ></Alarm.DetailModal>
       {/* <Alarm.ComplexConfig ref={compRef} showList editId={-1}></Alarm.ComplexConfig>
       <button onClick={() => compRef?.current?.ok()}>测试</button> */}

src/api/alarm.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 const config = {
-  baseURL: "http://192.168.1.109:32080",
-  // baseURL: '/api',
+  // baseURL: "http://192.168.1.109:32080",
+  baseURL: '/api',
   noNeedInterceptor: false,
   headers: {
     Authorization: localStorage.getItem("token"),

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

@@ -104,6 +104,7 @@ const Index = (props) => {
   });
 
   const onConfirm = (record) => {
+    if (record.op_status === 1) return;
     setCurrentAlarm(record);
     setShowConfirm(true);
   };

src/pages/Alarm/components/detail.jsx

@@ -101,7 +101,9 @@ const Detail = (props) => {
               <div className={styles.tags}>
                 <Tabs
                   hideAdd
-                  onChange={setCurrent}
+                  onChange={(value) => {
+                    setCurrent(value === "history" ? value : Number(value));
+                  }}
                   activeKey={current}
                   type="card"
                   items={[

src/pages/Alarm/components/easy.jsx

@@ -366,6 +366,7 @@ const Easy = (props, ref) => {
           if (!form.getFieldValue("name")) {
             form.setFieldsValue({
               name: res?.data?.[0]?.name,
+              unit: res?.data?.[0]?.unit,
             });
           }
           setDeferUnit(res?.data?.[0]?.defer_unit);