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

src/pages/statis/components/Filter.jsx

 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 = [
   { label: '本年', value: '3' },
 ];
 
+export const last30Days = [
+  moment().subtract(30, 'days'),
+  moment(),
+];
+
 export const yearRange = [
   moment().startOf('year'),
   moment(),
   const [radioValue, setRadioValue] = React.useState();
 
   const onChange = (val) => {
+    console.log(val);
     if (typeof props.onChange === 'function') {
       props.onChange(getStrValue(val));
     }
   const onPickerChange = val => {
     setDateRange(val);
     setRadioValue();
-    onChange(getStrValue(val));
+    onChange(val);
   }
 
   const onRadioChange = e => {
     }
     
     setDateRange(dateRange);
-    onChange(getStrValue(dateRange));
+    onChange(dateRange);
   }
 
   return (

src/pages/statis/components/Sumary.jsx

 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';
 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

 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>
     },
     xAxis: {
       type: 'category',
-      axisLabel: axisLabel,
+      axisLabel: { ...axisLabel, rotate: 45 },
       axisLine: {
         show: true,
         lineStyle: lineStyle
       },
       type: 'value'
     },
+    // dataZoom: [
+    //   {
+    //     show: true,
+    //   }
+    // ],
     grid: {
       top: 20,
       left: 50,
       right: 20,
-      bottom: 50,
+      bottom: 100,
     },
     series: [
       {

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

 
   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/regulation/edit/index.jsx

+import { addRegulation, updataRegulation, getRegulationById } from '@/services/regulation';
+import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
+import { Card, Col, message, Row, Space } from 'antd';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useEffect, useRef, useState } from 'react';
+
+export default (props) => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const id = searchParams.get('id');
+  const formRef = useRef();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (id) {
+      getRegulationById(id).then((res) => {
+        formRef.current.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values);
+
+    if (id) {
+      //修改
+      updataRegulation({ ...values }, id).then((res) => {
+        message.success('修改成功');
+        navigate(-1);
+      });
+
+    } else {
+      //添加
+      addRegulation({ ...values }).then((res) => {
+        message.success('添加成功');
+        navigate(-1);
+      });
+    }
+    return false;
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          layout={'horizontal'}
+          labelCol={{ span: 8 }}
+          wrapperCol={{ span: 16 }}
+          onFinish={onFinish}
+          submitter={{
+            searchConfig: {
+              resetText: '返回',
+            },
+            onReset: () => navigate(-1),
+            render: (props, doms) => {
+              return (
+                <Row>
+                  <Col span={8} offset={8}>
+                    <Space>{doms}</Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormText
+            name="detail"
+            label="发布内容"
+            placeholder="请输入发布内容"
+            rules={[{ required: true, message: '请输入发布内容' }]}
+            allowClear={false}
+            width={460}
+          />
+          <ProFormText
+            name="title"
+            label="内容名称"
+            placeholder="请输入内容名称"
+            rules={[{ required: true, message: '请输入内容名称' }]}
+            allowClear={false}
+            width={460}
+          />
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+}

src/regulation/index.jsx

+import { getRegulationList, updataRegulation, deleteRegulation } from '@/services/regulation';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
 import { useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { queryTable } from '@/utils/request';
+import { Button, message, Popconfirm } from 'antd';
 
 const RegulationList = (props) => {
-const actionRef = useRef();
-const navigate = useNavigate();
+  const actionRef = useRef();
+  const navigate = useNavigate();
 
-const columns = [
+  // const updata = (row) => {
+  //   if (row.id) {
+  //     // 修改
+  //     updataRegulation(row.id, { ...values }).then((res) => {
+  //       message.success('修改成功');
+  //       navigate(-1);
+  //     });
+  //   }
+  // };
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteRegulation(id).then((res) => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
     {
       title: 'id',
       dataIndex: 'id',
+      width: 200,
     },
     {
       title: '标题',
       dataIndex: 'title',
+      width: 200,
     },
 
     {
       title: '内容',
-      dataIndex: 'content',
+      dataIndex: 'detail',
+      width: 200,
     },
 
     {
       title: '发布人',
-      dataIndex: 'faburen',
+      dataIndex: 'create_person',
+      width: 200,
     },
     {
       title: '发布时间',
-      dataIndex: 'fabutime',
+      dataIndex: 'create_date',
+      width: 200,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, ']]');
+            navigate(`/cms/regulation/add?id=${record.id}`);
+          }}
+        >
+          编辑
+        </Button>,
+
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
     },
   ];
 
         search={false}
         actionRef={actionRef}
         rowKey="id"
-        // request={queryTable(getBannerList)}
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              navigate('/cms/regulation/add');
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        request={queryTable(getRegulationList)}
         columns={columns}
       />
     </PageContainer>

src/routes/routes.jsx

   MenuFoldOutlined,
   MenuUnfoldOutlined,
   PieChartOutlined,
-} from "@ant-design/icons";
-import { Navigate } from "react-router-dom";
-import AuthLayout from "@/layouts/AuthLayout";
-import Container from "@/layouts/Container";
-import Login from "@/pages/login";
-import Page404 from "@/pages/404";
-import Home from "@/pages/sample/home";
-import BasicForm from "@/pages/sample/form";
-import BasicTable from "@/pages/sample/table";
-import GuaranteeTaskList from "@/pages/guaranteeTask";
-import GuaranteeTaskEdit from "@/pages/guaranteeTask/Edit";
-import GuaranteeTaskPrint from "@/pages/guaranteeTask/print";
+} from '@ant-design/icons';
+import { Navigate } from 'react-router-dom';
+import AuthLayout from '@/layouts/AuthLayout';
+import Container from '@/layouts/Container';
+import Login from '@/pages/login';
+import Page404 from '@/pages/404';
+import Home from '@/pages/sample/home';
+import BasicForm from '@/pages/sample/form';
+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";
-import StockList from "@/pages/stock/list";
-import StockEdit from "@/pages/stock/edit";
-import StockInOut from "@/pages/stock/outAndIn";
-import StockLog from "@/pages/stock/stockLog";
-import StockClassificationList from "@/pages/stockClassification/list";
-import StockClassificationEdit from "@/pages/stockClassification/edit";
-import RotationChartList from "@/pages/rotationChart/list";
-import RotationChartEdit from "@/pages/rotationChart/edit";
-import RotationChartIntroduction from "@/pages/rotationChart/introduction";
-import Roles from "@/pages/roles/index";
-import RegulationList from "@/regulation";
-import UserList from "@/pages/user";
-import UserEdit from "@/pages/user/Edit";
+import DishList from '@/pages/dish/list';
+import DishEdit from '@/pages/dish/edit';
+import PackageList from '@/pages/package/List';
+import StockList from '@/pages/stock/list';
+import StockEdit from '@/pages/stock/edit';
+import StockInOut from '@/pages/stock/outAndIn';
+import StockLog from '@/pages/stock/stockLog';
+import StockClassificationList from '@/pages/stockClassification/list';
+import StockClassificationEdit from '@/pages/stockClassification/edit';
+import RotationChartList from '@/pages/rotationChart/list';
+import RotationChartEdit from '@/pages/rotationChart/edit';
+import RotationChartIntroduction from '@/pages/rotationChart/introduction';
+import Roles from '@/pages/roles/index';
+import RegulationList from '@/regulation';
+import RegulationEdit from '@/regulation/edit';
+import UserList from '@/pages/user';
+import UserEdit from '@/pages/user/Edit';
 import PurchasePlanList from "@/pages/purchase/plan/list";
 import PurchasePlanEdit from "@/pages/purchase/plan/edit";
 import PurchaseBillEdit from "@/pages/purchase/bill/edit";
         path: "guaranteeTask",
         element: <GuaranteeTaskList />,
         meta: {
-          title: "军供通报",
+          title: "任务通报",
         },
       },
       {
         },
       },
       {
-        path: "regulation",
-        element: null,
+        path: 'regulation',
+        element: <RegulationList />,
         meta: {
           title: "规章制度",
         },
       },
+      {
+        path: 'regulation/add',
+        element: <RegulationEdit />,
+        meta: {
+          hideInMenu: true,
+          title: '规章制度维护',
+        },
+      },
       {
         path: "emergency-plan",
         element: <EmergencyPlanList />,
   },
 ];
 
-export function mergeAuthRoutes(r1, r2) {
+export function mergeAuthRoutes (r1, r2) {
   const r = r1.slice();
   const children = r1[0].children.slice();
   r[0].children = children.concat(r2);
 
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
-
-function getPath(parent = "/", current = "") {
+function getPath (parent = "/", current = "") {
   if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
     return current;
   return `${parent}/${current}`.replace(/\/\//g, "/");

src/services/regulation.js

+import request from '@/utils/request';
+
+/**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getRegulationList = (params) => request('/posts', { params });
+
+/**
+* 新增
+* @param {*} data
+* @returns
+*/
+export const addRegulation = (data) => request('/posts', { method: 'post', data });
+
+/**
+ * 更新
+ * @param {*} data
+ * @returns
+ */
+export const updataRegulation = (data, id) => request(`/posts/${id}`, { method: 'get', data });
+
+/**
+* 详情
+* @param {*} id
+* @returns
+*/
+export const getRegulationById = (id) => request(`/posts/${id}`);
+
+/**
+ * 删除
+ * @param {*} id
+ * @returns
+ */
+export const deleteRegulation = (id) => request(`/posts/${id}`, { method: 'delete' });

src/services/statis.js

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

src/services/stock.js

  * @param {*} params
  * @returns
  */
-export const getStoreList = (params) => request('/store', { params,successTip:false });
+export const getStoreList = (params) => request('/store', { params, successTip: false });
 
 /**
  * 新增
  * @param {*} params
  * @returns
  */
-export const storeExport = (params) => request('/store/export',  { download: true, params });
+export const storeExport = (params) => request('/store/export', { download: true, params });
 
 
 // 库存分类
  * @param {*} params
  * @returns
  */
-export const getStoreTypeList = (params) => request('/storeType', { params,successTip:false });
+export const getStoreTypeList = (params) => request('/storeType', { params, successTip: false });
 
 /**
  * 新增
  * @param {*} data
  * @returns
  */
-export const updataStoreType = (id, data) => request(`/storeType/${id}`, { method: 'put', data });
+export const updataStoreType = (id, data) => request(`/storeType/${id}`, { method: 'post', data });
 
 /**
  * 删除
  * @param {*} params
  * @returns
  */
- export const storeLogExport = (params) => request('/storeLog/export',  { download: true, params });
+export const storeLogExport = (params) => request('/storeLog/export', { download: true, params });