From e3624a853a132ef78a2c4edd12309971bead6802 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Wed, 30 Nov 2022 15:27:30 +0800
Subject: [PATCH] 调整代表异常干预

---
 src/pages/backlog/Intervention/api.ts                            |  5 +++++
 src/pages/backlog/Intervention/components/EditModal.tsx          |  4 +++-
 src/pages/backlog/Intervention/components/SettingList.tsx        | 21 ++++++++++++++-------
 src/pages/backlog/Intervention/components/SettingModal.tsx       | 16 ++--------------
 src/pages/backlog/InterventionSetting/api.ts                     |  5 +++++
 src/pages/backlog/InterventionSetting/components/CreateModal.tsx | 23 ++++++++++++++++++++++-
 src/pages/backlog/InterventionSetting/index.tsx                  | 21 ++++++++++-----------
 src/pages/backlog/OverIntervention/components/EditModal.tsx      |  2 +-
 src/pages/backlog/OverIntervention/components/SettingList.tsx    |  2 +-
 src/pages/backlog/OverIntervention/components/SettingModal.tsx   |  9 +--------
 src/pages/backlog/entity.ts                                      |  8 ++++++++
 11 files changed, 72 insertions(+), 44 deletions(-)
 create mode 100644 src/pages/backlog/entity.ts

diff --git a/src/pages/backlog/Intervention/api.ts b/src/pages/backlog/Intervention/api.ts
index b1b86bd..a9e132b 100644
--- a/src/pages/backlog/Intervention/api.ts
+++ b/src/pages/backlog/Intervention/api.ts
@@ -2,6 +2,7 @@ import request from "@/utils/request";
 import { BACKLOG } from "@/utils/host";
 import { http } from "@/typing/http";
 import { PaginationParam } from "@/typing/common";
+import { NumberTypeEnum, SymbolDescEnum } from "@/pages/backlog/entity";
 
 export interface ListVO {
   id: number;
@@ -59,6 +60,10 @@ export interface InterveneVO {
   name: string;
   valueDesc: string;
   valueUnit: string;
+  /** 数据类型 */
+  numberType: NumberTypeEnum;
+  /** 运算符类型 */
+  symbolType: SymbolDescEnum;
 }
 
 export function queryInterveneSettingList(params: { interveneId?: number }): http.PromiseRespA<InterveneVO> {
diff --git a/src/pages/backlog/Intervention/components/EditModal.tsx b/src/pages/backlog/Intervention/components/EditModal.tsx
index f5d45a6..bdc968b 100644
--- a/src/pages/backlog/Intervention/components/EditModal.tsx
+++ b/src/pages/backlog/Intervention/components/EditModal.tsx
@@ -66,7 +66,7 @@ export default ({ visible, onCancel, item, onRefresh }: Props) => {
 
   return (
     <Modal
-      visible={visible}
+      open={visible}
       onCancel={onCancel}
       onOk={form.submit}
       title={item?.id ? "编辑异常干预" : "新增异常干预"}
@@ -107,6 +107,8 @@ export default ({ visible, onCancel, item, onRefresh }: Props) => {
               saveLoading={!currentIntervene || saveLoading}
               valueDesc={currentIntervene?.valueDesc}
               valueUnit={currentIntervene?.valueUnit}
+              numberType={currentIntervene?.numberType}
+              symbolType={currentIntervene?.symbolType}
             />
           </Form.Item>
         </Form>
diff --git a/src/pages/backlog/Intervention/components/SettingList.tsx b/src/pages/backlog/Intervention/components/SettingList.tsx
index 04d245e..4ccd008 100644
--- a/src/pages/backlog/Intervention/components/SettingList.tsx
+++ b/src/pages/backlog/Intervention/components/SettingList.tsx
@@ -5,6 +5,7 @@ import { PlusOutlined } from "@ant-design/icons";
 import useInitial from "@/hooks/useInitail";
 import * as roleApi from "@/pages/admin/Privilege/api";
 import orderBy from "lodash/orderBy";
+import { NumberTypeEnum, SymbolDescEnum } from "@/pages/backlog/entity";
 
 interface Props {
   onChange?: (value?: Item[]) => any;
@@ -12,17 +13,17 @@ interface Props {
   saveLoading?: boolean;
   valueDesc?: string;
   valueUnit?: string;
+  numberType?: number;
+  symbolType?: number;
   disabled?: boolean;
 }
 
-function Index({ value = [], onChange, saveLoading, valueUnit, valueDesc, disabled }: Props) {
+function Index({ value = [], onChange, saveLoading, valueUnit, valueDesc, numberType, symbolType, disabled }: Props) {
   const { data: roleList } = useInitial<roleApi.Item[], any>(roleApi.getAllRoleListApi, [], { roleTypes: 2 }, disabled);
   const [form] = Form.useForm();
   const [visible, setVisible] = useState(false);
 
-  useEffect(() => {
-
-  }, []);
+  useEffect(() => {}, []);
 
   const onRemove = (index: number) => {
     value.splice(index, 1);
@@ -74,7 +75,7 @@ function Index({ value = [], onChange, saveLoading, valueUnit, valueDesc, disabl
           title="干预条件"
           dataIndex="threshold"
           align="center"
-          render={(text) => `${valueDesc || ""}≥${text}${valueUnit || ""}`}
+          render={(text) => `${valueDesc || ""}${SymbolDescEnum[symbolType || SymbolDescEnum["≥"]]}${text}${valueUnit || ""}`}
         />
         <Table.Column title="干预角色" dataIndex="roleName" align="center" />
         {!disabled ? (
@@ -94,13 +95,19 @@ function Index({ value = [], onChange, saveLoading, valueUnit, valueDesc, disabl
           />
         ) : null}
       </Table>
-      <Modal visible={visible} onCancel={closeModal} onOk={form.submit} title="干预设置">
+      <Modal open={visible} onCancel={closeModal} onOk={form.submit} title="干预设置">
         <Form form={form} onFinish={handleSave} wrapperCol={{ span: 18 }} labelCol={{ span: 6 }}>
           <Form.Item hidden name="index" label="index" rules={[{ required: false }]}>
             <Input />
           </Form.Item>
           <Form.Item name="threshold" label="干预条件" rules={[{ required: true, message: "干预条件不能为空" }]}>
-            <InputNumber min={0} addonBefore={`${valueDesc || ""}≥`} addonAfter={valueUnit || ""} precision={0} />
+            <InputNumber
+              min={0}
+              placeholder={NumberTypeEnum["小数"] == numberType ? "0.00" : "0"}
+              addonBefore={`${valueDesc || ""}${SymbolDescEnum[symbolType || SymbolDescEnum["≥"]]}`}
+              addonAfter={valueUnit || ""}
+              precision={NumberTypeEnum["小数"] == numberType ? 2 : 0}
+            />
           </Form.Item>
           <Form.Item name="role" label="干预角色" rules={[{ required: true, message: "干预角色不能为空" }]}>
             <Select
diff --git a/src/pages/backlog/Intervention/components/SettingModal.tsx b/src/pages/backlog/Intervention/components/SettingModal.tsx
index af0cbd0..2a65b2f 100644
--- a/src/pages/backlog/Intervention/components/SettingModal.tsx
+++ b/src/pages/backlog/Intervention/components/SettingModal.tsx
@@ -36,21 +36,9 @@ export default ({ visible, onCancel, item }: Props) => {
   const interveneVO = useMemo(() => interList.find((t) => t.code == item?.code), [interList]);
 
   return (
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      cancelButtonProps={{ hidden: true }}
-      onOk={onCancel}
-      title="待办超时干预条件"
-      width="55%"
-    >
+    <Modal open={visible} onCancel={onCancel} cancelButtonProps={{ hidden: true }} onOk={onCancel} title="待办超时干预条件" width="55%">
       <Skeleton active loading={loading || interLoading}>
-        <SettingList
-          disabled
-          value={data || []}
-          valueDesc={interveneVO?.valueDesc}
-          valueUnit={interveneVO?.valueUnit}
-        />
+        <SettingList disabled value={data || []} valueDesc={interveneVO?.valueDesc} valueUnit={interveneVO?.valueUnit} />
       </Skeleton>
     </Modal>
   );
diff --git a/src/pages/backlog/InterventionSetting/api.ts b/src/pages/backlog/InterventionSetting/api.ts
index a280da4..c5d1b0e 100644
--- a/src/pages/backlog/InterventionSetting/api.ts
+++ b/src/pages/backlog/InterventionSetting/api.ts
@@ -2,6 +2,7 @@ import request from "@/utils/request";
 import { BACKLOG } from "@/utils/host";
 import { http } from "@/typing/http";
 import { PaginationParam } from "@/typing/common";
+import { NumberTypeEnum, SymbolDescEnum } from "@/pages/backlog/entity";
 
 export interface Params extends PaginationParam {
   sysId?: number;
@@ -31,6 +32,10 @@ export interface ListVO {
   valueDesc: string;
   /** 干预阀值单位 */
   valueUnit: string;
+  /** 数据类型 */
+  numberType: NumberTypeEnum;
+  /** 运算符类型 */
+  symbolType: SymbolDescEnum;
 }
 
 export function querySettingList(params: Params): http.PromisePageResp<ListVO> {
diff --git a/src/pages/backlog/InterventionSetting/components/CreateModal.tsx b/src/pages/backlog/InterventionSetting/components/CreateModal.tsx
index 50b9a52..77cceb3 100644
--- a/src/pages/backlog/InterventionSetting/components/CreateModal.tsx
+++ b/src/pages/backlog/InterventionSetting/components/CreateModal.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from "react";
-import { Modal, Form, Select, message, Input } from "antd";
+import { Modal, Form, Select, message, Input, Radio } from "antd";
 import { save, ListVO, queryBacklogList, BacklogItemVO } from "../api";
 import useInitial from "@/hooks/useInitail";
 import { systemListApi } from "@/pages/admin/Privilege/api";
 import usePagination from "@/hooks/usePagination";
+import { NumberTypeEnum, SymbolDescEnum } from "@/pages/backlog/entity";
 
 interface Props {
   visible: boolean;
@@ -24,6 +25,8 @@ export default ({ visible, onCancel, item, onRefresh }: Props) => {
         name: item.name,
         configId: { value: item.configId, label: item.itemName },
         applySysId: { value: item.applySysId, label: item.applySysName },
+        numberType: item.numberType,
+        symbolType: item.symbolType,
         valueDesc: item.valueDesc,
         valueUnit: item.valueUnit,
       });
@@ -97,6 +100,24 @@ export default ({ visible, onCancel, item, onRefresh }: Props) => {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item initialValue={1} name="numberType" label="数据类型" rules={[{ required: true, message: "数据类型不能为空" }]}>
+          <Radio.Group>
+            {[1, 2].map((t) => (
+              <Radio key={`nt-${t}`} value={t}>
+                {NumberTypeEnum[t]}
+              </Radio>
+            ))}
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item initialValue={1} name="symbolType" label="运算符类型" rules={[{ required: true, message: "运算符类型不能为空" }]}>
+          <Radio.Group>
+            {[1, 2].map((t) => (
+              <Radio key={`st-${t}`} value={t}>
+                {SymbolDescEnum[t]}
+              </Radio>
+            ))}
+          </Radio.Group>
+        </Form.Item>
         <Form.Item name="valueDesc" label="干预阀值描述" rules={[{ required: true, message: "干预阀值描述不能为空" }]}>
           <Input placeholder="请输入干预阀值描述" />
         </Form.Item>
diff --git a/src/pages/backlog/InterventionSetting/index.tsx b/src/pages/backlog/InterventionSetting/index.tsx
index 61b41a4..d931d3a 100644
--- a/src/pages/backlog/InterventionSetting/index.tsx
+++ b/src/pages/backlog/InterventionSetting/index.tsx
@@ -7,6 +7,7 @@ import debounce from "lodash/debounce";
 import usePagination from "@/hooks/usePagination";
 import { systemListApi } from "@/pages/admin/Privilege/api";
 import CreateModal from "./components/CreateModal";
+import { NumberTypeEnum, SymbolDescEnum } from "@/pages/backlog/entity";
 
 const Column = Table.Column;
 const Search = Input.Search;
@@ -63,12 +64,7 @@ export default () => {
               style={{ maxWidth: 260, marginRight: 15 }}
             />
 
-            <Select
-              allowClear
-              placeholder="归属系统"
-              style={{ width: 260, marginRight: 5 }}
-              onChange={(e: any) => _onChangeSys(e)}
-            >
+            <Select allowClear placeholder="归属系统" style={{ width: 260, marginRight: 5 }} onChange={(e: any) => _onChangeSys(e)}>
               {syslist.map((item) => (
                 <Select.Option value={item.id!} key={item.id}>
                   {item.sysName}
@@ -100,6 +96,13 @@ export default () => {
               <Badge status={record.status == 0 ? "error" : "processing"} text={StatusEnum[record.status]} />
             )}
           />
+          <Column title="数据类型" dataIndex="numberType" align="center" render={(text: number, record: ListVO) => NumberTypeEnum[text]} />
+          <Column
+            title="运算符类型"
+            dataIndex="symbolType"
+            align="center"
+            render={(text: number, record: ListVO) => SymbolDescEnum[text]}
+          />
           <Column title="干预阀值描述" dataIndex="valueDesc" align="center" />
           <Column title="干预阀值单位" dataIndex="valueUnit" align="center" />
 
@@ -117,11 +120,7 @@ export default () => {
                 >
                   编辑
                 </Button>
-                <Popconfirm
-                  placement="top"
-                  title={`确认${row.status == 0 ? "启用" : "禁用"}?`}
-                  onConfirm={() => switchDisable(row)}
-                >
+                <Popconfirm placement="top" title={`确认${row.status == 0 ? "启用" : "禁用"}?`} onConfirm={() => switchDisable(row)}>
                   <Button danger={row.status == 1} type="link">
                     {row.status == 0 ? "启用" : "禁用"}
                   </Button>
diff --git a/src/pages/backlog/OverIntervention/components/EditModal.tsx b/src/pages/backlog/OverIntervention/components/EditModal.tsx
index 065851f..6d302cd 100644
--- a/src/pages/backlog/OverIntervention/components/EditModal.tsx
+++ b/src/pages/backlog/OverIntervention/components/EditModal.tsx
@@ -61,7 +61,7 @@ export default ({ visible, onCancel, item, onRefresh }: Props) => {
 
   return (
     <Modal
-      visible={visible}
+      open={visible}
       onCancel={onCancel}
       onOk={form.submit}
       title={item?.id ? "编辑超时干预" : "新增超时干预"}
diff --git a/src/pages/backlog/OverIntervention/components/SettingList.tsx b/src/pages/backlog/OverIntervention/components/SettingList.tsx
index e4f99b1..fc99d64 100644
--- a/src/pages/backlog/OverIntervention/components/SettingList.tsx
+++ b/src/pages/backlog/OverIntervention/components/SettingList.tsx
@@ -83,7 +83,7 @@ export default ({ value = [], onChange, saveLoading, disabled }: Props) => {
           />
         ) : null}
       </Table>
-      <Modal visible={visible} onCancel={closeModal} onOk={form.submit} title="干预设置">
+      <Modal open={visible} onCancel={closeModal} onOk={form.submit} title="干预设置">
         <Form form={form} onFinish={handleSave} wrapperCol={{ span: 18 }} labelCol={{ span: 6 }}>
           <Form.Item hidden name="index" label="index" rules={[{ required: false }]}>
             <Input />
diff --git a/src/pages/backlog/OverIntervention/components/SettingModal.tsx b/src/pages/backlog/OverIntervention/components/SettingModal.tsx
index ff2ba74..1ab6c6c 100644
--- a/src/pages/backlog/OverIntervention/components/SettingModal.tsx
+++ b/src/pages/backlog/OverIntervention/components/SettingModal.tsx
@@ -23,14 +23,7 @@ export default ({ visible, onCancel, id }: Props) => {
   }, [visible]);
 
   return (
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      cancelButtonProps={{ hidden: true }}
-      onOk={onCancel}
-      title="待办超时干预条件"
-      width="55%"
-    >
+    <Modal open={visible} onCancel={onCancel} cancelButtonProps={{ hidden: true }} onOk={onCancel} title="待办超时干预条件" width="55%">
       <Skeleton active loading={loading}>
         <SettingList disabled value={data || []} />
       </Skeleton>
diff --git a/src/pages/backlog/entity.ts b/src/pages/backlog/entity.ts
new file mode 100644
index 0000000..0ec9b13
--- /dev/null
+++ b/src/pages/backlog/entity.ts
@@ -0,0 +1,8 @@
+export enum NumberTypeEnum {
+  "整数" = 1,
+  "小数" = 2,
+}
+export enum SymbolDescEnum {
+  "≥" = 1,
+  "≤" = 2,
+}
\ No newline at end of file
--
libgit2 0.22.2