Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/pages/check/components/LocTable.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import useBool from '@/utils/hooks/useBool';
 import { Table, Space, Button, Row, Col, Card } from 'antd';
-import { getTaCheckItem } from '@/service/tacheckitem';
+import { getTaCheckItem, exportTaCheckItem } from '@/service/tacheckitem';
 import QuList from './QuList';
 import LocForm from './LocForm';
 import styles from './style.module.less';
@@ -14,6 +14,7 @@ export default (props) => {
   const [curItem, setCurItem] = React.useState();
   const [loading, startLoading, stopLoading] = useBool();
   const [open, setOpen] = React.useState(false);
+  const [expLoading, startExpLoading, stopExpLoading] = useBool();
 
   const columns = [
     {
@@ -107,6 +108,15 @@ export default (props) => {
     setOpen(true);
   }
 
+  const onExport = () => {
+    startExpLoading();
+    exportTaCheckItem(checkId).then(() => {
+      stopExpLoading();
+    }).catch(() => {
+      stopExpLoading();
+    });
+  }
+
   const onChange = (item) => {
     const newList = list.map(x => x.itemId === item.itemId ? item : x);
     setList(newList);
@@ -130,7 +140,7 @@ export default (props) => {
   return (
     <Row gutter={24}>
       <Col span={12}>
-        <Card>
+        <Card extra={<Button loading={expLoading} type="primary" onClick={onExport}>导出</Button>}>
           <Table
             sticky
             summary={() => (

src/pages/check/components/QuForm.jsx

@@ -130,7 +130,7 @@ export default (props) => {
           />
         </Col>
         <Col span={6}>
-          {/* <ProFormSelect
+          <ProFormSelect
             initialValue={'+'}
             name="computeType"
             label="计分方式"
@@ -147,7 +147,7 @@ export default (props) => {
                 message: '请选择计分方式',
               },
             ]}
-          /> */}
+          />
         </Col>
         <Col span={6}>
           <ProFormDigit
@@ -255,8 +255,8 @@ export default (props) => {
                       <ProFormDigit
                         name="score"
                         label="计分"
-                        min={0}
                         help="计分"
+                        min={-999}
                         fieldProps={{ precision: 2 }}
                       />
                     </Col>

src/pages/check/components/QuList.jsx

@@ -13,7 +13,8 @@ export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
 
   const totalScore = React.useMemo(() => {
-    return list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0);
+    const s = list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0);
+    return Number(s || 0).toFixed(2);
   }, [list]);
 
   const columns = [

src/pages/check/components/SurveyForm.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Button, Tabs, Form, Space } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
-import { ModalForm, ProFormDigit, ProFormDependency } from '@ant-design/pro-components';
+import { ModalForm, ProFormDigit, ProFormText } from '@ant-design/pro-components';
 import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
 
 const itemType = 'survey';
@@ -86,6 +86,7 @@ const SurveyForm = (props) => {
       )}
     >
       <ProFormDigit label="预收数量" name="num" min={1} fieldProps={{precision: 0}} />
+      <ProFormText label="文明用语" name="cultureTerm"  fieldProps={{precision: 0}} />
     </ModalForm>
   )
 }

src/pages/check/index.jsx

@@ -94,11 +94,14 @@ export default (props) => {
       dataIndex: "surveyScore",
       hideInSearch: true,
       render: (_, row) => {
+        const num = row.surveyNum || 0;
+        if (num === 0) return '-';
+
         const origin = row.surveyScore || 0;
         const percent = row.surveyScorePercent || 0;
-        const score = Number(origin * percent).toFixed(2);
+        const score = Number(origin / num * percent).toFixed(2);
 
-        return `${origin} * ${percent * 100}% = ${score}`;
+        return `${origin} / ${num} * ${percent * 100}% = ${score}`;
       },
     },
     {

src/pages/checkAnswer/survey/index.jsx

@@ -1,18 +1,21 @@
-import React from 'react';
-import Page from '@/components/Page';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import React from "react";
+import Page from "@/components/Page";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import { queryTable, queryDict } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 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';
+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 getCheck = queryDict(getTaCheck, {
+  labelKey: "title",
+  valueKey: "checkId",
+});
 const getAnswer = queryTable(getTaCheckAnswer);
 
-const addOnParams = { itemType: 'survey' };
+const addOnParams = { itemType: "survey" };
 
 export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
@@ -20,36 +23,36 @@ export default (props) => {
   const [notificationApi, contextHolder] = notification.useNotification();
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
-  
+
   const initialValues = React.useMemo(() => {
-    const checkId = searchParams.get('checkId');
-  
+    const checkId = searchParams.get("checkId");
+
     return {
       checkId,
-    }
+    };
   }, []);
 
   const goToDetail = (row) => {
-    navigate(`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`)
-  }
+    navigate(
+      `/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`
+    );
+  };
 
   const columns = [
     {
       title: "模拟测评",
       dataIndex: "checkId",
-      valueType: 'select',
+      valueType: "select",
       request: getCheck,
       hideInTable: true,
       formItemProps: {
-        rules: [
-          { required: true, message: '请选择模拟测评' }
-        ]
-      }
+        rules: [{ required: true, message: "请选择模拟测评" }],
+      },
     },
     {
       title: "答题时间",
       dataIndex: "createDate",
-      valueType: 'date',
+      valueType: "date",
       hideInSearch: true,
     },
     {
@@ -80,38 +83,45 @@ export default (props) => {
       hideInSearch: true,
     },
     {
-      title: '操作',
+      title: "操作",
       hideInSearch: true,
-      key: 'options',
+      key: "options",
       render: (_, row) => {
         return (
+          // <a target="_blank" onClick={(row, e) => jumpPage(row, e)}>
+          //   详情
+          // </a>
           <TargetLink to={`/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`}>详情</TargetLink>
-        )
-      }
-    }
-  ]
-
+        );
+      },
+    },
+  ];
+  const jumpPage = (row, e) => {
+    e.target.href = `/checkAnswer/survey/detail?answerId=${row.answerId}&itemType=survey`;
+  };
   const beforeSearchSubmit = (params) => {
     paramsRef.current = params;
     return params;
-  }
+  };
 
   const onExport = () => {
     if (!paramsRef.current) {
-      notificationApi.warning({ message: '请先进行条件查询' });
-      return
+      notificationApi.warning({ message: "请先进行条件查询" });
+      return;
     }
 
     startLoading();
     exportTaCheckAnswer({
       ...paramsRef.current,
       ...addOnParams,
-    }).then(() => {
-      stopLoading();
-    }).catch(() => {
-      stopLoading();
-    });
-  }
+    })
+      .then(() => {
+        stopLoading();
+      })
+      .catch(() => {
+        stopLoading();
+      });
+  };
 
   return (
     <Page>
@@ -125,16 +135,11 @@ export default (props) => {
         beforeSearchSubmit={beforeSearchSubmit}
         form={{ ignoreRules: false, initialValues }}
         toolBarRender={() => [
-          <Button
-            key="1"
-            type="primary"
-            loading={loading}
-            onClick={onExport}
-          >
+          <Button key="1" type="primary" loading={loading} onClick={onExport}>
             导出
           </Button>,
         ]}
       />
     </Page>
-  )
-}
+  );
+};

src/pages/issue/detail/components/BasicProfile.jsx

@@ -1,61 +1,63 @@
-import React from 'react';
-import { Card, Descriptions, Badge } from 'antd';
-import dayjs from 'dayjs';
-import useBool from '@/utils/hooks/useBool';
-import { getTaIssueById } from '@/service/taissue';
-import { getSysOrgById } from '@/service/sysorg';
-import { processStatus } from '@/utils/biz';
-import AttachList from './AttachList';
+import React from "react";
+import { Card, Descriptions, Badge } from "antd";
+import dayjs from "dayjs";
+import useBool from "@/utils/hooks/useBool";
+import { getTaIssueById } from "@/service/taissue";
+import { getSysOrgById } from "@/service/sysorg";
+import { processStatus } from "@/utils/biz";
+import AttachList from "./AttachList";
 
-const yestoday = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
-const fmDate = dt => !dt ? '-' : dayjs(dt).format('YYYY-MM-DD');
-const fmDateTime = dt => !dt ? '-' : dayjs(dt).format('YYYY-MM-DD HH:mm:ss');
-const getStatusLabel = val => (processStatus.filter(x => x.value == val)[0])?.label;
+const yestoday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
+const fmDate = (dt) => (!dt ? "-" : dayjs(dt).format("YYYY-MM-DD"));
+const fmDateTime = (dt) =>
+  !dt ? "-" : dayjs(dt).format("YYYY-MM-DD HH:mm:ss");
+const getStatusLabel = (val) =>
+  processStatus.filter((x) => x.value == val)[0]?.label;
 
 export default (props) => {
-
   const { issueId, onIssueChange } = props;
 
   const [loading, startLoading, stopLoading] = useBool();
   const [detail, setDetail] = React.useState();
 
-  const [
-    isExpire,
-    status,
-  ] = React.useMemo(() => {
+  const [isExpire, status] = React.useMemo(() => {
     if (!detail) return [];
     return [
-      detail.processNode != '03' && yestoday > detail.expireDate,
-      processStatus.filter(x => x.value == detail.processNode)[0],
-    ]
+      detail.processNode != "03" && yestoday > detail.expireDate,
+      processStatus.filter((x) => x.value == detail.processNode)[0],
+    ];
   }, [detail]);
 
   React.useEffect(() => {
     if (issueId) {
       startLoading();
-      getTaIssueById(issueId).then((res) => {
-        if (onIssueChange) {
-          onIssueChange(res);
-        }
+      getTaIssueById(issueId)
+        .then((res) => {
+          if (onIssueChange) {
+            onIssueChange(res);
+          }
 
-        if (res.orgId) {
-          getSysOrgById(res.orgId).then(r => {
-            stopLoading();
-            setDetail({
-              ...res,
-              orgName: r.name
-            });
-          }).catch(() => {
+          if (res.orgId) {
+            getSysOrgById(res.orgId)
+              .then((r) => {
+                stopLoading();
+                setDetail({
+                  ...res,
+                  orgName: r.name,
+                });
+              })
+              .catch(() => {
+                stopLoading();
+                setDetail(res);
+              });
+          } else {
             stopLoading();
             setDetail(res);
-          });
-        } else {
+          }
+        })
+        .catch((er) => {
           stopLoading();
-          setDetail(res);
-        }
-      }).catch(er => {
-        stopLoading();
-      });
+        });
     }
   }, [issueId]);
   return (
@@ -63,18 +65,41 @@ export default (props) => {
       <Descriptions layout="vertical" column={3} bordered>
         <Descriptions.Item label="点位">{detail?.locName}</Descriptions.Item>
         <Descriptions.Item label="地址">{detail?.addr}</Descriptions.Item>
-        <Descriptions.Item label="上报时间">{fmDate(detail?.createDate)}</Descriptions.Item>
+        <Descriptions.Item label="上报时间">
+          {fmDate(detail?.createDate)}
+        </Descriptions.Item>
         <Descriptions.Item label="上报人">{detail?.userName}</Descriptions.Item>
-        <Descriptions.Item label="问题类型">{detail?.typeName}</Descriptions.Item>
+        <Descriptions.Item label="问题类型">
+          {detail?.typeName}
+        </Descriptions.Item>
+        <Descriptions.Item label="问题来源">
+          {detail?.sourceType == "check"
+            ? "实地检测"
+            : detail?.sourceType == "feedback"
+            ? "市民上报"
+            : detail?.sourceType == "inspector"
+            ? "日常督查"
+            : ""}
+        </Descriptions.Item>
         <Descriptions.Item label="流程状态">
-          {
-            isExpire ? <Badge status="error" text="已逾期" /> : <Badge status={status?.badge} text={status?.label} />
-          }
+          {isExpire ? (
+            <Badge status="error" text="已逾期" />
+          ) : (
+            <Badge status={status?.badge} text={status?.label} />
+          )}
+        </Descriptions.Item>
+        <Descriptions.Item label="截止日期">
+          {fmDate(detail?.expireDate)}
+        </Descriptions.Item>
+        <Descriptions.Item label="责任单位" span={2}>
+          {detail?.orgName}
+        </Descriptions.Item>
+        <Descriptions.Item label="办结时间">
+          {fmDateTime(detail?.endDate)}
+        </Descriptions.Item>
+        <Descriptions.Item label="交办次数" span={2}>
+          {detail?.processNum}
         </Descriptions.Item>
-        <Descriptions.Item label="截止日期">{fmDate(detail?.expireDate)}</Descriptions.Item>
-        <Descriptions.Item label="责任单位" span={2}>{detail?.orgName}</Descriptions.Item>
-        <Descriptions.Item label="办结时间">{fmDateTime(detail?.endDate)}</Descriptions.Item>
-        <Descriptions.Item label="交办次数" span={2}>{detail?.processNum}</Descriptions.Item>
         <Descriptions.Item label="问题描述" span={3}>
           <div dangerouslySetInnerHTML={{ __html: detail?.content }}></div>
         </Descriptions.Item>
@@ -83,5 +108,5 @@ export default (props) => {
         </Descriptions.Item>
       </Descriptions>
     </Card>
-  )
-}
+  );
+};

src/pages/issue/index.jsx

@@ -1,6 +1,6 @@
 // 此页面包含两个接口  后端需要注意
 import React from "react";
-import { Button, Badge } from "antd";
+import { Button, Badge, Popconfirm } from "antd";
 import { useNavigate } from "react-router-dom";
 import List from "@/components/Page/List";
 import {
@@ -8,6 +8,7 @@ import {
   getTaOrgIssue,
   exportTaIssue,
   exportTaOrgIssue,
+  deleteTaOrgIssue,
 } from "@/service/taissue";
 import { getTdIssueType } from "@/service/tdissuetype";
 
@@ -32,6 +33,8 @@ const getTdList = queryDict(getTdIssueType, {
 
 const yestoday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
 export default (props) => {
+  const issueIdRef = React.useRef();
+
   const [loading, startLoading, stopLoading] = useBool();
   const [loading1, startLoading1, stopLoading1] = useBool();
   const navigate = useNavigate();
@@ -59,6 +62,23 @@ export default (props) => {
         return <span>{row.typeName}</span>;
       },
     },
+    {
+      title: "问题来源",
+      dataIndex: "sourceType",
+      valueType: "select",
+      valueEnum: {
+        check: "实地测评",
+        feedback: "市民上报",
+        inspector: "日常督查",
+      },
+      search: {
+        transform: (value) => {
+          return {
+            'sourceType2': value,
+          };
+        },
+      },
+    },
     {
       title: "创建时间",
       dataIndex: "createdAt",
@@ -141,7 +161,6 @@ export default (props) => {
     {
       title: "上报人",
       dataIndex: "userName",
-      // hideInSearch: true,
     },
     {
       title: "办结时间",
@@ -186,16 +205,36 @@ export default (props) => {
     };
     return params;
   };
-
+  const handleDelete = (row) => {
+    deleteTaOrgIssue(row.issueId).then(() => {
+      issueIdRef.current.reload();
+    });
+  };
   return (
     <List
+      ref={issueIdRef}
       rowKey="issueId"
       request={request}
       columns={columns}
       params={params}
       beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
-        <TargetLink key="detail" to={`/issue/detail?id=${row.issueId}`}>详情</TargetLink>,
+        <>
+          <TargetLink key="detail" to={`/issue/detail?id=${row.issueId}`}>
+            详情
+          </TargetLink>
+          <Popconfirm
+            key="delete"
+            title="您是否确认删除 ?"
+            onConfirm={() => handleDelete(row)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button style={{ padding: 0 }} danger type="link">
+              删除
+            </Button>
+          </Popconfirm>
+        </>,
       ]}
       toolBarRender={() => [
         <Button key="1" type="primary" loading={loading} onClick={onExport}>

src/service/tacheckitem.js

@@ -32,4 +32,7 @@ export const deleteTaCheckItem = (id) => request(`/api/taCheckItem/${id}`, { met
  * @param {*} typeId 
  * @returns 
  */
-export const getByCheckId = (checkId, typeId) => request(`/api/taCheck/${checkId}/item/${typeId}`)
+export const getByCheckId = (checkId, typeId) => request(`/api/taCheck/${checkId}/item/${typeId}`)
+
+
+export const exportTaCheckItem = (checkId) => request(`/api/taCheck/${checkId}/loc/export`, { method: 'post', download: true });

src/service/taissue.js

@@ -34,6 +34,8 @@ export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+export const deleteTaOrgIssue = (id) => request(`/api/taOrgIssue/${id}`, { method: 'delete' });
+
 
 /*
  * 导出

src/utils/request.js

@@ -52,7 +52,7 @@ instance.interceptors.response.use(
 
     const { data, config } = response;
 
-    if (config.download && !data.code) {
+    if (config.download && !data?.code) {
       return downloadBlob(response, "下载文件");
     }