Merge branch 'dev' of http://git.ycjcjy.com/jgz/admin into dev

src/components/evaluateItem/index.jsx

@@ -0,0 +1,22 @@
+import React, { useState, useEffect } from "react";
+import { Radio } from "antd";
+function MyEditor(props) {
+  const {
+    // value,
+    // onChange = (e) => {},
+    options = [
+      { value: 2, label: "优" },
+      { value: 1, label: "良" },
+      { value: 0, label: "差" },
+    ],
+    ...leftProps
+  } = props;
+
+  return (
+    <>
+      <Radio.Group options={options} {...leftProps} />
+    </>
+  );
+}
+
+export default MyEditor;

src/pages/evaluate/evaluateList/addeValuate.jsx

@@ -0,0 +1,92 @@
+import { PlusOutlined } from "@ant-design/icons";
+import {
+  ModalForm,
+  ProForm,
+  ProFormDateRangePicker,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { Button, Form, message } from "antd";
+// import { getPostsFilesList, savePostsFiles } from "@/services/posts";
+import {
+  getEvaluateList,
+  saveEvaluate
+} from "@/services/evaluate";
+import EvaluateItem from "@/components/evaluateItem";
+
+export default ({ taskId, onsuccess = () => {} }) => {
+  const [form] = Form.useForm();
+
+  const onFinish = async (values) => {
+    console.log(values);
+    // await waitTime(2000);
+
+    await saveEvaluate(values);
+    onsuccess();
+    return true;
+  };
+
+  const itemList = [
+    {
+      name: "item1",
+      label: "服务质量",
+    },
+    {
+      name: "item2",
+      label: "供应住宿",
+    },
+    {
+      name: "item3",
+      label: "供应餐饮",
+    },
+    {
+      name: "item4",
+      label: "洗浴评价",
+    },
+    {
+      name: "item5",
+      label: "娱乐评价",
+    },
+    {
+      name: "item6",
+      label: "军供文化",
+    },
+  ];
+  
+  return (
+    <ModalForm
+      title="评价"
+      trigger={<Button type="primary">新增</Button>}
+      form={form}
+      // open={true}
+      layout={"horizontal"}
+      labelCol={{ span: 8 }}
+      wrapperCol={{ span: 12 }}
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => console.log("run"),
+      }}
+      initialValues={{ taskId: taskId }}
+      submitTimeout={2000}
+      onFinish={onFinish}
+    >
+      <ProFormText
+        width="md"
+        name="taskId"
+        label="任务ID"
+        readonly
+        hidden={true}
+      />
+      {itemList?.map((x) => {
+       return <ProForm.Item
+          key={x.name}
+          name={x.name}
+          label={x.label}
+          rules={[{ required: true, message: "请选择评价" }]}
+        >
+          <EvaluateItem></EvaluateItem>
+        </ProForm.Item>;
+      })}
+    </ModalForm>
+  );
+};

src/pages/evaluate/evaluateList/index.jsx

@@ -0,0 +1,103 @@
+import { getEvaluateList } from "@/services/evaluate";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { Link, useNavigate, useSearchParams } from "react-router-dom";
+
+import { Button, message, Popconfirm } from "antd";
+import moment from "moment";
+import { useRef, useState } from "react";
+import AddeValuate from "./addeValuate";
+
+const EvaluateList = (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const navigate = useNavigate();
+
+  // const [storeTypeDict, setStoreTypeDict] = useState([]);
+  const actionRef = useRef();
+  const formRef = useRef();
+
+  const  valueEnum= {
+    2: { text: "优", status: "Success" },
+    1: { text: "良", status: "Processing" },
+    0: { text: "差", status: "Default" },
+  }
+
+  const columns = [
+    // {
+    //   title: "任务ID",
+    //   dataIndex: "taskId",
+    // },
+
+    {
+      title: "服务质量",
+      dataIndex: "item1",
+      search: false,
+      valueEnum
+    },
+    {
+      title: "供应住宿",
+      dataIndex: "item2",
+      search: false,
+      valueEnum
+    },
+    {
+      title: "供应餐饮",
+      dataIndex: "item3",
+      search: false,
+      valueEnum
+    },
+    {
+      title: "洗浴评价",
+      dataIndex: "item4",
+      search: false,
+      valueEnum
+    },
+    {
+      title: "娱乐评价",
+      dataIndex: "item5",
+      search: false,
+      valueEnum
+    },
+    {
+      title: "军供文化",
+      dataIndex: "item6",
+      search: false,
+      valueEnum
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        formRef={formRef}
+        search={false}
+        params={{ taskId: id }}
+        rowKey="id"
+        toolBarRender={() => [
+          <AddeValuate
+            taskId={id}
+            key="2"
+            onsuccess={() => {
+              actionRef.current.reload();
+            }}
+          ></AddeValuate>,
+          // <Button
+          //   key="2"
+          //   type="primary"
+          //   onClick={() => {
+
+          //   }}
+          // >
+          //   新增评价
+          // </Button>,
+        ]}
+        request={queryTable(getEvaluateList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default EvaluateList;

src/pages/evaluate/index.jsx

@@ -0,0 +1,114 @@
+import {
+  deleteGuaranteeTask,
+  getGuaranteeTaskList,
+} from "@/services/guaranteeTask";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { Link, useNavigate } from "react-router-dom";
+
+import { Button, message, Popconfirm } from "antd";
+import moment from "moment";
+import { useRef, useState } from "react";
+
+const GuaranteeTaskList = (props) => {
+  const navigate = useNavigate();
+  const [isOpen, setIsOpen] = useState(false);
+  const [modalData, setModalData] = useState({});
+  // const [storeTypeDict, setStoreTypeDict] = useState([]);
+  const actionRef = useRef();
+  const formRef = useRef();
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteGuaranteeTask(id).then((res) => {
+        message.success("删除成功");
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const onCancel = () => {
+    setIsOpen(false);
+    setModalData({});
+  };
+
+  const columns = [
+    {
+      title: "保障序号",
+      dataIndex: "guaranteeNo",
+    },
+    {
+      title: "受领人",
+      dataIndex: "receiver",
+    },
+    {
+      title: "时间区间",
+      dataIndex: "dateRange",
+      valueType: "dateRange",
+      search: {
+        transform: (value) => {
+          console.log(value, value[0].valueOf(), "valuevalue");
+
+          return {
+            startDate: moment(value[0]).format("yyyy-MM-DD"),
+            endDate: moment(value[1]).format("yyyy-MM-DD"),
+          };
+        },
+      },
+    },
+    {
+      title: "保障地点",
+      dataIndex: "address",
+      search: false,
+    },
+    {
+      title: "保障人数",
+      dataIndex: "totalPersonNum",
+      search: false,
+    },
+    {
+      title: "伙食标准",
+      dataIndex: "standard",
+      search: false,
+    },
+
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/task/evaluate/list?id=${record.id}`);
+          }}
+        >
+          评价
+        </Button>,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        formRef={formRef}
+        postData={(data) => {
+          return data.map((x) => ({
+            dateRange: [x.startDate, x.endDate],
+            ...x,
+          }));
+        }}
+        rowKey="id"
+       
+        request={queryTable(getGuaranteeTaskList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default GuaranteeTaskList;

src/pages/statis/components/Filter.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Row, Col, Radio, DatePicker } from 'antd';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import locale from 'antd/es/locale/zh_CN';
+import locale from 'antd/es/date-picker/locale/zh_CN';
 
 const { RangePicker } = DatePicker;
 const radioOptions = [
@@ -11,6 +11,11 @@ const radioOptions = [
   { label: '本年', value: '3' },
 ];
 
+export const last30Days = [
+  moment().subtract(30, 'days'),
+  moment(),
+];
+
 export const yearRange = [
   moment().startOf('year'),
   moment(),
@@ -29,6 +34,7 @@ export default (props) => {
   const [radioValue, setRadioValue] = React.useState();
 
   const onChange = (val) => {
+    console.log(val);
     if (typeof props.onChange === 'function') {
       props.onChange(getStrValue(val));
     }
@@ -37,7 +43,7 @@ export default (props) => {
   const onPickerChange = val => {
     setDateRange(val);
     setRadioValue();
-    onChange(getStrValue(val));
+    onChange(val);
   }
 
   const onRadioChange = e => {
@@ -59,7 +65,7 @@ export default (props) => {
     }
     
     setDateRange(dateRange);
-    onChange(getStrValue(dateRange));
+    onChange(dateRange);
   }
 
   return (

src/pages/statis/components/Sumary.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Row, Col } from 'antd';
 import classNames from 'classnames';
+import { getSummary } from '@/services/statis';
 import icon1 from '@/assets/images/statistic/数字统计.png';
 import icon2 from '@/assets/images/statistic/接待军人总数.png';
 import icon3 from '@/assets/images/statistic/保障机构数.png';
@@ -8,33 +9,44 @@ import icon4 from '@/assets/images/statistic/设备数量.png';
 import Styles from './style.module.less';
 
 const DataCard = (props) => {
-  const { className, icon } = props;
+  const { className, icon, title, value = 0, size } = props;
 
   const cls = classNames(Styles['data-card'], className);
 
+  const valStyle = React.useMemo(() => {
+    return size ? { fontSize: size } : {}
+  }, [size]);
+
   return (
     <dl className={cls}>
-      <dt>0</dt>
-      <dd>任务总数</dd>
+      <dt style={valStyle}>{value}</dt>
+      <dd>{title}</dd>
       <img src={icon} alt="" />
     </dl>
   )
 }
 
 export default (props) => {
+  
+  const [data, setData] = React.useState({});
+
+  React.useEffect(() => {
+    getSummary().then(setData);
+  }, []);
+
   return (
     <Row gutter={props.gutter} justify="space-between">
       <Col span={6}>
-        <DataCard icon={icon1} className={Styles['bk1']} />
+        <DataCard title="任务总数" value={data.taskCount} icon={icon1} className={Styles['bk1']} />
       </Col>
       <Col span={6}>
-        <DataCard icon={icon2} className={Styles['bk2']} />
+        <DataCard title="接待军人总数" value={data.personNum} icon={icon2} className={Styles['bk2']} />
       </Col>
       <Col span={6}>
-        <DataCard icon={icon3} className={Styles['bk3']} />
+        <DataCard title="总体评价" value={data.evaValue} icon={icon3} className={Styles['bk3']} size="24px" />
       </Col>
       <Col span={6}>
-        <DataCard icon={icon4} className={Styles['bk4']} />
+        <DataCard title="设备数量" value={data.deviceNum} icon={icon4} className={Styles['bk4']} />
       </Col>
     </Row>
   )

src/pages/statis/components/Task.jsx

@@ -2,18 +2,33 @@ import React from 'react';
 import * as echarts from 'echarts/core';
 import icon from '@/assets/images/statistic/任务统计.png';
 import Chart from '@/components/chart';
+import { getTaskInfo } from '@/services/statis';
 import StatisCard from './StatisCard';
-import Filter from './Filter';
+import Filter, { last30Days, getStrValue } from './Filter';
 
+const defaultValue = getStrValue(last30Days);
 export default (props) => {
 
-  const option = getOption(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], [0, 0, 0, 0, 0, 0, 8, 9, 10, 1, 1, 6])
+  const [dateRange, setDateRange] = React.useState(defaultValue);
+  const [option, setOption] = React.useState({});
+  // const option = getOption(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], [0, 0, 0, 0, 0, 0, 8, 9, 10, 1, 1, 6])
+
+  React.useEffect(() => {
+    getTaskInfo({ startDate: dateRange[0], endDate: dateRange[1] }).then(res => {
+      const keys = res.map(x => x.dt);
+      const vals = res.map(x => x.cnt);
+
+      const opt = getOption(keys, vals);
+
+      setOption(res.length > 30 ? { ...opt, dataZoom: { height: 20, bottom: 6 } } : opt);
+    });
+  }, [dateRange]);
 
   return (
     <StatisCard
       title="任务统计"
       icon={icon}
-      extra={<Filter />}
+      extra={<Filter onChange={setDateRange} />}
     >
       <Chart option={option} style={{ height: '300px' }} />
     </StatisCard>
@@ -39,7 +54,7 @@ function getOption(xAxisData, seriesData) {
     },
     xAxis: {
       type: 'category',
-      axisLabel: axisLabel,
+      axisLabel: { ...axisLabel, rotate: 45 },
       axisLine: {
         show: true,
         lineStyle: lineStyle
@@ -57,11 +72,16 @@ function getOption(xAxisData, seriesData) {
       },
       type: 'value'
     },
+    // dataZoom: [
+    //   {
+    //     show: true,
+    //   }
+    // ],
     grid: {
       top: 20,
       left: 50,
       right: 20,
-      bottom: 50,
+      bottom: 100,
     },
     series: [
       {

src/pages/statis/components/style.module.less

@@ -14,17 +14,18 @@
 
   dt {
     font-size: 36px;
+    line-height: 55px;
   }
 
   dd {
     font-size: 16px;
+    line-height: 1.53846;
   }
 
   dt, dd {
     padding: 0;
     font-weight: 400;
     color: rgb(255, 255, 255);
-    line-height: 1.53846;
   }
 
   img {

src/routes/routes.jsx

@@ -18,6 +18,8 @@ import BasicTable from '@/pages/sample/table';
 import GuaranteeTaskList from '@/pages/guaranteeTask';
 import GuaranteeTaskEdit from '@/pages/guaranteeTask/Edit';
 import GuaranteeTaskPrint from '@/pages/guaranteeTask/print';
+import GuaranteeTaskEvaluate from "@/pages/evaluate";
+import GuaranteeTaskEvaluateList from "@/pages/evaluate/evaluateList";
 import DishList from '@/pages/dish/list';
 import DishEdit from '@/pages/dish/edit';
 import PackageList from '@/pages/package/List';
@@ -77,7 +79,7 @@ export const authRoutes = [
         path: "guaranteeTask",
         element: <GuaranteeTaskList />,
         meta: {
-          title: "军供通报",
+          title: "任务通报",
         },
       },
       {
@@ -98,10 +100,18 @@ export const authRoutes = [
         },
       },
       {
-        path: "guaranteeTask/print",
-        element: <GuaranteeTaskPrint />,
+        path: "evaluate",
+        element: <GuaranteeTaskEvaluate />,
+        meta: {
+          title: "任务评价",
+        },
+      },
+      {
+        path: "evaluate/list",
+        element: <GuaranteeTaskEvaluateList />,
         meta: {
           title: "任务评价",
+          hideInMenu: true,
         },
       },
     ],

src/services/evaluate.js

@@ -0,0 +1,21 @@
+import { restful } from "@/utils/request";
+
+/**
+ * 构造 Service
+ * @returns
+ */
+const [
+  getEvaluateList,
+  geEvaluateDetail,
+  saveEvaluate,
+  updateEvaluate,
+  deleteEvaluate,
+] = restful("/evaluate");
+
+export {
+  getEvaluateList,
+  geEvaluateDetail,
+  saveEvaluate,
+  updateEvaluate,
+  deleteEvaluate,
+};

src/services/statis.js

@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const getSummary = () => request('/statis/summary', { successTip: false });
+
+export const getTaskInfo = (params) => request('/statis/taskInfo', { params, successTip: false });