类型添加完成

web/client/src/sections/control/containers/control.jsx

@@ -155,13 +155,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
             })
          } else {
             if (ProblemAlarm?.length > 0) {
-               ProblemAlarm.sort((a, b) => {
+               ProblemAlarm.sort((a, b) => (moment(a.StartTime).isBefore(b.StartTime) ? 1 : -1))
-                  if (moment(a.StartTime).isBefore(b.StartTime)) {
-                     return 1
-                  } else {
-                     return -1
-                  }
-               })
                setProblemsList([...ProblemAlarm, ...problemsList])
             }
          }
@@ -187,19 +181,12 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                }
             })
          }
-         newest.sort((a, b) => {
+         newest.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
-            if (moment(a.time).isBefore(b.time)) {
-               return 1
-            } else {
-               return -1
-            }
-         })
          querydata.current = [...newest, ...querydata.current]
          setQueryData1([...querydata.current])
          
       }
    }, [socketData])
-   console.log(querydata.current);
    useEffect(() => {
       consoleToollink()
 
@@ -423,13 +410,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                         id: v.id,
                      }))
                   }
-                  data.sort((a, b) => {
+                  data.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
-                     if (moment(a.time).isBefore(b.time)) {
-                        return 1
-                     } else {
-                        return -1
-                     }
-                  })
                   // console.log(data)
                   querydata.current = data
                   setQueryData1(data)
@@ -505,13 +486,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                               id: v.id,
                            }))
                         }
-                        data.sort((a, b) => {
+                        data.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
-                           if (moment(a.time).isBefore(b.time)) {
-                              return 1
-                           } else {
-                              return -1
-                           }
-                        })
                         querydata.current = data
                         setQueryData1(data)
                      }

web/client/src/sections/install/components/systemModal.jsx

@@ -20,7 +20,8 @@ function adminModal (props) {
       anxincloudArr,//修改时已经选择的安心云列表
       anxinDelete,//修改时安心云项目有删除,显示提示信息
       appArr,//修改时添加应用
-      bindId
+      bindId,
+      mapping //修改时的映射类型
    } = props;
    const { install } = actions;
    const form = useRef();//表单
@@ -236,15 +237,13 @@ function adminModal (props) {
                         }
                      </Form.Select>
                      <Form.Select
-                        label="添加映射分类:"
+                        label="映射分类:"
                         field="mappingClass"
-                        multiple
                         filter
                         placeholder="请选择映射类型"
                         style={{ width: 425 }}
-                        initValue={appArr || []}
+                        initValue={mapping}
                         showClear
-                        renderSelectedItem={renderMultipleWithCustomTag}
                         >
                         {
                            [

web/client/src/sections/install/containers/system.jsx

@@ -27,6 +27,7 @@ const Example = (props) => {
    const [bindId, setBindId] = useState()  //修改时绑定的id
    const [tableKey, setTableKey] = useState([])  //修改时绑定的id
    const page = useRef(query.page);//哪一页
+   const [mapping, setMapping] = useState() //修改时的映射类型
 
 
 
@@ -228,7 +229,7 @@ const Example = (props) => {
          dataIndex: "createTime",
          key: 'time',
          render: (_, row) => {
-                return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss");
+            return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss")
          }
       },
       {
@@ -236,7 +237,7 @@ const Example = (props) => {
          dataIndex: "updateTime",
          key: 'updateTime',
          render: (_, row) => {
-                return moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss");
+            return moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss")
          }
       },
       {
@@ -284,9 +285,11 @@ const Example = (props) => {
                            delete myarrarrList[j].projectApp
                            myapparr.push(JSON.stringify(myarrarrList[j]))
                         }
+
                         setAppArr(myapparr)
                         setAnxincloudArr(myanxinArr)
                         setBindId(row.id)
+                        setMapping(row?.mappingClass)
                         setSystemEdit(true)
                      }}
                   >
@@ -355,6 +358,7 @@ const Example = (props) => {
                         setAppArr([])
                         setAnxincloudArr()
                         setBindId()
+                        setMapping('')
                      }}
                   >
                      添加映射关系
@@ -450,6 +454,7 @@ const Example = (props) => {
                   anxincloudArr={anxincloudArr}
                   pepProjectId={pepProjectId}
                   anxinDelete={anxinDelete}
+                  mapping={mapping}
                   appArr={appArr}
                   bindId={bindId}
                   cancel={() => {

web/client/src/sections/problem/components/sideSheet.jsx

@@ -32,13 +32,7 @@ function SideSheets ({ dispatch, actions, close, alarmId }) {
          dispatch(problem.getAlarmDataDetailAgg({ alarmId: alarmId })).then((res) => {
             if (res?.success) {
                let dataSort = res.payload.data || []
-               dataSort.sort((a, b) => {
+               dataSort.sort((a, b) => (moment(a.hours).isBefore(b.hours) ? -1 : 1))
-                  if (moment(a.hours).isBefore(b.hours)) {
-                     return -1
-                  } else {
-                     return 1
-                  }
-               })
                let data = {
                   grid: {
                      left: '5%',