内测bug修复

jsconfig.json

@@ -3,7 +3,8 @@
     "baseUrl": "src",
     "paths": {
       "~/*": ["*"]
-    }
+    },
+    "jsx": "react"
   },
   "include": ["src"]
 }

package.json

@@ -32,7 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.2.10"
+    "zy-react-library": "^1.2.14"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/pages/Container/Supervision/EvaluationTeamConfig/List/index.js

@@ -195,7 +195,11 @@ const ConfigModalComponent = (props) => {
     corpinfoId && getData();
   }, []);
   const onSubmit = async (values) => {
-    await isExistenceDuplicateSelection({ data: values.updateCmdList, key: "userId", message: "考评人员存在重复项，请勿重复选择" });
+    await isExistenceDuplicateSelection({
+      data: values.updateCmdList,
+      key: "userId",
+      message: "考评人员存在重复项，请勿重复选择",
+    });
     const { success } = await props["evaluationTeamConfigUpdate"]({
       ...values,
       corpinfoId,
@@ -410,22 +414,14 @@ const ViewModalComponent = (props) => {
 const ChangeLogModalComponent = (props) => {
   const corpinfoId = props.data.corpinfoId;
 
-  const [list, setList] = useState([]);
+  const { tableProps } = useTable(props["evaluationTeamConfigChangeLog"], {
-
+    params: { corpinfoId },
-  const getData = async () => {
+    useStorageQueryCriteria: false,
-    const { data } = await props["evaluationTeamConfigChangeLog"]({
-      corpinfoId,
   });
-    setList(data);
-  };
-
-  useEffect(() => {
-    getData();
-  }, []);
 
   return (
     <Modal
-      title="查看"
+      title="变更记录"
       width={1200}
       open
       onCancel={props.onCancel}
@@ -434,17 +430,27 @@ const ChangeLogModalComponent = (props) => {
         <Button key="back" onClick={props.onCancel}>关闭</Button>,
       ]}
     >
-      <Descriptions
+      <Table
-        column={3}
+        columns={[
-        bordered
+          {
-        styles={{ label: { width: 100 }, content: { width: 100 } }}
+            title: "隐患考评组类型",
-        items={[
+            dataIndex: "evaluationType",
-          ...list.flatMap(item => ([
+            render: (_, record) => getLabelName({ list: EVALUATION_TYPE_ENUM, status: record.evaluationType }),
-            { label: "隐患考评组类型", children: getLabelName({ list: EVALUATION_TYPE_ENUM, status: item.evaluationType }) },
+          },
-            { label: "变更前", children: `${item.oldDepartmentName || ""}-${item.oldUserName || ""}` },
+          {
-            { label: "变更后", children: `${item.newDepartmentName || ""}-${item.newUserName || ""}` },
+            title: "变更前",
-          ])),
+            dataIndex: "oldDepartmentName",
+            render: (_, record) => `${record.oldDepartmentName || ""}-${record.oldUserName || ""}`,
+          },
+          {
+            title: "变更后",
+            dataIndex: "newDepartmentName",
+            render: (_, record) => `${record.newDepartmentName || ""}-${record.newUserName || ""}`,
+          },
         ]}
+        options={false}
+        disabledResizer={true}
+        {...tableProps}
       />
     </Modal>
   );

src/pages/Container/Supervision/HiddenEvaluation/List/index.js

@@ -60,6 +60,11 @@ function List(props) {
             dataIndex: "fireCheckEvalCount",
             render: (_, record) => (`${record.fireCheckEvalCount}/${record.fireCheckTotalCount}`),
           },
+          {
+            title: "视频巡屏",
+            dataIndex: "videoPatrolEvalCount",
+            render: (_, record) => (`${record.videoPatrolEvalCount}/${record.videoPatrolTotalCount}`),
+          },
           { title: "考评组成员", dataIndex: "evaluationMembers" },
           {
             title: "操作",