feats

src/components/Page/index.jsx

@@ -29,7 +29,11 @@ const Title = (props) => {
     e.preventDefault();
     e.stopPropagation();
 
-    navigate(-1);
+    if (history.length > 1) {
+      navigate(-1);
+    } else { 
+      window.close();
+    }
   }
 
   return (

src/components/TargetLink/index.jsx

@@ -0,0 +1,18 @@
+import React from 'react'
+
+export default (props) => {
+
+  const { to, route = 'hash' } = props;
+
+  const href = React.useMemo(() => {
+    if (route === 'hash') {
+      const prefix = window.location.href.replace(/#.*$/, '');
+      return `${prefix}#${to}`;
+    }
+    return to;
+  }, [route, to]);
+
+  return (
+    <a target="_blank" href={href}>{props.children}</a>
+  )
+}

src/pages/check/Edit.jsx

@@ -32,7 +32,6 @@ export default (props) => {
     }
   }, [id]);
 
-  console.log('-----survey----->', survey);
   return (
     <Page back>
       <CheckForm

src/pages/check/components/LocForm.jsx

@@ -8,8 +8,8 @@ import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
 const LocForm = (props) => {
   const { checkItem, open, onOpenChange, onChange, itemId, checkId } = props;
 
-  const [loading, startLoading, stopLoading] = useBool();
-  const [list, setList] = React.useState();
+  // const [loading, startLoading, stopLoading] = useBool();
+  // const [list, setList] = React.useState();
   // const [listData, setListData] = React.useState();
 
   const [form] = Form.useForm();
@@ -34,35 +34,18 @@ const LocForm = (props) => {
     }
   }, [checkItem]);
 
-  React.useEffect(() => {
-    if (itemId) {
-      startLoading();
-      getTaCheckItemQu({ pageSize: 500, itemId }).then((res) => {
-        stopLoading();
-        setList(...res.records);
-      }).catch(() => {
-        stopLoading();
-      });
-    }
-  }, [itemId]);
-
   // React.useEffect(() => {
-  //   if (checkId) {
+  //   if (itemId) {
   //     startLoading();
-  //     getTaCheckItem({ pageSize: 500, checkId, itemType: "loc" }).then(res => {
-  //       setListData(...res.records || []);
+  //     getTaCheckItemQu({ pageSize: 500, itemId }).then((res) => {
   //       stopLoading();
+  //       setList(...res.records);
   //     }).catch(() => {
   //       stopLoading();
   //     });
   //   }
-  // }, [checkId]);
-
-
+  // }, [itemId]);
 
-  // console.log('list?.maxScore', list?.maxScore);
-  // console.log('checkItem?.answerNum', checkItem?.answerNum);
-  // console.log('list?.maxScore / checkItem?.answerNum', list?.maxScore / checkItem?.answerNum);
   return (
     <ModalForm
       title={`${checkItem?.name} 维护`}
@@ -72,11 +55,11 @@ const LocForm = (props) => {
       onFinish={onFinish}
       onOpenChange={onOpenChange}
     >
-      <ProFormDigit readonly label="分值" value={checkItem?.answerNum == 0 ? 0 : list?.maxScore / checkItem?.answerNum} />
+      <ProFormDigit readonly label="分值" name="fullScore" value={checkItem?.fullScore || 0} />
       <ProFormDigit label="数量" name="num" min={1} fieldProps={{ precision: 0 }} />
       <ProFormDependency name={['fullScore', 'num']}>
         {
-          ({ fullScore, num }) => <ProFormDigit readonly label="小计" value={fullScore / num} fieldProps={{ precision: 2 }} />
+          ({ fullScore, num }) => <ProFormDigit readonly label="小计" value={fullScore * num} fieldProps={{ precision: 2 }} />
         }
       </ProFormDependency>
     </ModalForm>

src/pages/check/components/LocTable.jsx

@@ -15,14 +15,6 @@ export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
   const [open, setOpen] = React.useState(false);
 
-  const onEdit = (row) => {
-    // console.log('________________________>', row);
-    setCurItem(row);
-    setOpen(true);
-  }
-
-
-
   const columns = [
     {
       title: '点位名称',
@@ -53,7 +45,7 @@ export default (props) => {
       title: '小计',
       dataIndex: 'fullScore',
       key: 'fullScore',
-      render: (_, row) => row.fullScore ? Number(row.fullScore * (row.num || 1)).toFixed(2) : '-',
+      render: (_, row) => row.fullScore ? Number(row.fullScore * (row.num || 0)).toFixed(2) : '-',
     },
     {
       title: '测评得分',
@@ -74,19 +66,31 @@ export default (props) => {
     },
   ]
 
-  const onChange = (item) => {
-    const newList = list.map(x => x.itemId === item.itemId ? item : x);
-    setList(newList);
-  }
+  const summary = React.useMemo(() => {
+    let fullScore = 0;
+    let answerNum = 0;
+    let num = 0;
+    let score = 0;
+    let subtotal = 0;
 
-  const getRowClassName = (row) => {
-    return [
-      styles['yz-table-row'],
-      (row.itemId == curItem?.itemId) ? styles.active : false,
-    ].filter(Boolean).join(' ');
-  }
+    list.forEach((x) => {
+      fullScore += (x.fullScore || 0);
+      answerNum += (x.answerNum || 0);
+      num += (x.num || 0);
+      score += (x.score || 0);
+      subtotal += (x.fullScore || 0) * (x.num || 0);
+    });
 
-  React.useEffect(() => {
+    return {
+      fullScore,
+      answerNum,
+      num,
+      score,
+      subtotal: Number(subtotal).toFixed(2),
+    }
+  }, [list]);
+
+  const queryList = React.useCallback(() => {
     if (checkId) {
       startLoading();
       getTaCheckItem({ pageSize: 500, checkId, itemType: "loc" }).then(res => {
@@ -98,7 +102,30 @@ export default (props) => {
     }
   }, [checkId]);
 
-  // console.log('---------------------------------------------------------->', list?.map((x) => Number(x.fullScore / (x.num || 1)).toFixed(2)))
+  const onEdit = (row) => {
+    setCurItem(row);
+    setOpen(true);
+  }
+
+  const onChange = (item) => {
+    const newList = list.map(x => x.itemId === item.itemId ? item : x);
+    setList(newList);
+  }
+
+  const onQuChange = () => {
+    queryList();
+  }
+
+  const getRowClassName = (row) => {
+    return [
+      styles['yz-table-row'],
+      (row.itemId == curItem?.itemId) ? styles.active : false,
+    ].filter(Boolean).join(' ');
+  }
+
+  React.useEffect(() => {
+    queryList();
+  }, [queryList]);
 
   return (
     <Row gutter={24}>
@@ -107,15 +134,13 @@ export default (props) => {
           <Table
             sticky
             summary={() => (
-              <Table.Summary>
+              <Table.Summary fixed="top">
                 <Table.Summary.Row style={{ fontWeight: 'bolder' }}>
                   <Table.Summary.Cell index={0}>合计</Table.Summary.Cell>
-                  <Table.Summary.Cell index={1}>{list?.map((x) => x.fullScore).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
-                  <Table.Summary.Cell index={2}>
-                    {list?.map((x) => x.answerNum).reduce((total, num) => total + num, 0)} / {list?.map((x) => x.num).reduce((total, num) => total + num, 0)}
-                  </Table.Summary.Cell>
-                  <Table.Summary.Cell index={3}>{list?.map((x) => Number(x.fullScore * (x.num || 1))).reduce((total, num) => total + num, 0).toFixed(2)}</Table.Summary.Cell>
-                  <Table.Summary.Cell index={4}>{list?.map((x) => x.score).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={1}>{summary.fullScore}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={2}>{`${summary.answerNum} / ${summary.num}`}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={3}>{summary.subtotal}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={4}>{summary.score}</Table.Summary.Cell>
                 </Table.Summary.Row>
               </Table.Summary>
             )}
@@ -140,7 +165,7 @@ export default (props) => {
         </Card>
       </Col>
       <Col span={12}>
-        <QuList itemId={curItem?.itemId} />
+        <QuList itemId={curItem?.itemId} onChange={onQuChange} />
       </Col>
     </Row>
   )

src/pages/check/components/QuForm.jsx

@@ -47,12 +47,12 @@ export default (props) => {
   }
 
   React.useEffect(() => {
-    if (quInfo) {
-      form.setFieldsValue(quInfo);
-    } else {
+    if (!open || !quInfo) {
       form.resetFields();
+    } else {
+      form.setFieldsValue(quInfo);
     }
-  }, [quInfo]);
+  }, [quInfo, open]);
 
   // console.log('value', value);
   return (

src/pages/check/components/QuList.jsx

@@ -5,13 +5,17 @@ import { getTaCheckItemQu, deleteTaCheckItemQu } from '@/service/tacheckitemqu';
 import QuForm from './QuForm';
 
 export default (props) => {
-  const { itemId, itemType = 'loc' } = props;
+  const { itemId, itemType = 'loc', onChange } = props;
 
   const [open, setOpen] = React.useState(false);
   const [list, setList] = React.useState([]);
   const [curItem, setCurItem] = React.useState();
   const [loading, startLoading, stopLoading] = useBool();
 
+  const totalScore = React.useMemo(() => {
+    return list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0);
+  }, [list]);
+
   const columns = [
     {
       title: '序号',
@@ -93,6 +97,10 @@ export default (props) => {
     }
 
     setList(newList);
+
+    if (onChange) {
+      onChange();
+    }
   }
 
   React.useEffect(() => {
@@ -109,7 +117,7 @@ export default (props) => {
 
   return (
     <Card
-      title="试题列表"
+      title={`试题列表 (总分 ${totalScore})`}
       extra={
         itemType == 'loc' ?
           <Button type="link" disabled={!itemId} onClick={onAdd}>新增</Button> :
@@ -117,17 +125,6 @@ export default (props) => {
       }
     >
       <Table
-        // sticky
-        // summary={() => (
-        //   <Table.Summary>
-        //     <Table.Summary.Row style={{ fontWeight: 'bolder' }}>
-        //       <Table.Summary.Cell index={0}>合计</Table.Summary.Cell>
-        //       <Table.Summary.Cell index={1}>1</Table.Summary.Cell>
-        //       <Table.Summary.Cell index={2}>{list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
-        //     </Table.Summary.Row>
-        //   </Table.Summary>
-        // )}
-        title={() => (<div style={{ fontWeight: 'bolder' }}>分值合计:{list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0)}</div>)}
         bordered
         rowKey="quId"
         loading={loading}

src/pages/checkAnswer/loc/index.jsx

@@ -8,6 +8,7 @@ import { getTaCheck } from '@/service/tacheck';
 import { getTdLocType } from '@/service/tdloctype';
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
+import TargetLink from '@/components/TargetLink';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
 const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
@@ -83,7 +84,7 @@ export default (props) => {
       key: 'options',
       render: (_, row) => {
         return (
-          <Button type="link" onClick={() => goToDetail(row)}>详情</Button>
+          <TargetLink to={`/checkAnswer/loc/detail?answerId=${row.answerId}&itemType=loc`}>详情</TargetLink>
         )
       }
     }

src/pages/checkAnswer/survey/index.jsx

@@ -7,6 +7,7 @@ import { Button, notification } from "antd";
 import { getTaCheck } from '@/service/tacheck';
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
 import useBool from '@/utils/hooks/useBool';
+import TargetLink from '@/components/TargetLink';
 
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
 const getAnswer = queryTable(getTaCheckAnswer);
@@ -84,7 +85,7 @@ export default (props) => {
       key: 'options',
       render: (_, row) => {
         return (
-          <Button type="link" onClick={() => goToDetail(row)}>详情</Button>
+          <TargetLink to={`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`}>详情</TargetLink>
         )
       }
     }

src/pages/issue/index.jsx

@@ -18,6 +18,7 @@ import { processEnum, processStatus } from "@/utils/biz";
 import useBool from "@/utils/hooks/useBool";
 import useOrgResponsible from "@/utils/hooks/useOrgResponsible";
 import dayjs from "dayjs";
+import TargetLink from "@/components/TargetLink";
 
 const queryOrg = queryDict(getSysOrg, { labelKey: "name", valueKey: "orgId" });
 const queryLocType = queryDict(getTdLocType, {
@@ -194,13 +195,7 @@ export default (props) => {
       params={params}
       beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
-        <Button
-          key="detail"
-          type="link"
-          onClick={() => navigate(`/issue/detail?id=${row.issueId}`)}
-        >
-          详情
-        </Button>,
+        <TargetLink key="detail" to={`/issue/detail?id=${row.issueId}`}>详情</TargetLink>,
       ]}
       toolBarRender={() => [
         <Button key="1" type="primary" loading={loading} onClick={onExport}>