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/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/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/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, "下载文件");
     }