bugfix

src/api/alarm.js

@@ -94,6 +94,11 @@ export async function getRuleList(point_id) {
   return res.statusText ? res.data : res;
 }
 
+export async function getGroupList(data) {
+  const res = await axios.post("/api/unialarm/get_group_list", data, config);
+  return res.statusText ? res.data : res;
+}
+
 export default {
   editRule,
   addRule,

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

@@ -27,6 +27,9 @@ export function AlarmConfig(props) {
   };
 
   useEffect(() => {
+    // const fetchGroup = async () => {
+    //   const res = await getGroupList({});
+    // };
     if (props.visible) {
       setType(0);
     }

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

@@ -34,7 +34,7 @@ const Index = (props) => {
     const res = await confirmAlarm({
       id: props.currentAlarm?.id,
       remark: value?.remark ?? "",
-      oper_id: localStorage.getItem("user_id"),
+      oper_id: Number(localStorage.getItem("user_id")),
       oper_name: localStorage.getItem("username"),
     });
 

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

@@ -209,7 +209,7 @@ const Index = (props) => {
     const res = await API.getAlarmPointData(
       props.data?.data?.rule_id,
       range[0].unix(),
-      range[1].hour(23).minute(58).second(59).unix()
+      range[1].hour(23).minute(59).second(59).unix()
     );
     const newData = _.cloneDeep(initialOption);
     newData.series[0].data = res?.data?.point?.map((item) => item[1]);